Fix/web accessible resources script modules (#855)

* include script module entry file in web resources * tests(client) fix loading page script * tests(update) update output snapshots * Create eight-stingrays-provide.md * tests(update) update output snapshots 2
crxjs · Jan 10, 2024 · ce9fe1c · ce9fe1c
1 parent a0d4592
commit ce9fe1c
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 15 deletions.
diff --git a/.changeset/eight-stingrays-provide.md b/.changeset/eight-stingrays-provide.md
@@ -0,0 +1,5 @@
+---
+"@crxjs/vite-plugin": patch
+---
+
+Fix/web accessible resources script modules
diff --git a/packages/vite-plugin/src/client/es/loading-page-script.ts b/packages/vite-plugin/src/client/es/loading-page-script.ts
@@ -58,7 +58,7 @@ do {
   }
 } while (!ready)
 
-// reload the extension to load the built files from the dev server
-chrome.runtime.reload()
+// reload the page to load the built files from the dev server
+location.reload()
 
 export {}
diff --git a/packages/vite-plugin/src/node/plugin-webAccessibleResources.ts b/packages/vite-plugin/src/node/plugin-webAccessibleResources.ts
@@ -141,7 +141,8 @@ export const pluginWebAccessibleResources: CrxPluginFn = () => {
                   contentScripts.get(key)!.css = [...css]
 
                   // loader files import the entry, so entry file must be web accessible
-                  if (type === 'loader') imports.add(fileName)
+                  if (type === 'loader' || isDynamicScript)
+                    imports.add(fileName)
 
                   const resource:
                     | WebAccessibleResourceById

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
@@ -116,7 +116,7 @@ do {
     await new Promise((resolve) => setTimeout(resolve, timeout));
   }
 } while (!ready);
-chrome.runtime.reload();
+location.reload();
 "
 `;
 

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
@@ -113,7 +113,7 @@ do {
     await new Promise((resolve) => setTimeout(resolve, timeout));
   }
 } while (!ready);
-chrome.runtime.reload();
+location.reload();
 "
 `;
 

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
@@ -117,7 +117,7 @@ do {
     await new Promise((resolve) => setTimeout(resolve, timeout));
   }
 } while (!ready);
-chrome.runtime.reload();
+location.reload();
 "
 `;
 

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
@@ -116,7 +116,7 @@ do {
     await new Promise((resolve) => setTimeout(resolve, timeout));
   }
 } while (!ready);
-chrome.runtime.reload();
+location.reload();
 "
 `;
 

diff --git a/packages/vite-plugin/tests/out/vite-svelte/__snapshots__/serve.test.ts.snap b/packages/vite-plugin/tests/out/vite-svelte/__snapshots__/serve.test.ts.snap
@@ -126,7 +126,7 @@ do {
     await new Promise((resolve) => setTimeout(resolve, timeout));
   }
 } while (!ready);
-chrome.runtime.reload();
+location.reload();
 "
 `;
 
@@ -137,7 +137,7 @@ import 'http://localhost:3000/@crx/client-worker';
 `;
 
 exports[`serve fs output > src/App.svelte.js 1`] = `
-"import { createHotContext as __vite__createHotContext } from \\"/vendor/vite-client.js\\";import.meta.hot = __vite__createHotContext(\\"/src/App.svelte.js\\");/* tests/out/vite-svelte/src/App.svelte generated by Svelte v3.48.0 */
+"import { createHotContext as __vite__createHotContext } from \\"/vendor/vite-client.js\\";import.meta.hot = __vite__createHotContext(\\"/src/App.svelte.js\\");/* src/App.svelte generated by Svelte v3.48.0 */
 import {
 	SvelteComponentDev as SvelteComponentDev$,
 	add_location as add_location$,
@@ -165,7 +165,7 @@ import {
 const { Error: Error$, Object: Object$, console: console$ } = globals$;
 import logo from '/src/assets/svelte.png__import.js';
 import Counter from '/src/lib/Counter.svelte.js';
-const file$ = \\"tests/out/vite-svelte/src/App.svelte\\";
+const file$ = \\"src/App.svelte\\";
 
 function create_fragment(ctx) {
 	let main$;
@@ -365,7 +365,7 @@ exports[`serve fs output > src/content.js-loader.js 1`] = `
 `;
 
 exports[`serve fs output > src/lib/Counter.svelte.js 1`] = `
-"import { createHotContext as __vite__createHotContext } from \\"/vendor/vite-client.js\\";import.meta.hot = __vite__createHotContext(\\"/src/lib/Counter.svelte.js\\");/* tests/out/vite-svelte/src/lib/Counter.svelte generated by Svelte v3.48.0 */
+"import { createHotContext as __vite__createHotContext } from \\"/vendor/vite-client.js\\";import.meta.hot = __vite__createHotContext(\\"/src/lib/Counter.svelte.js\\");/* src/lib/Counter.svelte generated by Svelte v3.48.0 */
 import {
 	SvelteComponentDev as SvelteComponentDev$,
 	add_location as add_location$,
@@ -386,7 +386,7 @@ import {
 } from \\"/vendor/svelte_internal.js__v--hash.js\\";
 
 const { Error: Error$, Object: Object$, console: console$ } = globals$;
-const file$ = \\"tests/out/vite-svelte/src/lib/Counter.svelte\\";
+const file$ = \\"src/lib/Counter.svelte\\";
 
 function create_fragment(ctx) {
 	let button$;

diff --git a/packages/vite-plugin/tests/out/with-circular-deps/__snapshots__/serve.test.ts.snap b/packages/vite-plugin/tests/out/with-circular-deps/__snapshots__/serve.test.ts.snap
@@ -115,7 +115,7 @@ do {
     await new Promise((resolve) => setTimeout(resolve, timeout));
   }
 } while (!ready);
-chrome.runtime.reload();
+location.reload();
 "
 `;
 

diff --git a/packages/vite-plugin/tests/out/with-public-dir/__snapshots__/serve.test.ts.snap b/packages/vite-plugin/tests/out/with-public-dir/__snapshots__/serve.test.ts.snap
@@ -115,7 +115,7 @@ do {
     await new Promise((resolve) => setTimeout(resolve, timeout));
   }
 } while (!ready);
-chrome.runtime.reload();
+location.reload();
 "
 `;
 

diff --git a/packages/vite-plugin/tests/out/with-sourcemaps/__snapshots__/serve.test.ts.snap b/packages/vite-plugin/tests/out/with-sourcemaps/__snapshots__/serve.test.ts.snap
@@ -113,7 +113,7 @@ do {
     await new Promise((resolve) => setTimeout(resolve, timeout));
   }
 } while (!ready);
-chrome.runtime.reload();
+location.reload();
 "
 `;