@modern-js/app-tools 2.63.1-alpha.0 → 2.63.1

package/dist/esm/old.js

@@ -0,0 +1,258 @@
+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-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: 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 old_default = appTools;
+export {
+  appTools,
+  old_default as default,
+  dev,
+  mergeConfig
+};

package/dist/esm/plugins/serverBuild.js

@@ -21,59 +21,63 @@ function serverBuild_default() {
   return {
     name: "@modern-js/server-build",
     setup: function setup(api) {
-      api.onAfterBuild(/* @__PURE__ */ _async_to_generator(function() {
-        var _api_getAppContext, appDirectory, distDirectory, metaName, modernConfig, distDir, serverDir, sharedDir, tsconfigPath, sourceDirs, server, alias, babel;
-        return _ts_generator(this, function(_state) {
-          switch (_state.label) {
-            case 0:
-              _api_getAppContext = api.getAppContext(), appDirectory = _api_getAppContext.appDirectory, distDirectory = _api_getAppContext.distDirectory, metaName = _api_getAppContext.metaName;
-              if (!checkHasCache(appDirectory) && !checkHasConfig(appDirectory, metaName)) {
-                return [
-                  2
-                ];
+      return {
+        afterBuild: function afterBuild() {
+          return _async_to_generator(function() {
+            var _api_useAppContext, appDirectory, distDirectory, metaName, modernConfig, distDir, serverDir, sharedDir, tsconfigPath, sourceDirs, server, alias, babel;
+            return _ts_generator(this, function(_state) {
+              switch (_state.label) {
+                case 0:
+                  _api_useAppContext = api.useAppContext(), appDirectory = _api_useAppContext.appDirectory, distDirectory = _api_useAppContext.distDirectory, metaName = _api_useAppContext.metaName;
+                  if (!checkHasCache(appDirectory) && !checkHasConfig(appDirectory, metaName)) {
+                    return [
+                      2
+                    ];
+                  }
+                  modernConfig = api.useResolvedConfigContext();
+                  distDir = path.resolve(distDirectory);
+                  serverDir = path.resolve(appDirectory, SERVER_DIR);
+                  sharedDir = path.resolve(appDirectory, SHARED_DIR);
+                  tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
+                  sourceDirs = [];
+                  if (fs.existsSync(serverDir)) {
+                    sourceDirs.push(serverDir);
+                    if (fs.existsSync(sharedDir)) {
+                      sourceDirs.push(sharedDir);
+                    }
+                  }
+                  server = modernConfig.server;
+                  alias = modernConfig.source.alias;
+                  babel = modernConfig.tools.babel;
+                  if (!(sourceDirs.length > 0))
+                    return [
+                      3,
+                      2
+                    ];
+                  return [
+                    4,
+                    compile(appDirectory, {
+                      server,
+                      alias,
+                      babelConfig: babel
+                    }, {
+                      sourceDirs,
+                      distDir,
+                      tsconfigPath
+                    })
+                  ];
+                case 1:
+                  _state.sent();
+                  _state.label = 2;
+                case 2:
+                  return [
+                    2
+                  ];
               }
-              modernConfig = api.getNormalizedConfig();
-              distDir = path.resolve(distDirectory);
-              serverDir = path.resolve(appDirectory, SERVER_DIR);
-              sharedDir = path.resolve(appDirectory, SHARED_DIR);
-              tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
-              sourceDirs = [];
-              if (fs.existsSync(serverDir)) {
-                sourceDirs.push(serverDir);
-                if (fs.existsSync(sharedDir)) {
-                  sourceDirs.push(sharedDir);
-                }
-              }
-              server = modernConfig.server;
-              alias = modernConfig.source.alias;
-              babel = modernConfig.tools.babel;
-              if (!(sourceDirs.length > 0))
-                return [
-                  3,
-                  2
-                ];
-              return [
-                4,
-                compile(appDirectory, {
-                  server,
-                  alias,
-                  babelConfig: babel
-                }, {
-                  sourceDirs,
-                  distDir,
-                  tsconfigPath
-                })
-              ];
-            case 1:
-              _state.sent();
-              _state.label = 2;
-            case 2:
-              return [
-                2
-              ];
-          }
-        });
-      }));
+            });
+          })();
+        }
+      };
     }
   };
 }

package/dist/esm/utils/loadPlugins.js

@@ -1,24 +1,23 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { loadServerPlugins as loadServerPluginInstances } from "@modern-js/prod-server";
-import { compatibleRequire, createDebugger, dynamicImport, getInternalPlugins, tryResolve } from "@modern-js/utils";
-var debug = createDebugger("load-plugins");
 function getServerPlugins(api) {
   return _getServerPlugins.apply(this, arguments);
 }
 function _getServerPlugins() {
   _getServerPlugins = _async_to_generator(function(api) {
-    var metaName, hooks, plugins, filtedPlugins;
+    var metaName, runner, plugins, filtedPlugins;
     var _arguments = arguments;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           metaName = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : "modern-js";
-          hooks = api.getHooks();
+          runner = api.useHookRunners();
           return [
             4,
-            hooks._internalServerPlugins.call({
+            runner._internalServerPlugins({
               plugins: []
             })
           ];
@@ -27,9 +26,9 @@ function _getServerPlugins() {
           filtedPlugins = plugins.filter(function(plugin) {
             return plugin.name.includes(metaName);
           });
-          api.updateAppContext({
+          api.setAppContext(_object_spread_props(_object_spread({}, api.useAppContext()), {
             serverPlugins: filtedPlugins
-          });
+          }));
           return [
             2,
             filtedPlugins
@@ -69,94 +68,7 @@ function _loadServerPlugins() {
   });
   return _loadServerPlugins.apply(this, arguments);
 }
-var resolveCliPlugin = function() {
-  var _ref = _async_to_generator(function(p, appDirectory) {
-    var pkg, pluginOptions, path, module, e, ref, result;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          pkg = typeof p === "string" ? p : p[0];
-          pluginOptions = typeof p === "string" ? void 0 : p[1];
-          path = tryResolve(pkg, appDirectory);
-          _state.label = 1;
-        case 1:
-          _state.trys.push([
-            1,
-            3,
-            ,
-            5
-          ]);
-          return [
-            4,
-            compatibleRequire(path)
-          ];
-        case 2:
-          module = _state.sent();
-          return [
-            3,
-            5
-          ];
-        case 3:
-          e = _state.sent();
-          return [
-            4,
-            dynamicImport(path)
-          ];
-        case 4:
-          ref = _state.sent(), module = ref.default, ref;
-          return [
-            3,
-            5
-          ];
-        case 5:
-          if (typeof module === "function") {
-            result = module(pluginOptions);
-            return [
-              2,
-              result
-            ];
-          }
-          return [
-            2,
-            module
-          ];
-      }
-    });
-  });
-  return function resolveCliPlugin2(p, appDirectory) {
-    return _ref.apply(this, arguments);
-  };
-}();
-var loadInternalPlugins = function() {
-  var _ref = _async_to_generator(function(appDirectory, internalPlugins, autoLoad, autoLoadPlugins) {
-    var plugins, loadedPlugins;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          plugins = _to_consumable_array(autoLoadPlugins ? getInternalPlugins(appDirectory, internalPlugins) : []).concat(_to_consumable_array(autoLoad ? getInternalPlugins(appDirectory, autoLoad) : []));
-          return [
-            4,
-            Promise.all(plugins.map(function(plugin) {
-              var loadedPlugin = resolveCliPlugin(plugin, appDirectory);
-              debug("resolve plugin %s: %s", plugin, loadedPlugin);
-              return loadedPlugin;
-            }))
-          ];
-        case 1:
-          loadedPlugins = _state.sent();
-          return [
-            2,
-            loadedPlugins
-          ];
-      }
-    });
-  });
-  return function loadInternalPlugins2(appDirectory, internalPlugins, autoLoad, autoLoadPlugins) {
-    return _ref.apply(this, arguments);
-  };
-}();
 export {
   getServerPlugins,
-  loadInternalPlugins,
   loadServerPlugins
 };

package/dist/esm/utils/printInstructions.js

@@ -27,6 +27,33 @@ var printInstructions = function() {
     return _ref.apply(this, arguments);
   };
 }();
+var printInstructionsCompat = function() {
+  var _ref = _async_to_generator(function(hookRunners, appContext, config) {
+    var message, instructions;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          message = prettyInstructions(appContext, config);
+          return [
+            4,
+            hookRunners.beforePrintInstructions({
+              instructions: message
+            })
+          ];
+        case 1:
+          instructions = _state.sent().instructions;
+          logger.log(instructions);
+          return [
+            2
+          ];
+      }
+    });
+  });
+  return function printInstructionsCompat2(hookRunners, appContext, config) {
+    return _ref.apply(this, arguments);
+  };
+}();
 export {
-  printInstructions
+  printInstructions,
+  printInstructionsCompat
 };

package/dist/esm/utils/restart.js

@@ -3,11 +3,11 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { cli } from "@modern-js/plugin-v2/cli";
 import { chalk, clearConsole, getFullArgv, logger } from "@modern-js/utils";
 import { program } from "@modern-js/utils/commander";
-function restart(hooks, filename) {
+function restart(hooksRunner, filename) {
   return _restart.apply(this, arguments);
 }
 function _restart() {
-  _restart = _async_to_generator(function(hooks, filename) {
+  _restart = _async_to_generator(function(hooksRunner, filename) {
     var hasGetError, err;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
@@ -17,7 +17,7 @@ function _restart() {
           hasGetError = false;
           return [
             4,
-            hooks.onBeforeRestart.call()
+            hooksRunner.beforeRestart()
           ];
         case 1:
           _state.sent();

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

@@ -1,3 +1,4 @@
+import { ResolvedConfigContext } from "@modern-js/core";
 import { logger } from "@modern-js/utils";
 import { buildServerConfig } from "../utils/config";
 import { loadServerPlugins } from "../utils/loadPlugins";
@@ -8,9 +9,9 @@ const build = async (api, options) => {
   if (options === null || options === void 0 ? void 0 : options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
   }
-  const resolvedConfig = api.getNormalizedConfig();
-  const appContext = api.getAppContext();
-  const hooks = api.getHooks();
+  let resolvedConfig = api.useResolvedConfigContext();
+  const appContext = api.useAppContext();
+  const hookRunners = api.useHookRunners();
   await loadServerPlugins(api, appContext.appDirectory, appContext.metaName);
   if (appContext.moduleType && appContext.moduleType === "module") {
     var _resolvedConfig_source1;
@@ -25,12 +26,9 @@ const build = async (api, options) => {
   const { apiOnly } = appContext;
   if (apiOnly) {
     const { appDirectory: appDirectory2, distDirectory: distDirectory2, serverConfigFile: serverConfigFile2 } = appContext;
-    await hooks.onBeforeBuild.call({
-      environments: {},
+    await hookRunners.beforeBuild({
       // "null" bundlerConfigs
-      bundlerConfigs: void 0,
-      isFirstCompile: false,
-      isWatch: false
+      bundlerConfigs: void 0
     });
     await buildServerConfig({
       appDirectory: appDirectory2,
@@ -38,21 +36,17 @@ const build = async (api, options) => {
       configFile: serverConfigFile2
     });
     await generateRoutes(appContext);
-    await hooks.onAfterBuild.call({
-      environments: {},
+    await hookRunners.afterBuild({
       // "null" stats
-      stats: void 0,
-      isFirstCompile: false,
-      isWatch: false
+      stats: void 0
     });
     return;
   }
-  api.modifyResolvedConfig((config) => {
-    return {
-      ...config,
-      cliOptions: options
-    };
-  });
+  resolvedConfig = {
+    ...resolvedConfig,
+    cliOptions: options
+  };
+  ResolvedConfigContext.set(resolvedConfig);
   const { distDirectory, appDirectory, serverConfigFile } = appContext;
   await buildServerConfig({
     appDirectory,

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

@@ -1,11 +1,11 @@
 import { getServerPlugins } from "../utils/loadPlugins";
 const deploy = async (api, options) => {
-  const hooks = api.getHooks();
-  const { metaName } = api.getAppContext();
+  const hookRunners = api.useHookRunners();
+  const { metaName } = api.useAppContext();
   await getServerPlugins(api, metaName);
-  await hooks.onBeforeDeploy.call(options);
-  await hooks.deploy.call();
-  await hooks.onAfterDeploy.call(options);
+  await hookRunners.beforeDeploy(options);
+  await hookRunners.deploy(options);
+  await hookRunners.afterDeploy(options);
 };
 export {
   deploy