Skip to content

Commit

Permalink
chore: upgrade to [email protected] (aws#24869)
Browse files Browse the repository at this point in the history
Fixes an issue with deep directory imports that resolve to an `/index` file, when compiling with `<4.0` TypeScript compilers.

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
  • Loading branch information
RomainMuller authored and Hogan Bobertz committed Mar 30, 2023
1 parent 397e46c commit c7cd6ee
Show file tree
Hide file tree
Showing 15 changed files with 57 additions and 25 deletions.
3 changes: 2 additions & 1 deletion packages/@aws-cdk/assertions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"typesVersions": {
"<=3.9": {
"*": [
".types-compat/ts3.9/*"
".types-compat/ts3.9/*",
".types-compat/ts3.9/*/index.d.ts"
]
}
},
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-eks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"typesVersions": {
"<=3.9": {
"*": [
".types-compat/ts3.9/*"
".types-compat/ts3.9/*",
".types-compat/ts3.9/*/index.d.ts"
]
}
},
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-elasticloadbalancingv2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"typesVersions": {
"<=3.9": {
"*": [
".types-compat/ts3.9/*"
".types-compat/ts3.9/*",
".types-compat/ts3.9/*/index.d.ts"
]
}
},
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-elasticsearch/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"typesVersions": {
"<=3.9": {
"*": [
".types-compat/ts3.9/*"
".types-compat/ts3.9/*",
".types-compat/ts3.9/*/index.d.ts"
]
}
},
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-events-targets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"typesVersions": {
"<=3.9": {
"*": [
".types-compat/ts3.9/*"
".types-compat/ts3.9/*",
".types-compat/ts3.9/*/index.d.ts"
]
}
},
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-lambda-go/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"typesVersions": {
"<=3.9": {
"*": [
".types-compat/ts3.9/*"
".types-compat/ts3.9/*",
".types-compat/ts3.9/*/index.d.ts"
]
}
},
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-lambda-nodejs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"typesVersions": {
"<=3.9": {
"*": [
".types-compat/ts3.9/*"
".types-compat/ts3.9/*",
".types-compat/ts3.9/*/index.d.ts"
]
}
},
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-opensearchservice/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"typesVersions": {
"<=3.9": {
"*": [
".types-compat/ts3.9/*"
".types-compat/ts3.9/*",
".types-compat/ts3.9/*/index.d.ts"
]
}
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cli-lib/THIRD_PARTY_LICENSES
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The @aws-cdk/cli-lib package includes the following third-party software/licensing:

** @jsii/check-node@1.77.0 - https://www.npmjs.com/package/@jsii/check-node/v/1.77.0 | Apache-2.0
** @jsii/check-node@1.78.1 - https://www.npmjs.com/package/@jsii/check-node/v/1.78.1 | Apache-2.0
jsii
Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.

Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"typesVersions": {
"<=3.9": {
"*": [
".types-compat/ts3.9/*"
".types-compat/ts3.9/*",
".types-compat/ts3.9/*/index.d.ts"
]
}
},
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/custom-resources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"typesVersions": {
"<=3.9": {
"*": [
".types-compat/ts3.9/*"
".types-compat/ts3.9/*",
".types-compat/ts3.9/*/index.d.ts"
]
}
},
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/pipelines/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"typesVersions": {
"<=3.9": {
"*": [
".types-compat/ts3.9/*"
".types-compat/ts3.9/*",
".types-compat/ts3.9/*/index.d.ts"
]
}
},
Expand Down
8 changes: 7 additions & 1 deletion packages/aws-cdk-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"typesVersions": {
"<=3.9": {
"*": [
".types-compat/ts3.9/*"
".types-compat/ts3.9/*",
".types-compat/ts3.9/*/index.d.ts"
]
}
},
Expand Down Expand Up @@ -482,6 +483,7 @@
"./aws-codestarconnections": "./aws-codestarconnections/index.js",
"./aws-codestarnotifications": "./aws-codestarnotifications/index.js",
"./aws-cognito": "./aws-cognito/index.js",
"./aws-comprehend": "./aws-comprehend/index.js",
"./aws-config": "./aws-config/index.js",
"./aws-connect": "./aws-connect/index.js",
"./aws-connectcampaigns": "./aws-connectcampaigns/index.js",
Expand Down Expand Up @@ -543,6 +545,7 @@
"./aws-imagebuilder": "./aws-imagebuilder/index.js",
"./aws-inspector": "./aws-inspector/index.js",
"./aws-inspectorv2": "./aws-inspectorv2/index.js",
"./aws-internetmonitor": "./aws-internetmonitor/index.js",
"./aws-iot": "./aws-iot/index.js",
"./aws-iot1click": "./aws-iot1click/index.js",
"./aws-iotanalytics": "./aws-iotanalytics/index.js",
Expand All @@ -555,6 +558,7 @@
"./aws-iottwinmaker": "./aws-iottwinmaker/index.js",
"./aws-iotwireless": "./aws-iotwireless/index.js",
"./aws-ivs": "./aws-ivs/index.js",
"./aws-ivschat": "./aws-ivschat/index.js",
"./aws-kafkaconnect": "./aws-kafkaconnect/index.js",
"./aws-kendra": "./aws-kendra/index.js",
"./aws-kendraranking": "./aws-kendraranking/index.js",
Expand Down Expand Up @@ -656,9 +660,11 @@
"./aws-stepfunctions-tasks": "./aws-stepfunctions-tasks/index.js",
"./aws-supportapp": "./aws-supportapp/index.js",
"./aws-synthetics": "./aws-synthetics/index.js",
"./aws-systemsmanagersap": "./aws-systemsmanagersap/index.js",
"./aws-timestream": "./aws-timestream/index.js",
"./aws-transfer": "./aws-transfer/index.js",
"./aws-voiceid": "./aws-voiceid/index.js",
"./aws-vpclattice": "./aws-vpclattice/index.js",
"./aws-waf": "./aws-waf/index.js",
"./aws-wafregional": "./aws-wafregional/index.js",
"./aws-wafv2": "./aws-wafv2/index.js",
Expand Down
2 changes: 1 addition & 1 deletion tools/@aws-cdk/cdk-build-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"fs-extra": "^9.1.0",
"jest": "^27.5.1",
"jest-junit": "^13.2.0",
"jsii": "~5.0.0",
"jsii": "~5.0.2",
"jsii-pacmak": "1.78.1",
"jsii-reflect": "1.78.1",
"markdownlint-cli": "^0.33.0",
Expand Down
37 changes: 26 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -811,6 +811,14 @@
chalk "^4.1.2"
semver "^7.3.8"

"@jsii/[email protected]":
version "1.79.0"
resolved "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.79.0.tgz#802fb9db739a805dffd87acc44c3f534c554ad6d"
integrity sha512-CQk5RtaFqbWAWcV35ciVqdLT7NnPPjYeRPnlD3KY7bkYhvYC7z2kcmRpTycGBRk7NS7Plr3l+4i02gjCzr59eA==
dependencies:
chalk "^4.1.2"
semver "^7.3.8"

"@jsii/[email protected]":
version "1.77.0"
resolved "https://registry.npmjs.org/@jsii/spec/-/spec-1.77.0.tgz#2ee31c32e26d61880e422a546a62296c6543bff9"
Expand All @@ -832,6 +840,13 @@
dependencies:
ajv "^8.12.0"

"@jsii/spec@^1.79.0":
version "1.79.0"
resolved "https://registry.npmjs.org/@jsii/spec/-/spec-1.79.0.tgz#0fc9d9dfda05c85cf67295a5b7d6e438128e74d1"
integrity sha512-ZmHObap/rOSjvoeqTmQOYrxm26vRftYepAmtd7yVwnNu/3tbwXcdSQMs/2rjaMsn6H3pmDwn048g3lUtYszzaw==
dependencies:
ajv "^8.12.0"

"@lerna/[email protected]":
version "4.0.0"
resolved "https://registry.npmjs.org/@lerna/add/-/add-4.0.0.tgz#c36f57d132502a57b9e7058d1548b7a565ef183f"
Expand Down Expand Up @@ -7187,12 +7202,12 @@ [email protected]:
yargs "^16.2.0"

[email protected]:
version "5.0.0-dev.3"
resolved "https://registry.npmjs.org/jsii/-/jsii-5.0.0-dev.3.tgz#d87ddd873e472b657aaaf884b837833da0ec8056"
integrity sha512-y3slZsIEaIPXeNlQcv/k0nPJXZR8qtyl1dVaLU24oQnKaxOZGZQhrmUSDNBzLNjC+6GSk855UXzZWnBNmv3tlg==
version "5.0.2-dev.2"
resolved "https://registry.npmjs.org/jsii/-/jsii-5.0.2-dev.2.tgz#03df0368380f6c7deeafc0996d2d18f9a5dfafca"
integrity sha512-DO9nWtNV0XCG0Be3xxn/bOaWmwgXuTzlDyj8w6fF+odUpnDFx/CJDtqfaOfhC6ITUmpr3rkicNTAhBAZQD/xuQ==
dependencies:
"@jsii/check-node" "1.78.1"
"@jsii/spec" "^1.78.1"
"@jsii/check-node" "1.79.0"
"@jsii/spec" "^1.79.0"
case "^1.6.3"
chalk "^4"
downlevel-dts "^0.11.0"
Expand All @@ -7205,13 +7220,13 @@ [email protected]:
typescript "~5.0.2"
yargs "^17.7.1"

jsii@~5.0.0:
version "5.0.0"
resolved "https://registry.npmjs.org/jsii/-/jsii-5.0.0.tgz#8e4196c8bb902c30d650f57c035ee418200e8b65"
integrity sha512-/lMnzw2ySi8iFtlIuA5o8PoZXkXfeWBURR8TVj32aaeW2A9ueMbgQicqgd8A31yF1BZNLdTjunsenChAMCZK+Q==
jsii@~5.0.2:
version "5.0.2"
resolved "https://registry.npmjs.org/jsii/-/jsii-5.0.2.tgz#d8d7252583a73d7812b3d8a58ad22d4b71ce4170"
integrity sha512-5L9Kl11jGS9Iikf0Ran/Vv1CYHAkTfeuRs9JPj9x8qvwJxMQwhQDwEiz6RqT1ekAxZs6syknpa077/Yt+l4ifQ==
dependencies:
"@jsii/check-node" "1.78.1"
"@jsii/spec" "^1.78.1"
"@jsii/check-node" "1.79.0"
"@jsii/spec" "^1.79.0"
case "^1.6.3"
chalk "^4"
downlevel-dts "^0.11.0"
Expand Down

0 comments on commit c7cd6ee

Please sign in to comment.