one 1.1.483 → 1.1.485

package/dist/cjs/vercel/build/buildVercelOutputDirectory.cjs

@@ -39,9 +39,9 @@ var import_node_path = require("node:path"),
   import_ts_pattern = require("ts-pattern"),
   import_createApiServerlessFunction = require("./generate/createApiServerlessFunction.cjs"),
   import_createSsrServerlessFunction = require("./generate/createSsrServerlessFunction.cjs"),
-  import_vc_config_base = require("./config/vc-config-base.cjs"),
   import_vc_package_base = require("./config/vc-package-base.cjs"),
-  import_vc_build_output_config_base = require("./config/vc-build-output-config-base.cjs");
+  import_vc_build_output_config_base = require("./config/vc-build-output-config-base.cjs"),
+  import_getPathFromRoute = require("./getPathFromRoute.cjs");
 const {
   copy,
   ensureDir,
@@ -75,7 +75,7 @@ const buildVercelOutputDirectory = async ({
     }, o));
     for (const route of buildInfoForWriting.manifest.apiRoutes) {
       const compiledRoute = compiltedApiRoutes.find(compiled => compiled.facadeModuleId.includes(route.file.replace("./", "")));
-      compiledRoute ? (postBuildLogs.push(`[one.build][vercel] generating serverless function for apiRoute ${route.page}`), await (0, import_createApiServerlessFunction.createApiServerlessFunction)(route.page, compiledRoute.code, oneOptionsRoot, postBuildLogs), route.page !== route.urlCleanPath && (await (0, import_createApiServerlessFunction.createApiServerlessFunction)(route.urlCleanPath, compiledRoute.code, oneOptionsRoot, postBuildLogs))) : console.warn(`
+      compiledRoute ? (postBuildLogs.push(`[one.build][vercel] generating serverless function for apiRoute ${route.page}`), await (0, import_createApiServerlessFunction.createApiServerlessFunction)(route, compiledRoute.code, oneOptionsRoot, postBuildLogs)) : console.warn(`
  \u{1F528}[one.build][vercel] apiRoute missing code compilation for`, route.file);
     }
   }
@@ -84,7 +84,7 @@ const buildVercelOutputDirectory = async ({
   for (const route of buildInfoForWriting.manifest.pageRoutes) switch (route.type) {
     case "ssr":
       {
-        routeToBuildInfo[route.file] && (postBuildLogs.push(`[one.build][vercel] generate serverless function for ${route.page} with ${route.type}`), await (0, import_createSsrServerlessFunction.createSsrServerlessFunction)(route.page, buildInfoForWriting, oneOptionsRoot, postBuildLogs));
+        routeToBuildInfo[route.file] && (postBuildLogs.push(`[one.build][vercel] generate serverless function for ${route.page} with ${route.type}`), await (0, import_createSsrServerlessFunction.createSsrServerlessFunction)(route, buildInfoForWriting, oneOptionsRoot, postBuildLogs));
         break;
       }
     default:
@@ -92,18 +92,48 @@ const buildVercelOutputDirectory = async ({
   }
   const distMiddlewareDir = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", "middlewares"));
   if (existsSync(distMiddlewareDir)) {
-    const vercelMiddlewareDir = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, ".vercel/output/functions/_middleware"));
+    const vercelMiddlewareDir = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, ".vercel/output/functions/_middleware.func"));
     await ensureDir(vercelMiddlewareDir), postBuildLogs.push(`[one.build][vercel] copying middlewares from ${distMiddlewareDir} to ${vercelMiddlewareDir}`), await moveAllFiles((0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", "middlewares")), vercelMiddlewareDir);
     const vercelMiddlewarePackageJsonFilePath = (0, import_node_path.resolve)((0, import_node_path.join)(vercelMiddlewareDir, "index.js"));
     postBuildLogs.push(`[one.build][vercel] writing package.json to ${vercelMiddlewarePackageJsonFilePath}`), await writeJSON(vercelMiddlewarePackageJsonFilePath, import_vc_package_base.serverlessVercelPackageJson);
+    const wrappedMiddlewareEntryPointFilename = "_wrapped_middleware.js",
+      wrappedMiddlewareEntryPointPath = (0, import_node_path.resolve)((0, import_node_path.join)(vercelMiddlewareDir, wrappedMiddlewareEntryPointFilename));
+    await import_fs_extra.default.writeFile(wrappedMiddlewareEntryPointPath, `
+import middlewareFunction from './_middleware.js'
+
+const next = (e) => {
+  const t = new Headers(null == e ? void 0 : e.headers)
+  t.set('x-middleware-next', '1')
+  return new Response(null, { ...e, headers: t })
+}
+
+const wrappedMiddlewareFunction = (request, event) => {
+  return middlewareFunction({ request, event, next })
+}
+
+export { wrappedMiddlewareFunction as default }
+  `);
     const middlewareVercelConfigFilePath = (0, import_node_path.resolve)((0, import_node_path.join)(vercelMiddlewareDir, ".vc-config.json"));
     postBuildLogs.push(`[one.build][vercel] writing .vc-config.json to ${middlewareVercelConfigFilePath}`), await writeJSON(middlewareVercelConfigFilePath, {
-      ...import_vc_config_base.serverlessVercelNodeJsConfig,
-      handler: "_middleware.js"
+      runtime: "edge",
+      // Seems that middlewares only work with edge runtime
+      entrypoint: wrappedMiddlewareEntryPointFilename
     });
   }
   const vercelOutputStaticDir = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, ".vercel/output/static"));
   await ensureDir(vercelOutputStaticDir), postBuildLogs.push(`[one.build][vercel] copying static files from ${clientDir} to ${vercelOutputStaticDir}`), await moveAllFiles(clientDir, vercelOutputStaticDir);
   const vercelConfigFilePath = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, ".vercel/output", "config.json"));
-  await writeJSON(vercelConfigFilePath, import_vc_build_output_config_base.vercelBuildOutputConfig), postBuildLogs.push(`[one.build] wrote vercel config to: ${vercelConfigFilePath}`);
+  await writeJSON(vercelConfigFilePath, {
+    ...import_vc_build_output_config_base.vercelBuildOutputConfigBase,
+    routes: [...import_vc_build_output_config_base.vercelBuildOutputConfigBase.routes, ...(existsSync(distMiddlewareDir) ? [{
+      src: "/(.*)",
+      middlewarePath: "_middleware",
+      continue: !0
+    }] : []), {
+      handle: "rewrite"
+    }, ...buildInfoForWriting.manifest.allRoutes.filter(r => r.routeKeys && Object.keys(r.routeKeys).length > 0).map(r => ({
+      src: r.namedRegex,
+      dest: `${(0, import_getPathFromRoute.getPathFromRoute)(r)}?${Object.entries(r.routeKeys).map(([k, v]) => `${k}=$${v}`).join("&")}`
+    }))]
+  }), postBuildLogs.push(`[one.build] wrote vercel config to: ${vercelConfigFilePath}`);
 };

package/dist/cjs/vercel/build/buildVercelOutputDirectory.js

@@ -25,7 +25,7 @@ __export(buildVercelOutputDirectory_exports, {
   buildVercelOutputDirectory: () => buildVercelOutputDirectory
 });
 module.exports = __toCommonJS(buildVercelOutputDirectory_exports);
-var import_node_path = require("node:path"), import_fs_extra = __toESM(require("fs-extra"), 1), import_ts_pattern = require("ts-pattern"), import_createApiServerlessFunction = require("./generate/createApiServerlessFunction"), import_createSsrServerlessFunction = require("./generate/createSsrServerlessFunction"), import_vc_config_base = require("./config/vc-config-base"), import_vc_package_base = require("./config/vc-package-base"), import_vc_build_output_config_base = require("./config/vc-build-output-config-base");
+var import_node_path = require("node:path"), import_fs_extra = __toESM(require("fs-extra"), 1), import_ts_pattern = require("ts-pattern"), import_createApiServerlessFunction = require("./generate/createApiServerlessFunction"), import_createSsrServerlessFunction = require("./generate/createSsrServerlessFunction"), import_vc_package_base = require("./config/vc-package-base"), import_vc_build_output_config_base = require("./config/vc-build-output-config-base"), import_getPathFromRoute = require("./getPathFromRoute");
 const { copy, ensureDir, existsSync, writeJSON } = import_fs_extra.default;
 async function moveAllFiles(src, dest) {
   try {
@@ -50,17 +50,7 @@ const buildVercelOutputDirectory = async ({
       const compiledRoute = compiltedApiRoutes.find((compiled) => compiled.facadeModuleId.includes(route.file.replace("./", "")));
       compiledRoute ? (postBuildLogs.push(
         `[one.build][vercel] generating serverless function for apiRoute ${route.page}`
-      ), await (0, import_createApiServerlessFunction.createApiServerlessFunction)(
-        route.page,
-        compiledRoute.code,
-        oneOptionsRoot,
-        postBuildLogs
-      ), route.page !== route.urlCleanPath && await (0, import_createApiServerlessFunction.createApiServerlessFunction)(
-        route.urlCleanPath,
-        compiledRoute.code,
-        oneOptionsRoot,
-        postBuildLogs
-      )) : console.warn(`
+      ), await (0, import_createApiServerlessFunction.createApiServerlessFunction)(route, compiledRoute.code, oneOptionsRoot, postBuildLogs)) : console.warn(`
  \u{1F528}[one.build][vercel] apiRoute missing code compilation for`, route.file);
     }
   }
@@ -72,7 +62,7 @@ const buildVercelOutputDirectory = async ({
         routeToBuildInfo[route.file] && (postBuildLogs.push(
           `[one.build][vercel] generate serverless function for ${route.page} with ${route.type}`
         ), await (0, import_createSsrServerlessFunction.createSsrServerlessFunction)(
-          route.page,
+          route,
           buildInfoForWriting,
           oneOptionsRoot,
           postBuildLogs
@@ -85,7 +75,7 @@ const buildVercelOutputDirectory = async ({
   const distMiddlewareDir = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", "middlewares"));
   if (existsSync(distMiddlewareDir)) {
     const vercelMiddlewareDir = (0, import_node_path.resolve)(
-      (0, import_node_path.join)(oneOptionsRoot, ".vercel/output/functions/_middleware")
+      (0, import_node_path.join)(oneOptionsRoot, ".vercel/output/functions/_middleware.func")
     );
     await ensureDir(vercelMiddlewareDir), postBuildLogs.push(
       `[one.build][vercel] copying middlewares from ${distMiddlewareDir} to ${vercelMiddlewareDir}`
@@ -94,12 +84,34 @@ const buildVercelOutputDirectory = async ({
     postBuildLogs.push(
       `[one.build][vercel] writing package.json to ${vercelMiddlewarePackageJsonFilePath}`
     ), await writeJSON(vercelMiddlewarePackageJsonFilePath, import_vc_package_base.serverlessVercelPackageJson);
+    const wrappedMiddlewareEntryPointFilename = "_wrapped_middleware.js", wrappedMiddlewareEntryPointPath = (0, import_node_path.resolve)(
+      (0, import_node_path.join)(vercelMiddlewareDir, wrappedMiddlewareEntryPointFilename)
+    );
+    await import_fs_extra.default.writeFile(
+      wrappedMiddlewareEntryPointPath,
+      `
+import middlewareFunction from './_middleware.js'
+
+const next = (e) => {
+  const t = new Headers(null == e ? void 0 : e.headers)
+  t.set('x-middleware-next', '1')
+  return new Response(null, { ...e, headers: t })
+}
+
+const wrappedMiddlewareFunction = (request, event) => {
+  return middlewareFunction({ request, event, next })
+}
+
+export { wrappedMiddlewareFunction as default }
+  `
+    );
     const middlewareVercelConfigFilePath = (0, import_node_path.resolve)((0, import_node_path.join)(vercelMiddlewareDir, ".vc-config.json"));
     postBuildLogs.push(
       `[one.build][vercel] writing .vc-config.json to ${middlewareVercelConfigFilePath}`
     ), await writeJSON(middlewareVercelConfigFilePath, {
-      ...import_vc_config_base.serverlessVercelNodeJsConfig,
-      handler: "_middleware.js"
+      runtime: "edge",
+      // Seems that middlewares only work with edge runtime
+      entrypoint: wrappedMiddlewareEntryPointFilename
     });
   }
   const vercelOutputStaticDir = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, ".vercel/output/static"));
@@ -107,6 +119,25 @@ const buildVercelOutputDirectory = async ({
     `[one.build][vercel] copying static files from ${clientDir} to ${vercelOutputStaticDir}`
   ), await moveAllFiles(clientDir, vercelOutputStaticDir);
   const vercelConfigFilePath = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, ".vercel/output", "config.json"));
-  await writeJSON(vercelConfigFilePath, import_vc_build_output_config_base.vercelBuildOutputConfig), postBuildLogs.push(`[one.build] wrote vercel config to: ${vercelConfigFilePath}`);
+  await writeJSON(vercelConfigFilePath, {
+    ...import_vc_build_output_config_base.vercelBuildOutputConfigBase,
+    routes: [
+      ...import_vc_build_output_config_base.vercelBuildOutputConfigBase.routes,
+      ...existsSync(distMiddlewareDir) ? [
+        {
+          src: "/(.*)",
+          middlewarePath: "_middleware",
+          continue: !0
+        }
+      ] : [],
+      {
+        handle: "rewrite"
+      },
+      ...buildInfoForWriting.manifest.allRoutes.filter((r) => r.routeKeys && Object.keys(r.routeKeys).length > 0).map((r) => ({
+        src: r.namedRegex,
+        dest: `${(0, import_getPathFromRoute.getPathFromRoute)(r)}?${Object.entries(r.routeKeys).map(([k, v]) => `${k}=$${v}`).join("&")}`
+      }))
+    ]
+  }), postBuildLogs.push(`[one.build] wrote vercel config to: ${vercelConfigFilePath}`);
 };
 //# sourceMappingURL=buildVercelOutputDirectory.js.map

package/dist/cjs/vercel/build/buildVercelOutputDirectory.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/vercel/build/buildVercelOutputDirectory.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["FSExtra"]
 }

package/dist/cjs/vercel/build/buildVercelOutputDirectory.native.js

@@ -26,7 +26,7 @@ __export(buildVercelOutputDirectory_exports, {
   buildVercelOutputDirectory: () => buildVercelOutputDirectory
 });
 module.exports = __toCommonJS(buildVercelOutputDirectory_exports);
-var import_node_path = require("node:path"), import_fs_extra = __toESM(require("fs-extra"), 1), import_ts_pattern = require("ts-pattern"), import_createApiServerlessFunction = require("./generate/createApiServerlessFunction"), import_createSsrServerlessFunction = require("./generate/createSsrServerlessFunction"), import_vc_config_base = require("./config/vc-config-base"), import_vc_package_base = require("./config/vc-package-base"), import_vc_build_output_config_base = require("./config/vc-build-output-config-base"), { copy, ensureDir, existsSync, writeJSON } = import_fs_extra.default;
+var import_node_path = require("node:path"), import_fs_extra = __toESM(require("fs-extra"), 1), import_ts_pattern = require("ts-pattern"), import_createApiServerlessFunction = require("./generate/createApiServerlessFunction"), import_createSsrServerlessFunction = require("./generate/createSsrServerlessFunction"), import_vc_package_base = require("./config/vc-package-base"), import_vc_build_output_config_base = require("./config/vc-build-output-config-base"), import_getPathFromRoute = require("./getPathFromRoute"), { copy, ensureDir, existsSync, writeJSON } = import_fs_extra.default;
 async function moveAllFiles(src, dest) {
   try {
     await copy(src, dest, {
@@ -52,7 +52,7 @@ var buildVercelOutputDirectory = async function(param) {
           var flag = compiled.facadeModuleId.includes(route2.file.replace("./", ""));
           return flag;
         });
-        compiledRoute ? (postBuildLogs.push(`[one.build][vercel] generating serverless function for apiRoute ${route2.page}`), await (0, import_createApiServerlessFunction.createApiServerlessFunction)(route2.page, compiledRoute.code, oneOptionsRoot, postBuildLogs), route2.page !== route2.urlCleanPath && await (0, import_createApiServerlessFunction.createApiServerlessFunction)(route2.urlCleanPath, compiledRoute.code, oneOptionsRoot, postBuildLogs)) : console.warn(`
+        compiledRoute ? (postBuildLogs.push(`[one.build][vercel] generating serverless function for apiRoute ${route2.page}`), await (0, import_createApiServerlessFunction.createApiServerlessFunction)(route2, compiledRoute.code, oneOptionsRoot, postBuildLogs)) : console.warn(`
  \u{1F528}[one.build][vercel] apiRoute missing code compilation for`, route2.file);
       }, _iterator = buildInfoForWriting.manifest.apiRoutes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) await _loop();
     } catch (err) {
@@ -75,7 +75,7 @@ var buildVercelOutputDirectory = async function(param) {
       switch (route.type) {
         case "ssr": {
           var builtPageRoute = routeToBuildInfo[route.file];
-          builtPageRoute && (postBuildLogs.push(`[one.build][vercel] generate serverless function for ${route.page} with ${route.type}`), await (0, import_createSsrServerlessFunction.createSsrServerlessFunction)(route.page, buildInfoForWriting, oneOptionsRoot, postBuildLogs));
+          builtPageRoute && (postBuildLogs.push(`[one.build][vercel] generate serverless function for ${route.page} with ${route.type}`), await (0, import_createSsrServerlessFunction.createSsrServerlessFunction)(route, buildInfoForWriting, oneOptionsRoot, postBuildLogs));
           break;
         }
         default:
@@ -94,20 +94,63 @@ var buildVercelOutputDirectory = async function(param) {
   }
   var distMiddlewareDir = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", "middlewares"));
   if (existsSync(distMiddlewareDir)) {
-    var vercelMiddlewareDir = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, ".vercel/output/functions/_middleware"));
+    var vercelMiddlewareDir = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, ".vercel/output/functions/_middleware.func"));
     await ensureDir(vercelMiddlewareDir), postBuildLogs.push(`[one.build][vercel] copying middlewares from ${distMiddlewareDir} to ${vercelMiddlewareDir}`), await moveAllFiles((0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", "middlewares")), vercelMiddlewareDir);
     var vercelMiddlewarePackageJsonFilePath = (0, import_node_path.resolve)((0, import_node_path.join)(vercelMiddlewareDir, "index.js"));
     postBuildLogs.push(`[one.build][vercel] writing package.json to ${vercelMiddlewarePackageJsonFilePath}`), await writeJSON(vercelMiddlewarePackageJsonFilePath, import_vc_package_base.serverlessVercelPackageJson);
+    var wrappedMiddlewareEntryPointFilename = "_wrapped_middleware.js", wrappedMiddlewareEntryPointPath = (0, import_node_path.resolve)((0, import_node_path.join)(vercelMiddlewareDir, wrappedMiddlewareEntryPointFilename));
+    await import_fs_extra.default.writeFile(wrappedMiddlewareEntryPointPath, `
+import middlewareFunction from './_middleware.js'
+
+const next = (e) => {
+  const t = new Headers(null == e ? void 0 : e.headers)
+  t.set('x-middleware-next', '1')
+  return new Response(null, { ...e, headers: t })
+}
+
+const wrappedMiddlewareFunction = (request, event) => {
+  return middlewareFunction({ request, event, next })
+}
+
+export { wrappedMiddlewareFunction as default }
+  `);
     var middlewareVercelConfigFilePath = (0, import_node_path.resolve)((0, import_node_path.join)(vercelMiddlewareDir, ".vc-config.json"));
     postBuildLogs.push(`[one.build][vercel] writing .vc-config.json to ${middlewareVercelConfigFilePath}`), await writeJSON(middlewareVercelConfigFilePath, {
-      ...import_vc_config_base.serverlessVercelNodeJsConfig,
-      handler: "_middleware.js"
+      runtime: "edge",
+      // Seems that middlewares only work with edge runtime
+      entrypoint: wrappedMiddlewareEntryPointFilename
     });
   }
   var vercelOutputStaticDir = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, ".vercel/output/static"));
   await ensureDir(vercelOutputStaticDir), postBuildLogs.push(`[one.build][vercel] copying static files from ${clientDir} to ${vercelOutputStaticDir}`), await moveAllFiles(clientDir, vercelOutputStaticDir);
   var vercelConfigFilePath = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, ".vercel/output", "config.json"));
-  await writeJSON(vercelConfigFilePath, import_vc_build_output_config_base.vercelBuildOutputConfig), postBuildLogs.push(`[one.build] wrote vercel config to: ${vercelConfigFilePath}`);
+  await writeJSON(vercelConfigFilePath, {
+    ...import_vc_build_output_config_base.vercelBuildOutputConfigBase,
+    routes: [
+      ...import_vc_build_output_config_base.vercelBuildOutputConfigBase.routes,
+      ...existsSync(distMiddlewareDir) ? [
+        {
+          src: "/(.*)",
+          middlewarePath: "_middleware",
+          continue: !0
+        }
+      ] : [],
+      {
+        handle: "rewrite"
+      },
+      ...buildInfoForWriting.manifest.allRoutes.filter(function(r) {
+        return r.routeKeys && Object.keys(r.routeKeys).length > 0;
+      }).map(function(r) {
+        return {
+          src: r.namedRegex,
+          dest: `${(0, import_getPathFromRoute.getPathFromRoute)(r)}?${Object.entries(r.routeKeys).map(function(param2) {
+            var [k, v] = param2;
+            return `${k}=$${v}`;
+          }).join("&")}`
+        };
+      })
+    ]
+  }), postBuildLogs.push(`[one.build] wrote vercel config to: ${vercelConfigFilePath}`);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/vercel/build/buildVercelOutputDirectory.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/vercel/build/buildVercelOutputDirectory.ts"],
-  "mappings": "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",
-  "names": ["copy", "ensureDir", "existsSync", "writeJSON", "FSExtra", "moveAllFiles", "src", "dest", "overwrite", "errorOnExist", "err", "console", "error", "buildVercelOutputDirectory", "apiOutput", "buildInfoForWriting", "clientDir", "oneOptionsRoot", "postBuildLogs", "routeToBuildInfo", "compiltedApiRoutes", "output", "filter", "o", "isMatching", "code", "P", "string", "facadeModuleId", "route", "compiledRoute", "find", "compiled", "flag", "includes", "file", "replace", "push", "page", "createApiServerlessFunction", "urlCleanPath", "warn", "manifest", "apiRoutes", "vercelOutputFunctionsDir", "join", "pageRoutes", "type", "builtPageRoute", "createSsrServerlessFunction", "distMiddlewareDir", "resolve", "vercelMiddlewareDir", "vercelMiddlewarePackageJsonFilePath", "serverlessVercelPackageJson", "middlewareVercelConfigFilePath", "serverlessVercelNodeJsConfig", "handler", "vercelOutputStaticDir", "vercelConfigFilePath", "vercelBuildOutputConfig"]
+  "mappings": "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",
+  "names": ["copy", "ensureDir", "existsSync", "writeJSON", "FSExtra", "moveAllFiles", "src", "dest", "overwrite", "errorOnExist", "err", "console", "error", "buildVercelOutputDirectory", "apiOutput", "buildInfoForWriting", "clientDir", "oneOptionsRoot", "postBuildLogs", "routeToBuildInfo", "compiltedApiRoutes", "output", "filter", "o", "isMatching", "code", "P", "string", "facadeModuleId", "route", "compiledRoute", "find", "compiled", "flag", "includes", "file", "replace", "push", "page", "createApiServerlessFunction", "warn", "manifest", "apiRoutes", "vercelOutputFunctionsDir", "join", "pageRoutes", "type", "builtPageRoute", "createSsrServerlessFunction", "distMiddlewareDir", "resolve", "vercelMiddlewareDir", "vercelMiddlewarePackageJsonFilePath", "serverlessVercelPackageJson", "wrappedMiddlewareEntryPointFilename", "wrappedMiddlewareEntryPointPath", "writeFile", "middlewareVercelConfigFilePath", "runtime", "entrypoint", "vercelOutputStaticDir", "vercelConfigFilePath", "vercelBuildOutputConfigBase", "routes", "middlewarePath", "continue", "handle", "allRoutes", "r", "routeKeys", "Object", "keys", "length", "map", "namedRegex", "getPathFromRoute", "entries", "param", "k", "v"]
 }

package/dist/cjs/vercel/build/config/vc-build-output-config-base.cjs

@@ -20,14 +20,17 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
 }), mod);
 var vc_build_output_config_base_exports = {};
 __export(vc_build_output_config_base_exports, {
-  vercelBuildOutputConfig: () => vercelBuildOutputConfig
+  vercelBuildOutputConfigBase: () => vercelBuildOutputConfigBase
 });
 module.exports = __toCommonJS(vc_build_output_config_base_exports);
-const vercelBuildOutputConfig = {
+const vercelBuildOutputConfigBase = {
   version: 3,
   // https://vercel.com/docs/build-output-api/v3/configuration#routes
-  routes: [{
-    src: "/(.*)",
-    status: 200
-  }]
+  routes: [
+    // Not sure if we really need this, but having this seems to break the 'rewrite's we will add to handle dynamic routes.
+    // {
+    //   src: '/(.*)',
+    //   status: 200,
+    // },
+  ]
 };

package/dist/cjs/vercel/build/config/vc-build-output-config-base.js

@@ -14,17 +14,18 @@ var __export = (target, all) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
 var vc_build_output_config_base_exports = {};
 __export(vc_build_output_config_base_exports, {
-  vercelBuildOutputConfig: () => vercelBuildOutputConfig
+  vercelBuildOutputConfigBase: () => vercelBuildOutputConfigBase
 });
 module.exports = __toCommonJS(vc_build_output_config_base_exports);
-const vercelBuildOutputConfig = {
+const vercelBuildOutputConfigBase = {
   version: 3,
   // https://vercel.com/docs/build-output-api/v3/configuration#routes
   routes: [
-    {
-      src: "/(.*)",
-      status: 200
-    }
+    // Not sure if we really need this, but having this seems to break the 'rewrite's we will add to handle dynamic routes.
+    // {
+    //   src: '/(.*)',
+    //   status: 200,
+    // },
   ]
 };
 //# sourceMappingURL=vc-build-output-config-base.js.map

package/dist/cjs/vercel/build/config/vc-build-output-config-base.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../src/vercel/build/config/vc-build-output-config-base.ts"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEO,MAAM,0BAA0B;AAAA,EACrC,SAAS;AAAA;AAAA,EAET,QAAQ;AAAA,IACN;AAAA,MACE,KAAK;AAAA,MACL,QAAQ;AAAA,IACV;AAAA,EACF;AACF;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEO,MAAM,8BAA8B;AAAA,EACzC,SAAS;AAAA;AAAA,EAET,QAAQ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAMR;AACF;",
   "names": []
 }

package/dist/cjs/vercel/build/config/vc-build-output-config-base.native.js

@@ -15,21 +15,16 @@ var __export = (target, all) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
 var vc_build_output_config_base_exports = {};
 __export(vc_build_output_config_base_exports, {
-  vercelBuildOutputConfig: () => vercelBuildOutputConfig
+  vercelBuildOutputConfigBase: () => vercelBuildOutputConfigBase
 });
 module.exports = __toCommonJS(vc_build_output_config_base_exports);
-var vercelBuildOutputConfig = {
+var vercelBuildOutputConfigBase = {
   version: 3,
   // https://vercel.com/docs/build-output-api/v3/configuration#routes
-  routes: [
-    {
-      src: "/(.*)",
-      status: 200
-    }
-  ]
+  routes: []
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  vercelBuildOutputConfig
+  vercelBuildOutputConfigBase
 });
 //# sourceMappingURL=vc-build-output-config-base.js.map

package/dist/cjs/vercel/build/config/vc-build-output-config-base.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../src/vercel/build/config/vc-build-output-config-base.ts"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;AAEO,IAAMA,0BAA0B;EACrCC,SAAS;;EAETC,QAAQ;IACN;MACEC,KAAK;MACLC,QAAQ;IACV;;AAEJ;",
-  "names": ["vercelBuildOutputConfig", "version", "routes", "src", "status"]
+  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;AAEO,IAAMA,8BAA8B;EACzCC,SAAS;;EAETC,QAAQ,CAAA;AAOV;",
+  "names": ["vercelBuildOutputConfigBase", "version", "routes"]
 }

package/dist/cjs/vercel/build/generate/createApiServerlessFunction.cjs

@@ -36,23 +36,68 @@ __export(createApiServerlessFunction_exports, {
 module.exports = __toCommonJS(createApiServerlessFunction_exports);
 var import_node_path = require("node:path"),
   import_fs_extra = __toESM(require("fs-extra"), 1),
+  import_resolve = require("@vxrn/resolve"),
+  import_parser = __toESM(require("@babel/parser"), 1),
+  import_traverse = __toESM(require("@babel/traverse"), 1),
+  import_types = __toESM(require("@babel/types"), 1),
+  import_generator = __toESM(require("@babel/generator"), 1),
+  import_fs_extra2 = __toESM(require("fs-extra"), 1),
   import_vc_package_base = require("../config/vc-package-base.cjs"),
-  import_vc_config_base = require("../config/vc-config-base.cjs");
-async function createApiServerlessFunction(pageName, code, oneOptionsRoot, postBuildLogs) {
+  import_vc_config_base = require("../config/vc-config-base.cjs"),
+  import_getPathFromRoute = require("../getPathFromRoute.cjs");
+async function createApiServerlessFunction(route, code, oneOptionsRoot, postBuildLogs) {
   try {
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${pageName}`);
-    const funcFolder = (0, import_node_path.join)(oneOptionsRoot, `.vercel/output/functions/${pageName}.func`);
-    await import_fs_extra.default.ensureDir(funcFolder), code.includes("react") && (postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] detected react in depenency tree for ${pageName}`), await import_fs_extra.default.copy((0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "..", "..", "node_modules", "react")), (0, import_node_path.resolve)((0, import_node_path.join)(funcFolder, "node_modules", "react"))));
+    const path = (0, import_getPathFromRoute.getPathFromRoute)(route);
+    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${path}`);
+    const funcFolder = (0, import_node_path.join)(oneOptionsRoot, `.vercel/output/functions/${path}.func`);
+    if (await import_fs_extra2.default.ensureDir(funcFolder), code.includes("react")) {
+      postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] detected react in depenency tree for ${path}`);
+      const reactPath = (0, import_node_path.dirname)((0, import_resolve.resolvePath)("react/package.json", oneOptionsRoot));
+      await import_fs_extra2.default.copy((0, import_node_path.resolve)(reactPath), (0, import_node_path.resolve)((0, import_node_path.join)(funcFolder, "node_modules", "react")));
+    }
     const distAssetsFolder = (0, import_node_path.resolve)((0, import_node_path.join)(funcFolder, "assets"));
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] copy shared assets to ${distAssetsFolder}`), await import_fs_extra.default.copy((0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", "api", "assets")), distAssetsFolder), await import_fs_extra.default.ensureDir((0, import_node_path.resolve)((0, import_node_path.join)(funcFolder, "entrypoint")));
+    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] copy shared assets to ${distAssetsFolder}`);
+    const sourceAssetsFolder = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", "api", "assets"));
+    (await import_fs_extra.default.pathExists(sourceAssetsFolder)) && (await import_fs_extra2.default.copy(sourceAssetsFolder, distAssetsFolder)), await import_fs_extra2.default.ensureDir((0, import_node_path.resolve)((0, import_node_path.join)(funcFolder, "entrypoint")));
     const entrypointFilePath = (0, import_node_path.resolve)((0, import_node_path.join)(funcFolder, "entrypoint", "index.js"));
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] writing entrypoint to ${entrypointFilePath}`), await import_fs_extra.default.writeFile(entrypointFilePath, code);
+    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] writing entrypoint to ${entrypointFilePath}`), await import_fs_extra2.default.writeFile(entrypointFilePath, wrapHandlerFunctions(code));
     const packageJsonFilePath = (0, import_node_path.resolve)((0, import_node_path.join)(funcFolder, "package.json"));
-    return postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] writing package.json to ${packageJsonFilePath}`), await import_fs_extra.default.writeJSON(packageJsonFilePath, import_vc_package_base.serverlessVercelPackageJson), postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] writing .vc-config.json to ${(0, import_node_path.join)(funcFolder, ".vc-config.json")}`), import_fs_extra.default.writeJson((0, import_node_path.join)(funcFolder, ".vc-config.json"), {
+    return postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] writing package.json to ${packageJsonFilePath}`), await import_fs_extra2.default.writeJSON(packageJsonFilePath, import_vc_package_base.serverlessVercelPackageJson), postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] writing .vc-config.json to ${(0, import_node_path.join)(funcFolder, ".vc-config.json")}`), import_fs_extra2.default.writeJson((0, import_node_path.join)(funcFolder, ".vc-config.json"), {
       ...import_vc_config_base.serverlessVercelNodeJsConfig,
       handler: "entrypoint/index.js"
     });
   } catch (e) {
-    console.error(`[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${pageName}`, e);
+    console.error(`[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${route.file}`, e);
   }
+}
+function wrapHandlerFunctions(code) {
+  const ast = import_parser.default.parse(code, {
+    sourceType: "module"
+  });
+  return import_traverse.default.default(ast, {
+    FunctionDeclaration(path) {
+      const {
+          node
+        } = path,
+        functionNamesToHandle = ["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD", "OPTIONS"
+        // TODO: more possibilities?
+        ];
+      if (!node.id || !functionNamesToHandle.includes(node.id.name) || node.extra && node.extra.isWrapper || node.extra && node.extra.isWrapped) return;
+      const originalName = `orig_${node.id.name}`,
+        originalFunction = import_types.default.functionDeclaration(import_types.default.identifier(originalName), node.params, node.body, node.generator, node.async),
+        requestIdentifier = import_types.default.identifier("request"),
+        wrapperParams = [requestIdentifier],
+        urlIdentifier = import_types.default.identifier("url"),
+        paramsIdentifier = import_types.default.identifier("params"),
+        urlDecl = import_types.default.variableDeclaration("const", [import_types.default.variableDeclarator(urlIdentifier, import_types.default.newExpression(import_types.default.identifier("URL"), [import_types.default.memberExpression(requestIdentifier, import_types.default.identifier("url"))]))]),
+        paramsDecl = import_types.default.variableDeclaration("const", [import_types.default.variableDeclarator(paramsIdentifier, import_types.default.callExpression(import_types.default.memberExpression(import_types.default.identifier("Object"), import_types.default.identifier("fromEntries")), [import_types.default.callExpression(import_types.default.memberExpression(import_types.default.memberExpression(urlIdentifier, import_types.default.identifier("searchParams")), import_types.default.identifier("entries")), [])]))]),
+        callOrigFnStatement = import_types.default.callExpression(import_types.default.identifier(originalName), [requestIdentifier, import_types.default.objectExpression([import_types.default.objectProperty(import_types.default.identifier("params"), paramsIdentifier)])]),
+        wrapperFunction = import_types.default.functionDeclaration(import_types.default.identifier(node.id.name + ""), wrapperParams, import_types.default.blockStatement([urlDecl, paramsDecl, import_types.default.returnStatement(callOrigFnStatement)])
+        // No need to care if the wrapper function should be async,
+        // since we didn't use any await in the wrapper function, and we'll
+        // just return what the original function returns.
+        );
+      node.extra = node.extra || {}, node.extra.isWrapped = !0, wrapperFunction.extra = wrapperFunction.extra || {}, wrapperFunction.extra.isWrapper = !0, path.parentPath.isExportNamedDeclaration() ? path.replaceWithMultiple([originalFunction, import_types.default.exportNamedDeclaration(wrapperFunction, [])]) : path.replaceWithMultiple([originalFunction, wrapperFunction]);
+    }
+  }), import_generator.default.default(ast, {}).code;
 }