From 29a6e2c2e0d919f595ab1d9e0b685e9627f7ec41 Mon Sep 17 00:00:00 2001 From: Chris Sidi Date: Tue, 30 Jul 2024 16:15:03 -0400 Subject: [PATCH 1/6] fix!: Address breaking engine change in dependency node 14.17.0 no longer works due to https://github.com/isaacs/minipass/commit/1270e6ac685fbc527fd43dd57e95c9a171f11bea BREAKING CHANGE: `ssri` is now compatible with the following semver range for node: `^16.14.0 || >=18.0.0` --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2839541..7b86fac 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "tap": "^16.0.1" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^16.14.0 || >=18.0.0" }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", From f2dd0125e4381f54ce97d4e03e57c21b3ff0aa3d Mon Sep 17 00:00:00 2001 From: Chris Sidi Date: Tue, 30 Jul 2024 16:15:48 -0400 Subject: [PATCH 2/6] chore: template-oss-apply --- .github/workflows/ci-release.yml | 10 ++-------- .github/workflows/ci.yml | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index ae2532c..0c952cb 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -87,21 +87,15 @@ jobs: os: windows-latest shell: cmd node-version: - - 14.17.0 - - 14.x - - 16.13.0 + - 16.14.0 - 16.x - 18.0.0 - 18.x - 20.x - 22.x exclude: - - platform: { name: macOS, os: macos-latest, shell: bash } - node-version: 14.17.0 - - platform: { name: macOS, os: macos-latest, shell: bash } - node-version: 14.x - platform: { name: macOS, os: macos-13, shell: bash } - node-version: 16.13.0 + node-version: 16.14.0 - platform: { name: macOS, os: macos-13, shell: bash } node-version: 16.x - platform: { name: macOS, os: macos-13, shell: bash } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 28dca18..7915009 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,21 +64,15 @@ jobs: os: windows-latest shell: cmd node-version: - - 14.17.0 - - 14.x - - 16.13.0 + - 16.14.0 - 16.x - 18.0.0 - 18.x - 20.x - 22.x exclude: - - platform: { name: macOS, os: macos-latest, shell: bash } - node-version: 14.17.0 - - platform: { name: macOS, os: macos-latest, shell: bash } - node-version: 14.x - platform: { name: macOS, os: macos-13, shell: bash } - node-version: 16.13.0 + node-version: 16.14.0 - platform: { name: macOS, os: macos-13, shell: bash } node-version: 16.x - platform: { name: macOS, os: macos-13, shell: bash } From 4508f71d8a873a2d3cee9369fa6117530bee6b6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 17:35:13 +0000 Subject: [PATCH 3/6] chore: bump @npmcli/template-oss from 4.22.0 to 4.23.3 Bumps [@npmcli/template-oss](https://github.com/npm/template-oss) from 4.22.0 to 4.23.3. - [Release notes](https://github.com/npm/template-oss/releases) - [Changelog](https://github.com/npm/template-oss/blob/main/CHANGELOG.md) - [Commits](https://github.com/npm/template-oss/compare/v4.22.0...v4.23.3) --- updated-dependencies: - dependency-name: @npmcli/template-oss dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7b86fac..a7a2d3b 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.22.0", + "@npmcli/template-oss": "4.23.3", "tap": "^16.0.1" }, "engines": { From f2a2a9d09fd8956180b8aaf30b69481f61da0e2d Mon Sep 17 00:00:00 2001 From: Chris Sidi Date: Tue, 27 Aug 2024 15:42:21 -0400 Subject: [PATCH 4/6] chore: postinstall for dependabot template-oss PR --- .commitlintrc.js | 1 + .github/actions/create-check/action.yml | 2 +- .github/actions/install-latest-npm/action.yml | 2 +- .github/workflows/ci-release.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/post-dependabot.yml | 2 +- .gitignore | 7 ++++--- SECURITY.md | 2 +- package.json | 9 +++++---- 9 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.commitlintrc.js b/.commitlintrc.js index e9c80b9..b706e52 100644 --- a/.commitlintrc.js +++ b/.commitlintrc.js @@ -7,5 +7,6 @@ module.exports = { 'header-max-length': [2, 'always', 80], 'subject-case': [0], 'body-max-line-length': [0], + 'footer-max-line-length': [0], }, } diff --git a/.github/actions/create-check/action.yml b/.github/actions/create-check/action.yml index aa24a5b..d1220c9 100644 --- a/.github/actions/create-check/action.yml +++ b/.github/actions/create-check/action.yml @@ -25,7 +25,7 @@ runs: with: result-encoding: string script: | - const { repo: { owner, repo}, runId, serverUrl } = context + const { repo: { owner, repo}, runId, serverUrl } = context const { JOB_NAME, SHA } = process.env const job = await github.rest.actions.listJobsForWorkflowRun({ diff --git a/.github/actions/install-latest-npm/action.yml b/.github/actions/install-latest-npm/action.yml index 8339dbf..580603d 100644 --- a/.github/actions/install-latest-npm/action.yml +++ b/.github/actions/install-latest-npm/action.yml @@ -44,7 +44,7 @@ runs: MATCH=$SPEC echo "Found compatible version: npm@$MATCH" break - fi + fi done if [ -z $MATCH ]; then diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index 0c952cb..3678b6c 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -61,7 +61,7 @@ jobs: run: npm run postlint --ignore-scripts - name: Conclude Check uses: LouisBrunner/checks-action@v1.6.0 - if: always() + if: steps.create-check.outputs.check-id && always() with: token: ${{ secrets.GITHUB_TOKEN }} conclusion: ${{ job.status }} @@ -145,7 +145,7 @@ jobs: run: npm test --ignore-scripts - name: Conclude Check uses: LouisBrunner/checks-action@v1.6.0 - if: always() + if: steps.create-check.outputs.check-id && always() with: token: ${{ secrets.GITHUB_TOKEN }} conclusion: ${{ job.status }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 13efe1b..15c8efe 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -29,8 +29,8 @@ jobs: git config --global user.email "npm-cli+bot@github.com" git config --global user.name "npm CLI robot" - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: javascript - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/post-dependabot.yml b/.github/workflows/post-dependabot.yml index a7ebe12..1ea8693 100644 --- a/.github/workflows/post-dependabot.yml +++ b/.github/workflows/post-dependabot.yml @@ -49,7 +49,7 @@ jobs: id: flags run: | dependabot_dir="${{ steps.metadata.outputs.directory }}" - if [[ "$dependabot_dir" == "/" ]]; then + if [[ "$dependabot_dir" == "/" || "$dependabot_dir" == "/main" ]]; then echo "workspace=-iwr" >> $GITHUB_OUTPUT else # strip leading slash from directory so it works as a diff --git a/.gitignore b/.gitignore index 773cada..2bab6d1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,17 +2,17 @@ # ignore everything in the root /* -# transient test directories -tap-testdir*/ -# keep these !**/.gitignore !/.commitlintrc.js !/.eslintrc.js !/.eslintrc.local.* +!/.git-blame-ignore-revs !/.github/ !/.gitignore !/.npmrc +!/.prettierignore +!/.prettierrc.js !/.release-please-manifest.json !/bin/ !/CHANGELOG* @@ -30,3 +30,4 @@ tap-testdir*/ !/tap-snapshots/ !/test/ !/tsconfig.json +tap-testdir*/ diff --git a/SECURITY.md b/SECURITY.md index 9cd2dea..4fe06a2 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,7 +2,7 @@ GitHub takes the security of our software products and services seriously, including the open source code repositories managed through our GitHub organizations, such as [GitHub](https://github.com/GitHub). -If you believe you have found a security vulnerability in this GitHub-owned open source repository, you can report it to us in one of two ways. +If you believe you have found a security vulnerability in this GitHub-owned open source repository, you can report it to us in one of two ways. If the vulnerability you have found is *not* [in scope for the GitHub Bug Bounty Program](https://bounty.github.com/#scope) or if you do not wish to be considered for a bounty reward, please report the issue to us directly through [opensource-security@github.com](mailto:opensource-security@github.com). diff --git a/package.json b/package.json index a7a2d3b..d58973d 100644 --- a/package.json +++ b/package.json @@ -13,11 +13,12 @@ "posttest": "npm run lint", "test": "tap", "coverage": "tap", - "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"", + "lint": "npm run eslint", "postlint": "template-oss-check", "template-oss-apply": "template-oss-apply --force", - "lintfix": "npm run lint -- --fix", - "snap": "tap" + "lintfix": "npm run eslint -- --fix", + "snap": "tap", + "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"" }, "tap": { "check-coverage": true, @@ -59,7 +60,7 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.22.0", + "version": "4.23.3", "publish": "true" } } From db4219f28ab4576c32cde8ef008f2fc408b7f577 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 12:22:20 +0000 Subject: [PATCH 5/6] chore: bump @npmcli/eslint-config from 4.0.5 to 5.0.0 Bumps [@npmcli/eslint-config](https://github.com/npm/eslint-config) from 4.0.5 to 5.0.0. - [Release notes](https://github.com/npm/eslint-config/releases) - [Changelog](https://github.com/npm/eslint-config/blob/main/CHANGELOG.md) - [Commits](https://github.com/npm/eslint-config/compare/v4.0.5...v5.0.0) --- updated-dependencies: - dependency-name: "@npmcli/eslint-config" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d58973d..ff35558 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "minipass": "^7.0.3" }, "devDependencies": { - "@npmcli/eslint-config": "^4.0.0", + "@npmcli/eslint-config": "^5.0.0", "@npmcli/template-oss": "4.23.3", "tap": "^16.0.1" }, From ba65b07e5bb3b4041c71bb499a1e76d82c0fa367 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 12:28:01 -0400 Subject: [PATCH 6/6] chore: release 11.0.0 (#138) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :robot: I have created a release *beep* *boop* --- ## [11.0.0](https://github.com/npm/ssri/compare/v10.0.6...v11.0.0) (2024-09-03) ### ⚠️ BREAKING CHANGES * `ssri` is now compatible with the following semver range for node: `^16.14.0 || >=18.0.0` ### Bug Fixes * [`29a6e2c`](https://github.com/npm/ssri/commit/29a6e2c2e0d919f595ab1d9e0b685e9627f7ec41) Address breaking engine change in dependency (@hashtagchris) ### Chores * [`db4219f`](https://github.com/npm/ssri/commit/db4219f28ab4576c32cde8ef008f2fc408b7f577) bump @npmcli/eslint-config from 4.0.5 to 5.0.0 (@dependabot[bot]) * [`f2dd012`](https://github.com/npm/ssri/commit/f2dd0125e4381f54ce97d4e03e57c21b3ff0aa3d) template-oss-apply (@hashtagchris) * [`f2a2a9d`](https://github.com/npm/ssri/commit/f2a2a9d09fd8956180b8aaf30b69481f61da0e2d) postinstall for dependabot template-oss PR (@hashtagchris) * [`4508f71`](https://github.com/npm/ssri/commit/4508f71d8a873a2d3cee9369fa6117530bee6b6c) bump @npmcli/template-oss from 4.22.0 to 4.23.3 (@dependabot[bot]) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .release-please-manifest.json | 2 +- CHANGELOG.md | 11 +++++++++++ package.json | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 430e183..4981afa 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "10.0.6" + ".": "11.0.0" } diff --git a/CHANGELOG.md b/CHANGELOG.md index e1eaea6..d5103fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [11.0.0](https://github.com/npm/ssri/compare/v10.0.6...v11.0.0) (2024-09-03) +### ⚠️ BREAKING CHANGES +* `ssri` is now compatible with the following semver range for node: `^16.14.0 || >=18.0.0` +### Bug Fixes +* [`29a6e2c`](https://github.com/npm/ssri/commit/29a6e2c2e0d919f595ab1d9e0b685e9627f7ec41) Address breaking engine change in dependency (@hashtagchris) +### Chores +* [`db4219f`](https://github.com/npm/ssri/commit/db4219f28ab4576c32cde8ef008f2fc408b7f577) bump @npmcli/eslint-config from 4.0.5 to 5.0.0 (@dependabot[bot]) +* [`f2dd012`](https://github.com/npm/ssri/commit/f2dd0125e4381f54ce97d4e03e57c21b3ff0aa3d) template-oss-apply (@hashtagchris) +* [`f2a2a9d`](https://github.com/npm/ssri/commit/f2a2a9d09fd8956180b8aaf30b69481f61da0e2d) postinstall for dependabot template-oss PR (@hashtagchris) +* [`4508f71`](https://github.com/npm/ssri/commit/4508f71d8a873a2d3cee9369fa6117530bee6b6c) bump @npmcli/template-oss from 4.22.0 to 4.23.3 (@dependabot[bot]) + ## [10.0.6](https://github.com/npm/ssri/compare/v10.0.5...v10.0.6) (2024-05-04) ### Bug Fixes diff --git a/package.json b/package.json index ff35558..3d8e1c0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ssri", - "version": "10.0.6", + "version": "11.0.0", "description": "Standard Subresource Integrity library -- parses, serializes, generates, and verifies integrity metadata according to the SRI spec.", "main": "lib/index.js", "files": [