feat: Rename "Prefetch SW" to "Preloader"

packages/docs/src/routes/docs/(qwikcity)/advanced/speculative-module-fetching/index.mdx

@@ -195,5 +195,5 @@ Note that this process is only for testing the speculative module fetching, and
 
 The service worker in Qwik core, which uses the `<PrefetchServiceWorker />` and `<PrefetchGraph />` components in `root.tsx` has a debug mode.
 
-To see the service worker logs, add `window.qwikPrefetchSW.push(['verbose', '', []])` to the JavaScript console and press the `Enter` key.
+To see the service worker logs, add `window.qwikPreloader.push(['verbose', '', []])` to the JavaScript console and press the `Enter` key.
 

packages/qwik/src/core/components/prefetch.ts

@@ -72,7 +72,7 @@ export const PrefetchServiceWorker = (opts: {
         JSON.stringify(resolvedOpts.base),
         JSON.stringify(resolvedOpts.manifestHash),
         'navigator.serviceWorker',
-        'window.qwikPrefetchSW||(window.qwikPrefetchSW=[])',
+        'window.qwikPreloader||(window.qwikPreloader=[])',
         resolvedOpts.verbose,
       ].join(','),
       ');',
@@ -149,7 +149,7 @@ export const PrefetchGraph = (
     resolvedOpts.base,
     `q-bundle-graph-${resolvedOpts.manifestHash}.json`,
   ]);
-  const code = `(window.qwikPrefetchSW||(window.qwikPrefetchSW=[])).push(${args})`;
+  const code = `(window.qwikPreloader||(window.qwikPreloader=[])).push(${args})`;
   const props = {
     dangerouslySetInnerHTML: code,
     nonce: opts.nonce,

packages/qwik/src/optimizer/src/plugins/vite.ts

@@ -1171,18 +1171,16 @@ export function convertManifestToBundleGraph(manifest: QwikManifest): QwikBundle
     let didAdd = false;
     for (const depName of bundle.dynamicImports || []) {
       // If we dynamically import a qrl segment that is not a handler, we'll probably need it soon
-      const dep = graph[depName];
+      // const dep = graph[depName];
       if (!graph[depName]) {
         // external dependency
         continue;
       }
-      if (dep.isTask) {
-        if (!didAdd) {
-          deps.add('<dynamic>');
-          didAdd = true;
-        }
-        deps.add(depName);
+      if (!didAdd) {
+        deps.add('<dynamic>');
+        didAdd = true;
       }
+      deps.add(depName);
     }
     map.set(bundleName, { index, deps });
     bundleGraph.push(bundleName);

packages/qwik/src/optimizer/src/plugins/vite.unit.ts

@@ -478,6 +478,15 @@ suite('convertManifestToBundleGraph', () => {
         },
       } as Record<string, QwikBundle>,
     } as QwikManifest;
-    expect(convertManifestToBundleGraph(manifest)).toEqual(['a.js', 2, 'b.js', 'c.js']);
+    expect(convertManifestToBundleGraph(manifest)).toEqual([
+      'a.js',
+      4,
+      -1,
+      7,
+      'b.js',
+      -1,
+      7,
+      'c.js',
+    ]);
   });
 });

packages/qwik/src/prefetch-service-worker/process-message.ts

@@ -57,7 +57,7 @@ export type SWMessages = SWMsgBundleGraph | SWMsgBundleGraphUrl | SWMsgPrefetch
 
 export const log = (...args: any[]) => {
   // eslint-disable-next-line no-console
-  console.log('⚙️ Prefetch SW:', ...args);
+  console.log('⚙️ Preloader:', ...args);
 };
 
 export const processMessage = async (state: SWState, msg: SWMessages) => {

packages/qwik/src/server/prefetch-utils.ts

@@ -24,7 +24,7 @@ export function prefetchUrlsEventScript(base: string, prefetchResources: Prefetc
     bundles: flattenPrefetchResources(prefetchResources).map((u) => u.split('/').pop()!),
   };
   const args = JSON.stringify(['prefetch', base, ...data.bundles!]);
-  return `(window.qwikPrefetchSW||(window.qwikPrefetchSW=[])).push(${args});`;
+  return `(window.qwikPreloader||(window.qwikPreloader=[])).push(${args});`;
 }
 
 export function flattenPrefetchResources(prefetchResources: PrefetchResource[]) {

scripts/build.ts

@@ -186,6 +186,7 @@ export async function build(config: BuildConfig) {
         [join(config.srcQwikDir, 'prefetch-service-worker')]: () => submoduleQwikPrefetch(config),
         [join(config.srcQwikDir, 'server')]: () => submoduleServer(config),
         [join(config.srcQwikCityDir, 'runtime/src')]: () => buildQwikCity(config),
+        [join(config.srcQwikCityDir, 'buildtime')]: () => buildQwikCity(config),
       });
     }
   } catch (e: any) {

scripts/submodule-qwikprefetch.ts

@@ -18,15 +18,15 @@ import { writePackageJson } from './package-json';
  * provides a utility function.
  */
 export async function submoduleQwikPrefetch(config: BuildConfig) {
-  const prefetchSwDir = join(config.srcQwikDir, 'prefetch-service-worker');
+  const PreloaderDir = join(config.srcQwikDir, 'prefetch-service-worker');
   const input: InputOptions = {
-    input: join(prefetchSwDir, 'entry.ts'),
+    input: join(PreloaderDir, 'entry.ts'),
     plugins: [
       {
         name: 'qwikPrefetchTranspile',
         resolveId(id) {
           if (!id.endsWith('.ts')) {
-            return join(prefetchSwDir, id + '.ts');
+            return join(PreloaderDir, id + '.ts');
           }
           return null;
         },