Skip to content

Commit c9fdc8a

Browse files
authored
feat(cli): use up-to-date dependencies in init templates (#23124)
Upgrades dependencies for all init templates. Also changes the upgrade workflow to be less restrictive in which dependencies should be updated for the init-templates. ---- ### All Submissions: * [x] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [x] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 8a1460e commit c9fdc8a

File tree

6 files changed

+21
-27
lines changed

6 files changed

+21
-27
lines changed

.github/workflows/yarn-upgrade.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
- name: Locate Yarn cache
2626
id: yarn-cache
27-
run: echo "::set-output name=dir::$(yarn cache dir)"
27+
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
2828

2929
- name: Restore Yarn cache
3030
uses: actions/cache@v3
@@ -45,7 +45,7 @@ jobs:
4545
# These need to be ignored from the `ncu` runs!
4646
run: |-
4747
echo -n "::set-output name=list::"
48-
node -p "$(lerna ls --all --json 2>/dev/null).map(item => item.name).join(',')"
48+
echo "list=$(lerna ls --all --json 2>/dev/null | jq -r 'map(.name) | join(",")')" >> $GITHUB_OUTPUT
4949
- name: Run "ncu -u"
5050
# We special-case @types/node because we want to stay on the current major (minimum supported node release)
5151
# We special-case @types/fs-extra because the current major (9.x) is broken with @types/node >= 10
@@ -65,10 +65,10 @@ jobs:
6565
lerna exec --parallel ncu -- --upgrade --reject='@types/node,@types/prettier,@types/fs-extra,constructs,typescript,aws-sdk,aws-sdk-mock,${{ steps.list-packages.outputs.list }}' --target=minor
6666
# Upgrade package.jsons in init templates
6767
for pj in $(find packages/aws-cdk/lib/init-templates -name package.json); do
68-
(cd $(dirname $pj) && ncu --upgrade --reject='@types/babel__traverse,@types/jest,@types/node,@types/prettier,@types/fs-extra,constructs,typescript,aws-sdk,aws-sdk-mock,ts-jest,jest,${{ steps.list-packages.outputs.list }}')
68+
(cd $(dirname $pj) && ncu --upgrade --reject='constructs,${{ steps.list-packages.outputs.list }}')
6969
done
7070
# Upgrade dependencies at an aws-eks integ test docker image
71-
cd packages/@aws-cdk/aws-eks/test/sdk-call-integ-test-docker-app/app/ && ncu --upgrade --reject='@types/jest,@types/node,@types/prettier,@types/fs-extra,constructs,typescript,aws-sdk,aws-sdk-mock,ts-jest,jest,${{ steps.list-packages.outputs.list }}'
71+
cd packages/@aws-cdk/aws-eks/test/sdk-call-integ-test-docker-app/app/ && ncu --upgrade --reject='aws-sdk,${{ steps.list-packages.outputs.list }}'
7272
7373
# This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn update" to run)
7474
- name: Run "yarn install"

packages/aws-cdk/lib/init-templates/app/javascript/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"devDependencies": {
1313
"aws-cdk": "%cdk-version%",
14-
"jest": "^27.5.1"
14+
"jest": "^29.3.1"
1515
},
1616
"dependencies": {
1717
"aws-cdk-lib": "%cdk-version%",

packages/aws-cdk/lib/init-templates/app/typescript/package.json

+5-7
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@
1111
"cdk": "cdk"
1212
},
1313
"devDependencies": {
14-
"@types/babel__traverse": "7.18.2",
15-
"@types/jest": "^27.5.2",
16-
"@types/node": "10.17.27",
17-
"@types/prettier": "2.6.0",
18-
"jest": "^27.5.1",
19-
"ts-jest": "^27.1.4",
14+
"@types/jest": "^29.2.3",
15+
"@types/node": "18.11.9",
16+
"jest": "^29.3.1",
17+
"ts-jest": "^29.0.3",
2018
"aws-cdk": "%cdk-version%",
2119
"ts-node": "^10.9.1",
22-
"typescript": "~3.9.7"
20+
"typescript": "~4.9.3"
2321
},
2422
"dependencies": {
2523
"aws-cdk-lib": "%cdk-version%",

packages/aws-cdk/lib/init-templates/lib/typescript/package.json

+5-7
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@
99
"test": "jest"
1010
},
1111
"devDependencies": {
12-
"@types/babel__traverse": "7.18.2",
13-
"@types/jest": "^27.5.2",
14-
"@types/node": "10.17.27",
15-
"@types/prettier": "2.6.0",
12+
"@types/jest": "^29.2.3",
13+
"@types/node": "18.11.9",
1614
"aws-cdk-lib": "%cdk-version%",
1715
"constructs": "%constructs-version%",
18-
"jest": "^27.5.1",
19-
"ts-jest": "^27.1.4",
20-
"typescript": "~3.9.7"
16+
"jest": "^29.3.1",
17+
"ts-jest": "^29.0.3",
18+
"typescript": "~4.9.3"
2119
},
2220
"peerDependencies": {
2321
"aws-cdk-lib": "%cdk-version%",

packages/aws-cdk/lib/init-templates/sample-app/javascript/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"devDependencies": {
1313
"aws-cdk": "%cdk-version%",
14-
"jest": "^27.5.1"
14+
"jest": "^29.3.1"
1515
},
1616
"dependencies": {
1717
"aws-cdk-lib": "%cdk-version%",

packages/aws-cdk/lib/init-templates/sample-app/typescript/package.json

+5-7
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@
1111
"cdk": "cdk"
1212
},
1313
"devDependencies": {
14+
"@types/jest": "^29.2.3",
15+
"@types/node": "18.11.9",
16+
"jest": "^29.3.1",
17+
"ts-jest": "^29.0.3",
1418
"aws-cdk": "%cdk-version%",
15-
"@types/babel__traverse": "7.18.2",
16-
"@types/jest": "^27.5.2",
17-
"@types/node": "10.17.27",
18-
"@types/prettier": "2.6.0",
19-
"jest": "^27.5.1",
20-
"ts-jest": "^27.1.4",
2119
"ts-node": "^10.9.1",
22-
"typescript": "~3.9.7"
20+
"typescript": "~4.9.3"
2321
},
2422
"dependencies": {
2523
"aws-cdk-lib": "%cdk-version%",

0 commit comments

Comments
 (0)