@modern-js/app-tools 2.63.1 → 2.63.2

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
 };

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

@@ -2,6 +2,7 @@ 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 _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import * as path from "path";
 import { fs, createDebugger, getArgv, isApiOnly, isDevCommand, minimist } from "@modern-js/utils";
@@ -11,7 +12,7 @@ import { emitResolvedConfig } from "../../utils/config";
 import { getSelectedEntries } from "../../utils/getSelectedEntries";
 import { printInstructions } from "../../utils/printInstructions";
 import { generateRoutes } from "../../utils/routes";
-import { checkIsBuildCommands } from "./utils";
+import { checkIsBuildCommands, checkIsServeCommand } from "./utils";
 var debug = createDebugger("plugin-analyze");
 function analyze_default(param) {
   var bundler = param.bundler;
@@ -24,7 +25,7 @@ function analyze_default(param) {
       var pagesDir = [];
       var nestedRouteEntries = [];
       api.onPrepare(/* @__PURE__ */ _async_to_generator(function() {
-        var _resolvedConfig_source, appContext, resolvedConfig, hooks, apiOnly, routes, _ref, getBundleEntry, getServerRoutes, getHtmlTemplate, entrypoints, _, _1, _tmp, initialRoutes, routes1, _ref1, partialsByEntrypoint, htmlTemplates, checkedEntries, entry, normalizedConfig, createBuilderForModern, builder;
+        var _resolvedConfig_source, appContext, resolvedConfig, hooks, apiOnly, _ref, getProdServerRoutes, routes, _routes, _routes1, _ref1, modifiedRoutes, _ref2, getBundleEntry, getServerRoutes, getHtmlTemplate, entrypoints, _, _1, _tmp, routes1, _routes2, _routes3, initialRoutes, _ref3, modifiedRoutes1, _ref4, partialsByEntrypoint, htmlTemplates, checkedEntries, entry, normalizedConfig, createBuilderForModern, builder;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
@@ -49,19 +50,45 @@ function analyze_default(param) {
               ];
             case 2:
               _state.sent();
+              return [
+                4,
+                Promise.all([
+                  import("./getServerRoutes.js")
+                ])
+              ];
+            case 3:
+              _ref = _sliced_to_array.apply(void 0, [
+                _state.sent(),
+                1
+              ]), getProdServerRoutes = _ref[0].getProdServerRoutes;
               if (!apiOnly)
+                return [
+                  3,
+                  7
+                ];
+              routes = [];
+              if (!checkIsServeCommand())
                 return [
                   3,
                   4
                 ];
+              (_routes = routes).push.apply(_routes, _to_consumable_array(getProdServerRoutes(appContext.distDirectory)));
+              return [
+                3,
+                6
+              ];
+            case 4:
               return [
                 4,
                 hooks.modifyServerRoutes.call({
                   routes: []
                 })
               ];
-            case 3:
-              routes = _state.sent().routes;
+            case 5:
+              _ref1 = _state.sent(), modifiedRoutes = _ref1.routes;
+              (_routes1 = routes).push.apply(_routes1, _to_consumable_array(modifiedRoutes));
+              _state.label = 6;
+            case 6:
               debug("server routes: %o", routes);
               api.updateAppContext({
                 apiOnly,
@@ -70,7 +97,7 @@ function analyze_default(param) {
               return [
                 2
               ];
-            case 4:
+            case 7:
               return [
                 4,
                 Promise.all([
@@ -79,27 +106,39 @@ function analyze_default(param) {
                   import("./getHtmlTemplate.js")
                 ])
               ];
-            case 5:
-              _ref = _sliced_to_array.apply(void 0, [
+            case 8:
+              _ref2 = _sliced_to_array.apply(void 0, [
                 _state.sent(),
                 3
-              ]), getBundleEntry = _ref[0].getBundleEntry, getServerRoutes = _ref[1].getServerRoutes, getHtmlTemplate = _ref[2].getHtmlTemplate;
+              ]), getBundleEntry = _ref2[0].getBundleEntry, getServerRoutes = _ref2[1].getServerRoutes, getHtmlTemplate = _ref2[2].getHtmlTemplate;
               _1 = (_ = hooks.modifyEntrypoints).call;
               _tmp = {};
               return [
                 4,
                 getBundleEntry(hooks, appContext, resolvedConfig)
               ];
-            case 6:
+            case 9:
               return [
                 4,
                 _1.apply(_, [
                   (_tmp.entrypoints = _state.sent(), _tmp)
                 ])
               ];
-            case 7:
+            case 10:
               entrypoints = _state.sent().entrypoints;
               debug("entrypoints: %o", entrypoints);
+              routes1 = [];
+              if (!checkIsServeCommand())
+                return [
+                  3,
+                  11
+                ];
+              (_routes2 = routes1).push.apply(_routes2, _to_consumable_array(getProdServerRoutes(appContext.distDirectory)));
+              return [
+                3,
+                13
+              ];
+            case 11:
               initialRoutes = getServerRoutes(entrypoints, {
                 appContext,
                 config: resolvedConfig
@@ -110,8 +149,11 @@ function analyze_default(param) {
                   routes: initialRoutes
                 })
               ];
-            case 8:
-              routes1 = _state.sent().routes;
+            case 12:
+              _ref3 = _state.sent(), modifiedRoutes1 = _ref3.routes;
+              (_routes3 = routes1).push.apply(_routes3, _to_consumable_array(modifiedRoutes1));
+              _state.label = 13;
+            case 13:
               debug("server routes: %o", routes1);
               appContext = _object_spread_props(_object_spread({}, api.getAppContext()), {
                 entrypoints,
@@ -133,8 +175,8 @@ function analyze_default(param) {
                   config: resolvedConfig
                 })
               ];
-            case 9:
-              _ref1 = _state.sent(), partialsByEntrypoint = _ref1.partialsByEntrypoint, htmlTemplates = _ref1.htmlTemplates;
+            case 14:
+              _ref4 = _state.sent(), partialsByEntrypoint = _ref4.partialsByEntrypoint, htmlTemplates = _ref4.htmlTemplates;
               debug("html templates: %o", htmlTemplates);
               api.updateAppContext({
                 partialsByEntrypoint
@@ -145,17 +187,17 @@ function analyze_default(param) {
               if (!isDevCommand())
                 return [
                   3,
-                  11
+                  16
                 ];
               entry = minimist(getArgv()).entry;
               return [
                 4,
                 getSelectedEntries(typeof entry === "string" ? entry.split(",") : entry, entrypoints)
               ];
-            case 10:
+            case 15:
               checkedEntries = _state.sent();
-              _state.label = 11;
-            case 11:
+              _state.label = 16;
+            case 16:
               appContext = _object_spread_props(_object_spread({}, api.getAppContext()), {
                 entrypoints,
                 checkedEntries,
@@ -167,7 +209,7 @@ function analyze_default(param) {
               if (!checkIsBuildCommands())
                 return [
                   3,
-                  15
+                  20
                 ];
               return [
                 4,
@@ -175,14 +217,14 @@ function analyze_default(param) {
                   entrypoints
                 })
               ];
-            case 12:
+            case 17:
               _state.sent();
               normalizedConfig = api.getNormalizedConfig();
               return [
                 4,
                 createBuilderGenerator(bundler)
               ];
-            case 13:
+            case 18:
               createBuilderForModern = _state.sent();
               return [
                 4,
@@ -191,10 +233,10 @@ function analyze_default(param) {
                   appContext
                 })
               ];
-            case 14:
+            case 19:
               builder = _state.sent();
               builder.onBeforeBuild(function() {
-                var _ref2 = _async_to_generator(function(param2) {
+                var _ref5 = _async_to_generator(function(param2) {
                   var bundlerConfigs, isFirstCompile, environments, isWatch;
                   return _ts_generator(this, function(_state2) {
                     switch (_state2.label) {
@@ -229,11 +271,11 @@ function analyze_default(param) {
                   });
                 });
                 return function(_2) {
-                  return _ref2.apply(this, arguments);
+                  return _ref5.apply(this, arguments);
                 };
               }());
               builder.onAfterBuild(function() {
-                var _ref2 = _async_to_generator(function(param2) {
+                var _ref5 = _async_to_generator(function(param2) {
                   var stats, environments, isFirstCompile, isWatch;
                   return _ts_generator(this, function(_state2) {
                     switch (_state2.label) {
@@ -263,11 +305,11 @@ function analyze_default(param) {
                   });
                 });
                 return function(_2) {
-                  return _ref2.apply(this, arguments);
+                  return _ref5.apply(this, arguments);
                 };
               }());
               builder.onDevCompileDone(function() {
-                var _ref2 = _async_to_generator(function(param2) {
+                var _ref5 = _async_to_generator(function(param2) {
                   var isFirstCompile;
                   return _ts_generator(this, function(_state2) {
                     isFirstCompile = param2.isFirstCompile;
@@ -283,11 +325,11 @@ function analyze_default(param) {
                   });
                 });
                 return function(_2) {
-                  return _ref2.apply(this, arguments);
+                  return _ref5.apply(this, arguments);
                 };
               }());
               builder.onBeforeCreateCompiler(function() {
-                var _ref2 = _async_to_generator(function(param2) {
+                var _ref5 = _async_to_generator(function(param2) {
                   var bundlerConfigs, environments;
                   return _ts_generator(this, function(_state2) {
                     switch (_state2.label) {
@@ -309,11 +351,11 @@ function analyze_default(param) {
                   });
                 });
                 return function(_2) {
-                  return _ref2.apply(this, arguments);
+                  return _ref5.apply(this, arguments);
                 };
               }());
               builder.onAfterCreateCompiler(function() {
-                var _ref2 = _async_to_generator(function(param2) {
+                var _ref5 = _async_to_generator(function(param2) {
                   var compiler, environments;
                   return _ts_generator(this, function(_state2) {
                     switch (_state2.label) {
@@ -335,15 +377,15 @@ function analyze_default(param) {
                   });
                 });
                 return function(_2) {
-                  return _ref2.apply(this, arguments);
+                  return _ref5.apply(this, arguments);
                 };
               }());
               builder.addPlugins(resolvedConfig.builderPlugins);
               api.updateAppContext({
                 builder
               });
-              _state.label = 15;
-            case 15:
+              _state.label = 20;
+            case 20:
               return [
                 2
               ];

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

@@ -83,6 +83,10 @@ var checkIsBuildCommands = function() {
   var command = getCommand();
   return buildCommands.includes(command);
 };
+var checkIsServeCommand = function() {
+  var command = getCommand();
+  return command === "serve";
+};
 var isSubDirOrEqual = function(parent, child) {
   if (parent === child) {
     return true;
@@ -93,6 +97,7 @@ var isSubDirOrEqual = function(parent, child) {
 };
 export {
   checkIsBuildCommands,
+  checkIsServeCommand,
   getServerCombinedModueFile,
   isSubDirOrEqual,
   parseModule,