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

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

@@ -3,8 +3,7 @@ import {
   ensureAbsolutePath,
   fs,
   findExists,
-  MAIN_ENTRY_NAME,
-  isRouterV5
+  MAIN_ENTRY_NAME
 } from "@modern-js/utils";
 import { getFileSystemEntry } from "./getFileSystemEntry";
 import { JS_EXTENSIONS } from "./constants";
@@ -56,7 +55,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 && isRouterV5(config)) {
+      if (entrypoint.fileSystemRoutes) {
         entrypoint.nestedRoutesEntry = entrypoint.entry;
       }
       if (!ifAlreadyExists(defaults, entrypoint)) {

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 builderPluginCompatModern = (options) => ({
+const PluginCompatModern = (options) => ({
   name: "builder-plugin-compat-modern",
   setup(api) {
     const { normalizedConfig: modernConfig, appContext } = options;
@@ -37,5 +37,5 @@ const builderPluginCompatModern = (options) => ({
   }
 });
 export {
-  builderPluginCompatModern
+  PluginCompatModern
 };

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

@@ -1,9 +1,10 @@
 import {
   builderWebpackProvider
 } from "@modern-js/builder-webpack-provider";
+import { applyOptionsChain } from "@modern-js/utils";
 import { createCopyPattern } from "../shared";
 import { generateBuilder } from "../generator";
-import { builderPluginCompatModern } from "./builderPlugins/compatModern";
+import { PluginCompatModern } from "./builderPlugins/compatModern";
 function createWebpackBuilderForModern(options) {
   return generateBuilder(options, builderWebpackProvider, {
     modifyBuilderConfig(config) {
@@ -30,15 +31,20 @@ function modifyOutputConfig(config, appContext) {
 async function applyBuilderPlugins(builder, options) {
   const { normalizedConfig } = options;
   if (!normalizedConfig.output.disableNodePolyfill) {
-    const { builderPluginNodePolyfill } = await import("@modern-js/builder-plugin-node-polyfill");
-    builder.addPlugins([builderPluginNodePolyfill()]);
+    const { PluginNodePolyfill } = await import("@modern-js/builder-plugin-node-polyfill");
+    builder.addPlugins([PluginNodePolyfill()]);
   }
   if (normalizedConfig.tools.esbuild) {
     const { esbuild: esbuildOptions } = normalizedConfig.tools;
-    const { builderPluginEsbuild } = await import("@modern-js/builder-plugin-esbuild");
-    builder.addPlugins([builderPluginEsbuild(esbuildOptions)]);
+    const { PluginEsbuild } = await import("@modern-js/builder-plugin-esbuild");
+    builder.addPlugins([
+      PluginEsbuild({
+        loader: false,
+        minimize: applyOptionsChain({}, esbuildOptions)
+      })
+    ]);
   }
-  builder.addPlugins([builderPluginCompatModern(options)]);
+  builder.addPlugins([PluginCompatModern(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 = isServiceWorker(normalizedConfig);
+  const useWorkerTarget = isProd() ? isServiceWorker(normalizedConfig) : false;
   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, _b;
+  var _a;
   if (options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
   }
@@ -41,9 +41,14 @@ const dev = async (api, options) => {
     dev: {
       port,
       https: normalizedConfig.dev.https,
-      host: normalizedConfig.dev.host,
       ...(_a = normalizedConfig.tools) == null ? void 0 : _a.devServer
     },
+    appContext: {
+      appDirectory: appContext.appDirectory,
+      sharedDirectory: appContext.sharedDirectory,
+      apiDirectory: appContext.apiDirectory,
+      lambdaDirectory: appContext.lambdaDirectory
+    },
     pwd: appDirectory,
     config: normalizedConfig,
     serverConfigFile,
@@ -54,19 +59,12 @@ const dev = async (api, options) => {
       ...serverOptions,
       compiler: null
     });
-    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);
+    app.listen(port, async (err) => {
+      if (err) {
+        throw err;
       }
-    );
+      printInstructions(hookRunners, appContext, normalizedConfig);
+    });
   } else {
     const { server } = await appContext.builder.startDevServer({
       printURLs: false,

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

@@ -1,4 +1,4 @@
-import { logger, chalk, isApiOnly } from "@modern-js/utils";
+import { logger, chalk, isApiOnly, getTargetDir } from "@modern-js/utils";
 import server from "@modern-js/prod-server";
 import { printInstructions } from "../utils/printInstructions";
 import { injectDataLoaderPlugin } from "../utils/createServer";
@@ -18,6 +18,23 @@ const start = async (api) => {
   const app = await server({
     pwd: appDirectory,
     config: userConfig,
+    appContext: {
+      sharedDirectory: getTargetDir(
+        appContext.sharedDirectory,
+        appContext.appDirectory,
+        appContext.distDirectory
+      ),
+      apiDirectory: getTargetDir(
+        appContext.apiDirectory,
+        appContext.appDirectory,
+        appContext.distDirectory
+      ),
+      lambdaDirectory: getTargetDir(
+        appContext.lambdaDirectory,
+        appContext.appDirectory,
+        appContext.distDirectory
+      )
+    },
     serverConfigFile,
     internalPlugins: injectDataLoaderPlugin(serverInternalPlugins),
     apiOnly

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

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

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

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

package/dist/js/modern/analyze/getServerRoutes.js

@@ -38,7 +38,8 @@ import {
   getEntryOptions,
   SERVER_BUNDLE_DIRECTORY,
   MAIN_ENTRY_NAME,
-  removeTailSlash
+  removeTailSlash,
+  SERVER_WORKER_BUNDLE_DIRECTORY
 } from "@modern-js/utils";
 import { walkDirectory } from "./utils";
 const applyBaseUrl = (baseUrl, routes) => {
@@ -101,7 +102,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(
@@ -113,6 +114,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 === MAIN_ENTRY_NAME ? "" : entryName}`,
@@ -125,6 +127,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
         isSPA: true,
         isSSR,
         responseHeaders: resHeaders,
+        worker: isWorker ? `${SERVER_WORKER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0,
         bundle: isSSR ? `${SERVER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0
       };
       if (routes == null ? void 0 : routes.hasOwnProperty(entryName)) {

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,7 +67,9 @@ import {
   APP_INIT_IMPORTED
 } from "./constants";
 const debug = createDebugger("plugin-analyze");
-var analyze_default = () => ({
+var analyze_default = ({
+  bundler
+}) => ({
   name: "@modern-js/plugin-analyze",
   setup: (api) => {
     let pagesDir = [];
@@ -159,56 +161,55 @@ var analyze_default = () => ({
           if (buildCommands.includes(command)) {
             let _b;
             const normalizedConfig = api.useResolvedConfigContext();
+            const createBuilderForModern = yield createBuilderGenerator(bundler);
             const builder = yield createBuilderForModern({
               normalizedConfig,
               appContext,
-              compatPluginConfig: {
-                onBeforeBuild(_0) {
-                  return __async(this, arguments, function* ({ bundlerConfigs }) {
-                    const hookRunners2 = api.useHookRunners();
-                    yield generateRoutes(appContext);
-                    yield hookRunners2.beforeBuild({ bundlerConfigs });
+              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
-                        );
-                      }
+                });
+              },
+              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
                   });
-                },
-                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 });
+                });
+              },
+              onAfterCreateCompiler(_0) {
+                return __async(this, arguments, function* ({ compiler }) {
+                  const hookRunners2 = api.useHookRunners();
+                  yield hookRunners2.afterCreateCompiler({
+                    compiler
                   });
-                }
+                });
               }
             });
             builder.addPlugins(resolvedConfig.builderPlugins);
@@ -251,7 +252,7 @@ var analyze_default = () => ({
       },
       resolvedConfig({ resolved }) {
         const appContext = api.useAppContext();
-        const config = initialNormalizedConfig(resolved, appContext);
+        const config = initialNormalizedConfig(resolved, appContext, bundler);
         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;
+  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
+};