@modern-js/app-tools 2.3.1-alpha.2 → 2.5.0

package/dist/cjs/index.js

@@ -0,0 +1,198 @@
+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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var src_exports = {};
+__export(src_exports, {
+  buildCommand: () => buildCommand,
+  default: () => src_default,
+  devCommand: () => devCommand
+});
+module.exports = __toCommonJS(src_exports);
+var import_path = __toESM(require("path"));
+var import_plugin_lint = __toESM(require("@modern-js/plugin-lint"));
+var import_utils = require("@modern-js/utils");
+var import_lodash = require("@modern-js/utils/lodash");
+var import_analyze = __toESM(require("./analyze"));
+var import_initialize = __toESM(require("./initialize"));
+var import_hooks = require("./hooks");
+var import_locale = require("./locale");
+var import_language = require("./utils/language");
+var import_restart = require("./utils/restart");
+var import_generateWatchFiles = require("./utils/generateWatchFiles");
+__reExport(src_exports, require("./defineConfig"), module.exports);
+__reExport(src_exports, require("./types"), module.exports);
+const upgradeModel = import_utils.Import.lazy(
+  "@modern-js/upgrade",
+  require
+);
+const devCommand = async (program, api) => {
+  const runner = api.useHookRunners();
+  const devToolMetas = await runner.registerDev();
+  const devProgram = program.command("dev").alias("start").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.dev.describe)).option("-c --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).option("-e --entry [entry...]", import_locale.i18n.t(import_locale.localeKeys.command.dev.entry)).option("--analyze", import_locale.i18n.t(import_locale.localeKeys.command.shared.analyze)).option("--api-only", import_locale.i18n.t(import_locale.localeKeys.command.dev.apiOnly)).action(async (options) => {
+    const { dev } = await Promise.resolve().then(() => __toESM(require("./commands/dev")));
+    await dev(api, options);
+  });
+  for (const meta of devToolMetas) {
+    if (!meta.subCommands) {
+      continue;
+    }
+    for (const subCmd of meta.subCommands) {
+      devProgram.command(subCmd).action(async (options = {}) => {
+        const { appDirectory } = api.useAppContext();
+        const { isTypescript } = await Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
+        await runner.beforeDevTask(meta);
+        await meta.action(options, {
+          isTsProject: isTypescript(appDirectory)
+        });
+      });
+    }
+  }
+};
+const buildCommand = async (program, api) => {
+  const runner = api.useHookRunners();
+  const platformBuilders = await runner.registerBuildPlatform();
+  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(async (options) => {
+    const { build } = await Promise.resolve().then(() => __toESM(require("./commands/build")));
+    await build(api, options);
+  });
+  for (const platformBuilder of platformBuilders) {
+    const platforms = (0, import_lodash.castArray)(platformBuilder.platform);
+    for (const platform of platforms) {
+      buildProgram.command(platform).action(async () => {
+        const { appDirectory } = api.useAppContext();
+        const { isTypescript } = await Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
+        await runner.beforeBuildPlatform(platformBuilders);
+        await platformBuilder.build(platform, {
+          isTsProject: isTypescript(appDirectory)
+        });
+      });
+    }
+  }
+};
+var src_default = (options = {
+  bundler: "webpack"
+}) => ({
+  name: "@modern-js/app-tools",
+  post: [
+    "@modern-js/plugin-initialize",
+    "@modern-js/plugin-analyze",
+    "@modern-js/plugin-ssr",
+    "@modern-js/plugin-document",
+    "@modern-js/plugin-state",
+    "@modern-js/plugin-router",
+    "@modern-js/plugin-router-v5",
+    "@modern-js/plugin-polyfill"
+  ],
+  registerHook: import_hooks.hooks,
+  usePlugins: [
+    (0, import_initialize.default)({
+      bundler: (options == null ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
+    }),
+    (0, import_analyze.default)({
+      bundler: (options == null ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
+    }),
+    (0, import_plugin_lint.default)()
+  ],
+  setup: (api) => {
+    const locale = (0, import_language.getLocaleLanguage)();
+    import_locale.i18n.changeLanguage({ locale });
+    return {
+      async commands({ program }) {
+        await devCommand(program, api);
+        await buildCommand(program, api);
+        program.command("serve").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.serve.describe)).option("--api-only", import_locale.i18n.t(import_locale.localeKeys.command.dev.apiOnly)).option(
+          "-c --config <config>",
+          import_locale.i18n.t(import_locale.localeKeys.command.shared.config)
+        ).action(async () => {
+          const { start } = await Promise.resolve().then(() => __toESM(require("./commands/serve")));
+          await start(api);
+        });
+        program.command("deploy").usage("[options]").option(
+          "-c --config <config>",
+          import_locale.i18n.t(import_locale.localeKeys.command.shared.config)
+        ).description(import_locale.i18n.t(import_locale.localeKeys.command.deploy.describe)).action(async (options2) => {
+          const { build } = await Promise.resolve().then(() => __toESM(require("./commands/build")));
+          await build(api);
+          const { deploy } = await Promise.resolve().then(() => __toESM(require("./commands/deploy")));
+          await deploy(api, options2);
+          process.exit(0);
+        });
+        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(async (options2) => {
+          const { MWANewAction } = await Promise.resolve().then(() => __toESM(require("@modern-js/new-action")));
+          await MWANewAction({ ...options2, locale: options2.lang || locale });
+        });
+        program.command("inspect").description("inspect internal webpack config").option(
+          `--env <env>`,
+          import_locale.i18n.t(import_locale.localeKeys.command.inspect.env),
+          "development"
+        ).option(
+          "--output <output>",
+          import_locale.i18n.t(import_locale.localeKeys.command.inspect.output),
+          "/"
+        ).option("--verbose", import_locale.i18n.t(import_locale.localeKeys.command.inspect.verbose)).option(
+          "-c --config <config>",
+          import_locale.i18n.t(import_locale.localeKeys.command.shared.config)
+        ).action(async (options2) => {
+          const { inspect } = await Promise.resolve().then(() => __toESM(require("./commands/inspect")));
+          inspect(api, options2);
+        });
+        upgradeModel.defineCommand(program.command("upgrade"));
+      },
+      async prepare() {
+        const command = (0, import_utils.getCommand)();
+        if (command === "dev" || command === "start" || command === "build") {
+          const appContext = api.useAppContext();
+          await (0, import_utils.emptyDir)(appContext.distDirectory);
+        }
+      },
+      async watchFiles() {
+        const appContext = api.useAppContext();
+        const config = api.useResolvedConfigContext();
+        return (0, import_generateWatchFiles.generateWatchFiles)(appContext, config.source.configDir);
+      },
+      async fileChange(e) {
+        const { filename, eventType } = e;
+        const appContext = api.useAppContext();
+        const { appDirectory, srcDirectory } = appContext;
+        const absolutePath = import_path.default.resolve(appDirectory, filename);
+        if (!absolutePath.includes(srcDirectory) && (eventType === "change" || eventType === "unlink")) {
+          const { closeServer } = await Promise.resolve().then(() => __toESM(require("./utils/createServer")));
+          await closeServer();
+          await (0, import_restart.restart)(api.useHookRunners(), filename);
+        }
+      },
+      async beforeRestart() {
+        (0, import_utils.cleanRequireCache)([require.resolve("./analyze")]);
+      }
+    };
+  }
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  buildCommand,
+  devCommand
+});

package/dist/cjs/initialize/index.js

@@ -0,0 +1,102 @@
+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 initialize_exports = {};
+__export(initialize_exports, {
+  default: () => initialize_default
+});
+module.exports = __toCommonJS(initialize_exports);
+var import_utils = require("@modern-js/utils");
+var import_schema = require("../schema");
+var import_config = require("../config");
+var initialize_default = ({
+  bundler
+}) => ({
+  name: "@modern-js/plugin-initialize",
+  setup(api) {
+    const config = () => {
+      const appContext = api.useAppContext();
+      const userConfig = api.useConfigContext();
+      return (0, import_config.checkIsLegacyConfig)(userConfig) ? (0, import_config.createLegacyDefaultConfig)(appContext) : (0, import_config.createDefaultConfig)(appContext, bundler);
+    };
+    const validateSchema = () => {
+      const userConfig = api.useConfigContext();
+      const schemas = (0, import_config.checkIsLegacyConfig)(userConfig) ? import_schema.legacySchema : import_schema.schema;
+      return schemas.generate();
+    };
+    return {
+      config,
+      validateSchema,
+      async resolvedConfig({ resolved }) {
+        var _a;
+        let appContext = api.useAppContext();
+        const userConfig = api.useConfigContext();
+        const port = await getServerPort(resolved);
+        appContext = {
+          ...appContext,
+          port,
+          distDirectory: (0, import_utils.ensureAbsolutePath)(
+            appContext.distDirectory,
+            ((_a = resolved.output.distPath) == null ? void 0 : _a.root) || "dist"
+          )
+        };
+        api.setAppContext(appContext);
+        const normalizedConfig = (0, import_config.checkIsLegacyConfig)(resolved) ? (0, import_config.transformNormalizedConfig)(resolved) : resolved;
+        resolved._raw = userConfig;
+        resolved.server = {
+          ...normalizedConfig.server || {},
+          port
+        };
+        resolved.autoLoadPlugins = normalizedConfig.autoLoadPlugins || false;
+        stabilizeConfig(resolved, normalizedConfig, [
+          "source",
+          "bff",
+          "dev",
+          "html",
+          "output",
+          "tools",
+          "testing",
+          "plugins",
+          "builderPlugins",
+          "runtime",
+          "runtimeByEntries",
+          "deploy",
+          "performance"
+        ]);
+        if (bundler === "webpack") {
+          resolved.security = normalizedConfig.security || {};
+          resolved.experiments = normalizedConfig.experiments;
+        }
+        return { resolved };
+      }
+    };
+  }
+});
+function stabilizeConfig(resolve, config, keys) {
+  keys.forEach((key) => {
+    resolve[key] = config[key] || {};
+  });
+}
+async function getServerPort(config) {
+  const prodPort = config.server.port || 8080;
+  if ((0, import_utils.isDev)() && (0, import_utils.isDevCommand)()) {
+    return (0, import_utils.getPort)(config.dev.port || prodPort);
+  }
+  return prodPort;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/{js/node → cjs}/locale/zh.js

@@ -39,7 +39,7 @@ const ZH_LOCALE = {
     serve: { describe: "应用启动命令" },
     deploy: { describe: "部署应用命令" },
     new: {
-      describe: "MWA 项目中执行生成器",
+      describe: "Web App 项目中执行生成器",
       debug: "开启 Debug 模式，打印调试日志信息",
       config: "生成器运行默认配置(JSON 字符串)",
       distTag: "生成器使用特殊的 npm Tag 版本",

package/dist/cjs/types/utils.js

@@ -0,0 +1,15 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 utils_exports = {};
+module.exports = __toCommonJS(utils_exports);

package/dist/{js/node → cjs}/utils/config.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -38,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var config_exports = {};
 __export(config_exports, {
   buildServerConfig: () => buildServerConfig,
@@ -70,22 +33,20 @@ var path = __toESM(require("path"));
 var import_node_bundle_require = require("@modern-js/node-bundle-require");
 var import_utils = require("@modern-js/utils");
 const defineServerConfig = (config) => config;
-const buildServerConfig = (_0) => __async(void 0, [_0], function* ({
+const buildServerConfig = async ({
   appDirectory,
   distDirectory,
   configFile,
   options
-}) {
-  const configFilePath = yield (0, import_utils.getServerConfig)(appDirectory, configFile);
-  const getOutputFile = (filepath) => __async(void 0, null, function* () {
-    return path.resolve(
-      distDirectory,
-      `${filepath.replace(
-        new RegExp(import_utils.CONFIG_FILE_EXTENSIONS.join("|")),
-        ""
-      )}.js`
-    );
-  });
+}) => {
+  const configFilePath = await (0, import_utils.getServerConfig)(appDirectory, configFile);
+  const getOutputFile = async (filepath) => path.resolve(
+    distDirectory,
+    `${filepath.replace(
+      new RegExp(import_utils.CONFIG_FILE_EXTENSIONS.join("|")),
+      ""
+    )}.js`
+  );
   if (configFilePath) {
     const configHelperFilePath = path.normalize(
       path.join(distDirectory, "./config-helper.js")
@@ -93,9 +54,10 @@ const buildServerConfig = (_0) => __async(void 0, [_0], function* ({
     const helperCode = `
       export const defineConfig = (config) => config;
     `;
-    yield import_utils.fs.ensureDir(distDirectory);
-    yield import_utils.fs.writeFile(configHelperFilePath, helperCode);
-    yield (0, import_node_bundle_require.bundle)(configFilePath, __spreadProps(__spreadValues({}, options), {
+    await import_utils.fs.ensureDir(distDirectory);
+    await import_utils.fs.writeFile(configHelperFilePath, helperCode);
+    await (0, import_node_bundle_require.bundle)(configFilePath, {
+      ...options,
       getOutputFile,
       esbuildPlugins: [
         {
@@ -114,9 +76,9 @@ const buildServerConfig = (_0) => __async(void 0, [_0], function* ({
           }
         }
       ]
-    }));
+    });
   }
-});
+};
 const safeReplacer = () => {
   const cache = [];
   const keyCache = [];
@@ -132,18 +94,18 @@ const safeReplacer = () => {
     return value;
   };
 };
-const emitResolvedConfig = (appDirectory, resolvedConfig) => __async(void 0, null, function* () {
+const emitResolvedConfig = async (appDirectory, resolvedConfig) => {
   var _a;
   const outputPath = path.join(
     appDirectory,
     ((_a = resolvedConfig.output.distPath) == null ? void 0 : _a.root) || "./dist",
     import_utils.OUTPUT_CONFIG_FILE
   );
-  yield import_utils.fs.writeJSON(outputPath, resolvedConfig, {
+  await import_utils.fs.writeJSON(outputPath, resolvedConfig, {
     spaces: 2,
     replacer: safeReplacer()
   });
-});
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   buildServerConfig,

package/dist/{js/node → cjs}/utils/createServer.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -38,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var createServer_exports = {};
 __export(createServer_exports, {
   closeServer: () => closeServer,
@@ -73,28 +36,29 @@ const getServer = () => server;
 const setServer = (newServer) => {
   server = newServer;
 };
-const closeServer = () => __async(void 0, null, function* () {
+const closeServer = async () => {
   if (server) {
-    yield server.close();
+    await server.close();
     server = null;
   }
-});
-const createServer = (options) => __async(void 0, null, function* () {
+};
+const createServer = async (options) => {
   if (server) {
-    yield server.close();
+    await server.close();
   }
   server = new import_server.Server(options);
-  const app = yield server.init();
+  const app = await server.init();
   return app;
-});
+};
 const injectDataLoaderPlugin = (internalPlugins) => {
   const DataLoaderPlugin = require.resolve("@modern-js/plugin-data-loader/server");
-  return __spreadProps(__spreadValues({}, internalPlugins), {
+  return {
+    ...internalPlugins,
     "@modern-js/plugin-data-loader": {
       path: DataLoaderPlugin,
       forced: true
     }
-  });
+  };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {