Merge pull request #19 from th3fallen/update-loader

upgrade cypress to version 13
th3fallen · Dec 22, 2023 · 5165ecb · 5165ecb
2 parents a925f6e + 10545dc
commit 5165ecb
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 30 deletions.
diff --git a/dist/loader.js b/dist/loader.js
@@ -16,7 +16,11 @@ const makeImport = (file, filename, chunkName, projectRoot) => {
     // If we want to rename the chunks, we can use this
     const magicComments = chunkName ? `/* rspackChunkName: "${chunkName}" */` : '';
     return `"${filename}": {
-    shouldLoad: () => decodeURI(document.location.pathname).includes("${file.absolute}"),
+    shouldLoad: () => {
+      const newLoad = new URLSearchParams(document.location.search).get("specPath") === "${file.absolute}";
+      const oldLoad = decodeURI(document.location.pathname).includes("${file.absolute}");
+      return newLoad | oldLoad;
+    },
     load: () => import(${magicComments} "${file.absolute}"),
     absolute: "${file.absolute.split(path.sep).join(path.posix.sep)}",
     relative: "${file.relative.split(path.sep).join(path.posix.sep)}",
@@ -30,7 +34,13 @@ const makeImport = (file, filename, chunkName, projectRoot) => {
  * @returns {Record<string, ReturnType<makeImport>}
  * {
  *   "App.spec.js": {
- *     shouldLoad: () => document.location.pathname.includes('cypress/component/App.spec.js'),
+ *     shouldLoad: () => {
+         const newLoad = new URLSearchParams(document.location.search).get("specPath") === "${
+           file.absolute
+         }";
+         const oldLoad = decodeURI(document.location.pathname).includes("${file.absolute}");
+         return newLoad | oldLoad;
+       },
  *     load: () => {
  *       return import("/Users/projects/my-app/cypress/component/App.spec.js" \/* rspackChunkName: "spec-0" *\/)
  *     },

diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "@typescript-eslint/parser": "^6.11.0",
     "babel-jest": "^29.7.0",
     "cross-env": "^7.0.3",
-    "cypress": "^12.13.0",
+    "cypress": "^13.6.1",
     "debug": "^4.3.4",
     "dedent": "^0.7.0",
     "eslint": "^8.54.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/loader.ts b/src/loader.ts
@@ -24,7 +24,13 @@ const makeImport = (
   const magicComments = chunkName ? `/* rspackChunkName: "${chunkName}" */` : ''
 
   return `"${filename}": {
-    shouldLoad: () => decodeURI(document.location.pathname).includes("${file.absolute}"),
+    shouldLoad: () => {
+      const newLoad = new URLSearchParams(document.location.search).get("specPath") === "${
+        file.absolute
+      }";
+      const oldLoad = decodeURI(document.location.pathname).includes("${file.absolute}");
+      return newLoad | oldLoad;
+    },
     load: () => import(${magicComments} "${file.absolute}"),
     absolute: "${file.absolute.split(path.sep).join(path.posix.sep)}",
     relative: "${file.relative.split(path.sep).join(path.posix.sep)}",
@@ -39,7 +45,13 @@ const makeImport = (
  * @returns {Record<string, ReturnType<makeImport>}
  * {
  *   "App.spec.js": {
- *     shouldLoad: () => document.location.pathname.includes('cypress/component/App.spec.js'),
+ *     shouldLoad: () => {
+         const newLoad = new URLSearchParams(document.location.search).get("specPath") === "${
+           file.absolute
+         }";
+         const oldLoad = decodeURI(document.location.pathname).includes("${file.absolute}");
+         return newLoad | oldLoad;
+       },
  *     load: () => {
  *       return import("/Users/projects/my-app/cypress/component/App.spec.js" \/* rspackChunkName: "spec-0" *\/)
  *     },