[cypress] Fix tests for Cypress 12.17.4 (Webpack 5)

ramosbugs · ramosbugs · commit 7156946c3e03 · 2023-08-26T15:48:16.000-07:00
diff --git a/packages/cypress-plugin/test/integration-input-manual/cypress-config.mjs b/packages/cypress-plugin/test/integration-input-manual/cypress-config.mjs
@@ -6,6 +6,8 @@ import webpackConfig from "./config/webpack.js";
 import { registerSimpleGitMock } from "unflakable-test-common/dist/git.js";
 import { registerCosmiconfigMock } from "unflakable-test-common/dist/config.js";
 import { registerUnflakable } from "@unflakable/cypress-plugin";
+import semverGte from "semver/functions/gte.js";
+import path from "path";
 
 /**
  * @type {Cypress.ConfigOptions}
@@ -43,6 +45,14 @@ export default {
       tasks.registerTasks(on);
       devtools.openDevToolsOnLaunch(on);
 
+      // Versions prior to 12.17.4 use Webpack 4, which doesn't support the package.json "exports"
+      // field (see https://github.com/cypress-io/cypress/issues/23826). Webpack 5 both supports and
+      // enforces this field, so we have to use a different require path to manually import the
+      // skip-tests module.
+      if (semverGte(config.version, "12.17.4")) {
+        config.supportFile = path.resolve("./cypress/support/e2e-webpack5.js");
+      }
+
       return registerUnflakable(on, config);
     },
     // supportFile: "cypress/support/e2e.js",
diff --git a/packages/cypress-plugin/test/integration-input-manual/cypress.config.js b/packages/cypress-plugin/test/integration-input-manual/cypress.config.js
@@ -7,8 +7,10 @@ const { registerSimpleGitMock } = require("unflakable-test-common/dist/git");
 const {
   registerCosmiconfigMock,
 } = require("unflakable-test-common/dist/config");
+const semverGte = require("semver/functions/gte");
 
 const { registerUnflakable } = require("@unflakable/cypress-plugin");
+const path = require("path");
 
 module.exports = {
   /**
@@ -46,6 +48,14 @@ module.exports = {
       registerTasks(on);
       openDevToolsOnLaunch(on);
 
+      // Versions prior to 12.17.4 use Webpack 4, which doesn't support the package.json "exports"
+      // field (see https://github.com/cypress-io/cypress/issues/23826). Webpack 5 both supports and
+      // enforces this field, so we have to use a different require path to manually import the
+      // skip-tests module.
+      if (semverGte(config.version, "12.17.4")) {
+        config.supportFile = path.resolve("./cypress/support/e2e-webpack5.js");
+      }
+
       return registerUnflakable(on, config);
     },
     // supportFile: "cypress/support/e2e.js",
diff --git a/packages/cypress-plugin/test/integration-input-manual/cypress/support/e2e-webpack5.js b/packages/cypress-plugin/test/integration-input-manual/cypress/support/e2e-webpack5.js
@@ -0,0 +1,10 @@
+// Copyright (c) 2023 Developer Innovations, LLC
+
+// Import commands.js using CJS syntax:
+require("./commands.js");
+
+const {
+  registerMochaInstrumentation,
+} = require("@unflakable/cypress-plugin/skip-tests");
+
+registerMochaInstrumentation();
diff --git a/packages/cypress-plugin/test/integration-input-manual/package.json b/packages/cypress-plugin/test/integration-input-manual/package.json
@@ -16,6 +16,7 @@
     "process": "^0.11.10",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+    "semver": "^7.5.4",
     "ts-loader": "^9.4.3",
     "typescript": "^4.9.5",
     "unflakable-test-common": "workspace:^",
diff --git a/yarn.lock b/yarn.lock
@@ -4777,6 +4777,7 @@ __metadata:
     process: ^0.11.10
     react: ^18.2.0
     react-dom: ^18.2.0
+    semver: ^7.5.4
     ts-loader: ^9.4.3
     typescript: ^4.9.5
     unflakable-test-common: "workspace:^"
