Skip to content

Commit

Permalink
Merge pull request #732 from Financial-Times/add-node-22-support
Browse files Browse the repository at this point in the history
Add support for Node 22 and remove npm engine field
  • Loading branch information
joelcarr authored Jan 2, 2025
2 parents 2e59b06 + 24ddb73 commit 95c1c45
Show file tree
Hide file tree
Showing 39 changed files with 249 additions and 327 deletions.
32 changes: 16 additions & 16 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ references:
- image: cimg/node:<< parameters.node-version >>
parameters:
node-version:
default: '20.12'
default: '22.12'
type: string

workspace_root: &workspace_root ~/project
Expand Down Expand Up @@ -179,21 +179,21 @@ workflows:
name: build-v<< matrix.node-version >>
matrix:
parameters:
node-version: [ '18.20', '20.12' ]
node-version: [ '18.20', '20.18', '22.12' ]
- test:
requires:
- build-v<< matrix.node-version >>
name: test-v<< matrix.node-version >>
matrix:
parameters:
node-version: [ '18.20', '20.12' ]
node-version: [ '18.20', '20.18', '22.12' ]
- lint:
requires:
- build-v<< matrix.node-version >>
name: lint-v<< matrix.node-version >>
matrix:
parameters:
node-version: [ '18.20', '20.12' ]
node-version: [ '18.20', '20.18', '22.12' ]

release-please:
when:
Expand All @@ -219,7 +219,7 @@ workflows:
name: build-v<< matrix.node-version >>
matrix:
parameters:
node-version: [ '18.20', '20.12' ]
node-version: [ '18.20', '20.18', '22.12' ]
- test:
filters:
<<: *filters_release_build
Expand All @@ -228,7 +228,7 @@ workflows:
name: test-v<< matrix.node-version >>
matrix:
parameters:
node-version: [ '18.20', '20.12' ]
node-version: [ '18.20', '20.18', '22.12' ]
- lint:
filters:
<<: *filters_release_build
Expand All @@ -237,14 +237,14 @@ workflows:
name: lint-v<< matrix.node-version >>
matrix:
parameters:
node-version: [ '18.20', '20.12' ]
node-version: [ '18.20', '20.18', '22.12' ]
- publish:
context: npm-publish-token
filters:
<<: *filters_release_build
requires:
- lint-v20.12
- test-v20.12
- lint-v22.12
- test-v22.12

build-test-prepublish:
when:
Expand All @@ -259,7 +259,7 @@ workflows:
name: build-v<< matrix.node-version >>
matrix:
parameters:
node-version: [ '18.20', '20.12' ]
node-version: [ '18.20', '20.18', '22.12' ]
- test:
filters:
<<: *filters_prerelease_build
Expand All @@ -268,7 +268,7 @@ workflows:
name: test-v<< matrix.node-version >>
matrix:
parameters:
node-version: [ '18.20', '20.12' ]
node-version: [ '18.20', '20.18', '22.12' ]
- lint:
filters:
<<: *filters_prerelease_build
Expand All @@ -277,14 +277,14 @@ workflows:
name: lint-v<< matrix.node-version >>
matrix:
parameters:
node-version: [ '18.20', '20.12' ]
node-version: [ '18.20', '20.18', '22.12' ]
- prepublish:
context: npm-publish-token
filters:
<<: *filters_prerelease_build
requires:
- lint-v20.12
- test-v20.12
- lint-v22.12
- test-v22.12

nightly:
when:
Expand All @@ -301,15 +301,15 @@ workflows:
name: build-v<< matrix.node-version >>
matrix:
parameters:
node-version: [ '18.20', '20.12' ]
node-version: [ '18.20', '20.18', '22.12' ]
- test:
requires:
- build-v<< matrix.node-version >>
context: next-nightly-build
name: test-v<< matrix.node-version >>
matrix:
parameters:
node-version: [ '18.20', '20.12' ]
node-version: [ '18.20', '20.18', '22.12' ]

# Prior to producing a development orb (which requires credentials) basic validation, linting, and even unit testing can be performed.
# This workflow will run on every commit
Expand Down
3 changes: 1 addition & 2 deletions core/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@
"zod-validation-error": "^2.1.0"
},
"engines": {
"node": "18.x || 20.x",
"npm": "7.x || 8.x || 9.x || 10.x"
"node": "18.x || 20.x || 22.x"
},
"files": [
"/bin",
Expand Down
3 changes: 1 addition & 2 deletions core/create/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
"extends": "../../package.json"
},
"engines": {
"node": "18.x || 20.x",
"npm": "7.x || 8.x || 9.x || 10.x"
"node": "18.x || 20.x || 22.x"
}
}
3 changes: 1 addition & 2 deletions lib/doppler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"winston": "^3.5.1"
},
"engines": {
"node": "18.x || 20.x",
"npm": "7.x || 8.x || 9.x || 10.x"
"node": "18.x || 20.x || 22.x"
}
}
3 changes: 1 addition & 2 deletions lib/error/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"tslib": "^2.3.1"
},
"engines": {
"node": "18.x || 20.x",
"npm": "7.x || 8.x || 9.x || 10.x"
"node": "18.x || 20.x || 22.x"
}
}
3 changes: 1 addition & 2 deletions lib/logger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"@types/triple-beam": "^1.3.2"
},
"engines": {
"node": "18.x || 20.x",
"npm": "7.x || 8.x || 9.x || 10.x"
"node": "18.x || 20.x || 22.x"
}
}
3 changes: 1 addition & 2 deletions lib/state/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"tslib": "^2.3.1"
},
"engines": {
"node": "18.x || 20.x",
"npm": "7.x || 8.x || 9.x || 10.x"
"node": "18.x || 20.x || 22.x"
}
}
3 changes: 1 addition & 2 deletions lib/wait-for-ok/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"extends": "../../package.json"
},
"engines": {
"node": "18.x || 20.x",
"npm": "7.x || 8.x || 9.x || 10.x"
"node": "18.x || 20.x || 22.x"
}
}
Loading

0 comments on commit 95c1c45

Please sign in to comment.