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

package/lib/adapters/azure-swa/vite/index.cjs

@@ -1,5 +1,61 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const d=require("node:fs"),y=require("node:path"),j=require("@qwik.dev/router/middleware/request-handler");async function O(e,o,t,n,h){t&&!t.endsWith("/")&&(t+="/");const w=new Set([t+"/"+(globalThis.__QWIK_BUILD_DIR__||"build")+"/",t+"/"+(globalThis.__QWIK_ASSETS_DIR__||"assets")+"/"]),s=new Set(n.map(_)),f=[],u=async(a,l,c)=>{if(c=_(c),w.has(c))return;const m=y.join(a,l);if(l==="index.html"||l==="q-data.json"){!s.has(c)&&h&&await d.promises.unlink(m);return}if(l==="404.html"){const r=await d.promises.readFile(m,"utf-8");f.push([c,r]);return}const S=await d.promises.stat(m);S.isDirectory()?await p(m,c+l+"/"):S.isFile()&&s.add(c+l)},p=async(a,l)=>{const c=await d.promises.readdir(a);await Promise.all(c.map(m=>u(a,m,l)))};d.existsSync(e)&&await p(e,t);const i=R(t,f),g=T(s);await b(g,i,o)}function _(e){return e.endsWith("/")?e:e+"/"}function R(e,o){if(o.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),!o.some(t=>t[0]===e)){const t=j.getErrorHtml(404,"Resource Not Found");o.push([e,t])}return JSON.stringify(o,null,2).slice(1,-1)}function T(e){return JSON.stringify(Array.from(new Set(e)).sort()).slice(1,-1)}const b=async(e,o,t)=>{const n=new Set,h=async s=>{const f=await d.promises.readFile(s,"utf-8");let u=!1;const p=f.replace(/(['"])__QWIK_ROUTER_(STATIC_PATHS|NOT_FOUND)_ARRAY__\1/g,(i,g,a)=>(u=!0,a==="STATIC_PATHS"?e:o));u&&await d.promises.writeFile(s,p)},w=async s=>{const f=await d.promises.readdir(s,{withFileTypes:!0});for(const u of f)if(u.isDirectory())await w(y.join(s,u.name));else if(u.name.endsWith("js")){const p=h(y.join(s,u.name)).finally(()=>{n.delete(p)});n.add(p)}};await w(t),await Promise.all(n)};function D(e){let o=null,t=null,n=null,h=null,w=null,s=!1,f;const u=[];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(s=!!i.build.ssr,f=i.command,s){if(o=i.plugins.find(g=>g.name==="vite-plugin-qwik-router"),!o)throw new Error("Missing vite-plugin-qwik-router");if(t=i.plugins.find(g=>g.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(s&&e.ssg!==null){const{srcDir:i}=t.api.getOptions();f==="build"&&n&&i&&(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,g){if(s){u.length=0;for(const a in g){const l=g[a];l.type==="chunk"&&l.isEntry&&(u.push(a),l.name==="entry.ssr"?h=y.join(n,a):l.name==="@qwik-router-config"&&(w=y.join(n,a)))}}},closeBundle:{sequential:!0,async handler(){if(s&&n&&o?.api&&t?.api){const i=e.staticPaths||[],g=o.api.getRoutes(),a=o.api.getBasePathname(),l=t.api.getClientOutDir(),c=t.api.getClientPublicOutDir(),m=t.api.getAssetsDir(),S=t.api.getRootDir()??void 0;if(e.ssg!==null&&h&&w&&l&&c){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 v=await Promise.resolve().then(()=>require("./index-BqUeglYs.cjs")),q={maxWorkers:e.maxWorkers,basePathname:a,outDir:c,rootDir:S,...e.ssg,origin:r,renderModulePath:h,qwikRouterConfigModulePath:w},k=await v.generate(q);if(k.errors>0){const P=new Error(`Error while running SSG from "${e.name}" adapter. At least one path failed to render.`);P.stack=void 0,this.error(P)}i.push(...k.staticPaths)}await O(c,n,m?y.join(a,m):a,i,!!e.cleanStaticGenerated),typeof e.generate=="function"&&await e.generate({outputEntries:u,serverOutDir:n,clientOutDir:l,clientPublicOutDir:c,basePathname:a,routes:g,assetsDir:m,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(()=>{console.warn("SSG seems to be hanging after completion, forcing process to exit. Everything is likely fine."),process.exit(0)},5e3).unref(),e.ssg!==null&&setTimeout(()=>{process.exit(0)},5e3).unref()}}}}}function E(e={}){const o=process?.env;return D({name:"azure-swa",origin:o?.ORIGIN??o?.URL??"https://yoursitename.region.2.azurestaticapps.net",ssg:e.ssg,cleanStaticGenerated:!0,async generate({outputEntries:t,serverOutDir:n,clientPublicOutDir:h}){const w=y.join(n,"package.json"),s='{"type":"module"}';await d.promises.mkdir(n,{recursive:!0}),await d.promises.writeFile(w,s);const f=t.find(i=>i.indexOf("entry.azure-swa")===0),u=y.join(n,"function.json"),p=JSON.stringify({bindings:[{authLevel:"anonymous",type:"httpTrigger",direction:"in",name:"req",methods:["get","head","post","put","delete","connect","options","trace","patch"]},{type:"http",direction:"out",name:"$return"}],scriptFile:f},null,2);await d.promises.writeFile(u,p),d.existsSync(y.join(h,"index.html"))||await d.promises.writeFile(y.join(h,"index.html"),"")}})}exports.azureSwaAdapter=E;
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const fs = require("node:fs");
+const path = require("node:path");
+const adapters_shared_vite = require("../../shared/vite/index.cjs");
+require("../../../chunks/error-handler.cjs");
+function azureSwaAdapter(opts = {}) {
+  const env = process?.env;
+  return adapters_shared_vite.viteAdapter({
+    name: "azure-swa",
+    origin: env?.ORIGIN ?? env?.URL ?? "https://yoursitename.region.2.azurestaticapps.net",
+    ssg: opts.ssg,
+    cleanStaticGenerated: true,
+    async generate({ outputEntries, serverOutDir, clientPublicOutDir }) {
+      const serverPackageJsonPath = path.join(serverOutDir, "package.json");
+      const serverPackageJsonCode = `{"type":"module"}`;
+      await fs.promises.mkdir(serverOutDir, { recursive: true });
+      await fs.promises.writeFile(serverPackageJsonPath, serverPackageJsonCode);
+      const azureSwaModulePath = outputEntries.find(
+        (entryName) => entryName.indexOf("entry.azure-swa") === 0
+      );
+      const funcJsonPath = path.join(serverOutDir, "function.json");
+      const funcJson = JSON.stringify(
+        {
+          bindings: [
+            {
+              authLevel: "anonymous",
+              type: "httpTrigger",
+              direction: "in",
+              name: "req",
+              methods: [
+                "get",
+                "head",
+                "post",
+                "put",
+                "delete",
+                "connect",
+                "options",
+                "trace",
+                "patch"
+              ]
+            },
+            {
+              type: "http",
+              direction: "out",
+              name: "$return"
+            }
+          ],
+          scriptFile: azureSwaModulePath
+        },
+        null,
+        2
+      );
+      await fs.promises.writeFile(funcJsonPath, funcJson);
+      if (!fs.existsSync(path.join(clientPublicOutDir, "index.html"))) {
+        await fs.promises.writeFile(path.join(clientPublicOutDir, "index.html"), "");
+      }
+    }
+  });
+}
+exports.azureSwaAdapter = azureSwaAdapter;

package/lib/adapters/azure-swa/vite/index.mjs

@@ -1,206 +1,24 @@
-import d from "node:fs";
-import { join as y } from "node:path";
-import { getErrorHtml as R } from "@qwik.dev/router/middleware/request-handler";
-async function O(e, o, t, r, h) {
-  t && !t.endsWith("/") && (t += "/");
-  const p = /* @__PURE__ */ new Set([
-    t + "/" + (globalThis.__QWIK_BUILD_DIR__ || "build") + "/",
-    t + "/" + (globalThis.__QWIK_ASSETS_DIR__ || "assets") + "/"
-  ]), s = new Set(r.map(P)), f = [], u = async (a, l, c) => {
-    if (c = P(c), p.has(c))
-      return;
-    const m = y(a, l);
-    if (l === "index.html" || l === "q-data.json") {
-      !s.has(c) && h && await d.promises.unlink(m);
-      return;
-    }
-    if (l === "404.html") {
-      const n = await d.promises.readFile(m, "utf-8");
-      f.push([c, n]);
-      return;
-    }
-    const S = await d.promises.stat(m);
-    S.isDirectory() ? await w(m, c + l + "/") : S.isFile() && s.add(c + l);
-  }, w = async (a, l) => {
-    const c = await d.promises.readdir(a);
-    await Promise.all(c.map((m) => u(a, m, l)));
-  };
-  d.existsSync(e) && await w(e, t);
-  const i = T(t, f), g = D(s);
-  await b(g, i, o);
-}
-function P(e) {
-  return e.endsWith("/") ? e : e + "/";
-}
-function T(e, o) {
-  if (o.sort((t, r) => t[0].length > r[0].length ? -1 : t[0].length < r[0].length ? 1 : t[0] < r[0] ? -1 : t[0] > r[0] ? 1 : 0), !o.some((t) => t[0] === e)) {
-    const t = R(404, "Resource Not Found");
-    o.push([e, t]);
-  }
-  return JSON.stringify(o, null, 2).slice(1, -1);
-}
-function D(e) {
-  return JSON.stringify(Array.from(new Set(e)).sort()).slice(1, -1);
-}
-const b = async (e, o, t) => {
-  const r = /* @__PURE__ */ new Set(), h = async (s) => {
-    const f = await d.promises.readFile(s, "utf-8");
-    let u = !1;
-    const w = f.replace(
-      /(['"])__QWIK_ROUTER_(STATIC_PATHS|NOT_FOUND)_ARRAY__\1/g,
-      (i, g, a) => (u = !0, a === "STATIC_PATHS" ? e : o)
-    );
-    u && await d.promises.writeFile(s, w);
-  }, p = async (s) => {
-    const f = await d.promises.readdir(s, { withFileTypes: !0 });
-    for (const u of f)
-      if (u.isDirectory())
-        await p(y(s, u.name));
-      else if (u.name.endsWith("js")) {
-        const w = h(y(s, u.name)).finally(() => {
-          r.delete(w);
-        });
-        r.add(w);
-      }
-  };
-  await p(t), await Promise.all(r);
-};
-function E(e) {
-  let o = null, t = null, r = null, h = null, p = null, s = !1, f;
-  const u = [];
-  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 (s = !!i.build.ssr, f = i.command, s) {
-        if (o = i.plugins.find(
-          (g) => g.name === "vite-plugin-qwik-router"
-        ), !o)
-          throw new Error("Missing vite-plugin-qwik-router");
-        if (t = i.plugins.find(
-          (g) => g.name === "vite-plugin-qwik"
-        ), !t)
-          throw new Error("Missing vite-plugin-qwik");
-        if (r = 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 (s && e.ssg !== null) {
-        const { srcDir: i } = t.api.getOptions();
-        f === "build" && r && i && (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, g) {
-      if (s) {
-        u.length = 0;
-        for (const a in g) {
-          const l = g[a];
-          l.type === "chunk" && l.isEntry && (u.push(a), l.name === "entry.ssr" ? h = y(r, a) : l.name === "@qwik-router-config" && (p = y(r, a)));
-        }
-      }
-    },
-    closeBundle: {
-      sequential: !0,
-      async handler() {
-        if (s && r && o?.api && t?.api) {
-          const i = e.staticPaths || [], g = o.api.getRoutes(), a = o.api.getBasePathname(), l = t.api.getClientOutDir(), c = t.api.getClientPublicOutDir(), m = t.api.getAssetsDir(), S = t.api.getRootDir() ?? void 0;
-          if (e.ssg !== null && h && p && l && c) {
-            let n = e.ssg?.origin ?? e.origin;
-            n || (n = "https://yoursite.qwik.dev"), n.length > 0 && !/:\/\//.test(n) && (n = `https://${n}`), n.startsWith("//") && (n = `https:${n}`);
-            try {
-              n = new URL(n).origin;
-            } catch {
-              this.warn(
-                `Invalid "origin" option: "${n}". Using default origin: "https://yoursite.qwik.dev"`
-              ), n = "https://yoursite.qwik.dev";
-            }
-            const v = await import("./index-CrwlB95_.js"), q = {
-              maxWorkers: e.maxWorkers,
-              basePathname: a,
-              outDir: c,
-              rootDir: S,
-              ...e.ssg,
-              origin: n,
-              renderModulePath: h,
-              qwikRouterConfigModulePath: p
-            }, k = await v.generate(q);
-            if (k.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(...k.staticPaths);
-          }
-          await O(
-            c,
-            r,
-            m ? y(a, m) : a,
-            i,
-            !!e.cleanStaticGenerated
-          ), typeof e.generate == "function" && await e.generate({
-            outputEntries: u,
-            serverOutDir: r,
-            clientOutDir: l,
-            clientPublicOutDir: c,
-            basePathname: a,
-            routes: g,
-            assetsDir: m,
-            warn: (n) => this.warn(n),
-            error: (n) => this.error(n)
-          }), 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(() => {
-            console.warn(
-              "SSG seems to be hanging after completion, forcing process to exit. Everything is likely fine."
-            ), process.exit(0);
-          }, 5e3).unref(), e.ssg !== null && setTimeout(() => {
-            process.exit(0);
-          }, 5e3).unref();
-        }
-      }
-    }
-  };
-}
-function C(e = {}) {
-  const o = process?.env;
-  return E({
+import fs from "node:fs";
+import { join } from "node:path";
+import { viteAdapter } from "../../shared/vite/index.mjs";
+import "../../../chunks/error-handler.mjs";
+function azureSwaAdapter(opts = {}) {
+  const env = process?.env;
+  return viteAdapter({
     name: "azure-swa",
-    origin: o?.ORIGIN ?? o?.URL ?? "https://yoursitename.region.2.azurestaticapps.net",
-    ssg: e.ssg,
-    cleanStaticGenerated: !0,
-    async generate({ outputEntries: t, serverOutDir: r, clientPublicOutDir: h }) {
-      const p = y(r, "package.json"), s = '{"type":"module"}';
-      await d.promises.mkdir(r, { recursive: !0 }), await d.promises.writeFile(p, s);
-      const f = t.find(
-        (i) => i.indexOf("entry.azure-swa") === 0
-      ), u = y(r, "function.json"), w = JSON.stringify(
+    origin: env?.ORIGIN ?? env?.URL ?? "https://yoursitename.region.2.azurestaticapps.net",
+    ssg: opts.ssg,
+    cleanStaticGenerated: true,
+    async generate({ outputEntries, serverOutDir, clientPublicOutDir }) {
+      const serverPackageJsonPath = join(serverOutDir, "package.json");
+      const serverPackageJsonCode = `{"type":"module"}`;
+      await fs.promises.mkdir(serverOutDir, { recursive: true });
+      await fs.promises.writeFile(serverPackageJsonPath, serverPackageJsonCode);
+      const azureSwaModulePath = outputEntries.find(
+        (entryName) => entryName.indexOf("entry.azure-swa") === 0
+      );
+      const funcJsonPath = join(serverOutDir, "function.json");
+      const funcJson = JSON.stringify(
         {
           bindings: [
             {
@@ -226,15 +44,18 @@ function C(e = {}) {
               name: "$return"
             }
           ],
-          scriptFile: f
+          scriptFile: azureSwaModulePath
         },
         null,
         2
       );
-      await d.promises.writeFile(u, w), d.existsSync(y(h, "index.html")) || await d.promises.writeFile(y(h, "index.html"), "");
+      await fs.promises.writeFile(funcJsonPath, funcJson);
+      if (!fs.existsSync(join(clientPublicOutDir, "index.html"))) {
+        await fs.promises.writeFile(join(clientPublicOutDir, "index.html"), "");
+      }
     }
   });
 }
 export {
-  C as azureSwaAdapter
+  azureSwaAdapter
 };

package/lib/adapters/bun-server/vite/index.cjs

@@ -1,5 +1,27 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const y=require("node:path"),b=require("@qwik.dev/router/middleware/request-handler"),p=require("node:fs");async function D(e,s,t,n,m){t&&!t.endsWith("/")&&(t+="/");const h=new Set([t+"/"+(globalThis.__QWIK_BUILD_DIR__||"build")+"/",t+"/"+(globalThis.__QWIK_ASSETS_DIR__||"assets")+"/"]),o=new Set(n.map(_)),g=[],c=async(a,l,u)=>{if(u=_(u),h.has(u))return;const f=y.join(a,l);if(l==="index.html"||l==="q-data.json"){!o.has(u)&&m&&await p.promises.unlink(f);return}if(l==="404.html"){const r=await p.promises.readFile(f,"utf-8");g.push([u,r]);return}const S=await p.promises.stat(f);S.isDirectory()?await w(f,u+l+"/"):S.isFile()&&o.add(u+l)},w=async(a,l)=>{const u=await p.promises.readdir(a);await Promise.all(u.map(f=>c(a,f,l)))};p.existsSync(e)&&await w(e,t);const i=O(t,g),d=R(o);await T(d,i,s)}function _(e){return e.endsWith("/")?e:e+"/"}function O(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=b.getErrorHtml(404,"Resource Not Found");s.push([e,t])}return JSON.stringify(s,null,2).slice(1,-1)}function R(e){return JSON.stringify(Array.from(new Set(e)).sort()).slice(1,-1)}const T=async(e,s,t)=>{const n=new Set,m=async o=>{const g=await p.promises.readFile(o,"utf-8");let c=!1;const w=g.replace(/(['"])__QWIK_ROUTER_(STATIC_PATHS|NOT_FOUND)_ARRAY__\1/g,(i,d,a)=>(c=!0,a==="STATIC_PATHS"?e:s));c&&await p.promises.writeFile(o,w)},h=async o=>{const g=await p.promises.readdir(o,{withFileTypes:!0});for(const c of g)if(c.isDirectory())await h(y.join(o,c.name));else if(c.name.endsWith("js")){const w=m(y.join(o,c.name)).finally(()=>{n.delete(w)});n.add(w)}};await h(t),await Promise.all(n)};function E(e){let s=null,t=null,n=null,m=null,h=null,o=!1,g;const c=[];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,g=i.command,o){if(s=i.plugins.find(d=>d.name==="vite-plugin-qwik-router"),!s)throw new Error("Missing vite-plugin-qwik-router");if(t=i.plugins.find(d=>d.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();g==="build"&&n&&i&&(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,d){if(o){c.length=0;for(const a in d){const l=d[a];l.type==="chunk"&&l.isEntry&&(c.push(a),l.name==="entry.ssr"?m=y.join(n,a):l.name==="@qwik-router-config"&&(h=y.join(n,a)))}}},closeBundle:{sequential:!0,async handler(){if(o&&n&&s?.api&&t?.api){const i=e.staticPaths||[],d=s.api.getRoutes(),a=s.api.getBasePathname(),l=t.api.getClientOutDir(),u=t.api.getClientPublicOutDir(),f=t.api.getAssetsDir(),S=t.api.getRootDir()??void 0;if(e.ssg!==null&&m&&h&&l&&u){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 q=await Promise.resolve().then(()=>require("./index-BqUeglYs.cjs")),P={maxWorkers:e.maxWorkers,basePathname:a,outDir:u,rootDir:S,...e.ssg,origin:r,renderModulePath:m,qwikRouterConfigModulePath:h},k=await q.generate(P);if(k.errors>0){const v=new Error(`Error while running SSG from "${e.name}" adapter. At least one path failed to render.`);v.stack=void 0,this.error(v)}i.push(...k.staticPaths)}await D(u,n,f?y.join(a,f):a,i,!!e.cleanStaticGenerated),typeof e.generate=="function"&&await e.generate({outputEntries:c,serverOutDir:n,clientOutDir:l,clientPublicOutDir:u,basePathname:a,routes:d,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(()=>{console.warn("SSG seems to be hanging after completion, forcing process to exit. Everything is likely fine."),process.exit(0)},5e3).unref(),e.ssg!==null&&setTimeout(()=>{process.exit(0)},5e3).unref()}}}}}function A(e={}){const s=process?.env;return E({name:e.name||"bun-server",origin:s?.ORIGIN??s?.URL??"https://yoursitename.qwik.dev",ssg:e.ssg,cleanStaticGenerated:!0,config(){return{ssr:{target:"node"},build:{ssr:!0},publicDir:!1}}})}exports.bunServerAdapter=A;
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const adapters_shared_vite = require("../../shared/vite/index.cjs");
+require("node:path");
+require("node:fs");
+require("../../../chunks/error-handler.cjs");
+function bunServerAdapter(opts = {}) {
+  const env = process?.env;
+  return adapters_shared_vite.viteAdapter({
+    name: opts.name || "bun-server",
+    origin: env?.ORIGIN ?? env?.URL ?? "https://yoursitename.qwik.dev",
+    ssg: opts.ssg,
+    cleanStaticGenerated: true,
+    config() {
+      return {
+        ssr: {
+          target: "node"
+        },
+        build: {
+          ssr: true
+        },
+        publicDir: false
+      };
+    }
+  });
+}
+exports.bunServerAdapter = bunServerAdapter;

package/lib/adapters/bun-server/vite/index.mjs

@@ -1,213 +1,27 @@
-import { join as y } from "node:path";
-import { getErrorHtml as D } from "@qwik.dev/router/middleware/request-handler";
-import p from "node:fs";
-async function b(e, s, t, n, m) {
-  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(v)), g = [], c = async (a, l, u) => {
-    if (u = v(u), w.has(u))
-      return;
-    const f = y(a, l);
-    if (l === "index.html" || l === "q-data.json") {
-      !o.has(u) && m && await p.promises.unlink(f);
-      return;
-    }
-    if (l === "404.html") {
-      const r = await p.promises.readFile(f, "utf-8");
-      g.push([u, r]);
-      return;
-    }
-    const S = await p.promises.stat(f);
-    S.isDirectory() ? await h(f, u + l + "/") : S.isFile() && o.add(u + l);
-  }, h = async (a, l) => {
-    const u = await p.promises.readdir(a);
-    await Promise.all(u.map((f) => c(a, f, l)));
-  };
-  p.existsSync(e) && await h(e, t);
-  const i = O(t, g), d = R(o);
-  await T(d, i, s);
-}
-function v(e) {
-  return e.endsWith("/") ? e : e + "/";
-}
-function O(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 R(e) {
-  return JSON.stringify(Array.from(new Set(e)).sort()).slice(1, -1);
-}
-const T = async (e, s, t) => {
-  const n = /* @__PURE__ */ new Set(), m = async (o) => {
-    const g = await p.promises.readFile(o, "utf-8");
-    let c = !1;
-    const h = g.replace(
-      /(['"])__QWIK_ROUTER_(STATIC_PATHS|NOT_FOUND)_ARRAY__\1/g,
-      (i, d, a) => (c = !0, a === "STATIC_PATHS" ? e : s)
-    );
-    c && await p.promises.writeFile(o, h);
-  }, w = async (o) => {
-    const g = await p.promises.readdir(o, { withFileTypes: !0 });
-    for (const c of g)
-      if (c.isDirectory())
-        await w(y(o, c.name));
-      else if (c.name.endsWith("js")) {
-        const h = m(y(o, c.name)).finally(() => {
-          n.delete(h);
-        });
-        n.add(h);
-      }
-  };
-  await w(t), await Promise.all(n);
-};
-function E(e) {
-  let s = null, t = null, n = null, m = null, w = null, o = !1, g;
-  const c = [];
-  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, g = i.command, o) {
-        if (s = i.plugins.find(
-          (d) => d.name === "vite-plugin-qwik-router"
-        ), !s)
-          throw new Error("Missing vite-plugin-qwik-router");
-        if (t = i.plugins.find(
-          (d) => d.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();
-        g === "build" && n && i && (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, d) {
-      if (o) {
-        c.length = 0;
-        for (const a in d) {
-          const l = d[a];
-          l.type === "chunk" && l.isEntry && (c.push(a), l.name === "entry.ssr" ? m = y(n, a) : l.name === "@qwik-router-config" && (w = y(n, a)));
-        }
-      }
-    },
-    closeBundle: {
-      sequential: !0,
-      async handler() {
-        if (o && n && s?.api && t?.api) {
-          const i = e.staticPaths || [], d = s.api.getRoutes(), a = s.api.getBasePathname(), l = t.api.getClientOutDir(), u = t.api.getClientPublicOutDir(), f = t.api.getAssetsDir(), S = t.api.getRootDir() ?? void 0;
-          if (e.ssg !== null && m && w && l && u) {
-            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 P = await import("./index-CrwlB95_.js"), q = {
-              maxWorkers: e.maxWorkers,
-              basePathname: a,
-              outDir: u,
-              rootDir: S,
-              ...e.ssg,
-              origin: r,
-              renderModulePath: m,
-              qwikRouterConfigModulePath: w
-            }, k = await P.generate(q);
-            if (k.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(...k.staticPaths);
-          }
-          await b(
-            u,
-            n,
-            f ? y(a, f) : a,
-            i,
-            !!e.cleanStaticGenerated
-          ), typeof e.generate == "function" && await e.generate({
-            outputEntries: c,
-            serverOutDir: n,
-            clientOutDir: l,
-            clientPublicOutDir: u,
-            basePathname: a,
-            routes: d,
-            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(() => {
-            console.warn(
-              "SSG seems to be hanging after completion, forcing process to exit. Everything is likely fine."
-            ), process.exit(0);
-          }, 5e3).unref(), e.ssg !== null && setTimeout(() => {
-            process.exit(0);
-          }, 5e3).unref();
-        }
-      }
-    }
-  };
-}
-function F(e = {}) {
-  const s = process?.env;
-  return E({
-    name: e.name || "bun-server",
-    origin: s?.ORIGIN ?? s?.URL ?? "https://yoursitename.qwik.dev",
-    ssg: e.ssg,
-    cleanStaticGenerated: !0,
+import { viteAdapter } from "../../shared/vite/index.mjs";
+import "node:path";
+import "node:fs";
+import "../../../chunks/error-handler.mjs";
+function bunServerAdapter(opts = {}) {
+  const env = process?.env;
+  return viteAdapter({
+    name: opts.name || "bun-server",
+    origin: env?.ORIGIN ?? env?.URL ?? "https://yoursitename.qwik.dev",
+    ssg: opts.ssg,
+    cleanStaticGenerated: true,
     config() {
       return {
         ssr: {
           target: "node"
         },
         build: {
-          ssr: !0
+          ssr: true
         },
-        publicDir: !1
+        publicDir: false
       };
     }
   });
 }
 export {
-  F as bunServerAdapter
+  bunServerAdapter
 };

package/lib/adapters/cloud-run/vite/index.cjs

@@ -1,5 +1,24 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const y=require("node:path"),D=require("@qwik.dev/router/middleware/request-handler"),p=require("node:fs");async function R(e,s,t,n,m){t&&!t.endsWith("/")&&(t+="/");const h=new Set([t+"/"+(globalThis.__QWIK_BUILD_DIR__||"build")+"/",t+"/"+(globalThis.__QWIK_ASSETS_DIR__||"assets")+"/"]),o=new Set(n.map(q)),g=[],c=async(a,l,u)=>{if(u=q(u),h.has(u))return;const f=y.join(a,l);if(l==="index.html"||l==="q-data.json"){!o.has(u)&&m&&await p.promises.unlink(f);return}if(l==="404.html"){const r=await p.promises.readFile(f,"utf-8");g.push([u,r]);return}const S=await p.promises.stat(f);S.isDirectory()?await w(f,u+l+"/"):S.isFile()&&o.add(u+l)},w=async(a,l)=>{const u=await p.promises.readdir(a);await Promise.all(u.map(f=>c(a,f,l)))};p.existsSync(e)&&await w(e,t);const i=b(t,g),d=O(o);await T(d,i,s)}function q(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.getErrorHtml(404,"Resource Not Found");s.push([e,t])}return JSON.stringify(s,null,2).slice(1,-1)}function O(e){return JSON.stringify(Array.from(new Set(e)).sort()).slice(1,-1)}const T=async(e,s,t)=>{const n=new Set,m=async o=>{const g=await p.promises.readFile(o,"utf-8");let c=!1;const w=g.replace(/(['"])__QWIK_ROUTER_(STATIC_PATHS|NOT_FOUND)_ARRAY__\1/g,(i,d,a)=>(c=!0,a==="STATIC_PATHS"?e:s));c&&await p.promises.writeFile(o,w)},h=async o=>{const g=await p.promises.readdir(o,{withFileTypes:!0});for(const c of g)if(c.isDirectory())await h(y.join(o,c.name));else if(c.name.endsWith("js")){const w=m(y.join(o,c.name)).finally(()=>{n.delete(w)});n.add(w)}};await h(t),await Promise.all(n)};function E(e){let s=null,t=null,n=null,m=null,h=null,o=!1,g;const c=[];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,g=i.command,o){if(s=i.plugins.find(d=>d.name==="vite-plugin-qwik-router"),!s)throw new Error("Missing vite-plugin-qwik-router");if(t=i.plugins.find(d=>d.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();g==="build"&&n&&i&&(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,d){if(o){c.length=0;for(const a in d){const l=d[a];l.type==="chunk"&&l.isEntry&&(c.push(a),l.name==="entry.ssr"?m=y.join(n,a):l.name==="@qwik-router-config"&&(h=y.join(n,a)))}}},closeBundle:{sequential:!0,async handler(){if(o&&n&&s?.api&&t?.api){const i=e.staticPaths||[],d=s.api.getRoutes(),a=s.api.getBasePathname(),l=t.api.getClientOutDir(),u=t.api.getClientPublicOutDir(),f=t.api.getAssetsDir(),S=t.api.getRootDir()??void 0;if(e.ssg!==null&&m&&h&&l&&u){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 v=await Promise.resolve().then(()=>require("./index-BqUeglYs.cjs")),P={maxWorkers:e.maxWorkers,basePathname:a,outDir:u,rootDir:S,...e.ssg,origin:r,renderModulePath:m,qwikRouterConfigModulePath:h},_=await v.generate(P);if(_.errors>0){const k=new Error(`Error while running SSG from "${e.name}" adapter. At least one path failed to render.`);k.stack=void 0,this.error(k)}i.push(..._.staticPaths)}await R(u,n,f?y.join(a,f):a,i,!!e.cleanStaticGenerated),typeof e.generate=="function"&&await e.generate({outputEntries:c,serverOutDir:n,clientOutDir:l,clientPublicOutDir:u,basePathname:a,routes:d,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(()=>{console.warn("SSG seems to be hanging after completion, forcing process to exit. Everything is likely fine."),process.exit(0)},5e3).unref(),e.ssg!==null&&setTimeout(()=>{process.exit(0)},5e3).unref()}}}}}function A(e={}){const s=process?.env;return E({name:"cloud-run",origin:s?.ORIGIN??s?.URL??"https://your-app-name.run.app",ssg:e.ssg,cleanStaticGenerated:!0,config(){return{build:{ssr:!0},publicDir:!1}}})}exports.cloudRunAdapter=A;
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const adapters_shared_vite = require("../../shared/vite/index.cjs");
+require("node:path");
+require("node:fs");
+require("../../../chunks/error-handler.cjs");
+function cloudRunAdapter(opts = {}) {
+  const env = process?.env;
+  return adapters_shared_vite.viteAdapter({
+    name: "cloud-run",
+    origin: env?.ORIGIN ?? env?.URL ?? "https://your-app-name.run.app",
+    ssg: opts.ssg,
+    cleanStaticGenerated: true,
+    config() {
+      return {
+        build: {
+          ssr: true
+        },
+        publicDir: false
+      };
+    }
+  });
+}
+exports.cloudRunAdapter = cloudRunAdapter;