@modern-js/app-tools 2.15.0 → 2.16.0

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

@@ -1,52 +1,38 @@
 import path, { dirname, isAbsolute, posix, sep } from "path";
-import {
-  applyOptionsChain,
-  findExists,
-  findMonorepoRoot,
-  globby,
-  isModernjsMonorepo
-} from "@modern-js/utils";
-function initHtmlConfig(config, appContext) {
-  const ICON_EXTENSIONS = ["png", "jpg", "jpeg", "svg", "ico"];
+import { applyOptionsChain, findExists, findMonorepoRoot, globby, isModernjsMonorepo } from "@modern-js/utils";
+export function initHtmlConfig(config, appContext) {
+  const ICON_EXTENSIONS = [
+    "png",
+    "jpg",
+    "jpeg",
+    "svg",
+    "ico"
+  ];
   config.html.appIcon = createBuilderAppIcon(config, appContext);
   config.html.favicon = createBuilderFavicon(config, appContext);
   return config.html;
   function createBuilderAppIcon(config2, appContext2) {
     const { configDir } = config2.source;
-    const appIcon = findExists(
-      ICON_EXTENSIONS.map(
-        (ext) => path.resolve(
-          appContext2.appDirectory,
-          configDir || "./config",
-          `icon.${ext}`
-        )
-      )
-    );
+    const appIcon = findExists(ICON_EXTENSIONS.map((ext) => path.resolve(appContext2.appDirectory, configDir || "./config", `icon.${ext}`)));
     return typeof appIcon === "string" ? appIcon : void 0;
   }
   function createBuilderFavicon(config2, appContext2) {
     const { configDir } = config2.source;
     const { favicon } = config2.html;
-    const defaultFavicon = findExists(
-      ICON_EXTENSIONS.map(
-        (ext) => path.resolve(
-          appContext2.appDirectory,
-          configDir || "./config",
-          `favicon.${ext}`
-        )
-      )
-    );
+    const defaultFavicon = findExists(ICON_EXTENSIONS.map((ext) => path.resolve(appContext2.appDirectory, configDir || "./config", `favicon.${ext}`)));
     return favicon || defaultFavicon || void 0;
   }
 }
-function initSourceConfig(config, appContext, bundler) {
+export function initSourceConfig(config, appContext, bundler) {
   config.source.include = createBuilderInclude(config, appContext);
   if (bundler === "webpack") {
     config.source.moduleScopes = createBuilderModuleScope(config);
   }
   function createBuilderInclude(config2, appContext2) {
     const { include } = config2.source;
-    const defaultInclude = [appContext2.internalDirectory];
+    const defaultInclude = [
+      appContext2.internalDirectory
+    ];
     const transformInclude = (include || []).map((include2) => {
       if (typeof include2 === "string") {
         if (isAbsolute(include2)) {
@@ -63,9 +49,14 @@ function initSourceConfig(config, appContext, bundler) {
     const modernjsMonorepo = isModernjsMonorepo(root);
     if (modernjsMonorepo) {
       const paths = globby.sync(posix.join(root, "features", "**", "package.json"), {
-        ignore: ["**/node_modules/**/*"]
+        ignore: [
+          "**/node_modules/**/*"
+        ]
       }).map((pathname) => dirname(pathname) + sep);
-      return [...paths, ...transformInclude];
+      return [
+        ...paths,
+        ...transformInclude
+      ];
     }
     return transformInclude;
   }
@@ -82,48 +73,51 @@ function initSourceConfig(config, appContext, bundler) {
         if (isPrimitiveScope(moduleScopes)) {
           builderModuleScope = DEFAULT_SCOPES.concat(moduleScopes);
         } else {
-          builderModuleScope = [DEFAULT_SCOPES, ...moduleScopes];
+          builderModuleScope = [
+            DEFAULT_SCOPES,
+            ...moduleScopes
+          ];
         }
       } else {
-        builderModuleScope = [DEFAULT_SCOPES, moduleScopes];
+        builderModuleScope = [
+          DEFAULT_SCOPES,
+          moduleScopes
+        ];
       }
       return builderModuleScope;
     } else {
       return void 0;
     }
     function isPrimitiveScope(items) {
-      return items.every(
-        (item) => typeof item === "string" || Object.prototype.toString.call(item) === "[object RegExp]"
-      );
+      return items.every((item) => typeof item === "string" || Object.prototype.toString.call(item) === "[object RegExp]");
     }
   }
 }
-function initToolsConfig(config) {
+export function initToolsConfig(config) {
   const defaultTsChecker = {
     issue: {
-      include: [{ file: "**/src/**/*" }],
+      include: [
+        {
+          file: "**/src/**/*"
+        }
+      ],
       exclude: [
-        { file: "**/*.(spec|test).ts" },
-        { file: "**/node_modules/**/*" }
+        {
+          file: "**/*.(spec|test).ts"
+        },
+        {
+          file: "**/node_modules/**/*"
+        }
       ]
     }
   };
   const { tsChecker, tsLoader } = config.tools;
   config.tools.tsChecker = applyOptionsChain(defaultTsChecker, tsChecker);
   tsLoader && (config.tools.tsLoader = (tsLoaderConfig, utils) => {
-    applyOptionsChain(
-      {
-        ...tsLoaderConfig,
-        transpileOnly: false,
-        allowTsInNodeModules: true
-      },
-      tsLoader || {},
-      utils
-    );
+    applyOptionsChain({
+      ...tsLoaderConfig,
+      transpileOnly: false,
+      allowTsInNodeModules: true
+    }, tsLoader || {}, utils);
   });
 }
-export {
-  initHtmlConfig,
-  initSourceConfig,
-  initToolsConfig
-};

package/dist/esm-node/config/legacy/createHtmlConfig.js

@@ -1,19 +1,5 @@
-function createHtmlConfig(config) {
-  const {
-    disableHtmlFolder,
-    favicon,
-    faviconByEntries,
-    inject,
-    injectByEntries,
-    meta,
-    metaByEntries,
-    mountId,
-    title,
-    titleByEntries,
-    templateParameters,
-    templateParametersByEntries,
-    crossorigin
-  } = config.output;
+export function createHtmlConfig(config) {
+  const { disableHtmlFolder, favicon, faviconByEntries, inject, injectByEntries, meta, metaByEntries, mountId, title, titleByEntries, templateParameters, templateParametersByEntries, crossorigin } = config.output;
   return {
     disableHtmlFolder,
     favicon,
@@ -30,6 +16,3 @@ function createHtmlConfig(config) {
     templateParametersByEntries
   };
 }
-export {
-  createHtmlConfig
-};

package/dist/esm-node/config/legacy/createOutputConfig.js

@@ -1,30 +1,5 @@
-function createOutputConfig(config) {
-  const {
-    assetPrefix,
-    copy,
-    cssModuleLocalIdentName,
-    cssPath,
-    jsPath,
-    htmlPath,
-    mediaPath,
-    enableTsLoader,
-    path,
-    disableInlineRuntimeChunk,
-    disableCssExtract,
-    disableMinimize,
-    disableSourceMap,
-    disableTsChecker,
-    enableCssModuleTSDeclaration,
-    enableInlineScripts,
-    enableInlineStyles,
-    polyfill,
-    dataUriLimit,
-    disableAssetsCache,
-    enableLatestDecorators,
-    disableCssModuleExtension,
-    ssg,
-    disableNodePolyfill
-  } = config.output;
+export function createOutputConfig(config) {
+  const { assetPrefix, copy, cssModuleLocalIdentName, cssPath, jsPath, htmlPath, mediaPath, enableTsLoader, path, disableInlineRuntimeChunk, disableCssExtract, disableMinimize, disableSourceMap, disableTsChecker, enableCssModuleTSDeclaration, enableInlineScripts, enableInlineStyles, polyfill, dataUriLimit, disableAssetsCache, enableLatestDecorators, disableCssModuleExtension, ssg, disableNodePolyfill } = config.output;
   return {
     assetPrefix,
     copy,
@@ -65,6 +40,3 @@ function createOutputConfig(config) {
     disableNodePolyfill
   };
 }
-export {
-  createOutputConfig
-};

package/dist/esm-node/config/legacy/createSourceConfig.js

@@ -1,17 +1,5 @@
-function createSourceConfig(config) {
-  const {
-    alias,
-    envVars,
-    globalVars,
-    include,
-    moduleScopes,
-    preEntry,
-    entries,
-    enableAsyncEntry,
-    disableDefaultEntries,
-    entriesDir,
-    configDir
-  } = config.source;
+export function createSourceConfig(config) {
+  const { alias, envVars, globalVars, include, moduleScopes, preEntry, entries, enableAsyncEntry, disableDefaultEntries, entriesDir, configDir } = config.source;
   const builderGlobalVars = globalVars || {};
   for (const envVar of envVars || []) {
     const envVarValue = process.env[envVar];
@@ -34,6 +22,3 @@ function createSourceConfig(config) {
     }
   };
 }
-export {
-  createSourceConfig
-};

package/dist/esm-node/config/legacy/createToolsConfig.js

@@ -1,22 +1,5 @@
-function createToolsConfig(config) {
-  const {
-    autoprefixer,
-    babel,
-    minifyCss,
-    terser,
-    webpack,
-    webpackChain,
-    tsLoader,
-    styledComponents,
-    sass,
-    postcss,
-    less,
-    htmlPlugin,
-    devServer,
-    tailwindcss,
-    jest,
-    esbuild
-  } = config.tools;
+export function createToolsConfig(config) {
+  const { autoprefixer, babel, minifyCss, terser, webpack, webpackChain, tsLoader, styledComponents, sass, postcss, less, htmlPlugin, devServer, tailwindcss, jest, esbuild } = config.tools;
   const { enableTsLoader } = config.output;
   return {
     tsLoader: enableTsLoader ? tsLoader : void 0,
@@ -40,6 +23,3 @@ function createToolsConfig(config) {
     }
   };
 }
-export {
-  createToolsConfig
-};

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

@@ -2,23 +2,12 @@ import { createToolsConfig } from "./createToolsConfig";
 import { createSourceConfig } from "./createSourceConfig";
 import { createOutputConfig } from "./createOutputConfig";
 import { createHtmlConfig } from "./createHtmlConfig";
-function transformNormalizedConfig(config) {
+export function transformNormalizedConfig(config) {
   const html = createHtmlConfig(config);
   const output = createOutputConfig(config);
   const source = createSourceConfig(config);
   const tools = createToolsConfig(config);
-  const {
-    bff,
-    dev,
-    deploy,
-    runtime,
-    runtimeByEntries,
-    server,
-    cliOptions,
-    plugins,
-    testing,
-    autoLoadPlugins
-  } = config;
+  const { bff, dev, deploy, runtime, runtimeByEntries, server, cliOptions, plugins, testing, autoLoadPlugins } = config;
   return {
     source,
     html,
@@ -43,10 +32,6 @@ function transformNormalizedConfig(config) {
     }
   };
 }
-function checkIsLegacyConfig(config) {
+export function checkIsLegacyConfig(config) {
   return Boolean(config.legacy);
 }
-export {
-  checkIsLegacyConfig,
-  transformNormalizedConfig
-};

package/dist/esm-node/defineConfig.js

@@ -1,13 +1,7 @@
-const defineConfig = (config) => config;
-const defineLegacyConfig = (config) => {
-  var _a;
-  return {
-    ...config,
-    legacy: true,
-    autoLoadPlugins: (_a = config.autoLoadPlugins) != null ? _a : true
-  };
-};
-export {
-  defineConfig,
-  defineLegacyConfig
-};
+export const defineConfig = (config) => config;
+var _config_autoLoadPlugins;
+export const defineLegacyConfig = (config) => ({
+  ...config,
+  legacy: true,
+  autoLoadPlugins: (_config_autoLoadPlugins = config.autoLoadPlugins) !== null && _config_autoLoadPlugins !== void 0 ? _config_autoLoadPlugins : true
+});

package/dist/esm-node/exports/server.js

@@ -1,4 +1 @@
-import { defineServerConfig } from "../utils/config";
-export {
-  defineServerConfig as defineConfig
-};
+export { defineServerConfig as defineConfig } from "../utils/config";

package/dist/esm-node/hooks.js

@@ -1,9 +1,5 @@
-import {
-  createAsyncWaterfall,
-  createAsyncWorkflow,
-  createParallelWorkflow
-} from "@modern-js/plugin";
-const hooks = {
+import { createAsyncWaterfall, createAsyncWorkflow, createParallelWorkflow } from "@modern-js/plugin";
+export const hooks = {
   modifyEntryExport: createAsyncWaterfall(),
   modifyEntryImports: createAsyncWaterfall(),
   modifyEntryRuntimePlugins: createAsyncWaterfall(),
@@ -30,6 +26,3 @@ const hooks = {
   registerBuildPlatform: createParallelWorkflow(),
   beforeBuildPlatform: createParallelWorkflow()
 };
-export {
-  hooks
-};

package/dist/esm-node/index.js

@@ -1,11 +1,6 @@
 import path from "path";
 import lintPlugin from "@modern-js/plugin-lint";
-import {
-  cleanRequireCache,
-  emptyDir,
-  Import,
-  getCommand
-} from "@modern-js/utils";
+import { cleanRequireCache, emptyDir, Import, getCommand } from "@modern-js/utils";
 import { castArray } from "@modern-js/utils/lodash";
 import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
 import analyzePlugin from "./analyze";
@@ -14,14 +9,11 @@ import { hooks } from "./hooks";
 import { i18n, localeKeys } from "./locale";
 import { restart } from "./utils/restart";
 import { generateWatchFiles } from "./utils/generateWatchFiles";
-import { mergeConfig } from "@modern-js/core";
+export { mergeConfig } from "@modern-js/core";
 export * from "./defineConfig";
 export * from "./types";
-const upgradeModel = Import.lazy(
-  "@modern-js/upgrade",
-  require
-);
-const devCommand = async (program, api) => {
+const upgradeModel = Import.lazy("@modern-js/upgrade", require);
+export 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)).option("--web-only", i18n.t(localeKeys.command.dev.webOnly)).action(async (options) => {
@@ -44,7 +36,7 @@ const devCommand = async (program, api) => {
     }
   }
 };
-const buildCommand = async (program, api) => {
+export 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) => {
@@ -65,114 +57,97 @@ const buildCommand = async (program, api) => {
     }
   }
 };
-var src_default = (options = {
+export 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 the internal configs").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" || command === "deploy") {
-          const resolvedConfig = api.useResolvedConfigContext();
-          if (resolvedConfig.output.cleanDistPath) {
-            const appContext = api.useAppContext();
-            await emptyDir(appContext.distDirectory);
+}) => {
+  return {
+    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 || options === void 0 ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
+      }),
+      analyzePlugin({
+        bundler: (options === null || options === void 0 ? 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("-c, --config <config>", i18n.t(localeKeys.command.new.config)).option("-d, --debug", i18n.t(localeKeys.command.new.debug), false).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 the internal configs").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" || command === "deploy") {
+            const resolvedConfig = api.useResolvedConfigContext();
+            if (resolvedConfig.output.cleanDistPath) {
+              const appContext = api.useAppContext();
+              await emptyDir(appContext.distDirectory);
+            }
           }
+        },
+        async watchFiles() {
+          const appContext = api.useAppContext();
+          const config = api.useResolvedConfigContext();
+          return generateWatchFiles(appContext, config.source.configDir);
+        },
+        // 这里会被 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 restart(api.useHookRunners(), filename);
+          }
+        },
+        async beforeRestart() {
+          cleanRequireCache([
+            require.resolve("./analyze")
+          ]);
         }
-      },
-      async watchFiles() {
-        const appContext = api.useAppContext();
-        const config = api.useResolvedConfigContext();
-        return generateWatchFiles(appContext, config.source.configDir);
-      },
-      // 这里会被 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 restart(api.useHookRunners(), filename);
-        }
-      },
-      async beforeRestart() {
-        cleanRequireCache([require.resolve("./analyze")]);
-      }
-    };
-  }
-});
-export {
-  buildCommand,
-  src_default as default,
-  devCommand,
-  mergeConfig
+      };
+    }
+  };
 };