Upgrade to version of cypress that works & use js config file

See issues linked in PR for details
ral-facilities · Nov 3, 2023 · 13a2f26 · 13a2f26
1 parent 04e4eb3
commit 13a2f26
Show file tree

Hide file tree

Showing 16 changed files with 109 additions and 86 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/...est-npm-2.88.11-863a69ed3c-e4b3f62e0c.zip → ...est-npm-2.88.12-9c79415088-2c6fbf7f31.zip b/...est-npm-2.88.11-863a69ed3c-e4b3f62e0c.zip → ...est-npm-2.88.12-9c79415088-2c6fbf7f31.zip
diff --git a/.yarn/cache/@types-node-npm-14.18.43-f0e28be370-3ef43eda26.zip b/.yarn/cache/@types-node-npm-14.18.43-f0e28be370-3ef43eda26.zip
diff --git a/.yarn/cache/@types-node-npm-16.18.60-d8a53d4818-aa0c81c3f2.zip b/.yarn/cache/@types-node-npm-16.18.60-d8a53d4818-aa0c81c3f2.zip
diff --git a/.yarn/cache/commander-npm-5.1.0-7e939e7832-0b7fec1712.zip b/.yarn/cache/commander-npm-5.1.0-7e939e7832-0b7fec1712.zip
diff --git a/.yarn/cache/commander-npm-6.2.1-d5b635f237-d7090410c0.zip b/.yarn/cache/commander-npm-6.2.1-d5b635f237-d7090410c0.zip
diff --git a/.yarn/cache/cypress-npm-12.0.2-a70fb00cc8-9b5394749c.zip b/.yarn/cache/cypress-npm-12.0.2-a70fb00cc8-9b5394749c.zip
diff --git a/.yarn/cache/cypress-npm-12.17.3-602acfb08c-1da3922cac.zip b/.yarn/cache/cypress-npm-12.17.3-602acfb08c-1da3922cac.zip
diff --git a/.yarn/cache/semver-npm-7.5.4-c4ad957fcd-12d8ad952f.zip b/.yarn/cache/semver-npm-7.5.4-c4ad957fcd-12d8ad952f.zip
diff --git a/.yarn/cache/tough-cookie-npm-2.5.0-79a2fe43fe-16a8cd0902.zip b/.yarn/cache/tough-cookie-npm-2.5.0-79a2fe43fe-16a8cd0902.zip
diff --git a/.yarn/cache/tough-cookie-npm-4.1.3-08285e2518-c9226afff3.zip b/.yarn/cache/tough-cookie-npm-4.1.3-08285e2518-c9226afff3.zip
diff --git a/cypress.config.js b/cypress.config.js
@@ -0,0 +1,18 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+const { defineConfig } = require('cypress');
+
+module.exports = defineConfig({
+  chromeWebSecurity: false,
+  video: false,
+  retries: {
+    runMode: 3,
+    openMode: 0,
+  },
+  e2e: {
+    setupNodeEvents(on) {
+      // https://github.com/bahmutov/cypress-failed-log
+      require('cypress-failed-log/on')(on);
+    },
+    baseUrl: 'http://127.0.0.1:3000',
+  },
+});
diff --git a/cypress.config.ts b/cypress.config.ts
diff --git a/package.json b/package.json
@@ -119,7 +119,7 @@
     "chart.js": "4.3.0",
     "chartjs-plugin-zoom": "2.0.0",
     "cross-env": "7.0.3",
-    "cypress": "12.0.2",
+    "cypress": "12.17.3",
     "cypress-failed-log": "2.10.0",
     "eslint": "8.44.0",
     "eslint-config-prettier": "8.8.0",

diff --git a/src/index.tsx b/src/index.tsx
@@ -46,7 +46,7 @@ function domElementGetter(): HTMLElement {
 const reactLifecycles = singleSpaReact({
   React,
   ReactDOMClient,
-  rootComponent: () => document.getElementById(pluginName) ? <App /> : null,
+  rootComponent: () => (document.getElementById(pluginName) ? <App /> : null),
   domElementGetter,
   errorBoundary: (error) => {
     log.error(`${pluginName} failed with error: ${error}`);