Skip to content

Commit

Permalink
chore: fix cyclic package dependencies (#33022)
Browse files Browse the repository at this point in the history
We can't upgrade Lerna/NX anymore because we have cyclic dependencies
between our packages that the old NX wasn't able to detect, but the new
one is.

Remove those cyclic dependencies and upgrade NX.

Depends-On: #33016

----

*By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache-2.0 license*
  • Loading branch information
rix0rrr authored Jan 25, 2025
1 parent 097caaa commit 06144d9
Show file tree
Hide file tree
Showing 439 changed files with 4,088 additions and 86,984 deletions.
2 changes: 1 addition & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
]
}
},
"extends": "@nrwl/workspace/presets/npm.json",
"extends": "@nx/workspace/presets/npm.json",
"workspaceLayout": {},
"tasksRunnerOptions": {
"default": {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"build-all": "tsc -b"
},
"devDependencies": {
"@nx/workspace": "^19.8.6",
"@nx/workspace": "^20",
"@types/node": "18.11.19",
"@types/prettier": "2.6.0",
"@yarnpkg/lockfile": "^1.1.0",
Expand All @@ -29,7 +29,7 @@
"jsii-pacmak": "1.106.0",
"jsii-reflect": "1.106.0",
"lerna": "^8.1.8",
"nx": "^19.8.6",
"nx": "^20",
"semver": "^7.6.3",
"standard-version": "^9.5.0",
"ts-jest": "^29.2.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk-testing/cli-integ/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@aws-sdk/credential-providers": "3.632.0",
"@smithy/util-retry": "3.0.8",
"@smithy/types": "3.6.0",
"axios": "^1.7.7",
"axios": "1.7.7",
"chalk": "^4",
"fs-extra": "^9.1.0",
"glob": "^7.2.3",
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk-testing/framework-integ/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
"@aws-sdk/client-acm": "3.632.0",
"@aws-sdk/client-rds": "3.632.0",
"@aws-sdk/client-s3": "3.632.0",
"delay": "5.0.0"
"delay": "5.0.0",
"axios": "1.7.8"
},
"dependencies": {
"@aws-cdk/integ-tests-alpha": "0.0.0",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "f24ba5e516d9d80b64bc7b0f406eedd12c36b20e7461f3e7719b7ffbdad72410.zip"
"S3Key": "e42a736be21cd3134b9bff4e71e3afa99a4cc900ae489e9a7f7025c8d258f9b8.zip"
},
"Description": "/opt/awscli/aws"
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "f24ba5e516d9d80b64bc7b0f406eedd12c36b20e7461f3e7719b7ffbdad72410.zip"
"S3Key": "e42a736be21cd3134b9bff4e71e3afa99a4cc900ae489e9a7f7025c8d258f9b8.zip"
},
"Description": "/opt/awscli/aws"
}
Expand Down
Loading

0 comments on commit 06144d9

Please sign in to comment.