@qwik.dev/router 2.0.0-beta.10 → 2.0.0-beta.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qwik.dev/router",
   "description": "The router for Qwik.",
-  "version": "2.0.0-beta.10",
+  "version": "2.0.0-beta.11",
   "bugs": "https://github.com/QwikDev/qwik/issues",
   "dependencies": {
     "@azure/functions": "3.5.1",
@@ -27,7 +27,7 @@
     "unist-util-visit": "^5.0.0",
     "valibot": ">=0.36.0 <2",
     "vfile": "6.0.3",
-    "vite-imagetools": "^7.1.0",
+    "vite-imagetools": "^8.0.0",
     "yaml": "^2.8.1",
     "zod": "^3.25.40"
   },
@@ -39,7 +39,7 @@
     "@types/set-cookie-parser": "2.4.10",
     "tsm": "2.3.0",
     "uvu": "0.5.6",
-    "@qwik.dev/core": "2.0.0-beta.10"
+    "@qwik.dev/core": "2.0.0-beta.11"
   },
   "engines": {
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
@@ -186,7 +186,7 @@
   "main": "./lib/index.qwik.mjs",
   "peerDependencies": {
     "vite": ">=5 <8",
-    "@qwik.dev/core": "^2.0.0-beta.10"
+    "@qwik.dev/core": "^2.0.0-beta.11"
   },
   "publishConfig": {
     "access": "public"

package/lib/adapters/cloudflare-pages/vite/index-BIeHg2Cj.cjs

@@ -1,5 +0,0 @@
-"use strict";const g=require("node:fs"),h=require("node:path"),R=require("@qwik.dev/router/middleware/request-handler");function j(e){return v(h.normalize(e))}function v(e){const s=/^\\\\\?\\/.test(e),t=/[^\u0000-\u0080]+/.test(e);return s||t||(e=e.replace(/\\/g,"/"),e.endsWith("/")&&(e=e.slice(0,e.length-1))),e}async function O(e,s,t,n,w){t&&!t.endsWith("/")&&(t+="/");const p=new Set([t+"/"+(globalThis.__QWIK_BUILD_DIR__||"build")+"/",t+"/"+(globalThis.__QWIK_ASSETS_DIR__||"assets")+"/"]),o=new Set(n.map(S)),m=[],c=async(u,d,f)=>{if(f=S(f),p.has(f))return;const y=h.join(u,d);if(d==="index.html"||d==="q-data.json"){!o.has(f)&&w&&await g.promises.unlink(y);return}if(d==="404.html"){const k=await g.promises.readFile(y,"utf-8");m.push([f,k]);return}const r=await g.promises.stat(y);r.isDirectory()?await i(y,f+d+"/"):r.isFile()&&o.add(f+d)},i=async(u,d)=>{const f=await g.promises.readdir(u);await Promise.all(f.map(y=>c(u,y,d)))};g.existsSync(e)&&await i(e,t);const a=D(t,m),l=E(o);await b(l,a,s)}function S(e){return e.endsWith("/")?e:e+"/"}function D(e,s){if(s.sort((t,n)=>t[0].length>n[0].length?-1:t[0].length<n[0].length?1:t[0]<n[0]?-1:t[0]>n[0]?1:0),!s.some(t=>t[0]===e)){const t=R.getErrorHtml(404,"Resource Not Found");s.push([e,t])}return JSON.stringify(s,null,2).slice(1,-1)}function E(e){return JSON.stringify(Array.from(new Set(e)).sort()).slice(1,-1)}const b=async(e,s,t)=>{const n=new Set,w=async o=>{const m=await g.promises.readFile(o,"utf-8");let c=!1;const i=m.replace(/(['"])__QWIK_ROUTER_(STATIC_PATHS|NOT_FOUND)_ARRAY__\1/g,(a,l,u)=>(c=!0,u==="STATIC_PATHS"?e:s));c&&await g.promises.writeFile(o,i)},p=async o=>{const m=await g.promises.readdir(o,{withFileTypes:!0});for(const c of m)if(c.isDirectory())await p(h.join(o,c.name));else if(c.name.endsWith("js")){const i=w(h.join(o,c.name)).finally(()=>{n.delete(i)});n.add(i)}};await p(t),await Promise.all(n)};function A(e){let s=null,t=null,n=null,w=null,p=null,o=!1;const m=[];return{name:`vite-plugin-qwik-router-ssg-${e.name}`,enforce:"post",apply:"build",config(i){return typeof e.config=="function"&&(i=e.config(i)),i.define={"process.env.NODE_ENV":JSON.stringify("production"),...i.define},i},configResolved(i){if(o=!!i.build.ssr,o){if(s=i.plugins.find(a=>a.name==="vite-plugin-qwik-router"),!s)throw new Error("Missing vite-plugin-qwik-router");if(t=i.plugins.find(a=>a.name==="vite-plugin-qwik"),!t)throw new Error("Missing vite-plugin-qwik");if(n=i.build.outDir,i.build?.ssr!==!0)throw new Error(`"build.ssr" must be set to "true" in order to use the "${e.name}" adapter.`);if(!i.build?.rollupOptions?.input)throw new Error(`"build.rollupOptions.input" must be set in order to use the "${e.name}" adapter.`)}},buildStart(){if(o&&e.ssg!==null){const{srcDir:i}=t.api.getOptions();this.emitFile({id:"@qwik-router-config",type:"chunk",fileName:"@qwik-router-config.js"}),this.emitFile({id:`${i}/entry.ssr`,type:"chunk",fileName:"entry.ssr.js"})}},generateBundle(i,a){if(o){m.length=0;for(const l in a){const u=a[l];u.type==="chunk"&&u.isEntry&&(m.push(l),u.name==="entry.ssr"?w=h.join(n,l):u.name==="@qwik-router-config"&&(p=h.join(n,l)))}}},closeBundle:{sequential:!0,async handler(){if(o&&n&&s?.api&&t?.api){const i=e.staticPaths||[],a=s.api.getRoutes(),l=s.api.getBasePathname(),u=t.api.getClientOutDir(),d=t.api.getClientPublicOutDir(),f=t.api.getAssetsDir(),y=t.api.getRootDir()??void 0;if(e.ssg!==null&&w&&p&&u&&d){let r=e.ssg?.origin??e.origin;r||(r="https://yoursite.qwik.dev"),r.length>0&&!/:\/\//.test(r)&&(r=`https://${r}`),r.startsWith("//")&&(r=`https:${r}`);try{r=new URL(r).origin}catch{this.warn(`Invalid "origin" option: "${r}". Using default origin: "https://yoursite.qwik.dev"`),r="https://yoursite.qwik.dev"}const k=await Promise.resolve().then(()=>require("./index-C455V8_A.cjs")),q={maxWorkers:e.maxWorkers,basePathname:l,outDir:d,rootDir:y,...e.ssg,origin:r,renderModulePath:w,qwikRouterConfigModulePath:p},P=await k.generate(q);if(P.errors>0){const _=new Error(`Error while running SSG from "${e.name}" adapter. At least one path failed to render.`);_.stack=void 0,this.error(_)}i.push(...P.staticPaths)}await O(d,n,f?h.join(l,f):l,i,!!e.cleanStaticGenerated),typeof e.generate=="function"&&await e.generate({outputEntries:m,serverOutDir:n,clientOutDir:u,clientPublicOutDir:d,basePathname:l,routes:a,assetsDir:f,warn:r=>this.warn(r),error:r=>this.error(r)}),this.warn(`
-==============================================
-Note: Make sure that you are serving the built files with proper cache headers.
-See https://qwik.dev/docs/deployments/#cache-headers for more information.
-==============================================`),e.ssg!==null&&setTimeout(()=>{process.exit(0)},5e3).unref()}}}}}function T(e={}){const s=process?.env;return A({name:"cloudflare-pages",origin:s?.CF_PAGES_URL??s?.ORIGIN??"https://your.cloudflare.pages.dev",ssg:e.ssg,staticPaths:e.staticPaths,cleanStaticGenerated:!0,config(){return{resolve:{conditions:["webworker","worker"]},ssr:{target:"webworker",noExternal:!0,external:["node:async_hooks"]},build:{ssr:!0,rollupOptions:{output:{format:"es",hoistTransitiveImports:!1}}},publicDir:!1}},async generate({clientOutDir:t,serverOutDir:n,basePathname:w,assetsDir:p}){const o=h.join(t,"_routes.json");if(!g.existsSync(o)&&e.functionRoutes!==!1){let a=p?h.join(w,p):w;a.endsWith("/")||(a+="/");const l={version:1,include:[w+"*"],exclude:[a+"build/*",a+"assets/*"]};await g.promises.writeFile(o,JSON.stringify(l,void 0,2))}const c=h.join(t,"_worker.js");if(!g.existsSync(c)){const a=h.relative(t,h.join(n,"entry.cloudflare-pages"));await g.promises.writeFile(c,`import { fetch } from "${v(a)}"; export default { fetch };`)}}})}exports.cloudflarePagesAdapter=T;exports.normalizePath=j;

package/lib/adapters/cloudflare-pages/vite/index-bogwy7wh.js

@@ -1,250 +0,0 @@
-import g from "node:fs";
-import { normalize as q, join as m, relative as O } from "node:path";
-import { getErrorHtml as D } from "@qwik.dev/router/middleware/request-handler";
-function C(e) {
-  return v(q(e));
-}
-function v(e) {
-  const s = /^\\\\\?\\/.test(e), t = /[^\u0000-\u0080]+/.test(e);
-  return s || t || (e = e.replace(/\\/g, "/"), e.endsWith("/") && (e = e.slice(0, e.length - 1))), e;
-}
-async function E(e, s, t, n, h) {
-  t && !t.endsWith("/") && (t += "/");
-  const w = /* @__PURE__ */ new Set([
-    t + "/" + (globalThis.__QWIK_BUILD_DIR__ || "build") + "/",
-    t + "/" + (globalThis.__QWIK_ASSETS_DIR__ || "assets") + "/"
-  ]), o = new Set(n.map(P)), p = [], c = async (u, f, d) => {
-    if (d = P(d), w.has(d))
-      return;
-    const y = m(u, f);
-    if (f === "index.html" || f === "q-data.json") {
-      !o.has(d) && h && await g.promises.unlink(y);
-      return;
-    }
-    if (f === "404.html") {
-      const k = await g.promises.readFile(y, "utf-8");
-      p.push([d, k]);
-      return;
-    }
-    const r = await g.promises.stat(y);
-    r.isDirectory() ? await i(y, d + f + "/") : r.isFile() && o.add(d + f);
-  }, i = async (u, f) => {
-    const d = await g.promises.readdir(u);
-    await Promise.all(d.map((y) => c(u, y, f)));
-  };
-  g.existsSync(e) && await i(e, t);
-  const a = b(t, p), l = T(o);
-  await A(l, a, s);
-}
-function P(e) {
-  return e.endsWith("/") ? e : e + "/";
-}
-function b(e, s) {
-  if (s.sort((t, n) => t[0].length > n[0].length ? -1 : t[0].length < n[0].length ? 1 : t[0] < n[0] ? -1 : t[0] > n[0] ? 1 : 0), !s.some((t) => t[0] === e)) {
-    const t = D(404, "Resource Not Found");
-    s.push([e, t]);
-  }
-  return JSON.stringify(s, null, 2).slice(1, -1);
-}
-function T(e) {
-  return JSON.stringify(Array.from(new Set(e)).sort()).slice(1, -1);
-}
-const A = async (e, s, t) => {
-  const n = /* @__PURE__ */ new Set(), h = async (o) => {
-    const p = await g.promises.readFile(o, "utf-8");
-    let c = !1;
-    const i = p.replace(
-      /(['"])__QWIK_ROUTER_(STATIC_PATHS|NOT_FOUND)_ARRAY__\1/g,
-      (a, l, u) => (c = !0, u === "STATIC_PATHS" ? e : s)
-    );
-    c && await g.promises.writeFile(o, i);
-  }, w = async (o) => {
-    const p = await g.promises.readdir(o, { withFileTypes: !0 });
-    for (const c of p)
-      if (c.isDirectory())
-        await w(m(o, c.name));
-      else if (c.name.endsWith("js")) {
-        const i = h(m(o, c.name)).finally(() => {
-          n.delete(i);
-        });
-        n.add(i);
-      }
-  };
-  await w(t), await Promise.all(n);
-};
-function x(e) {
-  let s = null, t = null, n = null, h = null, w = null, o = !1;
-  const p = [];
-  return {
-    name: `vite-plugin-qwik-router-ssg-${e.name}`,
-    enforce: "post",
-    apply: "build",
-    config(i) {
-      return typeof e.config == "function" && (i = e.config(i)), i.define = {
-        "process.env.NODE_ENV": JSON.stringify("production"),
-        ...i.define
-      }, i;
-    },
-    configResolved(i) {
-      if (o = !!i.build.ssr, o) {
-        if (s = i.plugins.find(
-          (a) => a.name === "vite-plugin-qwik-router"
-        ), !s)
-          throw new Error("Missing vite-plugin-qwik-router");
-        if (t = i.plugins.find(
-          (a) => a.name === "vite-plugin-qwik"
-        ), !t)
-          throw new Error("Missing vite-plugin-qwik");
-        if (n = i.build.outDir, i.build?.ssr !== !0)
-          throw new Error(
-            `"build.ssr" must be set to "true" in order to use the "${e.name}" adapter.`
-          );
-        if (!i.build?.rollupOptions?.input)
-          throw new Error(
-            `"build.rollupOptions.input" must be set in order to use the "${e.name}" adapter.`
-          );
-      }
-    },
-    buildStart() {
-      if (o && e.ssg !== null) {
-        const { srcDir: i } = t.api.getOptions();
-        this.emitFile({
-          id: "@qwik-router-config",
-          type: "chunk",
-          fileName: "@qwik-router-config.js"
-        }), this.emitFile({
-          id: `${i}/entry.ssr`,
-          type: "chunk",
-          fileName: "entry.ssr.js"
-        });
-      }
-    },
-    generateBundle(i, a) {
-      if (o) {
-        p.length = 0;
-        for (const l in a) {
-          const u = a[l];
-          u.type === "chunk" && u.isEntry && (p.push(l), u.name === "entry.ssr" ? h = m(n, l) : u.name === "@qwik-router-config" && (w = m(n, l)));
-        }
-      }
-    },
-    closeBundle: {
-      sequential: !0,
-      async handler() {
-        if (o && n && s?.api && t?.api) {
-          const i = e.staticPaths || [], a = s.api.getRoutes(), l = s.api.getBasePathname(), u = t.api.getClientOutDir(), f = t.api.getClientPublicOutDir(), d = t.api.getAssetsDir(), y = t.api.getRootDir() ?? void 0;
-          if (e.ssg !== null && h && w && u && f) {
-            let r = e.ssg?.origin ?? e.origin;
-            r || (r = "https://yoursite.qwik.dev"), r.length > 0 && !/:\/\//.test(r) && (r = `https://${r}`), r.startsWith("//") && (r = `https:${r}`);
-            try {
-              r = new URL(r).origin;
-            } catch {
-              this.warn(
-                `Invalid "origin" option: "${r}". Using default origin: "https://yoursite.qwik.dev"`
-              ), r = "https://yoursite.qwik.dev";
-            }
-            const k = await import("./index-DwovcBp3.js"), R = {
-              maxWorkers: e.maxWorkers,
-              basePathname: l,
-              outDir: f,
-              rootDir: y,
-              ...e.ssg,
-              origin: r,
-              renderModulePath: h,
-              qwikRouterConfigModulePath: w
-            }, _ = await k.generate(R);
-            if (_.errors > 0) {
-              const S = new Error(
-                `Error while running SSG from "${e.name}" adapter. At least one path failed to render.`
-              );
-              S.stack = void 0, this.error(S);
-            }
-            i.push(..._.staticPaths);
-          }
-          await E(
-            f,
-            n,
-            d ? m(l, d) : l,
-            i,
-            !!e.cleanStaticGenerated
-          ), typeof e.generate == "function" && await e.generate({
-            outputEntries: p,
-            serverOutDir: n,
-            clientOutDir: u,
-            clientPublicOutDir: f,
-            basePathname: l,
-            routes: a,
-            assetsDir: d,
-            warn: (r) => this.warn(r),
-            error: (r) => this.error(r)
-          }), this.warn(
-            `
-==============================================
-Note: Make sure that you are serving the built files with proper cache headers.
-See https://qwik.dev/docs/deployments/#cache-headers for more information.
-==============================================`
-          ), e.ssg !== null && setTimeout(() => {
-            process.exit(0);
-          }, 5e3).unref();
-        }
-      }
-    }
-  };
-}
-function J(e = {}) {
-  const s = process?.env;
-  return x({
-    name: "cloudflare-pages",
-    origin: s?.CF_PAGES_URL ?? s?.ORIGIN ?? "https://your.cloudflare.pages.dev",
-    ssg: e.ssg,
-    staticPaths: e.staticPaths,
-    cleanStaticGenerated: !0,
-    config() {
-      return {
-        resolve: {
-          conditions: ["webworker", "worker"]
-        },
-        ssr: {
-          target: "webworker",
-          noExternal: !0,
-          external: ["node:async_hooks"]
-        },
-        build: {
-          ssr: !0,
-          rollupOptions: {
-            output: {
-              format: "es",
-              hoistTransitiveImports: !1
-            }
-          }
-        },
-        publicDir: !1
-      };
-    },
-    async generate({ clientOutDir: t, serverOutDir: n, basePathname: h, assetsDir: w }) {
-      const o = m(t, "_routes.json");
-      if (!g.existsSync(o) && e.functionRoutes !== !1) {
-        let a = w ? m(h, w) : h;
-        a.endsWith("/") || (a += "/");
-        const l = {
-          version: 1,
-          include: [h + "*"],
-          exclude: [a + "build/*", a + "assets/*"]
-        };
-        await g.promises.writeFile(o, JSON.stringify(l, void 0, 2));
-      }
-      const c = m(t, "_worker.js");
-      if (!g.existsSync(c)) {
-        const a = O(t, m(n, "entry.cloudflare-pages"));
-        await g.promises.writeFile(
-          c,
-          `import { fetch } from "${v(a)}"; export default { fetch };`
-        );
-      }
-    }
-  });
-}
-export {
-  J as c,
-  C as n
-};