@qwik.dev/router 2.0.0-beta.10 → 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"),m=require("node:path"),v=require("@qwik.dev/router/middleware/request-handler");async function j(e,o,t,n,w){t&&!t.endsWith("/")&&(t+="/");const p=new Set([t+"/"+(globalThis.__QWIK_BUILD_DIR__||"build")+"/",t+"/"+(globalThis.__QWIK_ASSETS_DIR__||"assets")+"/"]),s=new Set(n.map(_)),f=[],g=async(a,l,c)=>{if(c=_(c),p.has(c))return;const y=m.join(a,l);if(l==="index.html"||l==="q-data.json"){!s.has(c)&&w&&await d.promises.unlink(y);return}if(l==="404.html"){const S=await d.promises.readFile(y,"utf-8");f.push([c,S]);return}const r=await d.promises.stat(y);r.isDirectory()?await i(y,c+l+"/"):r.isFile()&&s.add(c+l)},i=async(a,l)=>{const c=await d.promises.readdir(a);await Promise.all(c.map(y=>g(a,y,l)))};d.existsSync(e)&&await i(e,t);const u=O(t,f),h=R(s);await T(h,u,o)}function _(e){return e.endsWith("/")?e:e+"/"}function O(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=v.getErrorHtml(404,"Resource Not Found");o.push([e,t])}return JSON.stringify(o,null,2).slice(1,-1)}function R(e){return JSON.stringify(Array.from(new Set(e)).sort()).slice(1,-1)}const T=async(e,o,t)=>{const n=new Set,w=async s=>{const f=await d.promises.readFile(s,"utf-8");let g=!1;const i=f.replace(/(['"])__QWIK_ROUTER_(STATIC_PATHS|NOT_FOUND)_ARRAY__\1/g,(u,h,a)=>(g=!0,a==="STATIC_PATHS"?e:o));g&&await d.promises.writeFile(s,i)},p=async s=>{const f=await d.promises.readdir(s,{withFileTypes:!0});for(const g of f)if(g.isDirectory())await p(m.join(s,g.name));else if(g.name.endsWith("js")){const i=w(m.join(s,g.name)).finally(()=>{n.delete(i)});n.add(i)}};await p(t),await Promise.all(n)};function D(e){let o=null,t=null,n=null,w=null,p=null,s=!1;const f=[];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,s){if(o=i.plugins.find(u=>u.name==="vite-plugin-qwik-router"),!o)throw new Error("Missing vite-plugin-qwik-router");if(t=i.plugins.find(u=>u.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();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,u){if(s){f.length=0;for(const h in u){const a=u[h];a.type==="chunk"&&a.isEntry&&(f.push(h),a.name==="entry.ssr"?w=m.join(n,h):a.name==="@qwik-router-config"&&(p=m.join(n,h)))}}},closeBundle:{sequential:!0,async handler(){if(s&&n&&o?.api&&t?.api){const i=e.staticPaths||[],u=o.api.getRoutes(),h=o.api.getBasePathname(),a=t.api.getClientOutDir(),l=t.api.getClientPublicOutDir(),c=t.api.getAssetsDir(),y=t.api.getRootDir()??void 0;if(e.ssg!==null&&w&&p&&a&&l){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 S=await Promise.resolve().then(()=>require("./index-BqUeglYs.cjs")),q={maxWorkers:e.maxWorkers,basePathname:h,outDir:l,rootDir:y,...e.ssg,origin:r,renderModulePath:w,qwikRouterConfigModulePath:p},k=await S.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 j(l,n,c?m.join(h,c):h,i,!!e.cleanStaticGenerated),typeof e.generate=="function"&&await e.generate({outputEntries:f,serverOutDir:n,clientOutDir:a,clientPublicOutDir:l,basePathname:h,routes:u,assetsDir:c,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 b(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:w}){const p=m.join(n,"package.json"),s='{"type":"module"}';await d.promises.mkdir(n,{recursive:!0}),await d.promises.writeFile(p,s);const f=t.find(u=>u.indexOf("entry.azure-swa")===0),g=m.join(n,"function.json"),i=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(g,i),d.existsSync(m.join(w,"index.html"))||await d.promises.writeFile(m.join(w,"index.html"),"")}})}exports.azureSwaAdapter=b;
+"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,202 +1,24 @@
-import d from "node:fs";
-import { join as m } from "node:path";
-import { getErrorHtml as q } from "@qwik.dev/router/middleware/request-handler";
-async function R(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 = [], g = async (a, u, c) => {
-    if (c = P(c), p.has(c))
-      return;
-    const y = m(a, u);
-    if (u === "index.html" || u === "q-data.json") {
-      !s.has(c) && h && await d.promises.unlink(y);
-      return;
-    }
-    if (u === "404.html") {
-      const k = await d.promises.readFile(y, "utf-8");
-      f.push([c, k]);
-      return;
-    }
-    const n = await d.promises.stat(y);
-    n.isDirectory() ? await i(y, c + u + "/") : n.isFile() && s.add(c + u);
-  }, i = async (a, u) => {
-    const c = await d.promises.readdir(a);
-    await Promise.all(c.map((y) => g(a, y, u)));
-  };
-  d.existsSync(e) && await i(e, t);
-  const l = O(t, f), w = D(s);
-  await T(w, l, o);
-}
-function P(e) {
-  return e.endsWith("/") ? e : e + "/";
-}
-function O(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 = q(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 T = async (e, o, t) => {
-  const r = /* @__PURE__ */ new Set(), h = async (s) => {
-    const f = await d.promises.readFile(s, "utf-8");
-    let g = !1;
-    const i = f.replace(
-      /(['"])__QWIK_ROUTER_(STATIC_PATHS|NOT_FOUND)_ARRAY__\1/g,
-      (l, w, a) => (g = !0, a === "STATIC_PATHS" ? e : o)
-    );
-    g && await d.promises.writeFile(s, i);
-  }, p = async (s) => {
-    const f = await d.promises.readdir(s, { withFileTypes: !0 });
-    for (const g of f)
-      if (g.isDirectory())
-        await p(m(s, g.name));
-      else if (g.name.endsWith("js")) {
-        const i = h(m(s, g.name)).finally(() => {
-          r.delete(i);
-        });
-        r.add(i);
-      }
-  };
-  await p(t), await Promise.all(r);
-};
-function F(e) {
-  let o = null, t = null, r = null, h = null, p = null, s = !1;
-  const f = [];
-  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, s) {
-        if (o = i.plugins.find(
-          (l) => l.name === "vite-plugin-qwik-router"
-        ), !o)
-          throw new Error("Missing vite-plugin-qwik-router");
-        if (t = i.plugins.find(
-          (l) => l.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();
-        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, l) {
-      if (s) {
-        f.length = 0;
-        for (const w in l) {
-          const a = l[w];
-          a.type === "chunk" && a.isEntry && (f.push(w), a.name === "entry.ssr" ? h = m(r, w) : a.name === "@qwik-router-config" && (p = m(r, w)));
-        }
-      }
-    },
-    closeBundle: {
-      sequential: !0,
-      async handler() {
-        if (s && r && o?.api && t?.api) {
-          const i = e.staticPaths || [], l = o.api.getRoutes(), w = o.api.getBasePathname(), a = t.api.getClientOutDir(), u = t.api.getClientPublicOutDir(), c = t.api.getAssetsDir(), y = t.api.getRootDir() ?? void 0;
-          if (e.ssg !== null && h && p && a && u) {
-            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 k = await import("./index-CrwlB95_.js"), v = {
-              maxWorkers: e.maxWorkers,
-              basePathname: w,
-              outDir: u,
-              rootDir: y,
-              ...e.ssg,
-              origin: n,
-              renderModulePath: h,
-              qwikRouterConfigModulePath: p
-            }, S = await k.generate(v);
-            if (S.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(...S.staticPaths);
-          }
-          await R(
-            u,
-            r,
-            c ? m(w, c) : w,
-            i,
-            !!e.cleanStaticGenerated
-          ), typeof e.generate == "function" && await e.generate({
-            outputEntries: f,
-            serverOutDir: r,
-            clientOutDir: a,
-            clientPublicOutDir: u,
-            basePathname: w,
-            routes: l,
-            assetsDir: c,
-            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(() => {
-            process.exit(0);
-          }, 5e3).unref();
-        }
-      }
-    }
-  };
-}
-function I(e = {}) {
-  const o = process?.env;
-  return F({
+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 = m(r, "package.json"), s = '{"type":"module"}';
-      await d.promises.mkdir(r, { recursive: !0 }), await d.promises.writeFile(p, s);
-      const f = t.find(
-        (l) => l.indexOf("entry.azure-swa") === 0
-      ), g = m(r, "function.json"), i = 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: [
             {
@@ -222,15 +44,18 @@ function I(e = {}) {
               name: "$return"
             }
           ],
-          scriptFile: f
+          scriptFile: azureSwaModulePath
         },
         null,
         2
       );
-      await d.promises.writeFile(g, i), d.existsSync(m(h, "index.html")) || await d.promises.writeFile(m(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 {
-  I 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"),P=require("@qwik.dev/router/middleware/request-handler"),p=require("node:fs");async function b(e,n,t,s,m){t&&!t.endsWith("/")&&(t+="/");const h=new Set([t+"/"+(globalThis.__QWIK_BUILD_DIR__||"build")+"/",t+"/"+(globalThis.__QWIK_ASSETS_DIR__||"assets")+"/"]),o=new Set(s.map(v)),f=[],g=async(a,u,l)=>{if(l=v(l),h.has(l))return;const w=y.join(a,u);if(u==="index.html"||u==="q-data.json"){!o.has(l)&&m&&await p.promises.unlink(w);return}if(u==="404.html"){const S=await p.promises.readFile(w,"utf-8");f.push([l,S]);return}const r=await p.promises.stat(w);r.isDirectory()?await i(w,l+u+"/"):r.isFile()&&o.add(l+u)},i=async(a,u)=>{const l=await p.promises.readdir(a);await Promise.all(l.map(w=>g(a,w,u)))};p.existsSync(e)&&await i(e,t);const d=D(t,f),c=O(o);await R(c,d,n)}function v(e){return e.endsWith("/")?e:e+"/"}function D(e,n){if(n.sort((t,s)=>t[0].length>s[0].length?-1:t[0].length<s[0].length?1:t[0]<s[0]?-1:t[0]>s[0]?1:0),!n.some(t=>t[0]===e)){const t=P.getErrorHtml(404,"Resource Not Found");n.push([e,t])}return JSON.stringify(n,null,2).slice(1,-1)}function O(e){return JSON.stringify(Array.from(new Set(e)).sort()).slice(1,-1)}const R=async(e,n,t)=>{const s=new Set,m=async o=>{const f=await p.promises.readFile(o,"utf-8");let g=!1;const i=f.replace(/(['"])__QWIK_ROUTER_(STATIC_PATHS|NOT_FOUND)_ARRAY__\1/g,(d,c,a)=>(g=!0,a==="STATIC_PATHS"?e:n));g&&await p.promises.writeFile(o,i)},h=async o=>{const f=await p.promises.readdir(o,{withFileTypes:!0});for(const g of f)if(g.isDirectory())await h(y.join(o,g.name));else if(g.name.endsWith("js")){const i=m(y.join(o,g.name)).finally(()=>{s.delete(i)});s.add(i)}};await h(t),await Promise.all(s)};function T(e){let n=null,t=null,s=null,m=null,h=null,o=!1;const f=[];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(n=i.plugins.find(d=>d.name==="vite-plugin-qwik-router"),!n)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(s=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,d){if(o){f.length=0;for(const c in d){const a=d[c];a.type==="chunk"&&a.isEntry&&(f.push(c),a.name==="entry.ssr"?m=y.join(s,c):a.name==="@qwik-router-config"&&(h=y.join(s,c)))}}},closeBundle:{sequential:!0,async handler(){if(o&&s&&n?.api&&t?.api){const i=e.staticPaths||[],d=n.api.getRoutes(),c=n.api.getBasePathname(),a=t.api.getClientOutDir(),u=t.api.getClientPublicOutDir(),l=t.api.getAssetsDir(),w=t.api.getRootDir()??void 0;if(e.ssg!==null&&m&&h&&a&&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 S=await Promise.resolve().then(()=>require("./index-BqUeglYs.cjs")),q={maxWorkers:e.maxWorkers,basePathname:c,outDir:u,rootDir:w,...e.ssg,origin:r,renderModulePath:m,qwikRouterConfigModulePath:h},_=await S.generate(q);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 b(u,s,l?y.join(c,l):c,i,!!e.cleanStaticGenerated),typeof e.generate=="function"&&await e.generate({outputEntries:f,serverOutDir:s,clientOutDir:a,clientPublicOutDir:u,basePathname:c,routes:d,assetsDir:l,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 A(e={}){const n=process?.env;return T({name:e.name||"bun-server",origin:n?.ORIGIN??n?.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,209 +1,27 @@
-import { join as y } from "node:path";
-import { getErrorHtml as q } from "@qwik.dev/router/middleware/request-handler";
-import p from "node:fs";
-async function D(e, n, t, s, 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(s.map(v)), f = [], g = async (a, l, u) => {
-    if (u = v(u), w.has(u))
-      return;
-    const h = y(a, l);
-    if (l === "index.html" || l === "q-data.json") {
-      !o.has(u) && m && await p.promises.unlink(h);
-      return;
-    }
-    if (l === "404.html") {
-      const k = await p.promises.readFile(h, "utf-8");
-      f.push([u, k]);
-      return;
-    }
-    const r = await p.promises.stat(h);
-    r.isDirectory() ? await i(h, u + l + "/") : r.isFile() && o.add(u + l);
-  }, i = async (a, l) => {
-    const u = await p.promises.readdir(a);
-    await Promise.all(u.map((h) => g(a, h, l)));
-  };
-  p.existsSync(e) && await i(e, t);
-  const d = O(t, f), c = R(o);
-  await b(c, d, n);
-}
-function v(e) {
-  return e.endsWith("/") ? e : e + "/";
-}
-function O(e, n) {
-  if (n.sort((t, s) => t[0].length > s[0].length ? -1 : t[0].length < s[0].length ? 1 : t[0] < s[0] ? -1 : t[0] > s[0] ? 1 : 0), !n.some((t) => t[0] === e)) {
-    const t = q(404, "Resource Not Found");
-    n.push([e, t]);
-  }
-  return JSON.stringify(n, null, 2).slice(1, -1);
-}
-function R(e) {
-  return JSON.stringify(Array.from(new Set(e)).sort()).slice(1, -1);
-}
-const b = async (e, n, t) => {
-  const s = /* @__PURE__ */ new Set(), m = async (o) => {
-    const f = await p.promises.readFile(o, "utf-8");
-    let g = !1;
-    const i = f.replace(
-      /(['"])__QWIK_ROUTER_(STATIC_PATHS|NOT_FOUND)_ARRAY__\1/g,
-      (d, c, a) => (g = !0, a === "STATIC_PATHS" ? e : n)
-    );
-    g && await p.promises.writeFile(o, i);
-  }, w = async (o) => {
-    const f = await p.promises.readdir(o, { withFileTypes: !0 });
-    for (const g of f)
-      if (g.isDirectory())
-        await w(y(o, g.name));
-      else if (g.name.endsWith("js")) {
-        const i = m(y(o, g.name)).finally(() => {
-          s.delete(i);
-        });
-        s.add(i);
-      }
-  };
-  await w(t), await Promise.all(s);
-};
-function T(e) {
-  let n = null, t = null, s = null, m = null, w = null, o = !1;
-  const f = [];
-  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 (n = i.plugins.find(
-          (d) => d.name === "vite-plugin-qwik-router"
-        ), !n)
-          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 (s = 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, d) {
-      if (o) {
-        f.length = 0;
-        for (const c in d) {
-          const a = d[c];
-          a.type === "chunk" && a.isEntry && (f.push(c), a.name === "entry.ssr" ? m = y(s, c) : a.name === "@qwik-router-config" && (w = y(s, c)));
-        }
-      }
-    },
-    closeBundle: {
-      sequential: !0,
-      async handler() {
-        if (o && s && n?.api && t?.api) {
-          const i = e.staticPaths || [], d = n.api.getRoutes(), c = n.api.getBasePathname(), a = t.api.getClientOutDir(), l = t.api.getClientPublicOutDir(), u = t.api.getAssetsDir(), h = t.api.getRootDir() ?? void 0;
-          if (e.ssg !== null && m && w && a && l) {
-            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-CrwlB95_.js"), P = {
-              maxWorkers: e.maxWorkers,
-              basePathname: c,
-              outDir: l,
-              rootDir: h,
-              ...e.ssg,
-              origin: r,
-              renderModulePath: m,
-              qwikRouterConfigModulePath: w
-            }, S = await k.generate(P);
-            if (S.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(...S.staticPaths);
-          }
-          await D(
-            l,
-            s,
-            u ? y(c, u) : c,
-            i,
-            !!e.cleanStaticGenerated
-          ), typeof e.generate == "function" && await e.generate({
-            outputEntries: f,
-            serverOutDir: s,
-            clientOutDir: a,
-            clientPublicOutDir: l,
-            basePathname: c,
-            routes: d,
-            assetsDir: u,
-            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 C(e = {}) {
-  const n = process?.env;
-  return T({
-    name: e.name || "bun-server",
-    origin: n?.ORIGIN ?? n?.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 {
-  C 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"),v=require("@qwik.dev/router/middleware/request-handler"),p=require("node:fs");async function D(e,n,t,s,m){t&&!t.endsWith("/")&&(t+="/");const h=new Set([t+"/"+(globalThis.__QWIK_BUILD_DIR__||"build")+"/",t+"/"+(globalThis.__QWIK_ASSETS_DIR__||"assets")+"/"]),o=new Set(s.map(q)),f=[],g=async(a,u,l)=>{if(l=q(l),h.has(l))return;const w=y.join(a,u);if(u==="index.html"||u==="q-data.json"){!o.has(l)&&m&&await p.promises.unlink(w);return}if(u==="404.html"){const S=await p.promises.readFile(w,"utf-8");f.push([l,S]);return}const r=await p.promises.stat(w);r.isDirectory()?await i(w,l+u+"/"):r.isFile()&&o.add(l+u)},i=async(a,u)=>{const l=await p.promises.readdir(a);await Promise.all(l.map(w=>g(a,w,u)))};p.existsSync(e)&&await i(e,t);const d=R(t,f),c=O(o);await b(c,d,n)}function q(e){return e.endsWith("/")?e:e+"/"}function R(e,n){if(n.sort((t,s)=>t[0].length>s[0].length?-1:t[0].length<s[0].length?1:t[0]<s[0]?-1:t[0]>s[0]?1:0),!n.some(t=>t[0]===e)){const t=v.getErrorHtml(404,"Resource Not Found");n.push([e,t])}return JSON.stringify(n,null,2).slice(1,-1)}function O(e){return JSON.stringify(Array.from(new Set(e)).sort()).slice(1,-1)}const b=async(e,n,t)=>{const s=new Set,m=async o=>{const f=await p.promises.readFile(o,"utf-8");let g=!1;const i=f.replace(/(['"])__QWIK_ROUTER_(STATIC_PATHS|NOT_FOUND)_ARRAY__\1/g,(d,c,a)=>(g=!0,a==="STATIC_PATHS"?e:n));g&&await p.promises.writeFile(o,i)},h=async o=>{const f=await p.promises.readdir(o,{withFileTypes:!0});for(const g of f)if(g.isDirectory())await h(y.join(o,g.name));else if(g.name.endsWith("js")){const i=m(y.join(o,g.name)).finally(()=>{s.delete(i)});s.add(i)}};await h(t),await Promise.all(s)};function T(e){let n=null,t=null,s=null,m=null,h=null,o=!1;const f=[];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(n=i.plugins.find(d=>d.name==="vite-plugin-qwik-router"),!n)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(s=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,d){if(o){f.length=0;for(const c in d){const a=d[c];a.type==="chunk"&&a.isEntry&&(f.push(c),a.name==="entry.ssr"?m=y.join(s,c):a.name==="@qwik-router-config"&&(h=y.join(s,c)))}}},closeBundle:{sequential:!0,async handler(){if(o&&s&&n?.api&&t?.api){const i=e.staticPaths||[],d=n.api.getRoutes(),c=n.api.getBasePathname(),a=t.api.getClientOutDir(),u=t.api.getClientPublicOutDir(),l=t.api.getAssetsDir(),w=t.api.getRootDir()??void 0;if(e.ssg!==null&&m&&h&&a&&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 S=await Promise.resolve().then(()=>require("./index-BqUeglYs.cjs")),P={maxWorkers:e.maxWorkers,basePathname:c,outDir:u,rootDir:w,...e.ssg,origin:r,renderModulePath:m,qwikRouterConfigModulePath:h},_=await S.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 D(u,s,l?y.join(c,l):c,i,!!e.cleanStaticGenerated),typeof e.generate=="function"&&await e.generate({outputEntries:f,serverOutDir:s,clientOutDir:a,clientPublicOutDir:u,basePathname:c,routes:d,assetsDir:l,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 A(e={}){const n=process?.env;return T({name:"cloud-run",origin:n?.ORIGIN??n?.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;