@modern-js/app-tools 2.0.1 → 2.0.3-alpha.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @modern-js/app-tools
 
+## 2.0.2
+
+### Patch Changes
+
+- 39988b2: feat: advance the timing of static resource loading
+  feat: 将嵌套路由下静态资源加载时机提前
+- Updated dependencies [39988b2]
+  - @modern-js/types@2.0.2
+  - @modern-js/new-action@2.0.2
+  - @modern-js/builder-shared@2.0.2
+  - @modern-js/builder-webpack-provider@2.0.2
+  - @modern-js/core@2.0.2
+  - @modern-js/plugin-data-loader@2.0.2
+  - @modern-js/prod-server@2.0.2
+  - @modern-js/server@2.0.2
+  - @modern-js/utils@2.0.2
+  - @modern-js/builder@2.0.2
+  - @modern-js/builder-plugin-esbuild@2.0.2
+  - @modern-js/builder-plugin-node-polyfill@2.0.2
+  - @modern-js/plugin-i18n@2.0.2
+  - @modern-js/plugin-lint@2.0.2
+  - @modern-js/node-bundle-require@2.0.2
+  - @modern-js/plugin@2.0.2
+  - @modern-js/upgrade@2.0.2
+
 ## 2.0.1
 
 ### Patch Changes

package/dist/js/modern/analyze/generateCode.js

@@ -22,29 +22,20 @@ import path from "path";
 import {
   fs,
   getEntryOptions,
-  LOADER_ROUTES_DIR,
   logger
 } from "@modern-js/utils";
 import {
   useResolvedConfigContext
 } from "@modern-js/core";
-import { isDevCommand } from "../utils/commands";
 import * as templates from "./templates";
 import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
 import {
   FILE_SYSTEM_ROUTES_FILE_NAME,
   ENTRY_POINT_FILE_NAME,
-  ENTRY_BOOTSTRAP_FILE_NAME,
-  TEMP_LOADERS_DIR
+  ENTRY_BOOTSTRAP_FILE_NAME
 } from "./constants";
-import { getDefaultImports } from "./utils";
+import { getDefaultImports, getServerLoadersFile } from "./utils";
 import { walk } from "./nestedRoutes";
-import { loaderBuilder, serverLoaderBuilder } from "./Builder";
-const loader = {
-  ".js": "jsx",
-  ".ts": "tsx"
-};
-const EXTERNAL_REGEXP = /^[^./]|^\.[^./]|^\.\.[^/]/;
 const createImportSpecifier = (specifiers) => {
   let defaults = "";
   const named = [];
@@ -92,49 +83,6 @@ ${initialize || ""}`
 ${initialize || ""}`
   ).join("\n");
 };
-const buildLoader = (entry, outfile) => __async(void 0, null, function* () {
-  yield loaderBuilder.build({
-    format: "esm",
-    platform: "browser",
-    target: "esnext",
-    loader,
-    watch: isDevCommand() && {},
-    bundle: true,
-    logLevel: "error",
-    entryPoints: [entry],
-    outfile,
-    plugins: [
-      {
-        name: "make-all-packages-external",
-        setup(build) {
-          build.onResolve({ filter: EXTERNAL_REGEXP }, (args) => {
-            let external = true;
-            if (args.kind === "entry-point") {
-              external = false;
-            }
-            return {
-              path: args.path,
-              external
-            };
-          });
-        }
-      }
-    ]
-  });
-});
-const buildServerLoader = (entry, outfile) => __async(void 0, null, function* () {
-  yield serverLoaderBuilder.build({
-    format: "cjs",
-    platform: "node",
-    target: "esnext",
-    loader,
-    watch: isDevCommand() && {},
-    bundle: true,
-    logLevel: "error",
-    entryPoints: [entry],
-    outfile
-  });
-});
 const generateCode = (appContext, config, entrypoints, api) => __async(void 0, null, function* () {
   var _a, _b, _c;
   const {
@@ -225,16 +173,9 @@ const generateCode = (appContext, config, entrypoints, api) => __async(void 0, n
             })
           });
           if (entrypoint.nestedRoutesEntry) {
-            const routesServerFile = path.join(
+            const routesServerFile = getServerLoadersFile(
               internalDirectory,
-              entryName,
-              "route-server-loaders.js"
-            );
-            const outputRoutesServerFile = path.join(
-              distDirectory,
-              LOADER_ROUTES_DIR,
-              entryName,
-              "index.js"
+              entryName
             );
             const code3 = templates.routesForServer({
               routes,
@@ -243,24 +184,6 @@ const generateCode = (appContext, config, entrypoints, api) => __async(void 0, n
             });
             yield fs.ensureFile(routesServerFile);
             yield fs.writeFile(routesServerFile, code3);
-            const loaderEntryFile = path.join(
-              internalDirectory,
-              entryName,
-              TEMP_LOADERS_DIR,
-              "entry.js"
-            );
-            const loaderIndexFile = path.join(
-              internalDirectory,
-              entryName,
-              TEMP_LOADERS_DIR,
-              "index.js"
-            );
-            if (yield fs.pathExists(loaderEntryFile)) {
-              yield buildLoader(loaderEntryFile, loaderIndexFile);
-            }
-            if (yield fs.pathExists(routesServerFile)) {
-              yield buildServerLoader(routesServerFile, outputRoutesServerFile);
-            }
           }
           fs.outputFileSync(
             path.resolve(

package/dist/js/modern/analyze/index.js

@@ -38,7 +38,7 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 import * as path from "path";
-import { createDebugger, findExists, fs, isApiOnly } from "@modern-js/utils";
+import { createDebugger, findExists, fs, isApiOnly, isUseSSRBundle } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { createBuilderForModern } from "../builder";
 import { printInstructions } from "../utils/printInstructions";
@@ -47,12 +47,11 @@ import { emitResolvedConfig } from "../utils/config";
 import { getCommand } from "../utils/commands";
 import { initialNormalizedConfig } from "../config";
 import {
-  isNestedRouteComponent,
+  getServerLoadersFile,
   isPageComponentFile,
   parseModule,
   replaceWithAlias
 } from "./utils";
-import { loaderBuilder, serverLoaderBuilder } from "./Builder";
 import {
   APP_CONFIG_NAME,
   APP_INIT_EXPORTED,
@@ -207,6 +206,27 @@ var analyze_default = () => ({
       watchFiles() {
         return pagesDir;
       },
+      config() {
+        return {
+          tools: {
+            webpackChain: (chain, { name, CHAIN_ID }) => {
+              const appContext = api.useAppContext();
+              const resolvedConfig = api.useResolvedConfigContext();
+              const { entrypoints, internalDirectory } = appContext;
+              entrypoints.forEach((entrypoint) => {
+                const { entryName } = entrypoint;
+                if (entrypoint.nestedRoutesEntry && isUseSSRBundle(resolvedConfig)) {
+                  const serverLoadersFile = getServerLoadersFile(
+                    internalDirectory,
+                    entryName
+                  );
+                  chain.entry(`${entryName}-server-loaders`).add(serverLoadersFile);
+                }
+              });
+            }
+          }
+        };
+      },
       resolvedConfig({ resolved }) {
         const appContext = api.useAppContext();
         const config = initialNormalizedConfig(resolved, appContext);
@@ -217,7 +237,7 @@ var analyze_default = () => ({
       modifyEntryImports(_0) {
         return __async(this, arguments, function* ({ entrypoint, imports }) {
           const appContext = api.useAppContext();
-          const { srcDirectory } = appContext;
+          const { srcDirectory, internalSrcAlias } = appContext;
           const { fileSystemRoutes, nestedRoutesEntry } = entrypoint;
           if (fileSystemRoutes && nestedRoutesEntry) {
             const rootLayoutPath = path.join(nestedRoutesEntry, "layout");
@@ -239,7 +259,7 @@ var analyze_default = () => ({
               const generateLayoutPath = replaceWithAlias(
                 srcDirectory,
                 rootLayoutFile,
-                "@_modern_js_src"
+                internalSrcAlias
               );
               if (hasAppConfig) {
                 imports.push({
@@ -266,12 +286,6 @@ var analyze_default = () => ({
           };
         });
       },
-      beforeRestart() {
-        return __async(this, null, function* () {
-          serverLoaderBuilder.stop();
-          loaderBuilder.stop();
-        });
-      },
       fileChange(e) {
         return __async(this, null, function* () {
           const appContext = api.useAppContext();
@@ -280,7 +294,7 @@ var analyze_default = () => ({
           const isPageFile = (name) => pagesDir.some((pageDir) => name.includes(pageDir));
           const absoluteFilePath = path.resolve(appDirectory, filename);
           const isRouteComponent = isPageFile(absoluteFilePath) && isPageComponentFile(absoluteFilePath);
-          if (isRouteComponent && (eventType === "add" || eventType === "unlink") || isNestedRouteComponent(nestedRouteEntries, absoluteFilePath) && eventType === "change") {
+          if (isRouteComponent && (eventType === "add" || eventType === "unlink")) {
             const resolvedConfig = api.useResolvedConfigContext();
             const { generateCode } = yield import("./generateCode");
             const entrypoints = cloneDeep(originEntrypoints);

package/dist/js/modern/analyze/nestedRoutes.js

@@ -40,14 +40,8 @@ var __async = (__this, __arguments, generator) => {
 import * as path from "path";
 import { fs, getRouteId } from "@modern-js/utils";
 import { JS_EXTENSIONS, NESTED_ROUTE } from "./constants";
-import { hasLoader, replaceWithAlias } from "./utils";
+import { replaceWithAlias } from "./utils";
 const conventionNames = Object.values(NESTED_ROUTE);
-const getLoaderPath = (filename) => __async(void 0, null, function* () {
-  if (yield hasLoader(filename)) {
-    return filename;
-  }
-  return void 0;
-});
 const replaceDynamicPath = (routePath) => {
   return routePath.replace(/\[(.*?)\]/g, ":$1");
 };
@@ -118,10 +112,6 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
     }
     if (itemWithoutExt === NESTED_ROUTE.LAYOUT_FILE) {
       route._component = replaceWithAlias(alias.basename, itemPath, alias.name);
-      const loaderPath = yield getLoaderPath(itemPath);
-      if (loaderPath) {
-        route.loader = loaderPath;
-      }
     }
     if (itemWithoutExt === NESTED_ROUTE.PAGE_LOADER_FILE) {
       pageLoaderFile = itemPath;
@@ -135,10 +125,7 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
         itemPath,
         entryName
       );
-      const loaderPath = yield getLoaderPath(itemPath);
-      if (loaderPath) {
-        pageRoute.loader = loaderPath;
-      } else if (pageLoaderFile) {
+      if (pageLoaderFile) {
         pageRoute.loader = pageLoaderFile;
       }
       (_b = route.children) == null ? void 0 : _b.push(pageRoute);

package/dist/js/modern/analyze/templates.js

@@ -175,10 +175,9 @@ const routesForServer = ({
 ];`;
   let importLoadersCode = "";
   if (loaders.length > 0) {
-    importLoadersCode = `
-    import { ${loaders.map(
-      (loader, index2) => `loader_${index2}`
-    )} } from "${slash(loaderIndexFile)}"`;
+    importLoadersCode = loaders.map((loader, index2) => {
+      return `import loader_${index2} from "${loader}"`;
+    }).join("\n");
   }
   return `
     ${importLoadersCode}
@@ -197,12 +196,6 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
   const errors = [];
   const loaders = [];
   const loadersMap = {};
-  const loadersIndexFile = path.join(
-    internalDirAlias,
-    entryName,
-    TEMP_LOADERS_DIR,
-    "index.js"
-  );
   const loadersMapFile = path.join(
     internalDirectory,
     entryName,
@@ -214,13 +207,17 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
     import loadable, { lazy as loadableLazy } from "@modern-js/runtime/loadable"
   `;
   let rootLayoutCode = ``;
-  let dataLoaderPath = "";
   let componentLoaderPath = "";
-  if (ssrMode) {
-    dataLoaderPath = require.resolve("@modern-js/plugin-data-loader/loader");
+  const getDataLoaderPath = (loaderId) => {
+    if (!ssrMode)
+      return "";
+    let dataLoaderPath = require.resolve("@modern-js/plugin-data-loader/loader");
     if (nestedRoutesEntry) {
-      dataLoaderPath = `${dataLoaderPath}?routesDir=${nestedRoutesEntry}&mapFile=${loadersMapFile}!`;
+      dataLoaderPath = `${slash(dataLoaderPath)}?mapFile=${slash(loadersMapFile)}&loaderId=${loaderId}!`;
     }
+    return dataLoaderPath;
+  };
+  if (ssrMode) {
     componentLoaderPath = `${path.join(
       __dirname,
       "../builder/loaders/routerLoader"
@@ -236,6 +233,7 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
     let error;
     let loader;
     let component = "";
+    let lazyImport = null;
     if (route.type === "nested") {
       if (route.loading) {
         loadings.push(route.loading);
@@ -249,22 +247,30 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
         loaders.push(route.loader);
         const loaderId = loaders.length - 1;
         loader = `loader_${loaderId}`;
-        loadersMap[loader] = route.id;
+        loadersMap[loader] = {
+          routeId: route.id,
+          filePath: route.loader,
+          inline: false
+        };
       }
       if (route._component) {
         if (route.isRoot) {
           rootLayoutCode = `import RootLayout from '${route._component}'`;
           component = `RootLayout`;
         } else if (ssrMode === "string") {
-          component = `loadable(() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}'))`;
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}')`;
+          component = `loadable(${lazyImport})`;
         } else {
-          component = `lazy(() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}'))`;
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}')`;
+          component = `lazy(${lazyImport})`;
         }
       }
     } else if (route._component) {
-      component = `loadable(() => import('${route._component}'))`;
+      lazyImport = `() => import('${route._component}')`;
+      component = `loadable(${lazyImport})`;
     }
     const finalRoute = __spreadProps(__spreadValues({}, route), {
+      lazyImport,
       loading,
       loader,
       error,
@@ -281,7 +287,7 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
   for (const route of routes) {
     if ("type" in route) {
       const newRoute = traverseRouteTree(route);
-      routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(lazy.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"')},`;
+      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), {
@@ -301,48 +307,17 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
 `;
   }).join("");
   let importLoadersCode = "";
-  if (loaders.length > 0) {
-    importLoadersCode = `
-    import { ${loaders.map(
-      (loader, index2) => `loader_${index2}`
-    )} } from "${slash(dataLoaderPath)}${slash(loadersIndexFile)}"
-  `;
-    const loaderEntryCode = loaders.map((loader, index2) => {
-      return `export * from './loader_${index2}.js';`;
-    }).join("\n");
-    const loaderEntryFile = path.join(
-      internalDirectory,
-      entryName,
-      TEMP_LOADERS_DIR,
-      "entry.js"
-    );
-    yield fs.ensureFile(loaderEntryFile);
-    yield fs.writeFile(loaderEntryFile, loaderEntryCode);
-    yield fs.writeJSON(loadersMapFile, loadersMap);
-    yield Promise.all(
-      loaders.map((loader, index2) => __async(void 0, null, function* () {
-        const name = `loader_${index2}`;
-        const filename = path.join(
-          internalDirectory,
-          entryName,
-          TEMP_LOADERS_DIR,
-          `${name}.js`
-        );
-        let code = "";
-        if (loader.includes(".loader.")) {
-          code = `
-          export { default as ${name} } from '${slash(loader)}'
-        `;
-        } else {
-          code = `
-          export { loader as ${name} } from '${slash(loader)}'
-        `;
-        }
-        yield fs.ensureFile(filename);
-        yield fs.writeFile(filename, code);
-      }))
-    );
+  for (const [key, loaderInfo] of Object.entries(loadersMap)) {
+    if (loaderInfo.inline) {
+      importLoadersCode += `import { loader as ${key} } from "${getDataLoaderPath(key)}${loaderInfo.filePath}";
+`;
+    } else {
+      importLoadersCode += `import ${key} from "${getDataLoaderPath(key)}${loaderInfo.filePath}";
+`;
+    }
   }
+  yield fs.ensureFile(loadersMapFile);
+  yield fs.writeJSON(loadersMapFile, loadersMap);
   return `
     ${importLazyCode}
     ${rootLayoutCode}

package/dist/js/modern/analyze/utils.js

@@ -107,7 +107,7 @@ const isPageComponentFile = (filePath) => {
 };
 const isNestedRouteComponent = (nestedRouteEntries, absoluteFilePath) => {
   const reg = new RegExp(
-    `(${NESTED_ROUTE.LAYOUT_FILE}|${NESTED_ROUTE.PAGE_FILE}})\\.tsx?$`
+    `(${NESTED_ROUTE.LAYOUT_FILE}|${NESTED_ROUTE.PAGE_FILE})\\.tsx?$`
   );
   return nestedRouteEntries.some((nestedRoutesEntry) => {
     if (absoluteFilePath.includes(nestedRoutesEntry) && reg.test(absoluteFilePath)) {
@@ -139,8 +139,16 @@ const hasLoader = (filename) => __async(void 0, null, function* () {
   });
   return moduleExports.some((e) => e.n === LOADER_EXPORT_NAME);
 });
+const getServerLoadersFile = (internalDirectory, entryName) => {
+  return path.join(
+    internalDirectory,
+    entryName,
+    "route-server-loaders.js"
+  );
+};
 export {
   getDefaultImports,
+  getServerLoadersFile,
   hasLoader,
   isNestedRouteComponent,
   isPageComponentFile,

package/dist/js/modern/config/initial/inits.js

@@ -132,7 +132,7 @@ function initToolsConfig(config) {
       ]
     }
   };
-  const { tsChecker, tsLoader, htmlPlugin } = config.tools;
+  const { tsChecker, tsLoader } = config.tools;
   config.tools.tsChecker = applyOptionsChain(defaultTsChecker, tsChecker);
   tsLoader && (config.tools.tsLoader = (tsLoaderConfig, utils) => {
     applyOptionsChain(
@@ -144,14 +144,6 @@ function initToolsConfig(config) {
       utils
     );
   });
-  config.tools.htmlPlugin = [
-    (config2) => __spreadProps(__spreadValues({}, config2), {
-      minify: typeof config2.minify === "object" ? __spreadProps(__spreadValues({}, config2.minify), {
-        removeComments: false
-      }) : config2.minify
-    }),
-    ...Array.isArray(htmlPlugin) ? htmlPlugin : htmlPlugin ? [htmlPlugin] : []
-  ];
 }
 export {
   initHtmlConfig,

package/dist/js/modern/index.js

@@ -38,11 +38,11 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 import path from "path";
-import LintPlugin from "@modern-js/plugin-lint";
+import lintPlugin from "@modern-js/plugin-lint";
 import { cleanRequireCache, emptyDir, Import } from "@modern-js/utils";
 import { castArray } from "@modern-js/utils/lodash";
-import AnalyzePlugin from "./analyze";
-import InitializePlugin from "./initialize";
+import analyzePlugin from "./analyze";
+import initializePlugin from "./initialize";
 import { hooks } from "./hooks";
 import { i18n, localeKeys } from "./locale";
 import { getLocaleLanguage } from "./utils/language";
@@ -83,7 +83,6 @@ const buildCommand = (program, api) => __async(void 0, null, function* () {
   const buildProgram = program.command("build").usage("[options]").description(i18n.t(localeKeys.command.build.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).action((options) => __async(void 0, null, function* () {
     const { build } = yield import("./commands/build");
     yield build(api, options);
-    process.exit(0);
   }));
   for (const platformBuilder of platformBuilders) {
     const platforms = castArray(platformBuilder.platform);
@@ -112,7 +111,7 @@ var src_default = () => ({
     "@modern-js/plugin-polyfill"
   ],
   registerHook: hooks,
-  usePlugins: [InitializePlugin(), AnalyzePlugin(), LintPlugin()],
+  usePlugins: [initializePlugin(), analyzePlugin(), lintPlugin()],
   setup: (api) => {
     const locale = getLocaleLanguage();
     i18n.changeLanguage({ locale });
@@ -138,12 +137,12 @@ var src_default = () => ({
             yield deploy(api, options);
             process.exit(0);
           }));
-          program.command("new").usage("[options]").description(i18n.t(localeKeys.command.new.describe)).option("-d, --debug", i18n.t(localeKeys.command.new.debug), false).option(
+          program.command("new").usage("[options]").description(i18n.t(localeKeys.command.new.describe)).option("--lang <lang>", i18n.t(localeKeys.command.new.lang)).option("-d, --debug", i18n.t(localeKeys.command.new.debug), false).option(
             "-c, --config <config>",
             i18n.t(localeKeys.command.new.config)
           ).option("--dist-tag <tag>", i18n.t(localeKeys.command.new.distTag)).option("--registry", i18n.t(localeKeys.command.new.registry)).action((options) => __async(this, null, function* () {
             const { MWANewAction } = yield import("@modern-js/new-action");
-            yield MWANewAction(__spreadProps(__spreadValues({}, options), { locale }));
+            yield MWANewAction(__spreadProps(__spreadValues({}, options), { locale: options.lang || locale }));
           }));
           program.command("inspect").description("inspect internal webpack config").option(
             `--env <env>`,

package/dist/js/modern/locale/en.js

@@ -19,7 +19,8 @@ const EN_LOCALE = {
       debug: "using debug mode to log something",
       config: "set default generator config(json string)",
       distTag: `use specified tag version for it's generator`,
-      registry: "set npm registry url to run npm command"
+      registry: "set npm registry url to run npm command",
+      lang: "set new command language(en or zh)"
     },
     inspect: {
       env: "specify env mode",

package/dist/js/modern/locale/zh.js

@@ -19,7 +19,8 @@ const ZH_LOCALE = {
       debug: "开启 Debug 模式，打印调试日志信息",
       config: "生成器运行默认配置(JSON 字符串)",
       distTag: "生成器使用特殊的 npm Tag 版本",
-      registry: "生成器运行过程中定制 npm Registry"
+      registry: "生成器运行过程中定制 npm Registry",
+      lang: "设置 new 命令执行语言(zh 或者 en)"
     },
     inspect: {
       env: "查看指定环境下的配置",

package/dist/js/node/analyze/generateCode.js

@@ -50,18 +50,11 @@ module.exports = __toCommonJS(generateCode_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_core = require("@modern-js/core");
-var import_commands = require("../utils/commands");
 var templates = __toESM(require("./templates"));
 var import_getClientRoutes = require("./getClientRoutes");
 var import_constants = require("./constants");
 var import_utils2 = require("./utils");
 var import_nestedRoutes = require("./nestedRoutes");
-var import_Builder = require("./Builder");
-const loader = {
-  ".js": "jsx",
-  ".ts": "tsx"
-};
-const EXTERNAL_REGEXP = /^[^./]|^\.[^./]|^\.\.[^/]/;
 const createImportSpecifier = (specifiers) => {
   let defaults = "";
   const named = [];
@@ -109,49 +102,6 @@ ${initialize || ""}`
 ${initialize || ""}`
   ).join("\n");
 };
-const buildLoader = (entry, outfile) => __async(void 0, null, function* () {
-  yield import_Builder.loaderBuilder.build({
-    format: "esm",
-    platform: "browser",
-    target: "esnext",
-    loader,
-    watch: (0, import_commands.isDevCommand)() && {},
-    bundle: true,
-    logLevel: "error",
-    entryPoints: [entry],
-    outfile,
-    plugins: [
-      {
-        name: "make-all-packages-external",
-        setup(build) {
-          build.onResolve({ filter: EXTERNAL_REGEXP }, (args) => {
-            let external = true;
-            if (args.kind === "entry-point") {
-              external = false;
-            }
-            return {
-              path: args.path,
-              external
-            };
-          });
-        }
-      }
-    ]
-  });
-});
-const buildServerLoader = (entry, outfile) => __async(void 0, null, function* () {
-  yield import_Builder.serverLoaderBuilder.build({
-    format: "cjs",
-    platform: "node",
-    target: "esnext",
-    loader,
-    watch: (0, import_commands.isDevCommand)() && {},
-    bundle: true,
-    logLevel: "error",
-    entryPoints: [entry],
-    outfile
-  });
-});
 const generateCode = (appContext, config, entrypoints, api) => __async(void 0, null, function* () {
   var _a, _b, _c;
   const {
@@ -242,16 +192,9 @@ const generateCode = (appContext, config, entrypoints, api) => __async(void 0, n
             })
           });
           if (entrypoint.nestedRoutesEntry) {
-            const routesServerFile = import_path.default.join(
+            const routesServerFile = (0, import_utils2.getServerLoadersFile)(
               internalDirectory,
-              entryName,
-              "route-server-loaders.js"
-            );
-            const outputRoutesServerFile = import_path.default.join(
-              distDirectory,
-              import_utils.LOADER_ROUTES_DIR,
-              entryName,
-              "index.js"
+              entryName
             );
             const code3 = templates.routesForServer({
               routes,
@@ -260,24 +203,6 @@ const generateCode = (appContext, config, entrypoints, api) => __async(void 0, n
             });
             yield import_utils.fs.ensureFile(routesServerFile);
             yield import_utils.fs.writeFile(routesServerFile, code3);
-            const loaderEntryFile = import_path.default.join(
-              internalDirectory,
-              entryName,
-              import_constants.TEMP_LOADERS_DIR,
-              "entry.js"
-            );
-            const loaderIndexFile = import_path.default.join(
-              internalDirectory,
-              entryName,
-              import_constants.TEMP_LOADERS_DIR,
-              "index.js"
-            );
-            if (yield import_utils.fs.pathExists(loaderEntryFile)) {
-              yield buildLoader(loaderEntryFile, loaderIndexFile);
-            }
-            if (yield import_utils.fs.pathExists(routesServerFile)) {
-              yield buildServerLoader(routesServerFile, outputRoutesServerFile);
-            }
           }
           import_utils.fs.outputFileSync(
             import_path.default.resolve(