Skip to content

chore: fix cyclic package dependencies #33022

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

Merged
merged 22 commits into from
Jan 25, 2025
Merged

chore: fix cyclic package dependencies #33022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
8757016
chore: make tests work with new SDKv3 version
rix0rrr Jan 20, 2025
c186032
Update docstring
rix0rrr Jan 20, 2025
792b25a
Merge remote-tracking branch 'origin/main' into huijbers/sdkv3-update…
rix0rrr Jan 20, 2025
8d64461
Avoid bumping lerna
rix0rrr Jan 20, 2025
4030933
Avoid bumping this
rix0rrr Jan 20, 2025
ae4992a
chore: fix cyclic package dependencies
rix0rrr Jan 20, 2025
331e932
Merge remote-tracking branch 'origin/main' into huijbers/sdkv3-update…
rix0rrr Jan 20, 2025
4d6f0e2
Update more deps
rix0rrr Jan 20, 2025
8d130e5
License file
rix0rrr Jan 20, 2025
924477e
Merge branch 'huijbers/sdkv3-update-tets' into huijbers/lerna-cycles
rix0rrr Jan 20, 2025
ac1c1fc
Merge remote-tracking branch 'origin/main' into huijbers/lerna-cycles
rix0rrr Jan 20, 2025
8987514
Update TPL
rix0rrr Jan 21, 2025
d35a586
Merge remote-tracking branch 'origin/main' into huijbers/lerna-cycles
rix0rrr Jan 21, 2025
2784603
Moar TPL
rix0rrr Jan 21, 2025
2ff0222
TPL
rix0rrr Jan 21, 2025
f472a85
Snapshots
rix0rrr Jan 21, 2025
0d53a1e
Don't update bun lockfile
rix0rrr Jan 21, 2025
dab7ec6
buuuuuuuuuunnnnnnnnnn
rix0rrr Jan 24, 2025
e183e9a
Merge remote-tracking branch 'origin/main' into huijbers/lerna-cycles
rix0rrr Jan 24, 2025
ec8d408
Merge remote-tracking branch 'origin/main' into huijbers/lerna-cycles
rix0rrr Jan 24, 2025
d12cf3c
Merge remote-tracking branch 'origin/main' into huijbers/lerna-cycles
rix0rrr Jan 25, 2025
9831fb7
snappy
rix0rrr Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion nx.json
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
12 changes: 6 additions & 6 deletions ...ic-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.assets.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ...-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.template.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...aws-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.js.snapshot/cdk.out
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ...js.snapshot/codepipelineelasticbeanstalkdeployDefaultTestDeployAssert785E452B.assets.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ...-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.js.snapshot/integ.json
View file
Open in desktop

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

11 changes: 3 additions & 8 deletions ...depipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.js.snapshot/manifest.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ...s-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.js.snapshot/tree.json
View file
Open in desktop

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

12 changes: 6 additions & 6 deletions ...source.js.snapshot/DynamoImportSourceIntegTestDefaultTestDeployAssert540810E4.assets.json
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions ...urce.js.snapshot/DynamoImportSourceIntegTestDefaultTestDeployAssert540810E4.template.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ...work-integ/test/aws-dynamodb/test/integ.import-source.js.snapshot/DynamoStack.assets.json
View file
Open in desktop

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

12 changes: 6 additions & 6 deletions ...ramework-integ/test/aws-dynamodb/test/integ.import-source.js.snapshot/S3Stack.assets.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ...mework-integ/test/aws-dynamodb/test/integ.import-source.js.snapshot/S3Stack.template.json
View file
Open in desktop
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
Loading