From 7a0907afe534adb762724ef85d5a034058447155 Mon Sep 17 00:00:00 2001 From: Nathan Fritz Date: Wed, 1 Feb 2023 14:22:05 -0800 Subject: [PATCH 1/7] deps: @npmcli/template-oss@4.11.3 --- .github/workflows/pull-request.yml | 4 +- .github/workflows/release.yml | 9 ++++- docs/package.json | 4 +- mock-registry/package.json | 4 +- node_modules/.gitignore | 5 +++ package-lock.json | 57 ++++++++++++++++----------- package.json | 2 +- smoke-tests/package.json | 4 +- workspaces/arborist/package.json | 4 +- workspaces/config/package.json | 4 +- workspaces/libnpmaccess/package.json | 4 +- workspaces/libnpmdiff/package.json | 4 +- workspaces/libnpmexec/package.json | 4 +- workspaces/libnpmfund/package.json | 4 +- workspaces/libnpmhook/package.json | 4 +- workspaces/libnpmorg/package.json | 4 +- workspaces/libnpmpack/package.json | 4 +- workspaces/libnpmpublish/package.json | 4 +- workspaces/libnpmsearch/package.json | 4 +- workspaces/libnpmteam/package.json | 4 +- workspaces/libnpmversion/package.json | 4 +- 21 files changed, 81 insertions(+), 60 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 3d008208833f3..c0c46fc557a80 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -38,8 +38,8 @@ jobs: id: commit continue-on-error: true run: | - npx --offline commitlint -V --from origin/${{ github.base_ref }} --to ${{ github.event.pull_request.head.sha }} + npx --offline commitlint -V --from 'origin/${{ github.base_ref }}' --to ${{ github.event.pull_request.head.sha }} - name: Run Commitlint on PR Title if: steps.commit.outcome == 'failure' run: | - echo ${{ github.event.pull_request.title }} | npx --offline commitlint -V + echo '${{ github.event.pull_request.title }}' | npx --offline commitlint -V diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2f95160d99443..7f875ff435bce 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -351,11 +351,18 @@ jobs: if (updateComment) { console.log('Found comment to update:', JSON.stringify(updateComment, null, 2)) + let body = updateComment.body.replace(/Workflow run: :[a-z_]+:/, `Workflow run: :${RESULT}:`) + if (RESULT === 'x') { + body += `\n\n:rotating_light:` + body += ` @npm/cli-team: The post-release workflow failed for this release.` + body += ` Manual steps may need to be taken after examining the workflow output` + body += ` from the above workflow run. :rotating_light:` + } await github.rest.issues.updateComment({ owner, repo, + body, comment_id: updateComment.id, - body: updateComment.body.replace(/Workflow run: :[a-z_]+:/, `Workflow run: :${RESULT}:`), }) } else { console.log('No matching comments found:', JSON.stringify(comments, null, 2)) diff --git a/docs/package.json b/docs/package.json index 2d92e2b37ecf5..9bca1aa5cdab5 100644 --- a/docs/package.json +++ b/docs/package.json @@ -22,7 +22,7 @@ "devDependencies": { "@isaacs/string-locale-compare": "^1.1.0", "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "front-matter": "^4.0.2", "ignore-walk": "^6.0.0", "jsdom": "^20.0.3", @@ -56,7 +56,7 @@ "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", "ciVersions": "latest", "engines": "^14.17.0 || ^16.13.0 || >=18.0.0", - "version": "4.11.1", + "version": "4.11.3", "content": "../scripts/template-oss/index.js", "workspaceRepo": { "add": { diff --git a/mock-registry/package.json b/mock-registry/package.json index 36d05d370a5d1..d381765da5c1c 100644 --- a/mock-registry/package.json +++ b/mock-registry/package.json @@ -34,7 +34,7 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.11.1" + "version": "4.11.3" }, "tap": { "no-coverage": true, @@ -46,7 +46,7 @@ "devDependencies": { "@npmcli/arborist": "^6.1.1", "@npmcli/eslint-config": "^4.0.1", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "nock": "^13.2.9", "npm-package-arg": "^10.1.0", "pacote": "^15.0.7", diff --git a/node_modules/.gitignore b/node_modules/.gitignore index 1a8e77b91f589..324d4d592a044 100644 --- a/node_modules/.gitignore +++ b/node_modules/.gitignore @@ -21,6 +21,11 @@ !/@npmcli/git !/@npmcli/installed-package-contents !/@npmcli/map-workspaces +!/@npmcli/map-workspaces/node_modules/ +/@npmcli/map-workspaces/node_modules/* +!/@npmcli/map-workspaces/node_modules/@npmcli/ +/@npmcli/map-workspaces/node_modules/@npmcli/* +!/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder !/@npmcli/metavuln-calculator !/@npmcli/name-from-folder !/@npmcli/node-gyp diff --git a/package-lock.json b/package-lock.json index e75716a4f9aed..0054bd46c99fc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -163,7 +163,7 @@ "@npmcli/git": "^4.0.1", "@npmcli/mock-registry": "^1.0.0", "@npmcli/promise-spawn": "^6.0.1", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "licensee": "^10.0.0", "nock": "^13.2.4", "npm-packlist": "^7.0.4", @@ -184,7 +184,7 @@ "devDependencies": { "@isaacs/string-locale-compare": "^1.1.0", "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "front-matter": "^4.0.2", "ignore-walk": "^6.0.0", "jsdom": "^20.0.3", @@ -209,7 +209,7 @@ "devDependencies": { "@npmcli/arborist": "^6.1.1", "@npmcli/eslint-config": "^4.0.1", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "nock": "^13.2.9", "npm-package-arg": "^10.1.0", "pacote": "^15.0.7", @@ -2163,11 +2163,12 @@ } }, "node_modules/@npmcli/map-workspaces": { - "version": "3.0.0", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-3.0.1.tgz", + "integrity": "sha512-QXwE2p5zRTP6X8Irgf/swYwwdQEalSA1GBm0IGE/86R5EJbUGgKMOP0kOjaJWJxaWPkSqyhM8N50SPxFHTfkNg==", "inBundle": true, - "license": "ISC", "dependencies": { - "@npmcli/name-from-folder": "^1.0.1", + "@npmcli/name-from-folder": "^2.0.0", "glob": "^8.0.1", "minimatch": "^5.0.1", "read-package-json-fast": "^3.0.0" @@ -2176,6 +2177,15 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-2.0.0.tgz", + "integrity": "sha512-pwK+BfEBZJbKdNYpHHRTNBwBoqrN/iIMO0AiGvYsp3Hoaq0WbgGSWQR6SCldZovoDpY3yje5lkFUe6gsDgJ2vg==", + "inBundle": true, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/@npmcli/metavuln-calculator": { "version": "5.0.0", "license": "ISC", @@ -2195,7 +2205,6 @@ }, "node_modules/@npmcli/name-from-folder": { "version": "1.0.1", - "inBundle": true, "license": "ISC" }, "node_modules/@npmcli/node-gyp": { @@ -2258,9 +2267,9 @@ "link": true }, "node_modules/@npmcli/template-oss": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/@npmcli/template-oss/-/template-oss-4.11.1.tgz", - "integrity": "sha512-Rs0sYcHhbcLA9mfQz/ojdNjKIMqyPG9kA/Ie2W4OxuBeVR/rhDf7yL4iqTK4Rum9dRVz9jWXex5PDNyDyiQnHw==", + "version": "4.11.3", + "resolved": "https://registry.npmjs.org/@npmcli/template-oss/-/template-oss-4.11.3.tgz", + "integrity": "sha512-AEpwlpIXsiPUnM9gFHQHtXkyq1atSHL+bINSANPrR9SAwXSGchprbXRxZunlciWvEkX+GS99tbE6k65dbj8MgQ==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -14357,7 +14366,7 @@ "@npmcli/eslint-config": "^4.0.0", "@npmcli/mock-registry": "^1.0.0", "@npmcli/promise-spawn": "^6.0.1", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "http-proxy": "^1.18.1", "just-extend": "^6.1.1", "just-safe-set": "^4.1.1", @@ -14412,7 +14421,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "benchmark": "^2.1.4", "chalk": "^4.1.0", "minify-registry-metadata": "^3.0.0", @@ -14440,7 +14449,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "tap": "^16.3.2" }, "engines": { @@ -14457,7 +14466,7 @@ "devDependencies": { "@npmcli/eslint-config": "^4.0.0", "@npmcli/mock-registry": "^1.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "nock": "^13.2.4", "tap": "^16.3.2" }, @@ -14481,7 +14490,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "tap": "^16.3.2" }, "engines": { @@ -14508,7 +14517,7 @@ "devDependencies": { "@npmcli/eslint-config": "^4.0.0", "@npmcli/mock-registry": "^1.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "bin-links": "^4.0.1", "just-extend": "^6.1.1", "just-safe-set": "^4.1.1", @@ -14528,7 +14537,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "tap": "^16.3.2" }, "engines": { @@ -14544,7 +14553,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "nock": "^13.2.4", "tap": "^16.3.2" }, @@ -14561,7 +14570,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "minipass": "^4.0.0", "nock": "^13.2.4", "tap": "^16.3.2" @@ -14581,7 +14590,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "nock": "^13.0.7", "spawk": "^1.7.1", "tap": "^16.3.2" @@ -14603,7 +14612,7 @@ "devDependencies": { "@npmcli/eslint-config": "^4.0.0", "@npmcli/mock-registry": "^1.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "lodash.clonedeep": "^4.5.0", "nock": "^13.2.4", "tap": "^16.3.2" @@ -14620,7 +14629,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "nock": "^13.2.4", "tap": "^16.3.2" }, @@ -14637,7 +14646,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "nock": "^13.2.4", "tap": "^16.3.2" }, @@ -14657,7 +14666,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "require-inject": "^1.4.4", "tap": "^16.3.2" }, diff --git a/package.json b/package.json index 7a29b5d8a9341..bc9a4c4daafca 100644 --- a/package.json +++ b/package.json @@ -196,7 +196,7 @@ "@npmcli/git": "^4.0.1", "@npmcli/mock-registry": "^1.0.0", "@npmcli/promise-spawn": "^6.0.1", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "licensee": "^10.0.0", "nock": "^13.2.4", "npm-packlist": "^7.0.4", diff --git a/smoke-tests/package.json b/smoke-tests/package.json index cff5f190a01f1..3505614b3b6da 100644 --- a/smoke-tests/package.json +++ b/smoke-tests/package.json @@ -21,7 +21,7 @@ "@npmcli/eslint-config": "^4.0.0", "@npmcli/mock-registry": "^1.0.0", "@npmcli/promise-spawn": "^6.0.1", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "http-proxy": "^1.18.1", "just-extend": "^6.1.1", "just-safe-set": "^4.1.1", @@ -32,7 +32,7 @@ "license": "ISC", "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.11.1", + "version": "4.11.3", "content": "../scripts/template-oss/index.js" }, "tap": { diff --git a/workspaces/arborist/package.json b/workspaces/arborist/package.json index 735dd41a2ef50..fe58adaf578d6 100644 --- a/workspaces/arborist/package.json +++ b/workspaces/arborist/package.json @@ -39,7 +39,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "benchmark": "^2.1.4", "chalk": "^4.1.0", "minify-registry-metadata": "^3.0.0", @@ -102,7 +102,7 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.11.1", + "version": "4.11.3", "content": "../../scripts/template-oss/index.js" } } diff --git a/workspaces/config/package.json b/workspaces/config/package.json index 11835648ea061..09e28f556da7b 100644 --- a/workspaces/config/package.json +++ b/workspaces/config/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "tap": "^16.3.2" }, "dependencies": { @@ -50,6 +50,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.11.1" + "version": "4.11.3" } } diff --git a/workspaces/libnpmaccess/package.json b/workspaces/libnpmaccess/package.json index c16c640c5eb63..e9f728b22997c 100644 --- a/workspaces/libnpmaccess/package.json +++ b/workspaces/libnpmaccess/package.json @@ -17,7 +17,7 @@ "devDependencies": { "@npmcli/eslint-config": "^4.0.0", "@npmcli/mock-registry": "^1.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "nock": "^13.2.4", "tap": "^16.3.2" }, @@ -41,7 +41,7 @@ ], "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.11.1", + "version": "4.11.3", "content": "../../scripts/template-oss/index.js" }, "tap": { diff --git a/workspaces/libnpmdiff/package.json b/workspaces/libnpmdiff/package.json index a1c261ba9dd30..5c8202998c326 100644 --- a/workspaces/libnpmdiff/package.json +++ b/workspaces/libnpmdiff/package.json @@ -43,7 +43,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "tap": "^16.3.2" }, "dependencies": { @@ -59,7 +59,7 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.11.1", + "version": "4.11.3", "content": "../../scripts/template-oss/index.js" }, "tap": { diff --git a/workspaces/libnpmexec/package.json b/workspaces/libnpmexec/package.json index d91219b1beb44..c6ed4c7337d1b 100644 --- a/workspaces/libnpmexec/package.json +++ b/workspaces/libnpmexec/package.json @@ -52,7 +52,7 @@ "devDependencies": { "@npmcli/eslint-config": "^4.0.0", "@npmcli/mock-registry": "^1.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "bin-links": "^4.0.1", "just-extend": "^6.1.1", "just-safe-set": "^4.1.1", @@ -76,7 +76,7 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.11.1", + "version": "4.11.3", "content": "../../scripts/template-oss/index.js" } } diff --git a/workspaces/libnpmfund/package.json b/workspaces/libnpmfund/package.json index f239951ef3a89..b70bca44e11ce 100644 --- a/workspaces/libnpmfund/package.json +++ b/workspaces/libnpmfund/package.json @@ -42,7 +42,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "tap": "^16.3.2" }, "dependencies": { @@ -53,7 +53,7 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.11.1", + "version": "4.11.3", "content": "../../scripts/template-oss/index.js" }, "tap": { diff --git a/workspaces/libnpmhook/package.json b/workspaces/libnpmhook/package.json index e1e55e0234985..7559f52aedabe 100644 --- a/workspaces/libnpmhook/package.json +++ b/workspaces/libnpmhook/package.json @@ -37,7 +37,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "nock": "^13.2.4", "tap": "^16.3.2" }, @@ -46,7 +46,7 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.11.1", + "version": "4.11.3", "content": "../../scripts/template-oss/index.js" }, "tap": { diff --git a/workspaces/libnpmorg/package.json b/workspaces/libnpmorg/package.json index b8dacb4a646a1..9a6fbddef77fe 100644 --- a/workspaces/libnpmorg/package.json +++ b/workspaces/libnpmorg/package.json @@ -28,7 +28,7 @@ ], "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "minipass": "^4.0.0", "nock": "^13.2.4", "tap": "^16.3.2" @@ -49,7 +49,7 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.11.1", + "version": "4.11.3", "content": "../../scripts/template-oss/index.js" }, "tap": { diff --git a/workspaces/libnpmpack/package.json b/workspaces/libnpmpack/package.json index 99b9259d8319d..63c683dbd1726 100644 --- a/workspaces/libnpmpack/package.json +++ b/workspaces/libnpmpack/package.json @@ -23,7 +23,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "nock": "^13.0.7", "spawk": "^1.7.1", "tap": "^16.3.2" @@ -46,7 +46,7 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.11.1", + "version": "4.11.3", "content": "../../scripts/template-oss/index.js" }, "tap": { diff --git a/workspaces/libnpmpublish/package.json b/workspaces/libnpmpublish/package.json index 6c64950744314..5af8683854b66 100644 --- a/workspaces/libnpmpublish/package.json +++ b/workspaces/libnpmpublish/package.json @@ -26,7 +26,7 @@ "devDependencies": { "@npmcli/eslint-config": "^4.0.0", "@npmcli/mock-registry": "^1.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "lodash.clonedeep": "^4.5.0", "nock": "^13.2.4", "tap": "^16.3.2" @@ -50,7 +50,7 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.11.1", + "version": "4.11.3", "content": "../../scripts/template-oss/index.js" }, "tap": { diff --git a/workspaces/libnpmsearch/package.json b/workspaces/libnpmsearch/package.json index 4dcac9839e61e..5d11b783e396c 100644 --- a/workspaces/libnpmsearch/package.json +++ b/workspaces/libnpmsearch/package.json @@ -26,7 +26,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "nock": "^13.2.4", "tap": "^16.3.2" }, @@ -45,7 +45,7 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.11.1", + "version": "4.11.3", "content": "../../scripts/template-oss/index.js" }, "tap": { diff --git a/workspaces/libnpmteam/package.json b/workspaces/libnpmteam/package.json index 38b08c83d7bcf..3cd79e409fedc 100644 --- a/workspaces/libnpmteam/package.json +++ b/workspaces/libnpmteam/package.json @@ -16,7 +16,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "nock": "^13.2.4", "tap": "^16.3.2" }, @@ -39,7 +39,7 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.11.1", + "version": "4.11.3", "content": "../../scripts/template-oss/index.js" }, "tap": { diff --git a/workspaces/libnpmversion/package.json b/workspaces/libnpmversion/package.json index c839a95fb9c13..f9159a25db8af 100644 --- a/workspaces/libnpmversion/package.json +++ b/workspaces/libnpmversion/package.json @@ -32,7 +32,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.11.1", + "@npmcli/template-oss": "4.11.3", "require-inject": "^1.4.4", "tap": "^16.3.2" }, @@ -48,7 +48,7 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.11.1", + "version": "4.11.3", "content": "../../scripts/template-oss/index.js" } } From a2b76a7dbda40d09e0f6527e77b417645ed7ab4f Mon Sep 17 00:00:00 2001 From: Nathan Fritz Date: Wed, 1 Feb 2023 14:51:03 -0800 Subject: [PATCH 2/7] deps: @npmcli/map-workspaces@3.0.1 --- .../@npmcli/name-from-folder/LICENSE | 15 +++++++ .../@npmcli/name-from-folder/lib/index.js | 7 +++ .../@npmcli/name-from-folder/package.json | 43 +++++++++++++++++++ .../@npmcli/map-workspaces/package.json | 10 ++--- package-lock.json | 6 +-- package.json | 2 +- workspaces/arborist/package.json | 2 +- workspaces/config/package.json | 2 +- 8 files changed, 76 insertions(+), 11 deletions(-) create mode 100644 node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/LICENSE create mode 100644 node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/lib/index.js create mode 100644 node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/package.json diff --git a/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/LICENSE b/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/LICENSE new file mode 100644 index 0000000000000..d24a9fca761c8 --- /dev/null +++ b/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/LICENSE @@ -0,0 +1,15 @@ +The ISC License + +Copyright npm, Inc. + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND NPM DISCLAIMS ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS. IN NO EVENT SHALL NPM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS +ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. diff --git a/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/lib/index.js b/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/lib/index.js new file mode 100644 index 0000000000000..afb1dbb76297f --- /dev/null +++ b/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/lib/index.js @@ -0,0 +1,7 @@ +const { basename, dirname } = require('path') + +const getName = (parent, base) => + parent.charAt(0) === '@' ? `${parent}/${base}` : base + +module.exports = dir => dir ? getName(basename(dirname(dir)), basename(dir)) + : false diff --git a/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/package.json b/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/package.json new file mode 100644 index 0000000000000..f0aa5b16dba1a --- /dev/null +++ b/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/package.json @@ -0,0 +1,43 @@ +{ + "name": "@npmcli/name-from-folder", + "version": "2.0.0", + "files": [ + "bin/", + "lib/" + ], + "main": "lib/index.js", + "description": "Get the package name from a folder path", + "repository": { + "type": "git", + "url": "https://github.com/npm/name-from-folder.git" + }, + "author": "GitHub Inc.", + "license": "ISC", + "scripts": { + "test": "tap", + "snap": "tap", + "lint": "eslint \"**/*.js\"", + "postlint": "template-oss-check", + "template-oss-apply": "template-oss-apply --force", + "lintfix": "npm run lint -- --fix", + "posttest": "npm run lint" + }, + "devDependencies": { + "@npmcli/eslint-config": "^4.0.1", + "@npmcli/template-oss": "4.11.0", + "tap": "^16.3.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "templateOSS": { + "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", + "version": "4.11.0" + }, + "tap": { + "nyc-arg": [ + "--exclude", + "tap-snapshots/**" + ] + } +} diff --git a/node_modules/@npmcli/map-workspaces/package.json b/node_modules/@npmcli/map-workspaces/package.json index c8113cb25eb32..b967d974d31bf 100644 --- a/node_modules/@npmcli/map-workspaces/package.json +++ b/node_modules/@npmcli/map-workspaces/package.json @@ -1,6 +1,6 @@ { "name": "@npmcli/map-workspaces", - "version": "3.0.0", + "version": "3.0.1", "main": "lib/index.js", "files": [ "bin/", @@ -42,18 +42,18 @@ ] }, "devDependencies": { - "@npmcli/eslint-config": "^3.0.1", - "@npmcli/template-oss": "4.5.1", + "@npmcli/eslint-config": "^4.0.0", + "@npmcli/template-oss": "4.11.0", "tap": "^16.0.1" }, "dependencies": { - "@npmcli/name-from-folder": "^1.0.1", + "@npmcli/name-from-folder": "^2.0.0", "glob": "^8.0.1", "minimatch": "^5.0.1", "read-package-json-fast": "^3.0.0" }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.5.1" + "version": "4.11.0" } } diff --git a/package-lock.json b/package-lock.json index 0054bd46c99fc..159c9effb5d34 100644 --- a/package-lock.json +++ b/package-lock.json @@ -87,7 +87,7 @@ "@isaacs/string-locale-compare": "^1.1.0", "@npmcli/arborist": "^6.2.0", "@npmcli/config": "^6.1.1", - "@npmcli/map-workspaces": "^3.0.0", + "@npmcli/map-workspaces": "^3.0.1", "@npmcli/package-json": "^3.0.0", "@npmcli/run-script": "^6.0.0", "abbrev": "^2.0.0", @@ -14385,7 +14385,7 @@ "@isaacs/string-locale-compare": "^1.1.0", "@npmcli/fs": "^3.1.0", "@npmcli/installed-package-contents": "^2.0.0", - "@npmcli/map-workspaces": "^3.0.0", + "@npmcli/map-workspaces": "^3.0.1", "@npmcli/metavuln-calculator": "^5.0.0", "@npmcli/name-from-folder": "^1.0.1", "@npmcli/node-gyp": "^3.0.0", @@ -14439,7 +14439,7 @@ "version": "6.1.1", "license": "ISC", "dependencies": { - "@npmcli/map-workspaces": "^3.0.0", + "@npmcli/map-workspaces": "^3.0.1", "ini": "^3.0.0", "nopt": "^7.0.0", "proc-log": "^3.0.0", diff --git a/package.json b/package.json index bc9a4c4daafca..7f296b0176f8d 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "@isaacs/string-locale-compare": "^1.1.0", "@npmcli/arborist": "^6.2.0", "@npmcli/config": "^6.1.1", - "@npmcli/map-workspaces": "^3.0.0", + "@npmcli/map-workspaces": "^3.0.1", "@npmcli/package-json": "^3.0.0", "@npmcli/run-script": "^6.0.0", "abbrev": "^2.0.0", diff --git a/workspaces/arborist/package.json b/workspaces/arborist/package.json index fe58adaf578d6..78425f2af5231 100644 --- a/workspaces/arborist/package.json +++ b/workspaces/arborist/package.json @@ -6,7 +6,7 @@ "@isaacs/string-locale-compare": "^1.1.0", "@npmcli/fs": "^3.1.0", "@npmcli/installed-package-contents": "^2.0.0", - "@npmcli/map-workspaces": "^3.0.0", + "@npmcli/map-workspaces": "^3.0.1", "@npmcli/metavuln-calculator": "^5.0.0", "@npmcli/name-from-folder": "^1.0.1", "@npmcli/node-gyp": "^3.0.0", diff --git a/workspaces/config/package.json b/workspaces/config/package.json index 09e28f556da7b..dec63b58c9888 100644 --- a/workspaces/config/package.json +++ b/workspaces/config/package.json @@ -37,7 +37,7 @@ "tap": "^16.3.2" }, "dependencies": { - "@npmcli/map-workspaces": "^3.0.0", + "@npmcli/map-workspaces": "^3.0.1", "ini": "^3.0.0", "nopt": "^7.0.0", "proc-log": "^3.0.0", From 395b90b03c216298f4e6075cdb91b7703d1007ed Mon Sep 17 00:00:00 2001 From: Nathan Fritz Date: Wed, 1 Feb 2023 14:58:28 -0800 Subject: [PATCH 3/7] deps: @npmcli/name-from-folder@2.0.0 --- node_modules/.gitignore | 5 --- .../@npmcli/name-from-folder/LICENSE | 15 ------- .../@npmcli/name-from-folder/package.json | 43 ------------------- .../@npmcli/name-from-folder/index.js | 7 --- .../name-from-folder/lib/index.js | 0 .../@npmcli/name-from-folder/package.json | 38 +++++++++++----- package-lock.json | 20 ++++----- package.json | 2 +- workspaces/arborist/package.json | 2 +- 9 files changed, 37 insertions(+), 95 deletions(-) delete mode 100644 node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/LICENSE delete mode 100644 node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/package.json delete mode 100644 node_modules/@npmcli/name-from-folder/index.js rename node_modules/@npmcli/{map-workspaces/node_modules/@npmcli => }/name-from-folder/lib/index.js (100%) diff --git a/node_modules/.gitignore b/node_modules/.gitignore index 324d4d592a044..1a8e77b91f589 100644 --- a/node_modules/.gitignore +++ b/node_modules/.gitignore @@ -21,11 +21,6 @@ !/@npmcli/git !/@npmcli/installed-package-contents !/@npmcli/map-workspaces -!/@npmcli/map-workspaces/node_modules/ -/@npmcli/map-workspaces/node_modules/* -!/@npmcli/map-workspaces/node_modules/@npmcli/ -/@npmcli/map-workspaces/node_modules/@npmcli/* -!/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder !/@npmcli/metavuln-calculator !/@npmcli/name-from-folder !/@npmcli/node-gyp diff --git a/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/LICENSE b/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/LICENSE deleted file mode 100644 index d24a9fca761c8..0000000000000 --- a/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/LICENSE +++ /dev/null @@ -1,15 +0,0 @@ -The ISC License - -Copyright npm, Inc. - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND NPM DISCLAIMS ALL WARRANTIES WITH REGARD -TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS. IN NO EVENT SHALL NPM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS -ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. diff --git a/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/package.json b/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/package.json deleted file mode 100644 index f0aa5b16dba1a..0000000000000 --- a/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/package.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "name": "@npmcli/name-from-folder", - "version": "2.0.0", - "files": [ - "bin/", - "lib/" - ], - "main": "lib/index.js", - "description": "Get the package name from a folder path", - "repository": { - "type": "git", - "url": "https://github.com/npm/name-from-folder.git" - }, - "author": "GitHub Inc.", - "license": "ISC", - "scripts": { - "test": "tap", - "snap": "tap", - "lint": "eslint \"**/*.js\"", - "postlint": "template-oss-check", - "template-oss-apply": "template-oss-apply --force", - "lintfix": "npm run lint -- --fix", - "posttest": "npm run lint" - }, - "devDependencies": { - "@npmcli/eslint-config": "^4.0.1", - "@npmcli/template-oss": "4.11.0", - "tap": "^16.3.2" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "templateOSS": { - "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.11.0" - }, - "tap": { - "nyc-arg": [ - "--exclude", - "tap-snapshots/**" - ] - } -} diff --git a/node_modules/@npmcli/name-from-folder/index.js b/node_modules/@npmcli/name-from-folder/index.js deleted file mode 100644 index afb1dbb76297f..0000000000000 --- a/node_modules/@npmcli/name-from-folder/index.js +++ /dev/null @@ -1,7 +0,0 @@ -const { basename, dirname } = require('path') - -const getName = (parent, base) => - parent.charAt(0) === '@' ? `${parent}/${base}` : base - -module.exports = dir => dir ? getName(basename(dirname(dir)), basename(dir)) - : false diff --git a/node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/lib/index.js b/node_modules/@npmcli/name-from-folder/lib/index.js similarity index 100% rename from node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder/lib/index.js rename to node_modules/@npmcli/name-from-folder/lib/index.js diff --git a/node_modules/@npmcli/name-from-folder/package.json b/node_modules/@npmcli/name-from-folder/package.json index 9569b4e66e90c..f0aa5b16dba1a 100644 --- a/node_modules/@npmcli/name-from-folder/package.json +++ b/node_modules/@npmcli/name-from-folder/package.json @@ -1,27 +1,43 @@ { "name": "@npmcli/name-from-folder", - "version": "1.0.1", + "version": "2.0.0", "files": [ - "index.js" + "bin/", + "lib/" ], + "main": "lib/index.js", "description": "Get the package name from a folder path", "repository": { "type": "git", - "url": "git+https://github.com/npm/name-from-folder" + "url": "https://github.com/npm/name-from-folder.git" }, - "author": "Isaac Z. Schlueter (https://izs.me)", + "author": "GitHub Inc.", "license": "ISC", "scripts": { "test": "tap", "snap": "tap", - "preversion": "npm test", - "postversion": "npm publish", - "prepublishOnly": "git push origin --follow-tags" - }, - "tap": { - "check-coverage": true + "lint": "eslint \"**/*.js\"", + "postlint": "template-oss-check", + "template-oss-apply": "template-oss-apply --force", + "lintfix": "npm run lint -- --fix", + "posttest": "npm run lint" }, "devDependencies": { - "tap": "^14.10.7" + "@npmcli/eslint-config": "^4.0.1", + "@npmcli/template-oss": "4.11.0", + "tap": "^16.3.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "templateOSS": { + "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", + "version": "4.11.0" + }, + "tap": { + "nyc-arg": [ + "--exclude", + "tap-snapshots/**" + ] } } diff --git a/package-lock.json b/package-lock.json index 159c9effb5d34..658f5ce48685b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2177,15 +2177,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/@npmcli/map-workspaces/node_modules/@npmcli/name-from-folder": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-2.0.0.tgz", - "integrity": "sha512-pwK+BfEBZJbKdNYpHHRTNBwBoqrN/iIMO0AiGvYsp3Hoaq0WbgGSWQR6SCldZovoDpY3yje5lkFUe6gsDgJ2vg==", - "inBundle": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/@npmcli/metavuln-calculator": { "version": "5.0.0", "license": "ISC", @@ -2204,8 +2195,13 @@ "link": true }, "node_modules/@npmcli/name-from-folder": { - "version": "1.0.1", - "license": "ISC" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-2.0.0.tgz", + "integrity": "sha512-pwK+BfEBZJbKdNYpHHRTNBwBoqrN/iIMO0AiGvYsp3Hoaq0WbgGSWQR6SCldZovoDpY3yje5lkFUe6gsDgJ2vg==", + "inBundle": true, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } }, "node_modules/@npmcli/node-gyp": { "version": "3.0.0", @@ -14387,7 +14383,7 @@ "@npmcli/installed-package-contents": "^2.0.0", "@npmcli/map-workspaces": "^3.0.1", "@npmcli/metavuln-calculator": "^5.0.0", - "@npmcli/name-from-folder": "^1.0.1", + "@npmcli/name-from-folder": "^2.0.0", "@npmcli/node-gyp": "^3.0.0", "@npmcli/package-json": "^3.0.0", "@npmcli/query": "^3.0.0", diff --git a/package.json b/package.json index 7f296b0176f8d..f6d4193ba674b 100644 --- a/package.json +++ b/package.json @@ -250,7 +250,7 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.11.1", + "version": "4.11.3", "content": "./scripts/template-oss/root.js" }, "license": "Artistic-2.0", diff --git a/workspaces/arborist/package.json b/workspaces/arborist/package.json index 78425f2af5231..a10277a1d19f3 100644 --- a/workspaces/arborist/package.json +++ b/workspaces/arborist/package.json @@ -8,7 +8,7 @@ "@npmcli/installed-package-contents": "^2.0.0", "@npmcli/map-workspaces": "^3.0.1", "@npmcli/metavuln-calculator": "^5.0.0", - "@npmcli/name-from-folder": "^1.0.1", + "@npmcli/name-from-folder": "^2.0.0", "@npmcli/node-gyp": "^3.0.0", "@npmcli/package-json": "^3.0.0", "@npmcli/query": "^3.0.0", From f346ea9ee9035c79ffea5e9bcf091b7389d90555 Mon Sep 17 00:00:00 2001 From: Nathan Fritz Date: Wed, 1 Feb 2023 15:18:19 -0800 Subject: [PATCH 4/7] deps: @npmcli/promise-spawn@6.0.2 --- node_modules/@npmcli/promise-spawn/lib/index.js | 2 +- node_modules/@npmcli/promise-spawn/package.json | 8 ++++---- package-lock.json | 9 +++++---- package.json | 2 +- smoke-tests/package.json | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/node_modules/@npmcli/promise-spawn/lib/index.js b/node_modules/@npmcli/promise-spawn/lib/index.js index 1d422045d558c..571ff6b9169c9 100644 --- a/node_modules/@npmcli/promise-spawn/lib/index.js +++ b/node_modules/@npmcli/promise-spawn/lib/index.js @@ -131,7 +131,7 @@ const open = (_args, opts = {}, extra = {}) => { let platform = process.platform // process.platform === 'linux' may actually indicate WSL, if that's the case // we want to treat things as win32 anyway so the host can open the argument - if (platform === 'linux' && os.release().includes('Microsoft')) { + if (platform === 'linux' && os.release().toLowerCase().includes('microsoft')) { platform = 'win32' } diff --git a/node_modules/@npmcli/promise-spawn/package.json b/node_modules/@npmcli/promise-spawn/package.json index c21e84fe83599..2080d9f5be9f0 100644 --- a/node_modules/@npmcli/promise-spawn/package.json +++ b/node_modules/@npmcli/promise-spawn/package.json @@ -1,6 +1,6 @@ { "name": "@npmcli/promise-spawn", - "version": "6.0.1", + "version": "6.0.2", "files": [ "bin/", "lib/" @@ -32,8 +32,8 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.8.0", - "minipass": "^3.1.1", + "@npmcli/template-oss": "4.11.0", + "minipass": "^4.0.0", "spawk": "^1.7.1", "tap": "^16.0.1" }, @@ -42,7 +42,7 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.8.0" + "version": "4.11.0" }, "dependencies": { "which": "^3.0.0" diff --git a/package-lock.json b/package-lock.json index 658f5ce48685b..9d56ac20b585a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -162,7 +162,7 @@ "@npmcli/fs": "^3.1.0", "@npmcli/git": "^4.0.1", "@npmcli/mock-registry": "^1.0.0", - "@npmcli/promise-spawn": "^6.0.1", + "@npmcli/promise-spawn": "^6.0.2", "@npmcli/template-oss": "4.11.3", "licensee": "^10.0.0", "nock": "^13.2.4", @@ -2223,9 +2223,10 @@ } }, "node_modules/@npmcli/promise-spawn": { - "version": "6.0.1", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz", + "integrity": "sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==", "inBundle": true, - "license": "ISC", "dependencies": { "which": "^3.0.0" }, @@ -14361,7 +14362,7 @@ "devDependencies": { "@npmcli/eslint-config": "^4.0.0", "@npmcli/mock-registry": "^1.0.0", - "@npmcli/promise-spawn": "^6.0.1", + "@npmcli/promise-spawn": "^6.0.2", "@npmcli/template-oss": "4.11.3", "http-proxy": "^1.18.1", "just-extend": "^6.1.1", diff --git a/package.json b/package.json index f6d4193ba674b..4d7717e38edd2 100644 --- a/package.json +++ b/package.json @@ -195,7 +195,7 @@ "@npmcli/fs": "^3.1.0", "@npmcli/git": "^4.0.1", "@npmcli/mock-registry": "^1.0.0", - "@npmcli/promise-spawn": "^6.0.1", + "@npmcli/promise-spawn": "^6.0.2", "@npmcli/template-oss": "4.11.3", "licensee": "^10.0.0", "nock": "^13.2.4", diff --git a/smoke-tests/package.json b/smoke-tests/package.json index 3505614b3b6da..37bf125f5be0c 100644 --- a/smoke-tests/package.json +++ b/smoke-tests/package.json @@ -20,7 +20,7 @@ "devDependencies": { "@npmcli/eslint-config": "^4.0.0", "@npmcli/mock-registry": "^1.0.0", - "@npmcli/promise-spawn": "^6.0.1", + "@npmcli/promise-spawn": "^6.0.2", "@npmcli/template-oss": "4.11.3", "http-proxy": "^1.18.1", "just-extend": "^6.1.1", From cb4394ed5c475d8a13570e37abda9e5ac50ca7cb Mon Sep 17 00:00:00 2001 From: Nathan Fritz Date: Wed, 1 Feb 2023 15:21:53 -0800 Subject: [PATCH 5/7] deps: cacache@17.0.4 --- node_modules/.gitignore | 3 + .../cacache/node_modules/fs-minipass/LICENSE | 15 + .../node_modules/fs-minipass/lib/index.js | 443 ++++++++++++++++++ .../node_modules/fs-minipass/package.json | 53 +++ node_modules/cacache/package.json | 8 +- package-lock.json | 24 +- package.json | 2 +- workspaces/arborist/package.json | 2 +- 8 files changed, 538 insertions(+), 12 deletions(-) create mode 100644 node_modules/cacache/node_modules/fs-minipass/LICENSE create mode 100644 node_modules/cacache/node_modules/fs-minipass/lib/index.js create mode 100644 node_modules/cacache/node_modules/fs-minipass/package.json diff --git a/node_modules/.gitignore b/node_modules/.gitignore index 1a8e77b91f589..3de9a6f67f260 100644 --- a/node_modules/.gitignore +++ b/node_modules/.gitignore @@ -52,6 +52,9 @@ !/buffer !/builtins !/cacache +!/cacache/node_modules/ +/cacache/node_modules/* +!/cacache/node_modules/fs-minipass !/chalk !/chownr !/ci-info diff --git a/node_modules/cacache/node_modules/fs-minipass/LICENSE b/node_modules/cacache/node_modules/fs-minipass/LICENSE new file mode 100644 index 0000000000000..19129e315fe59 --- /dev/null +++ b/node_modules/cacache/node_modules/fs-minipass/LICENSE @@ -0,0 +1,15 @@ +The ISC License + +Copyright (c) Isaac Z. Schlueter and Contributors + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/node_modules/cacache/node_modules/fs-minipass/lib/index.js b/node_modules/cacache/node_modules/fs-minipass/lib/index.js new file mode 100644 index 0000000000000..f9d5082a4d642 --- /dev/null +++ b/node_modules/cacache/node_modules/fs-minipass/lib/index.js @@ -0,0 +1,443 @@ +'use strict' +const MiniPass = require('minipass') +const EE = require('events').EventEmitter +const fs = require('fs') + +const writev = fs.writev + +const _autoClose = Symbol('_autoClose') +const _close = Symbol('_close') +const _ended = Symbol('_ended') +const _fd = Symbol('_fd') +const _finished = Symbol('_finished') +const _flags = Symbol('_flags') +const _flush = Symbol('_flush') +const _handleChunk = Symbol('_handleChunk') +const _makeBuf = Symbol('_makeBuf') +const _mode = Symbol('_mode') +const _needDrain = Symbol('_needDrain') +const _onerror = Symbol('_onerror') +const _onopen = Symbol('_onopen') +const _onread = Symbol('_onread') +const _onwrite = Symbol('_onwrite') +const _open = Symbol('_open') +const _path = Symbol('_path') +const _pos = Symbol('_pos') +const _queue = Symbol('_queue') +const _read = Symbol('_read') +const _readSize = Symbol('_readSize') +const _reading = Symbol('_reading') +const _remain = Symbol('_remain') +const _size = Symbol('_size') +const _write = Symbol('_write') +const _writing = Symbol('_writing') +const _defaultFlag = Symbol('_defaultFlag') +const _errored = Symbol('_errored') + +class ReadStream extends MiniPass { + constructor (path, opt) { + opt = opt || {} + super(opt) + + this.readable = true + this.writable = false + + if (typeof path !== 'string') { + throw new TypeError('path must be a string') + } + + this[_errored] = false + this[_fd] = typeof opt.fd === 'number' ? opt.fd : null + this[_path] = path + this[_readSize] = opt.readSize || 16 * 1024 * 1024 + this[_reading] = false + this[_size] = typeof opt.size === 'number' ? opt.size : Infinity + this[_remain] = this[_size] + this[_autoClose] = typeof opt.autoClose === 'boolean' ? + opt.autoClose : true + + if (typeof this[_fd] === 'number') { + this[_read]() + } else { + this[_open]() + } + } + + get fd () { + return this[_fd] + } + + get path () { + return this[_path] + } + + write () { + throw new TypeError('this is a readable stream') + } + + end () { + throw new TypeError('this is a readable stream') + } + + [_open] () { + fs.open(this[_path], 'r', (er, fd) => this[_onopen](er, fd)) + } + + [_onopen] (er, fd) { + if (er) { + this[_onerror](er) + } else { + this[_fd] = fd + this.emit('open', fd) + this[_read]() + } + } + + [_makeBuf] () { + return Buffer.allocUnsafe(Math.min(this[_readSize], this[_remain])) + } + + [_read] () { + if (!this[_reading]) { + this[_reading] = true + const buf = this[_makeBuf]() + /* istanbul ignore if */ + if (buf.length === 0) { + return process.nextTick(() => this[_onread](null, 0, buf)) + } + fs.read(this[_fd], buf, 0, buf.length, null, (er, br, b) => + this[_onread](er, br, b)) + } + } + + [_onread] (er, br, buf) { + this[_reading] = false + if (er) { + this[_onerror](er) + } else if (this[_handleChunk](br, buf)) { + this[_read]() + } + } + + [_close] () { + if (this[_autoClose] && typeof this[_fd] === 'number') { + const fd = this[_fd] + this[_fd] = null + fs.close(fd, er => er ? this.emit('error', er) : this.emit('close')) + } + } + + [_onerror] (er) { + this[_reading] = true + this[_close]() + this.emit('error', er) + } + + [_handleChunk] (br, buf) { + let ret = false + // no effect if infinite + this[_remain] -= br + if (br > 0) { + ret = super.write(br < buf.length ? buf.slice(0, br) : buf) + } + + if (br === 0 || this[_remain] <= 0) { + ret = false + this[_close]() + super.end() + } + + return ret + } + + emit (ev, data) { + switch (ev) { + case 'prefinish': + case 'finish': + break + + case 'drain': + if (typeof this[_fd] === 'number') { + this[_read]() + } + break + + case 'error': + if (this[_errored]) { + return + } + this[_errored] = true + return super.emit(ev, data) + + default: + return super.emit(ev, data) + } + } +} + +class ReadStreamSync extends ReadStream { + [_open] () { + let threw = true + try { + this[_onopen](null, fs.openSync(this[_path], 'r')) + threw = false + } finally { + if (threw) { + this[_close]() + } + } + } + + [_read] () { + let threw = true + try { + if (!this[_reading]) { + this[_reading] = true + do { + const buf = this[_makeBuf]() + /* istanbul ignore next */ + const br = buf.length === 0 ? 0 + : fs.readSync(this[_fd], buf, 0, buf.length, null) + if (!this[_handleChunk](br, buf)) { + break + } + } while (true) + this[_reading] = false + } + threw = false + } finally { + if (threw) { + this[_close]() + } + } + } + + [_close] () { + if (this[_autoClose] && typeof this[_fd] === 'number') { + const fd = this[_fd] + this[_fd] = null + fs.closeSync(fd) + this.emit('close') + } + } +} + +class WriteStream extends EE { + constructor (path, opt) { + opt = opt || {} + super(opt) + this.readable = false + this.writable = true + this[_errored] = false + this[_writing] = false + this[_ended] = false + this[_needDrain] = false + this[_queue] = [] + this[_path] = path + this[_fd] = typeof opt.fd === 'number' ? opt.fd : null + this[_mode] = opt.mode === undefined ? 0o666 : opt.mode + this[_pos] = typeof opt.start === 'number' ? opt.start : null + this[_autoClose] = typeof opt.autoClose === 'boolean' ? + opt.autoClose : true + + // truncating makes no sense when writing into the middle + const defaultFlag = this[_pos] !== null ? 'r+' : 'w' + this[_defaultFlag] = opt.flags === undefined + this[_flags] = this[_defaultFlag] ? defaultFlag : opt.flags + + if (this[_fd] === null) { + this[_open]() + } + } + + emit (ev, data) { + if (ev === 'error') { + if (this[_errored]) { + return + } + this[_errored] = true + } + return super.emit(ev, data) + } + + get fd () { + return this[_fd] + } + + get path () { + return this[_path] + } + + [_onerror] (er) { + this[_close]() + this[_writing] = true + this.emit('error', er) + } + + [_open] () { + fs.open(this[_path], this[_flags], this[_mode], + (er, fd) => this[_onopen](er, fd)) + } + + [_onopen] (er, fd) { + if (this[_defaultFlag] && + this[_flags] === 'r+' && + er && er.code === 'ENOENT') { + this[_flags] = 'w' + this[_open]() + } else if (er) { + this[_onerror](er) + } else { + this[_fd] = fd + this.emit('open', fd) + if (!this[_writing]) { + this[_flush]() + } + } + } + + end (buf, enc) { + if (buf) { + this.write(buf, enc) + } + + this[_ended] = true + + // synthetic after-write logic, where drain/finish live + if (!this[_writing] && !this[_queue].length && + typeof this[_fd] === 'number') { + this[_onwrite](null, 0) + } + return this + } + + write (buf, enc) { + if (typeof buf === 'string') { + buf = Buffer.from(buf, enc) + } + + if (this[_ended]) { + this.emit('error', new Error('write() after end()')) + return false + } + + if (this[_fd] === null || this[_writing] || this[_queue].length) { + this[_queue].push(buf) + this[_needDrain] = true + return false + } + + this[_writing] = true + this[_write](buf) + return true + } + + [_write] (buf) { + fs.write(this[_fd], buf, 0, buf.length, this[_pos], (er, bw) => + this[_onwrite](er, bw)) + } + + [_onwrite] (er, bw) { + if (er) { + this[_onerror](er) + } else { + if (this[_pos] !== null) { + this[_pos] += bw + } + if (this[_queue].length) { + this[_flush]() + } else { + this[_writing] = false + + if (this[_ended] && !this[_finished]) { + this[_finished] = true + this[_close]() + this.emit('finish') + } else if (this[_needDrain]) { + this[_needDrain] = false + this.emit('drain') + } + } + } + } + + [_flush] () { + if (this[_queue].length === 0) { + if (this[_ended]) { + this[_onwrite](null, 0) + } + } else if (this[_queue].length === 1) { + this[_write](this[_queue].pop()) + } else { + const iovec = this[_queue] + this[_queue] = [] + writev(this[_fd], iovec, this[_pos], + (er, bw) => this[_onwrite](er, bw)) + } + } + + [_close] () { + if (this[_autoClose] && typeof this[_fd] === 'number') { + const fd = this[_fd] + this[_fd] = null + fs.close(fd, er => er ? this.emit('error', er) : this.emit('close')) + } + } +} + +class WriteStreamSync extends WriteStream { + [_open] () { + let fd + // only wrap in a try{} block if we know we'll retry, to avoid + // the rethrow obscuring the error's source frame in most cases. + if (this[_defaultFlag] && this[_flags] === 'r+') { + try { + fd = fs.openSync(this[_path], this[_flags], this[_mode]) + } catch (er) { + if (er.code === 'ENOENT') { + this[_flags] = 'w' + return this[_open]() + } else { + throw er + } + } + } else { + fd = fs.openSync(this[_path], this[_flags], this[_mode]) + } + + this[_onopen](null, fd) + } + + [_close] () { + if (this[_autoClose] && typeof this[_fd] === 'number') { + const fd = this[_fd] + this[_fd] = null + fs.closeSync(fd) + this.emit('close') + } + } + + [_write] (buf) { + // throw the original, but try to close if it fails + let threw = true + try { + this[_onwrite](null, + fs.writeSync(this[_fd], buf, 0, buf.length, this[_pos])) + threw = false + } finally { + if (threw) { + try { + this[_close]() + } catch { + // ok error + } + } + } + } +} + +exports.ReadStream = ReadStream +exports.ReadStreamSync = ReadStreamSync + +exports.WriteStream = WriteStream +exports.WriteStreamSync = WriteStreamSync diff --git a/node_modules/cacache/node_modules/fs-minipass/package.json b/node_modules/cacache/node_modules/fs-minipass/package.json new file mode 100644 index 0000000000000..cba0d0cbc2dd8 --- /dev/null +++ b/node_modules/cacache/node_modules/fs-minipass/package.json @@ -0,0 +1,53 @@ +{ + "name": "fs-minipass", + "version": "3.0.1", + "main": "lib/index.js", + "scripts": { + "test": "tap", + "lint": "eslint \"**/*.js\"", + "postlint": "template-oss-check", + "template-oss-apply": "template-oss-apply --force", + "lintfix": "npm run lint -- --fix", + "snap": "tap", + "posttest": "npm run lint" + }, + "keywords": [], + "author": "GitHub Inc.", + "license": "ISC", + "repository": { + "type": "git", + "url": "https://github.com/npm/fs-minipass.git" + }, + "bugs": { + "url": "https://github.com/npm/fs-minipass/issues" + }, + "homepage": "https://github.com/npm/fs-minipass#readme", + "description": "fs read and write streams based on minipass", + "dependencies": { + "minipass": "^4.0.0" + }, + "devDependencies": { + "@npmcli/eslint-config": "^4.0.1", + "@npmcli/template-oss": "4.11.3", + "mutate-fs": "^2.1.1", + "tap": "^16.3.2" + }, + "files": [ + "bin/", + "lib/" + ], + "tap": { + "check-coverage": true, + "nyc-arg": [ + "--exclude", + "tap-snapshots/**" + ] + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "templateOSS": { + "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", + "version": "4.11.3" + } +} diff --git a/node_modules/cacache/package.json b/node_modules/cacache/package.json index 6ab0d2a9dd8a3..189a19bf31597 100644 --- a/node_modules/cacache/package.json +++ b/node_modules/cacache/package.json @@ -1,6 +1,6 @@ { "name": "cacache", - "version": "17.0.3", + "version": "17.0.4", "cache-version": { "content": "2", "index": "5" @@ -46,7 +46,7 @@ "license": "ISC", "dependencies": { "@npmcli/fs": "^3.1.0", - "fs-minipass": "^2.1.0", + "fs-minipass": "^3.0.0", "glob": "^8.0.1", "lru-cache": "^7.7.1", "minipass": "^4.0.0", @@ -61,7 +61,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.10.0", + "@npmcli/template-oss": "4.11.0", "tap": "^16.0.0" }, "engines": { @@ -70,7 +70,7 @@ "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", "windowsCI": false, - "version": "4.10.0" + "version": "4.11.0" }, "author": "GitHub Inc.", "tap": { diff --git a/package-lock.json b/package-lock.json index 9d56ac20b585a..11d78d934de9f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -92,7 +92,7 @@ "@npmcli/run-script": "^6.0.0", "abbrev": "^2.0.0", "archy": "~1.0.0", - "cacache": "^17.0.3", + "cacache": "^17.0.4", "chalk": "^4.1.2", "ci-info": "^3.7.0", "cli-columns": "^4.0.0", @@ -3108,13 +3108,13 @@ } }, "node_modules/cacache": { - "version": "17.0.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.0.3.tgz", - "integrity": "sha512-pwsIK/grdM0cHpfVaNFxMdzElBtLJGsVPE+JnxqXP1l40O01Z1mfDE8MbRTuwomGq/UwEtGisOylutOEVJxEqg==", + "version": "17.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.0.4.tgz", + "integrity": "sha512-Z/nL3gU+zTUjz5pCA5vVjYM8pmaw2kxM7JEiE0fv3w77Wj+sFbi70CrBruUWH0uNcEdvLDixFpgA2JM4F4DBjA==", "inBundle": true, "dependencies": { "@npmcli/fs": "^3.1.0", - "fs-minipass": "^2.1.0", + "fs-minipass": "^3.0.0", "glob": "^8.0.1", "lru-cache": "^7.7.1", "minipass": "^4.0.0", @@ -3131,6 +3131,18 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/cacache/node_modules/fs-minipass": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.1.tgz", + "integrity": "sha512-MhaJDcFRTuLidHrIttu0RDGyyXs/IYHVmlcxfLAEFIWjc1vdLAkdwT7Ace2u7DbitWC0toKMl5eJZRYNVreIMw==", + "inBundle": true, + "dependencies": { + "minipass": "^4.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/caching-transform": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz", @@ -14390,7 +14402,7 @@ "@npmcli/query": "^3.0.0", "@npmcli/run-script": "^6.0.0", "bin-links": "^4.0.1", - "cacache": "^17.0.3", + "cacache": "^17.0.4", "common-ancestor-path": "^1.0.1", "hosted-git-info": "^6.1.1", "json-parse-even-better-errors": "^3.0.0", diff --git a/package.json b/package.json index 4d7717e38edd2..1953dab2d1dbf 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "@npmcli/run-script": "^6.0.0", "abbrev": "^2.0.0", "archy": "~1.0.0", - "cacache": "^17.0.3", + "cacache": "^17.0.4", "chalk": "^4.1.2", "ci-info": "^3.7.0", "cli-columns": "^4.0.0", diff --git a/workspaces/arborist/package.json b/workspaces/arborist/package.json index a10277a1d19f3..72ba4af4262ef 100644 --- a/workspaces/arborist/package.json +++ b/workspaces/arborist/package.json @@ -14,7 +14,7 @@ "@npmcli/query": "^3.0.0", "@npmcli/run-script": "^6.0.0", "bin-links": "^4.0.1", - "cacache": "^17.0.3", + "cacache": "^17.0.4", "common-ancestor-path": "^1.0.1", "hosted-git-info": "^6.1.1", "json-parse-even-better-errors": "^3.0.0", From 13c46d20f44370d702bd3c1cb377068df09d64d0 Mon Sep 17 00:00:00 2001 From: Nathan Fritz Date: Wed, 1 Feb 2023 15:30:13 -0800 Subject: [PATCH 6/7] deps: pacote@15.0.8 --- mock-registry/package.json | 2 +- node_modules/.gitignore | 3 + .../pacote/node_modules/fs-minipass/LICENSE | 15 + .../node_modules/fs-minipass/lib/index.js | 443 ++++++++++++++++++ .../node_modules/fs-minipass/package.json | 53 +++ node_modules/pacote/package.json | 8 +- package-lock.json | 32 +- package.json | 2 +- workspaces/arborist/package.json | 2 +- workspaces/libnpmdiff/package.json | 2 +- workspaces/libnpmexec/package.json | 2 +- workspaces/libnpmpack/package.json | 2 +- 12 files changed, 546 insertions(+), 20 deletions(-) create mode 100644 node_modules/pacote/node_modules/fs-minipass/LICENSE create mode 100644 node_modules/pacote/node_modules/fs-minipass/lib/index.js create mode 100644 node_modules/pacote/node_modules/fs-minipass/package.json diff --git a/mock-registry/package.json b/mock-registry/package.json index d381765da5c1c..9d5dce996185b 100644 --- a/mock-registry/package.json +++ b/mock-registry/package.json @@ -49,7 +49,7 @@ "@npmcli/template-oss": "4.11.3", "nock": "^13.2.9", "npm-package-arg": "^10.1.0", - "pacote": "^15.0.7", + "pacote": "^15.0.8", "tap": "^16.3.2" } } diff --git a/node_modules/.gitignore b/node_modules/.gitignore index 3de9a6f67f260..76e9c118ffaa2 100644 --- a/node_modules/.gitignore +++ b/node_modules/.gitignore @@ -214,6 +214,9 @@ !/once !/p-map !/pacote +!/pacote/node_modules/ +/pacote/node_modules/* +!/pacote/node_modules/fs-minipass !/parse-conflict-json !/path-is-absolute !/postcss-selector-parser diff --git a/node_modules/pacote/node_modules/fs-minipass/LICENSE b/node_modules/pacote/node_modules/fs-minipass/LICENSE new file mode 100644 index 0000000000000..19129e315fe59 --- /dev/null +++ b/node_modules/pacote/node_modules/fs-minipass/LICENSE @@ -0,0 +1,15 @@ +The ISC License + +Copyright (c) Isaac Z. Schlueter and Contributors + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/node_modules/pacote/node_modules/fs-minipass/lib/index.js b/node_modules/pacote/node_modules/fs-minipass/lib/index.js new file mode 100644 index 0000000000000..f9d5082a4d642 --- /dev/null +++ b/node_modules/pacote/node_modules/fs-minipass/lib/index.js @@ -0,0 +1,443 @@ +'use strict' +const MiniPass = require('minipass') +const EE = require('events').EventEmitter +const fs = require('fs') + +const writev = fs.writev + +const _autoClose = Symbol('_autoClose') +const _close = Symbol('_close') +const _ended = Symbol('_ended') +const _fd = Symbol('_fd') +const _finished = Symbol('_finished') +const _flags = Symbol('_flags') +const _flush = Symbol('_flush') +const _handleChunk = Symbol('_handleChunk') +const _makeBuf = Symbol('_makeBuf') +const _mode = Symbol('_mode') +const _needDrain = Symbol('_needDrain') +const _onerror = Symbol('_onerror') +const _onopen = Symbol('_onopen') +const _onread = Symbol('_onread') +const _onwrite = Symbol('_onwrite') +const _open = Symbol('_open') +const _path = Symbol('_path') +const _pos = Symbol('_pos') +const _queue = Symbol('_queue') +const _read = Symbol('_read') +const _readSize = Symbol('_readSize') +const _reading = Symbol('_reading') +const _remain = Symbol('_remain') +const _size = Symbol('_size') +const _write = Symbol('_write') +const _writing = Symbol('_writing') +const _defaultFlag = Symbol('_defaultFlag') +const _errored = Symbol('_errored') + +class ReadStream extends MiniPass { + constructor (path, opt) { + opt = opt || {} + super(opt) + + this.readable = true + this.writable = false + + if (typeof path !== 'string') { + throw new TypeError('path must be a string') + } + + this[_errored] = false + this[_fd] = typeof opt.fd === 'number' ? opt.fd : null + this[_path] = path + this[_readSize] = opt.readSize || 16 * 1024 * 1024 + this[_reading] = false + this[_size] = typeof opt.size === 'number' ? opt.size : Infinity + this[_remain] = this[_size] + this[_autoClose] = typeof opt.autoClose === 'boolean' ? + opt.autoClose : true + + if (typeof this[_fd] === 'number') { + this[_read]() + } else { + this[_open]() + } + } + + get fd () { + return this[_fd] + } + + get path () { + return this[_path] + } + + write () { + throw new TypeError('this is a readable stream') + } + + end () { + throw new TypeError('this is a readable stream') + } + + [_open] () { + fs.open(this[_path], 'r', (er, fd) => this[_onopen](er, fd)) + } + + [_onopen] (er, fd) { + if (er) { + this[_onerror](er) + } else { + this[_fd] = fd + this.emit('open', fd) + this[_read]() + } + } + + [_makeBuf] () { + return Buffer.allocUnsafe(Math.min(this[_readSize], this[_remain])) + } + + [_read] () { + if (!this[_reading]) { + this[_reading] = true + const buf = this[_makeBuf]() + /* istanbul ignore if */ + if (buf.length === 0) { + return process.nextTick(() => this[_onread](null, 0, buf)) + } + fs.read(this[_fd], buf, 0, buf.length, null, (er, br, b) => + this[_onread](er, br, b)) + } + } + + [_onread] (er, br, buf) { + this[_reading] = false + if (er) { + this[_onerror](er) + } else if (this[_handleChunk](br, buf)) { + this[_read]() + } + } + + [_close] () { + if (this[_autoClose] && typeof this[_fd] === 'number') { + const fd = this[_fd] + this[_fd] = null + fs.close(fd, er => er ? this.emit('error', er) : this.emit('close')) + } + } + + [_onerror] (er) { + this[_reading] = true + this[_close]() + this.emit('error', er) + } + + [_handleChunk] (br, buf) { + let ret = false + // no effect if infinite + this[_remain] -= br + if (br > 0) { + ret = super.write(br < buf.length ? buf.slice(0, br) : buf) + } + + if (br === 0 || this[_remain] <= 0) { + ret = false + this[_close]() + super.end() + } + + return ret + } + + emit (ev, data) { + switch (ev) { + case 'prefinish': + case 'finish': + break + + case 'drain': + if (typeof this[_fd] === 'number') { + this[_read]() + } + break + + case 'error': + if (this[_errored]) { + return + } + this[_errored] = true + return super.emit(ev, data) + + default: + return super.emit(ev, data) + } + } +} + +class ReadStreamSync extends ReadStream { + [_open] () { + let threw = true + try { + this[_onopen](null, fs.openSync(this[_path], 'r')) + threw = false + } finally { + if (threw) { + this[_close]() + } + } + } + + [_read] () { + let threw = true + try { + if (!this[_reading]) { + this[_reading] = true + do { + const buf = this[_makeBuf]() + /* istanbul ignore next */ + const br = buf.length === 0 ? 0 + : fs.readSync(this[_fd], buf, 0, buf.length, null) + if (!this[_handleChunk](br, buf)) { + break + } + } while (true) + this[_reading] = false + } + threw = false + } finally { + if (threw) { + this[_close]() + } + } + } + + [_close] () { + if (this[_autoClose] && typeof this[_fd] === 'number') { + const fd = this[_fd] + this[_fd] = null + fs.closeSync(fd) + this.emit('close') + } + } +} + +class WriteStream extends EE { + constructor (path, opt) { + opt = opt || {} + super(opt) + this.readable = false + this.writable = true + this[_errored] = false + this[_writing] = false + this[_ended] = false + this[_needDrain] = false + this[_queue] = [] + this[_path] = path + this[_fd] = typeof opt.fd === 'number' ? opt.fd : null + this[_mode] = opt.mode === undefined ? 0o666 : opt.mode + this[_pos] = typeof opt.start === 'number' ? opt.start : null + this[_autoClose] = typeof opt.autoClose === 'boolean' ? + opt.autoClose : true + + // truncating makes no sense when writing into the middle + const defaultFlag = this[_pos] !== null ? 'r+' : 'w' + this[_defaultFlag] = opt.flags === undefined + this[_flags] = this[_defaultFlag] ? defaultFlag : opt.flags + + if (this[_fd] === null) { + this[_open]() + } + } + + emit (ev, data) { + if (ev === 'error') { + if (this[_errored]) { + return + } + this[_errored] = true + } + return super.emit(ev, data) + } + + get fd () { + return this[_fd] + } + + get path () { + return this[_path] + } + + [_onerror] (er) { + this[_close]() + this[_writing] = true + this.emit('error', er) + } + + [_open] () { + fs.open(this[_path], this[_flags], this[_mode], + (er, fd) => this[_onopen](er, fd)) + } + + [_onopen] (er, fd) { + if (this[_defaultFlag] && + this[_flags] === 'r+' && + er && er.code === 'ENOENT') { + this[_flags] = 'w' + this[_open]() + } else if (er) { + this[_onerror](er) + } else { + this[_fd] = fd + this.emit('open', fd) + if (!this[_writing]) { + this[_flush]() + } + } + } + + end (buf, enc) { + if (buf) { + this.write(buf, enc) + } + + this[_ended] = true + + // synthetic after-write logic, where drain/finish live + if (!this[_writing] && !this[_queue].length && + typeof this[_fd] === 'number') { + this[_onwrite](null, 0) + } + return this + } + + write (buf, enc) { + if (typeof buf === 'string') { + buf = Buffer.from(buf, enc) + } + + if (this[_ended]) { + this.emit('error', new Error('write() after end()')) + return false + } + + if (this[_fd] === null || this[_writing] || this[_queue].length) { + this[_queue].push(buf) + this[_needDrain] = true + return false + } + + this[_writing] = true + this[_write](buf) + return true + } + + [_write] (buf) { + fs.write(this[_fd], buf, 0, buf.length, this[_pos], (er, bw) => + this[_onwrite](er, bw)) + } + + [_onwrite] (er, bw) { + if (er) { + this[_onerror](er) + } else { + if (this[_pos] !== null) { + this[_pos] += bw + } + if (this[_queue].length) { + this[_flush]() + } else { + this[_writing] = false + + if (this[_ended] && !this[_finished]) { + this[_finished] = true + this[_close]() + this.emit('finish') + } else if (this[_needDrain]) { + this[_needDrain] = false + this.emit('drain') + } + } + } + } + + [_flush] () { + if (this[_queue].length === 0) { + if (this[_ended]) { + this[_onwrite](null, 0) + } + } else if (this[_queue].length === 1) { + this[_write](this[_queue].pop()) + } else { + const iovec = this[_queue] + this[_queue] = [] + writev(this[_fd], iovec, this[_pos], + (er, bw) => this[_onwrite](er, bw)) + } + } + + [_close] () { + if (this[_autoClose] && typeof this[_fd] === 'number') { + const fd = this[_fd] + this[_fd] = null + fs.close(fd, er => er ? this.emit('error', er) : this.emit('close')) + } + } +} + +class WriteStreamSync extends WriteStream { + [_open] () { + let fd + // only wrap in a try{} block if we know we'll retry, to avoid + // the rethrow obscuring the error's source frame in most cases. + if (this[_defaultFlag] && this[_flags] === 'r+') { + try { + fd = fs.openSync(this[_path], this[_flags], this[_mode]) + } catch (er) { + if (er.code === 'ENOENT') { + this[_flags] = 'w' + return this[_open]() + } else { + throw er + } + } + } else { + fd = fs.openSync(this[_path], this[_flags], this[_mode]) + } + + this[_onopen](null, fd) + } + + [_close] () { + if (this[_autoClose] && typeof this[_fd] === 'number') { + const fd = this[_fd] + this[_fd] = null + fs.closeSync(fd) + this.emit('close') + } + } + + [_write] (buf) { + // throw the original, but try to close if it fails + let threw = true + try { + this[_onwrite](null, + fs.writeSync(this[_fd], buf, 0, buf.length, this[_pos])) + threw = false + } finally { + if (threw) { + try { + this[_close]() + } catch { + // ok error + } + } + } + } +} + +exports.ReadStream = ReadStream +exports.ReadStreamSync = ReadStreamSync + +exports.WriteStream = WriteStream +exports.WriteStreamSync = WriteStreamSync diff --git a/node_modules/pacote/node_modules/fs-minipass/package.json b/node_modules/pacote/node_modules/fs-minipass/package.json new file mode 100644 index 0000000000000..cba0d0cbc2dd8 --- /dev/null +++ b/node_modules/pacote/node_modules/fs-minipass/package.json @@ -0,0 +1,53 @@ +{ + "name": "fs-minipass", + "version": "3.0.1", + "main": "lib/index.js", + "scripts": { + "test": "tap", + "lint": "eslint \"**/*.js\"", + "postlint": "template-oss-check", + "template-oss-apply": "template-oss-apply --force", + "lintfix": "npm run lint -- --fix", + "snap": "tap", + "posttest": "npm run lint" + }, + "keywords": [], + "author": "GitHub Inc.", + "license": "ISC", + "repository": { + "type": "git", + "url": "https://github.com/npm/fs-minipass.git" + }, + "bugs": { + "url": "https://github.com/npm/fs-minipass/issues" + }, + "homepage": "https://github.com/npm/fs-minipass#readme", + "description": "fs read and write streams based on minipass", + "dependencies": { + "minipass": "^4.0.0" + }, + "devDependencies": { + "@npmcli/eslint-config": "^4.0.1", + "@npmcli/template-oss": "4.11.3", + "mutate-fs": "^2.1.1", + "tap": "^16.3.2" + }, + "files": [ + "bin/", + "lib/" + ], + "tap": { + "check-coverage": true, + "nyc-arg": [ + "--exclude", + "tap-snapshots/**" + ] + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "templateOSS": { + "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", + "version": "4.11.3" + } +} diff --git a/node_modules/pacote/package.json b/node_modules/pacote/package.json index 7767513409985..ae4e871690eaa 100644 --- a/node_modules/pacote/package.json +++ b/node_modules/pacote/package.json @@ -1,6 +1,6 @@ { "name": "pacote", - "version": "15.0.7", + "version": "15.0.8", "description": "JavaScript package downloader", "author": "GitHub Inc.", "bin": { @@ -27,7 +27,7 @@ "devDependencies": { "@npmcli/arborist": "^6.0.0 || ^6.0.0-pre.0", "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.10.0", + "@npmcli/template-oss": "4.11.0", "hosted-git-info": "^6.0.0", "mutate-fs": "^2.1.1", "nock": "^13.2.4", @@ -49,7 +49,7 @@ "@npmcli/promise-spawn": "^6.0.1", "@npmcli/run-script": "^6.0.0", "cacache": "^17.0.0", - "fs-minipass": "^2.1.0", + "fs-minipass": "^3.0.0", "minipass": "^4.0.0", "npm-package-arg": "^10.0.0", "npm-packlist": "^7.0.0", @@ -71,7 +71,7 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.10.0", + "version": "4.11.0", "windowsCI": false } } diff --git a/package-lock.json b/package-lock.json index 11d78d934de9f..97bd0ef824ba7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -135,7 +135,7 @@ "npm-user-validate": "^1.0.1", "npmlog": "^7.0.1", "p-map": "^4.0.0", - "pacote": "^15.0.7", + "pacote": "^15.0.8", "parse-conflict-json": "^3.0.0", "proc-log": "^3.0.0", "qrcode-terminal": "^0.12.0", @@ -212,7 +212,7 @@ "@npmcli/template-oss": "4.11.3", "nock": "^13.2.9", "npm-package-arg": "^10.1.0", - "pacote": "^15.0.7", + "pacote": "^15.0.8", "tap": "^16.3.2" }, "engines": { @@ -9478,9 +9478,9 @@ } }, "node_modules/pacote": { - "version": "15.0.7", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.0.7.tgz", - "integrity": "sha512-OFf4dl3SM1PpsZvi1zk4vvMA0EplnyO0Ajbrtoyx6E3dXOWBoPnMapnLgQdInEfqPkNT8mrd2bY6c5t8JZ69sQ==", + "version": "15.0.8", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.0.8.tgz", + "integrity": "sha512-UlcumB/XS6xyyIMwg/WwMAyUmga+RivB5KgkRwA1hZNtrx+0Bt41KxHCvg1kr0pZ/ZeD8qjhW4fph6VaYRCbLw==", "inBundle": true, "dependencies": { "@npmcli/git": "^4.0.0", @@ -9488,7 +9488,7 @@ "@npmcli/promise-spawn": "^6.0.1", "@npmcli/run-script": "^6.0.0", "cacache": "^17.0.0", - "fs-minipass": "^2.1.0", + "fs-minipass": "^3.0.0", "minipass": "^4.0.0", "npm-package-arg": "^10.0.0", "npm-packlist": "^7.0.0", @@ -9508,6 +9508,18 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/pacote/node_modules/fs-minipass": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.1.tgz", + "integrity": "sha512-MhaJDcFRTuLidHrIttu0RDGyyXs/IYHVmlcxfLAEFIWjc1vdLAkdwT7Ace2u7DbitWC0toKMl5eJZRYNVreIMw==", + "inBundle": true, + "dependencies": { + "minipass": "^4.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -14414,7 +14426,7 @@ "npm-pick-manifest": "^8.0.1", "npm-registry-fetch": "^14.0.3", "npmlog": "^7.0.1", - "pacote": "^15.0.7", + "pacote": "^15.0.8", "parse-conflict-json": "^3.0.0", "proc-log": "^3.0.0", "promise-all-reject-late": "^1.0.0", @@ -14494,7 +14506,7 @@ "diff": "^5.1.0", "minimatch": "^5.1.1", "npm-package-arg": "^10.1.0", - "pacote": "^15.0.7", + "pacote": "^15.0.8", "tar": "^6.1.13" }, "devDependencies": { @@ -14516,7 +14528,7 @@ "ci-info": "^3.7.0", "npm-package-arg": "^10.1.0", "npmlog": "^7.0.1", - "pacote": "^15.0.7", + "pacote": "^15.0.8", "proc-log": "^3.0.0", "read": "^1.0.7", "read-package-json-fast": "^3.0.1", @@ -14595,7 +14607,7 @@ "@npmcli/arborist": "^6.2.0", "@npmcli/run-script": "^6.0.0", "npm-package-arg": "^10.1.0", - "pacote": "^15.0.7" + "pacote": "^15.0.8" }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", diff --git a/package.json b/package.json index 1953dab2d1dbf..bca9126fc6468 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "npm-user-validate": "^1.0.1", "npmlog": "^7.0.1", "p-map": "^4.0.0", - "pacote": "^15.0.7", + "pacote": "^15.0.8", "parse-conflict-json": "^3.0.0", "proc-log": "^3.0.0", "qrcode-terminal": "^0.12.0", diff --git a/workspaces/arborist/package.json b/workspaces/arborist/package.json index 72ba4af4262ef..b6a040213be42 100644 --- a/workspaces/arborist/package.json +++ b/workspaces/arborist/package.json @@ -26,7 +26,7 @@ "npm-pick-manifest": "^8.0.1", "npm-registry-fetch": "^14.0.3", "npmlog": "^7.0.1", - "pacote": "^15.0.7", + "pacote": "^15.0.8", "parse-conflict-json": "^3.0.0", "proc-log": "^3.0.0", "promise-all-reject-late": "^1.0.0", diff --git a/workspaces/libnpmdiff/package.json b/workspaces/libnpmdiff/package.json index 5c8202998c326..79d15b405c51e 100644 --- a/workspaces/libnpmdiff/package.json +++ b/workspaces/libnpmdiff/package.json @@ -54,7 +54,7 @@ "diff": "^5.1.0", "minimatch": "^5.1.1", "npm-package-arg": "^10.1.0", - "pacote": "^15.0.7", + "pacote": "^15.0.8", "tar": "^6.1.13" }, "templateOSS": { diff --git a/workspaces/libnpmexec/package.json b/workspaces/libnpmexec/package.json index c6ed4c7337d1b..a488c2488ae0c 100644 --- a/workspaces/libnpmexec/package.json +++ b/workspaces/libnpmexec/package.json @@ -67,7 +67,7 @@ "ci-info": "^3.7.0", "npm-package-arg": "^10.1.0", "npmlog": "^7.0.1", - "pacote": "^15.0.7", + "pacote": "^15.0.8", "proc-log": "^3.0.0", "read": "^1.0.7", "read-package-json-fast": "^3.0.1", diff --git a/workspaces/libnpmpack/package.json b/workspaces/libnpmpack/package.json index 63c683dbd1726..ed3165d2e6848 100644 --- a/workspaces/libnpmpack/package.json +++ b/workspaces/libnpmpack/package.json @@ -39,7 +39,7 @@ "@npmcli/arborist": "^6.2.0", "@npmcli/run-script": "^6.0.0", "npm-package-arg": "^10.1.0", - "pacote": "^15.0.7" + "pacote": "^15.0.8" }, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" From d6e4fa724c23f42c034570caf5fe33eb4419f99b Mon Sep 17 00:00:00 2001 From: Nathan Fritz Date: Wed, 1 Feb 2023 15:34:05 -0800 Subject: [PATCH 7/7] deps: read-package-json-fast@3.0.2 --- node_modules/read-package-json-fast/lib/index.js | 10 ++-------- node_modules/read-package-json-fast/package.json | 6 +++--- package-lock.json | 13 +++++++------ package.json | 2 +- workspaces/arborist/package.json | 2 +- workspaces/config/package.json | 2 +- workspaces/libnpmexec/package.json | 2 +- 7 files changed, 16 insertions(+), 21 deletions(-) diff --git a/node_modules/read-package-json-fast/lib/index.js b/node_modules/read-package-json-fast/lib/index.js index c5c896ffec004..beb089db8d53e 100644 --- a/node_modules/read-package-json-fast/lib/index.js +++ b/node_modules/read-package-json-fast/lib/index.js @@ -1,10 +1,6 @@ -const { promisify } = require('util') -const fs = require('fs') -const readFile = promisify(fs.readFile) -const lstat = promisify(fs.lstat) -const readdir = promisify(fs.readdir) +const { readFile, lstat, readdir } = require('fs/promises') const parse = require('json-parse-even-better-errors') - +const normalizePackageBin = require('npm-normalize-package-bin') const { resolve, dirname, join, relative } = require('path') const rpj = path => readFile(path, 'utf8') @@ -14,8 +10,6 @@ const rpj = path => readFile(path, 'utf8') throw er }) -const normalizePackageBin = require('npm-normalize-package-bin') - // load the directories.bin folder as a 'bin' object const readBinDir = async (path, data) => { if (data.bin) { diff --git a/node_modules/read-package-json-fast/package.json b/node_modules/read-package-json-fast/package.json index 7baa36cfbeb9e..4964bb0a934cb 100644 --- a/node_modules/read-package-json-fast/package.json +++ b/node_modules/read-package-json-fast/package.json @@ -1,6 +1,6 @@ { "name": "read-package-json-fast", - "version": "3.0.1", + "version": "3.0.2", "description": "Like read-package-json, but faster", "main": "lib/index.js", "author": "GitHub Inc.", @@ -19,7 +19,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.5.1", + "@npmcli/template-oss": "4.11.0", "tap": "^16.3.0" }, "dependencies": { @@ -36,7 +36,7 @@ ], "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.5.1" + "version": "4.11.0" }, "tap": { "nyc-arg": [ diff --git a/package-lock.json b/package-lock.json index 97bd0ef824ba7..573ba5b9bec74 100644 --- a/package-lock.json +++ b/package-lock.json @@ -141,7 +141,7 @@ "qrcode-terminal": "^0.12.0", "read": "~1.0.7", "read-package-json": "^6.0.0", - "read-package-json-fast": "^3.0.1", + "read-package-json-fast": "^3.0.2", "semver": "^7.3.8", "ssri": "^10.0.1", "tar": "^6.1.13", @@ -9963,9 +9963,10 @@ } }, "node_modules/read-package-json-fast": { - "version": "3.0.1", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz", + "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==", "inBundle": true, - "license": "ISC", "dependencies": { "json-parse-even-better-errors": "^3.0.0", "npm-normalize-package-bin": "^3.0.0" @@ -14431,7 +14432,7 @@ "proc-log": "^3.0.0", "promise-all-reject-late": "^1.0.0", "promise-call-limit": "^1.0.1", - "read-package-json-fast": "^3.0.1", + "read-package-json-fast": "^3.0.2", "semver": "^7.3.7", "ssri": "^10.0.1", "treeverse": "^3.0.0", @@ -14464,7 +14465,7 @@ "ini": "^3.0.0", "nopt": "^7.0.0", "proc-log": "^3.0.0", - "read-package-json-fast": "^3.0.0", + "read-package-json-fast": "^3.0.2", "semver": "^7.3.5", "walk-up-path": "^1.0.0" }, @@ -14531,7 +14532,7 @@ "pacote": "^15.0.8", "proc-log": "^3.0.0", "read": "^1.0.7", - "read-package-json-fast": "^3.0.1", + "read-package-json-fast": "^3.0.2", "semver": "^7.3.7", "walk-up-path": "^1.0.0" }, diff --git a/package.json b/package.json index bca9126fc6468..19e5e3b4ae37d 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "qrcode-terminal": "^0.12.0", "read": "~1.0.7", "read-package-json": "^6.0.0", - "read-package-json-fast": "^3.0.1", + "read-package-json-fast": "^3.0.2", "semver": "^7.3.8", "ssri": "^10.0.1", "tar": "^6.1.13", diff --git a/workspaces/arborist/package.json b/workspaces/arborist/package.json index b6a040213be42..f5a6e184d371d 100644 --- a/workspaces/arborist/package.json +++ b/workspaces/arborist/package.json @@ -31,7 +31,7 @@ "proc-log": "^3.0.0", "promise-all-reject-late": "^1.0.0", "promise-call-limit": "^1.0.1", - "read-package-json-fast": "^3.0.1", + "read-package-json-fast": "^3.0.2", "semver": "^7.3.7", "ssri": "^10.0.1", "treeverse": "^3.0.0", diff --git a/workspaces/config/package.json b/workspaces/config/package.json index dec63b58c9888..0defa2420dac1 100644 --- a/workspaces/config/package.json +++ b/workspaces/config/package.json @@ -41,7 +41,7 @@ "ini": "^3.0.0", "nopt": "^7.0.0", "proc-log": "^3.0.0", - "read-package-json-fast": "^3.0.0", + "read-package-json-fast": "^3.0.2", "semver": "^7.3.5", "walk-up-path": "^1.0.0" }, diff --git a/workspaces/libnpmexec/package.json b/workspaces/libnpmexec/package.json index a488c2488ae0c..de56343150157 100644 --- a/workspaces/libnpmexec/package.json +++ b/workspaces/libnpmexec/package.json @@ -70,7 +70,7 @@ "pacote": "^15.0.8", "proc-log": "^3.0.0", "read": "^1.0.7", - "read-package-json-fast": "^3.0.1", + "read-package-json-fast": "^3.0.2", "semver": "^7.3.7", "walk-up-path": "^1.0.0" },