-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: upgrade lerna and use nx (#24896)
Updating lerna to the latest version which now uses `nx` under the hood. Apart from just updating the version, this also allows us to take advantage of nx caching. For now this has only been enabled locally. I'm not 100% sure about the `nx` configuration since our repo is a little weird, but I've been running locally with this configuration for probably 6 months and it has worked fine for me. Side note - the repo restructure has caused some weirdness with our tests. I had to make some updates to existing tests, and I do not know why. Closes #<issue number here>. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
- Loading branch information
Showing
20 changed files
with
2,084 additions
and
1,772 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,29 @@ | ||
| { | ||
| "lerna": "^4.0.0", | ||
| "npmClient": "yarn", | ||
| "useWorkspaces": true, | ||
| "packages": [ | ||
| "packages/*", | ||
| "packages/aws-cdk-lib", | ||
| "packages/cdk-cli-wrapper", | ||
| "packages/cdk-assets", | ||
| "packages/aws-cdk", | ||
| "packages/cdk", | ||
| "packages/@aws-cdk/*", | ||
| "packages/awslint", | ||
| "packages/@aws-cdk-containers/*", | ||
| "packages/@aws-cdk-testing/*", | ||
| "packages/@aws-cdk/*/lambda-packages/*", | ||
| "tools/*", | ||
| "tools/@aws-cdk/*", | ||
| "scripts/@aws-cdk/script-tests", | ||
| "packages/individual-packages/*" | ||
| "tools/@aws-cdk/cdk-build-tools", | ||
| "tools/@aws-cdk/cdk-release", | ||
| "tools/@aws-cdk/cfn2ts", | ||
| "tools/@aws-cdk/eslint-plugin", | ||
| "tools/@aws-cdk/node-bundle", | ||
| "tools/@aws-cdk/pkglint", | ||
| "tools/@aws-cdk/pkgtools", | ||
| "tools/@aws-cdk/prlint", | ||
| "tools/@aws-cdk/yarn-cling", | ||
| "scripts/@aws-cdk/script-tests" | ||
| ], | ||
| "rejectCycles": "true", | ||
| "version": "0.0.0" | ||
| "version": "0.0.0", | ||
| "$schema": "node_modules/lerna/schemas/lerna-schema.json" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| { | ||
| "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"], | ||
| "inputs": [ | ||
| "{projectRoot}/lib/!(*.d|*.generated).ts", | ||
| "{projectRoot}/test/!(*.d).ts", | ||
| "!{workspaceRoot}/**/tsconfig.json", | ||
| "!{workspaceRoot}/**/tsconfig.json", | ||
| "!{workspaceRoot}/tsconfig.base.json", | ||
| "!{workspaceRoot}/**/tsconfig.tsbuildinfo" | ||
| ], | ||
| "outputs": [ | ||
| "!{projectRoot}/**/*.integ.snapshot/*", | ||
| "{projectRoot}/tsconfig.json", | ||
| "{projectRoot}/lib/aws-custom-resource/sdk-api-metadata.json", | ||
| "{projectRoot}/build-info.json", | ||
| "{projectRoot}/lib/**/*.js", | ||
| "{projectRoot}/lib/layer.zip", | ||
| "{projectRoot}/bin/**/*.js", | ||
| "{projectRoot}/lib/**/*.js.map", | ||
| "{projectRoot}/lib/**/*.generated.ts", | ||
| "{projectRoot}/lib/**/*.d.ts", | ||
| "{projectRoot}/test/**/*.d.ts", | ||
| "{projectRoot}/test/**/*.js", | ||
| "{projectRoot}/.jsii", | ||
| "{projectRoot}/spec/*.json", | ||
| "{projectRoot}/.warnings.jsii.js" | ||
| ] | ||
| }, | ||
| "test": { | ||
| "dependsOn": ["build"] | ||
| }, | ||
| }, | ||
| "affected": { | ||
| "defaultBase": "main" | ||
| }, | ||
| "pluginsConfig": { | ||
| "@nrwl/js": { | ||
| "analyzeSourceFiles": false | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...st/aws-ec2/test/integ.nat-instances.lit.js.snapshot/aws-cdk-vpc-nat-instances.assets.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...cdk-testing/framework-integ/test/aws-ec2/test/integ.nat-instances.lit.js.snapshot/cdk.out
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| {"version":"20.0.0"} | ||
| {"version":"31.0.0"} |
12 changes: 5 additions & 7 deletions
12
...-testing/framework-integ/test/aws-ec2/test/integ.nat-instances.lit.js.snapshot/integ.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,12 @@ | ||
| { | ||
| "version": "21.0.0", | ||
| "version": "31.0.0", | ||
| "testCases": { | ||
| "integ.nat-instances.lit": { | ||
| "integ-test/DefaultTest": { | ||
| "stacks": [ | ||
| "aws-cdk-vpc-nat-instances" | ||
| ], | ||
| "diffAssets": false, | ||
| "stackUpdateWorkflow": true | ||
| "assertionStack": "integ-test/DefaultTest/DeployAssert", | ||
| "assertionStackName": "integtestDefaultTestDeployAssert24D5C536" | ||
| } | ||
| }, | ||
| "synthContext": {}, | ||
| "enableLookups": true | ||
| } | ||
| } |
Oops, something went wrong.