Skip to content

Commit d9427e2

Browse files
authored
chore: upgrade lerna & nx to next major (#25984)
And adjust the configuration accordingly. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 49643d6 commit d9427e2

File tree

6 files changed

+627
-945
lines changed

6 files changed

+627
-945
lines changed

lerna.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"npmClient": "yarn",
3-
"useWorkspaces": true,
43
"packages": [
54
"packages/aws-cdk-lib",
65
"packages/cdk-assets",
@@ -22,7 +21,7 @@
2221
"tools/@aws-cdk/yarn-cling",
2322
"scripts/@aws-cdk/script-tests"
2423
],
25-
"rejectCycles": "true",
24+
"rejectCycles": true,
2625
"version": "0.0.0",
2726
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
2827
}

nx.json

+34-20
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,9 @@
11
{
2-
"extends": "@nrwl/workspace/presets/npm.json",
3-
"workspaceLayout": { },
4-
"tasksRunnerOptions": {
5-
"default": {
6-
"runner": "@nrwl/workspace/tasks-runners/default",
7-
"options": {
8-
"cacheableOperations": [
9-
"build",
10-
"test",
11-
"lint",
12-
"package",
13-
"prepare"
14-
]
15-
}
16-
}
17-
},
182
"targetDefaults": {
193
"build": {
20-
"implicitDependencies": ["aws-cdk-lib"],
21-
"dependsOn": ["^build"],
4+
"dependsOn": [
5+
"^build"
6+
],
227
"inputs": [
238
"{projectRoot}/**/lib/!(*.d|*.generated).ts",
249
"{projectRoot}/**/test/!(*.d).ts",
@@ -28,7 +13,7 @@
2813
"!{workspaceRoot}/**/tsconfig.tsbuildinfo"
2914
],
3015
"outputs": [
31-
"!{projectRoot}/**/*.integ.*.js.snapshot/*",
16+
"{projectRoot}/**/*.integ.*.js.snapshot/*",
3217
"{projectRoot}/tsconfig.json",
3318
"{projectRoot}/**/lib/aws-custom-resource/sdk-api-metadata.json",
3419
"{projectRoot}/**/build-info.json",
@@ -46,7 +31,25 @@
4631
]
4732
},
4833
"test": {
49-
"dependsOn": ["build"]
34+
"dependsOn": [
35+
"build"
36+
]
37+
}
38+
},
39+
"extends": "@nrwl/workspace/presets/npm.json",
40+
"workspaceLayout": {},
41+
"tasksRunnerOptions": {
42+
"default": {
43+
"runner": "@nx/workspace/tasks-runners/default",
44+
"options": {
45+
"cacheableOperations": [
46+
"build",
47+
"test",
48+
"lint",
49+
"package",
50+
"prepare"
51+
]
52+
}
5053
}
5154
},
5255
"affected": {
@@ -56,5 +59,16 @@
5659
"@nrwl/js": {
5760
"analyzeSourceFiles": false
5861
}
62+
},
63+
"$schema": "./node_modules/nx/schemas/nx-schema.json",
64+
"namedInputs": {
65+
"default": [
66+
"{projectRoot}/**/*",
67+
"sharedGlobals"
68+
],
69+
"sharedGlobals": [],
70+
"production": [
71+
"default"
72+
]
5973
}
6074
}

package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
"build-all": "tsc -b"
1616
},
1717
"devDependencies": {
18-
"@nrwl/cli": "^15.9.4",
19-
"@nrwl/workspace": "^15.9.4",
18+
"@nx/workspace": "^16.3.2",
2019
"@types/node": "18.11.19",
2120
"@types/prettier": "2.6.0",
2221
"@yarnpkg/lockfile": "^1.1.0",
@@ -29,8 +28,8 @@
2928
"jsii-pacmak": "1.82.0",
3029
"jsii-reflect": "1.82.0",
3130
"jsii-rosetta": "~5.0.8",
32-
"lerna": "^6.6.1",
33-
"nx": "^15.9.4",
31+
"lerna": "^7.0.1",
32+
"nx": "^16.3.2",
3433
"patch-package": "^6.5.1",
3534
"semver": "^6.3.0",
3635
"standard-version": "^9.5.0",

packages/@aws-cdk/integ-runner/THIRD_PARTY_LICENSES

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
156156

157157
----------------
158158

159-
** aws-sdk@2.1396.0 - https://www.npmjs.com/package/aws-sdk/v/2.1396.0 | Apache-2.0
159+
** aws-sdk@2.1397.0 - https://www.npmjs.com/package/aws-sdk/v/2.1397.0 | Apache-2.0
160160
AWS SDK for JavaScript
161161
Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
162162

packages/aws-cdk/THIRD_PARTY_LICENSES

+1-1
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
268268

269269
----------------
270270

271-
** aws-sdk@2.1396.0 - https://www.npmjs.com/package/aws-sdk/v/2.1396.0 | Apache-2.0
271+
** aws-sdk@2.1397.0 - https://www.npmjs.com/package/aws-sdk/v/2.1397.0 | Apache-2.0
272272
AWS SDK for JavaScript
273273
Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
274274

0 commit comments

Comments
 (0)