@modern-js/app-tools 2.5.0-alpha.1 → 2.5.1-alpha.0

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

@@ -1,5 +1,5 @@
 import path from "path";
-import { fs, getEntryOptions, logger } from "@modern-js/utils";
+import { fs, getEntryOptions, isRouterV5, logger } from "@modern-js/utils";
 import {
   useResolvedConfigContext
 } from "@modern-js/core";
@@ -60,17 +60,15 @@ ${initialize || ""}`
   ).join("\n");
 };
 const generateCode = async (appContext, config, entrypoints, api) => {
-  var _a, _b, _c;
   const {
     internalDirectory,
     srcDirectory,
     internalDirAlias,
     internalSrcAlias,
-    packageName,
-    metaName
+    packageName
   } = appContext;
   const hookRunners = api.useHookRunners();
-  const isV5 = typeof ((_a = config.runtime) == null ? void 0 : _a.router) !== "boolean" && ((_c = (_b = config == null ? void 0 : config.runtime) == null ? void 0 : _b.router) == null ? void 0 : _c.mode) === "react-router-5";
+  const isV5 = isRouterV5(config);
   const { mountId } = config.html;
   const getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
   await Promise.all(entrypoints.map(generateEntryCode));
@@ -89,23 +87,18 @@ const generateCode = async (appContext, config, entrypoints, api) => {
             internalDirAlias
           });
         }
-        if (entrypoint.nestedRoutesEntry) {
-          if (!isV5) {
-            nestedRoute = await walk(
-              entrypoint.nestedRoutesEntry,
-              entrypoint.nestedRoutesEntry,
-              {
-                name: internalSrcAlias,
-                basename: srcDirectory
-              },
-              entrypoint.entryName
-            );
-            if (nestedRoute) {
-              initialRoutes.unshift(nestedRoute);
-            }
-          } else {
-            logger.error("Nested routes is not supported in legacy mode.");
-            process.exit(1);
+        if (!isV5 && entrypoint.nestedRoutesEntry) {
+          nestedRoute = await walk(
+            entrypoint.nestedRoutesEntry,
+            entrypoint.nestedRoutesEntry,
+            {
+              name: internalSrcAlias,
+              basename: srcDirectory
+            },
+            entrypoint.entryName
+          );
+          if (nestedRoute) {
+            initialRoutes.unshift(nestedRoute);
           }
         }
         const { routes } = await hookRunners.modifyFileSystemRoutes({
@@ -152,8 +145,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
             entryName
           );
           const code3 = templates.routesForServer({
-            routes,
-            metaName
+            routes
           });
           await fs.ensureFile(routesServerFile);
           await fs.writeFile(routesServerFile, code3);

package/dist/esm-node/analyze/getBundleEntry.js

@@ -3,7 +3,8 @@ import {
   ensureAbsolutePath,
   fs,
   findExists,
-  MAIN_ENTRY_NAME
+  MAIN_ENTRY_NAME,
+  isRouterV5
 } from "@modern-js/utils";
 import { getFileSystemEntry } from "./getFileSystemEntry";
 import { JS_EXTENSIONS } from "./constants";
@@ -55,7 +56,7 @@ const getBundleEntry = (appContext, config) => {
         customBootstrap: value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
         fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value.entry)).isDirectory() ? {} : void 0
       };
-      if (entrypoint.fileSystemRoutes) {
+      if (entrypoint.fileSystemRoutes && isRouterV5(config)) {
         entrypoint.nestedRoutesEntry = entrypoint.entry;
       }
       if (!ifAlreadyExists(defaults, entrypoint)) {

package/dist/esm-node/analyze/index.js

@@ -196,10 +196,6 @@ var analyze_default = ({
                     entryName
                   );
                   chain.entry(`${entryName}-server-loaders`).add(serverLoadersFile);
-                  chain.resolve.alias.set(
-                    "@modern-js/plugin-data-loader/runtime",
-                    require.resolve("@modern-js/plugin-data-loader/runtime")
-                  );
                 }
               });
             }

package/dist/esm-node/analyze/templates.js

@@ -89,8 +89,7 @@ const html = (partials) => `
 </html>
 `;
 const routesForServer = ({
-  routes,
-  metaName
+  routes
 }) => {
   const loaders = [];
   const traverseRouteTree = (route) => {
@@ -135,13 +134,9 @@ const routesForServer = ({
       return `import loader_${index2} from "${slash(loader)}"`;
     }).join("\n");
   }
-  const exportCode = `
-    export { handleRequest } from '@modern-js/plugin-data-loader/runtime';
-  `;
   return `
     ${importLoadersCode}
     ${routesCode}
-    ${exportCode}
   `;
 };
 const fileSystemRoutes = async ({

package/dist/esm-node/builder/builder-webpack/builderPlugins/compatModern.js

@@ -1,7 +1,7 @@
 import { join } from "path";
 import { createCopyPattern } from "../../shared";
 import { RouterPlugin } from "../webpackPlugins";
-const PluginCompatModern = (options) => ({
+const builderPluginCompatModern = (options) => ({
   name: "builder-plugin-compat-modern",
   setup(api) {
     const { normalizedConfig: modernConfig, appContext } = options;
@@ -37,5 +37,5 @@ const PluginCompatModern = (options) => ({
   }
 });
 export {
-  PluginCompatModern
+  builderPluginCompatModern
 };

package/dist/esm-node/builder/builder-webpack/index.js

@@ -1,10 +1,9 @@
 import {
   builderWebpackProvider
 } from "@modern-js/builder-webpack-provider";
-import { applyOptionsChain } from "@modern-js/utils";
 import { createCopyPattern } from "../shared";
 import { generateBuilder } from "../generator";
-import { PluginCompatModern } from "./builderPlugins/compatModern";
+import { builderPluginCompatModern } from "./builderPlugins/compatModern";
 function createWebpackBuilderForModern(options) {
   return generateBuilder(options, builderWebpackProvider, {
     modifyBuilderConfig(config) {
@@ -31,20 +30,15 @@ function modifyOutputConfig(config, appContext) {
 async function applyBuilderPlugins(builder, options) {
   const { normalizedConfig } = options;
   if (!normalizedConfig.output.disableNodePolyfill) {
-    const { PluginNodePolyfill } = await import("@modern-js/builder-plugin-node-polyfill");
-    builder.addPlugins([PluginNodePolyfill()]);
+    const { builderPluginNodePolyfill } = await import("@modern-js/builder-plugin-node-polyfill");
+    builder.addPlugins([builderPluginNodePolyfill()]);
   }
   if (normalizedConfig.tools.esbuild) {
     const { esbuild: esbuildOptions } = normalizedConfig.tools;
-    const { PluginEsbuild } = await import("@modern-js/builder-plugin-esbuild");
-    builder.addPlugins([
-      PluginEsbuild({
-        loader: false,
-        minimize: applyOptionsChain({}, esbuildOptions)
-      })
-    ]);
+    const { builderPluginEsbuild } = await import("@modern-js/builder-plugin-esbuild");
+    builder.addPlugins([builderPluginEsbuild(esbuildOptions)]);
   }
-  builder.addPlugins([PluginCompatModern(options)]);
+  builder.addPlugins([builderPluginCompatModern(options)]);
 }
 export {
   createWebpackBuilderForModern

package/dist/esm-node/builder/generator/getBuilderTargets.js

@@ -10,7 +10,7 @@ function getBuilderTargets(normalizedConfig) {
   if (useNodeTarget) {
     targets.push("node");
   }
-  const useWorkerTarget = isProd() ? isServiceWorker(normalizedConfig) : false;
+  const useWorkerTarget = isServiceWorker(normalizedConfig);
   if (useWorkerTarget) {
     targets.push("service-worker");
   }

package/dist/esm-node/commands/dev.js

@@ -9,7 +9,7 @@ import { generateRoutes } from "../utils/routes";
 import { buildServerConfig } from "../utils/config";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 const dev = async (api, options) => {
-  var _a;
+  var _a, _b;
   if (options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
   }
@@ -41,6 +41,7 @@ const dev = async (api, options) => {
     dev: {
       port,
       https: normalizedConfig.dev.https,
+      host: normalizedConfig.dev.host,
       ...(_a = normalizedConfig.tools) == null ? void 0 : _a.devServer
     },
     pwd: appDirectory,
@@ -53,12 +54,19 @@ const dev = async (api, options) => {
       ...serverOptions,
       compiler: null
     });
-    app.listen(port, async (err) => {
-      if (err) {
-        throw err;
+    const host = ((_b = normalizedConfig.dev) == null ? void 0 : _b.host) || "localhost";
+    app.listen(
+      {
+        port,
+        host
+      },
+      async (err) => {
+        if (err) {
+          throw err;
+        }
+        printInstructions(hookRunners, appContext, normalizedConfig);
       }
-      printInstructions(hookRunners, appContext, normalizedConfig);
-    });
+    );
   } else {
     const { server } = await appContext.builder.startDevServer({
       printURLs: false,

package/dist/esm-node/config/legacy/createToolsConfig.js

@@ -34,7 +34,10 @@ function createToolsConfig(config) {
     devServer,
     tailwindcss,
     jest,
-    esbuild
+    esbuild: {
+      loader: false,
+      minimize: esbuild
+    }
   };
 }
 export {

package/dist/js/modern/analyze/constants.js

@@ -23,9 +23,7 @@ const NESTED_ROUTE = {
   PAGE_LOADER_FILE: "page.loader",
   LOADING_FILE: "loading",
   ERROR_FILE: "error",
-  LOADER_FILE: "loader",
-  SPLATE_FILE: "$",
-  SPLATE_LOADER_FILE: "$.loader"
+  LOADER_FILE: "loader"
 };
 const APP_CONFIG_NAME = "config";
 const APP_INIT_EXPORTED = "init";

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

@@ -49,12 +49,12 @@ import {
   isDevCommand
 } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
+import { createBuilderForModern } from "../builder";
 import { printInstructions } from "../utils/printInstructions";
 import { generateRoutes } from "../utils/routes";
 import { emitResolvedConfig } from "../utils/config";
 import { getSelectedEntries } from "../utils/getSelectedEntries";
 import { initialNormalizedConfig } from "../config";
-import { createBuilderGenerator } from "../builder";
 import {
   getServerLoadersFile,
   isPageComponentFile,
@@ -67,9 +67,7 @@ import {
   APP_INIT_IMPORTED
 } from "./constants";
 const debug = createDebugger("plugin-analyze");
-var analyze_default = ({
-  bundler
-}) => ({
+var analyze_default = () => ({
   name: "@modern-js/plugin-analyze",
   setup: (api) => {
     let pagesDir = [];
@@ -161,51 +159,56 @@ var analyze_default = ({
           if (buildCommands.includes(command)) {
             let _b;
             const normalizedConfig = api.useResolvedConfigContext();
-            const createBuilderForModern = yield createBuilderGenerator(bundler);
             const builder = yield createBuilderForModern({
               normalizedConfig,
               appContext,
-              onBeforeBuild(_0) {
-                return __async(this, arguments, function* ({ bundlerConfigs }) {
-                  const hookRunners2 = api.useHookRunners();
-                  yield generateRoutes(appContext);
-                  yield hookRunners2.beforeBuild({ bundlerConfigs });
-                });
-              },
-              onAfterBuild(_0) {
-                return __async(this, arguments, function* ({ stats }) {
-                  const hookRunners2 = api.useHookRunners();
-                  yield hookRunners2.afterBuild({ stats });
-                  yield emitResolvedConfig(
-                    appContext.appDirectory,
-                    normalizedConfig
-                  );
-                });
-              },
-              onDevCompileDone(_0) {
-                return __async(this, arguments, function* ({ isFirstCompile }) {
-                  const hookRunners2 = api.useHookRunners();
-                  if (process.stdout.isTTY || isFirstCompile) {
-                    hookRunners2.afterDev();
-                    if (isFirstCompile) {
-                      printInstructions(hookRunners2, appContext, normalizedConfig);
+              compatPluginConfig: {
+                onBeforeBuild(_0) {
+                  return __async(this, arguments, function* ({ bundlerConfigs }) {
+                    const hookRunners2 = api.useHookRunners();
+                    yield generateRoutes(appContext);
+                    yield hookRunners2.beforeBuild({ bundlerConfigs });
+                  });
+                },
+                onAfterBuild(_0) {
+                  return __async(this, arguments, function* ({ stats }) {
+                    const hookRunners2 = api.useHookRunners();
+                    yield hookRunners2.afterBuild({ stats });
+                    yield emitResolvedConfig(
+                      appContext.appDirectory,
+                      normalizedConfig
+                    );
+                  });
+                },
+                onDevCompileDone(_0) {
+                  return __async(this, arguments, function* ({ isFirstCompile }) {
+                    const hookRunners2 = api.useHookRunners();
+                    if (process.stdout.isTTY || isFirstCompile) {
+                      hookRunners2.afterDev();
+                      if (isFirstCompile) {
+                        printInstructions(
+                          hookRunners2,
+                          appContext,
+                          normalizedConfig
+                        );
+                      }
                     }
-                  }
-                });
-              },
-              onBeforeCreateCompiler(_0) {
-                return __async(this, arguments, function* ({ bundlerConfigs }) {
-                  const hookRunners2 = api.useHookRunners();
-                  yield hookRunners2.beforeCreateCompiler({
-                    bundlerConfigs
                   });
-                });
-              },
-              onAfterCreateCompiler(_0) {
-                return __async(this, arguments, function* ({ compiler }) {
-                  const hookRunners2 = api.useHookRunners();
-                  yield hookRunners2.afterCreateCompiler({ compiler });
-                });
+                },
+                onBeforeCreateCompiler(_0) {
+                  return __async(this, arguments, function* ({ bundlerConfigs }) {
+                    const hookRunners2 = api.useHookRunners();
+                    yield hookRunners2.beforeCreateCompiler({
+                      bundlerConfigs
+                    });
+                  });
+                },
+                onAfterCreateCompiler(_0) {
+                  return __async(this, arguments, function* ({ compiler }) {
+                    const hookRunners2 = api.useHookRunners();
+                    yield hookRunners2.afterCreateCompiler({ compiler });
+                  });
+                }
               }
             });
             builder.addPlugins(resolvedConfig.builderPlugins);
@@ -248,7 +251,7 @@ var analyze_default = ({
       },
       resolvedConfig({ resolved }) {
         const appContext = api.useAppContext();
-        const config = initialNormalizedConfig(resolved, appContext, bundler);
+        const config = initialNormalizedConfig(resolved, appContext);
         return {
           resolved: config
         };

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

@@ -64,7 +64,7 @@ const createRoute = (routeInfo, rootDir, filename, entryName) => {
   });
 };
 const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, function* () {
-  var _a, _b, _c, _d;
+  var _a, _b, _c;
   if (!(yield fs.pathExists(dirname))) {
     return null;
   }
@@ -90,8 +90,6 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
   };
   let pageLoaderFile = "";
   let pageRoute = null;
-  let splatLoaderFile = "";
-  let splatRoute = null;
   const items = yield fs.readdir(dirname);
   for (const item of items) {
     const itemPath = path.join(dirname, item);
@@ -132,24 +130,6 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
       }
       (_b = route.children) == null ? void 0 : _b.push(pageRoute);
     }
-    if (itemWithoutExt === NESTED_ROUTE.SPLATE_LOADER_FILE) {
-      splatLoaderFile = itemPath;
-    }
-    if (itemWithoutExt === NESTED_ROUTE.SPLATE_FILE) {
-      splatRoute = createRoute(
-        {
-          _component: replaceWithAlias(alias.basename, itemPath, alias.name),
-          path: "*"
-        },
-        rootDir,
-        itemPath,
-        entryName
-      );
-      if (splatLoaderFile) {
-        splatRoute.loader = splatLoaderFile;
-      }
-      (_c = route.children) == null ? void 0 : _c.push(splatRoute);
-    }
     if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {
       route.loading = replaceWithAlias(alias.basename, itemPath, alias.name);
     }
@@ -166,7 +146,7 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
   if (isPathlessLayout) {
     delete finalRoute.path;
   }
-  route.children = (_d = route.children) == null ? void 0 : _d.filter((childRoute) => childRoute);
+  route.children = (_c = route.children) == null ? void 0 : _c.filter((childRoute) => childRoute);
   if (route.children && route.children.length === 0 && !route.index) {
     return null;
   }

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

@@ -198,6 +198,7 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
     import loadable, { lazy as loadableLazy } from "@modern-js/runtime/loadable"
   `;
   let rootLayoutCode = ``;
+  let componentLoaderPath = "";
   const getDataLoaderPath = (loaderId) => {
     if (!ssrMode) {
       return "";
@@ -210,6 +211,12 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
     }
     return dataLoaderPath;
   };
+  if (ssrMode) {
+    componentLoaderPath = `${path.join(
+      __dirname,
+      "../builder/loaders/routerLoader"
+    )}!`;
+  }
   const traverseRouteTree = (route) => {
     var _a;
     let children;
@@ -245,10 +252,10 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
           rootLayoutCode = `import RootLayout from '${route._component}'`;
           component = `RootLayout`;
         } else if (ssrMode === "string") {
-          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}')`;
           component = `loadable(${lazyImport})`;
         } else {
-          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}')`;
           component = `lazy(${lazyImport})`;
         }
       }