@modern-js/app-tools 2.0.0-beta.2 → 2.0.0-beta.3

package/dist/js/node/builder/loaders/routerLoader.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+function loader(source) {
+  // eslint-disable-next-line @babel/no-invalid-this
+  this.cacheable();
+  // eslint-disable-next-line @babel/no-invalid-this
+  const {
+    target
+  } = this._compiler.options;
+  if (target === 'node' || Array.isArray(target) && target.includes('node')) {
+    return source;
+  }
+  // eslint-disable-next-line @babel/no-invalid-this
+  const {
+    resourcePath
+  } = this;
+  const code = `
+    export { default } from "${resourcePath}";
+  `;
+  return code;
+}
+var _default = loader;
+exports.default = _default;

package/dist/js/node/builder/loaders/serverModuleLoader.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+function loader() {
+  return `module.exports = {}`;
+}
+var _default = loader;
+exports.default = _default;

package/dist/js/node/commands/dev.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.dev = void 0;
-var _utils = require("@modern-js/utils");
 var _core = require("@modern-js/core");
 var _createFileWatcher = require("../utils/createFileWatcher");
 var _printInstructions = require("../utils/printInstructions");
@@ -53,43 +52,40 @@ const dev = async (api, options) => {
     }
   });
   await hookRunners.beforeDev();
-  let compiler = null;
+  let compiler;
+  if (!appContext.builder && !apiOnly) {
+    throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
+  }
   if (!apiOnly) {
-    if (!appContext.builder) {
-      throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
-    }
     compiler = await appContext.builder.createCompiler();
   }
   await (0, _routes.generateRoutes)(appContext);
-  const app = await (0, _createServer.createServer)({
-    dev: _objectSpread(_objectSpread({}, {
-      client: {
-        port: port.toString()
-      },
-      devMiddleware: {
-        writeToDisk: file => !file.includes('.hot-update.')
-      },
-      hot: true,
-      liveReload: true,
+  const serverOptions = {
+    dev: _objectSpread({
       port,
       https: normalizedConfig.dev.https
-    }), (_normalizedConfig$too = normalizedConfig.tools) === null || _normalizedConfig$too === void 0 ? void 0 : _normalizedConfig$too.devServer),
-    compiler,
+    }, (_normalizedConfig$too = normalizedConfig.tools) === null || _normalizedConfig$too === void 0 ? void 0 : _normalizedConfig$too.devServer),
+    compiler: compiler || null,
     pwd: appDirectory,
     config: normalizedConfig,
     serverConfigFile,
     internalPlugins: (0, _createServer.injectDataLoaderPlugin)(serverInternalPlugins)
-  });
-  app.listen(port, async err => {
-    if (err) {
-      throw err;
-    }
-    if (!apiOnly) {
-      _utils.logger.info(`Starting dev server...\n`);
-    } else {
+  };
+  if (apiOnly) {
+    const app = await (0, _createServer.createServer)(serverOptions);
+    app.listen(port, async err => {
+      if (err) {
+        throw err;
+      }
       (0, _printInstructions.printInstructions)(hookRunners, appContext, normalizedConfig);
-    }
-  });
+    });
+  } else {
+    await appContext.builder.startDevServer({
+      compiler,
+      printURLs: false,
+      serverOptions
+    });
+  }
   await (0, _createFileWatcher.createFileWatcher)(appContext, normalizedConfig.source.configDir, hookRunners);
 };
 exports.dev = dev;

package/dist/js/node/commands/start.js

@@ -23,7 +23,6 @@ const start = async api => {
   const apiOnly = await (0, _utils.isApiOnly)(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$source = userConfig.source) === null || _userConfig$source === void 0 ? void 0 : _userConfig$source.entriesDir);
   const app = await (0, _prodServer.default)({
     pwd: appDirectory,
-    // FIXME: remove the `any` type
     config: userConfig,
     serverConfigFile,
     internalPlugins: (0, _createServer.injectDataLoaderPlugin)(appContext.serverInternalPlugins),

package/dist/js/node/config/default.js

@@ -43,7 +43,6 @@ function createDefaultConfig(appContext) {
     disableFilenameHash: false,
     enableLatestDecorators: false,
     polyfill: 'entry',
-    dataUriLimit: 10000,
     cssModuleLocalIdentName: undefined
   };
   const html = {

package/dist/js/node/config/initial/createOutputConfig.js

@@ -68,6 +68,9 @@ function createOutputConfig(config) {
       css: cssModuleLocalIdentName
     },
     ssg,
+    // set `true`, only in legacy config
+    enableAssetFallback: true,
+    enableAssetManifest: true,
     enableModernMode,
     disableNodePolyfill
   };

package/dist/js/node/utils/createFileWatcher.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createFileWatcher = void 0;
+exports.createFileWatcher = exports.addServerConfigToDeps = void 0;
 var _crypto = _interopRequireDefault(require("crypto"));
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
@@ -26,6 +26,7 @@ const addServerConfigToDeps = async (dependencies, appDirectory, serverConfigFil
     dependencies.push(serverConfig);
   }
 };
+exports.addServerConfigToDeps = addServerConfigToDeps;
 const debug = (0, _utils.createDebugger)('watch-files');
 const md5 = data => _crypto.default.createHash('md5').update(data).digest('hex');
 const hashMap = new Map();

package/dist/js/node/utils/restart.js

@@ -11,7 +11,7 @@ async function restart(hooksRunner) {
   let hasGetError = false;
   await hooksRunner.beforeRestart();
   try {
-    await _core.cli.init(_core.cli.initOptions);
+    await _core.cli.init(_core.cli.getPrevInitOptions());
   } catch (err) {
     console.error(err);
     hasGetError = true;

package/dist/js/treeshaking/analyze/constants.js

@@ -4,6 +4,8 @@ export var APP_FILE_NAME = 'App';
 export var PAGES_DIR_NAME = 'pages';
 export var NESTED_ROUTES_DIR = 'routes';
 export var FILE_SYSTEM_ROUTES_FILE_NAME = 'routes.js';
+export var LOADER_EXPORT_NAME = 'loader';
+export var TEMP_LOADERS_DIR = '__loaders__';
 export var ENTRY_POINT_FILE_NAME = 'index.js';
 export var ENTRY_BOOTSTRAP_FILE_NAME = 'bootstrap.js';
 export var FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP = /^\[(\S+)\]([*+?]?)$/;

package/dist/js/treeshaking/analyze/generateCode.js

@@ -4,15 +4,20 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import path from 'path';
-import { fs, logger } from '@modern-js/utils';
+import { fs, LOADER_ROUTES_DIR, logger } from '@modern-js/utils';
 import { useResolvedConfigContext } from '@modern-js/core';
 import esbuild from 'esbuild';
 import { getCommand } from "../utils/commands";
 import * as templates from "./templates";
 import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
-import { FILE_SYSTEM_ROUTES_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME } from "./constants";
+import { FILE_SYSTEM_ROUTES_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME, TEMP_LOADERS_DIR } from "./constants";
 import { getDefaultImports } from "./utils";
 import { walk } from "./nestedRoutes";
+var loader = {
+  '.js': 'jsx',
+  '.ts': 'tsx'
+};
+var EXTERNAL_REGEXP = /^[^./]|^\.[^./]|^\.\.[^/]/;
 var createImportSpecifier = function createImportSpecifier(specifiers) {
   var defaults = '';
   var named = [];
@@ -91,21 +96,16 @@ export var createImportStatements = function createImportStatements(statements)
 };
 var buildLoader = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(entry, outfile) {
-    var loader, EXTERNAL_REGEXP, command;
+    var command;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            loader = {
-              '.js': 'jsx',
-              '.ts': 'tsx'
-            };
-            EXTERNAL_REGEXP = /^[^./]|^\.[^./]|^\.\.[^/]/;
             command = getCommand();
-            _context.next = 5;
+            _context.next = 3;
             return esbuild.build({
-              format: 'cjs',
-              platform: 'node',
+              format: 'esm',
+              platform: 'browser',
               target: 'esnext',
               loader: loader,
               watch: command === 'dev' && {},
@@ -133,7 +133,7 @@ var buildLoader = /*#__PURE__*/function () {
                 }
               }]
             });
-          case 5:
+          case 3:
           case "end":
             return _context.stop();
         }
@@ -144,28 +144,59 @@ var buildLoader = /*#__PURE__*/function () {
     return _ref2.apply(this, arguments);
   };
 }();
+var buildServerLoader = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(entry, outfile) {
+    var command;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            command = getCommand();
+            _context2.next = 3;
+            return esbuild.build({
+              format: 'cjs',
+              platform: 'node',
+              target: 'esnext',
+              loader: loader,
+              watch: command === 'dev' && {},
+              bundle: true,
+              logLevel: 'error',
+              entryPoints: [entry],
+              outfile: outfile
+            });
+          case 3:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return function buildServerLoader(_x3, _x4) {
+    return _ref3.apply(this, arguments);
+  };
+}();
 export var generateCode = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(appContext, config, entrypoints, api) {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(appContext, config, entrypoints, api) {
     var _config$runtime, _config$runtime$route;
     var internalDirectory, distDirectory, srcDirectory, internalDirAlias, internalSrcAlias, hookRunners, islegacy, mountId, getRoutes, generateEntryCode, _generateEntryCode;
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
       while (1) {
-        switch (_context3.prev = _context3.next) {
+        switch (_context4.prev = _context4.next) {
           case 0:
             _generateEntryCode = function _generateEntryCode3() {
-              _generateEntryCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(entrypoint) {
-                var entryName, isAutoMount, customBootstrap, fileSystemRoutes, initialRoutes, nestedRoute, _yield$hookRunners$mo, routes, _config, ssr, mode, hasPageRoute, _yield$hookRunners$be, _code, routesServerFile, outputRoutesServerFile, _code2, _yield$hookRunners$mo2, importStatements, _yield$hookRunners$mo3, plugins, _yield$hookRunners$mo4, renderFunction, _yield$hookRunners$mo5, exportStatement, code, entryFile, _yield$hookRunners$mo6, asyncEntryCode, bootstrapFile;
-                return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+              _generateEntryCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(entrypoint) {
+                var entryName, isAutoMount, customBootstrap, fileSystemRoutes, initialRoutes, nestedRoute, _yield$hookRunners$mo, routes, _config, ssr, mode, hasPageRoute, _yield$hookRunners$be, _code, routesServerFile, outputRoutesServerFile, _code2, loaderEntryFile, loaderIndexFile, _yield$hookRunners$mo2, importStatements, _yield$hookRunners$mo3, plugins, _yield$hookRunners$mo4, renderFunction, _yield$hookRunners$mo5, exportStatement, code, entryFile, _yield$hookRunners$mo6, asyncEntryCode, bootstrapFile;
+                return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                   while (1) {
-                    switch (_context2.prev = _context2.next) {
+                    switch (_context3.prev = _context3.next) {
                       case 0:
                         entryName = entrypoint.entryName, isAutoMount = entrypoint.isAutoMount, customBootstrap = entrypoint.customBootstrap, fileSystemRoutes = entrypoint.fileSystemRoutes;
                         if (!isAutoMount) {
-                          _context2.next = 69;
+                          _context3.next = 85;
                           break;
                         }
                         if (!fileSystemRoutes) {
-                          _context2.next = 39;
+                          _context3.next = 55;
                           break;
                         }
                         initialRoutes = [];
@@ -180,37 +211,37 @@ export var generateCode = /*#__PURE__*/function () {
                           });
                         }
                         if (!entrypoint.nestedRoutesEntry) {
-                          _context2.next = 16;
+                          _context3.next = 16;
                           break;
                         }
                         if (islegacy) {
-                          _context2.next = 14;
+                          _context3.next = 14;
                           break;
                         }
-                        _context2.next = 10;
+                        _context3.next = 10;
                         return walk(entrypoint.nestedRoutesEntry, entrypoint.nestedRoutesEntry, {
                           name: internalSrcAlias,
                           basename: srcDirectory
                         }, entrypoint.entryName);
                       case 10:
-                        nestedRoute = _context2.sent;
+                        nestedRoute = _context3.sent;
                         if (nestedRoute) {
                           initialRoutes.unshift(nestedRoute);
                         }
-                        _context2.next = 16;
+                        _context3.next = 16;
                         break;
                       case 14:
                         logger.error('Nested routes is not supported in legacy mode.');
                         // eslint-disable-next-line no-process-exit
                         process.exit(1);
                       case 16:
-                        _context2.next = 18;
+                        _context3.next = 18;
                         return hookRunners.modifyFileSystemRoutes({
                           entrypoint: entrypoint,
                           routes: initialRoutes
                         });
                       case 18:
-                        _yield$hookRunners$mo = _context2.sent;
+                        _yield$hookRunners$mo = _context3.sent;
                         routes = _yield$hookRunners$mo.routes;
                         _config = useResolvedConfigContext();
                         ssr = _config === null || _config === void 0 ? void 0 : _config.server.ssr;
@@ -229,44 +260,69 @@ export var generateCode = /*#__PURE__*/function () {
                             process.exit(1);
                           }
                         }
-                        _context2.next = 26;
-                        return hookRunners.beforeGenerateRoutes({
-                          entrypoint: entrypoint,
-                          code: templates.fileSystemRoutes({
-                            routes: routes,
-                            ssrMode: mode,
-                            nestedRoutesEntry: entrypoint.nestedRoutesEntry,
-                            entryName: entrypoint.entryName
-                          })
+                        _context3.t0 = hookRunners;
+                        _context3.t1 = entrypoint;
+                        _context3.next = 28;
+                        return templates.fileSystemRoutes({
+                          routes: routes,
+                          ssrMode: mode,
+                          nestedRoutesEntry: entrypoint.nestedRoutesEntry,
+                          entryName: entrypoint.entryName,
+                          internalDirectory: internalDirectory
                         });
-                      case 26:
-                        _yield$hookRunners$be = _context2.sent;
+                      case 28:
+                        _context3.t2 = _context3.sent;
+                        _context3.t3 = {
+                          entrypoint: _context3.t1,
+                          code: _context3.t2
+                        };
+                        _context3.next = 32;
+                        return _context3.t0.beforeGenerateRoutes.call(_context3.t0, _context3.t3);
+                      case 32:
+                        _yield$hookRunners$be = _context3.sent;
                         _code = _yield$hookRunners$be.code;
                         if (!entrypoint.nestedRoutesEntry) {
-                          _context2.next = 38;
+                          _context3.next = 54;
                           break;
                         }
-                        routesServerFile = path.join(internalDirectory, entryName, 'routes.server.js');
-                        outputRoutesServerFile = path.join(distDirectory, 'loader-routes', entryName, 'index.js');
+                        routesServerFile = path.join(internalDirectory, entryName, 'route-server-loaders.js');
+                        outputRoutesServerFile = path.join(distDirectory, LOADER_ROUTES_DIR, entryName, 'index.js');
                         _code2 = templates.routesForServer({
                           routes: routes,
-                          alias: {
-                            name: internalSrcAlias,
-                            basename: srcDirectory
-                          }
+                          internalDirectory: internalDirectory,
+                          entryName: entryName
                         });
-                        _context2.next = 34;
+                        _context3.next = 40;
                         return fs.ensureFile(routesServerFile);
-                      case 34:
-                        _context2.next = 36;
+                      case 40:
+                        _context3.next = 42;
                         return fs.writeFile(routesServerFile, _code2);
-                      case 36:
-                        _context2.next = 38;
-                        return buildLoader(routesServerFile, outputRoutesServerFile);
-                      case 38:
+                      case 42:
+                        loaderEntryFile = path.join(internalDirectory, entryName, TEMP_LOADERS_DIR, 'entry.js');
+                        loaderIndexFile = path.join(internalDirectory, entryName, TEMP_LOADERS_DIR, 'index.js');
+                        _context3.next = 46;
+                        return fs.pathExists(loaderEntryFile);
+                      case 46:
+                        if (!_context3.sent) {
+                          _context3.next = 49;
+                          break;
+                        }
+                        _context3.next = 49;
+                        return buildLoader(loaderEntryFile, loaderIndexFile);
+                      case 49:
+                        _context3.next = 51;
+                        return fs.pathExists(routesServerFile);
+                      case 51:
+                        if (!_context3.sent) {
+                          _context3.next = 54;
+                          break;
+                        }
+                        _context3.next = 54;
+                        return buildServerLoader(routesServerFile, outputRoutesServerFile);
+                      case 54:
                         fs.outputFileSync(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_FILE_NAME)), _code, 'utf8');
-                      case 39:
-                        _context2.next = 41;
+                      case 55:
+                        _context3.next = 57;
                         return hookRunners.modifyEntryImports({
                           entrypoint: entrypoint,
                           imports: getDefaultImports({
@@ -277,18 +333,18 @@ export var generateCode = /*#__PURE__*/function () {
                             internalDirectory: internalDirectory
                           })
                         });
-                      case 41:
-                        _yield$hookRunners$mo2 = _context2.sent;
+                      case 57:
+                        _yield$hookRunners$mo2 = _context3.sent;
                         importStatements = _yield$hookRunners$mo2.imports;
-                        _context2.next = 45;
+                        _context3.next = 61;
                         return hookRunners.modifyEntryRuntimePlugins({
                           entrypoint: entrypoint,
                           plugins: []
                         });
-                      case 45:
-                        _yield$hookRunners$mo3 = _context2.sent;
+                      case 61:
+                        _yield$hookRunners$mo3 = _context3.sent;
                         plugins = _yield$hookRunners$mo3.plugins;
-                        _context2.next = 49;
+                        _context3.next = 65;
                         return hookRunners.modifyEntryRenderFunction({
                           entrypoint: entrypoint,
                           code: templates.renderFunction({
@@ -297,16 +353,16 @@ export var generateCode = /*#__PURE__*/function () {
                             fileSystemRoutes: fileSystemRoutes
                           })
                         });
-                      case 49:
-                        _yield$hookRunners$mo4 = _context2.sent;
+                      case 65:
+                        _yield$hookRunners$mo4 = _context3.sent;
                         renderFunction = _yield$hookRunners$mo4.code;
-                        _context2.next = 53;
+                        _context3.next = 69;
                         return hookRunners.modifyEntryExport({
                           entrypoint: entrypoint,
                           exportStatement: 'export default AppWrapper;'
                         });
-                      case 53:
-                        _yield$hookRunners$mo5 = _context2.sent;
+                      case 69:
+                        _yield$hookRunners$mo5 = _context3.sent;
                         exportStatement = _yield$hookRunners$mo5.exportStatement;
                         code = templates.index({
                           mountId: mountId,
@@ -319,34 +375,34 @@ export var generateCode = /*#__PURE__*/function () {
 
                         // generate entry file.
                         if (!config.source.enableAsyncEntry) {
-                          _context2.next = 68;
+                          _context3.next = 84;
                           break;
                         }
-                        _context2.next = 61;
+                        _context3.next = 77;
                         return hookRunners.modifyAsyncEntry({
                           entrypoint: entrypoint,
                           code: "import('./".concat(ENTRY_BOOTSTRAP_FILE_NAME, "');")
                         });
-                      case 61:
-                        _yield$hookRunners$mo6 = _context2.sent;
+                      case 77:
+                        _yield$hookRunners$mo6 = _context3.sent;
                         asyncEntryCode = _yield$hookRunners$mo6.code;
                         fs.outputFileSync(entryFile, asyncEntryCode, 'utf8');
                         bootstrapFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_BOOTSTRAP_FILE_NAME));
                         fs.outputFileSync(bootstrapFile, code, 'utf8');
-                        _context2.next = 69;
+                        _context3.next = 85;
                         break;
-                      case 68:
+                      case 84:
                         fs.outputFileSync(entryFile, code, 'utf8');
-                      case 69:
+                      case 85:
                       case "end":
-                        return _context2.stop();
+                        return _context3.stop();
                     }
                   }
-                }, _callee2);
+                }, _callee3);
               }));
               return _generateEntryCode.apply(this, arguments);
             };
-            generateEntryCode = function _generateEntryCode2(_x7) {
+            generateEntryCode = function _generateEntryCode2(_x9) {
               return _generateEntryCode.apply(this, arguments);
             };
             internalDirectory = appContext.internalDirectory, distDirectory = appContext.distDirectory, srcDirectory = appContext.srcDirectory, internalDirAlias = appContext.internalDirAlias, internalSrcAlias = appContext.internalSrcAlias;
@@ -354,16 +410,16 @@ export var generateCode = /*#__PURE__*/function () {
             islegacy = Boolean(config === null || config === void 0 ? void 0 : (_config$runtime = config.runtime) === null || _config$runtime === void 0 ? void 0 : (_config$runtime$route = _config$runtime.router) === null || _config$runtime$route === void 0 ? void 0 : _config$runtime$route.legacy);
             mountId = config.html.mountId;
             getRoutes = islegacy ? getClientRoutesLegacy : getClientRoutes;
-            _context3.next = 9;
+            _context4.next = 9;
             return Promise.all(entrypoints.map(generateEntryCode));
           case 9:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
       }
-    }, _callee3);
+    }, _callee4);
   }));
-  return function generateCode(_x3, _x4, _x5, _x6) {
-    return _ref3.apply(this, arguments);
+  return function generateCode(_x5, _x6, _x7, _x8) {
+    return _ref4.apply(this, arguments);
   };
 }();

package/dist/js/treeshaking/analyze/getServerRoutes.js

@@ -88,9 +88,11 @@ var applyRouteOptions = function applyRouteOptions(original, routeOptions) {
  */
 var collectHtmlRoutes = function collectHtmlRoutes(entrypoints, appContext, config) {
   var disableHtmlFolder = config.html.disableHtmlFolder,
-    _config$output$distPa = config.output.distPath;
+    _config$output = config.output,
+    _config$output$distPa = _config$output.distPath;
   _config$output$distPa = _config$output$distPa === void 0 ? {} : _config$output$distPa;
   var htmlPath = _config$output$distPa.html,
+    enableModernMode = _config$output.enableModernMode,
     _config$server = config.server,
     baseUrl = _config$server.baseUrl,
     routes = _config$server.routes,
@@ -110,8 +112,7 @@ var collectHtmlRoutes = function collectHtmlRoutes(entrypoints, appContext, conf
       isSPA: true,
       isSSR: isSSR,
       responseHeaders: resHeaders,
-      // FIXME: remove the config.enableModernMode
-      // enableModernMode: Boolean(enableModernMode),
+      enableModernMode: Boolean(enableModernMode),
       bundle: isSSR ? "".concat(SERVER_BUNDLE_DIRECTORY, "/").concat(entryName, ".js") : undefined
     };
     if (routes !== null && routes !== void 0 && routes.hasOwnProperty(entryName)) {