@modern-js/app-tools 2.69.5 → 3.0.0-alpha.0

package/bin/modern.js

@@ -1,8 +1,5 @@
 #!/usr/bin/env node
-const {
-  INTERNAL_APP_TOOLS_PLUGINS,
-  INTERNAL_APP_TOOLS_RUNTIME_PLUGINS,
-} = require('@modern-js/utils');
+const { INTERNAL_RUNTIME_PLUGINS } = require('@modern-js/utils');
 
 const { version } = require('../package.json');
 
@@ -11,9 +8,6 @@ if (!process.env.MODERN_JS_VERSION) {
 }
 
 require('../dist/cjs/run/index.js').run({
-  internalPlugins: {
-    cli: INTERNAL_APP_TOOLS_PLUGINS,
-    autoLoad: INTERNAL_APP_TOOLS_RUNTIME_PLUGINS,
-  },
+  internalPlugins: INTERNAL_RUNTIME_PLUGINS,
   version,
 });

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

@@ -1,32 +1,40 @@
 "use strict";
-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 builder_rspack_exports = {};
-__export(builder_rspack_exports, {
-  createRspackBuilderForModern: () => createRspackBuilderForModern
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    createRspackBuilderForModern: ()=>createRspackBuilderForModern
 });
-module.exports = __toCommonJS(builder_rspack_exports);
-var import_generator = require("../generator");
+const index_js_namespaceObject = require("../generator/index.js");
 async function createRspackBuilderForModern(options) {
-  const builder = await (0, import_generator.generateBuilder)(options, "rspack");
-  return builder;
+    const builder = await (0, index_js_namespaceObject.generateBuilder)(options, 'rspack');
+    return builder;
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createRspackBuilderForModern
+exports.createRspackBuilderForModern = __webpack_exports__.createRspackBuilderForModern;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "createRspackBuilderForModern"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });

package/dist/cjs/builder/generator/adapterCopy.js

@@ -1,50 +1,79 @@
 "use strict";
-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 adapterCopy_exports = {};
-__export(adapterCopy_exports, {
-  builderPluginAdapterCopy: () => builderPluginAdapterCopy
-});
-module.exports = __toCommonJS(adapterCopy_exports);
-var import_createCopyPattern = require("./createCopyPattern");
-const builderPluginAdapterCopy = (options) => ({
-  name: "builder-plugin-adapter-copy",
-  setup(api) {
-    const { normalizedConfig: modernConfig, appContext } = options;
-    api.modifyBundlerChain((chain, { CHAIN_ID }) => {
-      if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
-        const defaultCopyPattern = (0, import_createCopyPattern.createPublicPattern)(appContext, modernConfig, chain);
-        chain.plugin(CHAIN_ID.PLUGIN.COPY).tap((args) => {
-          var _args_;
-          return [
-            {
-              patterns: [
-                ...((_args_ = args[0]) === null || _args_ === void 0 ? void 0 : _args_.patterns) || [],
-                defaultCopyPattern
-              ]
-            }
-          ];
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
         });
-      }
-    });
-  }
+        return getter;
+    };
+})();
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    builderPluginAdapterCopy: ()=>builderPluginAdapterCopy
 });
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  builderPluginAdapterCopy
+const external_path_namespaceObject = require("path");
+var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
+const index_js_namespaceObject = require("../shared/index.js");
+const external_createCopyPattern_js_namespaceObject = require("./createCopyPattern.js");
+const builderPluginAdapterCopy = (options)=>({
+        name: 'builder-plugin-adapter-copy',
+        setup (api) {
+            const { normalizedConfig: modernConfig, appContext } = options;
+            api.modifyBundlerChain((chain, { CHAIN_ID })=>{
+                if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
+                    const defaultCopyPattern = (0, external_createCopyPattern_js_namespaceObject.createPublicPattern)(appContext, modernConfig, chain);
+                    const { customPublicDirs } = (0, index_js_namespaceObject.createCopyInfo)(appContext, modernConfig);
+                    const customCopyPatterns = customPublicDirs.map((customPublicDir)=>{
+                        const relativePath = external_path_default().relative(appContext.appDirectory, customPublicDir);
+                        const outputDir = relativePath || external_path_default().basename(customPublicDir);
+                        return {
+                            from: '**/*',
+                            to: outputDir,
+                            context: customPublicDir,
+                            noErrorOnMissing: true
+                        };
+                    });
+                    chain.plugin(CHAIN_ID.PLUGIN.COPY).tap((args)=>[
+                            {
+                                patterns: [
+                                    ...args[0]?.patterns || [],
+                                    defaultCopyPattern,
+                                    ...customCopyPatterns
+                                ]
+                            }
+                        ]);
+                }
+            });
+        }
+    });
+exports.builderPluginAdapterCopy = __webpack_exports__.builderPluginAdapterCopy;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "builderPluginAdapterCopy"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });

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

@@ -1,91 +1,93 @@
 "use strict";
-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 createBuilderProviderConfig_exports = {};
-__export(createBuilderProviderConfig_exports, {
-  createBuilderProviderConfig: () => createBuilderProviderConfig
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    createBuilderProviderConfig: ()=>createBuilderProviderConfig
 });
-module.exports = __toCommonJS(createBuilderProviderConfig_exports);
-var import_utils = require("@modern-js/utils");
-var import_createCopyPattern = require("./createCopyPattern");
+const utils_namespaceObject = require("@modern-js/utils");
+const external_createCopyPattern_js_namespaceObject = require("./createCopyPattern.js");
 function modifyOutputConfig(config, appContext) {
-  const defaultCopyPattern = (0, import_createCopyPattern.createUploadPattern)(appContext, config);
-  const { copy } = config.output;
-  const copyOptions = Array.isArray(copy) ? copy : copy === null || copy === void 0 ? void 0 : copy.patterns;
-  const builderCopy = [
-    ...copyOptions || [],
-    defaultCopyPattern
-  ];
-  config.output = {
-    ...config.output,
-    copy: builderCopy
-  };
+    const defaultCopyPattern = (0, external_createCopyPattern_js_namespaceObject.createUploadPattern)(appContext, config);
+    const { copy } = config.output;
+    const copyOptions = Array.isArray(copy) ? copy : copy?.patterns;
+    const builderCopy = [
+        ...copyOptions || [],
+        defaultCopyPattern
+    ];
+    config.output = {
+        ...config.output,
+        copy: builderCopy
+    };
 }
 function createBuilderProviderConfig(resolveConfig, appContext) {
-  var _resolveConfig_tools;
-  const htmlConfig = {
-    ...resolveConfig.html
-  };
-  if (!htmlConfig.template) {
-    htmlConfig.templateByEntries = {
-      ...appContext.htmlTemplates,
-      ...htmlConfig.templateByEntries
+    const htmlConfig = {
+        ...resolveConfig.html
     };
-  }
-  const config = {
-    ...resolveConfig,
-    plugins: [],
-    resolve: {
-      ...resolveConfig.resolve
-    },
-    dev: {
-      ...resolveConfig.dev,
-      port: appContext.port
-    },
-    server: resolveConfig.server,
-    html: htmlConfig,
-    output: {
-      ...resolveConfig.output,
-      // We need to do this in the app-tools prepare hook because some files will be generated into the dist directory in the analyze process
-      cleanDistPath: false
-    },
-    tools: {
-      ...resolveConfig.tools,
-      devServer: {
-        ...(_resolveConfig_tools = resolveConfig.tools) === null || _resolveConfig_tools === void 0 ? void 0 : _resolveConfig_tools.devServer,
-        compress: {
-          filter: (req) => {
-            var _resolveConfig_bff;
-            const bffPrefix = ((_resolveConfig_bff = resolveConfig.bff) === null || _resolveConfig_bff === void 0 ? void 0 : _resolveConfig_bff.prefix) || import_utils.DEFAULT_API_PREFIX;
-            const url = req.url;
-            if (url === null || url === void 0 ? void 0 : url.startsWith(bffPrefix)) {
-              return false;
+    if (!htmlConfig.template) htmlConfig.template = ({ entryName })=>appContext.htmlTemplates[entryName];
+    const serverConfig = {
+        ...resolveConfig.server
+    };
+    if (resolveConfig.dev?.server?.cors !== void 0) serverConfig.cors = resolveConfig.dev?.server?.cors;
+    const config = {
+        ...resolveConfig,
+        plugins: [],
+        resolve: {
+            ...resolveConfig.resolve
+        },
+        dev: {
+            ...resolveConfig.dev,
+            port: appContext.port
+        },
+        server: serverConfig,
+        html: htmlConfig,
+        output: {
+            ...resolveConfig.output,
+            cleanDistPath: false
+        },
+        tools: {
+            ...resolveConfig.tools,
+            devServer: {
+                ...resolveConfig.tools?.devServer,
+                compress: {
+                    filter: (req)=>{
+                        const bffPrefix = resolveConfig.bff?.prefix || utils_namespaceObject.DEFAULT_API_PREFIX;
+                        const url = req.url;
+                        if (url?.startsWith(bffPrefix)) return false;
+                        return true;
+                    }
+                }
             }
-            return true;
-          }
         }
-      }
-    }
-  };
-  modifyOutputConfig(config, appContext);
-  return config;
+    };
+    modifyOutputConfig(config, appContext);
+    return config;
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createBuilderProviderConfig
+exports.createBuilderProviderConfig = __webpack_exports__.createBuilderProviderConfig;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "createBuilderProviderConfig"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });

package/dist/cjs/builder/generator/createCopyPattern.js

@@ -1,66 +1,67 @@
 "use strict";
-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
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    createUploadPattern: ()=>createUploadPattern,
+    createPublicPattern: ()=>createPublicPattern
 });
-module.exports = __toCommonJS(createCopyPattern_exports);
-var import_utils = require("@modern-js/utils");
-var import_shared = require("../shared");
+const utils_namespaceObject = require("@modern-js/utils");
+const index_js_namespaceObject = require("../shared/index.js");
 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)
-});
+const info = (file)=>({
+        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,
-    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")));
-    }
-  };
+    const { publicDir } = (0, index_js_namespaceObject.createCopyInfo)(appContext, config);
+    return {
+        info,
+        from: '**/*',
+        to: 'public',
+        context: publicDir,
+        noErrorOnMissing: true,
+        transform: (content, absoluteFrom)=>{
+            if (!/\.html?$/.test(absoluteFrom)) return content;
+            return content.toString('utf8').replace(/<%=\s*assetPrefix\s*%>/g, (0, utils_namespaceObject.removeTailSlash)(chain.output.get('publicPath')));
+        }
+    };
 }
 function createUploadPattern(appContext, config) {
-  const { uploadDir } = (0, import_shared.createCopyInfo)(appContext, config);
-  return {
-    // rspack copy info structure is inconsistent with webpack, it only used in webpack mode
-    // @ts-expect-error
-    info,
-    from: "**/*",
-    to: "upload",
-    context: uploadDir,
-    noErrorOnMissing: true
-  };
+    const { uploadDir } = (0, index_js_namespaceObject.createCopyInfo)(appContext, config);
+    return {
+        from: '**/*',
+        to: 'upload',
+        context: uploadDir,
+        noErrorOnMissing: true
+    };
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createPublicPattern,
-  createUploadPattern
+exports.createPublicPattern = __webpack_exports__.createPublicPattern;
+exports.createUploadPattern = __webpack_exports__.createUploadPattern;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "createPublicPattern",
+    "createUploadPattern"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });