Skip to content

Commit

Permalink
chore: upgrade lerna & nx to next major (#25984)
Browse files Browse the repository at this point in the history
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*
  • Loading branch information
RomainMuller authored Jun 15, 2023
1 parent 49643d6 commit d9427e2
Show file tree
Hide file tree
Showing 6 changed files with 627 additions and 945 deletions.
3 changes: 1 addition & 2 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"npmClient": "yarn",
"useWorkspaces": true,
"packages": [
"packages/aws-cdk-lib",
"packages/cdk-assets",
Expand All @@ -22,7 +21,7 @@
"tools/@aws-cdk/yarn-cling",
"scripts/@aws-cdk/script-tests"
],
"rejectCycles": "true",
"rejectCycles": true,
"version": "0.0.0",
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
}
54 changes: 34 additions & 20 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,9 @@
{
"extends": "@nrwl/workspace/presets/npm.json",
"workspaceLayout": { },
"tasksRunnerOptions": {
"default": {
"runner": "@nrwl/workspace/tasks-runners/default",
"options": {
"cacheableOperations": [
"build",
"test",
"lint",
"package",
"prepare"
]
}
}
},
"targetDefaults": {
"build": {
"implicitDependencies": ["aws-cdk-lib"],
"dependsOn": ["^build"],
"dependsOn": [
"^build"
],
"inputs": [
"{projectRoot}/**/lib/!(*.d|*.generated).ts",
"{projectRoot}/**/test/!(*.d).ts",
Expand All @@ -28,7 +13,7 @@
"!{workspaceRoot}/**/tsconfig.tsbuildinfo"
],
"outputs": [
"!{projectRoot}/**/*.integ.*.js.snapshot/*",
"{projectRoot}/**/*.integ.*.js.snapshot/*",
"{projectRoot}/tsconfig.json",
"{projectRoot}/**/lib/aws-custom-resource/sdk-api-metadata.json",
"{projectRoot}/**/build-info.json",
Expand All @@ -46,7 +31,25 @@
]
},
"test": {
"dependsOn": ["build"]
"dependsOn": [
"build"
]
}
},
"extends": "@nrwl/workspace/presets/npm.json",
"workspaceLayout": {},
"tasksRunnerOptions": {
"default": {
"runner": "@nx/workspace/tasks-runners/default",
"options": {
"cacheableOperations": [
"build",
"test",
"lint",
"package",
"prepare"
]
}
}
},
"affected": {
Expand All @@ -56,5 +59,16 @@
"@nrwl/js": {
"analyzeSourceFiles": false
}
},
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"namedInputs": {
"default": [
"{projectRoot}/**/*",
"sharedGlobals"
],
"sharedGlobals": [],
"production": [
"default"
]
}
}
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
"build-all": "tsc -b"
},
"devDependencies": {
"@nrwl/cli": "^15.9.4",
"@nrwl/workspace": "^15.9.4",
"@nx/workspace": "^16.3.2",
"@types/node": "18.11.19",
"@types/prettier": "2.6.0",
"@yarnpkg/lockfile": "^1.1.0",
Expand All @@ -29,8 +28,8 @@
"jsii-pacmak": "1.82.0",
"jsii-reflect": "1.82.0",
"jsii-rosetta": "~5.0.8",
"lerna": "^6.6.1",
"nx": "^15.9.4",
"lerna": "^7.0.1",
"nx": "^16.3.2",
"patch-package": "^6.5.1",
"semver": "^6.3.0",
"standard-version": "^9.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/integ-runner/THIRD_PARTY_LICENSES
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE

----------------

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

Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk/THIRD_PARTY_LICENSES
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE

----------------

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

Expand Down
Loading

0 comments on commit d9427e2

Please sign in to comment.