pr comments

packages/server/index.js

@@ -1,19 +1,19 @@
 const { initializeStartTime } = require('./lib/util/performance_benchmark')
 
-const run = async () => {
+const startCypress = async () => {
   try {
     initializeStartTime()
 
     const { hookRequire } = require('./hook-require')
 
     hookRequire({ forceTypeScript: false })
 
-    await require('./server-entry')
+    await require('./start-cypress')
   } catch (error) {
     // eslint-disable-next-line no-console
     console.error(error)
     process.exit(1)
   }
 }
 
-module.exports = run()
+module.exports = startCypress()

packages/server/package.json

@@ -194,11 +194,11 @@
   },
   "files": [
     "config",
+    "hook-require.js",
     "lib",
     "patches",
-    "server-entry.js",
-    "snapshot-entry.js",
-    "hook-require.js"
+    "start-cypress.js",
+    "v8-snapshot-entry.js"
   ],
   "types": "index.d.ts",
   "productName": "Cypress",

packages/server/v8-snapshot-entry.js

@@ -0,0 +1 @@
+require('./start-cypress')

scripts/after-pack-hook.js

@@ -6,7 +6,7 @@ const os = require('os')
 const path = require('path')
 const { setupV8Snapshots } = require('@tooling/v8-snapshot')
 const { flipFuses, FuseVersion, FuseV1Options } = require('@electron/fuses')
-const { cleanup } = require('./binary/binary-cleanup')
+const { buildEntryPointAndCleanup } = require('./binary/binary-cleanup')
 const { getIntegrityCheckSource, getBinaryEntryPointSource } = require('./binary/binary-sources')
 
 module.exports = async function (params) {
@@ -66,7 +66,8 @@ module.exports = async function (params) {
       },
     )
 
-    await cleanup(outputFolder)
+    // Build out the entry point and clean up prior to setting up v8 snapshots so that the state of the binary is correct
+    await buildEntryPointAndCleanup(outputFolder)
     await setupV8Snapshots({ cypressAppPath: params.appOutDir, integrityCheckSource: getIntegrityCheckSource(outputFolder) })
   }
 }

scripts/binary/binary-cleanup.js

@@ -80,7 +80,7 @@ const getDependencyPathsToKeep = async (buildAppDir) => {
       absWorkingDir: unixBuildAppDir,
       external: [
         './transpile-ts',
-        './server-entry',
+        './start-cypress',
         'fsevents',
         'pnpapi',
         '@swc/core',
@@ -116,7 +116,7 @@ const getDependencyPathsToKeep = async (buildAppDir) => {
 const createServerEntryPointBundle = async (buildAppDir) => {
   const unixBuildAppDir = buildAppDir.split(path.sep).join(path.posix.sep)
   const entryPoints = [path.join(unixBuildAppDir, 'packages/server/index.js')]
-  // Build the binary entry point ignoring anything that happens in the server-entry since that will be in the v8 snapshot
+  // Build the binary entry point ignoring anything that happens in start-cypress since that will be in the v8 snapshot
   const esbuildResult = await esbuild.build({
     entryPoints,
     bundle: true,
@@ -126,7 +126,7 @@ const createServerEntryPointBundle = async (buildAppDir) => {
     absWorkingDir: unixBuildAppDir,
     external: [
       './transpile-ts',
-      './server-entry',
+      './start-cypress',
     ],
   })
 
@@ -146,7 +146,7 @@ const createServerEntryPointBundle = async (buildAppDir) => {
   return [...Object.keys(esbuildResult.metafile.inputs)].map((input) => `./${input}`)
 }
 
-const cleanup = async (buildAppDir) => {
+const buildEntryPointAndCleanup = async (buildAppDir) => {
   // 1. Retrieve all dependencies that still need to be kept in the binary. In theory, we could use the bundles generated here as single files within the binary,
   // but for now, we just track on the dependencies that get pulled in
   const keptDependencies = [...await getDependencyPathsToKeep(buildAppDir), 'package.json']
@@ -231,5 +231,5 @@ const cleanup = async (buildAppDir) => {
 }
 
 module.exports = {
-  cleanup,
+  buildEntryPointAndCleanup,
 }

scripts/binary/binary-integrity-check-source.js

@@ -120,7 +120,7 @@ function integrityCheck (options) {
         fileName: 'evalmachine.<anonymous>',
       },
       {
-        functionName: 'run',
+        functionName: 'startCypress',
         fileName: 'evalmachine.<anonymous>',
       },
       {

scripts/binary/binary-sources.js

@@ -4,18 +4,18 @@ const path = require('path')
 
 const escapeString = (string) => string.replaceAll(`\``, `\\\``).replaceAll(`$`, `\\$`)
 
-function read ({ file }) {
+function read (file) {
   const pathToFile = require.resolve(`./${file}`)
 
   return fs.readFileSync(pathToFile, 'utf8')
 }
 
 const getBinaryEntryPointSource = () => {
-  return read({ file: 'binary-entry-point-source.js' })
+  return read('binary-entry-point-source.js')
 }
 
 const getIntegrityCheckSource = (baseDirectory) => {
-  const fileSource = read({ file: 'binary-integrity-check-source.js' })
+  const fileSource = read('binary-integrity-check-source.js')
   const secret = require('crypto').randomBytes(48).toString('hex')
 
   const mainIndexHash = crypto.createHmac('md5', secret).update(fs.readFileSync(path.join(baseDirectory, './index.js'), 'utf8')).digest('hex')

tooling/v8-snapshot/cache/prod-darwin/snapshot-meta.cache.json

@@ -937,8 +937,8 @@
     "./packages/server/node_modules/uuid/dist/v3.js",
     "./packages/server/node_modules/uuid/dist/v4.js",
     "./packages/server/node_modules/uuid/dist/v5.js",
-    "./packages/server/server-entry.js",
-    "./packages/server/snapshot-entry.js",
+    "./packages/server/start-cypress.js",
+    "./packages/server/v8-snapshot-entry.js",
     "./packages/socket/index.js",
     "./packages/socket/lib/socket.ts",
     "./packages/socket/node_modules/socket.io/dist/broadcast-operator.js",

tooling/v8-snapshot/cache/prod-linux/snapshot-meta.cache.json

@@ -936,8 +936,8 @@
     "./packages/server/node_modules/uuid/dist/v3.js",
     "./packages/server/node_modules/uuid/dist/v4.js",
     "./packages/server/node_modules/uuid/dist/v5.js",
-    "./packages/server/server-entry.js",
-    "./packages/server/snapshot-entry.js",
+    "./packages/server/start-cypress.js",
+    "./packages/server/v8-snapshot-entry.js",
     "./packages/socket/index.js",
     "./packages/socket/lib/socket.ts",
     "./packages/socket/node_modules/socket.io/dist/broadcast-operator.js",

tooling/v8-snapshot/cache/prod-win32/snapshot-meta.cache.json

@@ -939,8 +939,8 @@
     "./packages/server/node_modules/uuid/dist/v3.js",
     "./packages/server/node_modules/uuid/dist/v4.js",
     "./packages/server/node_modules/uuid/dist/v5.js",
-    "./packages/server/server-entry.js",
-    "./packages/server/snapshot-entry.js",
+    "./packages/server/start-cypress.js",
+    "./packages/server/v8-snapshot-entry.js",
     "./packages/socket/index.js",
     "./packages/socket/lib/socket.ts",
     "./packages/socket/node_modules/socket.io/dist/broadcast-operator.js",

tooling/v8-snapshot/src/setup/config.ts

@@ -21,7 +21,7 @@ const platformString = process.platform
 const snapshotCacheBaseDir = path.resolve(__dirname, '..', '..', 'cache')
 
 const projectBaseDir = path.join(__dirname, '..', '..', '..', '..')
-const appEntryFile = require.resolve('@packages/server/snapshot-entry.js')
+const appEntryFile = require.resolve('@packages/server/v8-snapshot-entry')
 
 const cypressAppSnapshotDir = (cypressAppPath?: string) => {
   const electronPackageDir = path.join(projectBaseDir, 'packages', 'electron')