@modern-js/app-tools 2.0.2 → 2.0.3-alpha.0

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

@@ -205,10 +205,9 @@ const routesForServer = ({
 ];`;
   let importLoadersCode = "";
   if (loaders.length > 0) {
-    importLoadersCode = `
-    import { ${loaders.map(
-      (loader, index2) => `loader_${index2}`
-    )} } from "${(0, import_utils.slash)(loaderIndexFile)}"`;
+    importLoadersCode = loaders.map((loader, index2) => {
+      return `import loader_${index2} from "${loader}"`;
+    }).join("\n");
   }
   return `
     ${importLoadersCode}
@@ -227,12 +226,6 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
   const errors = [];
   const loaders = [];
   const loadersMap = {};
-  const loadersIndexFile = import_path.default.join(
-    internalDirAlias,
-    entryName,
-    import_constants.TEMP_LOADERS_DIR,
-    "index.js"
-  );
   const loadersMapFile = import_path.default.join(
     internalDirectory,
     entryName,
@@ -244,13 +237,17 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
     import loadable, { lazy as loadableLazy } from "@modern-js/runtime/loadable"
   `;
   let rootLayoutCode = ``;
-  let dataLoaderPath = "";
   let componentLoaderPath = "";
-  if (ssrMode) {
-    dataLoaderPath = require.resolve("@modern-js/plugin-data-loader/loader");
+  const getDataLoaderPath = (loaderId) => {
+    if (!ssrMode)
+      return "";
+    let dataLoaderPath = require.resolve("@modern-js/plugin-data-loader/loader");
     if (nestedRoutesEntry) {
-      dataLoaderPath = `${dataLoaderPath}?routesDir=${nestedRoutesEntry}&mapFile=${loadersMapFile}!`;
+      dataLoaderPath = `${(0, import_utils.slash)(dataLoaderPath)}?mapFile=${(0, import_utils.slash)(loadersMapFile)}&loaderId=${loaderId}!`;
     }
+    return dataLoaderPath;
+  };
+  if (ssrMode) {
     componentLoaderPath = `${import_path.default.join(
       __dirname,
       "../builder/loaders/routerLoader"
@@ -280,7 +277,11 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
         loaders.push(route.loader);
         const loaderId = loaders.length - 1;
         loader = `loader_${loaderId}`;
-        loadersMap[loader] = route.id;
+        loadersMap[loader] = {
+          routeId: route.id,
+          filePath: route.loader,
+          inline: false
+        };
       }
       if (route._component) {
         if (route.isRoot) {
@@ -336,48 +337,17 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
 `;
   }).join("");
   let importLoadersCode = "";
-  if (loaders.length > 0) {
-    importLoadersCode = `
-    import { ${loaders.map(
-      (loader, index2) => `loader_${index2}`
-    )} } from "${(0, import_utils.slash)(dataLoaderPath)}${(0, import_utils.slash)(loadersIndexFile)}"
-  `;
-    const loaderEntryCode = loaders.map((loader, index2) => {
-      return `export * from './loader_${index2}.js';`;
-    }).join("\n");
-    const loaderEntryFile = import_path.default.join(
-      internalDirectory,
-      entryName,
-      import_constants.TEMP_LOADERS_DIR,
-      "entry.js"
-    );
-    yield import_utils.fs.ensureFile(loaderEntryFile);
-    yield import_utils.fs.writeFile(loaderEntryFile, loaderEntryCode);
-    yield import_utils.fs.writeJSON(loadersMapFile, loadersMap);
-    yield Promise.all(
-      loaders.map((loader, index2) => __async(void 0, null, function* () {
-        const name = `loader_${index2}`;
-        const filename = import_path.default.join(
-          internalDirectory,
-          entryName,
-          import_constants.TEMP_LOADERS_DIR,
-          `${name}.js`
-        );
-        let code = "";
-        if (loader.includes(".loader.")) {
-          code = `
-          export { default as ${name} } from '${(0, import_utils.slash)(loader)}'
-        `;
-        } else {
-          code = `
-          export { loader as ${name} } from '${(0, import_utils.slash)(loader)}'
-        `;
-        }
-        yield import_utils.fs.ensureFile(filename);
-        yield import_utils.fs.writeFile(filename, code);
-      }))
-    );
+  for (const [key, loaderInfo] of Object.entries(loadersMap)) {
+    if (loaderInfo.inline) {
+      importLoadersCode += `import { loader as ${key} } from "${getDataLoaderPath(key)}${loaderInfo.filePath}";
+`;
+    } else {
+      importLoadersCode += `import ${key} from "${getDataLoaderPath(key)}${loaderInfo.filePath}";
+`;
+    }
   }
+  yield import_utils.fs.ensureFile(loadersMapFile);
+  yield import_utils.fs.writeJSON(loadersMapFile, loadersMap);
   return `
     ${importLazyCode}
     ${rootLayoutCode}

package/dist/js/node/analyze/utils.js

@@ -44,6 +44,7 @@ var __async = (__this, __arguments, generator) => {
 var utils_exports = {};
 __export(utils_exports, {
   getDefaultImports: () => getDefaultImports,
+  getServerLoadersFile: () => getServerLoadersFile,
   hasLoader: () => hasLoader,
   isNestedRouteComponent: () => isNestedRouteComponent,
   isPageComponentFile: () => isPageComponentFile,
@@ -168,9 +169,17 @@ const hasLoader = (filename) => __async(void 0, null, function* () {
   });
   return moduleExports.some((e) => e.n === import_constants.LOADER_EXPORT_NAME);
 });
+const getServerLoadersFile = (internalDirectory, entryName) => {
+  return import_path.default.join(
+    internalDirectory,
+    entryName,
+    "route-server-loaders.js"
+  );
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getDefaultImports,
+  getServerLoadersFile,
   hasLoader,
   isNestedRouteComponent,
   isPageComponentFile,

package/dist/js/node/config/initial/inits.js

@@ -154,7 +154,7 @@ function initToolsConfig(config) {
       ]
     }
   };
-  const { tsChecker, tsLoader, htmlPlugin } = config.tools;
+  const { tsChecker, tsLoader } = config.tools;
   config.tools.tsChecker = (0, import_utils.applyOptionsChain)(defaultTsChecker, tsChecker);
   tsLoader && (config.tools.tsLoader = (tsLoaderConfig, utils) => {
     (0, import_utils.applyOptionsChain)(
@@ -166,14 +166,6 @@ function initToolsConfig(config) {
       utils
     );
   });
-  config.tools.htmlPlugin = [
-    (config2) => __spreadProps(__spreadValues({}, config2), {
-      minify: typeof config2.minify === "object" ? __spreadProps(__spreadValues({}, config2.minify), {
-        removeComments: false
-      }) : config2.minify
-    }),
-    ...Array.isArray(htmlPlugin) ? htmlPlugin : htmlPlugin ? [htmlPlugin] : []
-  ];
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/js/node/index.js

@@ -112,7 +112,6 @@ const buildCommand = (program, api) => __async(void 0, null, function* () {
   const buildProgram = program.command("build").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.build.describe)).option("-c --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).option("--analyze", import_locale.i18n.t(import_locale.localeKeys.command.shared.analyze)).action((options) => __async(void 0, null, function* () {
     const { build } = yield Promise.resolve().then(() => __toESM(require("./commands/build")));
     yield build(api, options);
-    process.exit(0);
   }));
   for (const platformBuilder of platformBuilders) {
     const platforms = (0, import_lodash.castArray)(platformBuilder.platform);
@@ -167,12 +166,12 @@ var src_default = () => ({
             yield deploy(api, options);
             process.exit(0);
           }));
-          program.command("new").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.new.describe)).option("-d, --debug", import_locale.i18n.t(import_locale.localeKeys.command.new.debug), false).option(
+          program.command("new").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.new.describe)).option("--lang <lang>", import_locale.i18n.t(import_locale.localeKeys.command.new.lang)).option("-d, --debug", import_locale.i18n.t(import_locale.localeKeys.command.new.debug), false).option(
             "-c, --config <config>",
             import_locale.i18n.t(import_locale.localeKeys.command.new.config)
           ).option("--dist-tag <tag>", import_locale.i18n.t(import_locale.localeKeys.command.new.distTag)).option("--registry", import_locale.i18n.t(import_locale.localeKeys.command.new.registry)).action((options) => __async(this, null, function* () {
             const { MWANewAction } = yield Promise.resolve().then(() => __toESM(require("@modern-js/new-action")));
-            yield MWANewAction(__spreadProps(__spreadValues({}, options), { locale }));
+            yield MWANewAction(__spreadProps(__spreadValues({}, options), { locale: options.lang || locale }));
           }));
           program.command("inspect").description("inspect internal webpack config").option(
             `--env <env>`,

package/dist/js/node/locale/en.js

@@ -41,7 +41,8 @@ const EN_LOCALE = {
       debug: "using debug mode to log something",
       config: "set default generator config(json string)",
       distTag: `use specified tag version for it's generator`,
-      registry: "set npm registry url to run npm command"
+      registry: "set npm registry url to run npm command",
+      lang: "set new command language(en or zh)"
     },
     inspect: {
       env: "specify env mode",

package/dist/js/node/locale/zh.js

@@ -41,7 +41,8 @@ const ZH_LOCALE = {
       debug: "开启 Debug 模式，打印调试日志信息",
       config: "生成器运行默认配置(JSON 字符串)",
       distTag: "生成器使用特殊的 npm Tag 版本",
-      registry: "生成器运行过程中定制 npm Registry"
+      registry: "生成器运行过程中定制 npm Registry",
+      lang: "设置 new 命令执行语言(zh 或者 en)"
     },
     inspect: {
       env: "查看指定环境下的配置",

package/dist/js/treeshaking/analyze/generateCode.js

@@ -148,20 +148,13 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import path from "path";
-import { fs, getEntryOptions, LOADER_ROUTES_DIR, logger } from "@modern-js/utils";
+import { fs, getEntryOptions, logger } from "@modern-js/utils";
 import { useResolvedConfigContext } from "@modern-js/core";
-import { isDevCommand } from "../utils/commands";
 import * as templates from "./templates";
 import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
-import { FILE_SYSTEM_ROUTES_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME, TEMP_LOADERS_DIR } from "./constants";
-import { getDefaultImports } from "./utils";
+import { FILE_SYSTEM_ROUTES_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME } from "./constants";
+import { getDefaultImports, getServerLoadersFile } from "./utils";
 import { walk } from "./nestedRoutes";
-import { loaderBuilder, serverLoaderBuilder } from "./Builder";
-var loader = {
-    ".js": "jsx",
-    ".ts": "tsx"
-};
-var EXTERNAL_REGEXP = /^[^./]|^\.[^./]|^\.\.[^/]/;
 var createImportSpecifier = function(specifiers) {
     var defaults = "";
     var named = [];
@@ -245,91 +238,6 @@ var createImportStatements = function(statements) {
         return "import ".concat(createImportSpecifier(specifiers), " from '").concat(value, "';\n").concat(initialize || "");
     }).join("\n");
 };
-var buildLoader = function() {
-    var _ref = _asyncToGenerator(function(entry, outfile) {
-        return __generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    return [
-                        4,
-                        loaderBuilder.build({
-                            format: "esm",
-                            platform: "browser",
-                            target: "esnext",
-                            loader: loader,
-                            watch: isDevCommand() && {},
-                            bundle: true,
-                            logLevel: "error",
-                            entryPoints: [
-                                entry
-                            ],
-                            outfile: outfile,
-                            plugins: [
-                                {
-                                    name: "make-all-packages-external",
-                                    setup: function setup(build) {
-                                        build.onResolve({
-                                            filter: EXTERNAL_REGEXP
-                                        }, function(args) {
-                                            var external = true;
-                                            if (args.kind === "entry-point") {
-                                                external = false;
-                                            }
-                                            return {
-                                                path: args.path,
-                                                external: external
-                                            };
-                                        });
-                                    }
-                                }
-                            ]
-                        })
-                    ];
-                case 1:
-                    _state.sent();
-                    return [
-                        2
-                    ];
-            }
-        });
-    });
-    return function buildLoader(entry, outfile) {
-        return _ref.apply(this, arguments);
-    };
-}();
-var buildServerLoader = function() {
-    var _ref = _asyncToGenerator(function(entry, outfile) {
-        return __generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    return [
-                        4,
-                        serverLoaderBuilder.build({
-                            format: "cjs",
-                            platform: "node",
-                            target: "esnext",
-                            loader: loader,
-                            watch: isDevCommand() && {},
-                            bundle: true,
-                            logLevel: "error",
-                            entryPoints: [
-                                entry
-                            ],
-                            outfile: outfile
-                        })
-                    ];
-                case 1:
-                    _state.sent();
-                    return [
-                        2
-                    ];
-            }
-        });
-    });
-    return function buildServerLoader(entry, outfile) {
-        return _ref.apply(this, arguments);
-    };
-}();
 var generateCode = function() {
     var _ref = _asyncToGenerator(function(appContext, config, entrypoints, api) {
         var ref, ref1, ref2, internalDirectory, distDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, isV5, mountId, getRoutes;
@@ -338,18 +246,18 @@ var generateCode = function() {
         }
         function _generateEntryCode() {
             _generateEntryCode = _asyncToGenerator(function(entrypoint) {
-                var entryName, isAutoMount, customBootstrap, fileSystemRoutes, initialRoutes, nestedRoute, routes, config2, ssr, mode, hasPageRoute, ref, code2, _, _tmp, routesServerFile, outputRoutesServerFile, code3, loaderEntryFile, loaderIndexFile, ref1, importStatements, plugins, ref2, renderFunction, exportStatement, code, entryFile, ref3, asyncEntryCode, bootstrapFile;
+                var entryName, isAutoMount, customBootstrap, fileSystemRoutes, initialRoutes, nestedRoute, routes, config2, ssr, mode, hasPageRoute, ref, code2, _, _tmp, routesServerFile, code3, ref1, importStatements, plugins, ref2, renderFunction, exportStatement, code, entryFile, ref3, asyncEntryCode, bootstrapFile;
                 return __generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
                             entryName = entrypoint.entryName, isAutoMount = entrypoint.isAutoMount, customBootstrap = entrypoint.customBootstrap, fileSystemRoutes = entrypoint.fileSystemRoutes;
                             if (!isAutoMount) return [
                                 3,
-                                22
+                                17
                             ];
                             if (!fileSystemRoutes) return [
                                 3,
-                                15
+                                10
                             ];
                             initialRoutes = [];
                             nestedRoute = null;
@@ -442,10 +350,9 @@ var generateCode = function() {
                             ref = _state.sent(), code2 = ref.code;
                             if (!entrypoint.nestedRoutesEntry) return [
                                 3,
-                                14
+                                9
                             ];
-                            routesServerFile = path.join(internalDirectory, entryName, "route-server-loaders.js");
-                            outputRoutesServerFile = path.join(distDirectory, LOADER_ROUTES_DIR, entryName, "index.js");
+                            routesServerFile = getServerLoadersFile(internalDirectory, entryName);
                             code3 = templates.routesForServer({
                                 routes: routes,
                                 internalDirectory: internalDirectory,
@@ -463,45 +370,11 @@ var generateCode = function() {
                             ];
                         case 8:
                             _state.sent();
-                            loaderEntryFile = path.join(internalDirectory, entryName, TEMP_LOADERS_DIR, "entry.js");
-                            loaderIndexFile = path.join(internalDirectory, entryName, TEMP_LOADERS_DIR, "index.js");
-                            return [
-                                4,
-                                fs.pathExists(loaderEntryFile)
-                            ];
+                            _state.label = 9;
                         case 9:
-                            if (!_state.sent()) return [
-                                3,
-                                11
-                            ];
-                            return [
-                                4,
-                                buildLoader(loaderEntryFile, loaderIndexFile)
-                            ];
-                        case 10:
-                            _state.sent();
-                            _state.label = 11;
-                        case 11:
-                            return [
-                                4,
-                                fs.pathExists(routesServerFile)
-                            ];
-                        case 12:
-                            if (!_state.sent()) return [
-                                3,
-                                14
-                            ];
-                            return [
-                                4,
-                                buildServerLoader(routesServerFile, outputRoutesServerFile)
-                            ];
-                        case 13:
-                            _state.sent();
-                            _state.label = 14;
-                        case 14:
                             fs.outputFileSync(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_FILE_NAME)), code2, "utf8");
-                            _state.label = 15;
-                        case 15:
+                            _state.label = 10;
+                        case 10:
                             return [
                                 4,
                                 hookRunners.modifyEntryImports({
@@ -515,7 +388,7 @@ var generateCode = function() {
                                     })
                                 })
                             ];
-                        case 16:
+                        case 11:
                             ref1 = _state.sent(), importStatements = ref1.imports;
                             return [
                                 4,
@@ -524,7 +397,7 @@ var generateCode = function() {
                                     plugins: []
                                 })
                             ];
-                        case 17:
+                        case 12:
                             plugins = _state.sent().plugins;
                             return [
                                 4,
@@ -537,7 +410,7 @@ var generateCode = function() {
                                     })
                                 })
                             ];
-                        case 18:
+                        case 13:
                             ref2 = _state.sent(), renderFunction = ref2.code;
                             return [
                                 4,
@@ -546,7 +419,7 @@ var generateCode = function() {
                                     exportStatement: "export default AppWrapper;"
                                 })
                             ];
-                        case 19:
+                        case 14:
                             exportStatement = _state.sent().exportStatement;
                             code = templates.index({
                                 mountId: mountId,
@@ -558,7 +431,7 @@ var generateCode = function() {
                             entrypoint.entry = entryFile;
                             if (!config.source.enableAsyncEntry) return [
                                 3,
-                                21
+                                16
                             ];
                             return [
                                 4,
@@ -567,19 +440,19 @@ var generateCode = function() {
                                     code: "import('./".concat(ENTRY_BOOTSTRAP_FILE_NAME, "');")
                                 })
                             ];
-                        case 20:
+                        case 15:
                             ref3 = _state.sent(), asyncEntryCode = ref3.code;
                             fs.outputFileSync(entryFile, asyncEntryCode, "utf8");
                             bootstrapFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_BOOTSTRAP_FILE_NAME));
                             fs.outputFileSync(bootstrapFile, code, "utf8");
                             return [
                                 3,
-                                22
+                                17
                             ];
-                        case 21:
+                        case 16:
                             fs.outputFileSync(entryFile, code, "utf8");
-                            _state.label = 22;
-                        case 22:
+                            _state.label = 17;
+                        case 17:
                             return [
                                 2
                             ];

package/dist/js/treeshaking/analyze/index.js

@@ -221,7 +221,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import * as path from "path";
-import { createDebugger, findExists, fs, isApiOnly } from "@modern-js/utils";
+import { createDebugger, findExists, fs, isApiOnly, isUseSSRBundle } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { createBuilderForModern } from "../builder";
 import { printInstructions } from "../utils/printInstructions";
@@ -229,8 +229,7 @@ import { generateRoutes } from "../utils/routes";
 import { emitResolvedConfig } from "../utils/config";
 import { getCommand } from "../utils/commands";
 import { initialNormalizedConfig } from "../config";
-import { isNestedRouteComponent, isPageComponentFile, parseModule, replaceWithAlias } from "./utils";
-import { loaderBuilder, serverLoaderBuilder } from "./Builder";
+import { getServerLoadersFile, isPageComponentFile, parseModule, replaceWithAlias } from "./utils";
 import { APP_CONFIG_NAME, APP_INIT_EXPORTED, APP_INIT_IMPORTED } from "./constants";
 var debug = createDebugger("plugin-analyze");
 var analyze_default = function() {
@@ -525,6 +524,25 @@ var analyze_default = function() {
                 watchFiles: function watchFiles() {
                     return pagesDir;
                 },
+                config: function config() {
+                    return {
+                        tools: {
+                            webpackChain: function(chain, param) {
+                                var name = param.name, CHAIN_ID = param.CHAIN_ID;
+                                var appContext = api.useAppContext();
+                                var resolvedConfig = api.useResolvedConfigContext();
+                                var entrypoints = appContext.entrypoints, internalDirectory = appContext.internalDirectory;
+                                entrypoints.forEach(function(entrypoint) {
+                                    var entryName = entrypoint.entryName;
+                                    if (entrypoint.nestedRoutesEntry && isUseSSRBundle(resolvedConfig)) {
+                                        var serverLoadersFile = getServerLoadersFile(internalDirectory, entryName);
+                                        chain.entry("".concat(entryName, "-server-loaders")).add(serverLoadersFile);
+                                    }
+                                });
+                            }
+                        }
+                    };
+                },
                 resolvedConfig: function resolvedConfig(param) {
                     var resolved = param.resolved;
                     var appContext = api.useAppContext();
@@ -620,17 +638,6 @@ var analyze_default = function() {
                         });
                     })();
                 },
-                beforeRestart: function beforeRestart() {
-                    return _asyncToGenerator(function() {
-                        return __generator(this, function(_state) {
-                            serverLoaderBuilder.stop();
-                            loaderBuilder.stop();
-                            return [
-                                2
-                            ];
-                        });
-                    })();
-                },
                 fileChange: function fileChange(e) {
                     return _asyncToGenerator(function() {
                         var appContext, appDirectory, filename, eventType, isPageFile, absoluteFilePath, isRouteComponent, resolvedConfig, generateCode, entrypoints;
@@ -647,7 +654,7 @@ var analyze_default = function() {
                                     };
                                     absoluteFilePath = path.resolve(appDirectory, filename);
                                     isRouteComponent = isPageFile(absoluteFilePath) && isPageComponentFile(absoluteFilePath);
-                                    if (!(isRouteComponent && (eventType === "add" || eventType === "unlink") || isNestedRouteComponent(nestedRouteEntries, absoluteFilePath) && eventType === "change")) return [
+                                    if (!(isRouteComponent && (eventType === "add" || eventType === "unlink"))) return [
                                         3,
                                         2
                                     ];