Skip to content

Commit 298a6c1

Browse files
mrgraingithub-actions
and
github-actions
authored
fix(cdk-assets): use same SDK versions as other packages (#121)
Fixes dependency resolution warnings when installing toolkit-lib. ``` npm warn ERESOLVE overriding peer dependency npm warn While resolving: @aws-sdk/[email protected] npm warn Found: @aws-sdk/[email protected] npm warn node_modules/@aws-sdk/client-s3 npm warn @aws-sdk/client-s3@"3.741" from @aws-cdk/[email protected] npm warn node_modules/@aws-cdk/toolkit-lib npm warn @aws-cdk/toolkit-lib@"*" from the root project npm warn 2 more (@aws-sdk/lib-storage, cdk-assets) npm warn npm warn Could not resolve dependency: npm warn peer @aws-sdk/client-s3@"^3.750.0" from @aws-sdk/[email protected] npm warn node_modules/cdk-assets/node_modules/@aws-sdk/lib-storage npm warn @aws-sdk/lib-storage@"^3.750.0" from [email protected] npm warn node_modules/cdk-assets npm warn npm warn Conflicting peer dependency: @aws-sdk/[email protected] npm warn node_modules/@aws-sdk/client-s3 npm warn peer @aws-sdk/client-s3@"^3.750.0" from @aws-sdk/[email protected] npm warn node_modules/cdk-assets/node_modules/@aws-sdk/lib-storage npm warn @aws-sdk/lib-storage@"^3.750.0" from [email protected] npm warn node_modules/cdk-assets ``` --- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license --------- Signed-off-by: github-actions <[email protected]> Co-authored-by: github-actions <[email protected]>
1 parent a23376e commit 298a6c1

File tree

9 files changed

+199
-6471
lines changed

9 files changed

+199
-6471
lines changed

.projen/deps.json

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.projenrc.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ const repoProject = new yarn.Monorepo({
165165
'glob',
166166
'semver',
167167
`@aws-sdk/client-s3@${CLI_SDK_V3_RANGE}`,
168-
'@aws-sdk/credential-providers',
169-
'@aws-sdk/lib-storage',
168+
`@aws-sdk/credential-providers@${CLI_SDK_V3_RANGE}`,
169+
`@aws-sdk/lib-storage@${CLI_SDK_V3_RANGE}`,
170170
],
171171
vscodeWorkspace: true,
172172
vscodeWorkspaceOptions: {
@@ -558,8 +558,8 @@ const cdkAssets = configureProject(
558558
`@aws-sdk/client-s3@${CLI_SDK_V3_RANGE}`,
559559
`@aws-sdk/client-secrets-manager@${CLI_SDK_V3_RANGE}`,
560560
`@aws-sdk/client-sts@${CLI_SDK_V3_RANGE}`,
561-
'@aws-sdk/credential-providers',
562-
'@aws-sdk/lib-storage',
561+
`@aws-sdk/credential-providers@${CLI_SDK_V3_RANGE}`,
562+
`@aws-sdk/lib-storage@${CLI_SDK_V3_RANGE}`,
563563
'@smithy/config-resolver',
564564
'@smithy/node-config-provider',
565565
],

package.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES

+93-3,185
Large diffs are not rendered by default.

packages/aws-cdk/THIRD_PARTY_LICENSES

+93-3,185
Large diffs are not rendered by default.

packages/cdk-assets/.projen/deps.json

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/cdk-assets/.projen/tasks.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/cdk-assets/package.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

yarn.lock

-92
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)