From 207e4e9ca1697adeaf70a2460cba7922ffb0f876 Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Fri, 8 Dec 2023 16:18:59 -0800 Subject: [PATCH] [Fix] work around `npm-packlist` bug --- packages/list-exports/index.js | 5 +++++ .../expected/broken-dir-slash-conditions.json | 1 - .../tests/fixtures/single-spa-layout/expected/broken.json | 4 +--- .../fixtures/single-spa-layout/expected/conditions.json | 1 - .../fixtures/single-spa-layout/expected/experimental.json | 4 +--- .../expected/pattern-trailers-no-dir-slash.json | 1 - .../single-spa-layout/expected/pattern-trailers.json | 1 - .../tests/fixtures/single-spa-layout/expected/patterns.json | 1 - .../fixtures/single-spa-layout/expected/pre-exports.json | 4 +--- 9 files changed, 8 insertions(+), 14 deletions(-) diff --git a/packages/list-exports/index.js b/packages/list-exports/index.js index 009b9de..d19fb2b 100644 --- a/packages/list-exports/index.js +++ b/packages/list-exports/index.js @@ -786,6 +786,11 @@ async function getExports(packageDir, pkgData, nodeRange, problems) { flatMap( packedFiles, (x) => { + // hack to work around npm-packlist bug + if (x.split('/').indexOf('node_modules') > -1) { + return []; + } + const resolved = resolveFrom(dirname(x), packageDir, rootAllExtensions); return [ x, diff --git a/packages/tests/fixtures/single-spa-layout/expected/broken-dir-slash-conditions.json b/packages/tests/fixtures/single-spa-layout/expected/broken-dir-slash-conditions.json index 9d82765..faa52de 100644 --- a/packages/tests/fixtures/single-spa-layout/expected/broken-dir-slash-conditions.json +++ b/packages/tests/fixtures/single-spa-layout/expected/broken-dir-slash-conditions.json @@ -5,7 +5,6 @@ "node": "*" }, "problems": [ - "`./node_modules/@types/parse5` has a `package.json`, but both its `main` and `index.js` do not exist!", "`./package.json`: inside a conditions object, a files object (keys starting with `.`) is invalid" ], "exports": { diff --git a/packages/tests/fixtures/single-spa-layout/expected/broken.json b/packages/tests/fixtures/single-spa-layout/expected/broken.json index 26d3fbb..97602f6 100644 --- a/packages/tests/fixtures/single-spa-layout/expected/broken.json +++ b/packages/tests/fixtures/single-spa-layout/expected/broken.json @@ -4,9 +4,7 @@ "engines": { "node": "*" }, - "problems": [ - "`./node_modules/@types/parse5` has a `package.json`, but both its `main` and `index.js` do not exist!" - ], + "problems": [], "exports": { "binaries": {}, "latest": "broken", diff --git a/packages/tests/fixtures/single-spa-layout/expected/conditions.json b/packages/tests/fixtures/single-spa-layout/expected/conditions.json index 061efa9..1171a28 100644 --- a/packages/tests/fixtures/single-spa-layout/expected/conditions.json +++ b/packages/tests/fixtures/single-spa-layout/expected/conditions.json @@ -5,7 +5,6 @@ "node": "*" }, "problems": [ - "`./node_modules/@types/parse5` has a `package.json`, but both its `main` and `index.js` do not exist!", "`./package.json`: inside a conditions object, a files object (keys starting with `.`) is invalid" ], "exports": { diff --git a/packages/tests/fixtures/single-spa-layout/expected/experimental.json b/packages/tests/fixtures/single-spa-layout/expected/experimental.json index 8672df3..71ab7e7 100644 --- a/packages/tests/fixtures/single-spa-layout/expected/experimental.json +++ b/packages/tests/fixtures/single-spa-layout/expected/experimental.json @@ -4,9 +4,7 @@ "engines": { "node": "*" }, - "problems": [ - "`./node_modules/@types/parse5` has a `package.json`, but both its `main` and `index.js` do not exist!" - ], + "problems": [], "exports": { "binaries": {}, "latest": "experimental", diff --git a/packages/tests/fixtures/single-spa-layout/expected/pattern-trailers-no-dir-slash.json b/packages/tests/fixtures/single-spa-layout/expected/pattern-trailers-no-dir-slash.json index 53399d7..b07df04 100644 --- a/packages/tests/fixtures/single-spa-layout/expected/pattern-trailers-no-dir-slash.json +++ b/packages/tests/fixtures/single-spa-layout/expected/pattern-trailers-no-dir-slash.json @@ -5,7 +5,6 @@ "node": "*" }, "problems": [ - "`./node_modules/@types/parse5` has a `package.json`, but both its `main` and `index.js` do not exist!", "`./package.json`: inside a conditions object, a files object (keys starting with `.`) is invalid" ], "exports": { diff --git a/packages/tests/fixtures/single-spa-layout/expected/pattern-trailers.json b/packages/tests/fixtures/single-spa-layout/expected/pattern-trailers.json index 40c7c87..c6b2a9a 100644 --- a/packages/tests/fixtures/single-spa-layout/expected/pattern-trailers.json +++ b/packages/tests/fixtures/single-spa-layout/expected/pattern-trailers.json @@ -5,7 +5,6 @@ "node": "*" }, "problems": [ - "`./node_modules/@types/parse5` has a `package.json`, but both its `main` and `index.js` do not exist!", "`./package.json`: inside a conditions object, a files object (keys starting with `.`) is invalid" ], "exports": { diff --git a/packages/tests/fixtures/single-spa-layout/expected/patterns.json b/packages/tests/fixtures/single-spa-layout/expected/patterns.json index cf3dad9..3bbd86c 100644 --- a/packages/tests/fixtures/single-spa-layout/expected/patterns.json +++ b/packages/tests/fixtures/single-spa-layout/expected/patterns.json @@ -5,7 +5,6 @@ "node": "*" }, "problems": [ - "`./node_modules/@types/parse5` has a `package.json`, but both its `main` and `index.js` do not exist!", "`./package.json`: inside a conditions object, a files object (keys starting with `.`) is invalid" ], "exports": { diff --git a/packages/tests/fixtures/single-spa-layout/expected/pre-exports.json b/packages/tests/fixtures/single-spa-layout/expected/pre-exports.json index bf0280e..a9d84cb 100644 --- a/packages/tests/fixtures/single-spa-layout/expected/pre-exports.json +++ b/packages/tests/fixtures/single-spa-layout/expected/pre-exports.json @@ -4,9 +4,7 @@ "engines": { "node": "*" }, - "problems": [ - "`./node_modules/@types/parse5` has a `package.json`, but both its `main` and `index.js` do not exist!" - ], + "problems": [], "exports": { "binaries": {}, "latest": "pre-exports",