From a5340d273b86bf34081cb5d49f383fe9ca6988db Mon Sep 17 00:00:00 2001
From: Adam Stone-Lord <adams@cypress.io>
Date: Tue, 15 Aug 2023 19:54:33 -0400
Subject: [PATCH] chore: simplify build script (#27547)

* chore: simplify build script

* update CI workflows

* fix workflows

* empty commit because Percy weirdness
---
 .circleci/workflows.yml | 27 +++++++++------------------
 cli/package.json        |  6 +++++-
 package.json            |  3 +--
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml
index 831425e1f186..1ec6b841dc90 100644
--- a/.circleci/workflows.yml
+++ b/.circleci/workflows.yml
@@ -1189,10 +1189,6 @@ commands:
           command: |
             source ./scripts/ensure-node.sh
             yarn build --scope cypress
-      - run:
-          name: Copy Re-exported NPM Packages
-          command: node ./scripts/post-build.js
-          working_directory: cli
       - run:
           command: ls -la types
           working_directory: cli/build
@@ -1527,7 +1523,7 @@ jobs:
             - run: yarn test-scripts
             # make sure packages with TypeScript can be transpiled to JS
             - run: yarn lerna run build-prod --stream --concurrency 4
-            - run: yarn lerna run build --stream --concurrency 4
+            - run: yarn build --concurrency 4
             # run unit tests from each individual package
             - run: yarn test
             # run type checking for each individual package
@@ -1910,7 +1906,7 @@ jobs:
       - restore_cached_workspace
       - run:
           name: Build
-          command: yarn lerna run build --scope @cypress/webpack-preprocessor
+          command: yarn build --scope @cypress/webpack-preprocessor
       - run:
           name: Run tests
           command: yarn workspace @cypress/webpack-preprocessor test
@@ -1955,11 +1951,7 @@ jobs:
       - restore_cached_workspace
       - run:
           name: Build
-          command: yarn lerna run build --scope @cypress/vue
-      - run:
-          name: Type Check
-          command: yarn typecheck
-          working_directory: npm/vue
+          command: yarn build --scope @cypress/vue
       - store_test_results:
           path: npm/vue/test_results
       - store_artifacts:
@@ -1972,7 +1964,7 @@ jobs:
       - restore_cached_workspace
       - run:
           name: Build
-          command: yarn lerna run build --scope @cypress/angular
+          command: yarn build --scope @cypress/angular
       - store-npm-logs
 
   npm-react:
@@ -1981,7 +1973,7 @@ jobs:
       - restore_cached_workspace
       - run:
           name: Build
-          command: yarn lerna run build --scope @cypress/react
+          command: yarn build --scope @cypress/react
       - run:
           name: Run tests
           command: yarn test
@@ -1998,7 +1990,7 @@ jobs:
       - restore_cached_workspace
       - run:
           name: Build
-          command: yarn lerna run build --scope @cypress/vite-plugin-cypress-esm
+          command: yarn build --scope @cypress/vite-plugin-cypress-esm
       - run:
           name: Run tests
           command: yarn test
@@ -2015,7 +2007,7 @@ jobs:
       - restore_cached_workspace
       - run:
           name: Build
-          command: yarn lerna run build --scope @cypress/mount-utils
+          command: yarn build --scope @cypress/mount-utils
       - store-npm-logs
 
   npm-grep:
@@ -2037,7 +2029,7 @@ jobs:
     resource_class: small
     steps:
       - restore_cached_workspace
-      - run: yarn workspace create-cypress-tests build
+      - run: yarn build --scope create-cypress-tests
 
   npm-eslint-plugin-dev:
     <<: *defaults
@@ -2054,8 +2046,7 @@ jobs:
       - run:
           name: Build + Install
           command: |
-            yarn lerna run build --scope @cypress/schematic
-          working_directory: npm/cypress-schematic
+            yarn build --scope @cypress/schematic
       - run:
           name: Run unit tests
           command: |
diff --git a/cli/package.json b/cli/package.json
index 5c44e3b493db..eb15fd801697 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -7,6 +7,7 @@
     "clean": "node ./scripts/clean.js",
     "prebuild": "yarn postinstall && node ./scripts/start-build.js",
     "build": "node ./scripts/build.js",
+    "postbuild": "node ./scripts/post-build.js",
     "dtslint": "dtslint types",
     "postinstall": "patch-package && node ./scripts/post-install.js",
     "size": "t=\"cypress-v0.0.0.tgz\"; yarn pack --filename \"${t}\"; wc -c \"${t}\"; tar tvf \"${t}\"; rm \"${t}\";",
@@ -185,6 +186,9 @@
           "{projectRoot}/build"
         ]
       }
-    }
+    },
+    "implicitDependencies": [
+      "@cypress/*"
+    ]
   }
 }
diff --git a/package.json b/package.json
index 14a75fdc71ce..6e272b46b117 100644
--- a/package.json
+++ b/package.json
@@ -14,8 +14,7 @@
     "binary-zip": "node ./scripts/binary.js zip",
     "binary-package": "cross-env NODE_OPTIONS=--max_old_space_size=8192 node ./scripts/binary.js package",
     "check-binary-on-cdn": "node ./scripts/binary.js checkIfBinaryExistsOnCdn",
-    "build": "yarn build-npm-modules && lerna run build --stream --no-bail --ignore create-cypress-tests --ignore cypress --ignore \"'@packages/{runner}'\" --ignore \"'@cypress/{angular,react,react18,vue,vue2,mount-utils,svelte}'\" && node ./cli/scripts/post-build.js && lerna run build --stream --scope create-cypress-tests",
-    "build-npm-modules": "lerna run build --scope cypress --scope @cypress/mount-utils --scope @cypress/react && lerna run build --scope \"'@cypress/{angular,react18,vue,vue2,svelte}'\"",
+    "build": "lerna run build --stream",
     "build-prod": "lerna run build-prod-ui --stream && lerna run build-prod --stream --ignore create-cypress-tests && node ./cli/scripts/post-build.js && lerna run build-prod --stream --scope create-cypress-tests --scope",
     "build-v8-snapshot-dev": "node --max-old-space-size=8192 tooling/v8-snapshot/scripts/setup-v8-snapshot-in-cypress.js --env=dev",
     "build-v8-snapshot-prod": "node --max-old-space-size=8192 tooling/v8-snapshot/scripts/setup-v8-snapshot-in-cypress.js",