chore: "Revert chore(release): 2.75.0" (aws#25161)

Reverts aws#25159

.github/workflows/yarn-upgrade.yml

@@ -21,8 +21,6 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 14
-        env:
-          NODE_OPTIONS: "--max-old-space-size=8196 --experimental-worker ${NODE_OPTIONS:-}"
 
       - name: Locate Yarn cache
         id: yarn-cache
@@ -41,9 +39,7 @@ jobs:
         run: |-
           npm -g install lerna npm-check-updates
       - name: Build Integ Runner
-        run: |
-          export NODE_OPTIONS="--max-old-space-size=8196 --experimental-worker ${NODE_OPTIONS:-}"
-          npx lerna run build --scope @aws-cdk/integ-runner
+        run: lerna run build --scope @aws-cdk/integ-runner --include-dependencies
       - name: List Mono-Repo Packages
         id: list-packages
         # These need to be ignored from the `ncu` runs!
@@ -67,7 +63,7 @@ jobs:
             (cd $(dirname $pj) && ncu --upgrade --reject='constructs,${{ steps.list-packages.outputs.list }}')
           done
           # Upgrade dependencies at an aws-eks integ test docker image
-          cd packages/aws-cdk-lib/aws-eks/test/sdk-call-integ-test-docker-app/app/ && ncu --upgrade --reject=',${{ steps.list-packages.outputs.list }}'
+          cd packages/@aws-cdk/aws-eks/test/sdk-call-integ-test-docker-app/app/ && ncu --upgrade --reject=',${{ steps.list-packages.outputs.list }}'
 
       # This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn upgrade" to run)
       - name: Run "yarn install"

CHANGELOG.v2.alpha.md

@@ -2,8 +2,6 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [2.75.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.74.0-alpha.0...v2.75.0-alpha.0) (2023-04-17)
-
 ## [2.74.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.73.0-alpha.0...v2.74.0-alpha.0) (2023-04-13)
 
 ## [2.73.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.72.1-alpha.0...v2.73.0-alpha.0) (2023-04-05)

CHANGELOG.v2.md

@@ -2,13 +2,6 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [2.75.0](https://github.com/aws/aws-cdk/compare/v2.74.0...v2.75.0) (2023-04-17)
-
-
-### Features
-
-* **aws-lambda:** Add AWS Lambda runtime python3.10 ([08fb3cd](https://github.com/aws/aws-cdk/commit/08fb3cdab13e2e2a68ceadb36702a108c429e674))
-
 ## [2.74.0](https://github.com/aws/aws-cdk/compare/v2.73.0...v2.74.0) (2023-04-13)
 
 

CONTRIBUTING.md

@@ -99,12 +99,12 @@ Most contributions only require working on a single package, usually `aws-cdk-li
 time, you can execute the following to build it and it's dependencies.
 
 ```console
-$ npx lerna run build --scope=aws-cdk-lib
+$ cd packages/aws-cdk-lib
+$ ../../scripts/buildup
 ```
 
-Note: `lerna` uses a local cache by default. If your build fails, you can fix
-the issue and run the command again and it will not rerun any previously
-successful steps.
+Note: The `buildup` command is resumable. If your build fails, you can fix the issue and run `buildup --resume` to
+resume.
 
 At this point, you can run build and test the `aws-cdk-lib` module by running
 
@@ -121,19 +121,13 @@ However, if you wish to build the entire repository, the following command will
 
 ```console
 cd <root of the CDK repo>
-npx lerna run build
+scripts/foreach.sh yarn build
 ```
+Note: The `foreach` command is resumable by default; you must supply `-r` or `--reset` to start a new session.
 
 You are now ready to start contributing to the CDK. See the [Pull Requests](#pull-requests) section on how to make your
 changes and submit it as a pull request.
 
-If you want to run a build without using the local cache, provide the
-`--skip-nx-cache` flag.
-
-```console
-$ npx lerna run build --skip-nx-cache
-```
-
 ### Pack
 
 As called out in the above sections, the AWS CDK uses jsii to produce polyglot targets. This means that each CDK module

build.sh

@@ -6,8 +6,6 @@ runtarget="build"
 run_tests="true"
 check_prereqs="true"
 check_compat="true"
-ci="false"
-scope=""
 while [[ "${1:-}" != "" ]]; do
     case $1 in
         -h|--help)
@@ -29,9 +27,6 @@ while [[ "${1:-}" != "" ]]; do
         --skip-compat)
             check_compat="false"
             ;;
-        --ci)
-          ci=true
-          ;;
         *)
             echo "Unrecognized parameter: $1"
             exit 1
@@ -53,18 +48,6 @@ fi
 
 echo "============================================================================================="
 echo "installing..."
-version=$(node -p "require('./package.json').version")
-# this is super weird. If you run 'npm install' twice
-# and it actually performs an install, then
-# node-bundle test will fail with "npm ERR! maxAge must be a number".
-# This won't happen in most instances because if nothing changes then npm install
-# won't perform an install.
-# In the pipeline however, npm install is run once when all the versions are '0.0.0' (via ./scripts/bump-candidate.sh)
-# and then `align-versions` is run which updates all the versions to
-# (for example) `2.74.0-rc.0` and then npm install is run again here.
-if [ "$version" != "0.0.0" ]; then
-  rm -rf node_modules
-fi
 yarn install --frozen-lockfile --network-timeout 1000000
 
 fail() {
@@ -89,22 +72,21 @@ node ./scripts/check-yarn-lock.js
 BUILD_INDICATOR=".BUILD_COMPLETED"
 rm -rf $BUILD_INDICATOR
 
+# Speed up build by reusing calculated tree hashes
+# On dev machine, this speeds up the TypeScript part of the build by ~30%.
+export MERKLE_BUILD_CACHE=$(mktemp -d)
+trap "rm -rf $MERKLE_BUILD_CACHE" EXIT
+
 if [ "$run_tests" == "true" ]; then
-    runtarget="$runtarget,test"
+    runtarget="$runtarget+test"
 fi
 
 # Limit top-level concurrency to available CPUs - 1 to limit CPU load.
 concurrency=$(node -p 'Math.max(1, require("os").cpus().length - 1)')
 
-flags=""
-if [ "$ci" == "true" ]; then
-  flags="--stream --no-progress --skip-nx-cache"
-  export FORCE_COLOR=false
-fi
-
 echo "============================================================================================="
 echo "building..."
-time npx lerna run $bail --concurrency=$concurrency $runtarget $flags || fail
+time npx lerna run $bail --stream --concurrency=$concurrency $runtarget || fail
 
 if [ "$check_compat" == "true" ]; then
   /bin/bash scripts/check-api-compatibility.sh

buildspec-pr.yaml

@@ -24,7 +24,7 @@ phases:
       - /bin/bash ./scripts/cache-load.sh
   build:
     commands:
-      - /bin/bash ./build.sh --ci
+      - /bin/bash ./build.sh
       # After compilation, run Rosetta (using the cache if available).
       # This will print errors, and fail the build if there are compilation errors in any packages marked as 'strict'.
       - /bin/bash ./scripts/run-rosetta.sh

buildspec.yaml

@@ -30,7 +30,7 @@ phases:
       - codebuild-breakpoint
       - 'if ${BUMP_CANDIDATE:-false}; then env NODE_OPTIONS="--max-old-space-size=8196 ${NODE_OPTIONS:-}" /bin/bash ./scripts/bump-candidate.sh; fi'
       - /bin/bash ./scripts/align-version.sh
-      - /bin/bash ./build.sh --ci
+      - /bin/bash ./build.sh
   post_build:
     commands:
       # Short-circuit: Don't run pack if the above build failed.

lerna.json

@@ -1,29 +1,18 @@
 {
+  "lerna": "^4.0.0",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": [
-    "packages/aws-cdk-lib",
-    "packages/cdk-cli-wrapper",
-    "packages/cdk-assets",
-    "packages/aws-cdk",
-    "packages/cdk",
+    "packages/*",
     "packages/@aws-cdk/*",
-    "packages/awslint",
     "packages/@aws-cdk-containers/*",
     "packages/@aws-cdk-testing/*",
     "packages/@aws-cdk/*/lambda-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"
+    "tools/*",
+    "tools/@aws-cdk/*",
+    "scripts/@aws-cdk/script-tests",
+    "packages/individual-packages/*"
   ],
   "rejectCycles": "true",
-  "version": "0.0.0",
-  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
+  "version": "0.0.0"
 }

package.json

@@ -12,7 +12,8 @@
     "pack": "./pack.sh",
     "compat": "./scripts/check-api-compatibility.sh",
     "bump": "./bump.sh",
-    "build-all": "tsc -b"
+    "build-all": "tsc -b",
+    "postinstall": "patch-package --error-on-fail"
   },
   "devDependencies": {
     "@types/node": "18.11.19",
@@ -27,13 +28,10 @@
     "jsii-pacmak": "1.78.1",
     "jsii-reflect": "1.78.1",
     "jsii-rosetta": "~5.0.0",
-    "lerna": "^6.6.1",
+    "lerna": "^4.0.0",
     "patch-package": "^6.5.1",
     "semver": "^6.3.0",
     "standard-version": "^9.5.0",
-    "@nrwl/cli": "^15.9.1",
-    "@nrwl/workspace": "^15.9.1",
-    "nx": "^15.9.1",
     "typescript": "~4.9.5"
   },
   "resolutions": {
@@ -68,26 +66,15 @@
   },
   "workspaces": {
     "packages": [
-      "packages/aws-cdk-lib",
-      "packages/cdk-cli-wrapper",
-      "packages/aws-cdk",
-      "packages/cdk",
-      "packages/cdk-assets",
+      "packages/*",
       "packages/@aws-cdk/*",
-      "packages/awslint",
       "packages/@aws-cdk-containers/*",
       "packages/@aws-cdk-testing/*",
       "packages/@aws-cdk/*/lambda-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"
+      "tools/*",
+      "tools/@aws-cdk/*",
+      "scripts/@aws-cdk/script-tests",
+      "packages/individual-packages/*"
     ],
     "nohoist": [
       "**/jszip",

packages/@aws-cdk-testing/cli-integ/README.md

@@ -3,7 +3,13 @@
 
 ---
 
-![cdk-constructs: Stable](https://img.shields.io/badge/cdk--constructs-stable-success.svg?style=for-the-badge)
+![cdk-constructs: Experimental](https://img.shields.io/badge/cdk--constructs-experimental-important.svg?style=for-the-badge)
+
+> The APIs of higher level constructs in this module are experimental and under active development.
+> They are subject to non-backward compatible changes or removal in any future version. These are
+> not subject to the [Semantic Versioning](https://semver.org/) model and breaking changes will be
+> announced in the release notes. This means that while you may use them, you may need to update
+> your source code when upgrading to a newer version of this package.
 
 ---
 

packages/@aws-cdk-testing/cli-integ/package.json

@@ -43,7 +43,7 @@
     "axios": "^0.27.2",
     "fs-extra": "^9.1.0",
     "glob": "^7.2.3",
-    "jest": "^29.5.0",
+    "jest": "^27.5.1",
     "jest-junit": "^14.0.1",
     "make-runnable": "^1.4.1",
     "npm": "^8.19.4",
@@ -66,8 +66,8 @@
   "engines": {
     "node": ">= 14.15.0"
   },
-  "stability": "stable",
-  "maturity": "stable",
+  "stability": "experimental",
+  "maturity": "experimental",
   "publishConfig": {
     "tag": "latest"
   }