feat(core): expose preload and remove qprefetch

Author: wmertens

packages/qwik-city/src/runtime/src/client-navigate.ts

@@ -1,7 +1,6 @@
-import { isBrowser } from '@builder.io/qwik';
+import { isBrowser, _preload } from '@builder.io/qwik';
 import type { NavigationType, ScrollState } from './types';
 import { isSamePath, toPath } from './utils';
-import { PREFETCHED_NAVIGATE_PATHS } from './constants';
 
 export const clientNavigate = (
   win: Window,
@@ -43,9 +42,7 @@ export const newScrollState = (): ScrollState => {
 export const prefetchSymbols = (path: string) => {
   if (isBrowser) {
     path = path.endsWith('/') ? path : path + '/';
-    if (!PREFETCHED_NAVIGATE_PATHS.has(path)) {
-      PREFETCHED_NAVIGATE_PATHS.add(path);
-      document.dispatchEvent(new CustomEvent('qprefetch', { detail: { links: [path] } }));
-    }
+    path = path.length > 1 && path.startsWith('/') ? path.slice(1) : path;
+    _preload(path, true);
   }
 };

packages/qwik-city/src/runtime/src/constants.ts

@@ -4,8 +4,6 @@ export const MODULE_CACHE = /*#__PURE__*/ new WeakMap<any, any>();
 
 export const CLIENT_DATA_CACHE = new Map<string, Promise<ClientPageData | undefined>>();
 
-export const PREFETCHED_NAVIGATE_PATHS = new Set<string>();
-
 export const QACTION_KEY = 'qaction';
 
 export const QFN_KEY = 'qfunc';

packages/qwik/src/core/api.md

@@ -624,6 +624,9 @@ export const PrefetchServiceWorker: (opts: {
     nonce?: string;
 }) => JSXNode_2<'script'>;
 
+// @internal (undocumented)
+export const _preload: (name: string, priority: boolean) => void;
+
 // @public (undocumented)
 export interface ProgressHTMLAttributes<T extends Element> extends Attrs<'progress', T> {
 }

packages/qwik/src/core/internal.ts

@@ -16,3 +16,4 @@ export {
 } from './use/use-core';
 export { _jsxQ, _jsxC, _jsxS } from './render/jsx/jsx-runtime';
 export { _fnSignal } from './qrl/inlined-fn';
+export { preload as _preload } from './qrl/preload';

packages/qwik/src/core/qrl/preload.ts

@@ -32,11 +32,8 @@ type BundleImport = {
   $dynamicImports$: string[];
 };
 let bundles: Map<string, BundleImport> | undefined;
-type WantedBundle = {
-  name: string;
-  priority: boolean;
-};
-const wantedBundles: Set<WantedBundle> = new Set();
+
+const wantedBundles = new Map<string, boolean>();
 
 const parseBundleGraph = (text: string, base: string) => {
   try {
@@ -65,7 +62,7 @@ const parseBundleGraph = (text: string, base: string) => {
         $dynamicImports$: dynamicImports,
       });
     }
-    for (const { name, priority } of wantedBundles) {
+    for (const [name, priority] of wantedBundles) {
       preload(name, priority);
     }
     wantedBundles.clear();
@@ -75,6 +72,7 @@ const parseBundleGraph = (text: string, base: string) => {
   }
 };
 
+/** @internal */
 export const loadBundleGraph = (element: Element) => {
   if (typeof window === 'undefined' || bundlesP) {
     return;
@@ -137,9 +135,10 @@ const preloadBundle = (bundle: BundleImport, priority: boolean) => {
   bundle.$state$ = priority ? BundleImportState.Loading : BundleImportState.Low;
 };
 
+/** @internal */
 export const preload = (name: string, priority: boolean) => {
   if (!bundles) {
-    wantedBundles.add({ name, priority });
+    wantedBundles.set(name, priority || !!wantedBundles.get(name));
     return;
   }
   const bundle = bundles.get(name);

packages/qwik/src/core/qrl/qrl.ts

@@ -1,13 +1,6 @@
 import { EMPTY_ARRAY } from '../util/flyweight';
 import type { QRL } from './qrl.public';
-import {
-  assertQrl,
-  createQRL,
-  emitEvent,
-  getSymbolHash,
-  isSyncQrl,
-  type QRLInternal,
-} from './qrl-class';
+import { assertQrl, createQRL, isSyncQrl, type QRLInternal } from './qrl-class';
 import { isFunction, isString } from '../util/types';
 import {
   qError,
@@ -96,10 +89,6 @@ export const qrl = <T = any>(
   if (!announcedQRL.has(symbol)) {
     // Emit event
     announcedQRL.add(symbol);
-    emitEvent('qprefetch', {
-      symbols: [getSymbolHash(symbol)],
-      bundles: chunk && [chunk],
-    });
   }
 
   // Unwrap subscribers

packages/qwik/src/optimizer/src/plugins/bundle-graph.ts

@@ -1,3 +1,4 @@
+import { getSymbolHash } from 'packages/qwik/src/core/qrl/qrl-class';
 import type { QwikBundleGraph, QwikManifest } from '../types';
 
 /**
@@ -84,9 +85,7 @@ export function convertManifestToBundleGraph(
     if (!bundle) {
       console.warn(`Chunk ${chunkname} for symbol ${symbol} not found in the bundle graph.`);
     } else {
-      const idx = symbol.lastIndexOf('_');
-      const hash = idx === -1 ? symbol : symbol.slice(idx + 1);
-      bundleGraph.push(hash, bundle.index);
+      bundleGraph.push(getSymbolHash(symbol), bundle.index);
     }
   }
   // Second pass to to update dependency pointers