fix: add v8 snapshot usage to cypress in cypress testing

cypress-io · Nov 16, 2022 · f03253c · f03253c
1 parent 8d85c80
commit f03253c
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 20 deletions.
diff --git a/npm/vite-dev-server/cypress.config.ts b/npm/vite-dev-server/cypress.config.ts
@@ -12,6 +12,7 @@ export default defineConfig({
 
       // Delete this as we only want to honor it on parent Cypress when doing E2E Cypress in Cypress testing
       delete process.env.HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS
+      delete process.env.CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT
       process.env.CYPRESS_INTERNAL_E2E_TESTING_SELF = 'true'
       process.env.CYPRESS_INTERNAL_VITE_OPEN_MODE_TESTING = 'true'
       const { e2ePluginSetup } = require('@packages/frontend-shared/cypress/e2e/e2ePluginSetup') as typeof import('@packages/frontend-shared/cypress/e2e/e2ePluginSetup')

diff --git a/npm/vite-dev-server/package.json b/npm/vite-dev-server/package.json
@@ -8,7 +8,7 @@
     "build-prod": "tsc || echo 'built, with type errors'",
     "check-ts": "tsc --noEmit",
     "cypress:run": "yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --project . --browser chrome",
-    "cypress:run-cypress-in-cypress": "cross-env HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS=http://localhost:4455 CYPRESS_REMOTE_DEBUGGING_PORT=6666 TZ=America/New_York",
+    "cypress:run-cypress-in-cypress": "cross-env CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT=1 HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS=http://localhost:4455 CYPRESS_REMOTE_DEBUGGING_PORT=6666 TZ=America/New_York",
     "cypress:open": "yarn cypress:run-cypress-in-cypress gulp open --project .",
     "watch": "tsc -w",
     "test": "yarn test-unit",

diff --git a/npm/webpack-dev-server/cypress.config.ts b/npm/webpack-dev-server/cypress.config.ts
@@ -11,6 +11,7 @@ export default defineConfig({
 
       // Delete this as we only want to honor it on parent Cypress when doing E2E Cypress in Cypress testing
       delete process.env.HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS
+      delete process.env.CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT
       process.env.CYPRESS_INTERNAL_E2E_TESTING_SELF = 'true'
       const { e2ePluginSetup } = require('@packages/frontend-shared/cypress/e2e/e2ePluginSetup') as typeof import('@packages/frontend-shared/cypress/e2e/e2ePluginSetup')
 

diff --git a/npm/webpack-dev-server/package.json b/npm/webpack-dev-server/package.json
@@ -11,7 +11,7 @@
     "dev": "tsc --watch",
     "clean": "rimraf dist",
     "cypress:run": "yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --project . --browser chrome",
-    "cypress:run-cypress-in-cypress": "cross-env HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS=http://localhost:4455 CYPRESS_REMOTE_DEBUGGING_PORT=6666 TZ=America/New_York",
+    "cypress:run-cypress-in-cypress": "cross-env CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT=1 HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS=http://localhost:4455 CYPRESS_REMOTE_DEBUGGING_PORT=6666 TZ=America/New_York",
     "cypress:open": "yarn cypress:run-cypress-in-cypress gulp open --project .",
     "test": "yarn test-unit",
     "test-unit": "mocha -r ts-node/register/transpile-only --config ./test/.mocharc.js"

diff --git a/packages/app/cypress.config.ts b/packages/app/cypress.config.ts
@@ -34,6 +34,7 @@ export default defineConfig({
 
       // Delete this as we only want to honor it on parent Cypress when doing E2E Cypress in Cypress testing
       delete process.env.HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS
+      delete process.env.CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT
       process.env.CYPRESS_INTERNAL_E2E_TESTING_SELF = 'true'
       process.env.CYPRESS_INTERNAL_VITE_OPEN_MODE_TESTING = 'true'
       // process.env.DEBUG = '*'

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -8,7 +8,7 @@
     "clean": "rimraf dist && rimraf ./node_modules/.vite && echo 'cleaned'",
     "clean-deps": "rimraf node_modules",
     "test": "echo 'ok'",
-    "cypress:run-cypress-in-cypress": "cross-env HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS=http://localhost:4455 CYPRESS_REMOTE_DEBUGGING_PORT=6666 TZ=America/New_York",
+    "cypress:run-cypress-in-cypress": "cross-env CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT=1 HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS=http://localhost:4455 CYPRESS_REMOTE_DEBUGGING_PORT=6666 TZ=America/New_York",
     "cypress:launch": "yarn cypress:run-cypress-in-cypress gulp open --project .",
     "cypress:open": "yarn cypress:run-cypress-in-cypress gulp open --project .",
     "cypress:run:ct": "yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --component --project .",

diff --git a/packages/config/package.json b/packages/config/package.json
@@ -20,7 +20,7 @@
     "@babel/parser": "^7",
     "@babel/plugin-syntax-typescript": "^7",
     "@babel/plugin-transform-typescript": "^7",
-    "@babel/traverse": "^7",
+    "@babel/traverse": "7.15.4",
     "@babel/types": "^7",
     "check-more-types": "2.24.0",
     "common-tags": "1.8.0",

diff --git a/packages/data-context/src/data/ProjectConfigIpc.ts b/packages/data-context/src/data/ProjectConfigIpc.ts
@@ -1,7 +1,7 @@
 /* eslint-disable no-dupe-class-members */
 import { CypressError, getError } from '@packages/errors'
 import type { FullConfig, TestingType } from '@packages/types'
-import { ChildProcess, fork, ForkOptions } from 'child_process'
+import { ChildProcess, fork, ForkOptions, spawn } from 'child_process'
 import EventEmitter from 'events'
 import fs from 'fs-extra'
 import path from 'path'
@@ -310,6 +310,13 @@ export class ProjectConfigIpc extends EventEmitter {
       debug(`no typescript found, just use regular Node.js`)
     }
 
+    if (process.env.CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT) {
+      return spawn(process.execPath, ['--entryPoint', CHILD_PROCESS_FILE_PATH, ...configProcessArgs], {
+        ...childOptions,
+        stdio: ['pipe', 'pipe', 'pipe', 'ipc'],
+      })
+    }
+
     return fork(CHILD_PROCESS_FILE_PATH, configProcessArgs, childOptions)
   }
 

diff --git a/packages/launchpad/cypress.config.ts b/packages/launchpad/cypress.config.ts
@@ -28,6 +28,7 @@ export default defineConfig({
     baseUrl: 'http://localhost:5555',
     supportFile: 'cypress/e2e/support/e2eSupport.ts',
     async setupNodeEvents (on, config) {
+      delete process.env.CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT
       process.env.CYPRESS_INTERNAL_E2E_TESTING_SELF = 'true'
       const { e2ePluginSetup } = require('@packages/frontend-shared/cypress/e2e/e2ePluginSetup')
 

diff --git a/packages/launchpad/package.json b/packages/launchpad/package.json
@@ -9,10 +9,11 @@
     "clean-deps": "rimraf node_modules",
     "test": "yarn cypress:run:ct && yarn types",
     "windi": "yarn windicss-analysis",
-    "cypress:open": "cross-env TZ=America/New_York gulp open --project .",
-    "cypress:open:ct": "cross-env TZ=America/New_York gulp open --component --project .",
-    "cypress:run:ct": "cross-env TZ=America/New_York node ../../scripts/cypress run --component --project .",
-    "cypress:run:e2e": "cross-env TZ=America/New_York node ../../scripts/cypress run --e2e --project .",
+    "cypress:run-cypress-in-cypress": "cross-env CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT=1 TZ=America/New_York",
+    "cypress:open": "yarn cypress:run-cypress-in-cypress gulp open --project .",
+    "cypress:open:ct": "yarn cypress:run-cypress-in-cypress gulp open --component --project .",
+    "cypress:run:ct": "yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --component --project .",
+    "cypress:run:e2e": "yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --e2e --project .",
     "dev": "yarn gulp dev --project .",
     "start": "echo 'run yarn dev from the root' && exit 1",
     "watch": "echo 'run yarn dev from the root' && exit 1"

diff --git a/packages/packherd-require/src/loader.ts b/packages/packherd-require/src/loader.ts
@@ -12,8 +12,6 @@ import { strict as assert } from 'assert'
 
 const logDebug = debug('cypress-verbose:packherd:debug')
 const logTrace = debug('cypress-verbose:packherd:trace')
-const logSilly = debug('cypress-verbose:packherd:silly')
-const logWarn = debug('cypress:packherd:warn')
 
 /**
  * Provides information that is used to resolve a module's key from its URI.
@@ -869,11 +867,6 @@ export class PackherdModuleLoader {
       this.definitionHits.add(mod.id)
 
       return { mod, origin }
-    } catch (err: any) {
-      logWarn(err.message)
-      logSilly(err)
-
-      return { mod: undefined, origin }
     } finally {
       this.loading.finish(fullPath)
     }

diff --git a/packages/server/index.js b/packages/server/index.js
@@ -1,6 +1,20 @@
-const { initializeStartTime } = require('./lib/util/performance_benchmark')
+const runChildProcess = async (entryPoint) => {
+  require('./lib/plugins/child/register_ts_node')
+  if (require.name !== 'customRequire') {
+    // Purposefully make this a dynamic require so that it doesn't have the potential to get picked up by snapshotting mechanism
+    const hook = './hook'
+
+    const { hookRequire } = require(`${hook}-require`)
+
+    hookRequire(false)
+  }
+
+  require(entryPoint)
+}
+
+const runMainProcess = async () => {
+  const { initializeStartTime } = require('./lib/util/performance_benchmark')
 
-const run = async () => {
   initializeStartTime()
 
   if (require.name !== 'customRequire') {
@@ -15,4 +29,10 @@ const run = async () => {
   await require('./server-entry')
 }
 
-module.exports = run()
+const { entryPoint } = require('minimist')(process.argv.slice(1))
+
+if (entryPoint) {
+  module.exports = runChildProcess(entryPoint)
+} else {
+  module.exports = runMainProcess()
+}
diff --git a/yarn.lock b/yarn.lock
@@ -2204,7 +2204,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/traverse@^7", "@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9", "@babel/traverse@^7.4.3", "@babel/traverse@^7.6.0", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0":
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9", "@babel/traverse@^7.4.3", "@babel/traverse@^7.6.0", "@babel/traverse@^7.7.0", "@babel/traverse@^7.9.0":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.9.tgz#1f9b207435d9ae4a8ed6998b2b82300d83c37a0d"
   integrity sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==