@qwik.dev/core 2.0.0-beta.25 → 2.0.0-beta.27

package/dist/preloader.mjs

@@ -1,128 +1,128 @@
-import { isBrowser } from "@qwik.dev/core/build";
-const doc = isBrowser ? document : void 0;
-const config = { t: 0, o: 25, l: 0.65 };
-const rel = isBrowser && doc.createElement("link").relList.supports("modulepreload") ? "modulePreload" : "preload";
+import { isBrowser as Nn } from "@qwik.dev/core/build";
+const si = Nn ? document : void 0;
+const config = { t: 0, i: 25, S: 0.65 };
+const oi = Nn && si.createElement("link").relList.supports("modulepreload") ? "modulePreload" : "preload";
 const loadStart = Date.now();
-const isJSRegex = /\.[mc]?js$/;
+const li = /\.[mc]?js$/;
 const BundleImportState_None = 0;
 const BundleImportState_Queued = 1;
 const BundleImportState_Preload = 2;
 const BundleImportState_Alias = 3;
 const BundleImportState_Loaded = 4;
-const bundles = /* @__PURE__ */ new Map();
+const ui = /* @__PURE__ */ new Map();
 let queueDirty;
-let preloadCount = 0;
-const queue = [];
+let fi = 0;
+const ai = [];
 const log = (...e) => {
-  console.log(`Preloader ${Date.now() - loadStart}ms ${preloadCount}/${queue.length} queued>`, ...e);
+  console.log(`Preloader ${Date.now() - loadStart}ms ${fi}/${ai.length} queued>`, ...e);
 };
 const sortQueue = () => {
   if (queueDirty) {
-    queue.sort((e, t) => e.u - t.u);
+    ai.sort((e, t) => e.Tt - t.Tt);
     queueDirty = 0;
   }
 };
-const trigger = () => {
-  if (!queue.length) return;
+const hi = () => {
+  if (!ai.length) return;
   sortQueue();
-  while (queue.length) {
-    const e = queue[0];
-    const t = e.u;
+  while (ai.length) {
+    const e = ai[0];
+    const t = e.Tt;
     const o = 1 - t;
-    const n = graph ? config.o : (
+    const n = graph ? config.i : (
       // While the graph is not available, we limit to 5 preloads
       5
     );
-    if (o >= 0.99 || preloadCount < n) {
-      queue.shift();
-      preloadOne(e);
+    if (o >= 0.99 || fi < n) {
+      ai.shift();
+      di(e);
     } else break;
   }
-  if (config.t && !queue.length) {
-    const e = [...bundles.values()].filter((e2) => e2.i > BundleImportState_None);
-    const t = e.reduce((e2, t2) => e2 + t2.p, 0);
-    const o = e.reduce((e2, t2) => e2 + t2.$, 0);
-    log(`>>>> done ${e.length}/${bundles.size} total: ${t}ms waited, ${o}ms loaded`);
+  if (config.t && !ai.length) {
+    const e = [...ui.values()].filter((e2) => e2.Nt > BundleImportState_None);
+    const t = e.reduce((e2, t2) => e2 + t2.Lt, 0);
+    const o = e.reduce((e2, t2) => e2 + t2.zt, 0);
+    log(`>>>> done ${e.length}/${ui.size} total: ${t}ms waited, ${o}ms loaded`);
   }
 };
-const preloadOne = (e) => {
-  if (e.i >= BundleImportState_Preload) return;
-  preloadCount++;
+const di = (e) => {
+  if (e.Nt >= BundleImportState_Preload) return;
+  fi++;
   const t = Date.now();
-  e.p = t - e.B;
-  e.i = BundleImportState_Preload;
-  config.t && log(`<< load ${Math.round((1 - e.u) * 100)}% after ${`${e.p}ms`}`, e.m);
-  const o = doc.createElement("link");
-  o.href = new URL(`${base}${e.m}`, doc.baseURI).toString();
-  o.rel = rel;
+  e.Lt = t - e.Ft;
+  e.Nt = BundleImportState_Preload;
+  config.t && log(`<< load ${Math.round((1 - e.Tt) * 100)}% after ${`${e.Lt}ms`}`, e.It);
+  const o = si.createElement("link");
+  o.href = new URL(`${base}${e.It}`, si.baseURI).toString();
+  o.rel = oi;
   o.as = "script";
   o.onload = o.onerror = () => {
-    preloadCount--;
+    fi--;
     const n = Date.now();
-    e.$ = n - t;
-    e.i = BundleImportState_Loaded;
-    config.t && log(`>> done after ${e.$}ms`, e.m);
+    e.zt = n - t;
+    e.Nt = BundleImportState_Loaded;
+    config.t && log(`>> done after ${e.zt}ms`, e.It);
     o.remove();
-    trigger();
+    hi();
   };
-  doc.head.appendChild(o);
+  si.head.appendChild(o);
 };
-const adjustProbabilities = (e, t, o) => {
+const pi = (e, t, o) => {
   if (o?.has(e)) return;
-  const n = e.u;
-  e.u = t;
-  if (n - e.u < 0.01) return;
+  const n = e.Tt;
+  e.Tt = t;
+  if (n - e.Tt < 0.01) return;
   if (
     // don't queue until we have initialized the preloader
-    base != null && e.i < BundleImportState_Preload
+    base != null && e.Nt < BundleImportState_Preload
   ) {
-    if (e.i === BundleImportState_None) {
-      e.i = BundleImportState_Queued;
-      queue.push(e);
-      config.t && log(`queued ${Math.round((1 - e.u) * 100)}%`, e.m);
+    if (e.Nt === BundleImportState_None) {
+      e.Nt = BundleImportState_Queued;
+      ai.push(e);
+      config.t && log(`queued ${Math.round((1 - e.Tt) * 100)}%`, e.It);
     }
     queueDirty = 1;
   }
-  if (e.h) {
+  if (e.Mt) {
     o ||= /* @__PURE__ */ new Set();
     o.add(e);
-    const t2 = 1 - e.u;
-    for (const n2 of e.h) {
-      const e2 = getBundle(n2.m);
-      if (e2.u === 0) continue;
+    const t2 = 1 - e.Tt;
+    for (const n2 of e.Mt) {
+      const e2 = ci(n2.It);
+      if (e2.Tt === 0) continue;
       let r;
-      if (t2 === 1 || t2 >= 0.99 && depsCount < 100) {
-        depsCount++;
-        r = Math.min(0.01, 1 - n2.S);
+      if (t2 === 1 || t2 >= 0.99 && yi < 100) {
+        yi++;
+        r = Math.min(0.01, 1 - n2.Dt);
       } else {
-        const o2 = 1 - n2.S * t2;
-        const s = n2.q;
+        const o2 = 1 - n2.Dt * t2;
+        const s = n2.Wt;
         const l = o2 / s;
-        r = Math.max(0.02, e2.u * l);
-        n2.q = l;
+        r = Math.max(0.02, e2.Tt * l);
+        n2.Wt = l;
       }
-      adjustProbabilities(e2, r, o);
+      pi(e2, r, o);
     }
   }
 };
-const handleBundle = (e, t) => {
-  const o = getBundle(e);
-  if (o && o.u > t) adjustProbabilities(o, t);
+const $i = (e, t) => {
+  const o = ci(e);
+  if (o && o.Tt > t) pi(o, t);
 };
-let depsCount;
+let yi;
 const preload = (e, t) => {
   if (!e?.length) return;
-  depsCount = 0;
+  yi = 0;
   let o = t ? 1 - t : 0.4;
   if (Array.isArray(e)) for (let t2 = e.length - 1; t2 >= 0; t2--) {
     const n = e[t2];
     if (typeof n === "number") o = 1 - n / 10;
-    else handleBundle(n, o);
+    else $i(n, o);
   }
-  else handleBundle(e, o);
-  if (isBrowser) trigger();
+  else $i(e, o);
+  if (Nn) hi();
 };
-if (isBrowser) document.addEventListener("qsymbol", (e) => {
+if (Nn) document.addEventListener("qsymbol", (e) => {
   const { symbol: t, href: o } = e.detail;
   if (o) {
     const e2 = t.slice(t.lastIndexOf("_") + 1);
@@ -131,7 +131,7 @@ if (isBrowser) document.addEventListener("qsymbol", (e) => {
 });
 let base;
 let graph;
-const makeBundle = (e, t) => ({ m: e, i: isJSRegex.test(e) ? BundleImportState_None : BundleImportState_Alias, h: t, u: 1, B: Date.now(), p: 0, $: 0 });
+const makeBundle = (e, t) => ({ It: e, Nt: li.test(e) ? BundleImportState_None : BundleImportState_Alias, Mt: t, Tt: 1, Ft: Date.now(), Lt: 0, zt: 0 });
 const parseBundleGraph = (e) => {
   const t = /* @__PURE__ */ new Map();
   let o = 0;
@@ -142,15 +142,15 @@ const parseBundleGraph = (e) => {
     let l = 1;
     while (s = e[o], typeof s === "number") {
       if (s < 0) l = -s / 10;
-      else r.push({ m: e[s], S: l, q: 1 });
+      else r.push({ It: e[s], Dt: l, Wt: 1 });
       o++;
     }
     t.set(n, r);
   }
   return t;
 };
-const getBundle = (e) => {
-  let t = bundles.get(e);
+const ci = (e) => {
+  let t = ui.get(e);
   if (!t) {
     let o;
     if (graph) {
@@ -159,37 +159,37 @@ const getBundle = (e) => {
       if (!o.length) o = void 0;
     }
     t = makeBundle(e, o);
-    bundles.set(e, t);
+    ui.set(e, t);
   }
   return t;
 };
 const loadBundleGraph = (e, t, o) => {
   if (o) {
     if ("d" in o) config.t = !!o.d;
-    if ("P" in o) config.o = o["P"];
-    if ("Q" in o) config.l = 1 - o["Q"];
+    if ("P" in o) config.i = o["P"];
+    if ("Q" in o) config.S = 1 - o["Q"];
   }
-  if (!isBrowser || e == null) return;
+  if (!Nn || e == null) return;
   base = e;
   if (t) t.then((e2) => e2.text()).then((e2) => {
     graph = parseBundleGraph(JSON.parse(e2));
     const t2 = [];
     for (const [e3, o2] of graph.entries()) {
-      const n = getBundle(e3);
-      n.h = o2;
-      if (n.u < 1) {
-        t2.push([n, n.u]);
-        n.u = 1;
+      const n = ci(e3);
+      n.Mt = o2;
+      if (n.Tt < 1) {
+        t2.push([n, n.Tt]);
+        n.Tt = 1;
       }
     }
     config.t && log(`parseBundleGraph got ${graph.size} bundles, adjusting ${t2.length}`);
-    for (const [e3, o2] of t2) adjustProbabilities(e3, o2);
-    trigger();
+    for (const [e3, o2] of t2) pi(e3, o2);
+    hi();
   }).catch(console.warn);
 };
 export {
   parseBundleGraph as g,
-  handleBundle as h,
+  $i as h,
   loadBundleGraph as l,
   preload as p
 };

package/dist/server.mjs

@@ -1,16 +1,10 @@
 /**
  * @license
- * @qwik.dev/core/server 2.0.0-beta.25-dev+2677279
+ * @qwik.dev/core/server 2.0.0-beta.27-dev+7fc6984
  * Copyright QwikDev. All Rights Reserved.
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://github.com/QwikDev/qwik/blob/main/LICENSE
  */
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
 
 // packages/qwik/src/server/index.ts
 import { setPlatform as setPlatform2 } from "@qwik.dev/core";
@@ -26,12 +20,13 @@ import { isDev as isDev2 } from "@qwik.dev/core/build";
 import { isDev } from "@qwik.dev/core/build";
 
 // packages/qwik/src/core/shared/utils/qdev.ts
-var qDev = globalThis.qDev !== false;
-var qInspector = globalThis.qInspector === true;
-var qSerialize = globalThis.qSerialize !== false;
-var qDynamicPlatform = globalThis.qDynamicPlatform !== false;
-var qTest = globalThis.qTest === true;
-var qRuntimeQrl = globalThis.qRuntimeQrl === true;
+var g = globalThis;
+var qDev = g.qDev !== false;
+var qInspector = g.qInspector === true;
+var qSerialize = g.qSerialize !== false;
+var qDynamicPlatform = g.qDynamicPlatform !== false;
+var qTest = g.qTest === true;
+var qRuntimeQrl = g.qRuntimeQrl === true;
 
 // packages/qwik/src/core/shared/utils/log.ts
 var STYLE = qDev ? `background: #564CE0; color: white; padding: 2px 3px; border-radius: 2px; font-size: 0.8em;` : "";
@@ -145,7 +140,7 @@ var codeToText = (code, ...parts) => {
       // 4
       "QRL is not a function",
       // 5
-      "Dynamic import not found",
+      "Dynamic import {{0}} not found",
       // 6
       "Unknown type argument",
       // 7
@@ -1174,15 +1169,7 @@ function createPlatform(opts, resolvedManifest) {
       if (regSym) {
         return regSym;
       }
-      let modulePath = String(url);
-      if (!modulePath.endsWith(".js")) {
-        modulePath += ".js";
-      }
-      const module = __require(modulePath);
-      if (!(symbolName in module)) {
-        throw new Error(`Q-ERROR: missing symbol '${symbolName}' in module '${modulePath}'.`);
-      }
-      return module[symbolName];
+      throw qError(6 /* dynamicImportFailed */, [symbolName]);
     },
     raf: () => {
       console.error("server can not rerender");
@@ -1232,7 +1219,7 @@ function getBuildBase(opts) {
   return `${import.meta.env.BASE_URL || "/"}build/`;
 }
 var versions = {
-  qwik: "2.0.0-beta.25-dev+2677279",
+  qwik: "2.0.0-beta.27-dev+7fc6984",
   qwikDom: "2.1.19"
 };
 
@@ -2344,7 +2331,7 @@ var SSRContainer = class extends _SharedContainer {
   }
   $noScriptHere$ = 0;
   /** Renders opening tag for DOM element */
-  openElement(elementName, key, varAttrs, constAttrs = null, styleScopedId = null, currentFile = null) {
+  openElement(elementName, key, varAttrs, constAttrs = null, styleScopedId = null, currentFile = null, hasMovedCaptures = true) {
     const isQwikStyle = isQwikStyleElement(elementName, varAttrs) || isQwikStyleElement(elementName, constAttrs);
     if (
       // don't append qwik loader before qwik style elements
@@ -2371,7 +2358,14 @@ var SSRContainer = class extends _SharedContainer {
     this.write(elementName);
     const lastNode = this.getOrCreateLastNode();
     if (varAttrs) {
-      innerHTML = this.writeAttrs(elementName, varAttrs, false, styleScopedId, currentFile);
+      innerHTML = this.writeAttrs(
+        elementName,
+        varAttrs,
+        false,
+        styleScopedId,
+        currentFile,
+        hasMovedCaptures
+      );
     }
     this.write(" " + Q_PROPS_SEPARATOR);
     if (key !== null) {
@@ -2380,7 +2374,14 @@ var SSRContainer = class extends _SharedContainer {
       this.write(EMPTY_ATTR);
     }
     if (constAttrs && !isObjectEmpty(constAttrs)) {
-      innerHTML = this.writeAttrs(elementName, constAttrs, true, styleScopedId, currentFile) || innerHTML;
+      innerHTML = this.writeAttrs(
+        elementName,
+        constAttrs,
+        true,
+        styleScopedId,
+        currentFile,
+        hasMovedCaptures
+      ) || innerHTML;
     }
     this.write(GT);
     if (lastNode) {
@@ -2992,9 +2993,8 @@ var SSRContainer = class extends _SharedContainer {
       this.write(element);
     }
   }
-  writeAttrs(tag, attrs, isConst, styleScopedId, currentFile) {
+  writeAttrs(tag, attrs, isConst, styleScopedId, currentFile, hasMovedCaptures) {
     let innerHTML = void 0;
-    let isLoopElement = null;
     for (let key in attrs) {
       let value = attrs[key];
       if (isSSRUnsafeAttr(key)) {
@@ -3004,10 +3004,7 @@ var SSRContainer = class extends _SharedContainer {
         continue;
       }
       if (isHtmlAttributeAnEventName(key)) {
-        if (isLoopElement === null) {
-          isLoopElement = attributesContainsIterationProp(attrs);
-        }
-        value = _setEvent(this.serializationCtx, key, value, isLoopElement);
+        value = _setEvent(this.serializationCtx, key, value, hasMovedCaptures);
       } else if (key === "ref") {
         const lastNode = this.getOrCreateLastNode();
         if (isSignal(value)) {
@@ -3096,9 +3093,6 @@ var isQwikStyleElement = (tag, attrs) => {
   }
   return false;
 };
-var attributesContainsIterationProp = (attrs) => {
-  return Object.prototype.hasOwnProperty.call(attrs, ITERATION_ITEM_SINGLE) || Object.prototype.hasOwnProperty.call(attrs, ITERATION_ITEM_MULTI);
-};
 function newTagError(text) {
   return qError(12 /* tagError */, [text]);
 }