@modern-js/app-tools 2.63.1 → 2.63.3

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,

package/dist/esm/plugins/deploy/platforms/netlify.js

@@ -2,8 +2,8 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "node:path";
 import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, fs as fse } from "@modern-js/utils";
+import { nodeDepEmit as handleDependencies } from "ndepe";
 import { isMainEntry } from "../../../utils/routes";
-import { handleDependencies } from "../dependencies";
 import { genPluginImportsCode, getPluginsCode, serverAppContenxtTemplate } from "../utils";
 function cleanDistDirectory(dir) {
   return _cleanDistDirectory.apply(this, arguments);
@@ -306,10 +306,13 @@ var createNetlifyPreset = function(appContext, modernConfig, needModernServer) {
                 4,
                 handleDependencies({
                   appDir: appDirectory,
-                  serverRootDir: funcsDirectory,
+                  sourceDir: funcsDirectory,
                   includeEntries: [
                     require.resolve("@modern-js/prod-server")
-                  ]
+                  ],
+                  copyWholePackage: function copyWholePackage(pkgName) {
+                    return pkgName === "@modern-js/utils";
+                  }
                 })
               ];
             case 3:

package/dist/esm/plugins/deploy/platforms/node.js

@@ -2,7 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "node:path";
 import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, chalk, fs as fse } from "@modern-js/utils";
-import { handleDependencies } from "../dependencies";
+import { nodeDepEmit as handleDependencies } from "ndepe";
 import { genPluginImportsCode, getPluginsCode, serverAppContenxtTemplate } from "../utils";
 var createNodePreset = function(appContext, config) {
   var appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, serverPlugins = appContext.serverPlugins, moduleType = appContext.moduleType;
@@ -139,10 +139,13 @@ var createNodePreset = function(appContext, config) {
                 4,
                 handleDependencies({
                   appDir: appDirectory,
-                  serverRootDir: outputDirectory,
+                  sourceDir: outputDirectory,
                   includeEntries: [
                     require.resolve("@modern-js/prod-server")
                   ],
+                  copyWholePackage: function copyWholePackage(pkgName) {
+                    return pkgName === "@modern-js/utils";
+                  },
                   entryFilter: filter
                 })
               ];

package/dist/esm/plugins/deploy/platforms/vercel.js

@@ -2,8 +2,8 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "node:path";
 import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, fs as fse } from "@modern-js/utils";
+import { nodeDepEmit as handleDependencies } from "ndepe";
 import { isMainEntry } from "../../../utils/routes";
-import { handleDependencies } from "../dependencies";
 import { genPluginImportsCode, getPluginsCode, serverAppContenxtTemplate } from "../utils";
 var createVercelPreset = function(appContext, modernConfig, needModernServer) {
   var appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, entrypoints = appContext.entrypoints, serverPlugins = appContext.serverPlugins, moduleType = appContext.moduleType;
@@ -240,10 +240,13 @@ var createVercelPreset = function(appContext, modernConfig, needModernServer) {
                 4,
                 handleDependencies({
                   appDir: appDirectory,
-                  serverRootDir: funcsDirectory,
+                  sourceDir: funcsDirectory,
                   includeEntries: [
                     require.resolve("@modern-js/prod-server")
-                  ]
+                  ],
+                  copyWholePackage: function copyWholePackage(pkgName) {
+                    return pkgName === "@modern-js/utils";
+                  }
                 })
               ];
             case 1:

package/dist/esm/plugins/serverBuild.js

@@ -21,63 +21,59 @@ function serverBuild_default() {
   return {
     name: "@modern-js/server-build",
     setup: function setup(api) {
-      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
-                  ];
+      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
+                ];
               }
-            });
-          })();
-        }
-      };
+              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/{new/run.js → run/index.js}

@@ -3,11 +3,11 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { initAppDir } from "@modern-js/plugin-v2/cli";
 import { run as CLIPluginRun } from "@modern-js/plugin-v2/run";
 import { minimist } from "@modern-js/utils";
-import { handleSetupResult } from "./compat/hooks";
-import { PACKAGE_JSON_CONFIG_NAME } from "./constants";
-import { getConfigFile } from "./getConfigFile";
-import { loadInternalPlugins } from "./loadPlugins";
-import { getIsAutoLoadPlugins } from "./utils";
+import { handleSetupResult } from "../compat/hooks";
+import { PACKAGE_JSON_CONFIG_NAME } from "../constants";
+import { getConfigFile } from "../utils/getConfigFile";
+import { isAutoLoadPlugins } from "../utils/isAutoLoadPlugins";
+import { loadInternalPlugins } from "../utils/loadPlugins";
 function run(_) {
   return _run.apply(this, arguments);
 }
@@ -44,7 +44,7 @@ function _run() {
           finalConfigFile = customConfigFile || getConfigFile(configFile);
           return [
             4,
-            getIsAutoLoadPlugins(appDirectory, finalConfigFile)
+            isAutoLoadPlugins(appDirectory, finalConfigFile)
           ];
         case 2:
           autoLoadPlugins = _state.sent();

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

@@ -1,6 +1,6 @@
 import path from "path";
 import { CONFIG_FILE_EXTENSIONS, findExists } from "@modern-js/utils";
-import { DEFAULT_CONFIG_FILE } from "./constants";
+import { DEFAULT_CONFIG_FILE } from "../constants";
 var getConfigFile = function(configFile) {
   return findExists(CONFIG_FILE_EXTENSIONS.map(function(extension) {
     return path.resolve(process.cwd(), "".concat(configFile || DEFAULT_CONFIG_FILE).concat(extension));

package/dist/esm/{new/utils/index.js → utils/isAutoLoadPlugins.js}

@@ -1,11 +1,11 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { createLoadedConfig } from "@modern-js/plugin-v2/cli";
-function getIsAutoLoadPlugins(appDirectory) {
-  return _getIsAutoLoadPlugins.apply(this, arguments);
+function isAutoLoadPlugins(appDirectory) {
+  return _isAutoLoadPlugins.apply(this, arguments);
 }
-function _getIsAutoLoadPlugins() {
-  _getIsAutoLoadPlugins = _async_to_generator(function(appDirectory) {
+function _isAutoLoadPlugins() {
+  _isAutoLoadPlugins = _async_to_generator(function(appDirectory) {
     var configFile, packageJsonConfig, _loaded_config, loaded, autoLoadPlugins;
     var _arguments = arguments;
     return _ts_generator(this, function(_state) {
@@ -26,8 +26,8 @@ function _getIsAutoLoadPlugins() {
       }
     });
   });
-  return _getIsAutoLoadPlugins.apply(this, arguments);
+  return _isAutoLoadPlugins.apply(this, arguments);
 }
 export {
-  getIsAutoLoadPlugins
+  isAutoLoadPlugins
 };