@modern-js/app-tools 2.27.1-alpha.0 → 2.28.1-alpha.0

package/dist/cjs/initialize/index.js

@@ -11,81 +11,79 @@ Object.defineProperty(exports, "default", {
 const _utils = require("@modern-js/utils");
 const _schema = require("../schema");
 const _config = require("../config");
-const _default = ({ bundler }) => {
-  return {
-    name: "@modern-js/plugin-initialize",
-    post: [
-      "@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"
-    ],
-    setup(api) {
-      const config = () => {
-        const appContext = api.useAppContext();
+const _default = ({ bundler }) => ({
+  name: "@modern-js/plugin-initialize",
+  post: [
+    "@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"
+  ],
+  setup(api) {
+    const config = () => {
+      const appContext = api.useAppContext();
+      const userConfig = api.useConfigContext();
+      api.setAppContext({
+        ...appContext,
+        bundlerType: bundler
+      });
+      return (0, _config.checkIsLegacyConfig)(userConfig) ? (0, _config.createLegacyDefaultConfig)(appContext) : (0, _config.createDefaultConfig)(appContext, bundler);
+    };
+    const validateSchema = () => {
+      const userConfig = api.useConfigContext();
+      const schemas = (0, _config.checkIsLegacyConfig)(userConfig) ? _schema.legacySchema : _schema.schema;
+      return schemas.generate();
+    };
+    return {
+      config,
+      validateSchema,
+      async resolvedConfig({ resolved }) {
+        var _resolved_output_distPath;
+        let appContext = api.useAppContext();
         const userConfig = api.useConfigContext();
-        api.setAppContext({
+        const port = await getServerPort(resolved);
+        appContext = {
           ...appContext,
-          bundlerType: bundler
-        });
-        return (0, _config.checkIsLegacyConfig)(userConfig) ? (0, _config.createLegacyDefaultConfig)(appContext) : (0, _config.createDefaultConfig)(appContext, bundler);
-      };
-      const validateSchema = () => {
-        const userConfig = api.useConfigContext();
-        const schemas = (0, _config.checkIsLegacyConfig)(userConfig) ? _schema.legacySchema : _schema.schema;
-        return schemas.generate();
-      };
-      return {
-        config,
-        validateSchema,
-        async resolvedConfig({ resolved }) {
-          var _resolved_output_distPath;
-          let appContext = api.useAppContext();
-          const userConfig = api.useConfigContext();
-          const port = await getServerPort(resolved);
-          appContext = {
-            ...appContext,
-            port,
-            distDirectory: (0, _utils.ensureAbsolutePath)(appContext.distDirectory, ((_resolved_output_distPath = resolved.output.distPath) === null || _resolved_output_distPath === void 0 ? void 0 : _resolved_output_distPath.root) || "dist")
-          };
-          api.setAppContext(appContext);
-          const normalizedConfig = (0, _config.checkIsLegacyConfig)(resolved) ? (0, _config.transformNormalizedConfig)(resolved) : resolved;
-          resolved._raw = userConfig;
-          resolved.server = {
-            ...normalizedConfig.server || {},
-            port
-          };
-          var _normalizedConfig_autoLoadPlugins;
-          resolved.autoLoadPlugins = (_normalizedConfig_autoLoadPlugins = normalizedConfig.autoLoadPlugins) !== null && _normalizedConfig_autoLoadPlugins !== void 0 ? _normalizedConfig_autoLoadPlugins : false;
-          stabilizeConfig(resolved, normalizedConfig, [
-            "source",
-            "bff",
-            "dev",
-            "html",
-            "output",
-            "tools",
-            "testing",
-            "plugins",
-            "builderPlugins",
-            "runtime",
-            "runtimeByEntries",
-            "deploy",
-            "performance"
-          ]);
-          if (bundler === "webpack") {
-            resolved.security = normalizedConfig.security || {};
-            resolved.experiments = normalizedConfig.experiments;
-          }
-          return {
-            resolved
-          };
+          port,
+          distDirectory: (0, _utils.ensureAbsolutePath)(appContext.distDirectory, ((_resolved_output_distPath = resolved.output.distPath) === null || _resolved_output_distPath === void 0 ? void 0 : _resolved_output_distPath.root) || "dist")
+        };
+        api.setAppContext(appContext);
+        const normalizedConfig = (0, _config.checkIsLegacyConfig)(resolved) ? (0, _config.transformNormalizedConfig)(resolved) : resolved;
+        resolved._raw = userConfig;
+        resolved.server = {
+          ...normalizedConfig.server || {},
+          port
+        };
+        var _normalizedConfig_autoLoadPlugins;
+        resolved.autoLoadPlugins = (_normalizedConfig_autoLoadPlugins = normalizedConfig.autoLoadPlugins) !== null && _normalizedConfig_autoLoadPlugins !== void 0 ? _normalizedConfig_autoLoadPlugins : false;
+        stabilizeConfig(resolved, normalizedConfig, [
+          "source",
+          "bff",
+          "dev",
+          "html",
+          "output",
+          "tools",
+          "testing",
+          "plugins",
+          "builderPlugins",
+          "runtime",
+          "runtimeByEntries",
+          "deploy",
+          "performance"
+        ]);
+        if (bundler === "webpack") {
+          resolved.security = normalizedConfig.security || {};
+          resolved.experiments = normalizedConfig.experiments;
         }
-      };
-    }
-  };
-};
+        return {
+          resolved
+        };
+      }
+    };
+  }
+});
 function stabilizeConfig(resolve, config, keys) {
   keys.forEach((key) => {
     resolve[key] = config[key] || {};

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 internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, isV5, getRoutes, importsStatemets;
+    var _config, _config_runtime_router, _config_runtime, _config1, 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, initialRoutes, nestedRoute, routes, _$config, ssr, useSSG, mode, hasPageRoute, code, _, _tmp, routesServerFile, code1, serverLoaderCombined, serverLoaderFile, imports, entryFile;
+        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;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
@@ -116,7 +116,7 @@ export var generateCode = function() {
                   11
                 ];
               initialRoutes = [];
-              nestedRoute = null;
+              nestedRoutes = null;
               if (entrypoint.entry) {
                 initialRoutes = getRoutes({
                   entrypoint: entrypoint,
@@ -136,12 +136,36 @@ export var generateCode = function() {
                 walk(entrypoint.nestedRoutesEntry, entrypoint.nestedRoutesEntry, {
                   name: internalSrcAlias,
                   basename: srcDirectory
-                }, entrypoint.entryName, entrypoint.isMainEntry)
+                }, entrypoint.entryName, entrypoint.isMainEntry, oldVersion)
               ];
             case 1:
-              nestedRoute = _state.sent();
-              if (nestedRoute) {
-                initialRoutes.unshift(nestedRoute);
+              nestedRoutes = _state.sent();
+              if (nestedRoutes) {
+                if (!Array.isArray(nestedRoutes)) {
+                  nestedRoutes = [
+                    nestedRoutes
+                  ];
+                }
+                _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+                try {
+                  for (_iterator = nestedRoutes[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+                    route = _step.value;
+                    initialRoutes.unshift(route);
+                  }
+                } catch (err) {
+                  _didIteratorError = true;
+                  _iteratorError = err;
+                } finally {
+                  try {
+                    if (!_iteratorNormalCompletion && _iterator.return != null) {
+                      _iterator.return();
+                    }
+                  } finally {
+                    if (_didIteratorError) {
+                      throw _iteratorError;
+                    }
+                  }
+                }
               }
               _state.label = 2;
             case 2:
@@ -161,8 +185,8 @@ export var generateCode = function() {
                 mode = typeof ssr === "object" ? ssr.mode || "string" : "string";
               }
               if (mode === "stream") {
-                hasPageRoute = routes.some(function(route) {
-                  return "type" in route && route.type === "page";
+                hasPageRoute = routes.some(function(route2) {
+                  return "type" in route2 && route2.type === "page";
                 });
                 if (hasPageRoute) {
                   logger.error("Streaming ssr is not supported when pages dir exists");
@@ -181,7 +205,7 @@ export var generateCode = function() {
                   nestedRoutesEntry: entrypoint.nestedRoutesEntry,
                   entryName: entrypoint.entryName,
                   internalDirectory: internalDirectory,
-                  splitRouteChunks: _$config === null || _$config === void 0 ? void 0 : (_config_output = _$config.output) === null || _config_output === void 0 ? void 0 : _config_output.splitRouteChunks
+                  splitRouteChunks: (_config2 = _$config) === null || _config2 === void 0 ? void 0 : (_config_output = _config2.output) === null || _config_output === void 0 ? void 0 : _config_output.splitRouteChunks
                 })
               ];
             case 4:
@@ -270,6 +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 : (_config_runtime = _config1.runtime) === null || _config_runtime === void 0 ? void 0 : (_config_runtime_router = _config_runtime.router) === null || _config_runtime_router === void 0 ? void 0 : _config_runtime_router.oldVersion) : false;
           return [
             4,
             Promise.all(entrypoints.map(generateEntryCode))

package/dist/esm/analyze/getFileSystemEntry.js

@@ -87,7 +87,8 @@ 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)) {
-    disabledDirs = disableEntryDirs === null || disableEntryDirs === void 0 ? void 0 : disableEntryDirs.map(function(dir) {
+    var _disableEntryDirs;
+    disabledDirs = (_disableEntryDirs = disableEntryDirs) === null || _disableEntryDirs === void 0 ? void 0 : _disableEntryDirs.map(function(dir) {
       return ensureAbsolutePath(appDirectory, dir);
     });
   }

package/dist/esm/analyze/getServerRoutes.js

@@ -69,18 +69,19 @@ var applyRouteOptions = function(original, routeOptions) {
   return routes;
 };
 var collectHtmlRoutes = function(entrypoints, appContext, config) {
-  var _deploy_worker;
+  var _deploy_worker, _deploy;
   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 === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr;
+  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 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";
-    var resHeaders = ((routes === null || routes === void 0 ? void 0 : routes[entryName]) || {}).resHeaders;
+    var resHeaders = (((_routes = routes) === null || _routes === void 0 ? void 0 : _routes[entryName]) || {}).resHeaders;
     var route = {
       urlPath: "/".concat(isMainEntry ? "" : entryName),
       entryName: entryName,
@@ -92,7 +93,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 (routes === null || routes === void 0 ? void 0 : routes.hasOwnProperty(entryName)) {
+    if ((_routes1 = routes) === null || _routes1 === void 0 ? void 0 : _routes1.hasOwnProperty(entryName)) {
       var routeOptions = isPlainObject(routes[entryName]) ? routes[entryName] : {
         route: routes[entryName]
       };

package/dist/esm/analyze/nestedRoutes.js

@@ -38,9 +38,37 @@ var createRoute = function(routeInfo, rootDir, filename, entryName, isMainEntry)
     type: "nested"
   });
 };
+export var optimizeRoute = function(routeTree) {
+  if (!routeTree.children || routeTree.children.length === 0) {
+    return [
+      routeTree
+    ];
+  }
+  var children = routeTree.children;
+  if (!routeTree._component) {
+    var newRoutes = children.map(function(child) {
+      var _routeTree_path;
+      var routePath = "".concat((_routeTree_path = routeTree.path) !== null && _routeTree_path !== void 0 ? _routeTree_path : "").concat(child.path ? "/".concat(child.path) : "");
+      return _object_spread_props(_object_spread({}, child), {
+        path: routePath
+      });
+    });
+    if (newRoutes.length > 1) {
+      return newRoutes.flatMap(function(newRoute) {
+        return optimizeRoute(newRoute);
+      });
+    }
+    return newRoutes;
+  } else {
+    routeTree.children = children.flatMap(optimizeRoute);
+    return [
+      routeTree
+    ];
+  }
+};
 export var walk = function() {
-  var _ref = _async_to_generator(function(dirname, rootDir, alias, entryName, isMainEntry) {
-    var _route_children, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, splatLoaderFile, splatRoute, pageConfigFile, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory1, childRoute, _route_children1, _route_children2, _route_children3, err, finalRoute, childRoute1, _$path;
+  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, splatRoute, pageConfigFile, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory1, childRoute, _route_children, _route_children1, _route_children2, err, finalRoute, childRoutes, childRoute1, _$path, _childRoutes, slatRouteIndex, _childRoutes1, _childRoutes2, optimizedRoutes;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -79,7 +107,7 @@ export var walk = function() {
           }
           routePath = replaceDynamicPath(routePath);
           route = {
-            path: routePath === null || routePath === void 0 ? void 0 : routePath.replace(/\$$/, "?"),
+            path: (_routePath = routePath) === null || _routePath === void 0 ? void 0 : _routePath.replace(/\$$/, "?"),
             children: [],
             isRoot: isRoot
           };
@@ -128,13 +156,13 @@ export var walk = function() {
             ];
           return [
             4,
-            walk(itemPath, rootDir, alias, entryName, isMainEntry)
+            walk(itemPath, rootDir, alias, entryName, isMainEntry, oldVersion)
           ];
         case 7:
           childRoute = _state.sent();
-          if (childRoute) {
+          if (childRoute && !Array.isArray(childRoute)) {
             ;
-            (_route_children1 = route.children) === null || _route_children1 === void 0 ? void 0 : _route_children1.push(childRoute);
+            (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.push(childRoute);
           }
           _state.label = 8;
         case 8:
@@ -174,7 +202,7 @@ export var walk = function() {
             if (pageConfigFile) {
               pageRoute.config = pageConfigFile;
             }
-            (_route_children2 = route.children) === null || _route_children2 === void 0 ? void 0 : _route_children2.push(pageRoute);
+            (_route_children1 = route.children) === null || _route_children1 === void 0 ? void 0 : _route_children1.push(pageRoute);
           }
           if (itemWithoutExt === NESTED_ROUTE.SPLATE_LOADER_FILE) {
             splatLoaderFile = itemPath;
@@ -188,7 +216,7 @@ export var walk = function() {
             if (splatLoaderFile) {
               splatRoute.loader = splatLoaderFile;
             }
-            (_route_children3 = route.children) === null || _route_children3 === void 0 ? void 0 : _route_children3.push(splatRoute);
+            (_route_children2 = route.children) === null || _route_children2 === void 0 ? void 0 : _route_children2.push(splatRoute);
           }
           if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {
             route.loading = replaceWithAlias(alias.basename, itemPath, alias.name);
@@ -234,17 +262,17 @@ export var walk = function() {
           if (isPathlessLayout) {
             delete finalRoute.path;
           }
-          route.children = (_route_children = route.children) === null || _route_children === void 0 ? void 0 : _route_children.filter(function(childRoute2) {
+          childRoutes = finalRoute.children = (_finalRoute_children = finalRoute.children) === null || _finalRoute_children === void 0 ? void 0 : _finalRoute_children.filter(function(childRoute2) {
             return childRoute2;
           });
-          if (route.children && route.children.length === 0 && !route.index) {
+          if (childRoutes && childRoutes.length === 0 && !finalRoute.index) {
             return [
               2,
               null
             ];
           }
-          if (finalRoute.children && finalRoute.children.length === 1 && !finalRoute._component) {
-            childRoute1 = finalRoute.children[0];
+          if (childRoutes && childRoutes.length === 1 && !finalRoute._component) {
+            childRoute1 = childRoutes[0];
             if (childRoute1.path === "*") {
               _$path = "".concat(finalRoute.path || "", "/").concat(childRoute1.path || "");
               finalRoute = _object_spread_props(_object_spread({}, childRoute1), {
@@ -252,6 +280,24 @@ export var walk = function() {
               });
             }
           }
+          if (splatRoute) {
+            ;
+            slatRouteIndex = (_childRoutes = childRoutes) === null || _childRoutes === void 0 ? void 0 : _childRoutes.findIndex(function(childRoute2) {
+              return childRoute2 === splatRoute;
+            });
+            if (typeof slatRouteIndex === "number" && slatRouteIndex !== -1) {
+              ;
+              (_childRoutes1 = childRoutes) === null || _childRoutes1 === void 0 ? void 0 : _childRoutes1.splice(slatRouteIndex, 1);
+              (_childRoutes2 = childRoutes) === null || _childRoutes2 === void 0 ? void 0 : _childRoutes2.push(splatRoute);
+            }
+          }
+          if (isRoot && !oldVersion) {
+            optimizedRoutes = optimizeRoute(finalRoute);
+            return [
+              2,
+              optimizedRoutes
+            ];
+          }
           return [
             2,
             finalRoute
@@ -259,7 +305,7 @@ export var walk = function() {
       }
     });
   });
-  return function walk2(dirname, rootDir, alias, entryName, isMainEntry) {
+  return function walk2(dirname, rootDir, alias, entryName, isMainEntry, oldVersion) {
     return _ref.apply(this, arguments);
   };
 }();

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;
-      children = route2 === null || route2 === void 0 ? void 0 : (_route_children = route2.children) === null || _route_children === void 0 ? void 0 : _route_children.map(traverseRouteTree);
+      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 loader;
     if (route2.type === "nested") {
@@ -111,8 +111,8 @@ export var fileSystemRoutes = function() {
           traverseRouteTree = function(route2) {
             var children;
             if ("children" in route2 && route2.children) {
-              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 _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 loading;
             var error;

package/dist/esm/builder/builder-rspack/adapterCopy.js

@@ -13,7 +13,7 @@ export var builderPluginAdpaterCopy = function(options) {
     setup: function setup(api) {
       var publicPath;
       api.modifyRspackConfig(function(config) {
-        var _config_builtins, _config_builtins_copy, _config_output;
+        var _config_builtins_copy, _config_builtins, _config_output;
         config.builtins = _object_spread_props(_object_spread({}, config.builtins || {}), {
           copy: {
             patterns: _to_consumable_array(((_config_builtins = config.builtins) === null || _config_builtins === void 0 ? void 0 : (_config_builtins_copy = _config_builtins.copy) === null || _config_builtins_copy === void 0 ? void 0 : _config_builtins_copy.patterns) || []).concat(_to_consumable_array(createConfigBuiltinCopy(options)))

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

@@ -3,9 +3,10 @@ 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 === null || copy === void 0 ? void 0 : copy.patterns;
+  var copyOptions = Array.isArray(copy) ? copy : (_copy = copy) === null || _copy === void 0 ? void 0 : _copy.patterns;
   var builderCopy = _to_consumable_array(copyOptions || []).concat([
     defaultCopyPattern
   ]);

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,41 +119,36 @@ 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);
-  var minimize = !normalizedConfig.output.disableMinimize && process.env.NODE_ENV === "production";
   if (existNestedRoutes || routerManifest || workerSSR) {
-    chain.plugin("route-plugin").use(RouterPlugin, [
-      {
-        minimize: minimize
-      }
-    ]);
+    chain.plugin("route-plugin").use(RouterPlugin);
   }
 }
 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]) {
@@ -160,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);
     }
   });