@modern-js/app-tools 2.27.0 → 2.28.0

package/dist/esm/builder/shared/builderPlugins/adapterSSR.js

@@ -76,6 +76,7 @@ export var builderPluginAdapterSSR = function(options) {
   };
 };
 var isStreamingSSR = function(userConfig) {
+  var _server;
   var isStreaming = function(ssr) {
     return ssr && typeof ssr === "object" && ssr.mode === "stream";
   };
@@ -83,7 +84,7 @@ var isStreamingSSR = function(userConfig) {
   if (isStreaming(server.ssr)) {
     return true;
   }
-  if ((server === null || server === void 0 ? void 0 : server.ssrByEntries) && typeof server.ssrByEntries === "object") {
+  if (((_server = server) === null || _server === void 0 ? void 0 : _server.ssrByEntries) && typeof server.ssrByEntries === "object") {
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
     try {
       for (var _iterator = Object.keys(server.ssrByEntries)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
@@ -118,14 +119,14 @@ function applyAsyncChunkHtmlPlugin(param) {
   }
 }
 function applyRouterPlugin(chain, options) {
-  var _normalizedConfig_runtime, _normalizedConfig_deploy_worker;
+  var _normalizedConfig_runtime, _normalizedConfig, _routerConfig, _normalizedConfig_deploy_worker;
   var appContext = options.appContext, normalizedConfig = options.normalizedConfig;
   var entrypoints = appContext.entrypoints;
   var existNestedRoutes = entrypoints.some(function(entrypoint) {
     return entrypoint.nestedRoutesEntry;
   });
-  var routerConfig = normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_runtime = normalizedConfig.runtime) === null || _normalizedConfig_runtime === void 0 ? void 0 : _normalizedConfig_runtime.router;
-  var routerManifest = Boolean(routerConfig === null || routerConfig === void 0 ? void 0 : routerConfig.manifest);
+  var routerConfig = (_normalizedConfig = normalizedConfig) === null || _normalizedConfig === void 0 ? void 0 : (_normalizedConfig_runtime = _normalizedConfig.runtime) === null || _normalizedConfig_runtime === void 0 ? void 0 : _normalizedConfig_runtime.router;
+  var routerManifest = Boolean((_routerConfig = routerConfig) === null || _routerConfig === void 0 ? void 0 : _routerConfig.manifest);
   var workerSSR = Boolean((_normalizedConfig_deploy_worker = normalizedConfig.deploy.worker) === null || _normalizedConfig_deploy_worker === void 0 ? void 0 : _normalizedConfig_deploy_worker.ssr);
   if (existNestedRoutes || routerManifest || workerSSR) {
     chain.plugin("route-plugin").use(RouterPlugin);
@@ -133,21 +134,21 @@ function applyRouterPlugin(chain, options) {
 }
 function applyFilterEntriesBySSRConfig(param) {
   var isProd = param.isProd, chain = param.chain, appNormalizedConfig = param.appNormalizedConfig;
-  var _ref;
+  var _outputConfig, _this, _outputConfig1, _outputConfig2, _outputConfig3;
   var serverConfig = appNormalizedConfig.server, outputConfig = appNormalizedConfig.output;
   var entries = chain.entryPoints.entries();
-  if (isProd && ((outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg) === true || typeof ((_ref = outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg) === null || _ref === void 0 ? void 0 : _ref[0]) === "function")) {
+  if (isProd && (((_outputConfig = outputConfig) === null || _outputConfig === void 0 ? void 0 : _outputConfig.ssg) === true || typeof ((_this = (_outputConfig1 = outputConfig) === null || _outputConfig1 === void 0 ? void 0 : _outputConfig1.ssg) === null || _this === void 0 ? void 0 : _this[0]) === "function")) {
     return;
   }
   if (typeof entries === "undefined") {
     throw new Error("No entry found, one of src/routes/layout.tsx, src/App.tsx, src/index.tsx is required");
   }
   var entryNames = Object.keys(entries);
-  if (isProd && entryNames.length === 1 && (outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg)) {
+  if (isProd && entryNames.length === 1 && ((_outputConfig2 = outputConfig) === null || _outputConfig2 === void 0 ? void 0 : _outputConfig2.ssg)) {
     return;
   }
   var ssgEntries = [];
-  if (isProd && (outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg)) {
+  if (isProd && ((_outputConfig3 = outputConfig) === null || _outputConfig3 === void 0 ? void 0 : _outputConfig3.ssg)) {
     var ssg = outputConfig.ssg;
     entryNames.forEach(function(name) {
       if (ssg[name]) {
@@ -155,9 +156,10 @@ function applyFilterEntriesBySSRConfig(param) {
       }
     });
   }
-  var _ref1 = serverConfig || {}, ssr = _ref1.ssr, ssrByEntries = _ref1.ssrByEntries;
+  var _ref = serverConfig || {}, ssr = _ref.ssr, ssrByEntries = _ref.ssrByEntries;
   entryNames.forEach(function(name) {
-    if (!ssgEntries.includes(name) && (ssr && (ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[name]) === false || !ssr && !(ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[name]))) {
+    var _ssrByEntries, _ssrByEntries1;
+    if (!ssgEntries.includes(name) && (ssr && ((_ssrByEntries = ssrByEntries) === null || _ssrByEntries === void 0 ? void 0 : _ssrByEntries[name]) === false || !ssr && !((_ssrByEntries1 = ssrByEntries) === null || _ssrByEntries1 === void 0 ? void 0 : _ssrByEntries1[name]))) {
       chain.entryPoints.delete(name);
     }
   });

package/dist/esm/commands/build.js

@@ -8,11 +8,11 @@ import { generateRoutes } from "../utils/routes";
 import { buildServerConfig } from "../utils/config";
 export var build = function() {
   var _ref = _async_to_generator(function(api, options) {
-    var resolvedConfig, appContext, hookRunners, apiOnly, appDirectory, distDirectory, serverConfigFile, distDirectory1, appDirectory1, serverConfigFile1;
+    var _options, resolvedConfig, appContext, hookRunners, apiOnly, appDirectory, distDirectory, serverConfigFile, distDirectory1, appDirectory1, serverConfigFile1;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          if (options === null || options === void 0 ? void 0 : options.analyze) {
+          if ((_options = options) === null || _options === void 0 ? void 0 : _options.analyze) {
             process.env.BUNDLE_ANALYZE = "true";
           }
           resolvedConfig = api.useResolvedConfigContext();

package/dist/esm/commands/dev.js

@@ -11,10 +11,12 @@ import { buildServerConfig } from "../utils/config";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 export var dev = function() {
   var _ref = _async_to_generator(function(api, options) {
-    var _normalizedConfig_tools, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverInternalPlugins, serverOptions, _normalizedConfig_dev, app, host, server;
+    var devServerOptions, _normalizedConfig_tools, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverInternalPlugins, serverOptions, _normalizedConfig_dev, app, host, server;
+    var _arguments = arguments;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
+          devServerOptions = _arguments.length > 2 && _arguments[2] !== void 0 ? _arguments[2] : {};
           if (options.analyze) {
             process.env.BUNDLE_ANALYZE = "true";
           }
@@ -58,7 +60,7 @@ export var dev = function() {
           ];
         case 4:
           serverInternalPlugins = _state.sent();
-          serverOptions = {
+          serverOptions = _object_spread({
             dev: _object_spread({
               port: port,
               https: normalizedConfig.dev.https,
@@ -75,7 +77,7 @@ export var dev = function() {
             config: normalizedConfig,
             serverConfigFile: serverConfigFile,
             internalPlugins: injectDataLoaderPlugin(serverInternalPlugins)
-          };
+          }, devServerOptions);
           if (!apiOnly)
             return [
               3,

package/dist/esm/commands/inspect.js

@@ -3,7 +3,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { join } from "path";
 export var inspect = function() {
   var _ref = _async_to_generator(function(api, options) {
-    var appContext;
+    var _appContext, appContext;
     return _ts_generator(this, function(_state) {
       appContext = api.useAppContext();
       if (!appContext.builder) {
@@ -14,7 +14,7 @@ export var inspect = function() {
         appContext.builder.inspectConfig({
           env: options.env,
           verbose: options.verbose,
-          outputPath: join(appContext === null || appContext === void 0 ? void 0 : appContext.builder.context.distPath, options.output),
+          outputPath: join((_appContext = appContext) === null || _appContext === void 0 ? void 0 : _appContext.builder.context.distPath, options.output),
           writeToDisk: true
         })
       ];

package/dist/esm/commands/serve.js

@@ -9,7 +9,7 @@ import { injectDataLoaderPlugin } from "../utils/createServer";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 export var start = function() {
   var _ref = _async_to_generator(function(api) {
-    var _userConfig_source, _userConfig_output_distPath, appContext, userConfig, hookRunners, appDirectory, port, serverConfigFile, metaName, apiOnly, serverInternalPlugins, app;
+    var _userConfig_source, _userConfig, _userConfig_output_distPath, appContext, userConfig, hookRunners, appDirectory, port, serverConfigFile, metaName, apiOnly, serverInternalPlugins, app;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -20,7 +20,7 @@ export var start = function() {
           logger.log(chalk.cyan("Starting the modern server..."));
           return [
             4,
-            isApiOnly(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig_source = userConfig.source) === null || _userConfig_source === void 0 ? void 0 : _userConfig_source.entriesDir, appContext.apiDirectory)
+            isApiOnly(appContext.appDirectory, (_userConfig = userConfig) === null || _userConfig === void 0 ? void 0 : (_userConfig_source = _userConfig.source) === null || _userConfig_source === void 0 ? void 0 : _userConfig_source.entriesDir, appContext.apiDirectory)
           ];
         case 1:
           apiOnly = _state.sent();

package/dist/esm/index.js

@@ -14,6 +14,7 @@ import { i18n, localeKeys } from "./locale";
 import { restart } from "./utils/restart";
 import { generateWatchFiles } from "./utils/generateWatchFiles";
 export { mergeConfig } from "@modern-js/core";
+export { dev } from "./commands";
 export * from "./defineConfig";
 export * from "./types";
 export var devCommand = function() {
@@ -31,7 +32,7 @@ export var devCommand = function() {
           devToolMetas = _state.sent();
           devProgram = program.command("dev").alias("start").usage("[options]").description(i18n.t(localeKeys.command.dev.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-e --entry [entry...]", i18n.t(localeKeys.command.dev.entry)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).option("--web-only", i18n.t(localeKeys.command.dev.webOnly)).action(function() {
             var _ref2 = _async_to_generator(function(options) {
-              var dev;
+              var dev2;
               return _ts_generator(this, function(_state2) {
                 switch (_state2.label) {
                   case 0:
@@ -40,10 +41,10 @@ export var devCommand = function() {
                       import("./commands/dev")
                     ];
                   case 1:
-                    dev = _state2.sent().dev;
+                    dev2 = _state2.sent().dev;
                     return [
                       4,
-                      dev(api, options)
+                      dev2(api, options)
                     ];
                   case 2:
                     _state2.sent();
@@ -272,6 +273,7 @@ export var appTools = function() {
   var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {
     bundler: "webpack"
   };
+  var _options, _options1;
   return {
     name: "@modern-js/app-tools",
     post: [
@@ -287,10 +289,10 @@ export var appTools = function() {
     registerHook: hooks,
     usePlugins: [
       initializePlugin({
-        bundler: (options === null || options === void 0 ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
+        bundler: ((_options = options) === null || _options === void 0 ? void 0 : _options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
       }),
       analyzePlugin({
-        bundler: (options === null || options === void 0 ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
+        bundler: ((_options1 = options) === null || _options1 === void 0 ? void 0 : _options1.bundler) === "experimental-rspack" ? "rspack" : "webpack"
       }),
       lintPlugin()
     ],

package/dist/esm-node/analyze/generateCode.js

@@ -63,7 +63,7 @@ export const generateCode = async (appContext, config, entrypoints, api) => {
     const { entryName, isMainEntry, isAutoMount, fileSystemRoutes } = entrypoint;
     if (isAutoMount) {
       if (fileSystemRoutes) {
-        var _config_output;
+        var _config_output, _config;
         let initialRoutes = [];
         let nestedRoute = null;
         if (entrypoint.entry) {
@@ -110,7 +110,7 @@ export const generateCode = async (appContext, config, entrypoints, api) => {
             nestedRoutesEntry: entrypoint.nestedRoutesEntry,
             entryName: entrypoint.entryName,
             internalDirectory,
-            splitRouteChunks: config2 === null || config2 === void 0 ? void 0 : (_config_output = config2.output) === null || _config_output === void 0 ? void 0 : _config_output.splitRouteChunks
+            splitRouteChunks: (_config = config2) === null || _config === void 0 ? void 0 : (_config_output = _config.output) === null || _config_output === void 0 ? void 0 : _config_output.splitRouteChunks
           })
         });
         if (entrypoint.nestedRoutesEntry && isUseSSRBundle(config2)) {

package/dist/esm-node/analyze/getFileSystemEntry.js

@@ -69,7 +69,8 @@ export const getFileSystemEntry = (appContext, config) => {
   const { source: { entriesDir, disableEntryDirs } } = config;
   let disabledDirs = [];
   if (disableEntryDirs && Array.isArray(disableEntryDirs)) {
-    disabledDirs = disableEntryDirs === null || disableEntryDirs === void 0 ? void 0 : disableEntryDirs.map((dir) => ensureAbsolutePath(appDirectory, dir));
+    var _disableEntryDirs;
+    disabledDirs = (_disableEntryDirs = disableEntryDirs) === null || _disableEntryDirs === void 0 ? void 0 : _disableEntryDirs.map((dir) => ensureAbsolutePath(appDirectory, dir));
   }
   const src = ensureAbsolutePath(appDirectory, entriesDir || "");
   if (fs.existsSync(src)) {

package/dist/esm-node/analyze/getServerRoutes.js

@@ -68,17 +68,18 @@ const applyRouteOptions = (original, routeOptions) => {
   return routes;
 };
 const collectHtmlRoutes = (entrypoints, appContext, config) => {
-  var _deploy_worker;
+  var _deploy_worker, _deploy;
   const { source: { mainEntryName }, html: { disableHtmlFolder }, output: { distPath: { html: htmlPath } = {} }, server: { baseUrl, routes, ssr, ssrByEntries }, deploy } = config;
   const { packageName } = appContext;
-  const workerSSR = deploy === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr;
+  const workerSSR = (_deploy = deploy) === null || _deploy === void 0 ? void 0 : (_deploy_worker = _deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr;
   let htmlRoutes = entrypoints.reduce((previous, { entryName }) => {
+    var _routes, _routes1;
     const isMainEntry = entryName === (mainEntryName || MAIN_ENTRY_NAME);
     const entryOptions = getEntryOptions(entryName, isMainEntry, ssr, ssrByEntries, packageName);
     const isSSR = Boolean(entryOptions);
     const isWorker = Boolean(workerSSR);
     const isStream = typeof entryOptions === "object" && entryOptions.mode === "stream";
-    const { resHeaders } = (routes === null || routes === void 0 ? void 0 : routes[entryName]) || {};
+    const { resHeaders } = ((_routes = routes) === null || _routes === void 0 ? void 0 : _routes[entryName]) || {};
     let route = {
       urlPath: `/${isMainEntry ? "" : entryName}`,
       entryName,
@@ -90,7 +91,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
       worker: isWorker ? `${SERVER_WORKER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0,
       bundle: isSSR ? `${SERVER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0
     };
-    if (routes === null || routes === void 0 ? void 0 : routes.hasOwnProperty(entryName)) {
+    if ((_routes1 = routes) === null || _routes1 === void 0 ? void 0 : _routes1.hasOwnProperty(entryName)) {
       const routeOptions = isPlainObject(routes[entryName]) ? routes[entryName] : {
         route: routes[entryName]
       };