@modern-js/app-tools 2.13.4 → 2.15.0

package/dist/esm/builder/builder-webpack/{builderPlugins/compatModern.js → adapterModern.js}

@@ -24,17 +24,17 @@ function _unsupportedIterableToArray(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
 }
 import { join } from "path";
-import { createCopyPattern } from "../../shared";
-var builderPluginCompatModern = function(options) {
+import { createPublicPattern } from "./createCopyPattern";
+var builderPluginAdapterModern = function(options) {
     return {
-        name: "builder-plugin-compat-modern",
+        name: "builder-plugin-adapter-",
         setup: function setup(api) {
             var modernConfig = options.normalizedConfig, appContext = options.appContext;
             api.modifyWebpackChain(function(chain, param) {
                 var CHAIN_ID = param.CHAIN_ID;
                 chain.resolve.modules.add("node_modules").add(join(api.context.rootPath, "node_modules"));
                 if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
-                    var defaultCopyPattern = createCopyPattern(appContext, modernConfig, "public", chain);
+                    var defaultCopyPattern = createPublicPattern(appContext, modernConfig, chain);
                     chain.plugin(CHAIN_ID.PLUGIN.COPY).tap(function(args) {
                         var _args_;
                         return [
@@ -50,4 +50,4 @@ var builderPluginCompatModern = function(options) {
         }
     };
 };
-export { builderPluginCompatModern };
+export { builderPluginAdapterModern };

package/dist/esm/builder/builder-webpack/createCopyPattern.js

@@ -0,0 +1,39 @@
+import { removeTailSlash } from "@modern-js/utils";
+import { createCopyInfo } from "../shared";
+var minifiedJsRexExp = /\.min\.js/;
+var info = function(file) {
+    return {
+        // If the file name ends with `.min.js`, we assume it's a compressed file.
+        // So we don't want copy-webpack-plugin to minify it.
+        // ref: https://github.com/webpack-contrib/copy-webpack-plugin#info
+        minimized: minifiedJsRexExp.test(file.sourceFilename)
+    };
+};
+function createPublicPattern(appContext, config, chain) {
+    var publicDir = createCopyInfo(appContext, config).publicDir;
+    return {
+        info: info,
+        from: "**/*",
+        to: "public",
+        context: publicDir,
+        noErrorOnMissing: true,
+        // eslint-disable-next-line node/prefer-global/buffer
+        transform: function(content, absoluteFrom) {
+            if (!/\.html?$/.test(absoluteFrom)) {
+                return content;
+            }
+            return content.toString("utf8").replace(/<%=\s*assetPrefix\s*%>/g, removeTailSlash(chain.output.get("publicPath")));
+        }
+    };
+}
+function createUploadPattern(appContext, config) {
+    var uploadDir = createCopyInfo(appContext, config).uploadDir;
+    return {
+        info: info,
+        from: "**/*",
+        to: "upload",
+        context: uploadDir,
+        noErrorOnMissing: true
+    };
+}
+export { createPublicPattern, createUploadPattern };

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

@@ -200,9 +200,9 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import { builderWebpackProvider } from "@modern-js/builder-webpack-provider";
-import { createCopyPattern } from "../shared";
 import { generateBuilder } from "../generator";
-import { builderPluginCompatModern } from "./builderPlugins/compatModern";
+import { builderPluginAdapterModern } from "./adapterModern";
+import { createUploadPattern } from "./createCopyPattern";
 function createWebpackBuilderForModern(options) {
     return generateBuilder(options, builderWebpackProvider, {
         modifyBuilderConfig: function modifyBuilderConfig(config) {
@@ -230,7 +230,7 @@ function createWebpackBuilderForModern(options) {
 }
 function modifyOutputConfig(config, appContext) {
     var createOutputConfig = function createOutputConfig(config2, appContext2) {
-        var defaultCopyPattern = createCopyPattern(appContext2, config2, "upload");
+        var defaultCopyPattern = createUploadPattern(appContext2, config2);
         var copy = config2.output.copy;
         var copyOptions = Array.isArray(copy) ? copy : copy === null || copy === void 0 ? void 0 : copy.patterns;
         var builderCopy = _toConsumableArray(copyOptions || []).concat([
@@ -269,7 +269,7 @@ function _applyBuilderPlugins() {
                     _state.label = 2;
                 case 2:
                     builder.addPlugins([
-                        builderPluginCompatModern(options)
+                        builderPluginAdapterModern(options)
                     ]);
                     return [
                         2

package/dist/esm/builder/shared/createCopyInfo.js

@@ -0,0 +1,12 @@
+import path from "path";
+function createCopyInfo(appContext, config) {
+    var configDir = path.resolve(appContext.appDirectory, config.source.configDir || "./config");
+    var uploadDir = path.posix.join(configDir.replace(/\\/g, "/"), "upload");
+    var publicDir = path.posix.join(configDir.replace(/\\/g, "/"), "public");
+    return {
+        configDir: configDir,
+        uploadDir: uploadDir,
+        publicDir: publicDir
+    };
+}
+export { createCopyInfo };

package/dist/esm/builder/shared/index.js

@@ -1,3 +1,3 @@
-export * from "./createCopyPattern";
 export * from "./types";
 export * from "./builderPlugins";
+export * from "./createCopyInfo";

package/dist/esm/config/default.js

@@ -51,6 +51,7 @@ function _objectSpreadProps(target, source) {
     return target;
 }
 import { createDefaultConfig as createDefaultBuilderConfig } from "@modern-js/builder-webpack-provider";
+import { getAutoInjectEnv } from "../utils/env";
 function createDefaultConfig(appContext, bundler) {
     var defaultBuilderConfig = createDefaultBuilderConfig();
     var dev = _objectSpreadProps(_objectSpread({}, defaultBuilderConfig.dev), {
@@ -68,6 +69,7 @@ function createDefaultConfig(appContext, bundler) {
         disableDefaultEntries: false,
         entriesDir: "./src",
         configDir: "./config",
+        globalVars: getAutoInjectEnv(appContext),
         alias: (_obj = {}, _defineProperty(_obj, appContext.internalDirAlias, appContext.internalDirectory), _defineProperty(_obj, appContext.internalSrcAlias, appContext.srcDirectory), _defineProperty(_obj, "@", appContext.srcDirectory), _defineProperty(_obj, "@shared", appContext.sharedDirectory), _obj)
     });
     var html = _objectSpreadProps(_objectSpread({}, defaultBuilderConfig.html), {
@@ -121,7 +123,7 @@ function createLegacyDefaultConfig(appContext) {
         configDir: "./config",
         apiDir: "./api",
         envVars: [],
-        globalVars: void 0,
+        globalVars: getAutoInjectEnv(appContext),
         alias: defaultAlias,
         moduleScopes: void 0,
         include: []

package/dist/esm/config/initialize/inits.js

@@ -77,7 +77,6 @@ function _unsupportedIterableToArray(o, minLen) {
 }
 import path, { dirname, isAbsolute, posix, sep } from "path";
 import { applyOptionsChain, findExists, findMonorepoRoot, globby, isModernjsMonorepo } from "@modern-js/utils";
-import { getAutoInjectEnv } from "../../utils/env";
 function initHtmlConfig(config, appContext) {
     var createBuilderAppIcon = function createBuilderAppIcon(config2, appContext2) {
         var configDir = config2.source.configDir;
@@ -106,11 +105,6 @@ function initHtmlConfig(config, appContext) {
     return config.html;
 }
 function initSourceConfig(config, appContext, bundler) {
-    var createBuilderGlobalVars = function createBuilderGlobalVars(config2, appContext2) {
-        var _config2_source = config2.source, _config2_source_globalVars = _config2_source.globalVars, globalVars = _config2_source_globalVars === void 0 ? {} : _config2_source_globalVars;
-        var publicEnv = getAutoInjectEnv(appContext2);
-        return _objectSpread({}, globalVars, publicEnv);
-    };
     var createBuilderInclude = function createBuilderInclude(config2, appContext2) {
         var include = config2.source.include;
         var defaultInclude = [
@@ -176,7 +170,6 @@ function initSourceConfig(config, appContext, bundler) {
         }
     };
     config.source.include = createBuilderInclude(config, appContext);
-    config.source.globalVars = createBuilderGlobalVars(config, appContext);
     if (bundler === "webpack") {
         config.source.moduleScopes = createBuilderModuleScope(config);
     }

package/dist/esm/index.js

@@ -583,7 +583,7 @@ var src_default = function() {
                                             return _ref.apply(this, arguments);
                                         };
                                     }());
-                                    program.command("inspect").description("inspect internal webpack config").option("--env <env>", i18n.t(localeKeys.command.inspect.env), "development").option("--output <output>", i18n.t(localeKeys.command.inspect.output), "/").option("--verbose", i18n.t(localeKeys.command.inspect.verbose)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(function() {
+                                    program.command("inspect").description("inspect the internal configs").option("--env <env>", i18n.t(localeKeys.command.inspect.env), "development").option("--output <output>", i18n.t(localeKeys.command.inspect.output), "/").option("--verbose", i18n.t(localeKeys.command.inspect.verbose)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(function() {
                                         var _ref = _asyncToGenerator(function(options2) {
                                             var inspect;
                                             return __generator(this, function(_state) {
@@ -616,7 +616,7 @@ var src_default = function() {
                 },
                 prepare: function prepare() {
                     return _asyncToGenerator(function() {
-                        var command, appContext;
+                        var command, resolvedConfig, appContext;
                         return __generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
@@ -625,6 +625,11 @@ var src_default = function() {
                                         3,
                                         2
                                     ];
+                                    resolvedConfig = api.useResolvedConfigContext();
+                                    if (!resolvedConfig.output.cleanDistPath) return [
+                                        3,
+                                        2
+                                    ];
                                     appContext = api.useAppContext();
                                     return [
                                         4,

package/dist/esm/locale/en.js

@@ -5,7 +5,7 @@ var EN_LOCALE = {
             config: "specify config file"
         },
         dev: {
-            describe: "start dev server",
+            describe: "starting the dev server",
             entry: "compiler by entry",
             apiOnly: "start api server only",
             webOnly: "start web server only",
@@ -13,16 +13,16 @@ var EN_LOCALE = {
             requireEntry: "You must choose at least one entry"
         },
         build: {
-            describe: "build application"
+            describe: "build the app for production"
         },
         serve: {
-            describe: "start server"
+            describe: "preview the production build locally"
         },
         deploy: {
-            describe: "deploy application"
+            describe: "deploy the application"
         },
         new: {
-            describe: "generator runner for MWA project",
+            describe: "enable optional features or add a new entry",
             debug: "using debug mode to log something",
             config: "set default generator config(json string)",
             distTag: "use specified tag version for it's generator",

package/dist/esm/locale/zh.js

@@ -5,7 +5,7 @@ var ZH_LOCALE = {
             config: "指定配置文件路径，可以为相对路径或绝对路径"
         },
         dev: {
-            describe: "本地开发命令",
+            describe: "启动开发服务器",
             entry: "指定入口，编译特定的页面",
             apiOnly: "仅启动 API 接口服务",
             webOnly: "仅启动 Web 服务",
@@ -13,13 +13,13 @@ var ZH_LOCALE = {
             requireEntry: "请至少选择一个入口"
         },
         build: {
-            describe: "构建应用命令"
+            describe: "构建生产环境产物"
         },
         serve: {
-            describe: "应用启动命令"
+            describe: "启动生产环境服务"
         },
         deploy: {
-            describe: "部署应用命令"
+            describe: "部署应用"
         },
         new: {
             describe: "Web App 项目中执行生成器",

package/dist/esm/schema/legacy.js

@@ -67,7 +67,10 @@ var source = {
         type: "array"
     },
     globalVars: {
-        type: "object"
+        typeof: [
+            "object",
+            "function"
+        ]
     },
     moduleScopes: {
         instanceof: [

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

@@ -25,7 +25,9 @@ const NESTED_ROUTE = {
   ERROR_FILE: "error",
   LOADER_FILE: "loader",
   SPLATE_FILE: "$",
-  SPLATE_LOADER_FILE: "$.loader"
+  SPLATE_LOADER_FILE: "$.loader",
+  LAYOUT_CONFIG_FILE: "layout.config",
+  PAGE_CONFIG_FILE: "page.config"
 };
 const APP_CONFIG_NAME = "config";
 const APP_INIT_EXPORTED = "init";

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

@@ -75,12 +75,15 @@ const applyRouteOptions = (original, routeOptions) => {
   return routes;
 };
 const collectHtmlRoutes = (entrypoints, appContext, config) => {
+  var _a;
   const {
     html: { disableHtmlFolder },
     output: { distPath: { html: htmlPath } = {} },
-    server: { baseUrl, routes, ssr, ssrByEntries, worker }
+    server: { baseUrl, routes, ssr, ssrByEntries },
+    deploy
   } = config;
   const { packageName } = appContext;
+  const workerSSR = (_a = deploy == null ? void 0 : deploy.worker) == null ? void 0 : _a.ssr;
   let htmlRoutes = entrypoints.reduce(
     (previous, { entryName }) => {
       const entryOptions = getEntryOptions(
@@ -90,7 +93,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
         packageName
       );
       const isSSR = Boolean(entryOptions);
-      const isWorker = Boolean(worker);
+      const isWorker = Boolean(workerSSR);
       const { resHeaders } = (routes == null ? void 0 : routes[entryName]) || {};
       let route = {
         urlPath: `/${entryName === MAIN_ENTRY_NAME ? "" : entryName}`,

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

@@ -55,6 +55,7 @@ const walk = async (dirname, rootDir, alias, entryName) => {
   let pageRoute = null;
   let splatLoaderFile = "";
   let splatRoute = null;
+  let pageConfigFile = "";
   const items = await fs.readdir(dirname);
   for (const item of items) {
     const itemPath = path.join(dirname, item);
@@ -75,12 +76,20 @@ const walk = async (dirname, rootDir, alias, entryName) => {
         route.loader = itemPath;
       }
     }
+    if (itemWithoutExt === NESTED_ROUTE.LAYOUT_CONFIG_FILE) {
+      if (!route.config) {
+        route.config = itemPath;
+      }
+    }
     if (itemWithoutExt === NESTED_ROUTE.LAYOUT_FILE) {
       route._component = replaceWithAlias(alias.basename, itemPath, alias.name);
     }
     if (itemWithoutExt === NESTED_ROUTE.PAGE_LOADER_FILE) {
       pageLoaderFile = itemPath;
     }
+    if (itemWithoutExt === NESTED_ROUTE.PAGE_CONFIG_FILE) {
+      pageConfigFile = itemPath;
+    }
     if (itemWithoutExt === NESTED_ROUTE.PAGE_FILE) {
       pageRoute = createIndexRoute(
         {
@@ -93,6 +102,9 @@ const walk = async (dirname, rootDir, alias, entryName) => {
       if (pageLoaderFile) {
         pageRoute.loader = pageLoaderFile;
       }
+      if (pageConfigFile) {
+        pageRoute.config = pageConfigFile;
+      }
       (_b = route.children) == null ? void 0 : _b.push(pageRoute);
     }
     if (itemWithoutExt === NESTED_ROUTE.SPLATE_LOADER_FILE) {

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

@@ -150,6 +150,8 @@ const fileSystemRoutes = async ({
   const errors = [];
   const loaders = [];
   const loadersMap = {};
+  const configs = [];
+  const configsMap = {};
   const loadersMapFile = path.join(
     internalDirectory,
     entryName,
@@ -179,6 +181,7 @@ const fileSystemRoutes = async ({
     let loading;
     let error;
     let loader;
+    let config;
     let component = "";
     let lazyImport = null;
     if (route.type === "nested") {
@@ -200,6 +203,12 @@ const fileSystemRoutes = async ({
           inline: false
         };
       }
+      if (typeof route.config === "string") {
+        configs.push(route.config);
+        const configId = configs.length - 1;
+        config = `config_${configId}`;
+        configsMap[config] = route.config;
+      }
       if (route._component) {
         if (splitRouteChunks) {
           if (route.isRoot) {
@@ -231,6 +240,7 @@ const fileSystemRoutes = async ({
       lazyImport,
       loading,
       loader,
+      config,
       error,
       children
     };
@@ -251,7 +261,8 @@ const fileSystemRoutes = async ({
         "lazyImport",
         "loader",
         "loading",
-        "error"
+        "error",
+        "config"
       ];
       const regs = keywords.map(createMatchReg);
       const newRouteStr = regs.reduce((acc, reg) => acc.replace(reg, "$1$2"), routeStr).replace(/"(RootLayout)"/g, "$1").replace(/\\"/g, '"');
@@ -297,6 +308,11 @@ const fileSystemRoutes = async ({
 `;
     }
   }
+  let importConfigsCode = "";
+  for (const [key, configPath] of Object.entries(configsMap)) {
+    importConfigsCode += `import * as ${key} from "${slash(configPath)}";
+`;
+  }
   await fs.ensureFile(loadersMapFile);
   await fs.writeJSON(loadersMapFile, loadersMap);
   return `
@@ -306,6 +322,7 @@ const fileSystemRoutes = async ({
     ${importLoadingCode}
     ${importErrorComponentsCode}
     ${importLoadersCode}
+    ${importConfigsCode}
     ${routeComponentsCode}
   `;
 };

package/dist/esm-node/builder/builder-rspack/adapterCopy.js

@@ -0,0 +1,103 @@
+import path from "path";
+import fs from "@modern-js/utils/fs-extra";
+import { logger, removeTailSlash } from "@modern-js/utils";
+import { createCopyInfo } from "../shared";
+const builderPluginAdpaterCopy = (options) => ({
+  name: "builder-plugin-adapter-rspack-copy",
+  setup(api) {
+    let publicPath;
+    api.modifyRspackConfig((config) => {
+      var _a, _b, _c;
+      config.builtins = {
+        ...config.builtins || {},
+        copy: {
+          patterns: [
+            ...transformCopy((_b = (_a = config.builtins) == null ? void 0 : _a.copy) == null ? void 0 : _b.patterns),
+            ...createConfigBuiltinCopy(options)
+          ]
+        }
+      };
+      publicPath = (_c = config.output) == null ? void 0 : _c.publicPath;
+    });
+    api.onDevCompileDone(async () => {
+      await transformHtmlFiles();
+    });
+    api.onAfterBuild(async () => {
+      await transformHtmlFiles();
+    });
+    async function transformHtmlFiles() {
+      var _a;
+      const { normalizedConfig } = options;
+      const publicDir = path.resolve(
+        ((_a = normalizedConfig.output.distPath) == null ? void 0 : _a.root) || "./dist",
+        "./public"
+      );
+      if (!fs.existsSync(publicDir) || !fs.statSync(publicDir).isDirectory()) {
+        return;
+      }
+      const HTML_REGEXP = /\.html?$/;
+      const filepaths = (await fs.readdir(publicDir)).map(
+        (file) => path.resolve(publicDir, file)
+      );
+      await Promise.all(
+        filepaths.filter((file) => HTML_REGEXP.test(file)).map(async (file) => {
+          const content = await fs.readFile(file, "utf-8");
+          if (publicPath) {
+            await fs.writeFile(
+              file,
+              content.replace(
+                /<%=\s*assetPrefix\s*%>/g,
+                removeTailSlash(publicPath)
+              )
+            );
+          } else {
+            logger.warn(
+              "Expect get a string from `publicPath`, but receive `undefined`."
+            );
+            await fs.writeFile(
+              file,
+              content.replace(
+                /<%=\s*assetPrefix\s*%>/g,
+                removeTailSlash("/")
+              )
+            );
+          }
+        })
+      );
+    }
+  }
+});
+function transformCopy(patterns) {
+  if (patterns) {
+    patterns.map((value) => {
+      if (typeof value === "string") {
+        return {
+          from: value
+        };
+      }
+      return value;
+    });
+  }
+  return [];
+}
+function createConfigBuiltinCopy(options) {
+  const { normalizedConfig, appContext } = options;
+  const { uploadDir, publicDir } = createCopyInfo(appContext, normalizedConfig);
+  return [
+    {
+      from: "**/*",
+      to: "public",
+      context: publicDir,
+      noErrorOnMissing: true
+    },
+    {
+      from: "**/*",
+      to: "upload",
+      context: uploadDir,
+      noErrorOnMissing: true
+    }
+  ];
+}
+export {
+  builderPluginAdpaterCopy
+};

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

@@ -1,7 +1,12 @@
 import { builderRspackProvider } from "@modern-js/builder-rspack-provider";
 import { generateBuilder } from "../generator";
+import { builderPluginAdpaterCopy } from "./adapterCopy";
 function createRspackBuilderForModern(options) {
-  return generateBuilder(options, builderRspackProvider);
+  return generateBuilder(options, builderRspackProvider, {
+    modifyBuilderInstance(builder) {
+      builder.addPlugins([builderPluginAdpaterCopy(options)]);
+    }
+  });
 }
 export {
   createRspackBuilderForModern

package/dist/esm-node/builder/builder-webpack/{builderPlugins/compatModern.js → adapterModern.js}

@@ -1,16 +1,15 @@
 import { join } from "path";
-import { createCopyPattern } from "../../shared";
-const builderPluginCompatModern = (options) => ({
-  name: "builder-plugin-compat-modern",
+import { createPublicPattern } from "./createCopyPattern";
+const builderPluginAdapterModern = (options) => ({
+  name: "builder-plugin-adapter-",
   setup(api) {
     const { normalizedConfig: modernConfig, appContext } = options;
     api.modifyWebpackChain((chain, { CHAIN_ID }) => {
       chain.resolve.modules.add("node_modules").add(join(api.context.rootPath, "node_modules"));
       if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
-        const defaultCopyPattern = createCopyPattern(
+        const defaultCopyPattern = createPublicPattern(
           appContext,
           modernConfig,
-          "public",
           chain
         );
         chain.plugin(CHAIN_ID.PLUGIN.COPY).tap((args) => {
@@ -26,5 +25,5 @@ const builderPluginCompatModern = (options) => ({
   }
 });
 export {
-  builderPluginCompatModern
+  builderPluginAdapterModern
 };

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

@@ -0,0 +1,43 @@
+import { removeTailSlash } from "@modern-js/utils";
+import { createCopyInfo } from "../shared";
+const minifiedJsRexExp = /\.min\.js/;
+const info = (file) => ({
+  // If the file name ends with `.min.js`, we assume it's a compressed file.
+  // So we don't want copy-webpack-plugin to minify it.
+  // ref: https://github.com/webpack-contrib/copy-webpack-plugin#info
+  minimized: minifiedJsRexExp.test(file.sourceFilename)
+});
+function createPublicPattern(appContext, config, chain) {
+  const { publicDir } = createCopyInfo(appContext, config);
+  return {
+    info,
+    from: "**/*",
+    to: "public",
+    context: publicDir,
+    noErrorOnMissing: true,
+    // eslint-disable-next-line node/prefer-global/buffer
+    transform: (content, absoluteFrom) => {
+      if (!/\.html?$/.test(absoluteFrom)) {
+        return content;
+      }
+      return content.toString("utf8").replace(
+        /<%=\s*assetPrefix\s*%>/g,
+        removeTailSlash(chain.output.get("publicPath"))
+      );
+    }
+  };
+}
+function createUploadPattern(appContext, config) {
+  const { uploadDir } = createCopyInfo(appContext, config);
+  return {
+    info,
+    from: "**/*",
+    to: "upload",
+    context: uploadDir,
+    noErrorOnMissing: true
+  };
+}
+export {
+  createPublicPattern,
+  createUploadPattern
+};

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

@@ -1,9 +1,9 @@
 import {
   builderWebpackProvider
 } from "@modern-js/builder-webpack-provider";
-import { createCopyPattern } from "../shared";
 import { generateBuilder } from "../generator";
-import { builderPluginCompatModern } from "./builderPlugins/compatModern";
+import { builderPluginAdapterModern } from "./adapterModern";
+import { createUploadPattern } from "./createCopyPattern";
 function createWebpackBuilderForModern(options) {
   return generateBuilder(options, builderWebpackProvider, {
     modifyBuilderConfig(config) {
@@ -17,7 +17,7 @@ function createWebpackBuilderForModern(options) {
 function modifyOutputConfig(config, appContext) {
   config.output = createOutputConfig(config, appContext);
   function createOutputConfig(config2, appContext2) {
-    const defaultCopyPattern = createCopyPattern(appContext2, config2, "upload");
+    const defaultCopyPattern = createUploadPattern(appContext2, config2);
     const { copy } = config2.output;
     const copyOptions = Array.isArray(copy) ? copy : copy == null ? void 0 : copy.patterns;
     const builderCopy = [...copyOptions || [], defaultCopyPattern];
@@ -34,7 +34,7 @@ async function applyBuilderPlugins(builder, options) {
     const { builderPluginEsbuild } = await import("@modern-js/builder-plugin-esbuild");
     builder.addPlugins([builderPluginEsbuild(esbuildOptions)]);
   }
-  builder.addPlugins([builderPluginCompatModern(options)]);
+  builder.addPlugins([builderPluginAdapterModern(options)]);
 }
 export {
   createWebpackBuilderForModern

package/dist/esm-node/builder/shared/createCopyInfo.js

@@ -0,0 +1,17 @@
+import path from "path";
+function createCopyInfo(appContext, config) {
+  const configDir = path.resolve(
+    appContext.appDirectory,
+    config.source.configDir || "./config"
+  );
+  const uploadDir = path.posix.join(configDir.replace(/\\/g, "/"), "upload");
+  const publicDir = path.posix.join(configDir.replace(/\\/g, "/"), "public");
+  return {
+    configDir,
+    uploadDir,
+    publicDir
+  };
+}
+export {
+  createCopyInfo
+};

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

@@ -1,3 +1,3 @@
-export * from "./createCopyPattern";
 export * from "./types";
 export * from "./builderPlugins";
+export * from "./createCopyInfo";