@modern-js/app-tools 2.34.1-alpha.1 → 2.35.1

package/dist/cjs/utils/printInstructions.js

@@ -14,5 +14,5 @@ const printInstructions = async (hookRunners, appContext, config) => {
   const { instructions } = await hookRunners.beforePrintInstructions({
     instructions: message
   });
-  _utils.logger.info(instructions);
+  _utils.logger.log(instructions);
 };

package/dist/esm/analyze/generateCode.js

@@ -94,13 +94,13 @@ export var createImportStatements = function(statements) {
 };
 export var generateCode = function() {
   var _ref = _async_to_generator(function(appContext, config, entrypoints, api) {
-    var _config, _config1, internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, isV5, getRoutes, importsStatemets, oldVersion;
+    var internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, isV5, getRoutes, importsStatemets, oldVersion;
     function generateEntryCode(entrypoint) {
       return _generateEntryCode.apply(this, arguments);
     }
     function _generateEntryCode() {
       _generateEntryCode = _async_to_generator(function(entrypoint) {
-        var entryName, isMainEntry, isAutoMount, fileSystemRoutes, _config_output, _config2, initialRoutes, nestedRoutes, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, routes, _$config, ssr, useSSG, mode, hasPageRoute, code, _, _tmp, routesServerFile, code1, serverLoaderCombined, serverLoaderFile, imports, entryFile;
+        var entryName, isMainEntry, isAutoMount, fileSystemRoutes, _config_output, initialRoutes, nestedRoutes, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, routes, _$config, ssr, useSSG, mode, hasPageRoute, code, _, _tmp, routesServerFile, code1, serverLoaderCombined, serverLoaderFile, imports, entryFile;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
@@ -205,7 +205,7 @@ export var generateCode = function() {
                   nestedRoutesEntry: entrypoint.nestedRoutesEntry,
                   entryName: entrypoint.entryName,
                   internalDirectory: internalDirectory,
-                  splitRouteChunks: (_config2 = _$config) === null || _config2 === void 0 ? void 0 : (_config_output = _config2.output) === null || _config_output === void 0 ? void 0 : _config_output.splitRouteChunks
+                  splitRouteChunks: _$config === null || _$config === void 0 ? void 0 : (_config_output = _$config.output) === null || _config_output === void 0 ? void 0 : _config_output.splitRouteChunks
                 })
               ];
             case 4:
@@ -294,7 +294,7 @@ export var generateCode = function() {
           isV5 = isRouterV5(config);
           getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
           importsStatemets = /* @__PURE__ */ new Map();
-          oldVersion = typeof ((_config = config) === null || _config === void 0 ? void 0 : _config.runtime.router) === "object" ? Boolean(((_config1 = config) === null || _config1 === void 0 ? void 0 : _config1.runtime.router).oldVersion) : false;
+          oldVersion = typeof (config === null || config === void 0 ? void 0 : config.runtime.router) === "object" ? Boolean((config === null || config === void 0 ? void 0 : config.runtime.router).oldVersion) : false;
           return [
             4,
             Promise.all(entrypoints.map(generateEntryCode))

package/dist/esm/analyze/getFileSystemEntry.js

@@ -87,8 +87,7 @@ export var getFileSystemEntry = function(appContext, config) {
   var _config_source = config.source, entriesDir = _config_source.entriesDir, disableEntryDirs = _config_source.disableEntryDirs;
   var disabledDirs = [];
   if (disableEntryDirs && Array.isArray(disableEntryDirs)) {
-    var _disableEntryDirs;
-    disabledDirs = (_disableEntryDirs = disableEntryDirs) === null || _disableEntryDirs === void 0 ? void 0 : _disableEntryDirs.map(function(dir) {
+    disabledDirs = disableEntryDirs === null || disableEntryDirs === void 0 ? void 0 : disableEntryDirs.map(function(dir) {
       return ensureAbsolutePath(appDirectory, dir);
     });
   }

package/dist/esm/analyze/getServerRoutes.js

@@ -69,19 +69,18 @@ var applyRouteOptions = function(original, routeOptions) {
   return routes;
 };
 var collectHtmlRoutes = function(entrypoints, appContext, config) {
-  var _deploy_worker, _deploy;
+  var _deploy_worker;
   var mainEntryName = config.source.mainEntryName, disableHtmlFolder = config.html.disableHtmlFolder, _config_output = config.output, tmp = _config_output.distPath, _ref = tmp === void 0 ? {} : tmp, htmlPath = _ref.html, _config_server = config.server, baseUrl = _config_server.baseUrl, routes = _config_server.routes, ssr = _config_server.ssr, ssrByEntries = _config_server.ssrByEntries, deploy = config.deploy;
   var packageName = appContext.packageName;
-  var workerSSR = (_deploy = deploy) === null || _deploy === void 0 ? void 0 : (_deploy_worker = _deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr;
+  var workerSSR = deploy === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr;
   var htmlRoutes = entrypoints.reduce(function(previous, param) {
     var entryName = param.entryName;
-    var _routes, _routes1;
     var isMainEntry = entryName === (mainEntryName || MAIN_ENTRY_NAME);
     var entryOptions = getEntryOptions(entryName, isMainEntry, ssr, ssrByEntries, packageName);
     var isSSR = Boolean(entryOptions);
     var isWorker = Boolean(workerSSR);
     var isStream = typeof entryOptions === "object" && (entryOptions.mode === "stream" || Boolean(entryOptions.preload));
-    var resHeaders = (((_routes = routes) === null || _routes === void 0 ? void 0 : _routes[entryName]) || {}).resHeaders;
+    var resHeaders = ((routes === null || routes === void 0 ? void 0 : routes[entryName]) || {}).resHeaders;
     var route = {
       urlPath: "/".concat(isMainEntry ? "" : entryName),
       entryName: entryName,
@@ -93,7 +92,7 @@ var collectHtmlRoutes = function(entrypoints, appContext, config) {
       worker: isWorker ? "".concat(SERVER_WORKER_BUNDLE_DIRECTORY, "/").concat(entryName, ".js") : void 0,
       bundle: isSSR ? "".concat(SERVER_BUNDLE_DIRECTORY, "/").concat(entryName, ".js") : void 0
     };
-    if ((_routes1 = routes) === null || _routes1 === void 0 ? void 0 : _routes1.hasOwnProperty(entryName)) {
+    if (routes === null || routes === void 0 ? void 0 : routes.hasOwnProperty(entryName)) {
       var routeOptions = isPlainObject(routes[entryName]) ? routes[entryName] : {
         route: routes[entryName]
       };

package/dist/esm/analyze/nestedRoutes.js

@@ -73,7 +73,7 @@ export var optimizeRoute = function(routeTree) {
 };
 export var walk = function() {
   var _ref = _async_to_generator(function(dirname, rootDir, alias, entryName, isMainEntry, oldVersion) {
-    var _routePath, _finalRoute_children, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, splatLoaderFile, splatClientData, splatData, splatRoute, pageConfigFile, splatConfigFile, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory1, childRoute, _route_children, _route_children1, _route_children2, err, finalRoute, childRoutes, childRoute1, _$path, optimizedRoutes;
+    var _finalRoute_children, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, splatLoaderFile, splatClientData, splatData, splatRoute, pageConfigFile, splatConfigFile, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory1, childRoute, _route_children, _route_children1, _route_children2, err, finalRoute, childRoutes, childRoute1, _$path, optimizedRoutes;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -112,7 +112,7 @@ export var walk = function() {
           }
           routePath = replaceDynamicPath(routePath);
           route = {
-            path: (_routePath = routePath) === null || _routePath === void 0 ? void 0 : _routePath.replace(/\$$/, "?"),
+            path: routePath === null || routePath === void 0 ? void 0 : routePath.replace(/\$$/, "?"),
             children: [],
             isRoot: isRoot
           };

package/dist/esm/analyze/templates.js

@@ -28,8 +28,8 @@ export var routesForServer = function(param) {
   var traverseRouteTree = function(route2) {
     var children;
     if ("children" in route2 && route2.children) {
-      var _route_children, _route;
-      children = (_route = route2) === null || _route === void 0 ? void 0 : (_route_children = _route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
+      var _route_children;
+      children = route2 === null || route2 === void 0 ? void 0 : (_route_children = route2.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
     }
     var loader;
     if (route2.type === "nested") {
@@ -112,8 +112,8 @@ export var fileSystemRoutes = function() {
           traverseRouteTree = function(route2) {
             var children;
             if ("children" in route2 && route2.children) {
-              var _route_children, _route;
-              children = (_route = route2) === null || _route === void 0 ? void 0 : (_route_children = _route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
+              var _route_children;
+              children = route2 === null || route2 === void 0 ? void 0 : (_route_children = route2.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
             }
             var loading;
             var error;

package/dist/esm/builder/generator/createBuilderProviderConfig.js

@@ -3,10 +3,9 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { createUploadPattern } from "../builder-webpack/createCopyPattern";
 function modifyOutputConfig(config, appContext) {
-  var _copy;
   var defaultCopyPattern = createUploadPattern(appContext, config);
   var copy = config.output.copy;
-  var copyOptions = Array.isArray(copy) ? copy : (_copy = copy) === null || _copy === void 0 ? void 0 : _copy.patterns;
+  var copyOptions = Array.isArray(copy) ? copy : copy === null || copy === void 0 ? void 0 : copy.patterns;
   var builderCopy = _to_consumable_array(copyOptions || []).concat([
     defaultCopyPattern
   ]);

package/dist/esm/builder/index.js

@@ -41,7 +41,7 @@ function _createBuilderGenerator() {
           ];
         case 4:
           version = _state.sent();
-          logger.info("Using Rspack v".concat(version, " 🦀"));
+          logger.info("Using Rspack v".concat(version));
           return [
             2,
             createRspackBuilderForModern

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

@@ -1,5 +1,4 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
@@ -34,7 +33,6 @@ export var builderPluginAdapterHtml = function(options) {
                 return [
                   4,
                   injectAssetPrefix({
-                    api: api,
                     chain: chain
                   })
                 ];
@@ -60,48 +58,19 @@ function injectAssetPrefix(_) {
 }
 function _injectAssetPrefix() {
   _injectAssetPrefix = _async_to_generator(function(param) {
-    var api, chain, entries, entryNames, assetPrefix, code, isRspack, fileName, _ref, RspackVirtualModulePlugin;
+    var chain, entries, entryNames, assetPrefix, code;
     return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          api = param.api, chain = param.chain;
-          entries = chain.entryPoints.entries() || {};
-          entryNames = Object.keys(entries);
-          assetPrefix = removeTailSlash(chain.output.get("publicPath") || "");
-          code = "window.__assetPrefix__ = '".concat(assetPrefix, "';");
-          isRspack = api.context.bundlerType === "rspack";
-          if (!isRspack)
-            return [
-              3,
-              2
-            ];
-          fileName = "rspack-asset-prefix";
-          return [
-            4,
-            import("rspack-plugin-virtual-module")
-          ];
-        case 1:
-          _ref = _state.sent(), RspackVirtualModulePlugin = _ref.default;
-          entryNames.forEach(function(entryName) {
-            entries[entryName].prepend(fileName);
-            chain.plugin("rspack-asset-prefix").use(RspackVirtualModulePlugin, [
-              _define_property({}, fileName, code)
-            ]);
-          });
-          return [
-            3,
-            3
-          ];
-        case 2:
-          entryNames.forEach(function(entryName) {
-            entries[entryName].prepend(createVirtualModule(code));
-          });
-          _state.label = 3;
-        case 3:
-          return [
-            2
-          ];
-      }
+      chain = param.chain;
+      entries = chain.entryPoints.entries() || {};
+      entryNames = Object.keys(entries);
+      assetPrefix = removeTailSlash(chain.output.get("publicPath") || "");
+      code = "window.__assetPrefix__ = '".concat(assetPrefix, "';");
+      entryNames.forEach(function(entryName) {
+        entries[entryName].prepend(createVirtualModule(code));
+      });
+      return [
+        2
+      ];
     });
   });
   return _injectAssetPrefix.apply(this, arguments);

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

@@ -29,7 +29,7 @@ export var builderPluginAdapterSSR = function(options) {
                 target = param.target, CHAIN_ID = param.CHAIN_ID, isProd = param.isProd, HtmlBundlerPlugin = param.HtmlPlugin, isServer = param.isServer;
                 builderConfig = api.getNormalizedConfig();
                 normalizedConfig2 = options.normalizedConfig;
-                applyRouterPlugin(chain, options, HtmlBundlerPlugin);
+                applyRouterPlugin(chain, CHAIN_ID.PLUGIN.ROUTER_MANIFEST, options, HtmlBundlerPlugin);
                 if (!isSSR(normalizedConfig2))
                   return [
                     3,
@@ -76,7 +76,6 @@ export var builderPluginAdapterSSR = function(options) {
   };
 };
 var isStreamingSSR = function(userConfig) {
-  var _server;
   var isStreaming = function(ssr) {
     return ssr && typeof ssr === "object" && ssr.mode === "stream";
   };
@@ -84,7 +83,7 @@ var isStreamingSSR = function(userConfig) {
   if (isStreaming(server.ssr)) {
     return true;
   }
-  if (((_server = server) === null || _server === void 0 ? void 0 : _server.ssrByEntries) && typeof server.ssrByEntries === "object") {
+  if ((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,19 +117,19 @@ function applyAsyncChunkHtmlPlugin(param) {
     ]);
   }
 }
-function applyRouterPlugin(chain, options, HtmlBundlerPlugin) {
-  var _normalizedConfig_runtime, _normalizedConfig, _routerConfig, _normalizedConfig_deploy_worker;
+function applyRouterPlugin(chain, pluginName, options, HtmlBundlerPlugin) {
+  var _normalizedConfig_runtime, _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 = 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 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 workerSSR = Boolean((_normalizedConfig_deploy_worker = normalizedConfig.deploy.worker) === null || _normalizedConfig_deploy_worker === void 0 ? void 0 : _normalizedConfig_deploy_worker.ssr);
   if (existNestedRoutes || routerManifest || workerSSR) {
     var _normalizedConfig_output_distPath, _normalizedConfig_output, _normalizedConfig_output1, _normalizedConfig_html, _normalizedConfig_security;
-    chain.plugin("route-plugin").use(RouterPlugin, [
+    chain.plugin(pluginName).use(RouterPlugin, [
       {
         HtmlBundlerPlugin: HtmlBundlerPlugin,
         enableInlineRouteManifests: normalizedConfig.output.enableInlineRouteManifests,
@@ -144,21 +143,21 @@ function applyRouterPlugin(chain, options, HtmlBundlerPlugin) {
 }
 function applyFilterEntriesBySSRConfig(param) {
   var isProd = param.isProd, chain = param.chain, appNormalizedConfig = param.appNormalizedConfig;
-  var _outputConfig, _this, _outputConfig1, _outputConfig2, _outputConfig3;
+  var _this;
   var serverConfig = appNormalizedConfig.server, outputConfig = appNormalizedConfig.output;
   var entries = chain.entryPoints.entries();
-  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")) {
+  if (isProd && ((outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg) === true || typeof ((_this = outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.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 && ((_outputConfig2 = outputConfig) === null || _outputConfig2 === void 0 ? void 0 : _outputConfig2.ssg)) {
+  if (isProd && entryNames.length === 1 && (outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg)) {
     return;
   }
   var ssgEntries = [];
-  if (isProd && ((_outputConfig3 = outputConfig) === null || _outputConfig3 === void 0 ? void 0 : _outputConfig3.ssg)) {
+  if (isProd && (outputConfig === null || outputConfig === void 0 ? void 0 : outputConfig.ssg)) {
     var ssg = outputConfig.ssg;
     entryNames.forEach(function(name) {
       if (ssg[name]) {
@@ -168,8 +167,7 @@ function applyFilterEntriesBySSRConfig(param) {
   }
   var _ref = serverConfig || {}, ssr = _ref.ssr, ssrByEntries = _ref.ssrByEntries;
   entryNames.forEach(function(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]))) {
+    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]))) {
       chain.entryPoints.delete(name);
     }
   });

package/dist/esm/builder/shared/bundlerPlugins/RouterPlugin.js

@@ -18,6 +18,7 @@ export var RouterPlugin = /* @__PURE__ */ function() {
   function RouterPlugin2(param) {
     var _param_staticJsDir = param.staticJsDir, staticJsDir = _param_staticJsDir === void 0 ? "static/js" : _param_staticJsDir, HtmlBundlerPlugin = param.HtmlBundlerPlugin, enableInlineRouteManifests = param.enableInlineRouteManifests, _param_disableFilenameHash = param.disableFilenameHash, disableFilenameHash = _param_disableFilenameHash === void 0 ? false : _param_disableFilenameHash, _param_scriptLoading = param.scriptLoading, scriptLoading = _param_scriptLoading === void 0 ? "defer" : _param_scriptLoading, nonce = param.nonce;
     _class_call_check(this, RouterPlugin2);
+    _define_property(this, "name", "RouterPlugin");
     _define_property(this, "HtmlBundlerPlugin", void 0);
     _define_property(this, "enableInlineRouteManifests", void 0);
     _define_property(this, "staticJsDir", void 0);
@@ -117,10 +118,9 @@ export var RouterPlugin = /* @__PURE__ */ function() {
                 var relatedAssets = {};
                 if (entryChunkFiles.length > 1) {
                   Object.keys(routeAssets).forEach(function(routeId) {
-                    var _chunkNames;
                     var segments = routeId.split("_");
                     var chunkName = segments[0];
-                    if ((_chunkNames = chunkNames) === null || _chunkNames === void 0 ? void 0 : _chunkNames.includes(chunkName)) {
+                    if (chunkNames === null || chunkNames === void 0 ? void 0 : chunkNames.includes(chunkName)) {
                       relatedAssets[routeId] = routeAssets[routeId];
                     }
                   });

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 _options, resolvedConfig, appContext, hookRunners, apiOnly, appDirectory, distDirectory, serverConfigFile, distDirectory1, appDirectory1, serverConfigFile1;
+    var resolvedConfig, appContext, hookRunners, apiOnly, appDirectory, distDirectory, serverConfigFile, distDirectory1, appDirectory1, serverConfigFile1;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          if ((_options = options) === null || _options === void 0 ? void 0 : _options.analyze) {
+          if (options === null || options === void 0 ? void 0 : options.analyze) {
             process.env.BUNDLE_ANALYZE = "true";
           }
           resolvedConfig = api.useResolvedConfigContext();
@@ -78,7 +78,7 @@ export var build = function() {
           ];
         case 6:
           _state.sent();
-          logger.info("Create a production build...\n");
+          logger.info("Starting production build...");
           if (!appContext.builder) {
             throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
           }

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, appContext;
+    var 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 = appContext) === null || _appContext === void 0 ? void 0 : _appContext.builder.context.distPath, options.output),
+          outputPath: join(appContext === null || appContext === void 0 ? void 0 : appContext.builder.context.distPath, options.output),
           writeToDisk: true
         })
       ];

package/dist/esm/commands/serve.js

@@ -2,14 +2,14 @@ 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 _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { logger, chalk, isApiOnly, getTargetDir } from "@modern-js/utils";
+import { logger, isApiOnly, getTargetDir } from "@modern-js/utils";
 import server from "@modern-js/prod-server";
 import { printInstructions } from "../utils/printInstructions";
 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, _userConfig_output_distPath, appContext, userConfig, hookRunners, appDirectory, port, serverConfigFile, metaName, apiOnly, serverInternalPlugins, app;
+    var _userConfig_source, _userConfig_output_distPath, appContext, userConfig, hookRunners, appDirectory, port, serverConfigFile, metaName, apiOnly, serverInternalPlugins, app;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -17,10 +17,10 @@ export var start = function() {
           userConfig = api.useResolvedConfigContext();
           hookRunners = api.useHookRunners();
           appDirectory = appContext.appDirectory, port = appContext.port, serverConfigFile = appContext.serverConfigFile, metaName = appContext.metaName;
-          logger.log(chalk.cyan("Starting the modern server..."));
+          logger.info("Starting production server...");
           return [
             4,
-            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)
+            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)
           ];
         case 1:
           apiOnly = _state.sent();

package/dist/esm/index.js

@@ -273,7 +273,6 @@ 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: [
@@ -289,10 +288,10 @@ export var appTools = function() {
     registerHook: hooks,
     usePlugins: [
       initializePlugin({
-        bundler: ((_options = options) === null || _options === void 0 ? void 0 : _options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
+        bundler: (options === null || options === void 0 ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
       }),
       analyzePlugin({
-        bundler: ((_options1 = options) === null || _options1 === void 0 ? void 0 : _options1.bundler) === "experimental-rspack" ? "rspack" : "webpack"
+        bundler: (options === null || options === void 0 ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
       }),
       lintPlugin()
     ],

package/dist/esm/utils/config.js

@@ -4,7 +4,7 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import * as path from "path";
 import { bundle } from "@modern-js/node-bundle-require";
-import { CONFIG_FILE_EXTENSIONS, fs, getServerConfig, OUTPUT_CONFIG_FILE } from "@modern-js/utils";
+import { fs, getServerConfig, ensureAbsolutePath, OUTPUT_CONFIG_FILE, CONFIG_FILE_EXTENSIONS } from "@modern-js/utils";
 export var defineServerConfig = function(config) {
   return config;
 };
@@ -109,7 +109,7 @@ export var emitResolvedConfig = function() {
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          outputPath = path.join(appDirectory, ((_resolvedConfig_output_distPath = resolvedConfig.output.distPath) === null || _resolvedConfig_output_distPath === void 0 ? void 0 : _resolvedConfig_output_distPath.root) || "./dist", OUTPUT_CONFIG_FILE);
+          outputPath = ensureAbsolutePath(appDirectory, path.join(((_resolvedConfig_output_distPath = resolvedConfig.output.distPath) === null || _resolvedConfig_output_distPath === void 0 ? void 0 : _resolvedConfig_output_distPath.root) || "./dist", OUTPUT_CONFIG_FILE));
           return [
             4,
             fs.writeJSON(outputPath, resolvedConfig, {

package/dist/esm/utils/printInstructions.js

@@ -16,7 +16,7 @@ export var printInstructions = function() {
           ];
         case 1:
           instructions = _state.sent().instructions;
-          logger.info(instructions);
+          logger.log(instructions);
           return [
             2
           ];

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

@@ -50,13 +50,12 @@ ${initialize || ""}`);
 ${initialize || ""}`).join("\n");
 };
 export const generateCode = async (appContext, config, entrypoints, api) => {
-  var _config, _config1;
   const { internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName } = appContext;
   const hookRunners = api.useHookRunners();
   const isV5 = isRouterV5(config);
   const getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
   const importsStatemets = /* @__PURE__ */ new Map();
-  const oldVersion = typeof ((_config = config) === null || _config === void 0 ? void 0 : _config.runtime.router) === "object" ? Boolean(((_config1 = config) === null || _config1 === void 0 ? void 0 : _config1.runtime.router).oldVersion) : false;
+  const oldVersion = typeof (config === null || config === void 0 ? void 0 : config.runtime.router) === "object" ? Boolean((config === null || config === void 0 ? void 0 : config.runtime.router).oldVersion) : false;
   await Promise.all(entrypoints.map(generateEntryCode));
   return {
     importsStatemets
@@ -65,7 +64,7 @@ export const generateCode = async (appContext, config, entrypoints, api) => {
     const { entryName, isMainEntry, isAutoMount, fileSystemRoutes } = entrypoint;
     if (isAutoMount) {
       if (fileSystemRoutes) {
-        var _config_output, _config2;
+        var _config_output;
         let initialRoutes = [];
         let nestedRoutes = null;
         if (entrypoint.entry) {
@@ -119,7 +118,7 @@ export const generateCode = async (appContext, config, entrypoints, api) => {
             nestedRoutesEntry: entrypoint.nestedRoutesEntry,
             entryName: entrypoint.entryName,
             internalDirectory,
-            splitRouteChunks: (_config2 = config2) === null || _config2 === void 0 ? void 0 : (_config_output = _config2.output) === null || _config_output === void 0 ? void 0 : _config_output.splitRouteChunks
+            splitRouteChunks: config2 === null || config2 === void 0 ? void 0 : (_config_output = config2.output) === null || _config_output === void 0 ? void 0 : _config_output.splitRouteChunks
           })
         });
         if (entrypoint.nestedRoutesEntry && isUseSSRBundle(config2)) {

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

@@ -69,8 +69,7 @@ export const getFileSystemEntry = (appContext, config) => {
   const { source: { entriesDir, disableEntryDirs } } = config;
   let disabledDirs = [];
   if (disableEntryDirs && Array.isArray(disableEntryDirs)) {
-    var _disableEntryDirs;
-    disabledDirs = (_disableEntryDirs = disableEntryDirs) === null || _disableEntryDirs === void 0 ? void 0 : _disableEntryDirs.map((dir) => ensureAbsolutePath(appDirectory, dir));
+    disabledDirs = 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,18 +68,17 @@ const applyRouteOptions = (original, routeOptions) => {
   return routes;
 };
 const collectHtmlRoutes = (entrypoints, appContext, config) => {
-  var _deploy_worker, _deploy;
+  var _deploy_worker;
   const { source: { mainEntryName }, html: { disableHtmlFolder }, output: { distPath: { html: htmlPath } = {} }, server: { baseUrl, routes, ssr, ssrByEntries }, deploy } = config;
   const { packageName } = appContext;
-  const workerSSR = (_deploy = deploy) === null || _deploy === void 0 ? void 0 : (_deploy_worker = _deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr;
+  const workerSSR = 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" || Boolean(entryOptions.preload));
-    const { resHeaders } = ((_routes = routes) === null || _routes === void 0 ? void 0 : _routes[entryName]) || {};
+    const { resHeaders } = (routes === null || routes === void 0 ? void 0 : routes[entryName]) || {};
     let route = {
       urlPath: `/${isMainEntry ? "" : entryName}`,
       entryName,
@@ -91,7 +90,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 ((_routes1 = routes) === null || _routes1 === void 0 ? void 0 : _routes1.hasOwnProperty(entryName)) {
+    if (routes === null || routes === void 0 ? void 0 : routes.hasOwnProperty(entryName)) {
       const routeOptions = isPlainObject(routes[entryName]) ? routes[entryName] : {
         route: routes[entryName]
       };

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

@@ -70,7 +70,7 @@ export const optimizeRoute = (routeTree) => {
   }
 };
 export const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion) => {
-  var _routePath, _finalRoute_children;
+  var _finalRoute_children;
   if (!await fs.pathExists(dirname)) {
     return null;
   }
@@ -90,7 +90,7 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldV
   }
   routePath = replaceDynamicPath(routePath);
   const route = {
-    path: (_routePath = routePath) === null || _routePath === void 0 ? void 0 : _routePath.replace(/\$$/, "?"),
+    path: routePath === null || routePath === void 0 ? void 0 : routePath.replace(/\$$/, "?"),
     children: [],
     isRoot
   };

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

@@ -76,8 +76,8 @@ export const routesForServer = ({ routes }) => {
   const traverseRouteTree = (route) => {
     let children;
     if ("children" in route && route.children) {
-      var _route_children, _route;
-      children = (_route = route) === null || _route === void 0 ? void 0 : (_route_children = _route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
+      var _route_children;
+      children = route === null || route === void 0 ? void 0 : (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
     }
     let loader;
     if (route.type === "nested") {
@@ -145,8 +145,8 @@ export const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, ent
   const traverseRouteTree = (route) => {
     let children;
     if ("children" in route && route.children) {
-      var _route_children, _route;
-      children = (_route = route) === null || _route === void 0 ? void 0 : (_route_children = _route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
+      var _route_children;
+      children = route === null || route === void 0 ? void 0 : (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
     }
     let loading;
     let error;

package/dist/esm-node/builder/generator/createBuilderProviderConfig.js

@@ -1,9 +1,8 @@
 import { createUploadPattern } from "../builder-webpack/createCopyPattern";
 function modifyOutputConfig(config, appContext) {
-  var _copy;
   const defaultCopyPattern = createUploadPattern(appContext, config);
   const { copy } = config.output;
-  const copyOptions = Array.isArray(copy) ? copy : (_copy = copy) === null || _copy === void 0 ? void 0 : _copy.patterns;
+  const copyOptions = Array.isArray(copy) ? copy : copy === null || copy === void 0 ? void 0 : copy.patterns;
   const builderCopy = [
     ...copyOptions || [],
     defaultCopyPattern

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

@@ -5,7 +5,7 @@ export async function createBuilderGenerator(bundler) {
       const { createRspackBuilderForModern } = await import("./builder-rspack");
       const { getRspackVersion } = await import("@modern-js/builder-rspack-provider");
       const version = await getRspackVersion();
-      logger.info(`Using Rspack v${version} 🦀`);
+      logger.info(`Using Rspack v${version}`);
       return createRspackBuilderForModern;
     } catch (_) {
       throw new Error("Failed to use Rspack, please check if you have `@modern-js/builder-rspack-provider` installed");