@modern-js/app-tools 2.62.1 → 2.62.2-alpha.0

package/dist/cjs/new/index.js

@@ -0,0 +1,79 @@
+"use strict";
+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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var new_exports = {};
+__export(new_exports, {
+  appTools: () => appTools,
+  initAppContext: () => import_context.initAppContext
+});
+module.exports = __toCommonJS(new_exports);
+var import_plugin_v2 = require("@modern-js/plugin-v2");
+var import_old = require("../old");
+var import_compat = require("./compat");
+var import_constants = require("./constants");
+var import_context = require("./context");
+__reExport(new_exports, require("../defineConfig"), module.exports);
+const appTools = (options = {
+  // default webpack to be compatible with original projects
+  bundler: "webpack"
+}) => ({
+  name: "@modern-js/app-tools",
+  usePlugins: [
+    (0, import_compat.compatPlugin)(),
+    (0, import_old.appTools)(options)
+  ],
+  post: [
+    "@modern-js/app-tools-old"
+  ],
+  registryHooks: {
+    onBeforeConfig: (0, import_plugin_v2.createAsyncHook)(),
+    onAfterPrepare: (0, import_plugin_v2.createAsyncHook)(),
+    deploy: (0, import_plugin_v2.createAsyncHook)(),
+    _internalRuntimePlugins: (0, import_plugin_v2.createAsyncHook)(),
+    _internalServerPlugins: (0, import_plugin_v2.createAsyncHook)(),
+    checkEntryPoint: (0, import_plugin_v2.createAsyncHook)(),
+    modifyEntrypoints: (0, import_plugin_v2.createAsyncHook)(),
+    modifyFileSystemRoutes: (0, import_plugin_v2.createAsyncHook)(),
+    modifyServerRoutes: (0, import_plugin_v2.createAsyncHook)(),
+    generateEntryCode: (0, import_plugin_v2.createAsyncHook)(),
+    onBeforeGenerateRoutes: (0, import_plugin_v2.createAsyncHook)(),
+    onBeforePrintInstructions: (0, import_plugin_v2.createAsyncHook)(),
+    registerDev: (0, import_plugin_v2.createAsyncHook)(),
+    registerBuildPlatform: (0, import_plugin_v2.createAsyncHook)(),
+    addRuntimeExports: (0, import_plugin_v2.createAsyncHook)()
+  },
+  setup: (api) => {
+    var _userConfig_output;
+    const context = api.getAppContext();
+    const userConfig = api.getConfig();
+    api.updateAppContext((0, import_context.initAppContext)({
+      appDirectory: context.appDirectory,
+      options: {},
+      serverConfigFile: import_constants.DEFAULT_SERVER_CONFIG_FILE,
+      runtimeConfigFile: import_constants.DEFAULT_RUNTIME_CONFIG_FILE,
+      tempDir: (_userConfig_output = userConfig.output) === null || _userConfig_output === void 0 ? void 0 : _userConfig_output.tempDir
+    }));
+  }
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  appTools,
+  initAppContext,
+  ...require("../defineConfig")
+});

package/dist/cjs/new/loadPlugins.js

@@ -0,0 +1,57 @@
+"use strict";
+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 loadPlugins_exports = {};
+__export(loadPlugins_exports, {
+  loadInternalPlugins: () => loadInternalPlugins
+});
+module.exports = __toCommonJS(loadPlugins_exports);
+var import_utils = require("@modern-js/utils");
+const debug = (0, import_utils.createDebugger)("load-plugins");
+const resolveCliPlugin = async (p, appDirectory) => {
+  const pkg = typeof p === "string" ? p : p[0];
+  const pluginOptions = typeof p === "string" ? void 0 : p[1];
+  const path = (0, import_utils.tryResolve)(pkg, appDirectory);
+  let module2;
+  try {
+    module2 = await (0, import_utils.compatibleRequire)(path);
+  } catch (e) {
+    ({ default: module2 } = await (0, import_utils.dynamicImport)(path));
+  }
+  if (typeof module2 === "function") {
+    const result = module2(pluginOptions);
+    return result;
+  }
+  return module2;
+};
+const loadInternalPlugins = async (appDirectory, internalPlugins, autoLoad, autoLoadPlugins) => {
+  const plugins = [
+    ...autoLoadPlugins ? (0, import_utils.getInternalPlugins)(appDirectory, internalPlugins) : [],
+    ...autoLoad ? (0, import_utils.getInternalPlugins)(appDirectory, autoLoad) : []
+  ];
+  const loadedPlugins = await Promise.all(plugins.map((plugin) => {
+    const loadedPlugin = resolveCliPlugin(plugin, appDirectory);
+    debug(`resolve plugin %s: %s`, plugin, loadedPlugin);
+    return loadedPlugin;
+  }));
+  return loadedPlugins;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  loadInternalPlugins
+});

package/dist/cjs/new/run.js

@@ -0,0 +1,67 @@
+"use strict";
+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 run_exports = {};
+__export(run_exports, {
+  run: () => run
+});
+module.exports = __toCommonJS(run_exports);
+var import_cli = require("@modern-js/plugin-v2/cli");
+var import_run = require("@modern-js/plugin-v2/run");
+var import_utils = require("@modern-js/utils");
+var import_hooks = require("./compat/hooks");
+var import_constants = require("./constants");
+var import_getConfigFile = require("./getConfigFile");
+var import_loadPlugins = require("./loadPlugins");
+var import_utils2 = require("./utils");
+async function run({ cwd, initialLog, version, internalPlugins, packageJsonConfig, configFile }) {
+  const command = process.argv[2];
+  const cliParams = (0, import_utils.minimist)(process.argv.slice(2));
+  const SUPPORT_CONFIG_PARAM_COMMANDS = [
+    "dev",
+    "build",
+    "deploy",
+    "start",
+    "serve",
+    "inspect",
+    "upgrade"
+  ];
+  let customConfigFile;
+  if (SUPPORT_CONFIG_PARAM_COMMANDS.includes(command)) {
+    customConfigFile = cliParams.config || cliParams.c;
+  }
+  if (command === "new") {
+    customConfigFile = cliParams["config-file"];
+  }
+  const appDirectory = await (0, import_cli.initAppDir)(cwd);
+  const finalConfigFile = customConfigFile || (0, import_getConfigFile.getConfigFile)(configFile);
+  const autoLoadPlugins = await (0, import_utils2.getIsAutoLoadPlugins)(appDirectory, finalConfigFile);
+  const plugins = await (0, import_loadPlugins.loadInternalPlugins)(appDirectory, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.cli, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.autoLoad, autoLoadPlugins);
+  await (0, import_run.run)({
+    cwd,
+    initialLog: initialLog || `Modern.js Framework v${version}`,
+    configFile: finalConfigFile,
+    packageJsonConfig: packageJsonConfig || import_constants.PACKAGE_JSON_CONFIG_NAME,
+    internalPlugins: plugins,
+    handleSetupResult: import_hooks.handleSetupResult
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  run
+});

package/dist/cjs/new/types/index.js

@@ -0,0 +1,16 @@
+"use strict";
+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 types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/dist/cjs/new/utils/index.js

@@ -0,0 +1,34 @@
+"use strict";
+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 utils_exports = {};
+__export(utils_exports, {
+  getIsAutoLoadPlugins: () => getIsAutoLoadPlugins
+});
+module.exports = __toCommonJS(utils_exports);
+var import_cli = require("@modern-js/plugin-v2/cli");
+async function getIsAutoLoadPlugins(appDirectory, configFile = "modern.config.ts", packageJsonConfig = "ModernConfig") {
+  var _loaded_config;
+  const loaded = await (0, import_cli.createLoadedConfig)(appDirectory, configFile, packageJsonConfig);
+  const autoLoadPlugins = (_loaded_config = loaded.config) === null || _loaded_config === void 0 ? void 0 : _loaded_config.autoLoadPlugins;
+  return autoLoadPlugins || false;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getIsAutoLoadPlugins
+});

package/dist/cjs/old.js

@@ -0,0 +1,179 @@
+"use strict";
+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(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var old_exports = {};
+__export(old_exports, {
+  appTools: () => appTools,
+  default: () => old_default,
+  dev: () => import_dev.dev,
+  mergeConfig: () => import_core.mergeConfig
+});
+module.exports = __toCommonJS(old_exports);
+var import_path = __toESM(require("path"));
+var import_language_detector = require("@modern-js/plugin-i18n/language-detector");
+var import_uni_builder = require("@modern-js/uni-builder");
+var import_utils = require("@modern-js/utils");
+var import_hooks = require("./hooks");
+var import_locale = require("./locale");
+var import_analyze = __toESM(require("./plugins/analyze"));
+var import_deploy = __toESM(require("./plugins/deploy"));
+var import_initialize = __toESM(require("./plugins/initialize"));
+var import_serverBuild = __toESM(require("./plugins/serverBuild"));
+var import_commands = require("./commands");
+var import_generateWatchFiles = require("./utils/generateWatchFiles");
+var import_restart = require("./utils/restart");
+var import_dev = require("./commands/dev");
+var import_core = require("@modern-js/core");
+__reExport(old_exports, require("./defineConfig"), module.exports);
+__reExport(old_exports, require("./types"), module.exports);
+const appTools = (options = {
+  // default webpack to be compatible with original projects
+  bundler: "webpack"
+}) => ({
+  name: "@modern-js/app-tools-old",
+  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 || options === void 0 ? void 0 : options.bundler) && [
+        "rspack",
+        "experimental-rspack"
+      ].includes(options.bundler) ? "rspack" : "webpack"
+    }),
+    (0, import_analyze.default)({
+      bundler: (options === null || options === void 0 ? void 0 : options.bundler) && [
+        "rspack",
+        "experimental-rspack"
+      ].includes(options.bundler) ? "rspack" : "webpack"
+    }),
+    (0, import_serverBuild.default)(),
+    (0, import_deploy.default)()
+  ],
+  setup: (api) => {
+    const appContext = api.useAppContext();
+    api.setAppContext({
+      ...appContext,
+      toolsType: "app-tools"
+    });
+    const locale = (0, import_language_detector.getLocaleLanguage)();
+    import_locale.i18n.changeLanguage({
+      locale
+    });
+    return {
+      async beforeConfig() {
+        var _userConfig_output;
+        const userConfig = api.useConfigContext();
+        const appContext2 = api.useAppContext();
+        if ((_userConfig_output = userConfig.output) === null || _userConfig_output === void 0 ? void 0 : _userConfig_output.tempDir) {
+          api.setAppContext({
+            ...appContext2,
+            internalDirectory: import_path.default.resolve(appContext2.appDirectory, userConfig.output.tempDir)
+          });
+        }
+      },
+      async commands({ program }) {
+        await (0, import_commands.devCommand)(program, api);
+        await (0, import_commands.buildCommand)(program, api);
+        (0, import_commands.serverCommand)(program, api);
+        (0, import_commands.deployCommand)(program, api);
+        (0, import_commands.newCommand)(program, locale);
+        (0, import_commands.inspectCommand)(program, api);
+        (0, import_commands.upgradeCommand)(program);
+        (0, import_utils.deprecatedCommands)(program);
+      },
+      async prepare() {
+        const command = (0, import_utils.getCommand)();
+        if (command === "deploy") {
+          const isSkipBuild = [
+            "-s",
+            "--skip-build"
+          ].some((tag) => {
+            return (0, import_utils.getArgv)().includes(tag);
+          });
+          if (isSkipBuild) {
+            return;
+          }
+        }
+        if (command === "dev" || command === "start" || command === "build" || command === "deploy") {
+          const resolvedConfig = api.useResolvedConfigContext();
+          if (resolvedConfig.output.cleanDistPath) {
+            const appContext2 = api.useAppContext();
+            await (0, import_utils.emptyDir)(appContext2.distDirectory);
+          }
+        }
+      },
+      async watchFiles() {
+        const appContext2 = api.useAppContext();
+        const config = api.useResolvedConfigContext();
+        const files = await (0, import_generateWatchFiles.generateWatchFiles)(appContext2, config.source.configDir);
+        const watchFiles = (0, import_uni_builder.castArray)(config.dev.watchFiles);
+        watchFiles.forEach(({ type, paths }) => {
+          if (type === "reload-server") {
+            files.push(...Array.isArray(paths) ? paths : [
+              paths
+            ]);
+          }
+        });
+        return files;
+      },
+      // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
+      async fileChange(e) {
+        const { filename, eventType, isPrivate } = e;
+        if (!isPrivate && (eventType === "change" || eventType === "unlink")) {
+          const { closeServer } = await import("./utils/createServer.js");
+          await closeServer();
+          await (0, import_restart.restart)(api.useHookRunners(), filename);
+        }
+      },
+      async beforeRestart() {
+        (0, import_utils.cleanRequireCache)([
+          require.resolve("./plugins/analyze")
+        ]);
+      }
+    };
+  }
+});
+var old_default = appTools;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  appTools,
+  dev,
+  mergeConfig,
+  ...require("./defineConfig"),
+  ...require("./types")
+});

package/dist/cjs/utils/restart.js

@@ -21,7 +21,7 @@ __export(restart_exports, {
   restart: () => restart
 });
 module.exports = __toCommonJS(restart_exports);
-var import_core = require("@modern-js/core");
+var import_cli = require("@modern-js/plugin-v2/cli");
 var import_utils = require("@modern-js/utils");
 async function restart(hooksRunner, filename) {
   (0, import_utils.clearConsole)();
@@ -30,7 +30,7 @@ async function restart(hooksRunner, filename) {
   let hasGetError = false;
   await hooksRunner.beforeRestart();
   try {
-    await import_core.cli.init(import_core.cli.getPrevInitOptions());
+    await import_cli.cli.init(import_cli.cli.getPrevInitOptions());
   } catch (err) {
     console.error(err);
     hasGetError = true;