Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(cli): use up-to-date dependencies in init templates #23124

Merged
merged 2 commits into from Dec 7, 2022
+21 −27
Merged

feat(cli): use up-to-date dependencies in init templates #23124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d71e406
feat(cli): use up-to-date dependencies in init templates
mrgrain Nov 28, 2022
c667bac
Merge branch 'main' into mrgrain/fix/upgrade-deps-in-samples
mergify[bot] Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/yarn-upgrade.yml
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ jobs:

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

- name: Restore Yarn cache
uses: actions/cache@v3
Expand All @@ -45,7 +45,7 @@ jobs:
# These need to be ignored from the `ncu` runs!
run: |-
echo -n "::set-output name=list::"
node -p "$(lerna ls --all --json 2>/dev/null).map(item => item.name).join(',')"
echo "list=$(lerna ls --all --json 2>/dev/null | jq -r 'map(.name) | join(",")')" >> $GITHUB_OUTPUT
- name: Run "ncu -u"
# We special-case @types/node because we want to stay on the current major (minimum supported node release)
# We special-case @types/fs-extra because the current major (9.x) is broken with @types/node >= 10
Expand All @@ -65,10 +65,10 @@ jobs:
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
# Upgrade package.jsons in init templates
for pj in $(find packages/aws-cdk/lib/init-templates -name package.json); do
(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 }}')
(cd $(dirname $pj) && ncu --upgrade --reject='constructs,${{ steps.list-packages.outputs.list }}')
done
# Upgrade dependencies at an aws-eks integ test docker image
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 }}'
cd packages/@aws-cdk/aws-eks/test/sdk-call-integ-test-docker-app/app/ && ncu --upgrade --reject='aws-sdk,${{ steps.list-packages.outputs.list }}'

# This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn update" to run)
- name: Run "yarn install"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk/lib/init-templates/app/javascript/package.json
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
},
"devDependencies": {
"aws-cdk": "%cdk-version%",
"jest": "^27.5.1"
"jest": "^29.3.1"
},
"dependencies": {
"aws-cdk-lib": "%cdk-version%",
Expand Down
12 changes: 5 additions & 7 deletions packages/aws-cdk/lib/init-templates/app/typescript/package.json
View file
Open in desktop
Expand Up @@ -11,15 +11,13 @@
"cdk": "cdk"
},
"devDependencies": {
"@types/babel__traverse": "7.18.2",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing this is intentional right? We don't need it for #23126?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's not required anymore because the app now uses a recent TS version. 🎉

"@types/jest": "^27.5.2",
"@types/node": "10.17.27",
"@types/prettier": "2.6.0",
"jest": "^27.5.1",
"ts-jest": "^27.1.4",
"@types/jest": "^29.2.3",
"@types/node": "18.11.9",
"jest": "^29.3.1",
"ts-jest": "^29.0.3",
"aws-cdk": "%cdk-version%",
"ts-node": "^10.9.1",
"typescript": "~3.9.7"
"typescript": "~4.9.3"
},
"dependencies": {
"aws-cdk-lib": "%cdk-version%",
Expand Down
12 changes: 5 additions & 7 deletions packages/aws-cdk/lib/init-templates/lib/typescript/package.json
View file
Open in desktop
Expand Up @@ -9,15 +9,13 @@
"test": "jest"
},
"devDependencies": {
"@types/babel__traverse": "7.18.2",
"@types/jest": "^27.5.2",
"@types/node": "10.17.27",
"@types/prettier": "2.6.0",
"@types/jest": "^29.2.3",
"@types/node": "18.11.9",
"aws-cdk-lib": "%cdk-version%",
"constructs": "%constructs-version%",
"jest": "^27.5.1",
"ts-jest": "^27.1.4",
"typescript": "~3.9.7"
"jest": "^29.3.1",
"ts-jest": "^29.0.3",
"typescript": "~4.9.3"
},
"peerDependencies": {
"aws-cdk-lib": "%cdk-version%",
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk/lib/init-templates/sample-app/javascript/package.json
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
},
"devDependencies": {
"aws-cdk": "%cdk-version%",
"jest": "^27.5.1"
"jest": "^29.3.1"
},
"dependencies": {
"aws-cdk-lib": "%cdk-version%",
Expand Down
12 changes: 5 additions & 7 deletions packages/aws-cdk/lib/init-templates/sample-app/typescript/package.json
View file
Open in desktop
Expand Up @@ -11,15 +11,13 @@
"cdk": "cdk"
},
"devDependencies": {
"@types/jest": "^29.2.3",
"@types/node": "18.11.9",
"jest": "^29.3.1",
"ts-jest": "^29.0.3",
"aws-cdk": "%cdk-version%",
"@types/babel__traverse": "7.18.2",
"@types/jest": "^27.5.2",
"@types/node": "10.17.27",
"@types/prettier": "2.6.0",
"jest": "^27.5.1",
"ts-jest": "^27.1.4",
"ts-node": "^10.9.1",
"typescript": "~3.9.7"
"typescript": "~4.9.3"
},
"dependencies": {
"aws-cdk-lib": "%cdk-version%",
Expand Down