@modern-js/app-tools 2.3.1-alpha.2 → 2.5.0

package/dist/{js/node → cjs}/analyze/getServerRoutes.js

@@ -1,38 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -69,9 +40,10 @@ const applyBaseUrl = (baseUrl, routes) => {
     } else {
       return routes.map((route) => {
         const urlPath = (0, import_utils.urlJoin)(baseUrl, route.urlPath);
-        return __spreadProps(__spreadValues({}, route), {
+        return {
+          ...route,
           urlPath: urlPath === "/" ? urlPath : (0, import_utils.removeTailSlash)(urlPath)
-        });
+        };
       });
     }
   }
@@ -86,28 +58,34 @@ const applyRouteOptions = (original, routeOptions) => {
     if (Array.isArray(route)) {
       routes = route.map((url) => {
         if ((0, import_utils.isPlainObject)(url)) {
-          const _a2 = url, { path: urlPath } = _a2, other = __objRest(_a2, ["path"]);
-          return __spreadProps(__spreadValues(__spreadValues({}, original), other), {
+          const { path: urlPath, ...other } = url;
+          return {
+            ...original,
+            ...other,
             urlPath
-          });
+          };
         } else {
-          return __spreadProps(__spreadValues({}, original), {
+          return {
+            ...original,
             urlPath: url
-          });
+          };
         }
       });
     } else if ((0, import_utils.isPlainObject)(route)) {
-      const _a = route, { path: urlPath } = _a, other = __objRest(_a, ["path"]);
+      const { path: urlPath, ...other } = route;
       routes = [
-        __spreadProps(__spreadValues(__spreadValues({}, original), other), {
+        {
+          ...original,
+          ...other,
           urlPath
-        })
+        }
       ];
     } else {
       routes = [
-        __spreadProps(__spreadValues({}, original), {
+        {
+          ...original,
           urlPath: route
-        })
+        }
       ];
     }
   } else {
@@ -119,7 +97,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
   const {
     html: { disableHtmlFolder },
     output: { distPath: { html: htmlPath } = {} },
-    server: { baseUrl, routes, ssr, ssrByEntries }
+    server: { baseUrl, routes, ssr, ssrByEntries, worker }
   } = config;
   const { packageName } = appContext;
   let htmlRoutes = entrypoints.reduce(
@@ -131,6 +109,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
         packageName
       );
       const isSSR = Boolean(entryOptions);
+      const isWorker = Boolean(worker);
       const { resHeaders } = (routes == null ? void 0 : routes[entryName]) || {};
       let route = {
         urlPath: `/${entryName === import_utils.MAIN_ENTRY_NAME ? "" : entryName}`,
@@ -143,6 +122,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
         isSPA: true,
         isSSR,
         responseHeaders: resHeaders,
+        worker: isWorker ? `${import_utils.SERVER_WORKER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0,
         bundle: isSSR ? `${import_utils.SERVER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0
       };
       if (routes == null ? void 0 : routes.hasOwnProperty(entryName)) {

package/dist/cjs/analyze/index.js

@@ -0,0 +1,290 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var analyze_exports = {};
+__export(analyze_exports, {
+  default: () => analyze_default
+});
+module.exports = __toCommonJS(analyze_exports);
+var path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_lodash = require("@modern-js/utils/lodash");
+var import_printInstructions = require("../utils/printInstructions");
+var import_routes = require("../utils/routes");
+var import_config = require("../utils/config");
+var import_getSelectedEntries = require("../utils/getSelectedEntries");
+var import_config2 = require("../config");
+var import_builder = require("../builder");
+var import_utils2 = require("./utils");
+var import_constants = require("./constants");
+const debug = (0, import_utils.createDebugger)("plugin-analyze");
+var analyze_default = ({
+  bundler
+}) => ({
+  name: "@modern-js/plugin-analyze",
+  setup: (api) => {
+    let pagesDir = [];
+    let nestedRouteEntries = [];
+    let originEntrypoints = [];
+    return {
+      async prepare() {
+        var _a;
+        let appContext = api.useAppContext();
+        const resolvedConfig = api.useResolvedConfigContext();
+        const hookRunners = api.useHookRunners();
+        try {
+          import_utils.fs.emptydirSync(appContext.internalDirectory);
+        } catch {
+        }
+        const apiOnly = await (0, import_utils.isApiOnly)(
+          appContext.appDirectory,
+          (_a = resolvedConfig.source) == null ? void 0 : _a.entriesDir
+        );
+        await hookRunners.addRuntimeExports();
+        if (apiOnly) {
+          const { routes: routes2 } = await hookRunners.modifyServerRoutes({
+            routes: []
+          });
+          debug(`server routes: %o`, routes2);
+          appContext = {
+            ...appContext,
+            apiOnly,
+            serverRoutes: routes2
+          };
+          api.setAppContext(appContext);
+          return;
+        }
+        const [
+          { getBundleEntry },
+          { getServerRoutes },
+          { generateCode },
+          { getHtmlTemplate }
+        ] = await Promise.all([
+          Promise.resolve().then(() => __toESM(require("./getBundleEntry"))),
+          Promise.resolve().then(() => __toESM(require("./getServerRoutes"))),
+          Promise.resolve().then(() => __toESM(require("./generateCode"))),
+          Promise.resolve().then(() => __toESM(require("./getHtmlTemplate")))
+        ]);
+        const entrypoints = getBundleEntry(appContext, resolvedConfig);
+        debug(`entrypoints: %o`, entrypoints);
+        const initialRoutes = getServerRoutes(entrypoints, {
+          appContext,
+          config: resolvedConfig
+        });
+        const { routes } = await hookRunners.modifyServerRoutes({
+          routes: initialRoutes
+        });
+        debug(`server routes: %o`, routes);
+        appContext = {
+          ...appContext,
+          entrypoints,
+          serverRoutes: routes
+        };
+        api.setAppContext(appContext);
+        nestedRouteEntries = entrypoints.map((point) => point.nestedRoutesEntry).filter(Boolean);
+        pagesDir = entrypoints.map((point) => point.entry).filter(Boolean).concat(nestedRouteEntries);
+        originEntrypoints = (0, import_lodash.cloneDeep)(entrypoints);
+        await generateCode(appContext, resolvedConfig, entrypoints, api);
+        const htmlTemplates = await getHtmlTemplate(entrypoints, api, {
+          appContext,
+          config: resolvedConfig
+        });
+        debug(`html templates: %o`, htmlTemplates);
+        await hookRunners.addDefineTypes();
+        debug(`add Define Types`);
+        let checkedEntries = entrypoints.map((point) => point.entryName);
+        if ((0, import_utils.isDevCommand)()) {
+          const { entry } = (0, import_utils.minimist)(process.argv.slice(2));
+          checkedEntries = await (0, import_getSelectedEntries.getSelectedEntries)(
+            typeof entry === "string" ? entry.split(",") : entry,
+            entrypoints
+          );
+        }
+        appContext = {
+          ...appContext,
+          entrypoints,
+          checkedEntries,
+          apiOnly,
+          serverRoutes: routes,
+          htmlTemplates
+        };
+        api.setAppContext(appContext);
+        const command = (0, import_utils.getCommand)();
+        const buildCommands = ["dev", "start", "build", "inspect", "deploy"];
+        if (buildCommands.includes(command)) {
+          const normalizedConfig = api.useResolvedConfigContext();
+          const createBuilderForModern = await (0, import_builder.createBuilderGenerator)(bundler);
+          const builder = await createBuilderForModern({
+            normalizedConfig,
+            appContext,
+            async onBeforeBuild({ bundlerConfigs }) {
+              const hookRunners2 = api.useHookRunners();
+              await (0, import_routes.generateRoutes)(appContext);
+              await hookRunners2.beforeBuild({
+                bundlerConfigs
+              });
+            },
+            async onAfterBuild({ stats }) {
+              const hookRunners2 = api.useHookRunners();
+              await hookRunners2.afterBuild({ stats });
+              await (0, import_config.emitResolvedConfig)(
+                appContext.appDirectory,
+                normalizedConfig
+              );
+            },
+            async onDevCompileDone({ isFirstCompile }) {
+              const hookRunners2 = api.useHookRunners();
+              if (process.stdout.isTTY || isFirstCompile) {
+                hookRunners2.afterDev();
+                if (isFirstCompile) {
+                  (0, import_printInstructions.printInstructions)(hookRunners2, appContext, normalizedConfig);
+                }
+              }
+            },
+            async onBeforeCreateCompiler({ bundlerConfigs }) {
+              const hookRunners2 = api.useHookRunners();
+              await hookRunners2.beforeCreateCompiler({
+                bundlerConfigs
+              });
+            },
+            async onAfterCreateCompiler({ compiler }) {
+              const hookRunners2 = api.useHookRunners();
+              await hookRunners2.afterCreateCompiler({
+                compiler
+              });
+            }
+          });
+          builder.addPlugins(resolvedConfig.builderPlugins);
+          appContext = {
+            ...appContext,
+            builder
+          };
+          api.setAppContext(appContext);
+        }
+      },
+      watchFiles() {
+        return pagesDir;
+      },
+      config() {
+        return {
+          tools: {
+            webpackChain: (chain, { name }) => {
+              const appContext = api.useAppContext();
+              const resolvedConfig = api.useResolvedConfigContext();
+              const { entrypoints, internalDirectory, packageName } = appContext;
+              entrypoints.forEach((entrypoint) => {
+                const { entryName } = entrypoint;
+                const ssr = (0, import_utils.getEntryOptions)(
+                  entryName,
+                  resolvedConfig.server.ssr,
+                  resolvedConfig.server.ssrByEntries,
+                  packageName
+                );
+                if (entrypoint.nestedRoutesEntry && ssr && name === "server") {
+                  const serverLoadersFile = (0, import_utils2.getServerLoadersFile)(
+                    internalDirectory,
+                    entryName
+                  );
+                  chain.entry(`${entryName}-server-loaders`).add(serverLoadersFile);
+                }
+              });
+            }
+          }
+        };
+      },
+      resolvedConfig({ resolved }) {
+        const appContext = api.useAppContext();
+        const config = (0, import_config2.initialNormalizedConfig)(resolved, appContext, bundler);
+        return {
+          resolved: config
+        };
+      },
+      async modifyEntryImports({ entrypoint, imports }) {
+        const appContext = api.useAppContext();
+        const { srcDirectory, internalSrcAlias } = appContext;
+        const { fileSystemRoutes, nestedRoutesEntry } = entrypoint;
+        if (fileSystemRoutes && nestedRoutesEntry) {
+          const rootLayoutPath = path.join(nestedRoutesEntry, "layout");
+          const rootLayoutFile = (0, import_utils.findExists)(
+            [".js", ".ts", ".jsx", ".tsx"].map(
+              (ext) => `${rootLayoutPath}${ext}`
+            )
+          );
+          if (rootLayoutFile) {
+            const rootLayoutBuffer = await import_utils.fs.readFile(rootLayoutFile);
+            const rootLayout = rootLayoutBuffer.toString();
+            const [, moduleExports] = await (0, import_utils2.parseModule)({
+              source: rootLayout.toString(),
+              filename: rootLayoutFile
+            });
+            const hasAppConfig = moduleExports.some(
+              (e) => e.n === import_constants.APP_CONFIG_NAME
+            );
+            const generateLayoutPath = (0, import_utils2.replaceWithAlias)(
+              srcDirectory,
+              rootLayoutFile,
+              internalSrcAlias
+            );
+            if (hasAppConfig) {
+              imports.push({
+                value: generateLayoutPath,
+                specifiers: [{ imported: import_constants.APP_CONFIG_NAME }]
+              });
+            }
+            const hasAppInit = moduleExports.some(
+              (e) => e.n === import_constants.APP_INIT_EXPORTED
+            );
+            if (hasAppInit) {
+              imports.push({
+                value: generateLayoutPath,
+                specifiers: [
+                  { imported: import_constants.APP_INIT_EXPORTED, local: import_constants.APP_INIT_IMPORTED }
+                ]
+              });
+            }
+          }
+        }
+        return {
+          entrypoint,
+          imports
+        };
+      },
+      async fileChange(e) {
+        const appContext = api.useAppContext();
+        const { appDirectory } = appContext;
+        const { filename, eventType } = e;
+        const isPageFile = (name) => pagesDir.some((pageDir) => name.includes(pageDir));
+        const absoluteFilePath = path.resolve(appDirectory, filename);
+        const isRouteComponent = isPageFile(absoluteFilePath) && (0, import_utils2.isPageComponentFile)(absoluteFilePath);
+        if (isRouteComponent && (eventType === "add" || eventType === "unlink")) {
+          const resolvedConfig = api.useResolvedConfigContext();
+          const { generateCode } = await Promise.resolve().then(() => __toESM(require("./generateCode")));
+          const entrypoints = (0, import_lodash.cloneDeep)(originEntrypoints);
+          generateCode(appContext, resolvedConfig, entrypoints, api);
+        }
+      }
+    };
+  }
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/{js/node → cjs}/analyze/nestedRoutes.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -38,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var nestedRoutes_exports = {};
 __export(nestedRoutes_exports, {
   walk: () => walk
@@ -73,10 +36,11 @@ const replaceDynamicPath = (routePath) => {
 };
 const createIndexRoute = (routeInfo, rootDir, filename, entryName) => {
   return createRoute(
-    __spreadProps(__spreadValues({}, routeInfo), {
+    {
+      ...routeInfo,
       index: true,
       children: void 0
-    }),
+    },
     rootDir,
     filename,
     entryName
@@ -84,17 +48,18 @@ const createIndexRoute = (routeInfo, rootDir, filename, entryName) => {
 };
 const createRoute = (routeInfo, rootDir, filename, entryName) => {
   const id = (0, import_utils.getRouteId)(filename, rootDir, entryName);
-  return __spreadProps(__spreadValues({}, routeInfo), {
+  return {
+    ...routeInfo,
     id,
     type: "nested"
-  });
+  };
 };
-const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, function* () {
+const walk = async (dirname, rootDir, alias, entryName) => {
   var _a, _b, _c, _d;
-  if (!(yield import_utils.fs.pathExists(dirname))) {
+  if (!await import_utils.fs.pathExists(dirname)) {
     return null;
   }
-  const isDirectory = (yield import_utils.fs.stat(dirname)).isDirectory();
+  const isDirectory = (await import_utils.fs.stat(dirname)).isDirectory();
   if (!isDirectory) {
     return null;
   }
@@ -118,14 +83,14 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
   let pageRoute = null;
   let splatLoaderFile = "";
   let splatRoute = null;
-  const items = yield import_utils.fs.readdir(dirname);
+  const items = await import_utils.fs.readdir(dirname);
   for (const item of items) {
     const itemPath = path.join(dirname, item);
     const extname = path.extname(item);
     const itemWithoutExt = item.slice(0, -extname.length);
-    const isDirectory2 = (yield import_utils.fs.stat(itemPath)).isDirectory();
+    const isDirectory2 = (await import_utils.fs.stat(itemPath)).isDirectory();
     if (isDirectory2) {
-      const childRoute = yield walk(itemPath, rootDir, alias, entryName);
+      const childRoute = await walk(itemPath, rootDir, alias, entryName);
       if (childRoute) {
         (_a = route.children) == null ? void 0 : _a.push(childRoute);
       }
@@ -200,13 +165,14 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
     const childRoute = finalRoute.children[0];
     if (childRoute.path === "*") {
       const path2 = `${finalRoute.path || ""}/${childRoute.path || ""}`;
-      finalRoute = __spreadProps(__spreadValues({}, childRoute), {
+      finalRoute = {
+        ...childRoute,
         path: path2
-      });
+      };
     }
   }
   return finalRoute;
-});
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   walk

package/dist/{js/node → cjs}/analyze/templates.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -38,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var templates_exports = {};
 __export(templates_exports, {
   fileSystemRoutes: () => fileSystemRoutes,
@@ -99,6 +62,7 @@ const renderFunction = ({
   customBootstrap,
   fileSystemRoutes: fileSystemRoutes2
 }) => {
+  const bootstrap = "bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM)";
   return `
   const finalAppConfig = {
     ...App.config,
@@ -120,7 +84,7 @@ const renderFunction = ({
 
 
   if (IS_BROWSER) {
-    ${customBootstrap ? `customBootstrap(AppWrapper);` : `bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM);`}
+    ${customBootstrap ? `customBootstrap(AppWrapper, () => ${bootstrap});` : `${bootstrap};`}
   }
 
   return AppWrapper
@@ -173,10 +137,11 @@ const routesForServer = ({
         loader = `loader_${loaders.length - 1}`;
       }
     }
-    const finalRoute = __spreadProps(__spreadValues({}, route), {
+    const finalRoute = {
+      ...route,
       loader,
       children
-    });
+    };
     return finalRoute;
   };
   let routesCode = `
@@ -206,13 +171,13 @@ const routesForServer = ({
     ${routesCode}
   `;
 };
-const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
+const fileSystemRoutes = async ({
   routes,
   ssrMode,
   nestedRoutesEntry,
   entryName,
   internalDirectory
-}) {
+}) => {
   const loadings = [];
   const errors = [];
   const loaders = [];
@@ -286,13 +251,14 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
       lazyImport = `() => import('${route._component}')`;
       component = `loadable(${lazyImport})`;
     }
-    const finalRoute = __spreadProps(__spreadValues({}, route), {
+    const finalRoute = {
+      ...route,
       lazyImport,
       loading,
       loader,
       error,
       children
-    });
+    };
     if (route._component) {
       finalRoute.component = component;
     }
@@ -307,9 +273,10 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
       routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"')},`;
     } else {
       const component = `loadable(() => import('${route._component}'))`;
-      const finalRoute = __spreadProps(__spreadValues({}, route), {
+      const finalRoute = {
+        ...route,
         component
-      });
+      };
       routeComponentsCode += `${JSON.stringify(finalRoute, null, 2).replace(/"(loadable[^"]*)"/g, "$1").replace(/"(lazy[^"]*)"/g, "$1")},`;
     }
   }
@@ -337,8 +304,8 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
 `;
     }
   }
-  yield import_utils.fs.ensureFile(loadersMapFile);
-  yield import_utils.fs.writeJSON(loadersMapFile, loadersMap);
+  await import_utils.fs.ensureFile(loadersMapFile);
+  await import_utils.fs.writeJSON(loadersMapFile, loadersMap);
   return `
     ${importLazyCode}
     ${rootLayoutCode}
@@ -347,7 +314,7 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
     ${importLoadersCode}
     ${routeComponentsCode}
   `;
-});
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   fileSystemRoutes,