@qwik.dev/core 2.0.0-beta.31 → 2.0.0-beta.34

package/dist/preloader.mjs

@@ -10,9 +10,9 @@ const createMacroTask = (e) => {
 };
 const isBrowser$1 = !isServer;
 const doc = isBrowser$1 ? document : void 0;
-const config = { t: 0, o: 25, u: 0.65 };
+const config = { t: 25 };
 const rel = isBrowser$1 && doc.createElement("link").relList?.supports?.("modulepreload") ? "modulePreload" : "preload";
-const loadStart = performance.now();
+performance.now();
 const isJSRegex = /\.[mc]?js$/;
 const yieldInterval = 1e3 / 60;
 const BundleImportState_None = 0;
@@ -31,12 +31,9 @@ let isAdjustmentScheduled = 0;
 let isProcessingAdjustments = 0;
 const shouldYieldInBrowser = isBrowser$2;
 const adjustmentStack = [];
-const log = (...e) => {
-  console.log(`Preloader ${performance.now() - loadStart}ms ${preloadCount}/${queue.length} queued>`, ...e);
-};
 const sortQueue = () => {
   if (queueDirty) {
-    queue.sort((e, t) => e.l - t.l);
+    queue.sort((e, t) => e.o - t.o);
     queueDirty = 0;
   }
 };
@@ -48,13 +45,9 @@ function trigger() {
   let t = 0;
   while (queue.length) {
     const n = queue[0];
-    const s = n.l;
-    const o = 1 - s;
-    const r = graph ? config.o : (
-      // While the graph is not available, we limit to 5 preloads
-      5
-    );
-    if (o >= 0.99 || preloadCount < r) {
+    const s = n.o;
+    const r = 1 - s;
+    if (r >= 0.99 || preloadCount < config.t) {
       queue.shift();
       preloadOne(n);
       if (performance.now() >= e) {
@@ -67,71 +60,62 @@ function trigger() {
     isTriggerScheduled = 1;
     nextTriggerMacroTask();
   }
-  if (config.t && !queue.length) {
-    const e2 = [...bundles.values()].filter((e3) => e3.i > BundleImportState_None);
-    const t2 = e2.reduce((e3, t3) => e3 + t3.m, 0);
-    const n = e2.reduce((e3, t3) => e3 + t3.p, 0);
-    log(`>>>> done ${e2.length}/${bundles.size} total: ${t2}ms waited, ${n}ms loaded`);
-  }
 }
-const enqueueAdjustment = (e, t, n, s) => {
-  adjustmentStack.unshift({ $: e, l: t, B: s, h: n });
+const enqueueAdjustment = (e, t, n) => {
+  adjustmentStack.unshift({ u: e, o: t, i: n });
 };
 const processAdjustmentFrame = () => {
   const e = adjustmentStack[adjustmentStack.length - 1];
-  const t = e.$;
-  if (e.S) {
-    const n2 = e.j;
-    if (n2 >= e.S.length) {
+  const t = e.u;
+  if (e.l) {
+    const n2 = e.m;
+    if (n2 >= e.l.length) {
       adjustmentStack.pop();
       return 0;
     }
-    const s = e.S[n2];
-    e.j = n2 + 1;
-    const o = getBundle(s.k);
-    if (o.l === 0) return 1;
-    const r = 1 - t.l;
+    const s = e.l[n2];
+    e.m = n2 + 1;
+    const r = getBundle(s.p);
+    if (r.o === 0) return 1;
+    const o = 1 - t.o;
     let a;
-    if (r === 1 || r >= 0.99 && e.h.T < 100) {
-      e.h.T++;
-      a = Math.min(0.01, 1 - s.I);
-    } else {
-      const e2 = 1 - s.I * r;
-      const t2 = s.A;
+    if (o === 1 || o >= 0.99) a = Math.min(0.01, 1 - s.$);
+    else {
+      const e2 = 1 - s.$ * o;
+      const t2 = s.B;
       const n3 = e2 / t2;
-      a = Math.max(0.02, o.l * n3);
-      s.A = n3;
+      a = Math.max(0.02, r.o * n3);
+      s.B = n3;
     }
-    adjustmentStack.push({ $: o, l: a, B: e.B, h: e.h });
+    adjustmentStack.push({ u: r, o: a, i: e.i });
     return 1;
   }
-  if (e.B?.has(t)) {
+  if (e.i?.has(t)) {
     adjustmentStack.pop();
     return 0;
   }
-  const n = t.l;
-  t.l = e.l;
-  if (n - t.l < 0.01) {
+  const n = t.o;
+  t.o = e.o;
+  if (n - t.o < 0.01) {
     adjustmentStack.pop();
     return 0;
   }
   if (
     // don't queue until we have initialized the preloader
-    base != null && t.i < BundleImportState_Preload
+    base != null && t.S < BundleImportState_Preload
   ) {
-    if (t.i === BundleImportState_None) {
-      t.i = BundleImportState_Queued;
+    if (t.S === BundleImportState_None) {
+      t.S = BundleImportState_Queued;
       queue.push(t);
-      config.t && log(`queued ${Math.round((1 - t.l) * 100)}%`, t.k);
     }
     queueDirty = 1;
   }
-  if (t.S?.length) {
-    const n2 = e.B || /* @__PURE__ */ new Set();
+  if (t.l?.length) {
+    const n2 = e.i || /* @__PURE__ */ new Set();
     n2.add(t);
-    e.B = n2;
-    e.S = t.S;
-    e.j = 0;
+    e.i = n2;
+    e.l = t.l;
+    e.m = 0;
     return 0;
   }
   adjustmentStack.pop();
@@ -158,47 +142,42 @@ function processPendingAdjustments() {
   if (t && shouldYieldInBrowser) nextTriggerMacroTask();
 }
 const preloadOne = (e) => {
-  if (e.i >= BundleImportState_Preload) return;
+  if (e.S >= BundleImportState_Preload) return;
   preloadCount++;
   const t = performance.now();
-  e.m = t - e.M;
-  e.i = BundleImportState_Preload;
-  config.t && log(`<< load ${Math.round((1 - e.l) * 100)}% after ${`${e.m}ms`}`, e.k);
+  e.h = t - e.j;
+  e.S = BundleImportState_Preload;
   const n = doc.createElement("link");
-  n.href = new URL(`${base}${e.k}`, doc.baseURI).toString();
+  n.href = new URL(`${base}${e.p}`, doc.baseURI).toString();
   n.rel = rel;
   n.as = "script";
   n.onload = n.onerror = () => {
     preloadCount--;
     const s = performance.now();
-    e.p = s - t;
-    e.i = BundleImportState_Loaded;
-    config.t && log(`>> done after ${e.p}ms`, e.k);
+    e.k = s - t;
+    e.S = BundleImportState_Loaded;
     n.remove();
     nextTriggerMacroTask();
   };
   doc.head.appendChild(n);
 };
 const adjustProbabilities = (e, t, n) => {
-  enqueueAdjustment(e, t, { T: 0 }, n);
+  enqueueAdjustment(e, t, n);
   if (shouldYieldInBrowser) nextAdjustmentMacroTask();
   else processPendingAdjustments();
 };
-const handleBundle = (e, t, n) => {
-  const s = getBundle(e);
-  if (s && s.l > t) if (n) enqueueAdjustment(s, t, n);
-  else adjustProbabilities(s, t);
+const handleBundle = (e, t) => {
+  const n = getBundle(e);
+  if (n) enqueueAdjustment(n, t);
 };
 const preload = (e, t) => {
   if (!e?.length) return;
-  let n = t ? 1 - t : 0.4;
-  const s = { T: 0 };
+  const n = t ? 1 - t : 0.4;
   if (Array.isArray(e)) for (let t2 = e.length - 1; t2 >= 0; t2--) {
-    const o = e[t2];
-    if (typeof o === "number") n = 1 - o / 10;
-    else handleBundle(o, n, s);
+    const s = e[t2];
+    handleBundle(s, n);
   }
-  else handleBundle(e, n, s);
+  else handleBundle(e, n);
   if (shouldYieldInBrowser) nextAdjustmentMacroTask();
   else processPendingAdjustments();
 };
@@ -212,21 +191,21 @@ if (isBrowser$2) document.addEventListener("qsymbol", (e) => {
 let base;
 let graph;
 const isBrowser = !isServer;
-const makeBundle = (e, t) => ({ k: e, i: isJSRegex.test(e) ? BundleImportState_None : BundleImportState_Alias, S: t, l: 1, M: performance.now(), m: 0, p: 0 });
+const makeBundle = (e, t) => ({ p: e, S: isJSRegex.test(e) ? BundleImportState_None : BundleImportState_Alias, l: t, o: 1, j: performance.now(), h: 0, k: 0 });
 const parseBundleGraph = (e) => {
   const t = /* @__PURE__ */ new Map();
   let n = 0;
   while (n < e.length) {
     const s = e[n++];
-    const o = [];
-    let r;
+    const r = [];
+    let o;
     let a = 1;
-    while (r = e[n], typeof r === "number") {
-      if (r < 0) a = -r / 10;
-      else o.push({ k: e[r], I: a, A: 1 });
+    while (o = e[n], typeof o === "number") {
+      if (o < 0) a = -o / 10;
+      else r.push({ p: e[o], $: a, B: 1 });
       n++;
     }
-    t.set(s, o);
+    t.set(s, r);
   }
   return t;
 };
@@ -246,9 +225,7 @@ const getBundle = (e) => {
 };
 const loadBundleGraph = (e, t, n) => {
   if (n) {
-    if ("d" in n) config.t = !!n.d;
-    if ("P" in n) config.o = n["P"];
-    if ("Q" in n) config.u = 1 - n["Q"];
+    if ("P" in n) config.t = n["P"];
   }
   if (!isBrowser || e == null) return;
   base = e;
@@ -257,13 +234,12 @@ const loadBundleGraph = (e, t, n) => {
     const t2 = [];
     for (const [e3, n3] of graph.entries()) {
       const s2 = getBundle(e3);
-      s2.S = n3;
-      if (s2.l < 1) {
-        t2.push([s2, s2.l]);
-        s2.l = 1;
+      s2.l = n3;
+      if (s2.o < 1) {
+        t2.push([s2, s2.o]);
+        s2.o = 1;
       }
     }
-    config.t && log(`parseBundleGraph got ${graph.size} bundles, adjusting ${t2.length}`);
     if (!t2.length) {
       nextTriggerMacroTask();
       return;
@@ -272,9 +248,9 @@ const loadBundleGraph = (e, t, n) => {
     const s = createMacroTask(() => {
       const e3 = performance.now() + yieldInterval;
       while (n2 < t2.length) {
-        const [o, r] = t2[n2];
+        const [r, o] = t2[n2];
         n2++;
-        adjustProbabilities(o, r);
+        adjustProbabilities(r, o);
         if (n2 < t2.length && performance.now() >= e3) {
           s();
           return;
@@ -287,7 +263,6 @@ const loadBundleGraph = (e, t, n) => {
 };
 export {
   parseBundleGraph as g,
-  handleBundle as h,
   loadBundleGraph as l,
   preload as p
 };