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

package/dist/esm-node/commands/dev.js

@@ -0,0 +1,72 @@
+import { ResolvedConfigContext } from "@modern-js/core";
+import { printInstructions } from "../utils/printInstructions";
+import {
+  setServer,
+  createServer,
+  injectDataLoaderPlugin
+} from "../utils/createServer";
+import { generateRoutes } from "../utils/routes";
+import { buildServerConfig } from "../utils/config";
+import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
+const dev = async (api, options) => {
+  var _a;
+  if (options.analyze) {
+    process.env.BUNDLE_ANALYZE = "true";
+  }
+  let normalizedConfig = api.useResolvedConfigContext();
+  const appContext = api.useAppContext();
+  const hookRunners = api.useHookRunners();
+  normalizedConfig = { ...normalizedConfig, cliOptions: options };
+  ResolvedConfigContext.set(normalizedConfig);
+  const { appDirectory, distDirectory, port, apiOnly, serverConfigFile } = appContext;
+  await buildServerConfig({
+    appDirectory,
+    distDirectory,
+    configFile: serverConfigFile,
+    options: {
+      esbuildOptions: {
+        watch: true
+      }
+    }
+  });
+  await hookRunners.beforeDev();
+  if (!appContext.builder && !apiOnly) {
+    throw new Error(
+      "Expect the Builder to have been initialized, But the appContext.builder received `undefined`"
+    );
+  }
+  await generateRoutes(appContext);
+  const serverInternalPlugins = await getServerInternalPlugins(api);
+  const serverOptions = {
+    dev: {
+      port,
+      https: normalizedConfig.dev.https,
+      ...(_a = normalizedConfig.tools) == null ? void 0 : _a.devServer
+    },
+    pwd: appDirectory,
+    config: normalizedConfig,
+    serverConfigFile,
+    internalPlugins: injectDataLoaderPlugin(serverInternalPlugins)
+  };
+  if (apiOnly) {
+    const app = await createServer({
+      ...serverOptions,
+      compiler: null
+    });
+    app.listen(port, async (err) => {
+      if (err) {
+        throw err;
+      }
+      printInstructions(hookRunners, appContext, normalizedConfig);
+    });
+  } else {
+    const { server } = await appContext.builder.startDevServer({
+      printURLs: false,
+      serverOptions
+    });
+    setServer(server);
+  }
+};
+export {
+  dev
+};

package/dist/esm-node/commands/inspect.js

@@ -0,0 +1,18 @@
+import { join } from "path";
+const inspect = async (api, options) => {
+  const appContext = api.useAppContext();
+  if (!appContext.builder) {
+    throw new Error(
+      "Expect the Builder to have been initialized, But the appContext.builder received `undefined`"
+    );
+  }
+  return appContext.builder.inspectConfig({
+    env: options.env,
+    verbose: options.verbose,
+    outputPath: join(appContext == null ? void 0 : appContext.builder.context.distPath, options.output),
+    writeToDisk: true
+  });
+};
+export {
+  inspect
+};

package/dist/{js/modern → esm-node}/commands/serve.js

@@ -1,54 +1,34 @@
-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 { logger, chalk, isApiOnly } from "@modern-js/utils";
 import server from "@modern-js/prod-server";
 import { printInstructions } from "../utils/printInstructions";
 import { injectDataLoaderPlugin } from "../utils/createServer";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
-const start = (api) => __async(void 0, null, function* () {
+const start = async (api) => {
   var _a;
   const appContext = api.useAppContext();
   const userConfig = api.useResolvedConfigContext();
   const hookRunners = api.useHookRunners();
   const { appDirectory, port, serverConfigFile } = appContext;
   logger.log(chalk.cyan(`Starting the modern server...`));
-  const apiOnly = yield isApiOnly(
+  const apiOnly = await isApiOnly(
     appContext.appDirectory,
     (_a = userConfig == null ? void 0 : userConfig.source) == null ? void 0 : _a.entriesDir
   );
-  const serverInternalPlugins = yield getServerInternalPlugins(api);
-  const app = yield server({
+  const serverInternalPlugins = await getServerInternalPlugins(api);
+  const app = await server({
     pwd: appDirectory,
     config: userConfig,
     serverConfigFile,
     internalPlugins: injectDataLoaderPlugin(serverInternalPlugins),
     apiOnly
   });
-  app.listen(port, (err) => __async(void 0, null, function* () {
+  app.listen(port, async (err) => {
     if (err) {
       throw err;
     }
-    yield printInstructions(hookRunners, appContext, userConfig);
-  }));
-});
+    await printInstructions(hookRunners, appContext, userConfig);
+  });
+};
 export {
   start
 };

package/dist/{js/modern → esm-node}/config/default.js

@@ -1,33 +1,16 @@
-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));
 import { createDefaultConfig as createDefaultBuilderConfig } from "@modern-js/builder-webpack-provider";
-function createDefaultConfig(appContext) {
+function createDefaultConfig(appContext, bundler) {
   const defaultBuilderConfig = createDefaultBuilderConfig();
-  const dev = __spreadProps(__spreadValues({}, defaultBuilderConfig.dev), {
+  const dev = {
+    ...defaultBuilderConfig.dev,
     port: void 0
-  });
-  const tools = __spreadValues({}, defaultBuilderConfig.tools);
-  const output = __spreadProps(__spreadValues({}, defaultBuilderConfig.output), {
+  };
+  const output = {
+    ...defaultBuilderConfig.output,
     disableNodePolyfill: true
-  });
-  const source = __spreadProps(__spreadValues({}, defaultBuilderConfig.source), {
+  };
+  const source = {
+    ...defaultBuilderConfig.source,
     entries: void 0,
     enableAsyncEntry: false,
     disableDefaultEntries: false,
@@ -39,8 +22,9 @@ function createDefaultConfig(appContext) {
       "@": appContext.srcDirectory,
       "@shared": appContext.sharedDirectory
     }
-  });
-  const html = __spreadProps(__spreadValues({}, defaultBuilderConfig.html), {
+  };
+  const html = {
+    ...defaultBuilderConfig.html,
     title: "",
     meta: {
       charset: { charset: "utf-8" },
@@ -52,7 +36,7 @@ function createDefaultConfig(appContext) {
       "wap-font-scale": "no",
       "format-detection": "telephone=no"
     }
-  });
+  };
   const server = {
     routes: void 0,
     publicRoutes: void 0,
@@ -61,6 +45,9 @@ function createDefaultConfig(appContext) {
     baseUrl: "/",
     port: 8080
   };
+  const tools = bundler === "webpack" ? {
+    ...defaultBuilderConfig.tools
+  } : void 0;
   return {
     source,
     output,

package/dist/esm-node/config/index.js

@@ -0,0 +1,3 @@
+export * from "./legacy";
+export * from "./initialize";
+export * from "./default";

package/dist/esm-node/config/initialize/index.js

@@ -0,0 +1,12 @@
+import { initHtmlConfig, initSourceConfig, initToolsConfig } from "./inits";
+function initialNormalizedConfig(config, appContext, bundler) {
+  initHtmlConfig(config, appContext);
+  initSourceConfig(config, appContext, bundler);
+  if (bundler === "webpack") {
+    initToolsConfig(config);
+  }
+  return config;
+}
+export {
+  initialNormalizedConfig
+};

package/dist/{js/modern/config/initial → esm-node/config/initialize}/inits.js

@@ -1,22 +1,3 @@
-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));
 import path, { dirname, isAbsolute, posix, sep } from "path";
 import {
   applyOptionsChain,
@@ -59,14 +40,16 @@ function initHtmlConfig(config, appContext) {
     return favicon || defaultFavicon || void 0;
   }
 }
-function initSourceConfig(config, appContext) {
+function initSourceConfig(config, appContext, bundler) {
   config.source.include = createBuilderInclude(config, appContext);
-  config.source.moduleScopes = createBuilderModuleScope(config);
   config.source.globalVars = createBuilderGlobalVars(config, appContext);
+  if (bundler === "webpack") {
+    config.source.moduleScopes = createBuilderModuleScope(config);
+  }
   function createBuilderGlobalVars(config2, appContext2) {
     const { globalVars = {} } = config2.source;
     const publicEnv = getAutoInjectEnv(appContext2);
-    return __spreadValues(__spreadValues({}, globalVars), publicEnv);
+    return { ...globalVars, ...publicEnv };
   }
   function createBuilderInclude(config2, appContext2) {
     const { include } = config2.source;
@@ -136,10 +119,11 @@ function initToolsConfig(config) {
   config.tools.tsChecker = applyOptionsChain(defaultTsChecker, tsChecker);
   tsLoader && (config.tools.tsLoader = (tsLoaderConfig, utils) => {
     applyOptionsChain(
-      __spreadProps(__spreadValues({}, tsLoaderConfig), {
+      {
+        ...tsLoaderConfig,
         transpileOnly: false,
         allowTsInNodeModules: true
-      }),
+      },
       tsLoader || {},
       utils
     );

package/dist/{js/modern/config/initial/transformNormalizedConfig.js → esm-node/config/legacy/index.js}

@@ -42,6 +42,10 @@ function transformNormalizedConfig(config) {
     }
   };
 }
+function checkIsLegacyConfig(config) {
+  return Boolean(config.legacy);
+}
 export {
+  checkIsLegacyConfig,
   transformNormalizedConfig
 };

package/dist/esm-node/defineConfig.js

@@ -0,0 +1,9 @@
+const defineConfig = (config) => config;
+const defineLegacyConfig = (config) => ({
+  ...config,
+  legacy: true
+});
+export {
+  defineConfig,
+  defineLegacyConfig
+};

package/dist/esm-node/index.js

@@ -0,0 +1,172 @@
+import path from "path";
+import lintPlugin from "@modern-js/plugin-lint";
+import {
+  cleanRequireCache,
+  emptyDir,
+  Import,
+  getCommand
+} 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";
+import { restart } from "./utils/restart";
+import { generateWatchFiles } from "./utils/generateWatchFiles";
+export * from "./defineConfig";
+export * from "./types";
+const upgradeModel = 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(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);
+  });
+  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 import("@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(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);
+  });
+  for (const platformBuilder of platformBuilders) {
+    const platforms = castArray(platformBuilder.platform);
+    for (const platform of platforms) {
+      buildProgram.command(platform).action(async () => {
+        const { appDirectory } = api.useAppContext();
+        const { isTypescript } = await import("@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: hooks,
+  usePlugins: [
+    initializePlugin({
+      bundler: (options == null ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
+    }),
+    analyzePlugin({
+      bundler: (options == null ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
+    }),
+    lintPlugin()
+  ],
+  setup: (api) => {
+    const locale = getLocaleLanguage();
+    i18n.changeLanguage({ locale });
+    return {
+      async commands({ program }) {
+        await devCommand(program, api);
+        await 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 () => {
+          const { start } = await import("./commands/serve");
+          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 (options2) => {
+          const { build } = await import("./commands/build");
+          await build(api);
+          const { deploy } = await import("./commands/deploy");
+          await deploy(api, options2);
+          process.exit(0);
+        });
+        program.command("new").usage("[options]").description(i18n.t(localeKeys.command.new.describe)).option("--lang <lang>", i18n.t(localeKeys.command.new.lang)).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 (options2) => {
+          const { MWANewAction } = await import("@modern-js/new-action");
+          await MWANewAction({ ...options2, locale: options2.lang || 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(async (options2) => {
+          const { inspect } = await import("./commands/inspect");
+          inspect(api, options2);
+        });
+        upgradeModel.defineCommand(program.command("upgrade"));
+      },
+      async prepare() {
+        const command = getCommand();
+        if (command === "dev" || command === "start" || command === "build") {
+          const appContext = api.useAppContext();
+          await emptyDir(appContext.distDirectory);
+        }
+      },
+      async watchFiles() {
+        const appContext = api.useAppContext();
+        const config = api.useResolvedConfigContext();
+        return generateWatchFiles(appContext, config.source.configDir);
+      },
+      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 restart(api.useHookRunners(), filename);
+        }
+      },
+      async beforeRestart() {
+        cleanRequireCache([require.resolve("./analyze")]);
+      }
+    };
+  }
+});
+export {
+  buildCommand,
+  src_default as default,
+  devCommand
+};

package/dist/esm-node/initialize/index.js

@@ -0,0 +1,91 @@
+import {
+  ensureAbsolutePath,
+  getPort,
+  isDev,
+  isDevCommand
+} from "@modern-js/utils";
+import { legacySchema, schema } from "../schema";
+import {
+  checkIsLegacyConfig,
+  createDefaultConfig,
+  createLegacyDefaultConfig,
+  transformNormalizedConfig
+} from "../config";
+var initialize_default = ({
+  bundler
+}) => ({
+  name: "@modern-js/plugin-initialize",
+  setup(api) {
+    const config = () => {
+      const appContext = api.useAppContext();
+      const userConfig = api.useConfigContext();
+      return checkIsLegacyConfig(userConfig) ? createLegacyDefaultConfig(appContext) : createDefaultConfig(appContext, bundler);
+    };
+    const validateSchema = () => {
+      const userConfig = api.useConfigContext();
+      const schemas = checkIsLegacyConfig(userConfig) ? legacySchema : 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: ensureAbsolutePath(
+            appContext.distDirectory,
+            ((_a = resolved.output.distPath) == null ? void 0 : _a.root) || "dist"
+          )
+        };
+        api.setAppContext(appContext);
+        const normalizedConfig = checkIsLegacyConfig(resolved) ? 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 (isDev() && isDevCommand()) {
+    return getPort(config.dev.port || prodPort);
+  }
+  return prodPort;
+}
+export {
+  initialize_default as default
+};

package/dist/{js/modern → esm-node}/locale/zh.js

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