chore(deps): update dependency lerna to v7 (#554)

* chore(deps): update dependency lerna to v7 * Migrate scripts to use lerna 7 and update ci yaml * update docs as well --------- Co-authored-by: Aaron Abbott <[email protected]>
GoogleCloudPlatform · Jun 23, 2023 · 9f7eaa9 · 9f7eaa9
1 parent 37f91b2
commit 9f7eaa9
Show file tree

Hide file tree

Showing 8 changed files with 6,754 additions and 8,544 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -21,8 +21,7 @@ jobs:
       # TODO: remove once node 14 is dropped
       - name: Upgrade to latest npm to support lockfile v2
         run: npm install -g npm@${{ matrix.npm-version }}
-      - run: npm install --ignore-scripts
-      - run: npx lerna bootstrap --no-ci
+      - run: npm install
       - run: npm test
       - run: npm run codecov
         if: matrix.node == 19

diff --git a/cloudbuild-e2e-cloud-functions-gen2.yaml b/cloudbuild-e2e-cloud-functions-gen2.yaml
@@ -24,7 +24,7 @@ steps:
 
       # bootstrap and compile only the packages needed for e2e test server
       npm install --workspace=./e2e-test-server
-      npx lerna@^6 run compile --scope=@google-cloud/e2e-test-server --include-dependencies
+      npx lerna@^7 run compile --scope=@google-cloud/e2e-test-server --include-dependencies
 
       # builds a small self contained bundle with @vercel/ncc under dist/
       cd e2e-test-server

diff --git a/docs/contributing.md b/docs/contributing.md
@@ -40,8 +40,4 @@ Guidelines](https://opensource.google/conduct/).
 
 ## Running the tests
 
-The command `npm test` tests code the same way that our CI will test it.
-This is a convenience command for a number of steps, which can run separately if needed:
-
-- `npm run compile` compiles the code, checking for type errors.
-- `npm run bootstrap` Bootstrap the packages in the current Lerna repo. Installs all of their dependencies and links any cross-dependencies.
+After checking out the repo, run `npm install`. Then run `npm test` to test code the same way that our CI will test it.
diff --git a/docs/releasing.md b/docs/releasing.md
@@ -40,7 +40,7 @@ are not, re-run the command without `--conventional-commits` and lerna will
 interactively ask you to input the correct bumps. You may need to do this when
 first releasing a 0.X package as 1.0.0.
 
-## Run `npm install`
+## Run `npm install && npm run compile`
 
 Don't forget this step! This will build everything and regenerate the
 `src/version.ts` files in each subpackage.

diff --git a/e2e-test-server/Dockerfile b/e2e-test-server/Dockerfile
@@ -22,7 +22,7 @@ FROM node-base as build-base
 COPY . ./
 # bootstrap and compile only the packages needed for e2e test server
 RUN npm install --workspace=./e2e-test-server
-RUN npx lerna@^6 run compile --scope=@google-cloud/e2e-test-server --include-dependencies
+RUN npx lerna@^7 run compile --scope=@google-cloud/e2e-test-server --include-dependencies
 # builds a small self contained bundle with @vercel/ncc under dist/
 RUN cd e2e-test-server && npm run bundle
 

diff --git a/lerna.json b/lerna.json
@@ -1,8 +1,7 @@
 {
-  "packages": ["packages/*", "samples/*", "e2e-test-server"],
+  "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "ignoreChanges": ["**/test/**", "**/*.md", "**/package-lock.json"],
   "version": "independent",
-  "useWorkspaces": true,
   "command": {
     "publish": {
       "registry": "https://wombat-dressing-room.appspot.com"