@modern-js/app-tools 2.63.1 → 2.63.3

package/dist/esm/commands/inspect.js

@@ -4,7 +4,7 @@ var inspect = function() {
   var _ref = _async_to_generator(function(api, options) {
     var appContext;
     return _ts_generator(this, function(_state) {
-      appContext = api.useAppContext();
+      appContext = api.getAppContext();
       if (!appContext.builder) {
         throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
       }

package/dist/esm/commands/serve.js

@@ -6,16 +6,16 @@ import path from "path";
 import { createProdServer } from "@modern-js/prod-server";
 import { SERVER_DIR, getMeta, getTargetDir, isApiOnly, logger } from "@modern-js/utils";
 import { loadServerPlugins } from "../utils/loadPlugins";
-import { printInstructionsCompat } from "../utils/printInstructions";
+import { printInstructions } from "../utils/printInstructions";
 var start = function() {
   var _ref = _async_to_generator(function(api) {
-    var _userConfig_source, _userConfig_output_distPath, appContext, userConfig, hookRunners, distDirectory, appDirectory, internalDirectory, port, metaName, serverRoutes, serverConfigFile, apiOnly, runMode, meta, serverConfigPath, pluginInstances, app;
+    var _userConfig_source, _userConfig_output_distPath, appContext, userConfig, hooks, distDirectory, appDirectory, internalDirectory, port, metaName, serverRoutes, serverConfigFile, apiOnly, runMode, meta, serverConfigPath, pluginInstances, app;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          appContext = api.useAppContext();
-          userConfig = api.useResolvedConfigContext();
-          hookRunners = api.useHookRunners();
+          appContext = api.getAppContext();
+          userConfig = api.getNormalizedConfig();
+          hooks = api.getHooks();
           distDirectory = appContext.distDirectory, appDirectory = appContext.appDirectory, internalDirectory = appContext.internalDirectory, port = appContext.port, metaName = appContext.metaName, serverRoutes = appContext.serverRoutes, serverConfigFile = appContext.serverConfigFile;
           logger.info("Starting production server...");
           return [
@@ -69,7 +69,7 @@ var start = function() {
                 case 0:
                   return [
                     4,
-                    printInstructionsCompat(hookRunners, appContext, userConfig)
+                    printInstructions(hooks, appContext, userConfig)
                   ];
                 case 1:
                   _state2.sent();

package/dist/esm/{new/compat → compat}/hooks.js

@@ -1,6 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { getModifyHtmlPartials } from "../../plugins/analyze/getHtmlTemplate";
+import { getModifyHtmlPartials } from "../plugins/analyze/getHtmlTemplate";
 import { transformHookParams, transformHookResult, transformHookRunner } from "./utils";
 function getHookRunners(context) {
   var hooks = context.hooks;
@@ -173,6 +174,40 @@ function getHookRunners(context) {
         return _ref.apply(this, arguments);
       };
     }(),
+    // test plugin hooks
+    jestConfig: function() {
+      var _ref = _async_to_generator(function(utils) {
+        var result;
+        return _ts_generator(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              return [
+                4,
+                hooks === null || hooks === void 0 ? void 0 : hooks.jestConfig.call(utils, function(utils2) {
+                  return utils2;
+                })
+              ];
+            case 1:
+              result = _state.sent();
+              return [
+                2,
+                result
+              ];
+          }
+        });
+      });
+      return function(utils) {
+        return _ref.apply(this, arguments);
+      };
+    }(),
+    afterTest: /* @__PURE__ */ _async_to_generator(function() {
+      return _ts_generator(this, function(_state) {
+        return [
+          2,
+          hooks.afterTest.call()
+        ];
+      });
+    }),
     /**
     * common hooks
     */
@@ -374,35 +409,25 @@ function getHookRunners(context) {
     /**
     * @deprecated
     */
-    registerDev: function() {
-      var _ref = _async_to_generator(function(params) {
-        return _ts_generator(this, function(_state) {
-          return [
-            2,
-            hooks.registerDev.call(params)
-          ];
-        });
+    registerDev: /* @__PURE__ */ _async_to_generator(function() {
+      return _ts_generator(this, function(_state) {
+        return [
+          2,
+          hooks.registerDev.call()
+        ];
       });
-      return function(params) {
-        return _ref.apply(this, arguments);
-      };
-    }(),
+    }),
     /**
     * @deprecated
     */
-    registerBuildPlatform: function() {
-      var _ref = _async_to_generator(function(params) {
-        return _ts_generator(this, function(_state) {
-          return [
-            2,
-            hooks.registerBuildPlatform.call(params)
-          ];
-        });
+    registerBuildPlatform: /* @__PURE__ */ _async_to_generator(function() {
+      return _ts_generator(this, function(_state) {
+        return [
+          2,
+          hooks.registerBuildPlatform.call()
+        ];
       });
-      return function(params) {
-        return _ref.apply(this, arguments);
-      };
-    }(),
+    }),
     /**
     * @deprecated
     */
@@ -425,33 +450,57 @@ function handleSetupResult(setupResult, api) {
     if (typeof fn === "function") {
       var newAPI = transformHookRunner(key);
       if (api[newAPI]) {
-        api[newAPI](function() {
-          var _ref = _async_to_generator(function(params) {
-            var _tmp;
-            return _ts_generator(this, function(_state) {
-              switch (_state.label) {
-                case 0:
-                  _tmp = [
-                    key
-                  ];
-                  return [
-                    4,
-                    fn(transformHookParams(key, params))
-                  ];
-                case 1:
+        api[newAPI](/* @__PURE__ */ _async_to_generator(function() {
+          var _len, params, _key, _transformHookParams, isMultiple, transformParams, _tmp, _tmp1;
+          var _arguments = arguments;
+          return _ts_generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                for (_len = _arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
+                  params[_key] = _arguments[_key];
+                }
+                _transformHookParams = transformHookParams(key, params), isMultiple = _transformHookParams.isMultiple, transformParams = _transformHookParams.params;
+                if (!isMultiple)
                   return [
-                    2,
-                    transformHookResult.apply(void 0, _tmp.concat([
-                      _state.sent()
-                    ]))
+                    3,
+                    2
                   ];
-              }
-            });
+                _tmp = [
+                  key
+                ];
+                return [
+                  4,
+                  fn.apply(void 0, _to_consumable_array(transformParams))
+                ];
+              case 1:
+                return [
+                  2,
+                  transformHookResult.apply(void 0, _tmp.concat([
+                    _state.sent()
+                  ]))
+                ];
+              case 2:
+                _tmp1 = [
+                  key
+                ];
+                return [
+                  4,
+                  fn(transformParams)
+                ];
+              case 3:
+                return [
+                  2,
+                  transformHookResult.apply(void 0, _tmp1.concat([
+                    _state.sent()
+                  ]))
+                ];
+              case 4:
+                return [
+                  2
+                ];
+            }
           });
-          return function(params) {
-            return _ref.apply(this, arguments);
-          };
-        }());
+        }));
       }
     }
   });

package/dist/esm/{new/compat → compat}/index.js

@@ -1,5 +1,5 @@
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
-import { createCollectAsyncHook } from "@modern-js/plugin-v2";
+import { createAsyncHook, createCollectAsyncHook } from "@modern-js/plugin-v2";
 import { getHookRunners } from "./hooks";
 var compatPlugin = function() {
   return {
@@ -30,9 +30,14 @@ var compatPlugin = function() {
       };
     },
     registryHooks: {
-      appendEntryCode: createCollectAsyncHook()
+      appendEntryCode: createCollectAsyncHook(),
+      jestConfig: createAsyncHook(),
+      afterTest: createAsyncHook()
     },
-    setup: function(_api) {
+    setup: function(api) {
+      api.updateAppContext({
+        toolsType: "app-tools"
+      });
     }
   };
 };

package/dist/esm/{new/compat → compat}/utils.js

@@ -1,3 +1,4 @@
+import { getModifyHtmlPartials } from "../plugins/analyze/getHtmlTemplate";
 function transformHookRunner(hookRunnerName) {
   switch (hookRunnerName) {
     case "beforeConfig":
@@ -48,25 +49,45 @@ function transformHookParams(hookRunnerName, params) {
   switch (hookRunnerName) {
     case "resolvedConfig":
       return {
-        resolved: params
+        isMultiple: false,
+        params: {
+          resolved: params[0]
+        }
       };
     case "htmlPartials":
       return {
-        partials: {
-          top: params.partials.top.current,
-          head: params.partials.head.current,
-          body: params.partials.body.current
-        },
-        entrypoint: params.entrypoint
+        isMultiple: false,
+        params: {
+          partials: {
+            top: params[0].partials.top.current,
+            head: params[0].partials.head.current,
+            body: params[0].partials.body.current
+          },
+          entrypoint: params[0].entrypoint
+        }
       };
+    case "jestConfig": {
+      return {
+        isMultiple: true,
+        params
+      };
+    }
     default:
-      return params;
+      return {
+        isMultiple: false,
+        params: params[0]
+      };
   }
 }
 function transformHookResult(hookRunnerName, result) {
   switch (hookRunnerName) {
     case "resolvedConfig":
       return result.resolved;
+    case "htmlPartials":
+      return {
+        partials: getModifyHtmlPartials(result.partials),
+        entrypoint: result.entrypoint
+      };
     default:
       return result;
   }

package/dist/esm/config/default.js

@@ -5,7 +5,18 @@ function createDefaultConfig(appContext) {
   var dev = {
     // `dev.port` should not have a default value
     // because we will use `server.port` by default
-    port: void 0
+    port: void 0,
+    cliShortcuts: {
+      help: false,
+      // does not support restart server and print urls yet
+      custom: function() {
+        var shortcuts = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [];
+        return shortcuts.filter(function(param) {
+          var key = param.key;
+          return key !== "r" && key !== "u";
+        });
+      }
+    }
   };
   var output = {
     distPath: {

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

@@ -21,7 +21,6 @@ function transformNormalizedConfig(config) {
     server,
     cliOptions,
     testing,
-    devtools: {},
     builderPlugins: [],
     plugins,
     security: {},

package/dist/esm/index.js

@@ -1,5 +1,248 @@
-import { appTools } from "./new/index";
-import { initAppContext } from "./new/index";
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
+import { createAsyncHook, createCollectAsyncHook } from "@modern-js/plugin-v2";
+import { castArray } from "@modern-js/uni-builder";
+import { cleanRequireCache, deprecatedCommands, emptyDir, getArgv, getCommand } from "@modern-js/utils";
+import { buildCommand, deployCommand, devCommand, inspectCommand, newCommand, serverCommand, upgradeCommand } from "./commands";
+import { compatPlugin } from "./compat";
+import { DEFAULT_RUNTIME_CONFIG_FILE, DEFAULT_SERVER_CONFIG_FILE } from "./constants";
+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 { generateWatchFiles } from "./utils/generateWatchFiles";
+import { initAppContext } from "./utils/initAppContext";
+import { restart } from "./utils/restart";
+export * from "./defineConfig";
+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",
+    usePlugins: [
+      compatPlugin(),
+      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()
+    ],
+    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"
+    ],
+    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: createCollectAsyncHook(),
+      registerBuildPlatform: createCollectAsyncHook(),
+      addRuntimeExports: createAsyncHook()
+    },
+    setup: function(api) {
+      var _userConfig_output;
+      var context = api.getAppContext();
+      var userConfig = api.getConfig();
+      var locale = getLocaleLanguage();
+      i18n.changeLanguage({
+        locale
+      });
+      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
+      }));
+      api.addCommand(function() {
+        var _ref = _async_to_generator(function(param) {
+          var program;
+          return _ts_generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                program = param.program;
+                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
+                ];
+            }
+          });
+        });
+        return function(_) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+      api.onPrepare(/* @__PURE__ */ _async_to_generator(function() {
+        var command, isSkipBuild, resolvedConfig, appContext;
+        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.getNormalizedConfig();
+              if (!resolvedConfig.output.cleanDistPath)
+                return [
+                  3,
+                  2
+                ];
+              appContext = api.getAppContext();
+              return [
+                4,
+                emptyDir(appContext.distDirectory)
+              ];
+            case 1:
+              _state.sent();
+              _state.label = 2;
+            case 2:
+              return [
+                2
+              ];
+          }
+        });
+      }));
+      api.addWatchFiles(/* @__PURE__ */ _async_to_generator(function() {
+        var appContext, config, files, watchFiles;
+        return _ts_generator(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              appContext = api.getAppContext();
+              config = api.getNormalizedConfig();
+              return [
+                4,
+                generateWatchFiles(appContext, config.source.configDir)
+              ];
+            case 1:
+              files = _state.sent();
+              watchFiles = castArray(config.dev.watchFiles);
+              watchFiles.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
+              ];
+          }
+        });
+      }));
+      api.onFileChanged(function() {
+        var _ref = _async_to_generator(function(e) {
+          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.getHooks(), filename)
+                ];
+              case 3:
+                _state.sent();
+                _state.label = 4;
+              case 4:
+                return [
+                  2
+                ];
+            }
+          });
+        });
+        return function(e) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+      api.onBeforeRestart(function() {
+        cleanRequireCache([
+          require.resolve("./plugins/analyze")
+        ]);
+      });
+    }
+  };
+};
 import { defineConfig, defineLegacyConfig } from "./defineConfig";
 import { mergeConfig } from "@modern-js/core";
 import { dev } from "./commands/dev";

package/dist/esm/plugins/analyze/getServerRoutes.js

@@ -3,9 +3,8 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _type_of } from "@swc/helpers/_/_type_of";
-import fs from "fs";
 import path from "path";
-import { SERVER_BUNDLE_DIRECTORY, SERVER_WORKER_BUNDLE_DIRECTORY, getEntryOptions, isPlainObject, removeLeadingSlash, removeTailSlash, urlJoin } from "@modern-js/utils";
+import { fs, ROUTE_SPEC_FILE, SERVER_BUNDLE_DIRECTORY, SERVER_WORKER_BUNDLE_DIRECTORY, getEntryOptions, isPlainObject, removeLeadingSlash, removeTailSlash, urlJoin } from "@modern-js/utils";
 import { isMainEntry } from "../../utils/routes";
 import { walkDirectory } from "./utils";
 var applyBaseUrl = function(baseUrl, routes) {
@@ -132,6 +131,16 @@ var getServerRoutes = function(entrypoints, param) {
 var toPosix = function(pathStr) {
   return pathStr.split(path.sep).join(path.posix.sep);
 };
+var getProdServerRoutes = function(distDirectory) {
+  var routeJSON = path.join(distDirectory, ROUTE_SPEC_FILE);
+  try {
+    var routes = fs.readJSONSync(routeJSON).routes;
+    return routes;
+  } catch (e) {
+    throw new Error("Failed to read routes from ".concat(routeJSON, ", please check if the file exists."));
+  }
+};
 export {
+  getProdServerRoutes,
   getServerRoutes
 };