From d2712d1eb097ab93b9c2d3f80d67826b4cdf3733 Mon Sep 17 00:00:00 2001 From: Luke Karrys Date: Wed, 31 Aug 2022 16:11:56 -0700 Subject: [PATCH 01/13] chore: set prerelease flag --- release-please-config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release-please-config.json b/release-please-config.json index 8f82980337956..6c5b275e84740 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -32,7 +32,8 @@ ], "packages": { ".": { - "package-name": "" + "package-name": "", + "prerelease": true }, "workspaces/arborist": {}, "workspaces/libnpmaccess": {}, From dcc376534212e13fcd5813db9eb067be8179d04f Mon Sep 17 00:00:00 2001 From: Luke Karrys Date: Wed, 31 Aug 2022 16:24:37 -0700 Subject: [PATCH 02/13] chore: remove some outdated release steps Also increase docs tests so they dont timeout when rebuilding cmark-gfm --- Makefile | 3 --- docs/package.json | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 72b285359e776..5c153511e31af 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,6 @@ SHELL = bash PUBLISHTAG = $(shell node scripts/publish-tag.js) -BRANCH = $(shell git rev-parse --abbrev-ref HEAD) # these docs have the @VERSION@ tag in them, so they have to be rebuilt # whenever the package.json is touched, in case the version changed. @@ -112,8 +111,6 @@ prune: deps node scripts/git-dirty.js publish: gitclean ls-ok link test-all docs prune - git push origin $(BRANCH) &&\ - git push origin --tags &&\ node bin/npm-cli.js publish --tag=$(PUBLISHTAG) release: gitclean ls-ok docs prune diff --git a/docs/package.json b/docs/package.json index c7f02a7ae6fa9..7d96037e597ff 100644 --- a/docs/package.json +++ b/docs/package.json @@ -47,7 +47,8 @@ "statements": 81, "branches": 72, "functions": 75, - "lines": 81 + "lines": 81, + "timeout": 600 }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", From 68e1677483d34d0b4662fb93455a2d024163c2d2 Mon Sep 17 00:00:00 2001 From: Luke Karrys Date: Thu, 1 Sep 2022 07:45:17 -0700 Subject: [PATCH 03/13] chore: revert prerelease mode for now Using #5452 instead --- release-please-config.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/release-please-config.json b/release-please-config.json index 6c5b275e84740..8f82980337956 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -32,8 +32,7 @@ ], "packages": { ".": { - "package-name": "", - "prerelease": true + "package-name": "" }, "workspaces/arborist": {}, "workspaces/libnpmaccess": {}, From 4bc702912487117e5c5316b0052917950464f278 Mon Sep 17 00:00:00 2001 From: Luke Karrys Date: Thu, 1 Sep 2022 14:16:12 -0700 Subject: [PATCH 04/13] chore: @npmcli/template-oss@3.8.1 (#5461) --- .github/workflows/release-please.yml | 1 + docs/package.json | 6 ++--- package-lock.json | 36 +++++++++++++-------------- package.json | 4 +-- smoke-tests/package.json | 6 ++--- workspaces/arborist/package.json | 7 ++---- workspaces/libnpmaccess/package.json | 7 ++---- workspaces/libnpmdiff/package.json | 7 ++---- workspaces/libnpmexec/package.json | 7 ++---- workspaces/libnpmfund/package.json | 7 ++---- workspaces/libnpmhook/package.json | 7 ++---- workspaces/libnpmorg/package.json | 7 ++---- workspaces/libnpmpack/package.json | 7 ++---- workspaces/libnpmpublish/package.json | 7 ++---- workspaces/libnpmsearch/package.json | 7 ++---- workspaces/libnpmteam/package.json | 7 ++---- workspaces/libnpmversion/package.json | 7 ++---- 17 files changed, 49 insertions(+), 88 deletions(-) diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 6e0604199b90a..42c9972811795 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -49,6 +49,7 @@ jobs: run: echo "::set-output name=branch::${{ fromJSON(needs.release-please.outputs.pr).headBranchName }}" - uses: actions/checkout@v3 with: + fetch-depth: 0 ref: ${{ steps.ref.outputs.branch }} - name: Setup git user run: | diff --git a/docs/package.json b/docs/package.json index 7d96037e597ff..46297b934a996 100644 --- a/docs/package.json +++ b/docs/package.json @@ -8,8 +8,6 @@ "postlint": "template-oss-check", "template-oss-apply": "template-oss-apply --force", "lintfix": "npm run lint -- --fix", - "preversion": "npm test", - "postversion": "git push origin --follow-tags", "snap": "tap", "test": "tap", "posttest": "npm run lint" @@ -24,7 +22,7 @@ "@npmcli/eslint-config": "^3.1.0", "@npmcli/fs": "^2.1.0", "@npmcli/promise-spawn": "^3.0.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "cmark-gfm": "^0.9.0", "jsdom": "^18.1.0", "marked-man": "^0.7.0", @@ -61,6 +59,6 @@ "ciVersions": [ "16" ], - "version": "3.8.0" + "version": "3.8.1" } } diff --git a/package-lock.json b/package-lock.json index 83d293f6a8668..abf787c57f10e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -169,7 +169,7 @@ "devDependencies": { "@npmcli/eslint-config": "^3.1.0", "@npmcli/promise-spawn": "^3.0.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "fs-minipass": "^2.1.0", "licensee": "^8.2.0", "minimatch": "^5.1.0", @@ -189,7 +189,7 @@ "@npmcli/eslint-config": "^3.1.0", "@npmcli/fs": "^2.1.0", "@npmcli/promise-spawn": "^3.0.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "cmark-gfm": "^0.9.0", "jsdom": "^18.1.0", "marked-man": "^0.7.0", @@ -2362,9 +2362,9 @@ } }, "node_modules/@npmcli/template-oss": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@npmcli/template-oss/-/template-oss-3.8.0.tgz", - "integrity": "sha512-jpvuS/ZrLTIsHm19Wh8PQx6tJSvhWyto/5Bb16StMUGjM8/eyL+nPQQ+/oREtqI2nTtXOMhIorRjtwATUP8IFg==", + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/@npmcli/template-oss/-/template-oss-3.8.1.tgz", + "integrity": "sha512-YfOCIVYK7F0EoepXYUrKuD7LEOWEtWxAyxziSTZWJbjIslX/IYgaKrOqJGWl7eXSMW2LJizK31JBcHEyBNtNnQ==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -13843,7 +13843,7 @@ "devDependencies": { "@npmcli/eslint-config": "^3.1.0", "@npmcli/promise-spawn": "^3.0.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "minify-registry-metadata": "^2.2.0", "rimraf": "^3.0.2", "tap": "^16.0.1", @@ -13900,7 +13900,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "benchmark": "^2.1.4", "chalk": "^4.1.0", "minify-registry-metadata": "^2.1.0", @@ -13923,7 +13923,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -13946,7 +13946,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "tap": "^16.0.1" }, "engines": { @@ -13974,7 +13974,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "bin-links": "^3.0.3", "minify-registry-metadata": "^2.2.0", "mkdirp": "^1.0.4", @@ -13992,7 +13992,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "tap": "^16.0.1" }, "engines": { @@ -14008,7 +14008,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -14025,7 +14025,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "minipass": "^3.1.1", "nock": "^13.2.4", "tap": "^16.0.1" @@ -14044,7 +14044,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "nock": "^13.0.7", "tap": "^16.0.1" }, @@ -14064,7 +14064,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "libnpmpack": "^4.1.3", "lodash.clonedeep": "^4.5.0", "nock": "^13.2.4", @@ -14082,7 +14082,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -14099,7 +14099,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -14119,7 +14119,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "require-inject": "^1.4.4", "tap": "^16.0.1" }, diff --git a/package.json b/package.json index f280f1a3732c5..b612ff1f4a53a 100644 --- a/package.json +++ b/package.json @@ -206,7 +206,7 @@ "devDependencies": { "@npmcli/eslint-config": "^3.1.0", "@npmcli/promise-spawn": "^3.0.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "fs-minipass": "^2.1.0", "licensee": "^8.2.0", "minimatch": "^5.1.0", @@ -251,7 +251,7 @@ "templateOSS": { "rootRepo": false, "rootModule": false, - "version": "3.8.0", + "version": "3.8.1", "releaseTest": "release.yml" }, "license": "Artistic-2.0", diff --git a/smoke-tests/package.json b/smoke-tests/package.json index 12342862c8aaa..f7c83fb8fd65f 100644 --- a/smoke-tests/package.json +++ b/smoke-tests/package.json @@ -8,8 +8,6 @@ "postlint": "template-oss-check", "template-oss-apply": "template-oss-apply --force", "lintfix": "npm run lint -- --fix", - "preversion": "npm test", - "postversion": "git push origin --follow-tags", "snap": "tap", "test": "tap", "posttest": "npm run lint" @@ -22,7 +20,7 @@ "devDependencies": { "@npmcli/eslint-config": "^3.1.0", "@npmcli/promise-spawn": "^3.0.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "minify-registry-metadata": "^2.2.0", "rimraf": "^3.0.2", "tap": "^16.0.1", @@ -32,7 +30,7 @@ "license": "ISC", "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.0", + "version": "3.8.1", "workspaceRepo": false }, "tap": { diff --git a/workspaces/arborist/package.json b/workspaces/arborist/package.json index 206d444514377..b7cd92ba4cb11 100644 --- a/workspaces/arborist/package.json +++ b/workspaces/arborist/package.json @@ -42,7 +42,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "benchmark": "^2.1.4", "chalk": "^4.1.0", "minify-registry-metadata": "^2.1.0", @@ -56,9 +56,6 @@ "snap": "tap", "postsnap": "npm run lintfix", "test-proxy": "ARBORIST_TEST_PROXY=1 tap --snapshot", - "preversion": "npm test", - "postversion": "npm publish", - "prepublishOnly": "git push origin --follow-tags", "eslint": "eslint", "lint": "eslint \"**/*.js\"", "lintfix": "npm run lint -- --fix", @@ -103,6 +100,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.0" + "version": "3.8.1" } } diff --git a/workspaces/libnpmaccess/package.json b/workspaces/libnpmaccess/package.json index ca21f9de96031..94c688e07e58e 100644 --- a/workspaces/libnpmaccess/package.json +++ b/workspaces/libnpmaccess/package.json @@ -6,21 +6,18 @@ "license": "ISC", "main": "lib/index.js", "scripts": { - "preversion": "npm test", - "postversion": "npm publish", "postpublish": "git push origin --follow-tags", "lint": "eslint \"**/*.js\"", "test": "tap", "postlint": "template-oss-check", "lintfix": "npm run lint -- --fix", - "prepublishOnly": "git push origin --follow-tags", "snap": "tap", "posttest": "npm run lint", "template-oss-apply": "template-oss-apply --force" }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -46,6 +43,6 @@ ], "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.0" + "version": "3.8.1" } } diff --git a/workspaces/libnpmdiff/package.json b/workspaces/libnpmdiff/package.json index d672eada1e270..9f61ee8f55cc6 100644 --- a/workspaces/libnpmdiff/package.json +++ b/workspaces/libnpmdiff/package.json @@ -38,15 +38,12 @@ "test": "tap", "posttest": "npm run lint", "snap": "tap", - "preversion": "npm test", - "postversion": "npm publish", - "prepublishOnly": "git push origin --follow-tags", "postlint": "template-oss-check", "template-oss-apply": "template-oss-apply --force" }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "tap": "^16.0.1" }, "dependencies": { @@ -61,6 +58,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.0" + "version": "3.8.1" } } diff --git a/workspaces/libnpmexec/package.json b/workspaces/libnpmexec/package.json index 16439d854368e..7f7b8eac456b9 100644 --- a/workspaces/libnpmexec/package.json +++ b/workspaces/libnpmexec/package.json @@ -37,9 +37,6 @@ "posttest": "npm run lint", "test": "tap", "snap": "tap", - "preversion": "npm test", - "postversion": "npm publish", - "prepublishOnly": "git push origin --follow-tags", "postlint": "template-oss-check", "lintfix": "npm run lint -- --fix", "template-oss-apply": "template-oss-apply --force" @@ -50,7 +47,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "bin-links": "^3.0.3", "minify-registry-metadata": "^2.2.0", "mkdirp": "^1.0.4", @@ -74,6 +71,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.0" + "version": "3.8.1" } } diff --git a/workspaces/libnpmfund/package.json b/workspaces/libnpmfund/package.json index 0398463078a16..68db1d647326a 100644 --- a/workspaces/libnpmfund/package.json +++ b/workspaces/libnpmfund/package.json @@ -37,15 +37,12 @@ "posttest": "npm run lint", "test": "tap", "snap": "tap", - "preversion": "npm test", - "postversion": "npm publish", - "prepublishOnly": "git push origin --follow-tags", "postlint": "template-oss-check", "template-oss-apply": "template-oss-apply --force" }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "tap": "^16.0.1" }, "dependencies": { @@ -56,6 +53,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.0" + "version": "3.8.1" } } diff --git a/workspaces/libnpmhook/package.json b/workspaces/libnpmhook/package.json index 88eb3bc7f8b2c..446170777ff26 100644 --- a/workspaces/libnpmhook/package.json +++ b/workspaces/libnpmhook/package.json @@ -14,9 +14,6 @@ "lint": "eslint \"**/*.js\"", "postlint": "template-oss-check", "lintfix": "npm run lint -- --fix", - "preversion": "npm test", - "postversion": "npm publish", - "prepublishOnly": "git push origin --follow-tags", "snap": "tap", "posttest": "npm run lint", "template-oss-apply": "template-oss-apply --force" @@ -40,7 +37,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -49,6 +46,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.0" + "version": "3.8.1" } } diff --git a/workspaces/libnpmorg/package.json b/workspaces/libnpmorg/package.json index 7aef13f1a058d..b5ecf40cbf378 100644 --- a/workspaces/libnpmorg/package.json +++ b/workspaces/libnpmorg/package.json @@ -14,9 +14,6 @@ ], "license": "ISC", "scripts": { - "preversion": "npm test", - "postversion": "npm publish", - "prepublishOnly": "git push origin --follow-tags", "lint": "eslint \"**/*.js\"", "test": "tap", "posttest": "npm run lint", @@ -31,7 +28,7 @@ ], "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "minipass": "^3.1.1", "nock": "^13.2.4", "tap": "^16.0.1" @@ -52,6 +49,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.0" + "version": "3.8.1" } } diff --git a/workspaces/libnpmpack/package.json b/workspaces/libnpmpack/package.json index f1bb29dfc0f3f..e808c7b8e3b6b 100644 --- a/workspaces/libnpmpack/package.json +++ b/workspaces/libnpmpack/package.json @@ -13,9 +13,6 @@ ], "license": "ISC", "scripts": { - "preversion": "npm test", - "postversion": "npm publish", - "prepublishOnly": "git push origin --follow-tags", "lint": "eslint \"**/*.js\"", "test": "tap", "posttest": "npm run lint", @@ -26,7 +23,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "nock": "^13.0.7", "tap": "^16.0.1" }, @@ -47,6 +44,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.0" + "version": "3.8.1" } } diff --git a/workspaces/libnpmpublish/package.json b/workspaces/libnpmpublish/package.json index 4083976aa5ed7..dd88dd5460dbe 100644 --- a/workspaces/libnpmpublish/package.json +++ b/workspaces/libnpmpublish/package.json @@ -17,9 +17,6 @@ "eslint": "eslint", "lint": "eslint \"**/*.js\"", "lintfix": "npm run lint -- --fix", - "preversion": "npm test", - "postversion": "npm publish", - "prepublishOnly": "git push origin --follow-tags", "test": "tap", "posttest": "npm run lint", "postlint": "template-oss-check", @@ -28,7 +25,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "libnpmpack": "^4.1.3", "lodash.clonedeep": "^4.5.0", "nock": "^13.2.4", @@ -53,6 +50,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.0" + "version": "3.8.1" } } diff --git a/workspaces/libnpmsearch/package.json b/workspaces/libnpmsearch/package.json index cc3c582ae903b..f9b8cdded0c10 100644 --- a/workspaces/libnpmsearch/package.json +++ b/workspaces/libnpmsearch/package.json @@ -16,9 +16,6 @@ ], "license": "ISC", "scripts": { - "preversion": "npm test", - "postversion": "npm publish", - "prepublishOnly": "git push origin --follow-tags", "posttest": "npm run lint", "test": "tap", "lint": "eslint \"**/*.js\"", @@ -29,7 +26,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -48,6 +45,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.0" + "version": "3.8.1" } } diff --git a/workspaces/libnpmteam/package.json b/workspaces/libnpmteam/package.json index 8f53bf5fd33dd..2d5a91b5e57c7 100644 --- a/workspaces/libnpmteam/package.json +++ b/workspaces/libnpmteam/package.json @@ -6,9 +6,6 @@ "license": "ISC", "main": "lib/index.js", "scripts": { - "preversion": "npm test", - "postversion": "npm publish", - "prepublishOnly": "git push origin --follow-tags", "lint": "eslint \"**/*.js\"", "test": "tap", "posttest": "npm run lint", @@ -19,7 +16,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -42,6 +39,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.0" + "version": "3.8.1" } } diff --git a/workspaces/libnpmversion/package.json b/workspaces/libnpmversion/package.json index ee18df9366c25..ff6415afc862b 100644 --- a/workspaces/libnpmversion/package.json +++ b/workspaces/libnpmversion/package.json @@ -19,9 +19,6 @@ "test": "tap", "posttest": "npm run lint", "snap": "tap", - "preversion": "npm test", - "postversion": "npm publish", - "prepublishOnly": "git push origin --follow-tags", "postlint": "template-oss-check", "lintfix": "npm run lint -- --fix", "template-oss-apply": "template-oss-apply --force" @@ -31,7 +28,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.0", + "@npmcli/template-oss": "3.8.1", "require-inject": "^1.4.4", "tap": "^16.0.1" }, @@ -47,6 +44,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.0" + "version": "3.8.1" } } From d60b43f3825452dd8b9b5879c287df232c9a8dc8 Mon Sep 17 00:00:00 2001 From: Sandeep Meduru <73886592+sandeepmeduru@users.noreply.github.com> Date: Fri, 2 Sep 2022 02:46:33 +0530 Subject: [PATCH 05/13] fix: Turn off progress bar when using web based authorization (#5438) --- lib/utils/otplease.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/utils/otplease.js b/lib/utils/otplease.js index 0e20e7a797ae0..e40ef57730c30 100644 --- a/lib/utils/otplease.js +++ b/lib/utils/otplease.js @@ -1,3 +1,4 @@ +const log = require('./log-shim') async function otplease (npm, opts, fn) { try { return await fn(opts) @@ -7,6 +8,7 @@ async function otplease (npm, opts, fn) { } if (isWebOTP(err)) { + log.disableProgress() const webAuth = require('./web-auth') const openUrlPrompt = require('./open-url-prompt') From 155b714f8e9fb16e997635f51cce174f13e43981 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Sep 2022 21:21:08 +0000 Subject: [PATCH 06/13] chore: release 8.19.1 --- .release-please-manifest.json | 2 +- CHANGELOG.md | 6 ++++++ package-lock.json | 2 +- package.json | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 86f229c516555..1fcd6a2fedf0c 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,5 +1,5 @@ { - ".": "8.19.0", + ".": "8.19.1", "workspaces/arborist": "5.6.1", "workspaces/libnpmaccess": "6.0.4", "workspaces/libnpmdiff": "4.0.5", diff --git a/CHANGELOG.md b/CHANGELOG.md index 86669095767cd..f864a61f9d8b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [8.19.1](https://github.com/npm/cli/compare/v8.19.0...v8.19.1) (2022-09-01) + +### Bug Fixes + + * [`d60b43f`](https://github.com/npm/cli/commit/d60b43f3825452dd8b9b5879c287df232c9a8dc8) [#5438](https://github.com/npm/cli/pull/5438) fix: Turn off progress bar when using web based authorization (@sandeepmeduru) + ## [8.19.0](https://github.com/npm/cli/compare/v8.18.0...v8.19.0) (2022-08-31) ### Features diff --git a/package-lock.json b/package-lock.json index abf787c57f10e..5877fbbd9c414 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "npm", - "version": "8.19.0", + "version": "8.19.1", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/package.json b/package.json index b612ff1f4a53a..458952142ff2b 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "8.19.0", + "version": "8.19.1", "name": "npm", "description": "a package manager for JavaScript", "workspaces": [ From 63186c8f65cad80a02c48cda3f001a628a05cb61 Mon Sep 17 00:00:00 2001 From: npm CLI robot Date: Thu, 1 Sep 2022 21:22:38 +0000 Subject: [PATCH 07/13] chore: post pull request --- AUTHORS | 1 + package-lock.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index e5b44bb9792c6..4632f50e98a6d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -851,3 +851,4 @@ William Marlow KevinBrother <1301239018@qq.com> Kyle West Nathan Hughes +Sandeep Meduru <73886592+sandeepmeduru@users.noreply.github.com> diff --git a/package-lock.json b/package-lock.json index 5877fbbd9c414..46e6331583770 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "npm", - "version": "8.19.0", + "version": "8.19.1", "bundleDependencies": [ "@isaacs/string-locale-compare", "@npmcli/arborist", From 0545c7a2257f67af8795dea0816bf4610d2afaf6 Mon Sep 17 00:00:00 2001 From: Luke Karrys Date: Tue, 13 Sep 2022 14:05:51 -0700 Subject: [PATCH 08/13] chore: template-oss@4.1.0 --- .github/workflows/release-please.yml | 1 + docs/package.json | 4 +-- package-lock.json | 48 +++++++++++++-------------- package.json | 17 ++++++++-- smoke-tests/package.json | 4 +-- workspaces/arborist/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 +-- 17 files changed, 67 insertions(+), 55 deletions(-) diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 42c9972811795..a470405e638fb 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -7,6 +7,7 @@ on: branches: - main - latest + - v8 permissions: contents: write diff --git a/docs/package.json b/docs/package.json index 46297b934a996..cbc43fb3ab292 100644 --- a/docs/package.json +++ b/docs/package.json @@ -22,7 +22,7 @@ "@npmcli/eslint-config": "^3.1.0", "@npmcli/fs": "^2.1.0", "@npmcli/promise-spawn": "^3.0.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "cmark-gfm": "^0.9.0", "jsdom": "^18.1.0", "marked-man": "^0.7.0", @@ -59,6 +59,6 @@ "ciVersions": [ "16" ], - "version": "3.8.1" + "version": "4.1.0" } } diff --git a/package-lock.json b/package-lock.json index 46e6331583770..a7992ce3d2274 100644 --- a/package-lock.json +++ b/package-lock.json @@ -169,7 +169,7 @@ "devDependencies": { "@npmcli/eslint-config": "^3.1.0", "@npmcli/promise-spawn": "^3.0.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "fs-minipass": "^2.1.0", "licensee": "^8.2.0", "minimatch": "^5.1.0", @@ -189,7 +189,7 @@ "@npmcli/eslint-config": "^3.1.0", "@npmcli/fs": "^2.1.0", "@npmcli/promise-spawn": "^3.0.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "cmark-gfm": "^0.9.0", "jsdom": "^18.1.0", "marked-man": "^0.7.0", @@ -2362,9 +2362,9 @@ } }, "node_modules/@npmcli/template-oss": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/@npmcli/template-oss/-/template-oss-3.8.1.tgz", - "integrity": "sha512-YfOCIVYK7F0EoepXYUrKuD7LEOWEtWxAyxziSTZWJbjIslX/IYgaKrOqJGWl7eXSMW2LJizK31JBcHEyBNtNnQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/template-oss/-/template-oss-4.1.0.tgz", + "integrity": "sha512-gbGkAAQlP70TWs/wAaPStD/pPzCmqLY0iFUOUt+ct4gpKoHzqDrvvFXUCqI8qPUSVr+v7PP/Gxcmh6DtsZA64Q==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -2386,7 +2386,7 @@ "proc-log": "^2.0.0", "release-please": "npm:@npmcli/release-please@^14.2.4", "semver": "^7.3.5", - "yaml": "2.0.0-11" + "yaml": "^2.1.1" }, "bin": { "template-oss-apply": "bin/apply.js", @@ -2394,16 +2394,16 @@ "template-oss-release-please": "bin/release-please.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/@npmcli/template-oss/node_modules/yaml": { - "version": "2.0.0-11", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.0.0-11.tgz", - "integrity": "sha512-5kGSQrzDyjCk0BLuFfjkoUE9vYcoyrwZIZ+GnpOSM9vhkvPjItYiWJ1jpRSo0aU4QmsoNrFwDT4O7XS2UGcBQg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz", + "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==", "dev": true, "engines": { - "node": ">= 12" + "node": ">= 14" } }, "node_modules/@octokit/auth-token": { @@ -13843,7 +13843,7 @@ "devDependencies": { "@npmcli/eslint-config": "^3.1.0", "@npmcli/promise-spawn": "^3.0.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "minify-registry-metadata": "^2.2.0", "rimraf": "^3.0.2", "tap": "^16.0.1", @@ -13900,7 +13900,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "benchmark": "^2.1.4", "chalk": "^4.1.0", "minify-registry-metadata": "^2.1.0", @@ -13923,7 +13923,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -13946,7 +13946,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "tap": "^16.0.1" }, "engines": { @@ -13974,7 +13974,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "bin-links": "^3.0.3", "minify-registry-metadata": "^2.2.0", "mkdirp": "^1.0.4", @@ -13992,7 +13992,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "tap": "^16.0.1" }, "engines": { @@ -14008,7 +14008,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -14025,7 +14025,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "minipass": "^3.1.1", "nock": "^13.2.4", "tap": "^16.0.1" @@ -14044,7 +14044,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "nock": "^13.0.7", "tap": "^16.0.1" }, @@ -14064,7 +14064,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "libnpmpack": "^4.1.3", "lodash.clonedeep": "^4.5.0", "nock": "^13.2.4", @@ -14082,7 +14082,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -14099,7 +14099,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -14119,7 +14119,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "require-inject": "^1.4.4", "tap": "^16.0.1" }, diff --git a/package.json b/package.json index 458952142ff2b..258111b862c9d 100644 --- a/package.json +++ b/package.json @@ -206,7 +206,7 @@ "devDependencies": { "@npmcli/eslint-config": "^3.1.0", "@npmcli/promise-spawn": "^3.0.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "fs-minipass": "^2.1.0", "licensee": "^8.2.0", "minimatch": "^5.1.0", @@ -251,8 +251,19 @@ "templateOSS": { "rootRepo": false, "rootModule": false, - "version": "3.8.1", - "releaseTest": "release.yml" + "version": "4.1.0", + "releaseTest": "release.yml", + "ciVersions": [ + "12.13.0", + "12.x", + "14.15.0", + "14.x", + "16.0.0", + "16.x" + ], + "releaseBranches": [ + "v8" + ] }, "license": "Artistic-2.0", "engines": { diff --git a/smoke-tests/package.json b/smoke-tests/package.json index f7c83fb8fd65f..83646cf9e4438 100644 --- a/smoke-tests/package.json +++ b/smoke-tests/package.json @@ -20,7 +20,7 @@ "devDependencies": { "@npmcli/eslint-config": "^3.1.0", "@npmcli/promise-spawn": "^3.0.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "minify-registry-metadata": "^2.2.0", "rimraf": "^3.0.2", "tap": "^16.0.1", @@ -30,7 +30,7 @@ "license": "ISC", "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.1", + "version": "4.1.0", "workspaceRepo": false }, "tap": { diff --git a/workspaces/arborist/package.json b/workspaces/arborist/package.json index b7cd92ba4cb11..bb08682430b9b 100644 --- a/workspaces/arborist/package.json +++ b/workspaces/arborist/package.json @@ -42,7 +42,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "benchmark": "^2.1.4", "chalk": "^4.1.0", "minify-registry-metadata": "^2.1.0", @@ -100,6 +100,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.1" + "version": "4.1.0" } } diff --git a/workspaces/libnpmaccess/package.json b/workspaces/libnpmaccess/package.json index 94c688e07e58e..3b2760428a0b8 100644 --- a/workspaces/libnpmaccess/package.json +++ b/workspaces/libnpmaccess/package.json @@ -17,7 +17,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -43,6 +43,6 @@ ], "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.1" + "version": "4.1.0" } } diff --git a/workspaces/libnpmdiff/package.json b/workspaces/libnpmdiff/package.json index 9f61ee8f55cc6..02bdcfdccf90c 100644 --- a/workspaces/libnpmdiff/package.json +++ b/workspaces/libnpmdiff/package.json @@ -43,7 +43,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "tap": "^16.0.1" }, "dependencies": { @@ -58,6 +58,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.1" + "version": "4.1.0" } } diff --git a/workspaces/libnpmexec/package.json b/workspaces/libnpmexec/package.json index 7f7b8eac456b9..1c31cd08afb78 100644 --- a/workspaces/libnpmexec/package.json +++ b/workspaces/libnpmexec/package.json @@ -47,7 +47,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "bin-links": "^3.0.3", "minify-registry-metadata": "^2.2.0", "mkdirp": "^1.0.4", @@ -71,6 +71,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.1" + "version": "4.1.0" } } diff --git a/workspaces/libnpmfund/package.json b/workspaces/libnpmfund/package.json index 68db1d647326a..893023934e234 100644 --- a/workspaces/libnpmfund/package.json +++ b/workspaces/libnpmfund/package.json @@ -42,7 +42,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "tap": "^16.0.1" }, "dependencies": { @@ -53,6 +53,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.1" + "version": "4.1.0" } } diff --git a/workspaces/libnpmhook/package.json b/workspaces/libnpmhook/package.json index 446170777ff26..9dd8c86426d03 100644 --- a/workspaces/libnpmhook/package.json +++ b/workspaces/libnpmhook/package.json @@ -37,7 +37,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -46,6 +46,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.1" + "version": "4.1.0" } } diff --git a/workspaces/libnpmorg/package.json b/workspaces/libnpmorg/package.json index b5ecf40cbf378..21b2b5182b65a 100644 --- a/workspaces/libnpmorg/package.json +++ b/workspaces/libnpmorg/package.json @@ -28,7 +28,7 @@ ], "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "minipass": "^3.1.1", "nock": "^13.2.4", "tap": "^16.0.1" @@ -49,6 +49,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.1" + "version": "4.1.0" } } diff --git a/workspaces/libnpmpack/package.json b/workspaces/libnpmpack/package.json index e808c7b8e3b6b..79ed112b0e490 100644 --- a/workspaces/libnpmpack/package.json +++ b/workspaces/libnpmpack/package.json @@ -23,7 +23,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "nock": "^13.0.7", "tap": "^16.0.1" }, @@ -44,6 +44,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.1" + "version": "4.1.0" } } diff --git a/workspaces/libnpmpublish/package.json b/workspaces/libnpmpublish/package.json index dd88dd5460dbe..8dd824e809461 100644 --- a/workspaces/libnpmpublish/package.json +++ b/workspaces/libnpmpublish/package.json @@ -25,7 +25,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "libnpmpack": "^4.1.3", "lodash.clonedeep": "^4.5.0", "nock": "^13.2.4", @@ -50,6 +50,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.1" + "version": "4.1.0" } } diff --git a/workspaces/libnpmsearch/package.json b/workspaces/libnpmsearch/package.json index f9b8cdded0c10..2aef9e6c416c2 100644 --- a/workspaces/libnpmsearch/package.json +++ b/workspaces/libnpmsearch/package.json @@ -26,7 +26,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -45,6 +45,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.1" + "version": "4.1.0" } } diff --git a/workspaces/libnpmteam/package.json b/workspaces/libnpmteam/package.json index 2d5a91b5e57c7..f61cefc1c199a 100644 --- a/workspaces/libnpmteam/package.json +++ b/workspaces/libnpmteam/package.json @@ -16,7 +16,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -39,6 +39,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.1" + "version": "4.1.0" } } diff --git a/workspaces/libnpmversion/package.json b/workspaces/libnpmversion/package.json index ff6415afc862b..8ef219ec15412 100644 --- a/workspaces/libnpmversion/package.json +++ b/workspaces/libnpmversion/package.json @@ -28,7 +28,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "3.8.1", + "@npmcli/template-oss": "4.1.0", "require-inject": "^1.4.4", "tap": "^16.0.1" }, @@ -44,6 +44,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "3.8.1" + "version": "4.1.0" } } From cc2c784e45da97a74a533e9a8629599e69114060 Mon Sep 17 00:00:00 2001 From: Gar Date: Tue, 13 Sep 2022 09:52:29 -0700 Subject: [PATCH 09/13] fix: keep saveTypes separate for each `add` --- workspaces/arborist/lib/add-rm-pkg-deps.js | 23 +++++++++++---------- workspaces/arborist/test/add-rm-pkg-deps.js | 16 ++++++++++++++ 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/workspaces/arborist/lib/add-rm-pkg-deps.js b/workspaces/arborist/lib/add-rm-pkg-deps.js index 7b43c38e2492b..59d5e32547c29 100644 --- a/workspaces/arborist/lib/add-rm-pkg-deps.js +++ b/workspaces/arborist/lib/add-rm-pkg-deps.js @@ -5,23 +5,24 @@ const localeCompare = require('@isaacs/string-locale-compare')('en') const add = ({ pkg, add, saveBundle, saveType }) => { for (const { name, rawSpec } of add) { + let addSaveType = saveType // if the user does not give us a type, we infer which type(s) // to keep based on the same order of priority we do when // building the tree as defined in the _loadDeps method of // the node class. - if (!saveType) { - saveType = inferSaveType(pkg, name) + if (!addSaveType) { + addSaveType = inferSaveType(pkg, name) } - if (saveType === 'prod') { + if (addSaveType === 'prod') { // a production dependency can only exist as production (rpj ensures it // doesn't coexist w/ optional) deleteSubKey(pkg, 'devDependencies', name, 'dependencies') deleteSubKey(pkg, 'peerDependencies', name, 'dependencies') - } else if (saveType === 'dev') { + } else if (addSaveType === 'dev') { // a dev dependency may co-exist as peer, or optional, but not production deleteSubKey(pkg, 'dependencies', name, 'devDependencies') - } else if (saveType === 'optional') { + } else if (addSaveType === 'optional') { // an optional dependency may co-exist as dev (rpj ensures it doesn't // coexist w/ prod) deleteSubKey(pkg, 'peerDependencies', name, 'optionalDependencies') @@ -31,23 +32,23 @@ const add = ({ pkg, add, saveBundle, saveType }) => { deleteSubKey(pkg, 'optionalDependencies', name, 'peerDependencies') } - const depType = saveTypeMap.get(saveType) + const depType = saveTypeMap.get(addSaveType) pkg[depType] = pkg[depType] || {} if (rawSpec !== '' || pkg[depType][name] === undefined) { pkg[depType][name] = rawSpec || '*' } - if (saveType === 'optional') { + if (addSaveType === 'optional') { // Affordance for previous npm versions that require this behaviour pkg.dependencies = pkg.dependencies || {} pkg.dependencies[name] = pkg.optionalDependencies[name] } - if (saveType === 'peer' || saveType === 'peerOptional') { + if (addSaveType === 'peer' || addSaveType === 'peerOptional') { const pdm = pkg.peerDependenciesMeta || {} - if (saveType === 'peer' && pdm[name] && pdm[name].optional) { + if (addSaveType === 'peer' && pdm[name] && pdm[name].optional) { pdm[name].optional = false - } else if (saveType === 'peerOptional') { + } else if (addSaveType === 'peerOptional') { pdm[name] = pdm[name] || {} pdm[name].optional = true pkg.peerDependenciesMeta = pdm @@ -59,7 +60,7 @@ const add = ({ pkg, add, saveBundle, saveType }) => { } } - if (saveBundle && saveType !== 'peer' && saveType !== 'peerOptional') { + if (saveBundle && addSaveType !== 'peer' && addSaveType !== 'peerOptional') { // keep it sorted, keep it unique const bd = new Set(pkg.bundleDependencies || []) bd.add(name) diff --git a/workspaces/arborist/test/add-rm-pkg-deps.js b/workspaces/arborist/test/add-rm-pkg-deps.js index 77ea2bd61e550..b15b9f96d74a3 100644 --- a/workspaces/arborist/test/add-rm-pkg-deps.js +++ b/workspaces/arborist/test/add-rm-pkg-deps.js @@ -17,6 +17,22 @@ t.test('add', t => { } process.on('log', log) t.teardown(() => process.off('log', log)) + t.strictSame(add({ + pkg: { + dependencies: { bar: '1' }, + devDependencies: { foo: '2' }, + }, + add: [ + foo1, + bar, + ], + path: '/', + }), { + dependencies: { bar: '1' }, + devDependencies: { foo: '1' }, + }, 'inferred save types stay the same for each dependency') + + t.strictSame(logs, []) t.strictSame(add({ pkg: { dependencies: { bar: '1' }, From 0c547fc7fcab314c5797dd7b935feb018802bf85 Mon Sep 17 00:00:00 2001 From: Luke Karrys Date: Tue, 13 Sep 2022 14:28:31 -0700 Subject: [PATCH 10/13] chore: remove workspace-deps plugin from release-please --- release-please-config.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/release-please-config.json b/release-please-config.json index 8f82980337956..89077015c9fbf 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -1,8 +1,7 @@ { "bootstrap-sha": "141faf0c19eae382d0e19833129f5545fc2355c8", "plugins": [ - "node-workspace", - "workspace-deps" + "node-workspace" ], "changelog-sections": [ { From d172c5bdbb01902b4eda012f845d6753b4ada803 Mon Sep 17 00:00:00 2001 From: Luke Karrys Date: Tue, 13 Sep 2022 14:46:16 -0700 Subject: [PATCH 11/13] chore: template-oss@4.1.1 --- .github/workflows/release-please.yml | 2 +- docs/package.json | 4 +-- package-lock.json | 36 +++++++++++++-------------- package.json | 4 +-- smoke-tests/package.json | 4 +-- workspaces/arborist/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 +-- 17 files changed, 49 insertions(+), 49 deletions(-) diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index a470405e638fb..1f7fa71b94e68 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -34,7 +34,7 @@ jobs: - run: npm i --ignore-scripts --no-audit --no-fund - name: Release Please id: release - run: npx --offline template-oss-release-please + run: npx --offline template-oss-release-please ${{ github.ref_name }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/docs/package.json b/docs/package.json index cbc43fb3ab292..2ff642a1e0693 100644 --- a/docs/package.json +++ b/docs/package.json @@ -22,7 +22,7 @@ "@npmcli/eslint-config": "^3.1.0", "@npmcli/fs": "^2.1.0", "@npmcli/promise-spawn": "^3.0.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "cmark-gfm": "^0.9.0", "jsdom": "^18.1.0", "marked-man": "^0.7.0", @@ -59,6 +59,6 @@ "ciVersions": [ "16" ], - "version": "4.1.0" + "version": "4.1.1" } } diff --git a/package-lock.json b/package-lock.json index a7992ce3d2274..62407a29f05b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -169,7 +169,7 @@ "devDependencies": { "@npmcli/eslint-config": "^3.1.0", "@npmcli/promise-spawn": "^3.0.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "fs-minipass": "^2.1.0", "licensee": "^8.2.0", "minimatch": "^5.1.0", @@ -189,7 +189,7 @@ "@npmcli/eslint-config": "^3.1.0", "@npmcli/fs": "^2.1.0", "@npmcli/promise-spawn": "^3.0.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "cmark-gfm": "^0.9.0", "jsdom": "^18.1.0", "marked-man": "^0.7.0", @@ -2362,9 +2362,9 @@ } }, "node_modules/@npmcli/template-oss": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/template-oss/-/template-oss-4.1.0.tgz", - "integrity": "sha512-gbGkAAQlP70TWs/wAaPStD/pPzCmqLY0iFUOUt+ct4gpKoHzqDrvvFXUCqI8qPUSVr+v7PP/Gxcmh6DtsZA64Q==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/template-oss/-/template-oss-4.1.1.tgz", + "integrity": "sha512-eCjea410wXg/RRdX/zwpwdi0SsBKc1WyKNyx77elXXFsxEFx9nVBT/1NmrtXVORr48sXvQrkoeRWJwQ+cjVPtA==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -13843,7 +13843,7 @@ "devDependencies": { "@npmcli/eslint-config": "^3.1.0", "@npmcli/promise-spawn": "^3.0.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "minify-registry-metadata": "^2.2.0", "rimraf": "^3.0.2", "tap": "^16.0.1", @@ -13900,7 +13900,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "benchmark": "^2.1.4", "chalk": "^4.1.0", "minify-registry-metadata": "^2.1.0", @@ -13923,7 +13923,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -13946,7 +13946,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "tap": "^16.0.1" }, "engines": { @@ -13974,7 +13974,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "bin-links": "^3.0.3", "minify-registry-metadata": "^2.2.0", "mkdirp": "^1.0.4", @@ -13992,7 +13992,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "tap": "^16.0.1" }, "engines": { @@ -14008,7 +14008,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -14025,7 +14025,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "minipass": "^3.1.1", "nock": "^13.2.4", "tap": "^16.0.1" @@ -14044,7 +14044,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "nock": "^13.0.7", "tap": "^16.0.1" }, @@ -14064,7 +14064,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "libnpmpack": "^4.1.3", "lodash.clonedeep": "^4.5.0", "nock": "^13.2.4", @@ -14082,7 +14082,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -14099,7 +14099,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -14119,7 +14119,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "require-inject": "^1.4.4", "tap": "^16.0.1" }, diff --git a/package.json b/package.json index 258111b862c9d..30f8dbdbeb6d3 100644 --- a/package.json +++ b/package.json @@ -206,7 +206,7 @@ "devDependencies": { "@npmcli/eslint-config": "^3.1.0", "@npmcli/promise-spawn": "^3.0.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "fs-minipass": "^2.1.0", "licensee": "^8.2.0", "minimatch": "^5.1.0", @@ -251,7 +251,7 @@ "templateOSS": { "rootRepo": false, "rootModule": false, - "version": "4.1.0", + "version": "4.1.1", "releaseTest": "release.yml", "ciVersions": [ "12.13.0", diff --git a/smoke-tests/package.json b/smoke-tests/package.json index 83646cf9e4438..cd48a60e5c3bf 100644 --- a/smoke-tests/package.json +++ b/smoke-tests/package.json @@ -20,7 +20,7 @@ "devDependencies": { "@npmcli/eslint-config": "^3.1.0", "@npmcli/promise-spawn": "^3.0.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "minify-registry-metadata": "^2.2.0", "rimraf": "^3.0.2", "tap": "^16.0.1", @@ -30,7 +30,7 @@ "license": "ISC", "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.1.0", + "version": "4.1.1", "workspaceRepo": false }, "tap": { diff --git a/workspaces/arborist/package.json b/workspaces/arborist/package.json index bb08682430b9b..4a8be6c4ce7cb 100644 --- a/workspaces/arborist/package.json +++ b/workspaces/arborist/package.json @@ -42,7 +42,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "benchmark": "^2.1.4", "chalk": "^4.1.0", "minify-registry-metadata": "^2.1.0", @@ -100,6 +100,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.1.0" + "version": "4.1.1" } } diff --git a/workspaces/libnpmaccess/package.json b/workspaces/libnpmaccess/package.json index 3b2760428a0b8..01092346e71f6 100644 --- a/workspaces/libnpmaccess/package.json +++ b/workspaces/libnpmaccess/package.json @@ -17,7 +17,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -43,6 +43,6 @@ ], "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.1.0" + "version": "4.1.1" } } diff --git a/workspaces/libnpmdiff/package.json b/workspaces/libnpmdiff/package.json index 02bdcfdccf90c..b1da1aa1bb969 100644 --- a/workspaces/libnpmdiff/package.json +++ b/workspaces/libnpmdiff/package.json @@ -43,7 +43,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "tap": "^16.0.1" }, "dependencies": { @@ -58,6 +58,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.1.0" + "version": "4.1.1" } } diff --git a/workspaces/libnpmexec/package.json b/workspaces/libnpmexec/package.json index 1c31cd08afb78..863beb4688839 100644 --- a/workspaces/libnpmexec/package.json +++ b/workspaces/libnpmexec/package.json @@ -47,7 +47,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "bin-links": "^3.0.3", "minify-registry-metadata": "^2.2.0", "mkdirp": "^1.0.4", @@ -71,6 +71,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.1.0" + "version": "4.1.1" } } diff --git a/workspaces/libnpmfund/package.json b/workspaces/libnpmfund/package.json index 893023934e234..17d391be4126c 100644 --- a/workspaces/libnpmfund/package.json +++ b/workspaces/libnpmfund/package.json @@ -42,7 +42,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "tap": "^16.0.1" }, "dependencies": { @@ -53,6 +53,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.1.0" + "version": "4.1.1" } } diff --git a/workspaces/libnpmhook/package.json b/workspaces/libnpmhook/package.json index 9dd8c86426d03..48dac38b2a8b3 100644 --- a/workspaces/libnpmhook/package.json +++ b/workspaces/libnpmhook/package.json @@ -37,7 +37,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -46,6 +46,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.1.0" + "version": "4.1.1" } } diff --git a/workspaces/libnpmorg/package.json b/workspaces/libnpmorg/package.json index 21b2b5182b65a..3374aa34288ea 100644 --- a/workspaces/libnpmorg/package.json +++ b/workspaces/libnpmorg/package.json @@ -28,7 +28,7 @@ ], "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "minipass": "^3.1.1", "nock": "^13.2.4", "tap": "^16.0.1" @@ -49,6 +49,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.1.0" + "version": "4.1.1" } } diff --git a/workspaces/libnpmpack/package.json b/workspaces/libnpmpack/package.json index 79ed112b0e490..701e00eb1ad9c 100644 --- a/workspaces/libnpmpack/package.json +++ b/workspaces/libnpmpack/package.json @@ -23,7 +23,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "nock": "^13.0.7", "tap": "^16.0.1" }, @@ -44,6 +44,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.1.0" + "version": "4.1.1" } } diff --git a/workspaces/libnpmpublish/package.json b/workspaces/libnpmpublish/package.json index 8dd824e809461..dda1477201b5b 100644 --- a/workspaces/libnpmpublish/package.json +++ b/workspaces/libnpmpublish/package.json @@ -25,7 +25,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "libnpmpack": "^4.1.3", "lodash.clonedeep": "^4.5.0", "nock": "^13.2.4", @@ -50,6 +50,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.1.0" + "version": "4.1.1" } } diff --git a/workspaces/libnpmsearch/package.json b/workspaces/libnpmsearch/package.json index 2aef9e6c416c2..9cd26196d1a94 100644 --- a/workspaces/libnpmsearch/package.json +++ b/workspaces/libnpmsearch/package.json @@ -26,7 +26,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -45,6 +45,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.1.0" + "version": "4.1.1" } } diff --git a/workspaces/libnpmteam/package.json b/workspaces/libnpmteam/package.json index f61cefc1c199a..be4fd45527636 100644 --- a/workspaces/libnpmteam/package.json +++ b/workspaces/libnpmteam/package.json @@ -16,7 +16,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "nock": "^13.2.4", "tap": "^16.0.1" }, @@ -39,6 +39,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.1.0" + "version": "4.1.1" } } diff --git a/workspaces/libnpmversion/package.json b/workspaces/libnpmversion/package.json index 8ef219ec15412..aab8131607ec0 100644 --- a/workspaces/libnpmversion/package.json +++ b/workspaces/libnpmversion/package.json @@ -28,7 +28,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", - "@npmcli/template-oss": "4.1.0", + "@npmcli/template-oss": "4.1.1", "require-inject": "^1.4.4", "tap": "^16.0.1" }, @@ -44,6 +44,6 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.1.0" + "version": "4.1.1" } } From 683973c76ef981f0da5ddb3d9f3286a9464b9279 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 21:50:30 +0000 Subject: [PATCH 12/13] chore: release 8.19.2 --- .release-please-manifest.json | 8 ++++---- CHANGELOG.md | 8 ++++++++ package-lock.json | 2 +- package.json | 6 +++--- workspaces/arborist/CHANGELOG.md | 6 ++++++ workspaces/arborist/package.json | 2 +- workspaces/libnpmexec/CHANGELOG.md | 6 ++++++ workspaces/libnpmexec/package.json | 4 ++-- workspaces/libnpmfund/CHANGELOG.md | 6 ++++++ workspaces/libnpmfund/package.json | 4 ++-- 10 files changed, 39 insertions(+), 13 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 1fcd6a2fedf0c..cc0074dfd1c57 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,10 +1,10 @@ { - ".": "8.19.1", - "workspaces/arborist": "5.6.1", + ".": "8.19.2", + "workspaces/arborist": "5.6.2", "workspaces/libnpmaccess": "6.0.4", "workspaces/libnpmdiff": "4.0.5", - "workspaces/libnpmexec": "4.0.12", - "workspaces/libnpmfund": "3.0.3", + "workspaces/libnpmexec": "4.0.13", + "workspaces/libnpmfund": "3.0.4", "workspaces/libnpmhook": "8.0.4", "workspaces/libnpmorg": "4.0.4", "workspaces/libnpmpack": "4.1.3", diff --git a/CHANGELOG.md b/CHANGELOG.md index f864a61f9d8b3..0fb9d15f8dd8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [8.19.2](https://github.com/npm/cli/compare/v8.19.1...v8.19.2) (2022-09-13) + +### Dependencies + +* [Workspace](https://github.com/npm/cli/compare/arborist-v5.6.1...arborist-v5.6.2): `@npmcli/arborist@5.6.2` +* [Workspace](https://github.com/npm/cli/compare/libnpmexec-v4.0.12...libnpmexec-v4.0.13): `libnpmexec@4.0.13` +* [Workspace](https://github.com/npm/cli/compare/libnpmfund-v3.0.3...libnpmfund-v3.0.4): `libnpmfund@3.0.4` + ## [8.19.1](https://github.com/npm/cli/compare/v8.19.0...v8.19.1) (2022-09-01) ### Bug Fixes diff --git a/package-lock.json b/package-lock.json index 62407a29f05b2..c7dc803681307 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "npm", - "version": "8.19.1", + "version": "8.19.2", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/package.json b/package.json index 30f8dbdbeb6d3..2a511be78f6ee 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ }, "dependencies": { "@isaacs/string-locale-compare": "^1.1.0", - "@npmcli/arborist": "^5.6.1", + "@npmcli/arborist": "^5.6.2", "@npmcli/ci-detect": "^2.0.0", "@npmcli/config": "^4.2.1", "@npmcli/fs": "^2.1.0", @@ -81,8 +81,8 @@ "json-parse-even-better-errors": "^2.3.1", "libnpmaccess": "^6.0.4", "libnpmdiff": "^4.0.5", - "libnpmexec": "^4.0.12", - "libnpmfund": "^3.0.3", + "libnpmexec": "^4.0.13", + "libnpmfund": "^3.0.4", "libnpmhook": "^8.0.4", "libnpmorg": "^4.0.4", "libnpmpack": "^4.1.3", diff --git a/workspaces/arborist/CHANGELOG.md b/workspaces/arborist/CHANGELOG.md index eb3c924c12180..fbe735553eca6 100644 --- a/workspaces/arborist/CHANGELOG.md +++ b/workspaces/arborist/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [5.6.2](https://github.com/npm/cli/compare/arborist-v5.6.1...arborist-v5.6.2) (2022-09-13) + +### Bug Fixes + +* [`cc2c784`](https://github.com/npm/cli/commit/cc2c784e45da97a74a533e9a8629599e69114060) [#5500](https://github.com/npm/cli/pull/5500) keep saveTypes separate for each `add` (@wraithgar) + ## [5.6.1](https://github.com/npm/cli/compare/arborist-v5.6.0...arborist-v5.6.1) (2022-08-31) ### Bug Fixes diff --git a/workspaces/arborist/package.json b/workspaces/arborist/package.json index 4a8be6c4ce7cb..7f1b266305ef2 100644 --- a/workspaces/arborist/package.json +++ b/workspaces/arborist/package.json @@ -1,6 +1,6 @@ { "name": "@npmcli/arborist", - "version": "5.6.1", + "version": "5.6.2", "description": "Manage node_modules trees", "dependencies": { "@isaacs/string-locale-compare": "^1.1.0", diff --git a/workspaces/libnpmexec/CHANGELOG.md b/workspaces/libnpmexec/CHANGELOG.md index b847a0538e9e4..36e51794fe32d 100644 --- a/workspaces/libnpmexec/CHANGELOG.md +++ b/workspaces/libnpmexec/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [4.0.13](https://github.com/npm/cli/compare/libnpmexec-v4.0.12...libnpmexec-v4.0.13) (2022-09-13) + +### Dependencies + +* [Workspace](https://github.com/npm/cli/compare/arborist-v5.6.1...arborist-v5.6.2): `@npmcli/arborist@5.6.2` + ## [4.0.12](https://github.com/npm/cli/compare/libnpmexec-v4.0.11...libnpmexec-v4.0.12) (2022-08-31) ### Dependencies diff --git a/workspaces/libnpmexec/package.json b/workspaces/libnpmexec/package.json index 863beb4688839..7542bce982e42 100644 --- a/workspaces/libnpmexec/package.json +++ b/workspaces/libnpmexec/package.json @@ -1,6 +1,6 @@ { "name": "libnpmexec", - "version": "4.0.12", + "version": "4.0.13", "files": [ "bin/", "lib/" @@ -54,7 +54,7 @@ "tap": "^16.0.1" }, "dependencies": { - "@npmcli/arborist": "^5.6.1", + "@npmcli/arborist": "^5.6.2", "@npmcli/ci-detect": "^2.0.0", "@npmcli/fs": "^2.1.1", "@npmcli/run-script": "^4.2.0", diff --git a/workspaces/libnpmfund/CHANGELOG.md b/workspaces/libnpmfund/CHANGELOG.md index f07ad6b414f7e..ea79c88d59db0 100644 --- a/workspaces/libnpmfund/CHANGELOG.md +++ b/workspaces/libnpmfund/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [3.0.4](https://github.com/npm/cli/compare/libnpmfund-v3.0.3...libnpmfund-v3.0.4) (2022-09-13) + +### Dependencies + +* [Workspace](https://github.com/npm/cli/compare/arborist-v5.6.1...arborist-v5.6.2): `@npmcli/arborist@5.6.2` + ## [3.0.3](https://github.com/npm/cli/compare/libnpmfund-v3.0.2...libnpmfund-v3.0.3) (2022-08-31) ### Dependencies diff --git a/workspaces/libnpmfund/package.json b/workspaces/libnpmfund/package.json index 17d391be4126c..562a973e2dec1 100644 --- a/workspaces/libnpmfund/package.json +++ b/workspaces/libnpmfund/package.json @@ -1,6 +1,6 @@ { "name": "libnpmfund", - "version": "3.0.3", + "version": "3.0.4", "main": "lib/index.js", "files": [ "bin/", @@ -46,7 +46,7 @@ "tap": "^16.0.1" }, "dependencies": { - "@npmcli/arborist": "^5.6.1" + "@npmcli/arborist": "^5.6.2" }, "engines": { "node": "^12.13.0 || ^14.15.0 || >=16.0.0" From 6065f860d1b54d540e10b9a6c94235ec79072537 Mon Sep 17 00:00:00 2001 From: Luke Karrys Date: Tue, 13 Sep 2022 15:05:57 -0700 Subject: [PATCH 13/13] chore: post pull request --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index c7dc803681307..62c220ddc4429 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "npm", - "version": "8.19.1", + "version": "8.19.2", "bundleDependencies": [ "@isaacs/string-locale-compare", "@npmcli/arborist", @@ -91,7 +91,7 @@ ], "dependencies": { "@isaacs/string-locale-compare": "^1.1.0", - "@npmcli/arborist": "^5.6.1", + "@npmcli/arborist": "^5.6.2", "@npmcli/ci-detect": "^2.0.0", "@npmcli/config": "^4.2.1", "@npmcli/fs": "^2.1.0", @@ -116,8 +116,8 @@ "json-parse-even-better-errors": "^2.3.1", "libnpmaccess": "^6.0.4", "libnpmdiff": "^4.0.5", - "libnpmexec": "^4.0.12", - "libnpmfund": "^3.0.3", + "libnpmexec": "^4.0.13", + "libnpmfund": "^3.0.4", "libnpmhook": "^8.0.4", "libnpmorg": "^4.0.4", "libnpmpack": "^4.1.3", @@ -13855,7 +13855,7 @@ }, "workspaces/arborist": { "name": "@npmcli/arborist", - "version": "5.6.1", + "version": "5.6.2", "license": "ISC", "dependencies": { "@isaacs/string-locale-compare": "^1.1.0", @@ -13954,10 +13954,10 @@ } }, "workspaces/libnpmexec": { - "version": "4.0.12", + "version": "4.0.13", "license": "ISC", "dependencies": { - "@npmcli/arborist": "^5.6.1", + "@npmcli/arborist": "^5.6.2", "@npmcli/ci-detect": "^2.0.0", "@npmcli/fs": "^2.1.1", "@npmcli/run-script": "^4.2.0", @@ -13985,10 +13985,10 @@ } }, "workspaces/libnpmfund": { - "version": "3.0.3", + "version": "3.0.4", "license": "ISC", "dependencies": { - "@npmcli/arborist": "^5.6.1" + "@npmcli/arborist": "^5.6.2" }, "devDependencies": { "@npmcli/eslint-config": "^3.1.0", diff --git a/package.json b/package.json index 2a511be78f6ee..573e5d06e73a7 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "8.19.1", + "version": "8.19.2", "name": "npm", "description": "a package manager for JavaScript", "workspaces": [