@modern-js/app-tools 2.8.1-alpha.0 → 2.8.1-alpha.2

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;
+  var _a, _b, _c, _d;
   if (!(yield fs.pathExists(dirname))) {
     return null;
   }
@@ -90,6 +90,8 @@ 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);
@@ -130,6 +132,24 @@ 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);
     }
@@ -137,7 +157,7 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
       route.error = replaceWithAlias(alias.basename, itemPath, alias.name);
     }
   }
-  const finalRoute = createRoute(
+  let finalRoute = createRoute(
     route,
     rootDir,
     path.join(dirname, `${NESTED_ROUTE.LAYOUT_FILE}.ts`),
@@ -146,10 +166,19 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
   if (isPathlessLayout) {
     delete finalRoute.path;
   }
-  route.children = (_c = route.children) == null ? void 0 : _c.filter((childRoute) => childRoute);
+  route.children = (_d = route.children) == null ? void 0 : _d.filter((childRoute) => childRoute);
   if (route.children && route.children.length === 0 && !route.index) {
     return null;
   }
+  if (finalRoute.children && finalRoute.children.length === 1 && !finalRoute._component) {
+    const childRoute = finalRoute.children[0];
+    if (childRoute.path === "*") {
+      const path2 = `${finalRoute.path || ""}/${childRoute.path || ""}`;
+      finalRoute = __spreadProps(__spreadValues({}, childRoute), {
+        path: path2
+      });
+    }
+  }
   return finalRoute;
 });
 export {

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

@@ -69,6 +69,7 @@ const renderFunction = ({
   customBootstrap,
   fileSystemRoutes: fileSystemRoutes2
 }) => {
+  const bootstrap = "bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM)";
   return `
   const finalAppConfig = {
     ...App.config,
@@ -90,7 +91,7 @@ const renderFunction = ({
 
 
   if (IS_BROWSER) {
-    ${customBootstrap ? `customBootstrap(AppWrapper);` : `bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM);`}
+    ${customBootstrap ? `customBootstrap(AppWrapper, () => ${bootstrap});` : `${bootstrap};`}
   }
 
   return AppWrapper
@@ -198,7 +199,6 @@ 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 "";
@@ -211,12 +211,6 @@ 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;
@@ -252,10 +246,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}" */  '${componentLoaderPath}${route._component}')`;
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
           component = `loadable(${lazyImport})`;
         } else {
-          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}')`;
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
           component = `lazy(${lazyImport})`;
         }
       }

package/dist/js/modern/builder/builder-rspack/index.js

@@ -0,0 +1,8 @@
+import { builderRspackProvider } from "@modern-js/builder-rspack-provider";
+import { generateBuilder } from "../generator";
+function createRspackBuilderForModern(options) {
+  return generateBuilder(options, builderRspackProvider);
+}
+export {
+  createRspackBuilderForModern
+};

package/dist/js/modern/builder/builder-webpack/builderPlugins/compatModern.js

@@ -0,0 +1,41 @@
+import { join } from "path";
+import { createCopyPattern } from "../../shared";
+import { RouterPlugin } from "../webpackPlugins";
+const PluginCompatModern = (options) => ({
+  name: "builder-plugin-compat-modern",
+  setup(api) {
+    const { normalizedConfig: modernConfig, appContext } = options;
+    api.modifyWebpackChain((chain, { CHAIN_ID }) => {
+      var _a;
+      chain.resolve.modules.add("node_modules").add(join(api.context.rootPath, "node_modules"));
+      if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
+        const defaultCopyPattern = createCopyPattern(
+          appContext,
+          modernConfig,
+          "public",
+          chain
+        );
+        chain.plugin(CHAIN_ID.PLUGIN.COPY).tap((args) => {
+          var _a2;
+          return [
+            {
+              patterns: [...((_a2 = args[0]) == null ? void 0 : _a2.patterns) || [], defaultCopyPattern]
+            }
+          ];
+        });
+      }
+      const { entrypoints } = appContext;
+      const existNestedRoutes = entrypoints.some(
+        (entrypoint) => entrypoint.nestedRoutesEntry
+      );
+      const routerConfig = (_a = modernConfig == null ? void 0 : modernConfig.runtime) == null ? void 0 : _a.router;
+      const routerManifest = Boolean(routerConfig == null ? void 0 : routerConfig.manifest);
+      if (existNestedRoutes || routerManifest) {
+        chain.plugin("route-plugin").use(RouterPlugin);
+      }
+    });
+  }
+});
+export {
+  PluginCompatModern
+};

package/dist/js/modern/builder/builder-webpack/index.js

@@ -0,0 +1,93 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+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 __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());
+  });
+};
+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";
+function createWebpackBuilderForModern(options) {
+  return generateBuilder(options, builderWebpackProvider, {
+    modifyBuilderConfig(config) {
+      modifyOutputConfig(config, options.appContext);
+    },
+    modifyBuilderInstance(builder) {
+      return __async(this, null, function* () {
+        yield applyBuilderPlugins(builder, options);
+      });
+    }
+  });
+}
+function modifyOutputConfig(config, appContext) {
+  config.output = createOutputConfig(config, appContext);
+  function createOutputConfig(config2, appContext2) {
+    const defaultCopyPattern = createCopyPattern(appContext2, config2, "upload");
+    const { copy } = config2.output;
+    const copyOptions = Array.isArray(copy) ? copy : copy == null ? void 0 : copy.patterns;
+    const builderCopy = [...copyOptions || [], defaultCopyPattern];
+    return __spreadProps(__spreadValues({}, config2.output), {
+      copy: builderCopy
+    });
+  }
+}
+function applyBuilderPlugins(builder, options) {
+  return __async(this, null, function* () {
+    const { normalizedConfig } = options;
+    if (!normalizedConfig.output.disableNodePolyfill) {
+      const { PluginNodePolyfill } = yield import("@modern-js/builder-plugin-node-polyfill");
+      builder.addPlugins([PluginNodePolyfill()]);
+    }
+    if (normalizedConfig.tools.esbuild) {
+      const { esbuild: esbuildOptions } = normalizedConfig.tools;
+      const { PluginEsbuild } = yield import("@modern-js/builder-plugin-esbuild");
+      builder.addPlugins([
+        PluginEsbuild({
+          loader: false,
+          minimize: applyOptionsChain({}, esbuildOptions)
+        })
+      ]);
+    }
+    builder.addPlugins([PluginCompatModern(options)]);
+  });
+}
+export {
+  createWebpackBuilderForModern
+};

package/dist/js/modern/builder/{webpackPlugins/routerPlugin.js → builder-webpack/webpackPlugins/RouterPlugin.js}

@@ -32,6 +32,9 @@ class RouterPlugin {
     if (target === "node" || Array.isArray(target) && target.includes("node")) {
       return;
     }
+    if (target === "webworker" || Array.isArray(target) && target.includes("webworker")) {
+      return;
+    }
     const { webpack } = compiler;
     const { Compilation, sources } = webpack;
     const { RawSource } = sources;
@@ -109,5 +112,5 @@ class RouterPlugin {
   }
 }
 export {
-  RouterPlugin as default
+  RouterPlugin
 };

package/dist/js/modern/builder/builder-webpack/webpackPlugins/index.js

@@ -0,0 +1 @@
+export * from "./RouterPlugin";

package/dist/js/modern/builder/generator/createBuilderOptions.js

@@ -0,0 +1,24 @@
+function createBuilderOptions(target, appContext) {
+  const entries = {};
+  const { entrypoints = [], checkedEntries } = appContext;
+  for (const { entryName, entry } of entrypoints) {
+    if (checkedEntries && !checkedEntries.includes(entryName)) {
+      continue;
+    }
+    if (entryName in entries) {
+      entries[entryName].push(entry);
+    } else {
+      entries[entryName] = [entry];
+    }
+  }
+  return {
+    cwd: appContext.appDirectory,
+    target,
+    configPath: appContext.configFile || void 0,
+    entry: entries,
+    framework: appContext.metaName
+  };
+}
+export {
+  createBuilderOptions
+};

package/dist/js/modern/builder/generator/createBuilderProviderConfig.js

@@ -0,0 +1,39 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+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));
+function createBuilderProviderConfig(resolveConfig, appContext, modifyBuilderConfig) {
+  const htmlConfig = __spreadValues({}, resolveConfig.html);
+  if (!htmlConfig.template) {
+    htmlConfig.templateByEntries = __spreadValues(__spreadValues({}, htmlConfig.templateByEntries), appContext.htmlTemplates);
+  }
+  const config = __spreadProps(__spreadValues({}, resolveConfig), {
+    dev: __spreadProps(__spreadValues({}, resolveConfig.dev), {
+      port: appContext.port
+    }),
+    html: htmlConfig,
+    output: __spreadProps(__spreadValues({}, resolveConfig.output), {
+      cleanDistPath: false
+    })
+  });
+  modifyBuilderConfig == null ? void 0 : modifyBuilderConfig(config);
+  return config;
+}
+export {
+  createBuilderProviderConfig
+};

package/dist/js/modern/builder/generator/getBuilderTargets.js

@@ -0,0 +1,21 @@
+import {
+  isProd,
+  isServiceWorker,
+  isSSR,
+  isUseSSRBundle
+} from "@modern-js/utils";
+function getBuilderTargets(normalizedConfig) {
+  const targets = ["web"];
+  const useNodeTarget = isProd() ? isUseSSRBundle(normalizedConfig) : isSSR(normalizedConfig);
+  if (useNodeTarget) {
+    targets.push("node");
+  }
+  const useWorkerTarget = isProd() ? isServiceWorker(normalizedConfig) : false;
+  if (useWorkerTarget) {
+    targets.push("service-worker");
+  }
+  return targets;
+}
+export {
+  getBuilderTargets
+};

package/dist/js/modern/builder/generator/index.js

@@ -0,0 +1,53 @@
+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());
+  });
+};
+import { createBuilder } from "@modern-js/builder";
+import { createBuilderProviderConfig } from "./createBuilderProviderConfig";
+import { getBuilderTargets } from "./getBuilderTargets";
+import { createBuilderOptions } from "./createBuilderOptions";
+function generateBuilder(options, generateProvider, utils) {
+  return __async(this, null, function* () {
+    const { normalizedConfig, appContext } = options;
+    const { modifyBuilderConfig, modifyBuilderInstance } = utils || {};
+    const builderConfig = createBuilderProviderConfig(
+      normalizedConfig,
+      appContext,
+      modifyBuilderConfig
+    );
+    const provider = generateProvider({
+      builderConfig
+    });
+    const target = getBuilderTargets(normalizedConfig);
+    const builderOptions = createBuilderOptions(target, appContext);
+    const builder = yield createBuilder(provider, builderOptions);
+    yield applyBuilderPlugins(builder, options);
+    yield modifyBuilderInstance == null ? void 0 : modifyBuilderInstance(builder);
+    return builder;
+  });
+}
+function applyBuilderPlugins(builder, options) {
+  return __async(this, null, function* () {
+    const { builderPluginAdapterModern } = yield import("../shared/builderPlugins/adapterModern");
+    builder.addPlugins([builderPluginAdapterModern(options)]);
+  });
+}
+export {
+  generateBuilder
+};

package/dist/js/modern/builder/index.js

@@ -1,22 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-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 __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -37,123 +18,22 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import {
-  createBuilder
-} from "@modern-js/builder";
-import {
-  builderWebpackProvider
-} from "@modern-js/builder-webpack-provider";
-import {
-  applyOptionsChain,
-  isProd,
-  isSSR,
-  isUseSSRBundle
-} from "@modern-js/utils";
-import {
-  PluginCompatModern
-} from "./builderPlugins/compatModern";
-import { createCopyPattern } from "./share";
-function getBuilderTargets(normalizedConfig) {
-  const targets = ["web"];
-  const useNodeTarget = isProd() ? isUseSSRBundle(normalizedConfig) : isSSR(normalizedConfig);
-  if (useNodeTarget) {
-    targets.push("node");
-  }
-  return targets;
-}
-function createBuilderForModern(_0) {
-  return __async(this, arguments, function* ({
-    normalizedConfig,
-    appContext,
-    compatPluginConfig
-  }) {
-    const builderConfig = createBuilderProviderConfig(
-      normalizedConfig,
-      appContext
-    );
-    const webpackProvider = builderWebpackProvider({
-      builderConfig
-    });
-    const target = getBuilderTargets(normalizedConfig);
-    const builderOptions = createBuilderOptions(target, appContext);
-    const builder = yield createBuilder(webpackProvider, builderOptions);
-    yield applyBuilderPlugins(
-      builder,
-      normalizedConfig,
-      appContext,
-      compatPluginConfig
-    );
-    return builder;
-  });
-}
-function createBuilderProviderConfig(normalizedConfig, appContext) {
-  const output = createOutputConfig(normalizedConfig, appContext);
-  const htmlConfig = __spreadValues({}, normalizedConfig.html);
-  if (!htmlConfig.template) {
-    htmlConfig.templateByEntries = __spreadValues(__spreadValues({}, htmlConfig.templateByEntries), appContext.htmlTemplates);
-  }
-  return __spreadProps(__spreadValues({}, normalizedConfig), {
-    output,
-    dev: __spreadProps(__spreadValues({}, normalizedConfig.dev), {
-      port: appContext.port
-    }),
-    html: htmlConfig
-  });
-  function createOutputConfig(config, appContext2) {
-    const defaultCopyPattern = createCopyPattern(appContext2, config, "upload");
-    const { copy } = config.output;
-    const copyOptions = Array.isArray(copy) ? copy : copy == null ? void 0 : copy.patterns;
-    const builderCopy = [...copyOptions || [], defaultCopyPattern];
-    return __spreadProps(__spreadValues({}, config.output), {
-      copy: builderCopy,
-      cleanDistPath: false
-    });
-  }
-}
-function createBuilderOptions(target, appContext) {
-  const entries = {};
-  const { entrypoints = [], checkedEntries } = appContext;
-  for (const { entryName, entry } of entrypoints) {
-    if (checkedEntries && !checkedEntries.includes(entryName)) {
-      continue;
-    }
-    if (entryName in entries) {
-      entries[entryName].push(entry);
-    } else {
-      entries[entryName] = [entry];
-    }
-  }
-  return {
-    cwd: appContext.appDirectory,
-    target,
-    configPath: appContext.configFile || void 0,
-    entry: entries,
-    framework: appContext.metaName
-  };
-}
-function applyBuilderPlugins(builder, normalizedConfig, appContext, compatPluginConfig) {
+function createBuilderGenerator(bundler) {
   return __async(this, null, function* () {
-    if (!normalizedConfig.output.disableNodePolyfill) {
-      const { builderPluginNodePolyfill } = yield import("@modern-js/builder-plugin-node-polyfill");
-      builder.addPlugins([builderPluginNodePolyfill()]);
-    }
-    if (normalizedConfig.tools.esbuild) {
-      const { esbuild: esbuildOptions } = normalizedConfig.tools;
-      const { builderPluginEsbuild } = yield import("@modern-js/builder-plugin-esbuild");
-      builder.addPlugins([
-        builderPluginEsbuild({
-          loader: false,
-          minimize: applyOptionsChain({}, esbuildOptions)
-        })
-      ]);
+    if (bundler === "rspack") {
+      try {
+        const { createRspackBuilderForModern } = yield import("./builder-rspack");
+        return createRspackBuilderForModern;
+      } catch (_) {
+        throw new Error(
+          "Failed to use rspack, please check if you have `@modern-js/builder-rspack-provider` installed"
+        );
+      }
     }
-    builder.addPlugins([
-      PluginCompatModern(appContext, normalizedConfig, compatPluginConfig)
-    ]);
+    const { createWebpackBuilderForModern } = yield import("./builder-webpack");
+    return createWebpackBuilderForModern;
   });
 }
 export {
-  createBuilderForModern,
-  createBuilderOptions,
-  createBuilderProviderConfig
+  createBuilderGenerator
 };