fix: improve new SW logic (#6641)

QwikDev · Jul 8, 2024 · 9cfb612 · 9cfb612
1 parent 35be2b2
commit 9cfb612
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/packages/qwik/src/optimizer/src/plugins/vite.ts b/packages/qwik/src/optimizer/src/plugins/vite.ts
@@ -570,9 +570,14 @@ export function qwikVite(qwikViteOpts: QwikVitePluginOptions = {}): any {
           const fs: typeof import('fs') = await sys.dynamicImport('node:fs');
           const workerScriptPath = (await this.resolve('@builder.io/qwik/qwik-prefetch.js'))!.id;
           const workerScript = await fs.promises.readFile(workerScriptPath, 'utf-8');
+          const assetsDir = qwikPlugin.getOptions().assetsDir || '';
+          const useAssetsDir = !!assetsDir && assetsDir !== '_astro';
+          const qwikPrefetchServiceWorkerFile = 'qwik-prefetch-service-worker.js';
           this.emitFile({
             type: 'asset',
-            fileName: `qwik-prefetch-service-worker.js`,
+            fileName: useAssetsDir
+              ? sys.path.join(filePath, qwikPrefetchServiceWorkerFile)
+              : qwikPrefetchServiceWorkerFile,
             source: workerScript,
           });
 

diff --git a/packages/qwik/src/prefetch-service-worker/direct-fetch.ts b/packages/qwik/src/prefetch-service-worker/direct-fetch.ts
@@ -27,7 +27,7 @@ export async function enqueueFileAndDependencies(
   filenames.forEach((filename) => addDependencies(base.$graph$, fetchSet, filename));
   await Promise.all(
     Array.from(fetchSet).map((filename) =>
-      enqueueFetchIfNeeded(swState, new URL(base.$path$ + filename, swState.$url$), priority)
+      enqueueFetchIfNeeded(swState, new URL(base.$path$ + filename, swState.$url$.origin), priority)
     )
   );
   taskTick(swState);

diff --git a/packages/qwik/src/prefetch-service-worker/process-message.ts b/packages/qwik/src/prefetch-service-worker/process-message.ts
@@ -117,7 +117,7 @@ async function processBundleGraph(
 async function processBundleGraphUrl(swState: SWState, base: string, graphPath: string) {
   // Call `processBundleGraph` with an empty graph so that a cache location will be allocated.
   await processBundleGraph(swState, base, [], false);
-  const response = (await directFetch(swState, new URL(base + graphPath, swState.$url$)))!;
+  const response = (await directFetch(swState, new URL(base + graphPath, swState.$url$.origin)))!;
   if (response && response.status === 200) {
     const graph = (await response.json()) as SWGraph;
     graph.push(graphPath);