@modern-js/app-tools 1.22.2 → 2.0.0-alpha.0

package/dist/js/modern/index.js

@@ -1,109 +1,200 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import path from 'path';
-import { defineConfig, cli } from '@modern-js/core';
-import LintPlugin from '@modern-js/plugin-jarvis';
-import { cleanRequireCache, Import } from '@modern-js/utils';
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+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 __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());
+  });
+};
+import path from "path";
+import LintPlugin from "@modern-js/plugin-lint";
+import { cleanRequireCache, emptyDir, Import } from "@modern-js/utils";
+import { castArray } from "@modern-js/utils/lodash";
 import AnalyzePlugin from "./analyze";
+import InitializePlugin from "./initialize";
 import { hooks } from "./hooks";
 import { i18n, localeKeys } from "./locale";
 import { getLocaleLanguage } from "./utils/language";
-export { defineConfig };
-const upgradeModel = Import.lazy('@modern-js/upgrade', require);
-export default (() => ({
-  name: '@modern-js/app-tools',
-  post: ['@modern-js/plugin-analyze', '@modern-js/plugin-ssr', '@modern-js/plugin-state', '@modern-js/plugin-router', '@modern-js/plugin-polyfill'],
+import { getCommand } from "./utils/commands";
+import { restart } from "./utils/restart";
+export * from "./defineConfig";
+export * from "./types";
+const upgradeModel = Import.lazy(
+  "@modern-js/upgrade",
+  require
+);
+const devCommand = (program, api) => __async(void 0, null, function* () {
+  const runner = api.useHookRunners();
+  const devToolMetas = yield runner.registerDev();
+  const devProgram = program.command("dev").alias("start").usage("[options]").description(i18n.t(localeKeys.command.dev.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-e --entry [entry...]", i18n.t(localeKeys.command.dev.entry)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).action((options) => __async(void 0, null, function* () {
+    const { dev } = yield import("./commands/dev");
+    yield dev(api, options);
+  }));
+  for (const meta of devToolMetas) {
+    if (!meta.subCommands) {
+      continue;
+    }
+    for (const subCmd of meta.subCommands) {
+      devProgram.command(subCmd).action((..._0) => __async(void 0, [..._0], function* (options = {}) {
+        const { appDirectory } = api.useAppContext();
+        const { isTypescript } = yield import("@modern-js/utils");
+        yield runner.beforeDevTask(meta);
+        yield meta.action(options, {
+          isTsProject: isTypescript(appDirectory)
+        });
+      }));
+    }
+  }
+});
+const buildCommand = (program, api) => __async(void 0, null, function* () {
+  const runner = api.useHookRunners();
+  const platformBuilders = yield runner.registerBuildPlatform();
+  const buildProgram = program.command("build").usage("[options]").description(i18n.t(localeKeys.command.build.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).action((options) => __async(void 0, null, function* () {
+    const { build } = yield import("./commands/build");
+    yield build(api, options);
+    process.exit(0);
+  }));
+  for (const platformBuilder of platformBuilders) {
+    const platforms = castArray(platformBuilder.platform);
+    for (const platform of platforms) {
+      buildProgram.command(platform).action(() => __async(void 0, null, function* () {
+        const { appDirectory } = api.useAppContext();
+        const { isTypescript } = yield import("@modern-js/utils");
+        yield runner.beforeBuildPlatform(platformBuilders);
+        yield platformBuilder.build(platform, {
+          isTsProject: isTypescript(appDirectory)
+        });
+      }));
+    }
+  }
+});
+var src_default = () => ({
+  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: hooks,
-  usePlugins: [AnalyzePlugin(), LintPlugin()],
-  setup: api => {
+  usePlugins: [InitializePlugin(), AnalyzePlugin(), LintPlugin()],
+  setup: (api) => {
     const locale = getLocaleLanguage();
-    i18n.changeLanguage({
-      locale
-    });
+    i18n.changeLanguage({ locale });
     return {
-      commands({
-        program
-      }) {
-        program.command('dev').usage('[options]').description(i18n.t(localeKeys.command.dev.describe)).option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).option('-e --entry [entry...]', i18n.t(localeKeys.command.dev.entry)).option('--analyze', i18n.t(localeKeys.command.shared.analyze)).option('--api-only', i18n.t(localeKeys.command.dev.apiOnly)).action(async options => {
-          const {
-            dev
-          } = await import("./commands/dev");
-          await dev(api, options);
-        });
-        program.command('build').usage('[options]').description(i18n.t(localeKeys.command.build.describe)).option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).option('--analyze', i18n.t(localeKeys.command.shared.analyze)).action(async options => {
-          const {
-            build
-          } = await import("./commands/build");
-          await build(api, options); // force exit after build.
-          // eslint-disable-next-line no-process-exit
-
-          process.exit(0);
-        });
-        program.command('start').usage('[options]').description(i18n.t(localeKeys.command.start.describe)).option('--api-only', i18n.t(localeKeys.command.dev.apiOnly)).option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).action(async () => {
-          const {
-            start
-          } = await import("./commands/start");
-          await start(api);
-        });
-        program.command('deploy').usage('[options]').option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).description(i18n.t(localeKeys.command.deploy.describe)).action(async options => {
-          const {
-            build
-          } = await import("./commands/build");
-          await build(api);
-          const {
-            deploy
-          } = await import("./commands/deploy");
-          await deploy(api, options); // eslint-disable-next-line no-process-exit
-
-          process.exit(0);
-        });
-        program.command('new').usage('[options]').description(i18n.t(localeKeys.command.new.describe)).option('-d, --debug', i18n.t(localeKeys.command.new.debug), false).option('-c, --config <config>', i18n.t(localeKeys.command.new.config)).option('--dist-tag <tag>', i18n.t(localeKeys.command.new.distTag)).option('--registry', i18n.t(localeKeys.command.new.registry)).action(async options => {
-          const {
-            MWANewAction
-          } = await import('@modern-js/new-action');
-          await MWANewAction(_objectSpread(_objectSpread({}, options), {}, {
-            locale
+      commands(_0) {
+        return __async(this, arguments, function* ({ program }) {
+          yield devCommand(program, api);
+          yield buildCommand(program, api);
+          program.command("serve").usage("[options]").description(i18n.t(localeKeys.command.serve.describe)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).option(
+            "-c --config <config>",
+            i18n.t(localeKeys.command.shared.config)
+          ).action(() => __async(this, null, function* () {
+            const { start } = yield import("./commands/serve");
+            yield start(api);
+          }));
+          program.command("deploy").usage("[options]").option(
+            "-c --config <config>",
+            i18n.t(localeKeys.command.shared.config)
+          ).description(i18n.t(localeKeys.command.deploy.describe)).action((options) => __async(this, null, function* () {
+            const { build } = yield import("./commands/build");
+            yield build(api);
+            const { deploy } = yield import("./commands/deploy");
+            yield deploy(api, options);
+            process.exit(0);
+          }));
+          program.command("new").usage("[options]").description(i18n.t(localeKeys.command.new.describe)).option("-d, --debug", i18n.t(localeKeys.command.new.debug), false).option(
+            "-c, --config <config>",
+            i18n.t(localeKeys.command.new.config)
+          ).option("--dist-tag <tag>", i18n.t(localeKeys.command.new.distTag)).option("--registry", i18n.t(localeKeys.command.new.registry)).action((options) => __async(this, null, function* () {
+            const { MWANewAction } = yield import("@modern-js/new-action");
+            yield MWANewAction(__spreadProps(__spreadValues({}, options), { locale }));
           }));
+          program.command("inspect").description("inspect internal webpack config").option(
+            `--env <env>`,
+            i18n.t(localeKeys.command.inspect.env),
+            "development"
+          ).option(
+            "--output <output>",
+            i18n.t(localeKeys.command.inspect.output),
+            "/"
+          ).option("--verbose", i18n.t(localeKeys.command.inspect.verbose)).option(
+            "-c --config <config>",
+            i18n.t(localeKeys.command.shared.config)
+          ).action((options) => __async(this, null, function* () {
+            const { inspect } = yield import("./commands/inspect");
+            inspect(api, options);
+          }));
+          upgradeModel.defineCommand(program.command("upgrade"));
         });
-        program.command('inspect').description('inspect internal webpack config').option(`--env <env>`, i18n.t(localeKeys.command.inspect.env), 'development').option('--output <output>', i18n.t(localeKeys.command.inspect.output), '/').option('--no-console', i18n.t(localeKeys.command.inspect.noConsole)).option('--verbose', i18n.t(localeKeys.command.inspect.verbose)).option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).action(async options => {
-          const {
-            inspect
-          } = await import("./commands/inspect");
-          inspect(api, options);
+      },
+      prepare() {
+        return __async(this, null, function* () {
+          const command = getCommand();
+          if (command === "dev" || command === "start" || command === "build") {
+            const appContext = api.useAppContext();
+            yield emptyDir(appContext.distDirectory);
+          }
         });
-        upgradeModel.defineCommand(program.command('upgrade'));
       },
-
-      // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
-      async fileChange(e) {
-        const {
-          filename,
-          eventType
-        } = e;
-        const appContext = api.useAppContext();
-        const {
-          appDirectory,
-          srcDirectory
-        } = appContext;
-        const absolutePath = path.resolve(appDirectory, filename);
-
-        if (!absolutePath.includes(srcDirectory) && (eventType === 'change' || eventType === 'unlink')) {
-          const {
-            closeServer
-          } = await import("./utils/createServer");
-          await closeServer();
-          await cli.restart();
-        }
+      fileChange(e) {
+        return __async(this, null, function* () {
+          const { filename, eventType } = e;
+          const appContext = api.useAppContext();
+          const { appDirectory, srcDirectory } = appContext;
+          const absolutePath = path.resolve(appDirectory, filename);
+          if (!absolutePath.includes(srcDirectory) && (eventType === "change" || eventType === "unlink")) {
+            const { closeServer } = yield import("./utils/createServer");
+            yield closeServer();
+            yield restart(api.useHookRunners(), filename);
+          }
+        });
       },
-
-      async beforeRestart() {
-        cleanRequireCache([require.resolve("./analyze")]);
+      beforeRestart() {
+        return __async(this, null, function* () {
+          cleanRequireCache([require.resolve("./analyze")]);
+        });
       }
-
     };
   }
-}));
+});
+export {
+  buildCommand,
+  src_default as default,
+  devCommand
+};

package/dist/js/modern/initialize/index.js

@@ -0,0 +1,120 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+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 __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());
+  });
+};
+import { ensureAbsolutePath, getPort, isDev } from "@modern-js/utils";
+import { legacySchema, schema } from "../schema";
+import { isDevCommand } from "../utils/commands";
+import { transformNormalizedConfig } from "../config/initial/transformNormalizedConfig";
+import {
+  checkIsLegacyConfig,
+  createDefaultConfig,
+  createLegacyDefaultConfig
+} from "../config";
+var initialize_default = () => ({
+  name: "@modern-js/plugin-initialize",
+  setup(api) {
+    const config = () => {
+      const appContext = api.useAppContext();
+      const userConfig = api.useConfigContext();
+      return checkIsLegacyConfig(userConfig) ? createLegacyDefaultConfig(appContext) : createDefaultConfig(appContext);
+    };
+    const validateSchema = () => {
+      const userConfig = api.useConfigContext();
+      const schemas = checkIsLegacyConfig(userConfig) ? legacySchema : schema;
+      return schemas.generate();
+    };
+    return {
+      config,
+      validateSchema,
+      resolvedConfig(_0) {
+        return __async(this, arguments, function* ({ resolved }) {
+          var _a2, _b;
+          let appContext = api.useAppContext();
+          const userConfig = api.useConfigContext();
+          const port = yield getDevServerPort(appContext, resolved);
+          appContext = __spreadProps(__spreadValues({}, appContext), {
+            port,
+            distDirectory: ensureAbsolutePath(
+              appContext.distDirectory,
+              ((_a2 = resolved.output.distPath) == null ? void 0 : _a2.root) || "dist"
+            )
+          });
+          api.setAppContext(appContext);
+          const normalizedConfig = checkIsLegacyConfig(resolved) ? transformNormalizedConfig(resolved) : resolved;
+          return {
+            resolved: {
+              _raw: userConfig,
+              source: normalizedConfig.source || {},
+              server: __spreadProps(__spreadValues({}, normalizedConfig.server || {}), {
+                port: port || ((_b = normalizedConfig.server) == null ? void 0 : _b.port)
+              }),
+              bff: normalizedConfig.bff || {},
+              dev: normalizedConfig.dev || {},
+              html: normalizedConfig.html || {},
+              output: normalizedConfig.output || {},
+              security: normalizedConfig.security || {},
+              tools: normalizedConfig.tools || {},
+              testing: normalizedConfig.testing || {},
+              plugins: normalizedConfig.plugins || [],
+              builderPlugins: normalizedConfig.builderPlugins || [],
+              runtime: normalizedConfig.runtime || {},
+              runtimeByEntries: normalizedConfig.runtimeByEntries || {},
+              deploy: normalizedConfig.deploy || {},
+              performance: normalizedConfig.performance || {},
+              experiments: normalizedConfig.experiments || {},
+              autoLoadPlugins: normalizedConfig.autoLoadPlugins || false
+            }
+          };
+        });
+      }
+    };
+  }
+});
+function getDevServerPort(appContext, resolved) {
+  return __async(this, null, function* () {
+    var _a;
+    if (isDev() && isDevCommand()) {
+      return ((_a = appContext.port) != null ? _a : 0) > 0 ? appContext.port : yield getPort(resolved.server.port || 8080);
+    }
+    return resolved.server.port;
+  });
+}
+export {
+  initialize_default as default
+};

package/dist/js/modern/locale/en.js

@@ -1,35 +1,33 @@
-export const EN_LOCALE = {
+const EN_LOCALE = {
   command: {
     shared: {
-      analyze: 'analyze bundle size',
-      config: 'specify config file'
+      analyze: "analyze bundle size",
+      config: "specify config file"
     },
     dev: {
-      describe: 'start dev server',
-      entry: 'compiler by entry',
-      apiOnly: 'start api server only'
+      describe: "start dev server",
+      entry: "compiler by entry",
+      apiOnly: "start api server only"
     },
     build: {
-      describe: 'build application'
-    },
-    start: {
-      describe: 'start server'
-    },
-    deploy: {
-      describe: 'deploy application'
+      describe: "build application"
     },
+    serve: { describe: "start server" },
+    deploy: { describe: "deploy application" },
     new: {
-      describe: 'generator runner for MWA project',
-      debug: 'using debug mode to log something',
-      config: 'set default generator config(json string)',
+      describe: "generator runner for MWA project",
+      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"
     },
     inspect: {
-      env: 'specify env mode',
-      output: 'specify inspect content output path',
-      noConsole: 'do not log the result in terminal',
-      verbose: 'show full function definitions in output'
+      env: "specify env mode",
+      output: "specify inspect content output path",
+      verbose: "show full function definitions in output"
     }
   }
-};
+};
+export {
+  EN_LOCALE
+};

package/dist/js/modern/locale/index.js

@@ -1,9 +1,9 @@
-import { I18n } from '@modern-js/plugin-i18n';
+import { I18n } from "@modern-js/plugin-i18n";
 import { ZH_LOCALE } from "./zh";
 import { EN_LOCALE } from "./en";
 const i18n = new I18n();
-const localeKeys = i18n.init('zh', {
-  zh: ZH_LOCALE,
-  en: EN_LOCALE
-});
-export { i18n, localeKeys };
+const localeKeys = i18n.init("zh", { zh: ZH_LOCALE, en: EN_LOCALE });
+export {
+  i18n,
+  localeKeys
+};

package/dist/js/modern/locale/zh.js

@@ -1,35 +1,33 @@
-export const ZH_LOCALE = {
+const ZH_LOCALE = {
   command: {
     shared: {
-      analyze: '分析构建产物体积，查看各个模块打包后的大小',
-      config: '指定配置文件路径，可以为相对路径或绝对路径'
+      analyze: "分析构建产物体积，查看各个模块打包后的大小",
+      config: "指定配置文件路径，可以为相对路径或绝对路径"
     },
     dev: {
-      describe: '本地开发命令',
-      entry: '指定入口，编译特定的页面',
-      apiOnly: '仅启动 API 接口服务'
+      describe: "本地开发命令",
+      entry: "指定入口，编译特定的页面",
+      apiOnly: "仅启动 API 接口服务"
     },
     build: {
-      describe: '构建应用命令'
-    },
-    start: {
-      describe: '应用启动命令'
-    },
-    deploy: {
-      describe: '部署应用命令'
+      describe: "构建应用命令"
     },
+    serve: { describe: "应用启动命令" },
+    deploy: { describe: "部署应用命令" },
     new: {
-      describe: 'MWA 项目中执行生成器',
-      debug: '开启 Debug 模式，打印调试日志信息',
-      config: '生成器运行默认配置(JSON 字符串)',
-      distTag: '生成器使用特殊的 npm Tag 版本',
-      registry: '生成器运行过程中定制 npm Registry'
+      describe: "MWA 项目中执行生成器",
+      debug: "开启 Debug 模式，打印调试日志信息",
+      config: "生成器运行默认配置(JSON 字符串)",
+      distTag: "生成器使用特殊的 npm Tag 版本",
+      registry: "生成器运行过程中定制 npm Registry"
     },
     inspect: {
-      env: '查看指定环境下的配置',
-      output: '指定在 dist 目录下输出的路径',
-      noConsole: '不在终端中输出完整结果',
-      verbose: '在结果中展示函数的完整内容'
+      env: "查看指定环境下的配置",
+      output: "指定在 dist 目录下输出的路径",
+      verbose: "在结果中展示函数的完整内容"
     }
   }
-};
+};
+export {
+  ZH_LOCALE
+};

package/dist/js/modern/schema/Schema.js

@@ -0,0 +1,40 @@
+import { merge } from "@modern-js/utils/lodash";
+class Schema extends Map {
+  constructor(baseSchema = {}) {
+    super();
+    this.schema = baseSchema;
+  }
+  setSchema(key, object) {
+    Object.entries(object).forEach(([k, v]) => {
+      const target = `${key}.${k}`;
+      this.set(target, v);
+    });
+    return this;
+  }
+  set(key, value) {
+    if (this.has(key)) {
+      merge(this.schema[key], value);
+    } else {
+      this.schema[key] = value;
+    }
+    return this;
+  }
+  has(key) {
+    return key in this.schema;
+  }
+  get(key) {
+    return this.schema[key];
+  }
+  delete(key) {
+    return delete this.schema[key];
+  }
+  generate() {
+    return Object.entries(this.schema).map(([target, schema]) => ({
+      target,
+      schema
+    }));
+  }
+}
+export {
+  Schema
+};