@modern-js/app-tools 2.62.1 → 2.63.0

package/dist/esm/plugins/initialize/index.js

@@ -17,72 +17,69 @@ function initialize_default(param) {
       "@modern-js/plugin-polyfill"
     ],
     setup: function setup(api) {
-      var config = function() {
-        var appContext = api.useAppContext();
-        var userConfig = api.useConfigContext();
-        api.setAppContext(_object_spread_props(_object_spread({}, appContext), {
+      api.config(function() {
+        var appContext = api.getAppContext();
+        var userConfig = api.getConfig();
+        api.updateAppContext({
           bundlerType: bundler
-        }));
+        });
         return checkIsLegacyConfig(userConfig) ? createLegacyDefaultConfig(appContext) : createDefaultConfig(appContext);
-      };
-      return {
-        config,
-        resolvedConfig: function resolvedConfig(param2) {
-          var resolved = param2.resolved;
-          return _async_to_generator(function() {
-            var _resolved_output_distPath, appContext, userConfig, port, normalizedConfig, _normalizedConfig_autoLoadPlugins;
-            return _ts_generator(this, function(_state) {
-              switch (_state.label) {
-                case 0:
-                  appContext = api.useAppContext();
-                  userConfig = api.useConfigContext();
-                  return [
-                    4,
-                    getServerPort(resolved)
-                  ];
-                case 1:
-                  port = _state.sent();
-                  appContext = _object_spread_props(_object_spread({}, appContext), {
-                    port,
-                    distDirectory: ensureAbsolutePath(appContext.distDirectory, ((_resolved_output_distPath = resolved.output.distPath) === null || _resolved_output_distPath === void 0 ? void 0 : _resolved_output_distPath.root) || "dist")
-                  });
-                  api.setAppContext(appContext);
-                  normalizedConfig = checkIsLegacyConfig(resolved) ? transformNormalizedConfig(resolved) : resolved;
-                  resolved._raw = userConfig;
-                  resolved.server = _object_spread_props(_object_spread({}, normalizedConfig.server || {}), {
-                    port
-                  });
-                  resolved.autoLoadPlugins = (_normalizedConfig_autoLoadPlugins = normalizedConfig.autoLoadPlugins) !== null && _normalizedConfig_autoLoadPlugins !== void 0 ? _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 [
-                    2,
-                    {
-                      resolved
-                    }
-                  ];
-              }
-            });
-          })();
-        }
-      };
+      });
+      api.modifyResolvedConfig(function() {
+        var _ref = _async_to_generator(function(resolved) {
+          var _resolved_output_distPath, appContext, userConfig, port, normalizedConfig, _normalizedConfig_autoLoadPlugins;
+          return _ts_generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                appContext = api.getAppContext();
+                userConfig = api.getConfig();
+                return [
+                  4,
+                  getServerPort(resolved)
+                ];
+              case 1:
+                port = _state.sent();
+                appContext = _object_spread_props(_object_spread({}, appContext), {
+                  port,
+                  distDirectory: ensureAbsolutePath(appContext.distDirectory, ((_resolved_output_distPath = resolved.output.distPath) === null || _resolved_output_distPath === void 0 ? void 0 : _resolved_output_distPath.root) || "dist")
+                });
+                api.updateAppContext(appContext);
+                normalizedConfig = checkIsLegacyConfig(resolved) ? transformNormalizedConfig(resolved) : resolved;
+                resolved._raw = userConfig;
+                resolved.server = _object_spread_props(_object_spread({}, normalizedConfig.server || {}), {
+                  port
+                });
+                resolved.autoLoadPlugins = (_normalizedConfig_autoLoadPlugins = normalizedConfig.autoLoadPlugins) !== null && _normalizedConfig_autoLoadPlugins !== void 0 ? _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 [
+                  2,
+                  resolved
+                ];
+            }
+          });
+        });
+        return function(resolved) {
+          return _ref.apply(this, arguments);
+        };
+      }());
     }
   };
 }

package/dist/esm/utils/restart.js

@@ -1,6 +1,6 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { cli } from "@modern-js/core";
+import { cli } from "@modern-js/plugin-v2/cli";
 import { chalk, clearConsole, getFullArgv, logger, program } from "@modern-js/utils";
 function restart(hooksRunner, filename) {
   return _restart.apply(this, arguments);

package/dist/esm-node/index.js

@@ -1,140 +1,16 @@
-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 { appTools } from "./new/index";
+import { initAppContext } from "./new/index";
+import { defineConfig, defineLegacyConfig } from "./defineConfig";
 import { mergeConfig } from "@modern-js/core";
-export * from "./defineConfig";
+import { dev } from "./commands/dev";
 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,
+  defineConfig,
+  defineLegacyConfig,
   dev,
+  initAppContext,
   mergeConfig
 };

package/dist/esm-node/new/compat/hooks.js

@@ -0,0 +1,140 @@
+import { transformHookParams, transformHookResult, transformHookRunner } from "./utils";
+function getHookRunners(context) {
+  const { hooks } = context;
+  return {
+    /**
+    * app tools hooks
+    */
+    beforeConfig: async () => {
+      return hooks.onBeforeConfig.call();
+    },
+    afterPrepare: async () => {
+      return hooks.onAfterPrepare.call();
+    },
+    deploy: async () => {
+      return hooks.deploy.call();
+    },
+    _internalRuntimePlugins: async (params) => {
+      return hooks._internalRuntimePlugins.call(params);
+    },
+    _internalServerPlugins: async (params) => {
+      return hooks._internalServerPlugins.call(params);
+    },
+    checkEntryPoint: async (params) => {
+      return hooks.checkEntryPoint.call(params);
+    },
+    modifyEntrypoints: async (params) => {
+      return hooks.modifyEntrypoints.call(params);
+    },
+    modifyFileSystemRoutes: async (params) => {
+      return hooks.modifyFileSystemRoutes.call(params);
+    },
+    modifyServerRoutes: async (params) => {
+      return hooks.modifyServerRoutes.call(params);
+    },
+    generateEntryCode: async (params) => {
+      return hooks.generateEntryCode.call(params);
+    },
+    beforeGenerateRoutes: async (params) => {
+      return hooks.onBeforeGenerateRoutes.call(params);
+    },
+    beforePrintInstructions: async (params) => {
+      return hooks.onBeforePrintInstructions.call(params);
+    },
+    // garfish plugin hooks
+    appendEntryCode: async (params) => {
+      const result = await (hooks === null || hooks === void 0 ? void 0 : hooks.appendEntryCode.call(params));
+      return result;
+    },
+    /**
+    * common hooks
+    */
+    config: async () => {
+      return hooks.config.call();
+    },
+    resolvedConfig: (params) => {
+      return hooks.modifyResolvedConfig.call(params);
+    },
+    htmlPartials: async (params) => {
+      return hooks.modifyHtmlPartials.call(params);
+    },
+    commands: async (params) => {
+      return hooks.addCommand.call(params);
+    },
+    watchFiles: async () => {
+      return hooks.addWatchFiles.call();
+    },
+    prepare: async () => {
+      return hooks.onPrepare.call();
+    },
+    filedChange: async (params) => {
+      return hooks.onFileChanged.call(params);
+    },
+    beforeCreateCompiler: async (params) => {
+      return hooks.onBeforeCreateCompiler.call(params);
+    },
+    afterCreateCompiler: async (params) => {
+      return hooks.onAfterCreateCompiler.call(params);
+    },
+    beforeBuild: async (params) => {
+      return hooks.onBeforeBuild.call(params);
+    },
+    afterBuild: async (params) => {
+      return hooks.onAfterBuild.call(params);
+    },
+    beforeDev: async () => {
+      return hooks.onBeforeDev.call();
+    },
+    afterDev: async (params) => {
+      return hooks.onAfterDev.call(params);
+    },
+    beforeDeploy: async (options) => {
+      return hooks.onBeforeDeploy.call(options);
+    },
+    afterDeploy: async (options) => {
+      return hooks.onAfterDeploy.call(options);
+    },
+    beforeExit: async () => {
+      return hooks.onBeforeExit.call();
+    },
+    beforeRestart: async () => {
+      return hooks.onBeforeRestart.call();
+    },
+    /**
+    * @deprecated
+    */
+    registerDev: async (params) => {
+      return hooks.registerDev.call(params);
+    },
+    /**
+    * @deprecated
+    */
+    registerBuildPlatform: async (params) => {
+      return hooks.registerBuildPlatform.call(params);
+    },
+    /**
+    * @deprecated
+    */
+    addRuntimeExports: async (params) => {
+      return hooks.addRuntimeExports.call(params);
+    }
+  };
+}
+function handleSetupResult(setupResult, api) {
+  if (!setupResult) {
+    return;
+  }
+  Object.keys(setupResult).forEach((key) => {
+    const fn = setupResult[key];
+    if (typeof fn === "function") {
+      const newAPI = transformHookRunner(key);
+      if (api[newAPI]) {
+        api[newAPI](async (params) => transformHookResult(key, await fn(transformHookParams(key, params))));
+      }
+    }
+  });
+}
+export {
+  getHookRunners,
+  handleSetupResult
+};

package/dist/esm-node/new/compat/index.js

@@ -0,0 +1,36 @@
+import { createCollectAsyncHook } from "@modern-js/plugin-v2";
+import { getHookRunners } from "./hooks";
+const compatPlugin = () => ({
+  name: "@modern-js/app-tools-compat",
+  _registryApi: (getAppContext, updateAppContext) => {
+    const getInternalContext = () => {
+      return getAppContext()._internalContext;
+    };
+    return {
+      useAppContext: () => {
+        const { _internalContext, ...appContext } = getAppContext();
+        return appContext;
+      },
+      setAppContext: (context) => {
+        return updateAppContext(context);
+      },
+      useConfigContext: () => {
+        return getInternalContext().config;
+      },
+      useResolvedConfigContext: () => {
+        return getInternalContext().normalizedConfig;
+      },
+      useHookRunners: () => {
+        return getHookRunners(getInternalContext());
+      }
+    };
+  },
+  registryHooks: {
+    appendEntryCode: createCollectAsyncHook()
+  },
+  setup: (_api) => {
+  }
+});
+export {
+  compatPlugin
+};

package/dist/esm-node/new/compat/utils.js

@@ -0,0 +1,69 @@
+function transformHookRunner(hookRunnerName) {
+  switch (hookRunnerName) {
+    case "beforeConfig":
+      return "onBeforeConfig";
+    case "prepare":
+      return "onPrepare";
+    case "afterPrepare":
+      return "onAfterPrepare";
+    case "beforeGenerateRoutes":
+      return "onBeforeGenerateRoutes";
+    case "beforePrintInstructions":
+      return "onBeforePrintInstructions";
+    case "resolvedConfig":
+      return "modifyResolvedConfig";
+    case "commands":
+      return "addCommand";
+    case "watchFiles":
+      return "addWatchFiles";
+    case "filedChange":
+      return "onFileChanged";
+    case "beforeCreateCompiler":
+      return "onBeforeCreateCompiler";
+    case "afterCreateCompiler":
+      return "onAfterCreateCompiler";
+    case "beforeBuild":
+      return "onBeforeBuild";
+    case "afterBuild":
+      return "onAfterBuild";
+    case "beforeDev":
+      return "onBeforeDev";
+    case "afterDev":
+      return "onAfterDev";
+    case "beforeDeploy":
+      return "onBeforeDeploy";
+    case "afterDeploy":
+      return "onAfterDeploy";
+    case "beforeExit":
+      return "onBeforeExit";
+    case "beforeRestart":
+      return "onBeforeRestart";
+    case "htmlPartials":
+      return "modifyHtmlPartials";
+    default:
+      return hookRunnerName;
+  }
+}
+function transformHookParams(hookRunnerName, params) {
+  switch (hookRunnerName) {
+    case "resolvedConfig":
+      return {
+        resolved: params
+      };
+    default:
+      return params;
+  }
+}
+function transformHookResult(hookRunnerName, result) {
+  switch (hookRunnerName) {
+    case "resolvedConfig":
+      return result.resolved;
+    default:
+      return result;
+  }
+}
+export {
+  transformHookParams,
+  transformHookResult,
+  transformHookRunner
+};

package/dist/esm-node/new/constants.js

@@ -0,0 +1,10 @@
+const PACKAGE_JSON_CONFIG_NAME = "modernConfig";
+const DEFAULT_CONFIG_FILE = "modern.config";
+const DEFAULT_SERVER_CONFIG_FILE = "modern.server-runtime.config";
+const DEFAULT_RUNTIME_CONFIG_FILE = "modern.runtime";
+export {
+  DEFAULT_CONFIG_FILE,
+  DEFAULT_RUNTIME_CONFIG_FILE,
+  DEFAULT_SERVER_CONFIG_FILE,
+  PACKAGE_JSON_CONFIG_NAME
+};

package/dist/esm-node/new/context.js

@@ -0,0 +1,30 @@
+import path from "path";
+import { fs, address } from "@modern-js/utils";
+const initAppContext = ({ appDirectory, runtimeConfigFile, options, serverConfigFile, tempDir }) => {
+  const { metaName = "modern-js", apiDir = "api", distDir = "", sharedDir = "shared" } = options || {};
+  const pkgPath = path.resolve(appDirectory, "./package.json");
+  return {
+    metaName,
+    runtimeConfigFile,
+    serverConfigFile,
+    ip: address.ip(),
+    port: 0,
+    moduleType: fs.existsSync(pkgPath) ? require(pkgPath).type || "commonjs" : "commonjs",
+    apiDirectory: path.resolve(appDirectory, apiDir),
+    lambdaDirectory: path.resolve(appDirectory, apiDir, "lambda"),
+    sharedDirectory: path.resolve(appDirectory, sharedDir),
+    distDirectory: distDir,
+    serverPlugins: [],
+    internalDirectory: path.resolve(appDirectory, tempDir || `./node_modules/.${metaName}`),
+    htmlTemplates: {},
+    serverRoutes: [],
+    entrypoints: [],
+    checkedEntries: [],
+    apiOnly: false,
+    internalDirAlias: `@_${metaName.replace(/-/g, "_")}_internal`,
+    internalSrcAlias: `@_${metaName.replace(/-/g, "_")}_src`
+  };
+};
+export {
+  initAppContext
+};

package/dist/esm-node/new/getConfigFile.js

@@ -0,0 +1,7 @@
+import path from "path";
+import { CONFIG_FILE_EXTENSIONS, findExists } from "@modern-js/utils";
+import { DEFAULT_CONFIG_FILE } from "./constants";
+const getConfigFile = (configFile) => findExists(CONFIG_FILE_EXTENSIONS.map((extension) => path.resolve(process.cwd(), `${configFile || DEFAULT_CONFIG_FILE}${extension}`)));
+export {
+  getConfigFile
+};

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

@@ -0,0 +1,52 @@
+import { createAsyncHook } from "@modern-js/plugin-v2";
+import { appTools as oldAppTools } from "../old";
+import { compatPlugin } from "./compat";
+import { DEFAULT_RUNTIME_CONFIG_FILE, DEFAULT_SERVER_CONFIG_FILE } from "./constants";
+import { initAppContext } from "./context";
+export * from "../defineConfig";
+const appTools = (options = {
+  // default webpack to be compatible with original projects
+  bundler: "webpack"
+}) => ({
+  name: "@modern-js/app-tools",
+  usePlugins: [
+    compatPlugin(),
+    oldAppTools(options)
+  ],
+  post: [
+    "@modern-js/app-tools-old"
+  ],
+  registryHooks: {
+    onBeforeConfig: createAsyncHook(),
+    onAfterPrepare: createAsyncHook(),
+    deploy: createAsyncHook(),
+    _internalRuntimePlugins: createAsyncHook(),
+    _internalServerPlugins: createAsyncHook(),
+    checkEntryPoint: createAsyncHook(),
+    modifyEntrypoints: createAsyncHook(),
+    modifyFileSystemRoutes: createAsyncHook(),
+    modifyServerRoutes: createAsyncHook(),
+    generateEntryCode: createAsyncHook(),
+    onBeforeGenerateRoutes: createAsyncHook(),
+    onBeforePrintInstructions: createAsyncHook(),
+    registerDev: createAsyncHook(),
+    registerBuildPlatform: createAsyncHook(),
+    addRuntimeExports: createAsyncHook()
+  },
+  setup: (api) => {
+    var _userConfig_output;
+    const context = api.getAppContext();
+    const userConfig = api.getConfig();
+    api.updateAppContext(initAppContext({
+      appDirectory: context.appDirectory,
+      options: {},
+      serverConfigFile: DEFAULT_SERVER_CONFIG_FILE,
+      runtimeConfigFile: DEFAULT_RUNTIME_CONFIG_FILE,
+      tempDir: (_userConfig_output = userConfig.output) === null || _userConfig_output === void 0 ? void 0 : _userConfig_output.tempDir
+    }));
+  }
+});
+export {
+  appTools,
+  initAppContext
+};

package/dist/esm-node/new/loadPlugins.js

@@ -0,0 +1,33 @@
+import { compatibleRequire, createDebugger, dynamicImport, getInternalPlugins, tryResolve } from "@modern-js/utils";
+const debug = 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 = tryResolve(pkg, appDirectory);
+  let module;
+  try {
+    module = await compatibleRequire(path);
+  } catch (e) {
+    ({ default: module } = await dynamicImport(path));
+  }
+  if (typeof module === "function") {
+    const result = module(pluginOptions);
+    return result;
+  }
+  return module;
+};
+const loadInternalPlugins = async (appDirectory, internalPlugins, autoLoad, autoLoadPlugins) => {
+  const plugins = [
+    ...autoLoadPlugins ? getInternalPlugins(appDirectory, internalPlugins) : [],
+    ...autoLoad ? 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;
+};
+export {
+  loadInternalPlugins
+};