From 43d6ec13d81731f3627edb437246c0a8d7abef0f Mon Sep 17 00:00:00 2001 From: "Chris West (Faux)" Date: Sat, 18 Jul 2020 16:03:19 +0100 Subject: [PATCH] feat: swap out then-fs for promise-fs then-fs monkey patches the stdlib, which causes problems for jest, c.f. https://github.com/facebook/jest/pull/8331 promise-fs is a drop-in replacement here, for us. --- lib/index.js | 2 +- package.json | 4 ++-- test/unit/get-by-vuln.test.js | 2 +- test/unit/policy-save.test.js | 4 ++-- test/unit/policy.test.js | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/index.js b/lib/index.js index 3b2acfd..d35bc2a 100644 --- a/lib/index.js +++ b/lib/index.js @@ -1,4 +1,4 @@ -const fs = require('then-fs'); +const fs = require('promise-fs'); const path = require('path'); const debug = require('debug')('snyk:policy'); const match = require('./match'); diff --git a/package.json b/package.json index 3553541..d242724 100644 --- a/package.json +++ b/package.json @@ -29,11 +29,11 @@ "email-validator": "^2.0.4", "js-yaml": "^3.13.1", "lodash.clonedeep": "^4.5.0", + "promise-fs": "^2.1.1", "semver": "^6.0.0", "snyk-module": "^3.0.0", "snyk-resolve": "^1.0.1", - "snyk-try-require": "^1.3.1", - "then-fs": "^2.0.0" + "snyk-try-require": "^1.3.1" }, "repository": { "type": "git", diff --git a/test/unit/get-by-vuln.test.js b/test/unit/get-by-vuln.test.js index 40bace0..9055e27 100644 --- a/test/unit/get-by-vuln.test.js +++ b/test/unit/get-by-vuln.test.js @@ -1,6 +1,6 @@ const test = require('tap-only'); const fixtures = __dirname + '/../fixtures'; -const fs = require('then-fs'); +const fs = require('promise-fs'); const getByVuln = require('../../lib/match').getByVuln; const loadFromText = require('../../').loadFromText; const policy = require(fixtures + '/ignore/parsed.json'); diff --git a/test/unit/policy-save.test.js b/test/unit/policy-save.test.js index 89a9fd5..4db1eaa 100644 --- a/test/unit/policy-save.test.js +++ b/test/unit/policy-save.test.js @@ -4,9 +4,9 @@ const fixtures = __dirname + '/../fixtures'; const path = require('path'); const sinon = require('sinon'); const writeSpy = sinon.spy(); -const fs = require('then-fs'); +const fs = require('promise-fs'); const policy = proxyquire('../..', { - 'then-fs': { + 'promise-fs': { writeFile: function (filename, body) { writeSpy(filename, body); return Promise.resolve(); diff --git a/test/unit/policy.test.js b/test/unit/policy.test.js index 94573e9..17a217b 100644 --- a/test/unit/policy.test.js +++ b/test/unit/policy.test.js @@ -2,7 +2,7 @@ const test = require('tap-only'); const policy = require('../..'); const demunge = require('../../lib/parser').demunge; const path = require('path'); -const fs = require('then-fs'); +const fs = require('promise-fs'); const fixtures = __dirname + '/../fixtures'; test('module loads', function (t) {