fix: the issue with chrome.runtime.getURL introduced in Chrome 130 ca…

…using CSP rejecting script due to different origin (GUID instead of chrome extension id) (#928)
crxjs · Oct 20, 2024 · f4eb4d4 · f4eb4d4
1 parent a6d882a
commit f4eb4d4
Show file tree

Hide file tree

Showing 38 changed files with 99 additions and 58 deletions.
diff --git a/.changeset/smart-bottles-warn.md b/.changeset/smart-bottles-warn.md
@@ -0,0 +1,5 @@
+---
+'@crxjs/vite-plugin': major
+---
+
+fix: workaround for the issue with chrome.runtime.getURL introduced in Chrome 130 causing CSP rejecting script due to different origin (GUID instead of chrome extension id)
diff --git a/packages/vite-plugin/src/client/es/hmr-client-worker.ts b/packages/vite-plugin/src/client/es/hmr-client-worker.ts
@@ -17,7 +17,7 @@ declare const __SERVER_PORT__: string
 
 /* -------- REDIRECT FETCH TO THE DEV SERVER ------- */
 
-const ownOrigin = new URL(chrome.runtime.getURL('/')).origin
+const ownOrigin = `chrome-extension://${chrome.runtime.id}`;
 self.addEventListener('fetch', (fetchEvent) => {
   const url = new URL(fetchEvent.request.url)
   if (url.origin === ownOrigin) {

diff --git a/packages/vite-plugin/src/node/archive/plugin-contentScripts.ts b/packages/vite-plugin/src/node/archive/plugin-contentScripts.ts
@@ -420,11 +420,11 @@ export const pluginContentScripts: CrxPluginFn = ({
               resources: ['**/*', '*'],
             }
 
-            if (browser !== 'firefox') {
-              // change the extension origin on every reload
-              // not allowed in FF b/c FF does this by default
-              war.use_dynamic_url = true
-            }
+            // if (browser !== 'firefox') {
+            //   // change the extension origin on every reload
+            //   // not allowed in FF b/c FF does this by default
+            //   war.use_dynamic_url = true
+            // }
 
             manifest.web_accessible_resources.push(war)
           } else {
@@ -522,7 +522,7 @@ export const pluginContentScripts: CrxPluginFn = ({
                       | WebAccessibleResourceByMatch = {
                       matches: script.matches,
                       resources: [...assets, ...imports],
-                      use_dynamic_url: true,
+                      use_dynamic_url: false,
                     }
 
                     if (css.size)

diff --git a/packages/vite-plugin/src/node/defineManifest.ts b/packages/vite-plugin/src/node/defineManifest.ts
@@ -35,7 +35,7 @@ export const defineManifest = (manifest: ManifestV3Export): ManifestV3Export =>
  */
 export const defineDynamicResource = ({
   matches = ['http://*/*', 'https://*/*'],
-  use_dynamic_url = true,
+  use_dynamic_url = false,
 }: Omit<
   WebAccessibleResourceByMatch,
   'resources'

diff --git a/packages/vite-plugin/src/node/plugin-webAccessibleResources.ts b/packages/vite-plugin/src/node/plugin-webAccessibleResources.ts
@@ -56,7 +56,7 @@ export const pluginWebAccessibleResources: CrxPluginFn = () => {
           // all resources are web accessible
           resources: ['**/*', '*'],
           // change the extension origin on every reload
-          use_dynamic_url: true,
+          use_dynamic_url: false,
         }
 
         if (browser === 'firefox') {
@@ -163,7 +163,7 @@ export const pluginWebAccessibleResources: CrxPluginFn = () => {
                     resources: [...assets, ...imports],
                     use_dynamic_url: isDynamicScript
                       ? dynamicScriptDynamicUrl
-                      : true,
+                      : false,
                   }
 
                   if (isDynamicScript || !injectCss) {

diff --git a/packages/vite-plugin/tests/out/basic-js/__snapshots__/build.test.ts.snap b/packages/vite-plugin/tests/out/basic-js/__snapshots__/build.test.ts.snap
@@ -36,7 +36,7 @@ Object {
       "resources": Array [
         "assets/content.js.hash1.js",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/packages/vite-plugin/tests/out/basic-js/__snapshots__/serve.test.ts.snap b/packages/vite-plugin/tests/out/basic-js/__snapshots__/serve.test.ts.snap
@@ -36,7 +36,7 @@ Object {
         "*",
         "**/*",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/packages/vite-plugin/tests/out/basic-ts/__snapshots__/build.test.ts.snap b/packages/vite-plugin/tests/out/basic-ts/__snapshots__/build.test.ts.snap
@@ -33,7 +33,7 @@ Object {
       "resources": Array [
         "assets/content.ts.hash1.js",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/packages/vite-plugin/tests/out/basic-ts/__snapshots__/serve.test.ts.snap b/packages/vite-plugin/tests/out/basic-ts/__snapshots__/serve.test.ts.snap
@@ -33,7 +33,7 @@ Object {
         "*",
         "**/*",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/packages/vite-plugin/tests/out/content-script-module-api/__snapshots__/build.test.ts.snap b/packages/vite-plugin/tests/out/content-script-module-api/__snapshots__/build.test.ts.snap
@@ -29,7 +29,7 @@ Object {
       "resources": Array [
         "assets/content.js.hash1.js",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/packages/vite-plugin/tests/out/content-script-module-api/__snapshots__/serve.test.ts.snap b/packages/vite-plugin/tests/out/content-script-module-api/__snapshots__/serve.test.ts.snap
@@ -33,7 +33,7 @@ Object {
         "*",
         "**/*",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/packages/vite-plugin/tests/out/dynamic-script/__snapshots__/build.test.ts.snap b/packages/vite-plugin/tests/out/dynamic-script/__snapshots__/build.test.ts.snap
@@ -30,7 +30,7 @@ Object {
         "assets/declared-script.ts.hash1.js",
         "assets/main-world.ts.hash2.js",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
     Object {
       "matches": Array [

diff --git a/packages/vite-plugin/tests/out/dynamic-script/__snapshots__/serve.test.ts.snap b/packages/vite-plugin/tests/out/dynamic-script/__snapshots__/serve.test.ts.snap
@@ -29,7 +29,7 @@ Object {
         "*",
         "**/*",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/.../vite-plugin/tests/out/vite-content-script-css-imports-2/__snapshots__/build.test.ts.snap b/.../vite-plugin/tests/out/vite-content-script-css-imports-2/__snapshots__/build.test.ts.snap
@@ -41,7 +41,7 @@ Object {
         "assets/index.ts.hash4.js",
         "assets/index.ts.hash5.js",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/.../vite-plugin/tests/out/vite-content-script-css-imports-2/__snapshots__/serve.test.ts.snap b/.../vite-plugin/tests/out/vite-content-script-css-imports-2/__snapshots__/serve.test.ts.snap
@@ -38,7 +38,7 @@ Object {
         "*",
         "**/*",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/.../vite-plugin/tests/out/vite-content-script-css-imports-3/__snapshots__/build.test.ts.snap b/.../vite-plugin/tests/out/vite-content-script-css-imports-3/__snapshots__/build.test.ts.snap
@@ -44,7 +44,7 @@ Object {
         "assets/index.ts.hash6.js",
         "assets/index.ts.hash7.js",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/.../vite-plugin/tests/out/vite-content-script-css-imports-3/__snapshots__/serve.test.ts.snap b/.../vite-plugin/tests/out/vite-content-script-css-imports-3/__snapshots__/serve.test.ts.snap
@@ -38,7 +38,7 @@ Object {
         "*",
         "**/*",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/...es/vite-plugin/tests/out/vite-content-script-css-imports/__snapshots__/build.test.ts.snap b/...es/vite-plugin/tests/out/vite-content-script-css-imports/__snapshots__/build.test.ts.snap
@@ -28,7 +28,7 @@ Object {
       "resources": Array [
         "assets/content.ts.hash2.js",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/...es/vite-plugin/tests/out/vite-content-script-css-imports/__snapshots__/serve.test.ts.snap b/...es/vite-plugin/tests/out/vite-content-script-css-imports/__snapshots__/serve.test.ts.snap
@@ -29,7 +29,7 @@ Object {
         "*",
         "**/*",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/...ges/vite-plugin/tests/out/vite-declared-script-resources/__snapshots__/build.test.ts.snap b/...ges/vite-plugin/tests/out/vite-declared-script-resources/__snapshots__/build.test.ts.snap
@@ -28,7 +28,7 @@ Object {
         "assets/image.hash3.png",
         "assets/script.ts.hash4.js",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/...ges/vite-plugin/tests/out/vite-declared-script-resources/__snapshots__/serve.test.ts.snap b/...ges/vite-plugin/tests/out/vite-declared-script-resources/__snapshots__/serve.test.ts.snap
@@ -29,7 +29,7 @@ Object {
         "*",
         "**/*",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/...te-plugin/tests/out/vite-dynamic-script-resources-minify/__snapshots__/build.test.ts.snap b/...te-plugin/tests/out/vite-dynamic-script-resources-minify/__snapshots__/build.test.ts.snap
@@ -23,7 +23,7 @@ Object {
         "assets/image.hash3.png",
         "assets/script.ts.hash4.js",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/...te-plugin/tests/out/vite-dynamic-script-resources-minify/__snapshots__/serve.test.ts.snap b/...te-plugin/tests/out/vite-dynamic-script-resources-minify/__snapshots__/serve.test.ts.snap
@@ -19,7 +19,7 @@ Object {
         "*",
         "**/*",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/...ages/vite-plugin/tests/out/vite-dynamic-script-resources/__snapshots__/build.test.ts.snap b/...ages/vite-plugin/tests/out/vite-dynamic-script-resources/__snapshots__/build.test.ts.snap
@@ -23,7 +23,7 @@ Object {
         "assets/image.hash3.png",
         "assets/script.ts.hash4.js",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/...ages/vite-plugin/tests/out/vite-dynamic-script-resources/__snapshots__/serve.test.ts.snap b/...ages/vite-plugin/tests/out/vite-dynamic-script-resources/__snapshots__/serve.test.ts.snap
@@ -19,7 +19,7 @@ Object {
         "*",
         "**/*",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/packages/vite-plugin/tests/out/vite-react-fast-refresh/__snapshots__/build.test.ts.snap b/packages/vite-plugin/tests/out/vite-react-fast-refresh/__snapshots__/build.test.ts.snap
@@ -28,7 +28,7 @@ Object {
         "assets/content.tsx.hash2.js",
         "assets/vendor.hash3.js",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/packages/vite-plugin/tests/out/vite-react-fast-refresh/__snapshots__/serve.test.ts.snap b/packages/vite-plugin/tests/out/vite-react-fast-refresh/__snapshots__/serve.test.ts.snap
@@ -31,7 +31,7 @@ Object {
         "*",
         "**/*",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }
@@ -46,7 +46,7 @@ Array [
   "src/content.tsx-loader.js",
   "src/content.tsx.js",
   "src/popup.html",
-  "vendor/chunk-D6CDYV2H.js__v--hash.js",
+  "vendor/chunk-MPSAKQTA.js__v--hash.js",
   "vendor/crx-client-port.js",
   "vendor/crx-client-preamble.js",
   "vendor/id-__x00__react-jsx-dev-runtime.js",
@@ -170,15 +170,42 @@ export default App;
 var _c;
 $RefreshReg$(_c, \\"App\\");
 if (import.meta.hot) {
+  let isReactRefreshBoundary = function(mod) {
+    if (mod == null || typeof mod !== \\"object\\") {
+      return false;
+    }
+    let hasExports = false;
+    let areAllExportsComponents = true;
+    for (const exportName in mod) {
+      hasExports = true;
+      if (exportName === \\"__esModule\\") {
+        continue;
+      }
+      const desc = Object.getOwnPropertyDescriptor(mod, exportName);
+      if (desc && desc.get) {
+        return false;
+      }
+      const exportValue = mod[exportName];
+      if (!RefreshRuntime.isLikelyComponentType(exportValue)) {
+        areAllExportsComponents = false;
+      }
+    }
+    return hasExports && areAllExportsComponents;
+  };
   window.$RefreshReg$ = prevRefreshReg;
   window.$RefreshSig$ = prevRefreshSig;
-  import.meta.hot.accept();
-  if (!window.__vite_plugin_react_timeout) {
-    window.__vite_plugin_react_timeout = setTimeout(() => {
-      window.__vite_plugin_react_timeout = 0;
-      RefreshRuntime.performReactRefresh();
-    }, 30);
-  }
+  import.meta.hot.accept((mod) => {
+    if (isReactRefreshBoundary(mod)) {
+      if (!window.__vite_plugin_react_timeout) {
+        window.__vite_plugin_react_timeout = setTimeout(() => {
+          window.__vite_plugin_react_timeout = 0;
+          RefreshRuntime.performReactRefresh();
+        }, 30);
+      }
+    } else {
+      import.meta.hot.invalidate();
+    }
+  });
 }
 "
 `;

diff --git a/packages/vite-plugin/tests/out/vite-self-directive-in-csp/__snapshots__/build.test.ts.snap b/packages/vite-plugin/tests/out/vite-self-directive-in-csp/__snapshots__/build.test.ts.snap
@@ -36,7 +36,7 @@ Object {
       "resources": Array [
         "assets/content.ts.hash1.js",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/packages/vite-plugin/tests/out/vite-self-directive-in-csp/__snapshots__/serve.test.ts.snap b/packages/vite-plugin/tests/out/vite-self-directive-in-csp/__snapshots__/serve.test.ts.snap
@@ -36,7 +36,7 @@ Object {
         "*",
         "**/*",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }

diff --git a/packages/vite-plugin/tests/out/vite-svelte/__snapshots__/build.test.ts.snap b/packages/vite-plugin/tests/out/vite-svelte/__snapshots__/build.test.ts.snap
@@ -32,7 +32,7 @@ Object {
         "assets/svelte.hash.png",
         "assets/vendor.hash.js",
       ],
-      "use_dynamic_url": true,
+      "use_dynamic_url": false,
     },
   ],
 }