From 756afd8147f306f7037fd875a79be4fa0ce29212 Mon Sep 17 00:00:00 2001 From: Thijs Louisse Date: Fri, 12 Nov 2021 23:30:24 +0100 Subject: [PATCH] fix: update mock-fs for Node >= 16 compatibility --- package.json | 2 +- .../src/program/utils/resolve-import-path.js | 3 +- .../program/analyzers/match-imports.test.js | 5 ++- yarn.lock | 39 ++++++++++++++++--- 4 files changed, 40 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 0b345ce71..b650af600 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "minimist": "^1.2.5", "mkdirp-promise": "^5.0.1", "mocha": "^7.1.1", - "mock-fs": "^4.10.1", + "mock-fs": "^5.1.2", "npm-run-all": "^4.1.5", "nyc": "^15.0.0", "playwright": "^1.7.1", diff --git a/packages-node/providence-analytics/src/program/utils/resolve-import-path.js b/packages-node/providence-analytics/src/program/utils/resolve-import-path.js index 419c8feb4..b7658b3a8 100644 --- a/packages-node/providence-analytics/src/program/utils/resolve-import-path.js +++ b/packages-node/providence-analytics/src/program/utils/resolve-import-path.js @@ -9,7 +9,8 @@ const { LogService } = require('../services/LogService.js'); const fakePluginContext = { meta: { - rollupVersion: '^2.42.0', // nodeResolvePackageJson.peerDependencies.rollup, + // rollupVersion needed in plugin context => nodeResolvePackageJson.peerDependencies.rollup + rollupVersion: '^2.42.0', }, resolve: () => {}, warn(...msg) { diff --git a/packages-node/providence-analytics/test-node/program/analyzers/match-imports.test.js b/packages-node/providence-analytics/test-node/program/analyzers/match-imports.test.js index 56fb75610..a65c6733b 100644 --- a/packages-node/providence-analytics/test-node/program/analyzers/match-imports.test.js +++ b/packages-node/providence-analytics/test-node/program/analyzers/match-imports.test.js @@ -412,8 +412,9 @@ describe('Analyzer "match-imports"', () => { describe('Matching', () => { it(`produces a list of all matches, sorted by project`, async () => { /** - * N.B. output structure could be simplified, since there is - * For now, we keep it, so integration with dashboard stays intact. + * N.B. output structure could be simplified, since there is no need to order results by + * target project (there's only one target project per run). + * For now we keep it, so integration with dashboard stays intact. * TODO: * - write tests for dashboard transform logic * - simplify output for match-* analyzers diff --git a/yarn.lock b/yarn.lock index 4688a1d8b..29e25040a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1315,6 +1315,15 @@ "@open-wc/scoped-elements" "^2.0.0-next.3" lit "^2.0.0-rc.2" +"@lion/core@^0.18.0": + version "0.18.4" + resolved "https://registry.yarnpkg.com/@lion/core/-/core-0.18.4.tgz#1e41567251ad29be0dd45b6965644c7aa34c4654" + integrity sha512-iH5z9ulJA9GKVaw3pNMXoviQMh1XI51rBscFvNBlTADS6XODfNhhLWNIj+lkwGBBl8e02XY+F+J8p7QSa/Xelg== + dependencies: + "@open-wc/dedupe-mixin" "^1.2.18" + "@open-wc/scoped-elements" "^2.0.0-next.3" + lit "^2.0.0-rc.2" + "@lion/overlays@^0.26.1": version "0.26.1" resolved "https://registry.yarnpkg.com/@lion/overlays/-/overlays-0.26.1.tgz#d1bfa4f5f97108982afa7b409ba4300f8b2d2ba5" @@ -1722,6 +1731,18 @@ is-module "^1.0.0" resolve "^1.19.0" +"@rollup/plugin-node-resolve@^13.0.6": + version "13.0.6" + resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.0.6.tgz#29629070bb767567be8157f575cfa8f2b8e9ef77" + integrity sha512-sFsPDMPd4gMqnh2gS0uIxELnoRUp5kBl5knxD2EO0778G1oOJv4G1vyT2cpWz75OU2jDVcXhjVUuTAczGyFNKA== + dependencies: + "@rollup/pluginutils" "^3.1.0" + "@types/resolve" "1.17.1" + builtin-modules "^3.1.0" + deepmerge "^4.2.2" + is-module "^1.0.0" + resolve "^1.19.0" + "@rollup/plugin-node-resolve@^7.1.1": version "7.1.3" resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz#80de384edfbd7bfc9101164910f86078151a3eca" @@ -6140,7 +6161,7 @@ gensync@^1.0.0-beta.2: resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== -get-caller-file@^1.0.1: +get-caller-file@^1.0.1, get-caller-file@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== @@ -8740,10 +8761,18 @@ mocha@^7.1.1: yargs-parser "13.1.2" yargs-unparser "1.6.0" -mock-fs@^4.10.1: - version "4.14.0" - resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.14.0.tgz#ce5124d2c601421255985e6e94da80a7357b1b18" - integrity sha512-qYvlv/exQ4+svI3UOvPUpLDF0OMX5euvUH0Ny4N5QyRyhNdgAgUrVH3iUINSzEPLvx0kbo/Bp28GJKIqvE7URw== +mock-fs@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-5.1.2.tgz#6fa486e06d00f8793a8d2228de980eff93ce6db7" + integrity sha512-YkjQkdLulFrz0vD4BfNQdQRVmgycXTV7ykuHMlyv+C8WCHazpkiQRDthwa02kSyo8wKnY9wRptHfQLgmf0eR+A== + +mock-require@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz#ccd544d9eae81dd576b3f219f69ec867318a1946" + integrity sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg== + dependencies: + get-caller-file "^1.0.2" + normalize-path "^2.1.1" moment-mini@^2.22.1: version "2.24.0"