fixes for build, incorrect cy root

tgriesser · tgriesser · commit 56981edef1cb · 2022-04-13T14:27:24.000-04:00
diff --git a/npm/webpack-dev-server-fresh/cypress/e2e/vue-cli.cy.ts b/npm/webpack-dev-server-fresh/cypress/e2e/vue-cli.cy.ts
@@ -5,7 +5,7 @@ import type { ProjectFixtureDir } from '@tooling/system-tests/lib/fixtureDirs'
 const PROJECTS: ProjectFixtureDir[] = ['vuecli4-vue2', 'vuecli4-vue3', 'vuecli5-vue3']
 
 // Add to this list to focus on a particular permutation
-const ONLY_PROJECTS: ProjectFixtureDir[] = ['vuecli4-vue2']
+const ONLY_PROJECTS: ProjectFixtureDir[] = []
 
 for (const project of PROJECTS) {
   if (ONLY_PROJECTS.length && !ONLY_PROJECTS.includes(project)) {
diff --git a/package.json b/package.json
@@ -12,7 +12,8 @@
     "binary-release": "node ./scripts/binary.js release",
     "binary-upload": "node ./scripts/binary.js upload",
     "binary-zip": "node ./scripts/binary.js zip",
-    "build": "lerna run build --scope cypress && lerna run build --stream --no-bail --ignore create-cypress-tests --ignore \"'@packages/{runner}'\" && node ./cli/scripts/post-build.js && lerna run build --stream --scope create-cypress-tests",
+    "build": "yarn build-npm-modules && lerna run build --stream --no-bail --ignore create-cypress-tests --ignore cypress --ignore \"'@packages/{runner}'\" --ignore \"'@cypress/{react,vue,vue2,mount-utils}'\" && 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 && lerna run build --scope \"'@cypress/{react,vue,vue2}'\"",
     "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",
     "check-node-version": "node scripts/check-node-version.js",
     "check-terminal": "node scripts/check-terminal.js",
diff --git a/system-tests/lib/dep-installer/index.ts b/system-tests/lib/dep-installer/index.ts
@@ -214,6 +214,8 @@ export async function scaffoldProjectNodeModules (project: string, updateLockFil
     // 4. Fix relative paths in temp dir's lockfile.
     const lockFilePath = path.join(projectDir, lockFilename)
 
+    console.log(lockFilePath)
+
     log(`Writing ${lockFilename} with fixed relative paths to temp dir`)
     await restoreLockFileRelativePaths({ projectDir, lockFilePath, relativePathToMonorepoRoot })
 
diff --git a/system-tests/project-fixtures/cra/cypress/support/component-index.html b/system-tests/project-fixtures/cra/cypress/support/component-index.html
@@ -7,6 +7,6 @@
     <title>Components App</title>
   </head>
   <body>
-    <div id="__cy_root"></div>
+    <div data-cy-root></div>
   </body>
 </html>
diff --git a/system-tests/project-fixtures/vue2-cli/cypress/support/component-index.html b/system-tests/project-fixtures/vue2-cli/cypress/support/component-index.html
@@ -7,6 +7,6 @@
     <title>Components App</title>
   </head>
   <body>
-    <div id="__cy_root"></div>
+    <div data-cy-root></div>
   </body>
 </html>
diff --git a/yarn.lock b/yarn.lock
@@ -3295,9 +3295,6 @@
 "@cypress/mount-utils@file:npm/mount-utils":
   version "0.0.0-development"
 
-"@cypress/mount-utils@file:npm/mount-utils":
-  version "0.0.0-development"
-
 "@cypress/parse-domain@2.4.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/@cypress/parse-domain/-/parse-domain-2.4.0.tgz#3034b50babfd0adffa2a018aa03264b1e5be4d9e"
