@modern-js/app-tools 2.62.1-alpha.1 → 2.62.1

package/bin/modern.js

@@ -10,10 +10,10 @@ if (!process.env.MODERN_JS_VERSION) {
   process.env.MODERN_JS_VERSION = version;
 }
 
-require('../dist/cjs/new/run.js').run({
+require('@modern-js/core/runBin').run({
   internalPlugins: {
     cli: INTERNAL_APP_TOOLS_PLUGINS,
     autoLoad: INTERNAL_APP_TOOLS_RUNTIME_PLUGINS,
   },
-  version,
+  initialLog: `Modern.js Framework v${version}`,
 });

package/dist/cjs/index.js

@@ -1,7 +1,9 @@
 "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)
@@ -16,26 +18,162 @@ var __copyProps = (to, from, except, desc) => {
   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 src_exports = {};
 __export(src_exports, {
+  appTools: () => appTools,
   default: () => src_default,
   dev: () => import_dev.dev,
   mergeConfig: () => import_core.mergeConfig
 });
 module.exports = __toCommonJS(src_exports);
-var import_new = require("./new/index");
-__reExport(src_exports, require("./new/index"), module.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(src_exports, require("./defineConfig"), module.exports);
 __reExport(src_exports, require("./types"), module.exports);
-var src_default = import_new.appTools;
+const appTools = (options = {
+  // default webpack to be compatible with original projects
+  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 || 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 src_default = appTools;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  appTools,
   dev,
   mergeConfig,
-  ...require("./new/index"),
   ...require("./defineConfig"),
   ...require("./types")
 });

package/dist/esm/index.js

@@ -1,11 +1,257 @@
-import { appTools } from "./new/index";
-export * from "./new/index";
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import path from "path";
+import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
+import { castArray } from "@modern-js/uni-builder";
+import { cleanRequireCache, deprecatedCommands, emptyDir, getArgv, getCommand } from "@modern-js/utils";
+import { hooks } from "./hooks";
+import { i18n } from "./locale";
+import analyzePlugin from "./plugins/analyze";
+import deployPlugin from "./plugins/deploy";
+import initializePlugin from "./plugins/initialize";
+import serverBuildPlugin from "./plugins/serverBuild";
+import { buildCommand, deployCommand, devCommand, inspectCommand, newCommand, serverCommand, upgradeCommand } from "./commands";
+import { generateWatchFiles } from "./utils/generateWatchFiles";
+import { restart } from "./utils/restart";
 import { dev } from "./commands/dev";
 import { mergeConfig } from "@modern-js/core";
 export * from "./defineConfig";
 export * from "./types";
+var appTools = function() {
+  var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {
+    // default webpack to be compatible with original projects
+    bundler: "webpack"
+  };
+  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) && [
+          "rspack",
+          "experimental-rspack"
+        ].includes(options.bundler) ? "rspack" : "webpack"
+      }),
+      analyzePlugin({
+        bundler: (options === null || options === void 0 ? void 0 : options.bundler) && [
+          "rspack",
+          "experimental-rspack"
+        ].includes(options.bundler) ? "rspack" : "webpack"
+      }),
+      serverBuildPlugin(),
+      deployPlugin()
+    ],
+    setup: function(api) {
+      var appContext = api.useAppContext();
+      api.setAppContext(_object_spread_props(_object_spread({}, appContext), {
+        toolsType: "app-tools"
+      }));
+      var locale = getLocaleLanguage();
+      i18n.changeLanguage({
+        locale
+      });
+      return {
+        beforeConfig: function beforeConfig() {
+          return _async_to_generator(function() {
+            var _userConfig_output, userConfig, appContext2;
+            return _ts_generator(this, function(_state) {
+              userConfig = api.useConfigContext();
+              appContext2 = api.useAppContext();
+              if ((_userConfig_output = userConfig.output) === null || _userConfig_output === void 0 ? void 0 : _userConfig_output.tempDir) {
+                api.setAppContext(_object_spread_props(_object_spread({}, appContext2), {
+                  internalDirectory: path.resolve(appContext2.appDirectory, userConfig.output.tempDir)
+                }));
+              }
+              return [
+                2
+              ];
+            });
+          })();
+        },
+        commands: function commands(param) {
+          var program = param.program;
+          return _async_to_generator(function() {
+            return _ts_generator(this, function(_state) {
+              switch (_state.label) {
+                case 0:
+                  return [
+                    4,
+                    devCommand(program, api)
+                  ];
+                case 1:
+                  _state.sent();
+                  return [
+                    4,
+                    buildCommand(program, api)
+                  ];
+                case 2:
+                  _state.sent();
+                  serverCommand(program, api);
+                  deployCommand(program, api);
+                  newCommand(program, locale);
+                  inspectCommand(program, api);
+                  upgradeCommand(program);
+                  deprecatedCommands(program);
+                  return [
+                    2
+                  ];
+              }
+            });
+          })();
+        },
+        prepare: function prepare() {
+          return _async_to_generator(function() {
+            var command, isSkipBuild, resolvedConfig, appContext2;
+            return _ts_generator(this, function(_state) {
+              switch (_state.label) {
+                case 0:
+                  command = getCommand();
+                  if (command === "deploy") {
+                    isSkipBuild = [
+                      "-s",
+                      "--skip-build"
+                    ].some(function(tag) {
+                      return getArgv().includes(tag);
+                    });
+                    if (isSkipBuild) {
+                      return [
+                        2
+                      ];
+                    }
+                  }
+                  if (!(command === "dev" || command === "start" || command === "build" || command === "deploy"))
+                    return [
+                      3,
+                      2
+                    ];
+                  resolvedConfig = api.useResolvedConfigContext();
+                  if (!resolvedConfig.output.cleanDistPath)
+                    return [
+                      3,
+                      2
+                    ];
+                  appContext2 = api.useAppContext();
+                  return [
+                    4,
+                    emptyDir(appContext2.distDirectory)
+                  ];
+                case 1:
+                  _state.sent();
+                  _state.label = 2;
+                case 2:
+                  return [
+                    2
+                  ];
+              }
+            });
+          })();
+        },
+        watchFiles: function watchFiles() {
+          return _async_to_generator(function() {
+            var appContext2, config, files, watchFiles2;
+            return _ts_generator(this, function(_state) {
+              switch (_state.label) {
+                case 0:
+                  appContext2 = api.useAppContext();
+                  config = api.useResolvedConfigContext();
+                  return [
+                    4,
+                    generateWatchFiles(appContext2, config.source.configDir)
+                  ];
+                case 1:
+                  files = _state.sent();
+                  watchFiles2 = castArray(config.dev.watchFiles);
+                  watchFiles2.forEach(function(param) {
+                    var type = param.type, paths = param.paths;
+                    if (type === "reload-server") {
+                      var _files;
+                      (_files = files).push.apply(_files, _to_consumable_array(Array.isArray(paths) ? paths : [
+                        paths
+                      ]));
+                    }
+                  });
+                  return [
+                    2,
+                    files
+                  ];
+              }
+            });
+          })();
+        },
+        fileChange: (
+          // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
+          function fileChange(e) {
+            return _async_to_generator(function() {
+              var filename, eventType, isPrivate, closeServer;
+              return _ts_generator(this, function(_state) {
+                switch (_state.label) {
+                  case 0:
+                    filename = e.filename, eventType = e.eventType, isPrivate = e.isPrivate;
+                    if (!(!isPrivate && (eventType === "change" || eventType === "unlink")))
+                      return [
+                        3,
+                        4
+                      ];
+                    return [
+                      4,
+                      import("./utils/createServer.js")
+                    ];
+                  case 1:
+                    closeServer = _state.sent().closeServer;
+                    return [
+                      4,
+                      closeServer()
+                    ];
+                  case 2:
+                    _state.sent();
+                    return [
+                      4,
+                      restart(api.useHookRunners(), filename)
+                    ];
+                  case 3:
+                    _state.sent();
+                    _state.label = 4;
+                  case 4:
+                    return [
+                      2
+                    ];
+                }
+              });
+            })();
+          }
+        ),
+        beforeRestart: function beforeRestart() {
+          return _async_to_generator(function() {
+            return _ts_generator(this, function(_state) {
+              cleanRequireCache([
+                require.resolve("./plugins/analyze")
+              ]);
+              return [
+                2
+              ];
+            });
+          })();
+        }
+      };
+    }
+  };
+};
 var src_default = appTools;
 export {
+  appTools,
   src_default as default,
   dev,
   mergeConfig

package/dist/esm-node/index.js

@@ -1,11 +1,139 @@
-import { appTools } from "./new/index";
-export * from "./new/index";
+import path from "path";
+import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
+import { castArray } from "@modern-js/uni-builder";
+import { cleanRequireCache, deprecatedCommands, emptyDir, getArgv, getCommand } from "@modern-js/utils";
+import { hooks } from "./hooks";
+import { i18n } from "./locale";
+import analyzePlugin from "./plugins/analyze";
+import deployPlugin from "./plugins/deploy";
+import initializePlugin from "./plugins/initialize";
+import serverBuildPlugin from "./plugins/serverBuild";
+import { buildCommand, deployCommand, devCommand, inspectCommand, newCommand, serverCommand, upgradeCommand } from "./commands";
+import { generateWatchFiles } from "./utils/generateWatchFiles";
+import { restart } from "./utils/restart";
 import { dev } from "./commands/dev";
 import { mergeConfig } from "@modern-js/core";
 export * from "./defineConfig";
 export * from "./types";
+const appTools = (options = {
+  // default webpack to be compatible with original projects
+  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 || options === void 0 ? void 0 : options.bundler) && [
+        "rspack",
+        "experimental-rspack"
+      ].includes(options.bundler) ? "rspack" : "webpack"
+    }),
+    analyzePlugin({
+      bundler: (options === null || options === void 0 ? void 0 : options.bundler) && [
+        "rspack",
+        "experimental-rspack"
+      ].includes(options.bundler) ? "rspack" : "webpack"
+    }),
+    serverBuildPlugin(),
+    deployPlugin()
+  ],
+  setup: (api) => {
+    const appContext = api.useAppContext();
+    api.setAppContext({
+      ...appContext,
+      toolsType: "app-tools"
+    });
+    const locale = getLocaleLanguage();
+    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: path.resolve(appContext2.appDirectory, userConfig.output.tempDir)
+          });
+        }
+      },
+      async commands({ program }) {
+        await devCommand(program, api);
+        await buildCommand(program, api);
+        serverCommand(program, api);
+        deployCommand(program, api);
+        newCommand(program, locale);
+        inspectCommand(program, api);
+        upgradeCommand(program);
+        deprecatedCommands(program);
+      },
+      async prepare() {
+        const command = getCommand();
+        if (command === "deploy") {
+          const isSkipBuild = [
+            "-s",
+            "--skip-build"
+          ].some((tag) => {
+            return 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 emptyDir(appContext2.distDirectory);
+          }
+        }
+      },
+      async watchFiles() {
+        const appContext2 = api.useAppContext();
+        const config = api.useResolvedConfigContext();
+        const files = await generateWatchFiles(appContext2, config.source.configDir);
+        const watchFiles = 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 restart(api.useHookRunners(), filename);
+        }
+      },
+      async beforeRestart() {
+        cleanRequireCache([
+          require.resolve("./plugins/analyze")
+        ]);
+      }
+    };
+  }
+});
 var src_default = appTools;
 export {
+  appTools,
   src_default as default,
   dev,
   mergeConfig

package/dist/types/index.d.ts

@@ -1,5 +1,5 @@
-import { appTools } from './new/index';
-export * from './new/index';
+import type { CliPlugin } from '@modern-js/core';
+import type { AppTools } from './types';
 export { dev } from './commands/dev';
 export type { DevOptions } from './utils/types';
 export { mergeConfig } from '@modern-js/core';
@@ -13,4 +13,8 @@ export type AppToolsOptions = {
      * */
     bundler?: 'rspack' | 'webpack' | 'experimental-rspack';
 };
+/**
+ * The core package of the framework, providing CLI commands, build capabilities, configuration parsing and more.
+ */
+export declare const appTools: (options?: AppToolsOptions) => CliPlugin<AppTools<'shared'>>;
 export default appTools;