one 1.1.483 → 1.1.485

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

@@ -25,39 +25,107 @@ __export(createApiServerlessFunction_exports, {
   createApiServerlessFunction: () => createApiServerlessFunction
 });
 module.exports = __toCommonJS(createApiServerlessFunction_exports);
-var import_node_path = require("node:path"), import_fs_extra = __toESM(require("fs-extra"), 1), import_vc_package_base = require("../config/vc-package-base"), import_vc_config_base = require("../config/vc-config-base");
-async function createApiServerlessFunction(pageName, code, oneOptionsRoot, postBuildLogs) {
+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"), import_vc_config_base = require("../config/vc-config-base"), import_getPathFromRoute = require("../getPathFromRoute");
+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")));
+    );
+    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);
+    ), 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(
+    ), 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_extra.default.writeJson((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}`,
+      `[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;
+}
 //# sourceMappingURL=createApiServerlessFunction.js.map

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../src/vercel/build/generate/createApiServerlessFunction.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA8B,sBAE9B,kBAAe,iCAEf,yBAA4C,sCAC5C,wBAA6C;AAI7C,eAAsB,4BACpB,UACA,MACA,gBACA,eACA;AACA,MAAI;AACF,kBAAc,KAAK,6DAA6D,QAAQ,EAAE;AAE1F,UAAM,iBAAa,uBAAK,gBAAgB,4BAA4B,QAAQ,OAAO;AACnF,UAAM,gBAAAA,QAAG,UAAU,UAAU,GAEzB,KAAK,SAAS,OAAO,MACvB,cAAc;AAAA,MACZ,wFAAwF,QAAQ;AAAA,IAClG,GACA,MAAM,gBAAAA,QAAG;AAAA,UACP,8BAAQ,uBAAK,gBAAgB,MAAM,MAAM,gBAAgB,OAAO,CAAC;AAAA,UACjE,8BAAQ,uBAAK,YAAY,gBAAgB,OAAO,CAAC;AAAA,IACnD;AAGF,UAAM,uBAAmB,8BAAQ,uBAAK,YAAY,QAAQ,CAAC;AAC3D,kBAAc;AAAA,MACZ,yEAAyE,gBAAgB;AAAA,IAC3F,GACA,MAAM,gBAAAA,QAAG,SAAK,8BAAQ,uBAAK,gBAAgB,QAAQ,OAAO,QAAQ,CAAC,GAAG,gBAAgB,GAEtF,MAAM,gBAAAA,QAAG,cAAU,8BAAQ,uBAAK,YAAY,YAAY,CAAC,CAAC;AAC1D,UAAM,yBAAqB,8BAAQ,uBAAK,YAAY,cAAc,UAAU,CAAC;AAC7E,kBAAc;AAAA,MACZ,yEAAyE,kBAAkB;AAAA,IAC7F,GACA,MAAM,gBAAAA,QAAG,UAAU,oBAAoB,IAAI;AAE3C,UAAM,0BAAsB,8BAAQ,uBAAK,YAAY,cAAc,CAAC;AACpE,yBAAc;AAAA,MACZ,2EAA2E,mBAAmB;AAAA,IAChG,GACA,MAAM,gBAAAA,QAAG,UAAU,qBAAqB,kDAA2B,GAEnE,cAAc;AAAA,MACZ,kFAA8E,uBAAK,YAAY,iBAAiB,CAAC;AAAA,IACnH,GAGO,gBAAAA,QAAG,cAAU,uBAAK,YAAY,iBAAiB,GAAG;AAAA,MACvD,GAAG;AAAA,MACH,SAAS;AAAA,IACX,CAAC;AAAA,EACH,SAAS,GAAG;AACV,YAAQ;AAAA,MACN,+EAA+E,QAAQ;AAAA,MACvF;AAAA,IACF;AAAA,EACF;AACF;",
-  "names": ["fs"]
+  "mappings": "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",
+  "names": ["import_fs_extra", "fs", "FSExtra", "parser", "traverse", "t", "generator"]
 }

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

@@ -26,25 +26,89 @@ __export(createApiServerlessFunction_exports, {
   createApiServerlessFunction: () => createApiServerlessFunction
 });
 module.exports = __toCommonJS(createApiServerlessFunction_exports);
-var import_node_path = require("node:path"), import_fs_extra = __toESM(require("fs-extra"), 1), import_vc_package_base = require("../config/vc-package-base"), import_vc_config_base = require("../config/vc-config-base");
-async function createApiServerlessFunction(pageName, code, oneOptionsRoot, postBuildLogs) {
+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"), import_vc_config_base = require("../config/vc-config-base"), import_getPathFromRoute = require("../getPathFromRoute");
+async function createApiServerlessFunction(route, code, oneOptionsRoot, postBuildLogs) {
   try {
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${pageName}`);
-    var 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"))));
+    var path = (0, import_getPathFromRoute.getPathFromRoute)(route);
+    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${path}`);
+    var 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}`);
+      var 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")));
+    }
     var 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}`);
+    var 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")));
     var 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));
     var 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) {
+  var ast = import_parser.default.parse(code, {
+    sourceType: "module"
+  });
+  import_traverse.default.default(ast, {
+    FunctionDeclaration(path) {
+      var { node } = path, functionNamesToHandle = [
+        "GET",
+        "POST",
+        "PUT",
+        "PATCH",
+        "DELETE",
+        "HEAD",
+        "OPTIONS"
+      ];
+      if (!(!node.id || !functionNamesToHandle.includes(node.id.name)) && !(node.extra && node.extra.isWrapper) && !(node.extra && node.extra.isWrapped)) {
+        var 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"),
+            /* Node.js global */
+            [
+              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")),
+              /* url.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)
+        ]));
+        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
+        ]);
+      }
+    }
+  });
+  var output = import_generator.default.default(ast, {}).code;
+  return output;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createApiServerlessFunction

package/dist/cjs/vercel/build/generate/createApiServerlessFunction.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../src/vercel/build/generate/createApiServerlessFunction.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;uBAA8B,sBAE9B,kBAAe,iCAEf,yBAA4C,sCAC5C,wBAA6C;AAI7C,eAAsBA,4BACpBC,UACAC,MACAC,gBACAC,eAAuB;AAEvB,MAAI;AACFA,kBAAcC,KAAK,6DAA6DJ,QAAAA,EAAU;AAE1F,QAAMK,iBAAaC,uBAAKJ,gBAAgB,4BAA4BF,QAAAA,OAAe;AACnF,UAAMO,gBAAAA,QAAGC,UAAUH,UAAAA,GAEfJ,KAAKQ,SAAS,OAAA,MAChBN,cAAcC,KACZ,wFAAwFJ,QAAAA,EAAU,GAEpG,MAAMO,gBAAAA,QAAGG,SACPC,8BAAQL,uBAAKJ,gBAAgB,MAAM,MAAM,gBAAgB,OAAA,CAAA,OACzDS,8BAAQL,uBAAKD,YAAY,gBAAgB,OAAA,CAAA,CAAA;AAI7C,QAAMO,uBAAmBD,8BAAQL,uBAAKD,YAAY,QAAA,CAAA;AAClDF,kBAAcC,KACZ,yEAAyEQ,gBAAAA,EAAkB,GAE7F,MAAML,gBAAAA,QAAGG,SAAKC,8BAAQL,uBAAKJ,gBAAgB,QAAQ,OAAO,QAAA,CAAA,GAAYU,gBAAAA,GAEtE,MAAML,gBAAAA,QAAGC,cAAUG,8BAAQL,uBAAKD,YAAY,YAAA,CAAA,CAAA;AAC5C,QAAMQ,yBAAqBF,8BAAQL,uBAAKD,YAAY,cAAc,UAAA,CAAA;AAClEF,kBAAcC,KACZ,yEAAyES,kBAAAA,EAAoB,GAE/F,MAAMN,gBAAAA,QAAGO,UAAUD,oBAAoBZ,IAAAA;AAEvC,QAAMc,0BAAsBJ,8BAAQL,uBAAKD,YAAY,cAAA,CAAA;AACrDF,yBAAcC,KACZ,2EAA2EW,mBAAAA,EAAqB,GAElG,MAAMR,gBAAAA,QAAGS,UAAUD,qBAAqBE,kDAAAA,GAExCd,cAAcC,KACZ,kFAA8EE,uBAAKD,YAAY,iBAAA,CAAA,EAAoB,GAI9GE,gBAAAA,QAAGW,cAAUZ,uBAAKD,YAAY,iBAAA,GAAoB;MACvD,GAAGc;MACHC,SAAS;IACX,CAAA;EACF,SAASC,GAAG;AACVC,YAAQC,MACN,+EAA+EvB,QAAAA,IAC/EqB,CAAAA;EAEJ;AACF;",
-  "names": ["createApiServerlessFunction", "pageName", "code", "oneOptionsRoot", "postBuildLogs", "push", "funcFolder", "join", "fs", "ensureDir", "includes", "copy", "resolve", "distAssetsFolder", "entrypointFilePath", "writeFile", "packageJsonFilePath", "writeJSON", "serverlessVercelPackageJson", "writeJson", "serverlessVercelNodeJsConfig", "handler", "e", "console", "error"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;uBAAuC,sBACvC,kBAAoB,iCACpB,iBAA4B,0BAE5B,gBAAmB,sCACnB,kBAAqB,wCACrB,eAAc,qCACd,mBAAsB,yCAEtBA,mBAAe,iCAGf,yBAA4C,sCAC5C,wBAA6C,qCAC7C,0BAAiC;AAIjC,eAAsBC,4BACpBC,OACAC,MACAC,gBACAC,eAAuB;AAEvB,MAAI;AACF,QAAMC,WAAOC,0CAAiBL,KAAAA;AAE9BG,kBAAcG,KAAK,6DAA6DF,IAAAA,EAAM;AAEtF,QAAMG,iBAAaC,uBAAKN,gBAAgB,4BAA4BE,IAAAA,OAAW;AAG/E,QAFA,MAAMK,iBAAAA,QAAGC,UAAUH,UAAAA,GAEfN,KAAKU,SAAS,OAAA,GAAU;AAC1BR,oBAAcG,KACZ,wFAAwFF,IAAAA,EAAM;AAEhG,UAAMQ,gBAAYC,8BAAQC,4BAAY,sBAAsBZ,cAAAA,CAAAA;AAC5D,YAAMO,iBAAAA,QAAGM,SAAKC,0BAAQJ,SAAAA,OAAYI,8BAAQR,uBAAKD,YAAY,gBAAgB,OAAA,CAAA,CAAA;IAC7E;AAEA,QAAMU,uBAAmBD,8BAAQR,uBAAKD,YAAY,QAAA,CAAA;AAClDJ,kBAAcG,KACZ,yEAAyEW,gBAAAA,EAAkB;AAE7F,QAAMC,yBAAqBF,8BAAQR,uBAAKN,gBAAgB,QAAQ,OAAO,QAAA,CAAA;AACvE,IAAI,MAAMiB,gBAAAA,QAAQC,WAAWF,kBAAAA,KAC3B,MAAMT,iBAAAA,QAAGM,KAAKG,oBAAoBD,gBAAAA,GAGpC,MAAMR,iBAAAA,QAAGC,cAAUM,8BAAQR,uBAAKD,YAAY,YAAA,CAAA,CAAA;AAC5C,QAAMc,yBAAqBL,8BAAQR,uBAAKD,YAAY,cAAc,UAAA,CAAA;AAClEJ,kBAAcG,KACZ,yEAAyEe,kBAAAA,EAAoB,GAE/F,MAAMZ,iBAAAA,QAAGa,UAAUD,oBAAoBE,qBAAqBtB,IAAAA,CAAAA;AAE5D,QAAMuB,0BAAsBR,8BAAQR,uBAAKD,YAAY,cAAA,CAAA;AACrDJ,yBAAcG,KACZ,2EAA2EkB,mBAAAA,EAAqB,GAElG,MAAMf,iBAAAA,QAAGgB,UAAUD,qBAAqBE,kDAAAA,GAExCvB,cAAcG,KACZ,kFAA8EE,uBAAKD,YAAY,iBAAA,CAAA,EAAoB,GAI9GE,iBAAAA,QAAGkB,cAAUnB,uBAAKD,YAAY,iBAAA,GAAoB;MACvD,GAAGqB;MACHC,SAAS;IACX,CAAA;EACF,SAASC,GAAG;AACVC,YAAQC,MACN,+EAA+EhC,MAAMiC,IAAI,IACzFH,CAAAA;EAEJ;AACF;AAOA,SAASP,qBAAqBtB,MAAI;AAChC,MAAMiC,MAAMC,cAAAA,QAAOC,MAAMnC,MAAM;IAC7BoC,YAAY;EACd,CAAA;AAGGC,kBAAAA,QAAiBC,QAA4BL,KAAK;IACnDM,oBAAoBpC,MAAI;AACtB,UAAM,EAAEqC,KAAI,IAAKrC,MAEXsC,wBAAwB;QAC5B;QACA;QACA;QACA;QACA;QACA;QACA;;AAIF,UAAI,GAACD,KAAKE,MAAM,CAACD,sBAAsB/B,SAAS8B,KAAKE,GAAGC,IAAI,MAGxDH,OAAKI,SAASJ,KAAKI,MAAMC,cACzBL,OAAKI,SAASJ,KAAKI,MAAME,YAE7B;YAAMC,eAAe,QAAQP,KAAKE,GAAGC,IAAI,IAEnCK,mBAAmBC,aAAAA,QAAEC,oBACzBD,aAAAA,QAAEE,WAAWJ,YAAAA,GACbP,KAAKY,QACLZ,KAAKa,MACLb,KAAKc,WACLd,KAAKe,KAAK,GAINC,oBAAoBP,aAAAA,QAAEE,WAAW,SAAA,GACjCM,gBAAgB;UAACD;WAGjBE,gBAAgBT,aAAAA,QAAEE,WAAW,KAAA,GAE7BQ,mBAAmBV,aAAAA,QAAEE,WAAW,QAAA,GAEhCS,UAAUX,aAAAA,QAAEY,oBAAoB,SAAS;UAC7CZ,aAAAA,QAAEa,mBACAJ,eACAT,aAAAA,QAAEc;YAAcd,aAAAA,QAAEE,WAAW,KAAA;;YAA6B;cACxDF,aAAAA,QAAEe,iBAAiBR,mBAAmBP,aAAAA,QAAEE,WAAW,KAAA,CAAA;;UACpD,CAAA;SAEJ,GAEKc,aAAahB,aAAAA,QAAEY,oBAAoB,SAAS;UAChDZ,aAAAA,QAAEa,mBACAH,kBACAV,aAAAA,QAAEiB,eACAjB,aAAAA,QAAEe,iBAAiBf,aAAAA,QAAEE,WAAW,QAAA,GAAWF,aAAAA,QAAEE,WAAW,aAAA,CAAA,GACxD;YACEF,aAAAA,QAAEiB,eACAjB,aAAAA,QAAEe;cACAf,aAAAA,QAAEe,iBACAN,eACAT,aAAAA,QAAEE,WAAW,cAAA,CAAA;;cAEfF,aAAAA,QAAEE,WAAW,SAAA;YAAA,GAEf,CAAA,CAAE;WAEL,CAAA;SAGN,GAEKgB,sBAAsBlB,aAAAA,QAAEiB,eAAejB,aAAAA,QAAEE,WAAWJ,YAAAA,GAAe;UACvES;UACAP,aAAAA,QAAEmB,iBAAiB;YAACnB,aAAAA,QAAEoB,eAAepB,aAAAA,QAAEE,WAAW,QAAA,GAAWQ,gBAAAA;WAAkB;SAChF,GAEKW,kBAAkBrB,aAAAA,QAAEC,oBACxBD,aAAAA,QAAEE,WAAWX,KAAKE,GAAGC,OAAO,EAAA,GAC5Bc,eACAR,aAAAA,QAAEsB,eAAe;UAACX;UAASK;UAAYhB,aAAAA,QAAEuB,gBAAgBL,mBAAAA;SAAqB,CAAA;AAMhF3B,aAAKI,QAAQJ,KAAKI,SAAS,CAAC,GAC5BJ,KAAKI,MAAME,YAAY,IAEvBwB,gBAAgB1B,QAAQ0B,gBAAgB1B,SAAS,CAAC,GAClD0B,gBAAgB1B,MAAMC,YAAY,IAE9B1C,KAAKsE,WAAWC,yBAAwB,IAC1CvE,KAAKwE,oBAAoB;UAAC3B;UAAkBC,aAAAA,QAAE2B,uBAAuBN,iBAAiB,CAAA,CAAE;SAAE,IAE1FnE,KAAKwE,oBAAoB;UAAC3B;UAAkBsB;SAAgB;;IAEhE;EACF,CAAA;AAGA,MAAMO,SAAWvB,iBAAAA,QAAkBhB,QAA6BL,KAAK,CAAC,CAAA,EAAGjC;AACzE,SAAO6E;AACT;",
+  "names": ["import_fs_extra", "createApiServerlessFunction", "route", "code", "oneOptionsRoot", "postBuildLogs", "path", "getPathFromRoute", "push", "funcFolder", "join", "fs", "ensureDir", "includes", "reactPath", "dirname", "resolvePath", "copy", "resolve", "distAssetsFolder", "sourceAssetsFolder", "FSExtra", "pathExists", "entrypointFilePath", "writeFile", "wrapHandlerFunctions", "packageJsonFilePath", "writeJSON", "serverlessVercelPackageJson", "writeJson", "serverlessVercelNodeJsConfig", "handler", "e", "console", "error", "file", "ast", "parser", "parse", "sourceType", "traverse", "default", "FunctionDeclaration", "node", "functionNamesToHandle", "id", "name", "extra", "isWrapper", "isWrapped", "originalName", "originalFunction", "t", "functionDeclaration", "identifier", "params", "body", "generator", "async", "requestIdentifier", "wrapperParams", "urlIdentifier", "paramsIdentifier", "urlDecl", "variableDeclaration", "variableDeclarator", "newExpression", "memberExpression", "paramsDecl", "callExpression", "callOrigFnStatement", "objectExpression", "objectProperty", "wrapperFunction", "blockStatement", "returnStatement", "parentPath", "isExportNamedDeclaration", "replaceWithMultiple", "exportNamedDeclaration", "output"]
 }

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

@@ -37,12 +37,14 @@ module.exports = __toCommonJS(createSsrServerlessFunction_exports);
 var import_fs_extra = __toESM(require("fs-extra"), 1),
   import_node_path = require("node:path"),
   import_vc_config_base = require("../config/vc-config-base.cjs"),
-  import_vc_package_base = require("../config/vc-package-base.cjs");
-async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot, postBuildLogs) {
+  import_vc_package_base = require("../config/vc-package-base.cjs"),
+  import_getPathFromRoute = require("../getPathFromRoute.cjs");
+async function createSsrServerlessFunction(route, buildInfo, oneOptionsRoot, postBuildLogs) {
   try {
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${pageName}`);
+    const path = (0, import_getPathFromRoute.getPathFromRoute)(route);
+    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] path: ${path}`);
     const buildInfoAsString = JSON.stringify(buildInfo),
-      funcFolder = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, `.vercel/output/functions/${pageName}.func`));
+      funcFolder = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, `.vercel/output/functions/${path}.func`));
     await import_fs_extra.default.ensureDir(funcFolder);
     const distServerFrom = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", "server")),
       distServerTo = (0, import_node_path.resolve)((0, import_node_path.join)(funcFolder, "server"));
@@ -51,6 +53,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
     postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] writing entrypoint to ${entrypointFilePath}`), await import_fs_extra.default.writeFile(entrypointFilePath, `
   const buildInfoConfig = await import('../buildInfo.js');
   const entry = await import('../server/_virtual_one-entry.js');
+  const routeFile = ${JSON.stringify(route.file)}
 
   const handler = async (req, res) => {
     // console.debug("req.url", req.url);
@@ -60,7 +63,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
       params: Object.fromEntries(url.searchParams.entries())
     }
     const postfix = url.pathname.endsWith('/') ? 'index.tsx' : '+ssr.tsx';
-    const routeFile = \`.\${url.pathname}\${postfix}\`;
+    // const routeFile = \`.\${url.pathname}\${postfix}\`;
     let route = buildInfoConfig.default.routeToBuildInfo[routeFile];
 
     // If we cannot find the route by direct match, try to find it by looking it up in the
@@ -106,6 +109,6 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
       }
     });
   } 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);
   }
 }

package/dist/cjs/vercel/build/generate/createSsrServerlessFunction.js

@@ -25,11 +25,12 @@ __export(createSsrServerlessFunction_exports, {
   createSsrServerlessFunction: () => createSsrServerlessFunction
 });
 module.exports = __toCommonJS(createSsrServerlessFunction_exports);
-var import_fs_extra = __toESM(require("fs-extra"), 1), import_node_path = require("node:path"), import_vc_config_base = require("../config/vc-config-base"), import_vc_package_base = require("../config/vc-package-base");
-async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot, postBuildLogs) {
+var import_fs_extra = __toESM(require("fs-extra"), 1), import_node_path = require("node:path"), import_vc_config_base = require("../config/vc-config-base"), import_vc_package_base = require("../config/vc-package-base"), import_getPathFromRoute = require("../getPathFromRoute");
+async function createSsrServerlessFunction(route, buildInfo, oneOptionsRoot, postBuildLogs) {
   try {
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${pageName}`);
-    const buildInfoAsString = JSON.stringify(buildInfo), funcFolder = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, `.vercel/output/functions/${pageName}.func`));
+    const path = (0, import_getPathFromRoute.getPathFromRoute)(route);
+    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] path: ${path}`);
+    const buildInfoAsString = JSON.stringify(buildInfo), funcFolder = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, `.vercel/output/functions/${path}.func`));
     await import_fs_extra.default.ensureDir(funcFolder);
     const distServerFrom = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", "server")), distServerTo = (0, import_node_path.resolve)((0, import_node_path.join)(funcFolder, "server"));
     await import_fs_extra.default.ensureDir(distServerTo), postBuildLogs.push(
@@ -43,6 +44,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
       `
   const buildInfoConfig = await import('../buildInfo.js');
   const entry = await import('../server/_virtual_one-entry.js');
+  const routeFile = ${JSON.stringify(route.file)}
 
   const handler = async (req, res) => {
     // console.debug("req.url", req.url);
@@ -52,7 +54,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
       params: Object.fromEntries(url.searchParams.entries())
     }
     const postfix = url.pathname.endsWith('/') ? 'index.tsx' : '+ssr.tsx';
-    const routeFile = \`.\${url.pathname}\${postfix}\`;
+    // const routeFile = \`.\${url.pathname}\${postfix}\`;
     let route = buildInfoConfig.default.routeToBuildInfo[routeFile];
 
     // If we cannot find the route by direct match, try to find it by looking it up in the
@@ -104,7 +106,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
     });
   } catch (e) {
     console.error(
-      `[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${pageName}`,
+      `[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${route.file}`,
       e
     );
   }

package/dist/cjs/vercel/build/generate/createSsrServerlessFunction.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAe,iCACf,mBAA8B,sBAC9B,wBAA6C,qCAC7C,yBAA4C;AAK5C,eAAsB,4BACpB,UACA,WACA,gBACA,eACA;AACA,MAAI;AACF,kBAAc,KAAK,6DAA6D,QAAQ,EAAE;AAE1F,UAAM,oBAAoB,KAAK,UAAU,SAAS,GAC5C,iBAAa,8BAAQ,uBAAK,gBAAgB,4BAA4B,QAAQ,OAAO,CAAC;AAC5F,UAAM,gBAAAA,QAAG,UAAU,UAAU;AAE7B,UAAM,qBAAiB,8BAAQ,uBAAK,gBAAgB,QAAQ,QAAQ,CAAC,GAC/D,mBAAe,8BAAQ,uBAAK,YAAY,QAAQ,CAAC;AACvD,UAAM,gBAAAA,QAAG,UAAU,YAAY,GAC/B,cAAc;AAAA,MACZ,+EAA+E,cAAc,OAAO,YAAY;AAAA,IAClH,GACA,MAAM,gBAAAA,QAAG,KAAK,gBAAgB,YAAY,GAE1C,cAAc,KAAK,wEAAwE,GAC3F,MAAM,gBAAAA,QAAG,cAAU,uBAAK,YAAY,cAAc,GAAG,kBAAkB,iBAAiB,EAAE,GAE1F,MAAM,gBAAAA,QAAG,cAAU,uBAAK,YAAY,YAAY,CAAC;AACjD,UAAM,yBAAqB,8BAAQ,uBAAK,YAAY,cAAc,UAAU,CAAC;AAC7E,kBAAc;AAAA,MACZ,yEAAyE,kBAAkB;AAAA,IAC7F,GACA,MAAM,gBAAAA,QAAG;AAAA,MACP;AAAA,MACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IA8CF;AAEA,UAAM,0BAAsB,8BAAQ,uBAAK,YAAY,cAAc,CAAC;AACpE,kBAAc;AAAA,MACZ,2EAA2E,mBAAmB;AAAA,IAChG,GACA,MAAM,gBAAAA,QAAG,UAAU,qBAAqB,kDAA2B;AAInE,UAAM,uBAAmB,8BAAQ,uBAAK,YAAY,iBAAiB,CAAC;AACpE,yBAAc;AAAA,MACZ,8EAA8E,gBAAgB;AAAA,IAChG,GACO,gBAAAA,QAAG,UAAU,kBAAkB;AAAA,MACpC,GAAG;AAAA,MACH,SAAS;AAAA,MACT,aAAa;AAAA,QACX,GAAG,mDAA6B;AAAA,QAChC,yBAAyB;AAAA,MAC3B;AAAA,IACF,CAAC;AAAA,EACH,SAAS,GAAG;AACV,YAAQ;AAAA,MACN,+EAA+E,QAAQ;AAAA,MACvF;AAAA,IACF;AAAA,EACF;AACF;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAe,iCACf,mBAA8B,sBAC9B,wBAA6C,qCAC7C,yBAA4C,sCAE5C,0BAAiC;AAIjC,eAAsB,4BACpB,OACA,WACA,gBACA,eACA;AACA,MAAI;AACF,UAAM,WAAO,0CAAiB,KAAK;AACnC,kBAAc,KAAK,yDAAyD,IAAI,EAAE;AAElF,UAAM,oBAAoB,KAAK,UAAU,SAAS,GAC5C,iBAAa,8BAAQ,uBAAK,gBAAgB,4BAA4B,IAAI,OAAO,CAAC;AACxF,UAAM,gBAAAA,QAAG,UAAU,UAAU;AAE7B,UAAM,qBAAiB,8BAAQ,uBAAK,gBAAgB,QAAQ,QAAQ,CAAC,GAC/D,mBAAe,8BAAQ,uBAAK,YAAY,QAAQ,CAAC;AACvD,UAAM,gBAAAA,QAAG,UAAU,YAAY,GAC/B,cAAc;AAAA,MACZ,+EAA+E,cAAc,OAAO,YAAY;AAAA,IAClH,GACA,MAAM,gBAAAA,QAAG,KAAK,gBAAgB,YAAY,GAE1C,cAAc,KAAK,wEAAwE,GAC3F,MAAM,gBAAAA,QAAG,cAAU,uBAAK,YAAY,cAAc,GAAG,kBAAkB,iBAAiB,EAAE,GAE1F,MAAM,gBAAAA,QAAG,cAAU,uBAAK,YAAY,YAAY,CAAC;AACjD,UAAM,yBAAqB,8BAAQ,uBAAK,YAAY,cAAc,UAAU,CAAC;AAC7E,kBAAc;AAAA,MACZ,yEAAyE,kBAAkB;AAAA,IAC7F,GACA,MAAM,gBAAAA,QAAG;AAAA,MACP;AAAA,MACA;AAAA;AAAA;AAAA,sBAGgB,KAAK,UAAU,MAAM,IAAI,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IA4C5C;AAEA,UAAM,0BAAsB,8BAAQ,uBAAK,YAAY,cAAc,CAAC;AACpE,kBAAc;AAAA,MACZ,2EAA2E,mBAAmB;AAAA,IAChG,GACA,MAAM,gBAAAA,QAAG,UAAU,qBAAqB,kDAA2B;AAInE,UAAM,uBAAmB,8BAAQ,uBAAK,YAAY,iBAAiB,CAAC;AACpE,yBAAc;AAAA,MACZ,8EAA8E,gBAAgB;AAAA,IAChG,GACO,gBAAAA,QAAG,UAAU,kBAAkB;AAAA,MACpC,GAAG;AAAA,MACH,SAAS;AAAA,MACT,aAAa;AAAA,QACX,GAAG,mDAA6B;AAAA,QAChC,yBAAyB;AAAA,MAC3B;AAAA,IACF,CAAC;AAAA,EACH,SAAS,GAAG;AACV,YAAQ;AAAA,MACN,+EAA+E,MAAM,IAAI;AAAA,MACzF;AAAA,IACF;AAAA,EACF;AACF;",
   "names": ["fs"]
 }

package/dist/cjs/vercel/build/generate/createSsrServerlessFunction.native.js

@@ -26,11 +26,12 @@ __export(createSsrServerlessFunction_exports, {
   createSsrServerlessFunction: () => createSsrServerlessFunction
 });
 module.exports = __toCommonJS(createSsrServerlessFunction_exports);
-var import_fs_extra = __toESM(require("fs-extra"), 1), import_node_path = require("node:path"), import_vc_config_base = require("../config/vc-config-base"), import_vc_package_base = require("../config/vc-package-base");
-async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot, postBuildLogs) {
+var import_fs_extra = __toESM(require("fs-extra"), 1), import_node_path = require("node:path"), import_vc_config_base = require("../config/vc-config-base"), import_vc_package_base = require("../config/vc-package-base"), import_getPathFromRoute = require("../getPathFromRoute");
+async function createSsrServerlessFunction(route, buildInfo, oneOptionsRoot, postBuildLogs) {
   try {
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${pageName}`);
-    var buildInfoAsString = JSON.stringify(buildInfo), funcFolder = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, `.vercel/output/functions/${pageName}.func`));
+    var path = (0, import_getPathFromRoute.getPathFromRoute)(route);
+    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] path: ${path}`);
+    var buildInfoAsString = JSON.stringify(buildInfo), funcFolder = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, `.vercel/output/functions/${path}.func`));
     await import_fs_extra.default.ensureDir(funcFolder);
     var distServerFrom = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", "server")), distServerTo = (0, import_node_path.resolve)((0, import_node_path.join)(funcFolder, "server"));
     await import_fs_extra.default.ensureDir(distServerTo), postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] copy server dist files from ${distServerFrom} to ${distServerTo}`), await import_fs_extra.default.copy(distServerFrom, distServerTo), postBuildLogs.push("[one.build][vercel.createSsrServerlessFunction] writing buildInfo.json"), await import_fs_extra.default.writeFile((0, import_node_path.join)(funcFolder, "buildInfo.js"), `export default ${buildInfoAsString}`), await import_fs_extra.default.ensureDir((0, import_node_path.join)(funcFolder, "entrypoint"));
@@ -38,6 +39,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
     postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] writing entrypoint to ${entrypointFilePath}`), await import_fs_extra.default.writeFile(entrypointFilePath, `
   const buildInfoConfig = await import('../buildInfo.js');
   const entry = await import('../server/_virtual_one-entry.js');
+  const routeFile = ${JSON.stringify(route.file)}
 
   const handler = async (req, res) => {
     // console.debug("req.url", req.url);
@@ -47,7 +49,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
       params: Object.fromEntries(url.searchParams.entries())
     }
     const postfix = url.pathname.endsWith('/') ? 'index.tsx' : '+ssr.tsx';
-    const routeFile = \`.\${url.pathname}\${postfix}\`;
+    // const routeFile = \`.\${url.pathname}\${postfix}\`;
     let route = buildInfoConfig.default.routeToBuildInfo[routeFile];
 
     // If we cannot find the route by direct match, try to find it by looking it up in the
@@ -93,7 +95,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
       }
     });
   } 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);
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/vercel/build/generate/createSsrServerlessFunction.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;sBAAe,iCACf,mBAA8B,sBAC9B,wBAA6C,qCAC7C,yBAA4C;AAK5C,eAAsBA,4BACpBC,UACAC,WACAC,gBACAC,eAAuB;AAEvB,MAAI;AACFA,kBAAcC,KAAK,6DAA6DJ,QAAAA,EAAU;AAE1F,QAAMK,oBAAoBC,KAAKC,UAAUN,SAAAA,GACnCO,iBAAaC,8BAAQC,uBAAKR,gBAAgB,4BAA4BF,QAAAA,OAAe,CAAA;AAC3F,UAAMW,gBAAAA,QAAGC,UAAUJ,UAAAA;AAEnB,QAAMK,qBAAiBJ,8BAAQC,uBAAKR,gBAAgB,QAAQ,QAAA,CAAA,GACtDY,mBAAeL,8BAAQC,uBAAKF,YAAY,QAAA,CAAA;AAC9C,UAAMG,gBAAAA,QAAGC,UAAUE,YAAAA,GACnBX,cAAcC,KACZ,+EAA+ES,cAAAA,OAAqBC,YAAAA,EAAc,GAEpH,MAAMH,gBAAAA,QAAGI,KAAKF,gBAAgBC,YAAAA,GAE9BX,cAAcC,KAAK,wEAAwE,GAC3F,MAAMO,gBAAAA,QAAGK,cAAUN,uBAAKF,YAAY,cAAA,GAAiB,kBAAkBH,iBAAAA,EAAmB,GAE1F,MAAMM,gBAAAA,QAAGC,cAAUF,uBAAKF,YAAY,YAAA,CAAA;AACpC,QAAMS,yBAAqBR,8BAAQC,uBAAKF,YAAY,cAAc,UAAA,CAAA;AAClEL,kBAAcC,KACZ,yEAAyEa,kBAAAA,EAAoB,GAE/F,MAAMN,gBAAAA,QAAGK,UACPC,oBACA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CH;AAGC,QAAMC,0BAAsBT,8BAAQC,uBAAKF,YAAY,cAAA,CAAA;AACrDL,kBAAcC,KACZ,2EAA2Ec,mBAAAA,EAAqB,GAElG,MAAMP,gBAAAA,QAAGQ,UAAUD,qBAAqBE,kDAAAA;AAIxC,QAAMC,uBAAmBZ,8BAAQC,uBAAKF,YAAY,iBAAA,CAAA;AAClDL,yBAAcC,KACZ,8EAA8EiB,gBAAAA,EAAkB,GAE3FV,gBAAAA,QAAGW,UAAUD,kBAAkB;MACpC,GAAGE;MACHC,SAAS;MACTC,aAAa;QACX,GAAGF,mDAA6BE;QAChCC,yBAAyB;MAC3B;IACF,CAAA;EACF,SAASC,GAAG;AACVC,YAAQC,MACN,+EAA+E7B,QAAAA,IAC/E2B,CAAAA;EAEJ;AACF;",
-  "names": ["createSsrServerlessFunction", "pageName", "buildInfo", "oneOptionsRoot", "postBuildLogs", "push", "buildInfoAsString", "JSON", "stringify", "funcFolder", "resolve", "join", "fs", "ensureDir", "distServerFrom", "distServerTo", "copy", "writeFile", "entrypointFilePath", "packageJsonFilePath", "writeJSON", "serverlessVercelPackageJson", "vcConfigFilePath", "writeJson", "serverlessVercelNodeJsConfig", "handler", "environment", "ONE_DEFAULT_RENDER_MODE", "e", "console", "error"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;sBAAe,iCACf,mBAA8B,sBAC9B,wBAA6C,qCAC7C,yBAA4C,sCAE5C,0BAAiC;AAIjC,eAAsBA,4BACpBC,OACAC,WACAC,gBACAC,eAAuB;AAEvB,MAAI;AACF,QAAMC,WAAOC,0CAAiBL,KAAAA;AAC9BG,kBAAcG,KAAK,yDAAyDF,IAAAA,EAAM;AAElF,QAAMG,oBAAoBC,KAAKC,UAAUR,SAAAA,GACnCS,iBAAaC,8BAAQC,uBAAKV,gBAAgB,4BAA4BE,IAAAA,OAAW,CAAA;AACvF,UAAMS,gBAAAA,QAAGC,UAAUJ,UAAAA;AAEnB,QAAMK,qBAAiBJ,8BAAQC,uBAAKV,gBAAgB,QAAQ,QAAA,CAAA,GACtDc,mBAAeL,8BAAQC,uBAAKF,YAAY,QAAA,CAAA;AAC9C,UAAMG,gBAAAA,QAAGC,UAAUE,YAAAA,GACnBb,cAAcG,KACZ,+EAA+ES,cAAAA,OAAqBC,YAAAA,EAAc,GAEpH,MAAMH,gBAAAA,QAAGI,KAAKF,gBAAgBC,YAAAA,GAE9Bb,cAAcG,KAAK,wEAAwE,GAC3F,MAAMO,gBAAAA,QAAGK,cAAUN,uBAAKF,YAAY,cAAA,GAAiB,kBAAkBH,iBAAAA,EAAmB,GAE1F,MAAMM,gBAAAA,QAAGC,cAAUF,uBAAKF,YAAY,YAAA,CAAA;AACpC,QAAMS,yBAAqBR,8BAAQC,uBAAKF,YAAY,cAAc,UAAA,CAAA;AAClEP,kBAAcG,KACZ,yEAAyEa,kBAAAA,EAAoB,GAE/F,MAAMN,gBAAAA,QAAGK,UACPC,oBACA;;;sBAGgBX,KAAKC,UAAUT,MAAMoB,IAAI,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2C5C;AAGC,QAAMC,0BAAsBV,8BAAQC,uBAAKF,YAAY,cAAA,CAAA;AACrDP,kBAAcG,KACZ,2EAA2Ee,mBAAAA,EAAqB,GAElG,MAAMR,gBAAAA,QAAGS,UAAUD,qBAAqBE,kDAAAA;AAIxC,QAAMC,uBAAmBb,8BAAQC,uBAAKF,YAAY,iBAAA,CAAA;AAClDP,yBAAcG,KACZ,8EAA8EkB,gBAAAA,EAAkB,GAE3FX,gBAAAA,QAAGY,UAAUD,kBAAkB;MACpC,GAAGE;MACHC,SAAS;MACTC,aAAa;QACX,GAAGF,mDAA6BE;QAChCC,yBAAyB;MAC3B;IACF,CAAA;EACF,SAASC,GAAG;AACVC,YAAQC,MACN,+EAA+EhC,MAAMoB,IAAI,IACzFU,CAAAA;EAEJ;AACF;",
+  "names": ["createSsrServerlessFunction", "route", "buildInfo", "oneOptionsRoot", "postBuildLogs", "path", "getPathFromRoute", "push", "buildInfoAsString", "JSON", "stringify", "funcFolder", "resolve", "join", "fs", "ensureDir", "distServerFrom", "distServerTo", "copy", "writeFile", "entrypointFilePath", "file", "packageJsonFilePath", "writeJSON", "serverlessVercelPackageJson", "vcConfigFilePath", "writeJson", "serverlessVercelNodeJsConfig", "handler", "environment", "ONE_DEFAULT_RENDER_MODE", "e", "console", "error"]
 }

package/dist/cjs/vercel/build/getPathFromRoute.cjs

@@ -0,0 +1,31 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+    for (var name in all) __defProp(target, name, {
+      get: all[name],
+      enumerable: !0
+    });
+  },
+  __copyProps = (to, from, except, desc) => {
+    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+      get: () => from[key],
+      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+    });
+    return to;
+  };
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: !0
+}), mod);
+var getPathFromRoute_exports = {};
+__export(getPathFromRoute_exports, {
+  getPathFromRoute: () => getPathFromRoute
+});
+module.exports = __toCommonJS(getPathFromRoute_exports);
+var import_getPathnameFromFilePath = require("../../utils/getPathnameFromFilePath.cjs");
+function getPathFromRoute(route) {
+  return (0, import_getPathnameFromFilePath.getPathnameFromFilePath)(route.file, {}, !1, {
+    preserveExtensions: !0
+  }).replace(/^\.\//, "/").replace(/\/+$/, "");
+}

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

@@ -0,0 +1,24 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: !0 });
+}, __copyProps = (to, from, except, desc) => {
+  if (from && typeof from == "object" || typeof from == "function")
+    for (let key of __getOwnPropNames(from))
+      !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
+var getPathFromRoute_exports = {};
+__export(getPathFromRoute_exports, {
+  getPathFromRoute: () => getPathFromRoute
+});
+module.exports = __toCommonJS(getPathFromRoute_exports);
+var import_getPathnameFromFilePath = require("../../utils/getPathnameFromFilePath");
+function getPathFromRoute(route) {
+  return (0, import_getPathnameFromFilePath.getPathnameFromFilePath)(route.file, {}, !1, { preserveExtensions: !0 }).replace(/^\.\//, "/").replace(/\/+$/, "");
+}
+//# sourceMappingURL=getPathFromRoute.js.map

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

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/vercel/build/getPathFromRoute.ts"],
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qCAAwC;AAGjC,SAAS,iBAAiB,OAA0B;AACzD,aAAO,wDAAwB,MAAM,MAAM,CAAC,GAAG,IAAO,EAAE,oBAAoB,GAAK,CAAC,EAC/E,QAAQ,SAAS,GAAG,EACpB,QAAQ,QAAQ,EAAE;AACvB;",
+  "names": []
+}

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

@@ -0,0 +1,31 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: !0 });
+}, __copyProps = (to, from, except, desc) => {
+  if (from && typeof from == "object" || typeof from == "function")
+    for (let key of __getOwnPropNames(from))
+      !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
+var getPathFromRoute_exports = {};
+__export(getPathFromRoute_exports, {
+  getPathFromRoute: () => getPathFromRoute
+});
+module.exports = __toCommonJS(getPathFromRoute_exports);
+var import_getPathnameFromFilePath = require("../../utils/getPathnameFromFilePath");
+function getPathFromRoute(route) {
+  return (0, import_getPathnameFromFilePath.getPathnameFromFilePath)(route.file, {}, !1, {
+    preserveExtensions: !0
+  }).replace(/^\.\//, "/").replace(/\/+$/, "");
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getPathFromRoute
+});
+//# sourceMappingURL=getPathFromRoute.js.map

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

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/vercel/build/getPathFromRoute.ts"],
+  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;qCAAwC;AAGjC,SAASA,iBAAiBC,OAAwB;AACvD,aAAOC,wDAAwBD,MAAME,MAAM,CAAC,GAAG,IAAO;IAAEC,oBAAoB;EAAK,CAAA,EAC9EC,QAAQ,SAAS,GAAA,EACjBA,QAAQ,QAAQ,EAAA;AACrB;",
+  "names": ["getPathFromRoute", "route", "getPathnameFromFilePath", "file", "preserveExtensions", "replace"]
+}

package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.cjs

@@ -34,7 +34,7 @@ function generateFileSystemRouteTypesPlugin(options) {
     apply: "serve",
     configureServer(server) {
       const appDir = (0, import_node_path.join)(process.cwd(), (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options)),
-        outFile = (0, import_node_path.join)(process.cwd(), "routes.d.ts"),
+        outFile = (0, import_node_path.dirname)(appDir) !== process.cwd() ? (console.warn("Seems that the router root has been customized and is in a nested folder. For now we will generate the routes.d.ts file beside the app folder. This behavior might be changed in the future."), (0, import_node_path.join)((0, import_node_path.dirname)(appDir), "routes.d.ts")) : (0, import_node_path.join)(process.cwd(), "routes.d.ts"),
         routerRoot = (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options),
         fileWatcherChangeListener = (0, import_perfect_debounce.debounce)(async (type, path) => {
           (type === "add" || type === "delete") && path.startsWith(appDir) && (0, import_generateRouteTypes.generateRouteTypes)(outFile, routerRoot);

package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.js

@@ -24,7 +24,7 @@ function generateFileSystemRouteTypesPlugin(options) {
     enforce: "post",
     apply: "serve",
     configureServer(server) {
-      const appDir = (0, import_node_path.join)(process.cwd(), (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options)), outFile = (0, import_node_path.join)(process.cwd(), "routes.d.ts"), routerRoot = (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options), fileWatcherChangeListener = (0, import_perfect_debounce.debounce)(async (type, path) => {
+      const appDir = (0, import_node_path.join)(process.cwd(), (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options)), outFile = (0, import_node_path.dirname)(appDir) !== process.cwd() ? (console.warn("Seems that the router root has been customized and is in a nested folder. For now we will generate the routes.d.ts file beside the app folder. This behavior might be changed in the future."), (0, import_node_path.join)((0, import_node_path.dirname)(appDir), "routes.d.ts")) : (0, import_node_path.join)(process.cwd(), "routes.d.ts"), routerRoot = (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options), fileWatcherChangeListener = (0, import_perfect_debounce.debounce)(async (type, path) => {
         (type === "add" || type === "delete") && path.startsWith(appDir) && (0, import_generateRouteTypes.generateRouteTypes)(outFile, routerRoot);
       }, 100);
       return server.watcher.addListener("all", fileWatcherChangeListener), () => {

package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAqB,sBACrB,0BAAyB,6BAGzB,4BAAmC,kDACnC,qCAA4C;AAErC,SAAS,mCAAmC,SAAoC;AACrF,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IACT,OAAO;AAAA,IAEP,gBAAgB,QAAQ;AACtB,YAAM,aAAS,uBAAK,QAAQ,IAAI,OAAG,gEAA4B,OAAO,CAAC,GACjE,cAAU,uBAAK,QAAQ,IAAI,GAAG,aAAa,GAE3C,iBAAa,gEAA4B,OAAO,GAGhD,gCAA4B,kCAAS,OAAO,MAAc,SAAiB;AAC/E,SAAI,SAAS,SAAS,SAAS,aACzB,KAAK,WAAW,MAAM,SAExB,8CAAmB,SAAS,UAAU;AAAA,MAG5C,GAAG,GAAG;AAEN,oBAAO,QAAQ,YAAY,OAAO,yBAAyB,GAEpD,MAAM;AAGX,0DAAmB,SAAS,UAAU;AAAA,MACxC;AAAA,IACF;AAAA,EACF;AACF;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA8B,sBAC9B,0BAAyB,6BAGzB,4BAAmC,kDACnC,qCAA4C;AAErC,SAAS,mCAAmC,SAAoC;AACrF,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IACT,OAAO;AAAA,IAEP,gBAAgB,QAAQ;AACtB,YAAM,aAAS,uBAAK,QAAQ,IAAI,OAAG,gEAA4B,OAAO,CAAC,GACjE,cACA,0BAAQ,MAAM,MAAM,QAAQ,IAAI,KAClC,QAAQ,KAAK,8LAA8L,OACpM,2BAAK,0BAAQ,MAAM,GAAG,aAAa,SAGrC,uBAAK,QAAQ,IAAI,GAAG,aAAa,GAGpC,iBAAa,gEAA4B,OAAO,GAGhD,gCAA4B,kCAAS,OAAO,MAAc,SAAiB;AAC/E,SAAI,SAAS,SAAS,SAAS,aACzB,KAAK,WAAW,MAAM,SAExB,8CAAmB,SAAS,UAAU;AAAA,MAG5C,GAAG,GAAG;AAEN,oBAAO,QAAQ,YAAY,OAAO,yBAAyB,GAEpD,MAAM;AAGX,0DAAmB,SAAS,UAAU;AAAA,MACxC;AAAA,IACF;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.native.js

@@ -25,7 +25,9 @@ function generateFileSystemRouteTypesPlugin(options) {
     enforce: "post",
     apply: "serve",
     configureServer(server) {
-      var appDir = (0, import_node_path.join)(process.cwd(), (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options)), outFile = (0, import_node_path.join)(process.cwd(), "routes.d.ts"), routerRoot = (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options), fileWatcherChangeListener = (0, import_perfect_debounce.debounce)(async function(type, path) {
+      var appDir = (0, import_node_path.join)(process.cwd(), (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options)), outFile = function() {
+        return (0, import_node_path.dirname)(appDir) !== process.cwd() ? (console.warn("Seems that the router root has been customized and is in a nested folder. For now we will generate the routes.d.ts file beside the app folder. This behavior might be changed in the future."), (0, import_node_path.join)((0, import_node_path.dirname)(appDir), "routes.d.ts")) : (0, import_node_path.join)(process.cwd(), "routes.d.ts");
+      }(), routerRoot = (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options), fileWatcherChangeListener = (0, import_perfect_debounce.debounce)(async function(type, path) {
         (type === "add" || type === "delete") && path.startsWith(appDir) && (0, import_generateRouteTypes.generateRouteTypes)(outFile, routerRoot);
       }, 100);
       return server.watcher.addListener("all", fileWatcherChangeListener), function() {