@modern-js/app-tools 2.13.4 → 2.15.0

package/CHANGELOG.md

@@ -1,5 +1,106 @@
 # @modern-js/app-tools
 
+## 2.15.0
+
+### Patch Changes
+
+- 18aeb8c: fix(app-tools): missing MODERN_TARGET type
+
+  fix(app-tools): 缺少 MODERN_TARGET 类型定义
+
+- Updated dependencies [7d23d39]
+- Updated dependencies [3e5e790]
+  - @modern-js/builder-rspack-provider@2.15.0
+  - @modern-js/builder-webpack-provider@2.15.0
+  - @modern-js/builder-shared@2.15.0
+  - @modern-js/builder@2.15.0
+  - @modern-js/builder-plugin-esbuild@2.15.0
+  - @modern-js/builder-plugin-node-polyfill@2.15.0
+  - @modern-js/core@2.15.0
+  - @modern-js/plugin-data-loader@2.15.0
+  - @modern-js/plugin-i18n@2.15.0
+  - @modern-js/plugin-lint@2.15.0
+  - @modern-js/new-action@2.15.0
+  - @modern-js/prod-server@2.15.0
+  - @modern-js/server@2.15.0
+  - @modern-js/node-bundle-require@2.15.0
+  - @modern-js/plugin@2.15.0
+  - @modern-js/types@2.15.0
+  - @modern-js/upgrade@2.15.0
+  - @modern-js/utils@2.15.0
+
+## 2.14.0
+
+### Minor Changes
+
+- 7c5c752: feat: adpate rspack copy plugin
+  feat: 适配 rspack copy 插件
+
+### Patch Changes
+
+- b7b181e: fix(app-tools): failed to scan public dir when using Rspack
+
+  fix(app-tools): 修复 Rspack 模式读取 public 目录失败的问题
+
+- b7f72a6: fix(app-tools): can not disable output.cleanDistPath
+
+  fix(app-tools): 修复无法禁用 output.cleanDistPath 的问题
+
+- 9321bef: feat: adjust server.worker config to deploy.worker.ssr
+
+  feat: 调整 server.worker 为 deploy.worker.ssr
+
+- d102ba3: fix(app-tools): failed to validate globalVars in legacy mode
+
+  fix(app-tools): 修复兼容模式下 globalVars 类型校验错误的问题
+
+- 52d0cb1: feat: support config handle of Route
+  feat: 支持配置 Route 的 handle 属性
+- 432ac8b: chore(cli): improve commands descriptions
+
+  chore(cli): 优化命令的描述文案
+
+- 864d55e: feat(builder): source.globalVars support function usage
+
+  feat(builder): source.globalVars 支持函数写法
+
+- Updated dependencies [b46fbcb]
+- Updated dependencies [4779152]
+- Updated dependencies [bd52693]
+- Updated dependencies [fefd1c5]
+- Updated dependencies [8a3c693]
+- Updated dependencies [9321bef]
+- Updated dependencies [4baf588]
+- Updated dependencies [d0efae3]
+- Updated dependencies [9b45c58]
+- Updated dependencies [1f34dba]
+- Updated dependencies [52d0cb1]
+- Updated dependencies [60a81d0]
+- Updated dependencies [432ac8b]
+- Updated dependencies [864d55e]
+- Updated dependencies [b965df2]
+- Updated dependencies [dacef96]
+- Updated dependencies [d05651a]
+- Updated dependencies [16399fd]
+  - @modern-js/builder-shared@2.14.0
+  - @modern-js/server@2.14.0
+  - @modern-js/utils@2.14.0
+  - @modern-js/builder-webpack-provider@2.14.0
+  - @modern-js/builder-rspack-provider@2.14.0
+  - @modern-js/types@2.14.0
+  - @modern-js/prod-server@2.14.0
+  - @modern-js/plugin-lint@2.14.0
+  - @modern-js/plugin-data-loader@2.14.0
+  - @modern-js/builder@2.14.0
+  - @modern-js/builder-plugin-esbuild@2.14.0
+  - @modern-js/builder-plugin-node-polyfill@2.14.0
+  - @modern-js/core@2.14.0
+  - @modern-js/plugin-i18n@2.14.0
+  - @modern-js/new-action@2.14.0
+  - @modern-js/node-bundle-require@2.14.0
+  - @modern-js/upgrade@2.14.0
+  - @modern-js/plugin@2.14.0
+
 ## 2.13.4
 
 ### Patch Changes

package/dist/cjs/analyze/constants.js

@@ -68,7 +68,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/cjs/analyze/getServerRoutes.js

@@ -98,12 +98,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 = (0, import_utils.getEntryOptions)(
@@ -113,7 +116,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 === import_utils.MAIN_ENTRY_NAME ? "" : entryName}`,

package/dist/cjs/analyze/nestedRoutes.js

@@ -87,6 +87,7 @@ const walk = async (dirname, rootDir, alias, entryName) => {
   let pageRoute = null;
   let splatLoaderFile = "";
   let splatRoute = null;
+  let pageConfigFile = "";
   const items = await import_utils.fs.readdir(dirname);
   for (const item of items) {
     const itemPath = path.join(dirname, item);
@@ -107,12 +108,20 @@ const walk = async (dirname, rootDir, alias, entryName) => {
         route.loader = itemPath;
       }
     }
+    if (itemWithoutExt === import_constants.NESTED_ROUTE.LAYOUT_CONFIG_FILE) {
+      if (!route.config) {
+        route.config = itemPath;
+      }
+    }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.LAYOUT_FILE) {
       route._component = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
     }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.PAGE_LOADER_FILE) {
       pageLoaderFile = itemPath;
     }
+    if (itemWithoutExt === import_constants.NESTED_ROUTE.PAGE_CONFIG_FILE) {
+      pageConfigFile = itemPath;
+    }
     if (itemWithoutExt === import_constants.NESTED_ROUTE.PAGE_FILE) {
       pageRoute = createIndexRoute(
         {
@@ -125,6 +134,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 === import_constants.NESTED_ROUTE.SPLATE_LOADER_FILE) {

package/dist/cjs/analyze/templates.js

@@ -187,6 +187,8 @@ const fileSystemRoutes = async ({
   const errors = [];
   const loaders = [];
   const loadersMap = {};
+  const configs = [];
+  const configsMap = {};
   const loadersMapFile = import_path.default.join(
     internalDirectory,
     entryName,
@@ -216,6 +218,7 @@ const fileSystemRoutes = async ({
     let loading;
     let error;
     let loader;
+    let config;
     let component = "";
     let lazyImport = null;
     if (route.type === "nested") {
@@ -237,6 +240,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) {
@@ -268,6 +277,7 @@ const fileSystemRoutes = async ({
       lazyImport,
       loading,
       loader,
+      config,
       error,
       children
     };
@@ -288,7 +298,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, '"');
@@ -334,6 +345,11 @@ const fileSystemRoutes = async ({
 `;
     }
   }
+  let importConfigsCode = "";
+  for (const [key, configPath] of Object.entries(configsMap)) {
+    importConfigsCode += `import * as ${key} from "${(0, import_utils.slash)(configPath)}";
+`;
+  }
   await import_utils.fs.ensureFile(loadersMapFile);
   await import_utils.fs.writeJSON(loadersMapFile, loadersMap);
   return `
@@ -343,6 +359,7 @@ const fileSystemRoutes = async ({
     ${importLoadingCode}
     ${importErrorComponentsCode}
     ${importLoadersCode}
+    ${importConfigsCode}
     ${routeComponentsCode}
   `;
 };

package/dist/cjs/builder/builder-rspack/adapterCopy.js

@@ -0,0 +1,136 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var adapterCopy_exports = {};
+__export(adapterCopy_exports, {
+  builderPluginAdpaterCopy: () => builderPluginAdpaterCopy
+});
+module.exports = __toCommonJS(adapterCopy_exports);
+var import_path = __toESM(require("path"));
+var import_fs_extra = __toESM(require("@modern-js/utils/fs-extra"));
+var import_utils = require("@modern-js/utils");
+var import_shared = require("../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 = import_path.default.resolve(
+        ((_a = normalizedConfig.output.distPath) == null ? void 0 : _a.root) || "./dist",
+        "./public"
+      );
+      if (!import_fs_extra.default.existsSync(publicDir) || !import_fs_extra.default.statSync(publicDir).isDirectory()) {
+        return;
+      }
+      const HTML_REGEXP = /\.html?$/;
+      const filepaths = (await import_fs_extra.default.readdir(publicDir)).map(
+        (file) => import_path.default.resolve(publicDir, file)
+      );
+      await Promise.all(
+        filepaths.filter((file) => HTML_REGEXP.test(file)).map(async (file) => {
+          const content = await import_fs_extra.default.readFile(file, "utf-8");
+          if (publicPath) {
+            await import_fs_extra.default.writeFile(
+              file,
+              content.replace(
+                /<%=\s*assetPrefix\s*%>/g,
+                (0, import_utils.removeTailSlash)(publicPath)
+              )
+            );
+          } else {
+            import_utils.logger.warn(
+              "Expect get a string from `publicPath`, but receive `undefined`."
+            );
+            await import_fs_extra.default.writeFile(
+              file,
+              content.replace(
+                /<%=\s*assetPrefix\s*%>/g,
+                (0, import_utils.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 } = (0, import_shared.createCopyInfo)(appContext, normalizedConfig);
+  return [
+    {
+      from: "**/*",
+      to: "public",
+      context: publicDir,
+      noErrorOnMissing: true
+    },
+    {
+      from: "**/*",
+      to: "upload",
+      context: uploadDir,
+      noErrorOnMissing: true
+    }
+  ];
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  builderPluginAdpaterCopy
+});

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

@@ -22,8 +22,13 @@ __export(builder_rspack_exports, {
 module.exports = __toCommonJS(builder_rspack_exports);
 var import_builder_rspack_provider = require("@modern-js/builder-rspack-provider");
 var import_generator = require("../generator");
+var import_adapterCopy = require("./adapterCopy");
 function createRspackBuilderForModern(options) {
-  return (0, import_generator.generateBuilder)(options, import_builder_rspack_provider.builderRspackProvider);
+  return (0, import_generator.generateBuilder)(options, import_builder_rspack_provider.builderRspackProvider, {
+    modifyBuilderInstance(builder) {
+      builder.addPlugins([(0, import_adapterCopy.builderPluginAdpaterCopy)(options)]);
+    }
+  });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -15,24 +15,23 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var compatModern_exports = {};
-__export(compatModern_exports, {
-  builderPluginCompatModern: () => builderPluginCompatModern
+var adapterModern_exports = {};
+__export(adapterModern_exports, {
+  builderPluginAdapterModern: () => builderPluginAdapterModern
 });
-module.exports = __toCommonJS(compatModern_exports);
+module.exports = __toCommonJS(adapterModern_exports);
 var import_path = require("path");
-var import_shared = require("../../shared");
-const builderPluginCompatModern = (options) => ({
-  name: "builder-plugin-compat-modern",
+var import_createCopyPattern = require("./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((0, import_path.join)(api.context.rootPath, "node_modules"));
       if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
-        const defaultCopyPattern = (0, import_shared.createCopyPattern)(
+        const defaultCopyPattern = (0, import_createCopyPattern.createPublicPattern)(
           appContext,
           modernConfig,
-          "public",
           chain
         );
         chain.plugin(CHAIN_ID.PLUGIN.COPY).tap((args) => {
@@ -49,5 +48,5 @@ const builderPluginCompatModern = (options) => ({
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  builderPluginCompatModern
+  builderPluginAdapterModern
 });

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

@@ -0,0 +1,67 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var createCopyPattern_exports = {};
+__export(createCopyPattern_exports, {
+  createPublicPattern: () => createPublicPattern,
+  createUploadPattern: () => createUploadPattern
+});
+module.exports = __toCommonJS(createCopyPattern_exports);
+var import_utils = require("@modern-js/utils");
+var import_shared = require("../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 } = (0, import_shared.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,
+        (0, import_utils.removeTailSlash)(chain.output.get("publicPath"))
+      );
+    }
+  };
+}
+function createUploadPattern(appContext, config) {
+  const { uploadDir } = (0, import_shared.createCopyInfo)(appContext, config);
+  return {
+    info,
+    from: "**/*",
+    to: "upload",
+    context: uploadDir,
+    noErrorOnMissing: true
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createPublicPattern,
+  createUploadPattern
+});

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

@@ -31,9 +31,9 @@ __export(builder_webpack_exports, {
 });
 module.exports = __toCommonJS(builder_webpack_exports);
 var import_builder_webpack_provider = require("@modern-js/builder-webpack-provider");
-var import_shared = require("../shared");
 var import_generator = require("../generator");
-var import_compatModern = require("./builderPlugins/compatModern");
+var import_adapterModern = require("./adapterModern");
+var import_createCopyPattern = require("./createCopyPattern");
 function createWebpackBuilderForModern(options) {
   return (0, import_generator.generateBuilder)(options, import_builder_webpack_provider.builderWebpackProvider, {
     modifyBuilderConfig(config) {
@@ -47,7 +47,7 @@ function createWebpackBuilderForModern(options) {
 function modifyOutputConfig(config, appContext) {
   config.output = createOutputConfig(config, appContext);
   function createOutputConfig(config2, appContext2) {
-    const defaultCopyPattern = (0, import_shared.createCopyPattern)(appContext2, config2, "upload");
+    const defaultCopyPattern = (0, import_createCopyPattern.createUploadPattern)(appContext2, config2);
     const { copy } = config2.output;
     const copyOptions = Array.isArray(copy) ? copy : copy == null ? void 0 : copy.patterns;
     const builderCopy = [...copyOptions || [], defaultCopyPattern];
@@ -64,7 +64,7 @@ async function applyBuilderPlugins(builder, options) {
     const { builderPluginEsbuild } = await Promise.resolve().then(() => __toESM(require("@modern-js/builder-plugin-esbuild")));
     builder.addPlugins([builderPluginEsbuild(esbuildOptions)]);
   }
-  builder.addPlugins([(0, import_compatModern.builderPluginCompatModern)(options)]);
+  builder.addPlugins([(0, import_adapterModern.builderPluginAdapterModern)(options)]);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/builder/shared/{createCopyPattern.js → createCopyInfo.js}

@@ -25,59 +25,26 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var createCopyPattern_exports = {};
-__export(createCopyPattern_exports, {
-  createCopyPattern: () => createCopyPattern
+var createCopyInfo_exports = {};
+__export(createCopyInfo_exports, {
+  createCopyInfo: () => createCopyInfo
 });
-module.exports = __toCommonJS(createCopyPattern_exports);
+module.exports = __toCommonJS(createCopyInfo_exports);
 var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
-function createCopyPattern(appContext, config, patternsType, chain) {
+function createCopyInfo(appContext, config) {
   const configDir = import_path.default.resolve(
     appContext.appDirectory,
     config.source.configDir || "./config"
   );
   const uploadDir = import_path.default.posix.join(configDir.replace(/\\/g, "/"), "upload");
   const publicDir = import_path.default.posix.join(configDir.replace(/\\/g, "/"), "public");
-  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)
-  });
-  if (patternsType === "public") {
-    if (!chain) {
-      throw new Error("expect get a webpackChain, but receive 'undefined'");
-    }
-    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,
-          (0, import_utils.removeTailSlash)(chain.output.get("publicPath"))
-        );
-      }
-    };
-  } else {
-    return {
-      info,
-      from: "**/*",
-      to: "upload",
-      context: uploadDir,
-      noErrorOnMissing: true
-    };
-  }
+  return {
+    configDir,
+    uploadDir,
+    publicDir
+  };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createCopyPattern
+  createCopyInfo
 });

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

@@ -14,6 +14,6 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var shared_exports = {};
 module.exports = __toCommonJS(shared_exports);
-__reExport(shared_exports, require("./createCopyPattern"), module.exports);
 __reExport(shared_exports, require("./types"), module.exports);
 __reExport(shared_exports, require("./builderPlugins"), module.exports);
+__reExport(shared_exports, require("./createCopyInfo"), module.exports);

package/dist/cjs/config/default.js

@@ -22,6 +22,7 @@ __export(default_exports, {
 });
 module.exports = __toCommonJS(default_exports);
 var import_builder_webpack_provider = require("@modern-js/builder-webpack-provider");
+var import_env = require("../utils/env");
 function createDefaultConfig(appContext, bundler) {
   const defaultBuilderConfig = (0, import_builder_webpack_provider.createDefaultConfig)();
   const dev = {
@@ -41,6 +42,7 @@ function createDefaultConfig(appContext, bundler) {
     disableDefaultEntries: false,
     entriesDir: "./src",
     configDir: "./config",
+    globalVars: (0, import_env.getAutoInjectEnv)(appContext),
     alias: {
       [appContext.internalDirAlias]: appContext.internalDirectory,
       [appContext.internalSrcAlias]: appContext.srcDirectory,
@@ -101,7 +103,7 @@ function createLegacyDefaultConfig(appContext) {
     configDir: "./config",
     apiDir: "./api",
     envVars: [],
-    globalVars: void 0,
+    globalVars: (0, import_env.getAutoInjectEnv)(appContext),
     alias: defaultAlias,
     moduleScopes: void 0,
     include: []

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

@@ -34,7 +34,6 @@ __export(inits_exports, {
 module.exports = __toCommonJS(inits_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
-var import_env = require("../../utils/env");
 function initHtmlConfig(config, appContext) {
   const ICON_EXTENSIONS = ["png", "jpg", "jpeg", "svg", "ico"];
   config.html.appIcon = createBuilderAppIcon(config, appContext);
@@ -70,15 +69,9 @@ function initHtmlConfig(config, appContext) {
 }
 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);
   }
-  function createBuilderGlobalVars(config2, appContext2) {
-    const { globalVars = {} } = config2.source;
-    const publicEnv = (0, import_env.getAutoInjectEnv)(appContext2);
-    return { ...globalVars, ...publicEnv };
-  }
   function createBuilderInclude(config2, appContext2) {
     const { include } = config2.source;
     const defaultInclude = [appContext2.internalDirectory];