Merge branch 'develop' into webkit-experimental

cli/types/cypress.d.ts

@@ -2720,6 +2720,13 @@ declare namespace Cypress {
      * @default 60000
      */
     pageLoadTimeout: number
+    /**
+     * Whether Cypress will search for and replace
+     * obstructive JS code in .js or .html files.
+     *
+     * @see https://on.cypress.io/configuration#modifyObstructiveCode
+     */
+    modifyObstructiveCode: boolean
     /**
      * Time, in milliseconds, to wait for an XHR request to go out in a [cy.wait()](https://on.cypress.io/wait) command
      * @default 5000
@@ -2973,13 +2980,6 @@ declare namespace Cypress {
      * Whether Cypress was launched via 'cypress open' (interactive mode)
      */
     isInteractive: boolean
-    /**
-     * Whether Cypress will search for and replace
-     * obstructive JS code in .js or .html files.
-     *
-     * @see https://on.cypress.io/configuration#modifyObstructiveCode
-     */
-    modifyObstructiveCode: boolean
     /**
      * The platform Cypress is running on.
      */

cli/types/tests/cypress-npm-api-test.ts

@@ -1,6 +1,6 @@
 // type tests for Cypress NPM module
 // https://on.cypress.io/module-api
-import cypress from 'cypress'
+import cypress, { defineConfig } from 'cypress'
 
 cypress.run // $ExpectType (options?: Partial<CypressRunOptions> | undefined) => Promise<CypressRunResult | CypressFailedRunResult>
 cypress.open // $ExpectType (options?: Partial<CypressOpenOptions> | undefined) => Promise<void>
@@ -51,6 +51,10 @@ cypress.run().then(results => {
   }
 })
 
+const config = defineConfig({
+  modifyObstructiveCode: true
+})
+
 // component options
 const componentConfigNextWebpack: Cypress.ConfigOptions = {
   component: {

npm/vite-dev-server/package.json

@@ -26,7 +26,7 @@
     "dedent": "^0.7.0",
     "mocha": "^9.2.2",
     "sinon": "^13.0.1",
-    "ts-node": "^10.2.1",
+    "ts-node": "^10.9.1",
     "vite": "3.0.3",
     "vite-plugin-inspect": "0.4.3"
   },

npm/webpack-dev-server/package.json

@@ -37,7 +37,7 @@
     "proxyquire": "2.1.3",
     "sinon": "^13.0.1",
     "snap-shot-it": "^7.9.6",
-    "ts-node": "^10.2.1",
+    "ts-node": "^10.9.1",
     "webpack": "npm:webpack@^5",
     "webpack-4": "npm:webpack@^4",
     "webpack-dev-server-3": "npm:webpack-dev-server@^3"

npm/webpack-preprocessor/package.json

@@ -58,7 +58,7 @@
     "sinon": "^9.0.0",
     "sinon-chai": "^3.5.0",
     "snap-shot-it": "7.9.2",
-    "ts-node": "^10.2.1",
+    "ts-node": "^10.9.1",
     "webpack": "^4.44.2"
   },
   "peerDependencies": {

package.json

@@ -214,7 +214,7 @@
     "through": "2.3.8",
     "through2": "^4.0.2",
     "tree-kill": "1.2.2",
-    "ts-node": "^10.2.1",
+    "ts-node": "^10.9.1",
     "typescript": "^4.7.4",
     "yarn-deduplicate": "3.1.0"
   },

packages/data-context/src/data/ProjectConfigIpc.ts

@@ -271,7 +271,9 @@ export class ProjectConfigIpc extends EventEmitter {
     // ts-node for CommonJS
     // ts-node/esm for ESM
     if (hasTypeScriptInstalled(this.projectRoot)) {
+      debug('found typescript in %s', this.projectRoot)
       if (isProjectUsingESModules) {
+        debug(`using --experimental-specifier-resolution=node with --loader ${tsNodeEsm}`)
         // Use the ts-node/esm loader so they can use TypeScript with `"type": "module".
         // The loader API is experimental and will change.
         // The same can be said for the other alternative, esbuild, so this is the
@@ -294,6 +296,8 @@ export class ProjectConfigIpc extends EventEmitter {
         // so we need to load and evaluate the hook first using the `--require` module API.
         const tsNodeLoader = `--require "${tsNode}"`
 
+        debug(`using cjs with --require ${tsNode}`)
+
         if (childOptions.env.NODE_OPTIONS) {
           childOptions.env.NODE_OPTIONS += ` ${tsNodeLoader}`
         } else {
@@ -303,6 +307,7 @@ export class ProjectConfigIpc extends EventEmitter {
     } else {
       // Just use Node's built-in ESM support.
       // TODO: Consider using userland `esbuild` with Node's --loader API to handle ESM.
+      debug(`no typescript found, just use regular Node.js`)
     }
 
     return fork(CHILD_PROCESS_FILE_PATH, configProcessArgs, childOptions)

packages/server/lib/modes/run.ts

@@ -621,6 +621,11 @@ async function waitForTestsToFinishRunning (options: { project: Project, screens
 
   results.shouldUploadVideo = shouldUploadVideo
 
+  if (!shouldUploadVideo) {
+    debug(`Spec run had no failures and config.videoUploadOnPasses=false. Skip processing video. Video path: ${videoName}`)
+    results.video = null
+  }
+
   if (!quiet && !skippedSpec) {
     printResults.displayResults(results, estimated)
   }
@@ -660,10 +665,15 @@ async function waitForTestsToFinishRunning (options: { project: Project, screens
         },
       })
     } catch (err) {
+      videoCaptureFailed = true
       warnVideoRecordingFailed(err)
     }
   }
 
+  if (videoCaptureFailed) {
+    results.video = null
+  }
+
   return results
 }
 
@@ -866,7 +876,6 @@ async function runSpec (config, spec: SpecWithRelativeRoot, options: { project:
       quiet: options.quiet,
       shouldKeepTabOpen: !isLastSpec,
     }),
-
     waitForBrowserToConnect({
       spec,
       project,

packages/server/package.json

@@ -116,7 +116,7 @@
     "tough-cookie": "4.0.0",
     "trash": "5.2.0",
     "tree-kill": "1.2.2",
-    "ts-node": "^10.2.1",
+    "ts-node": "^10.9.1",
     "tslib": "2.3.1",
     "underscore.string": "3.3.5",
     "url-parse": "1.5.9",

packages/ts/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "debug": "^4.3.2",
-    "ts-node": "^10.2.1",
+    "ts-node": "^10.9.1",
     "tslib": "2.3.1",
     "typescript-cached-transpile": "^0.0.6"
   },