@qwik.dev/core 2.0.0-beta.40 → 2.0.0-beta.41

package/dist/loader/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwik.dev/core/loader",
-  "version": "2.0.0-beta.40-dev+a459d55",
+  "version": "2.0.0-beta.41-dev+4d04076",
   "main": "index.mjs",
   "types": "index.d.ts",
   "private": true,

package/dist/optimizer.d.ts

@@ -456,13 +456,7 @@ declare interface QwikVitePluginCommonOptions {
      * to be stable between releases
      */
     experimental?: (keyof typeof ExperimentalFeatures)[];
-    /**
-     * Disables automatic preloading of font assets (WOFF/WOFF2/TTF) found in the build output. When
-     * enabled, the plugin will not add `<link rel="preload">` tags for font files in the document
-     * head.
-     *
-     * Disabling may impact Cumulative Layout Shift (CLS) metrics.
-     */
+    /** @deprecated No longer used. Automatic font preloading has been removed. */
     disableFontPreload?: boolean;
 }
 

package/dist/optimizer.mjs

@@ -1,6 +1,6 @@
 /**
 * @license
-* @qwik.dev/core/optimizer 2.0.0-beta.40-dev+a459d55
+* @qwik.dev/core/optimizer 2.0.0-beta.41-dev+4d04076
 * 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
@@ -2609,36 +2609,32 @@ var Xr = "@qwik-worker-core", Zr = "\nexport { setPlatform } from '@qwik.dev/cor
 	".less",
 	".styl",
 	".stylus"
-], ui = [
-	".woff",
-	".woff2",
-	".ttf"
-], di = "@qwik-hmr-bridge", fi = "\n  // HMR bridge: connects Vite HMR events to Qwik's component re-rendering.\n  if (import.meta.hot) {\n    let timeout;\n    import.meta.hot.on(\"qwik:hmr\", (data) => {\n      if (data.t === document.__hmrT) {\n        console.log(\"Received duplicate HMR update, ignoring\", data.files);\n        return;\n      }\n      clearTimeout(timeout);\n      document.__hmrT = data.t;\n      document.__hmrDone = 0;\n      document.dispatchEvent(\n        new CustomEvent(\"qHmr\", { detail: data })\n      );\n      timeout = setTimeout(() => {\n      console.log(document.__hmrDone, document.__hmrT);\n        if (document.__hmrDone !== document.__hmrT) {\n          console.log(\"HMR update did not match active code, reloading the page\", location.href);\n          location.reload();\n        }\n      }, 500);\n    });\n  }\n";
-function pi(e = {}) {
-	let t = "serve", n = null, r = "/", i = null, a = null, o = null, s = null, c = "development", l, u, d = e.client?.outDir, f = null, p = e.fileFilter ? (t, n) => Je.test(t) || e.fileFilter(t, n) : () => !0, m = e.disableFontPreload ?? !1, h = [], g = Ue(e.optimizerOptions), _ = /* @__PURE__ */ new Set();
+], ui = "@qwik-hmr-bridge", di = "\n  // HMR bridge: connects Vite HMR events to Qwik's component re-rendering.\n  if (import.meta.hot) {\n    let timeout;\n    import.meta.hot.on(\"qwik:hmr\", (data) => {\n      if (data.t === document.__hmrT) {\n        console.log(\"Received duplicate HMR update, ignoring\", data.files);\n        return;\n      }\n      clearTimeout(timeout);\n      document.__hmrT = data.t;\n      document.__hmrDone = 0;\n      document.dispatchEvent(\n        new CustomEvent(\"qHmr\", { detail: data })\n      );\n      timeout = setTimeout(() => {\n      console.log(document.__hmrDone, document.__hmrT);\n        if (document.__hmrDone !== document.__hmrT) {\n          console.log(\"HMR update did not match active code, reloading the page\", location.href);\n          location.reload();\n        }\n      }, 500);\n    });\n  }\n";
+function fi(e = {}) {
+	let t = "serve", n = null, r = "/", i = null, a = null, o = null, s = null, c = "development", l, u, d = e.client?.outDir, f = null, p = e.fileFilter ? (t, n) => Je.test(t) || e.fileFilter(t, n) : () => !0, m = [], h = Ue(e.optimizerOptions), g = /* @__PURE__ */ new Set();
 	return [
 		{
 			name: "vite-plugin-qwik",
 			enforce: "pre",
 			api: {
-				getOptimizer: () => g.getOptimizer(),
-				getOptions: () => g.getOptions(),
-				getManifest: () => g.getOptions().manifestInput,
-				getRootDir: () => g.getOptions().rootDir,
+				getOptimizer: () => h.getOptimizer(),
+				getOptions: () => h.getOptions(),
+				getManifest: () => h.getOptions().manifestInput,
+				getRootDir: () => h.getOptions().rootDir,
 				getClientOutDir: () => n,
 				getClientPublicOutDir: () => i,
-				registerBundleGraphAdder: (e) => _.add(e),
+				registerBundleGraphAdder: (e) => g.add(e),
 				onSegment: (e) => {
-					g.segmentCallbacks.add(e);
+					h.segmentCallbacks.add(e);
 				},
 				_oldDevSsrServer: () => e.devSsrServer
 			},
 			async config(r, l) {
-				await g.init();
+				await h.init();
 				let u;
-				u = l.mode === "lib" ? "lib" : r.build?.ssr || l.mode === "ssr" ? "ssr" : l.mode === "test" || l.mode === "benchmark" ? "test" : "client", t = l.command, c = l.mode === "production" ? "production" : l.mode === "development" ? "development" : t === "build" && u === "client" ? "production" : "development", g.debug(`vite config(), command: ${t}, env.mode: ${l.mode}`), t === "serve" ? e.entryStrategy = { type: "segment" } : u === "ssr" ? e.entryStrategy = { type: "hoist" } : u === "lib" && (e.entryStrategy = { type: "inline" });
-				let p = u === "ssr" ? typeof r.build?.ssr == "string" ? r.build.ssr : e.ssr?.input : void 0, m = u === "client" ? e.client?.input : void 0, h = r.build?.rolldownOptions?.input || m || p;
-				h && typeof h == "string" && (h = [h]);
+				u = l.mode === "lib" ? "lib" : r.build?.ssr || l.mode === "ssr" ? "ssr" : l.mode === "test" || l.mode === "benchmark" ? "test" : "client", t = l.command, c = l.mode === "production" ? "production" : l.mode === "development" ? "development" : t === "build" && u === "client" ? "production" : "development", h.debug(`vite config(), command: ${t}, env.mode: ${l.mode}`), t === "serve" ? e.entryStrategy = { type: "segment" } : u === "ssr" ? e.entryStrategy = { type: "hoist" } : u === "lib" && (e.entryStrategy = { type: "inline" });
+				let p = u === "ssr" ? typeof r.build?.ssr == "string" ? r.build.ssr : e.ssr?.input : void 0, m = u === "client" ? e.client?.input : void 0, g = r.build?.rolldownOptions?.input || m || p;
+				g && typeof g == "string" && (g = [g]);
 				let _ = {
 					target: u,
 					buildMode: c,
@@ -2657,12 +2653,12 @@ function pi(e = {}) {
 					sourcemap: !!r.build?.sourcemap,
 					lint: e.lint,
 					experimental: e.experimental,
-					input: h,
+					input: g,
 					manifestInput: e.ssr?.manifestInput,
 					manifestInputPath: e.ssr?.manifestInputPath,
 					manifestOutput: e.client?.manifestOutput
-				}, v = await g.normalizeOptions(_);
-				h ||= v.input, f = _, a = v.srcDir, o = v.rootDir, e.csr || (n = v.clientOutDir, i = n, s = v.ssrOutDir);
+				}, v = await h.normalizeOptions(_);
+				g ||= v.input, f = _, a = v.srcDir, o = v.rootDir, e.csr || (n = v.clientOutDir, i = n, s = v.ssrOutDir);
 				let y = c === "development", b = "globalThis.qDev", x = "globalThis.qTest", S = "globalThis.qInspector", ee = r?.define?.[b] ?? y, C = r?.define?.[S] ?? y, w = {
 					ssr: { noExternal: [
 						G,
@@ -2698,14 +2694,14 @@ function pi(e = {}) {
 							J,
 							"@builder.io/qwik"
 						],
-						entries: h && (typeof h == "string" ? [h] : typeof h == "object" ? Object.values(h) : h)
+						entries: g && (typeof g == "string" ? [g] : typeof g == "object" ? Object.values(g) : g)
 					},
 					build: {
 						modulePreload: !1,
 						dynamicImportVarsOptions: { exclude: [/./] },
 						rolldownOptions: {
 							external: ["node:async_hooks"],
-							input: h,
+							input: g,
 							experimental: { attachDebugInfo: r.build?.rolldownOptions?.experimental?.attachDebugInfo ?? "none" }
 						}
 					},
@@ -2718,7 +2714,7 @@ function pi(e = {}) {
 				};
 				return e.csr || (w.build.cssCodeSplit = !1, v.outDir && (w.build.outDir = v.outDir), w.build.rolldownOptions = {
 					...w.build.rolldownOptions,
-					output: at(g, r.build?.rolldownOptions?.output),
+					output: at(h, r.build?.rolldownOptions?.output),
 					preserveEntrySignatures: "allow-extension"
 				}, v.target === "ssr" ? t === "build" && (w.publicDir = !1, w.build.ssr = !0, r.build?.minify == null && c === "production" && (w.build.minify = !0)) : v.target === "client" || (v.target === "lib" ? (w.build.minify = !1, w.build.rolldownOptions.external = [
 					G,
@@ -2744,7 +2740,7 @@ function pi(e = {}) {
 			},
 			async configResolved(n) {
 				if (r = n.base, !(r.startsWith("/") && r.endsWith("/"))) throw Error("vite's config.base must begin and end with /");
-				if (n.build.sourcemap && e.optimizerOptions?.sourcemap === void 0 && g.setSourceMapSupport(!0), f ? g.normalizeOptions(f) : g.normalizeOptions(e), t === "build" && !e.csr && g.getOptions().target === "client") {
+				if (n.build.sourcemap && e.optimizerOptions?.sourcemap === void 0 && h.setSourceMapSupport(!0), f ? h.normalizeOptions(f) : h.normalizeOptions(e), t === "build" && !e.csr && h.getOptions().target === "client") {
 					let e = ["vite:build-import-analysis", "native:import-analysis-build"], t = n.plugins;
 					for (let n of e) {
 						let e = t.findIndex((e) => e?.name === n);
@@ -2753,26 +2749,26 @@ function pi(e = {}) {
 				}
 			},
 			async buildStart() {
-				h.length = 0;
+				m.length = 0;
 				let e = this.resolve.bind(this);
-				await g.validateSource(e), g.onDiagnostics((e, t, n) => {
+				await h.validateSource(e), h.onDiagnostics((e, t, n) => {
 					e.forEach((e) => {
-						let r = g.normalizePath(t.sys.path.join(n, e.file));
+						let r = h.normalizePath(t.sys.path.join(n, e.file));
 						e.category === "error" ? this.error(ct(r, e)) : this.warn(ct(r, e));
 					});
-				}), await g.buildStart(this), u = void 0, t === "build" && g.getOptions().target === "client" && (u = ei(this));
+				}), await h.buildStart(this), u = void 0, t === "build" && h.getOptions().target === "client" && (u = ei(this));
 			},
 			resolveId(e, t, n) {
-				if (e.endsWith(di)) return di;
+				if (e.endsWith(ui)) return ui;
 				if (Qr(e)) return Xr;
 				let r = p(e, "resolveId");
-				return A(e) || !r ? null : g.resolveId(this, e, t, n);
+				return A(e) || !r ? null : h.resolveId(this, e, t, n);
 			},
 			load(e, n) {
-				if (e === di) return { code: fi };
+				if (e === ui) return { code: di };
 				if (e === "@qwik-worker-core") return $r();
 				let r = p(e, "load");
-				return A(e) || !r ? null : (e = g.normalizePath(e), t === "serve" && e.endsWith("@qwik-client-manifest") ? { code: "export const manifest = undefined;" } : g.load(this, e, n));
+				return A(e) || !r ? null : (e = h.normalizePath(e), t === "serve" && e.endsWith("@qwik-client-manifest") ? { code: "export const manifest = undefined;" } : h.load(this, e, n));
 			},
 			transform(e, t, n) {
 				if (t.includes(".vite/deps/") && e.slice(0, 5e3).includes("qwik") && /import[^\n]*qwik[^\n]*\n/.test(e)) {
@@ -2787,7 +2783,7 @@ function pi(e = {}) {
 👉   ${e}\n\n==============\n\n`);
 				}
 				let r = p(t, "transform"), i = t.includes("?raw");
-				return A(t) || !r || i ? null : g.transform(this, e, t, n);
+				return A(t) || !r || i ? null : h.transform(this, e, t, n);
 			}
 		},
 		{
@@ -2798,52 +2794,38 @@ function pi(e = {}) {
 				async handler(e, t) {
 					let n = this.environment.config.consumer === "client", i = this.environment.config.consumer === "server";
 					if (n) {
-						let e = g.getOptions();
+						let e = h.getOptions();
 						for (let [n, i] of Object.entries(t)) if (i.type === "asset") {
 							let t = r + n;
-							if (li.some((e) => n.endsWith(e))) typeof i.source == "string" && i.source.length < e.inlineStylesUpToBytes ? h.push({
+							li.some((e) => n.endsWith(e)) && (typeof i.source == "string" && i.source.length < e.inlineStylesUpToBytes ? m.push({
 								tag: "style",
 								location: "head",
 								attributes: {
 									"data-src": t,
 									dangerouslySetInnerHTML: i.source
 								}
-							}) : h.push({
+							}) : m.push({
 								tag: "link",
 								location: "head",
 								attributes: {
 									rel: "stylesheet",
 									href: t
 								}
-							});
-							else {
-								let e = ui.find((e) => n.endsWith(e));
-								e && !m && h.unshift({
-									tag: "link",
-									location: "head",
-									attributes: {
-										rel: "preload",
-										href: t,
-										as: "font",
-										type: `font/${e.slice(1)}`,
-										crossorigin: ""
-									}
-								});
-							}
+							}));
 						}
-						let n = je(await g.generateManifest(this, t, _, {
-							injections: h,
+						let n = je(await h.generateManifest(this, t, g, {
+							injections: m,
 							platform: { vite: "" }
 						}), r);
 						for (let e of Object.values(t)) e.type === "chunk" && (e.code = Ae(e.code, n));
 						ni(this, t, u);
-					} else i && ri(t, g.getOptions().manifestInput);
+					} else i && ri(t, h.getOptions().manifestInput);
 				}
 			},
 			async writeBundle(e, t) {
-				let n = g.getOptions();
+				let n = h.getOptions();
 				if (this.environment.config.consumer === "server") {
-					let r = g.getSys();
+					let r = h.getSys();
 					if (r.env === "node" || r.env === "bun" || r.env === "deno") {
 						let i = Object.keys(t);
 						await Promise.all(i.map(async (t) => {
@@ -2864,19 +2846,19 @@ function pi(e = {}) {
 				}
 			},
 			transformIndexHtml() {
-				if (t === "serve") return bt(g.getOptions(), r);
+				if (t === "serve") return bt(h.getOptions(), r);
 			},
 			configureServer(t) {
-				l = t, g.configureServer(t), (e?.devTools?.imageDevTools ?? !0) && t.middlewares.use(qr(g.getSys(), o, a));
+				l = t, h.configureServer(t), (e?.devTools?.imageDevTools ?? !0) && t.middlewares.use(qr(h.getSys(), o, a));
 			},
 			configurePreviewServer(e) {
 				return async () => {
-					let t = g.getSys(), n = g.getPath();
+					let t = h.getSys(), n = h.getPath();
 					await vt(e.middlewares, s, t, n);
 				};
 			},
 			hotUpdate(t) {
-				g.hotUpdate(this.environment, t);
+				h.hotUpdate(this.environment, t);
 				let n = e?.devTools?.hmr ?? !0;
 				if (this.environment.name === "ssr" && t.modules.length) {
 					if (n) {
@@ -2899,15 +2881,15 @@ function pi(e = {}) {
 			},
 			onLog(e, t) {
 				if (t.plugin == "vite-plugin-qwik") {
-					let n = hi[e] || $.White, r = (t.frame || "").split("\n").map((e) => (e.match(/^\s*\^\s*$/) ? $.BrightWhite : $.BrightBlack) + e);
+					let n = mi[e] || $.White, r = (t.frame || "").split("\n").map((e) => (e.match(/^\s*\^\s*$/) ? $.BrightWhite : $.BrightBlack) + e);
 					return console[e](`${n}%s\n${$.BrightWhite}%s\n%s${$.RESET}`, `[${t.plugin}](${e}): ${t.message}\n`, `  ${t?.loc?.file}:${t?.loc?.line}:${t?.loc?.column}\n`, `  ${r.join("\n  ")}\n`), !1;
 				}
 			}
 		},
-		mi()
+		pi()
 	];
 }
-async function mi() {
+async function pi() {
 	let e, t, n = !1;
 	async function r() {
 		if (n) return !0;
@@ -3014,10 +2996,10 @@ var $ = {
 	BrightCyan: "\x1B[96m",
 	BrightWhite: "\x1B[97m",
 	RESET: "\x1B[0m"
-}, hi = {
+}, mi = {
 	warn: $.Yellow,
 	info: $.Cyan,
 	debug: $.BrightBlack
 };
 //#endregion
-export { it as qwikRolldown, lt as qwikRollup, pi as qwikVite };
+export { it as qwikRolldown, lt as qwikRollup, fi as qwikVite };

package/dist/server.mjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core/server 2.0.0-beta.40-dev+a459d55
+ * @qwik.dev/core/server 2.0.0-beta.41-dev+4d04076
  * 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
@@ -1907,7 +1907,7 @@ function getBuildBase(opts) {
   return `${import.meta.env?.BASE_URL || "/"}build/`;
 }
 var versions = {
-  qwik: "2.0.0-beta.40-dev+a459d55",
+  qwik: "2.0.0-beta.41-dev+4d04076",
   qwikDom: "2.1.19"
 };
 

package/dist/server.prod.mjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core/server 2.0.0-beta.40-dev+a459d55
+ * @qwik.dev/core/server 2.0.0-beta.41-dev+4d04076
  * 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
@@ -538,7 +538,7 @@ var QRuntimeAttr = "q:runtime";
 
 var QVersionAttr = "q:version";
 
-var br = "q:base";
+var vr = "q:base";
 
 var QLocaleAttr = "q:locale";
 
@@ -562,7 +562,7 @@ var Rr = "/" + kr;
 
 var Pr = "q:template";
 
-var qr = "[q\\:container]:not([q\\:container=" + "html" /* HTML */ + "]):not([q\\:container=" + "text" /* TEXT */ + "])";
+var Tr = "[q\\:container]:not([q\\:container=" + "html" /* HTML */ + "]):not([q\\:container=" + "text" /* TEXT */ + "])";
 
 var QDefaultSlot = "";
 
@@ -896,7 +896,7 @@ function pi(t, e) {
     const n = e?.mapper;
     const r = t.symbolMapper ? t.symbolMapper : (t, e, r) => {
         if (n || isDev6 && import.meta.env?.MODE !== "test") {
-            const e = sd(t);
+            const e = ed(t);
             const s = !isDev6 ? n[e] : getDevSegmentPath(n, e, t, r);
             if (!s) {
                 if (e === Ge) {
@@ -914,7 +914,7 @@ function pi(t, e) {
     const s = {
         isServer: true,
         async importSymbol(t, e, n) {
-            const r = sd(n);
+            const r = ed(n);
             const s = globalThis.__qwik_reg_symbols?.get(r);
             if (s) {
                 return s;
@@ -937,7 +937,7 @@ async function setServerPlatform(t, e) {
     mi(n);
 }
 
-var sd = t => {
+var ed = t => {
     const e = t.lastIndexOf("_");
     if (e > -1) {
         return t.slice(e + 1);
@@ -951,7 +951,7 @@ import { getClientManifest as Ea } from "@qwik.dev/core";
 // packages/qwik/src/server/ssr-container.ts
 import { isDev as isDev8 } from "@qwik.dev/core/build";
 
-import { _SubscriptionData as Gs, _SharedContainer as Cc, _jsxSorted as fo, _jsxSplit as ao, _res as _, _setEvent, _walkJSX as zn, _createQRL as la, isSignal as Tu } from "@qwik.dev/core/internal";
+import { _SubscriptionData as Ys, _SharedContainer as Cc, _jsxSorted as co, _jsxSplit as fo, _res as _, _setEvent, _walkJSX as zn, _createQRL as la, isSignal as qu } from "@qwik.dev/core/internal";
 
 // packages/qwik/src/server/ooos-utils.ts
 import { _SubscriptionPatch as Ku } from "@qwik.dev/core/internal";
@@ -1225,7 +1225,7 @@ function getQwikOutOfOrderExecutorScript(t = {}) {
 }
 
 // packages/qwik/src/server/ssr-node.ts
-import { _isJSXNode as to, _EMPTY_OBJ, _EFFECT_BACK_REF as Vi } from "@qwik.dev/core/internal";
+import { _isJSXNode as Zs, _EMPTY_OBJ, _EFFECT_BACK_REF as Vi } from "@qwik.dev/core/internal";
 
 import { isDev as isDev7 } from "@qwik.dev/core/build";
 
@@ -1359,14 +1359,14 @@ var SsrComponentFrame = class {
     distributeChildrenIntoSlots(t, e, n) {
         this.projectionScopedStyle = e;
         this.projectionComponentFrame = n;
-        if (to(t)) {
+        if (Zs(t)) {
             const e = this.getSlotName(t);
             We(this.slots, e, t, 0);
         } else if (Array.isArray(t) && t.length > 0) {
             const e = [];
             for (let n = 0; n < t.length; n++) {
                 const r = t[n];
-                if (to(r)) {
+                if (Zs(r)) {
                     const t = this.getSlotName(r);
                     if (t === QDefaultSlot) {
                         e.push(r);
@@ -1914,7 +1914,7 @@ function getBuildBase(t) {
 }
 
 var versions = {
-    qwik: "2.0.0-beta.40-dev+a459d55",
+    qwik: "2.0.0-beta.41-dev+4d04076",
     qwikDom: "2.1.19"
 };
 
@@ -2363,7 +2363,7 @@ var SSRContainer = class extends Cc {
         t[QRuntimeAttr] = "2";
         t[QVersionAttr] = this.je ?? "dev";
         t[QRenderAttr] = (e ? e + "-" : "") + (isDev8 ? "ssr-dev" : "ssr");
-        t[br] = this.De || "";
+        t[vr] = this.De || "";
         t[QLocaleAttr] = this.en;
         t[QManifestHashAttr] = this.resolvedManifest.manifest.manifestHash;
         t[QInstanceAttr] = this.Ht;
@@ -2382,7 +2382,7 @@ var SSRContainer = class extends Cc {
     /** Renders closing tag for current container */    closeContainer() {
         return this.closeElement();
     }
-    Tt=0;
+    qt=0;
     /** Renders opening tag for DOM element */
     openElement(t, e, n, r = null, s = null, i = null, o = true) {
         if (!VALID_ELEMENT_NAME.test(t)) {
@@ -2390,13 +2390,13 @@ var SSRContainer = class extends Cc {
         }
         const a = isQwikStyleElement(t, n) || isQwikStyleElement(t, r);
         if (NO_SCRIPT_HERE_ELEMENTS.has(t)) {
-            this.Tt++;
+            this.qt++;
         }
         if (
         // don't append qwik loader before qwik style elements
         // it will confuse the resuming, because styles are expected to be the first nodes in subtree
         !a && this.qlInclude === 1 /* Inline */) {
-            if (this.Tt === 0 && this.size > 30 * 1024 && t !== "body") {
+            if (this.qt === 0 && this.size > 30 * 1024 && t !== "body") {
                 this.emitQwikLoaderInline();
             }
         }
@@ -2470,7 +2470,7 @@ var SSRContainer = class extends Cc {
         }
         this.lastNode = null;
         if (NO_SCRIPT_HERE_ELEMENTS.has(e)) {
-            this.Tt--;
+            this.qt--;
         }
     }
     /** Writes opening data to vNodeData for fragment boundaries */    openFragment(t) {
@@ -2600,7 +2600,7 @@ var SSRContainer = class extends Cc {
         }
         for (let e = 0; e < t.length; e++) {
             const n = t[e];
-            const r = ao(n.tag, null, n.attributes || {}, null, 0, null);
+            const r = fo(n.tag, null, n.attributes || {}, null, 0, null);
             if (n.location === "head") {
                 this.additionalHeadNodes.push(r);
             } else {
@@ -2618,7 +2618,7 @@ var SSRContainer = class extends Cc {
         if (!this.styleIds.has(e)) {
             this.styleIds.add(e);
             if (this.currentElementFrame?.elementName === "html") {
-                this.additionalHeadNodes.push(fo("style", null, {
+                this.additionalHeadNodes.push(co("style", null, {
                     dangerouslySetInnerHTML: t,
                     [dr]: e
                 }, null, 0, e));
@@ -2904,7 +2904,7 @@ var SSRContainer = class extends Cc {
         }
     }
     emitStateData() {
-        if (!this.serializationCtx.le.length && !this.serializationCtx.Te.size) {
+        if (!this.serializationCtx.le.length && !this.serializationCtx.qe.size) {
             return;
         }
         const t = this.stateScriptAttrs();
@@ -2919,7 +2919,7 @@ var SSRContainer = class extends Cc {
             type: "qwik/state",
             [QInstanceAttr]: this.Ht
         };
-        const e = this.serializationCtx.Te;
+        const e = this.serializationCtx.qe;
         if (e.size > 0) {
             t["q-d:qidle"] = la(null, "_res", _, null, [ ...e ]);
         }
@@ -2961,7 +2961,7 @@ var SSRContainer = class extends Cc {
         for (const [e, n] of this.backpatchMap) {
             for (let r = 0; r < n.length; r++) {
                 const s = n[r];
-                t.push(e, s.attrName, Tu(s.value) ? s.value.untrackedValue : s.value);
+                t.push(e, s.attrName, qu(s.value) ? s.value.untrackedValue : s.value);
             }
         }
         this.backpatchMap.clear();
@@ -3239,7 +3239,7 @@ var SSRContainer = class extends Cc {
                 u = _setEvent(this.serializationCtx, c, u, a);
             } else if (c === "ref") {
                 const t = this.getOrCreateLastNode();
-                if (Tu(u)) {
+                if (qu(u)) {
                     u.Ct = new DomRef(t);
                     continue;
                 } else if (typeof u === "function") {
@@ -3256,9 +3256,9 @@ var SSRContainer = class extends Cc {
                     continue;
                 }
                 u = typeof t === "number" ? [ t ] : String(t);
-            } else if (Tu(u)) {
+            } else if (qu(u)) {
                 const t = this.getOrCreateLastNode();
-                const e = new Gs({
+                const e = new Ys({
                     j: i,
                     rt: s
                 });
@@ -3362,7 +3362,7 @@ var SSRSegmentContainer = class extends SSRContainer {
             this.ar(n, s);
             const o = this.lr(n, r, s);
             if (r && (i.newRootLocalIds.length > 0 || o !== void 0)) {
-                s.ve = n.serializationCtx.ee;
+                s.be = n.serializationCtx.ee;
                 await this.emitStatePatchData(t, i.newRootStart, i.newRootLocalIds, o);
                 n.serializationCtx.ge = n.serializationCtx.le.length + (n.serializationCtx._e ? 1 : 0);
                 n.serializationCtx.ee += s.ee;
@@ -3394,7 +3394,7 @@ var SSRSegmentContainer = class extends SSRContainer {
             };
         } finally {
             if (this.F !== 1 /* EarlyFinalized */) {
-                s.qe = void 0;
+                s.Te = void 0;
                 n.removeOutOfOrderSegment(this);
             }
             n.serializationCtx.re(n.writer);
@@ -3408,7 +3408,7 @@ var SSRSegmentContainer = class extends SSRContainer {
             this.F = 2 /* Done */;
             this.Le.removeOutOfOrderSegment(this);
         } finally {
-            this.serializationCtx.qe = void 0;
+            this.serializationCtx.Te = void 0;
         }
     }
     markVNodeDataForSerialization(t, e = 16 /* SERIALIZE */) {
@@ -3449,7 +3449,7 @@ var SSRSegmentContainer = class extends SSRContainer {
     }
     ir(t, e) {
         const n = this.commitSegmentRoots(t, e);
-        e.qe = (e, r, s) => {
+        e.Te = (e, r, s) => {
             this.commitSegmentRoot(t, e, r, s, n);
         };
         return n;
@@ -3520,7 +3520,7 @@ var SSRSegmentContainer = class extends SSRContainer {
             this.seedCommittedRootForLiveSegments(t, r);
         }
         const o = t.serializationCtx;
-        s.rootIdMap[e] = t.v() && i >= o.be ? i + (o._e ? 1 : 0) : i;
+        s.rootIdMap[e] = t.v() && i >= o.ve ? i + (o._e ? 1 : 0) : i;
     }
     seedCommittedRootForLiveSegments(t, e) {
         const n = t.outOfOrderSegments;
@@ -3820,7 +3820,7 @@ function resolveManifest(t) {
         const t = {};
         for (const e in n.mapping) {
             const r = n.mapping[e];
-            t[sd(e)] = [ e, r ];
+            t[ed(e)] = [ e, r ];
         }
         return {
             mapper: t,

package/dist/starters/adapters/cloudflare-workers/adapters/cloudflare-workers/vite.config.ts

@@ -1,5 +1,5 @@
-import { cloudflarePagesAdapter as cloudflareWorkersAdapter } from "@builder.io/qwik-city/adapters/cloudflare-pages/vite";
-import { extendConfig } from "@builder.io/qwik-city/vite";
+import { cloudflarePagesAdapter as cloudflareWorkersAdapter } from "@qwik.dev/router/adapters/cloudflare-pages/vite";
+import { extendConfig } from "@qwik.dev/router/vite";
 import baseConfig from "../../vite.config";
 
 export default extendConfig(baseConfig, () => {
@@ -7,7 +7,7 @@ export default extendConfig(baseConfig, () => {
     build: {
       ssr: true,
       rolldownOptions: {
-        input: ["src/entry.cloudflare-pages.tsx", "@qwik-city-plan"],
+        input: ["src/entry.cloudflare-pages.tsx"],
       },
     },
     plugins: [cloudflareWorkersAdapter()],

package/dist/starters/adapters/cloudflare-workers/src/entry.cloudflare-pages.tsx

@@ -8,16 +8,15 @@
  *
  */
 import {
-  createQwikCity,
+  createQwikRouter,
   type PlatformCloudflarePages as PlatformCloudflareWorkers,
-} from "@builder.io/qwik-city/middleware/cloudflare-pages";
-import qwikCityPlan from "@qwik-city-plan";
+} from "@qwik.dev/router/middleware/cloudflare-pages";
 import render from "./entry.ssr";
 
 declare global {
-  type QwikCityPlatform = PlatformCloudflareWorkers;
+  type QwikRouterPlatform = PlatformCloudflareWorkers;
 }
 
-const fetch = createQwikCity({ render, qwikCityPlan });
+const fetch = createQwikRouter({ render });
 
 export { fetch };

package/dist/starters/features/compiled-i18n/src/components/locale-selector/locale-selector.tsx

@@ -1,4 +1,4 @@
-import { component$, getLocale } from "@builder.io/qwik";
+import { component$, getLocale } from "@qwik.dev/core";
 import { _, locales } from "compiled-i18n";
 
 export const LocaleSelector = component$(() => {

package/dist/starters/features/compiled-i18n/src/routes/plugin@compiled-i18n.ts

@@ -1,6 +1,6 @@
 // ... other imports
 import { guessLocale } from "compiled-i18n";
-import type { RequestHandler } from "@builder.io/qwik-city";
+import type { RequestHandler } from "@qwik.dev/router";
 
 /**
  * Handle incoming requests to determine and set the appropriate locale.

package/dist/starters/features/cypress/src/actions/example.action.ts

@@ -1,4 +1,4 @@
-import { routeAction$ } from "@builder.io/qwik-city";
+import { routeAction$ } from "@qwik.dev/router";
 
 export const useExampleAction = routeAction$(() => {
   return "This is example action data.";

package/dist/starters/features/cypress/src/components/example/example.cy.tsx

@@ -1,5 +1,5 @@
-import { $, component$ } from "@builder.io/qwik";
-import { QwikCityMockProvider } from "@builder.io/qwik-city";
+import { $, component$ } from "@qwik.dev/core";
+import { QwikRouterMockProvider } from "@qwik.dev/router";
 
 import { ExampleTest } from "./example";
 import { useExampleLoader } from "../../loaders/example.loader";
@@ -25,9 +25,9 @@ const Template = component$((props: { flag: boolean }) => {
   ];
 
   return (
-    <QwikCityMockProvider loaders={loadersMock} actions={actionsMock}>
+    <QwikRouterMockProvider loaders={loadersMock} actions={actionsMock}>
       <ExampleTest flag={props.flag} />
-    </QwikCityMockProvider>
+    </QwikRouterMockProvider>
   );
 });
 

package/dist/starters/features/cypress/src/loaders/example.loader.ts

@@ -1,4 +1,4 @@
-import { routeLoader$ } from "@builder.io/qwik-city";
+import { routeLoader$ } from "@qwik.dev/router";
 
 export const useExampleLoader = routeLoader$(() => {
   return "This is example loader data.";