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

package/dist/js/node/analyze/index.js

@@ -3,86 +3,41 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.modifyServerRoutes = exports.modifyFileSystemRoutes = exports.modifyEntryRuntimePlugins = exports.modifyEntryRenderFunction = exports.modifyEntryImports = exports.modifyEntryExport = exports.modifyAsyncEntry = exports.htmlPartials = exports.default = exports.beforeGenerateRoutes = exports.addRuntimeExports = exports.addDefineTypes = void 0;
-
+exports.default = void 0;
 var path = _interopRequireWildcard(require("path"));
-
-var _plugin = require("@modern-js/plugin");
-
 var _utils = require("@modern-js/utils");
-
 var _lodash = require("@modern-js/utils/lodash");
-
+var _builder = require("../builder");
+var _printInstructions = require("../utils/printInstructions");
+var _routes = require("../utils/routes");
+var _config = require("../utils/config");
+var _commands = require("../utils/commands");
+var _config2 = require("../config");
 var _utils2 = require("./utils");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 const debug = (0, _utils.createDebugger)('plugin-analyze');
-const modifyEntryImports = (0, _plugin.createAsyncWaterfall)();
-exports.modifyEntryImports = modifyEntryImports;
-const modifyEntryExport = (0, _plugin.createAsyncWaterfall)();
-exports.modifyEntryExport = modifyEntryExport;
-const addRuntimeExports = (0, _plugin.createAsyncWaterfall)();
-exports.addRuntimeExports = addRuntimeExports;
-const modifyEntryRuntimePlugins = (0, _plugin.createAsyncWaterfall)();
-exports.modifyEntryRuntimePlugins = modifyEntryRuntimePlugins;
-const modifyEntryRenderFunction = (0, _plugin.createAsyncWaterfall)();
-exports.modifyEntryRenderFunction = modifyEntryRenderFunction;
-const modifyAsyncEntry = (0, _plugin.createAsyncWaterfall)();
-exports.modifyAsyncEntry = modifyAsyncEntry;
-const modifyFileSystemRoutes = (0, _plugin.createAsyncWaterfall)();
-exports.modifyFileSystemRoutes = modifyFileSystemRoutes;
-const modifyServerRoutes = (0, _plugin.createAsyncWaterfall)();
-exports.modifyServerRoutes = modifyServerRoutes;
-const htmlPartials = (0, _plugin.createAsyncWaterfall)();
-exports.htmlPartials = htmlPartials;
-const beforeGenerateRoutes = (0, _plugin.createAsyncWaterfall)();
-exports.beforeGenerateRoutes = beforeGenerateRoutes;
-const addDefineTypes = (0, _plugin.createAsyncWaterfall)();
-exports.addDefineTypes = addDefineTypes;
-
 var _default = () => ({
   name: '@modern-js/plugin-analyze',
-  registerHook: {
-    modifyAsyncEntry,
-    modifyEntryImports,
-    modifyEntryExport,
-    modifyEntryRuntimePlugins,
-    modifyEntryRenderFunction,
-    modifyFileSystemRoutes,
-    modifyServerRoutes,
-    htmlPartials,
-    addRuntimeExports,
-    beforeGenerateRoutes,
-    addDefineTypes
-  },
   setup: api => {
     let pagesDir = [];
     let originEntrypoints = [];
     return {
       async prepare() {
         var _resolvedConfig$sourc;
-
-        const appContext = api.useAppContext();
+        let appContext = api.useAppContext();
         const resolvedConfig = api.useResolvedConfigContext();
         const hookRunners = api.useHookRunners();
-
         try {
           _utils.fs.emptydirSync(appContext.internalDirectory);
-        } catch (_unused) {// FIXME:
+        } catch (_unused) {
+          // FIXME:
         }
-
-        const apiOnly = await (0, _utils.isApiOnly)(appContext.appDirectory, resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig$sourc = resolvedConfig.source) === null || _resolvedConfig$sourc === void 0 ? void 0 : _resolvedConfig$sourc.entriesDir);
+        const apiOnly = await (0, _utils.isApiOnly)(appContext.appDirectory, (_resolvedConfig$sourc = resolvedConfig.source) === null || _resolvedConfig$sourc === void 0 ? void 0 : _resolvedConfig$sourc.entriesDir);
         await hookRunners.addRuntimeExports();
-
         if (apiOnly) {
           const {
             routes
@@ -90,13 +45,13 @@ var _default = () => ({
             routes: []
           });
           debug(`server routes: %o`, routes);
-          api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
+          appContext = _objectSpread(_objectSpread({}, appContext), {}, {
             apiOnly,
             serverRoutes: routes
-          }));
+          });
+          api.setAppContext(appContext);
           return;
         }
-
         const [{
           getBundleEntry
         }, {
@@ -119,10 +74,11 @@ var _default = () => ({
           routes: initialRoutes
         });
         debug(`server routes: %o`, routes);
-        api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
+        appContext = _objectSpread(_objectSpread({}, appContext), {}, {
           entrypoints,
           serverRoutes: routes
-        }));
+        });
+        api.setAppContext(appContext);
         const nestedRouteEntries = entrypoints.map(point => point.nestedRoutesEntry).filter(Boolean);
         pagesDir = entrypoints.map(point => point.entry).filter(Boolean).concat(nestedRouteEntries);
         originEntrypoints = (0, _lodash.cloneDeep)(entrypoints);
@@ -134,19 +90,89 @@ var _default = () => ({
         debug(`html templates: %o`, htmlTemplates);
         await hookRunners.addDefineTypes();
         debug(`add Define Types`);
-        api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
+        appContext = _objectSpread(_objectSpread({}, appContext), {}, {
           entrypoints,
           checkedEntries: defaultChecked,
           apiOnly,
           serverRoutes: routes,
           htmlTemplates
-        }));
+        });
+        api.setAppContext(appContext);
+        const command = (0, _commands.getCommand)();
+        const buildCommands = ['dev', 'build', 'inspect', 'deploy'];
+        if (buildCommands.includes(command)) {
+          const normalizedConfig = api.useResolvedConfigContext();
+          const builder = await (0, _builder.createBuilderForEdenX)({
+            normalizedConfig: normalizedConfig,
+            appContext,
+            compatPluginConfig: {
+              async onBeforeBuild({
+                bundlerConfigs
+              }) {
+                const hookRunners = api.useHookRunners();
+                await (0, _routes.generateRoutes)(appContext);
+                await hookRunners.beforeBuild({
+                  bundlerConfigs
+                });
+              },
+              async onAfterBuild({
+                stats
+              }) {
+                const hookRunners = api.useHookRunners();
+                await hookRunners.afterBuild({
+                  stats
+                });
+                await (0, _config.emitResolvedConfig)(appContext.appDirectory, normalizedConfig);
+              },
+              async onDevCompileDone({
+                isFirstCompile
+              }) {
+                const hookRunners = api.useHookRunners();
+                if (process.stdout.isTTY || isFirstCompile) {
+                  hookRunners.afterDev();
+                  if (isFirstCompile) {
+                    (0, _printInstructions.printInstructions)(hookRunners, appContext, normalizedConfig);
+                  }
+                }
+              },
+              async onBeforeCreateCompiler({
+                bundlerConfigs
+              }) {
+                const hookRunners = api.useHookRunners();
+                // run modernjs framework `beforeCreateCompiler` hook
+                await hookRunners.beforeCreateCompiler({
+                  bundlerConfigs
+                });
+              },
+              async onAfterCreateCompiler({
+                compiler
+              }) {
+                const hookRunners = api.useHookRunners();
+                // run modernjs framework afterCreateCompiler hooks
+                await hookRunners.afterCreateCompiler({
+                  compiler
+                });
+              }
+            }
+          });
+          appContext = _objectSpread(_objectSpread({}, appContext), {}, {
+            builder
+          });
+          api.setAppContext(appContext);
+        }
       },
-
       watchFiles() {
         return pagesDir;
       },
-
+      resolvedConfig({
+        resolved
+      }) {
+        const appContext = api.useAppContext();
+        const config = (0, _config2.initialNormalizedConfig)(resolved, appContext);
+        return {
+          resolved: config
+        };
+      },
       async fileChange(e) {
         const appContext = api.useAppContext();
         const {
@@ -156,12 +182,9 @@ var _default = () => ({
           filename,
           eventType
         } = e;
-
         const isPageFile = name => pagesDir.some(pageDir => name.includes(pageDir));
-
         const absoluteFilePath = path.resolve(appDirectory, filename);
         const isRouteComponent = isPageFile(absoluteFilePath) && (0, _utils2.isRouteComponentFile)(absoluteFilePath);
-
         if (isRouteComponent && (eventType === 'add' || eventType === 'unlink')) {
           const resolvedConfig = api.useResolvedConfigContext();
           const {
@@ -171,9 +194,7 @@ var _default = () => ({
           generateCode(appContext, resolvedConfig, entrypoints, api);
         }
       }
-
     };
   }
 });
-
 exports.default = _default;

package/dist/js/node/analyze/isDefaultExportFunction.js

@@ -4,28 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isDefaultExportFunction = void 0;
-
 var _fs = _interopRequireDefault(require("fs"));
-
 var _parser = require("@babel/parser");
-
 var _traverse = _interopRequireDefault(require("@babel/traverse"));
-
 var t = _interopRequireWildcard(require("@babel/types"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const isFunction = node => t.isFunctionDeclaration(node) || t.isFunctionExpression(node) || t.isArrowFunctionExpression(node);
-
 const isDefaultExportFunction = file => {
   if (!file || !_fs.default.existsSync(file)) {
     return false;
   }
-
   const ast = (0, _parser.parse)(_fs.default.readFileSync(file, 'utf8'), {
     sourceType: 'unambiguous',
     plugins: ['jsx', 'typescript', 'classProperties', 'dynamicImport', 'exportDefaultFrom', 'exportNamespaceFrom', 'decorators-legacy', 'functionBind', 'classPrivateMethods', ['pipelineOperator', {
@@ -38,7 +28,6 @@ const isDefaultExportFunction = file => {
       const {
         declaration
       } = path.node;
-
       if (isFunction(declaration)) {
         isExportFunction = true;
       }
@@ -46,5 +35,4 @@ const isDefaultExportFunction = file => {
   });
   return isExportFunction;
 };
-
 exports.isDefaultExportFunction = isDefaultExportFunction;

package/dist/js/node/analyze/makeLegalIdentifier.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.makeLegalIdentifier = makeLegalIdentifier;
-
 /**
  * modified from https://github.com/rollup/plugins/blob/master/packages/pluginutils
  * license at https://github.com/rollup/plugins/blob/master/LICENSE
@@ -12,13 +11,10 @@ exports.makeLegalIdentifier = makeLegalIdentifier;
 const reservedWords = 'break case class catch const continue debugger default delete do else export extends finally for function if import in instanceof let new return super switch this throw try typeof var void while with yield enum await implements package protected static interface private public';
 const builtins = 'arguments Infinity NaN undefined null true false eval uneval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Symbol Error EvalError InternalError RangeError ReferenceError SyntaxError TypeError URIError Number Math Date String RegExp Array Int8Array Uint8Array Uint8ClampedArray Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array Map Set WeakMap WeakSet SIMD ArrayBuffer DataView JSON Promise Generator GeneratorFunction Reflect Proxy Intl';
 const forbidList = new Set(`${reservedWords} ${builtins}`.split(' '));
-
 function makeLegalIdentifier(str) {
   const identifier = str.replace(/-(\w)/g, (_, letter) => letter.toUpperCase()).replace(/[^$_a-zA-Z0-9]/g, '_');
-
   if (/\d/.test(identifier[0]) || forbidList.has(identifier)) {
     return `_${identifier}`;
   }
-
   return identifier || '_';
 }

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

@@ -4,62 +4,45 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.walk = void 0;
-
 var path = _interopRequireWildcard(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 var _constants = require("./constants");
-
 var _utils2 = require("./utils");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 const LAYOUT_FILE = 'layout';
 const PAGE_FILE = 'page';
 const LOADING_FILE = 'loading';
 const ERROR_FILE = 'error';
 const LOADER_FILE = 'loader';
 const conventionNames = [LAYOUT_FILE, PAGE_FILE, LOADING_FILE, ERROR_FILE, LOADER_FILE];
-
 const replaceDynamicPath = routePath => {
   return routePath.replace(/\[(.*?)\]/g, ':$1');
 };
-
-const createIndexRoute = (routeInfo, rootDir, filename) => {
+const createIndexRoute = (routeInfo, rootDir, filename, entryName) => {
   return createRoute(_objectSpread(_objectSpread({}, routeInfo), {}, {
     index: true,
     children: undefined
-  }), rootDir, filename);
+  }), rootDir, filename, entryName);
 };
-
-const createRoute = (routeInfo, rootDir, filename) => {
-  const id = (0, _utils.getRouteId)(filename, rootDir);
+const createRoute = (routeInfo, rootDir, filename, entryName) => {
+  const id = (0, _utils.getRouteId)(filename, rootDir, entryName);
   return _objectSpread(_objectSpread({}, routeInfo), {}, {
     id,
     type: 'nested'
   });
 };
-
-const walk = async (dirname, rootDir, alias) => {
+const walk = async (dirname, rootDir, alias, entryName) => {
   if (!(await _utils.fs.pathExists(dirname))) {
     return null;
   }
-
   const isDirectory = (await _utils.fs.stat(dirname)).isDirectory();
-
   if (!isDirectory) {
     return null;
   }
-
   const relativeDir = path.relative(rootDir, dirname);
   const pathSegments = relativeDir.split(path.sep);
   const lastSegment = pathSegments[pathSegments.length - 1];
@@ -67,65 +50,52 @@ const walk = async (dirname, rootDir, alias) => {
   const isPathlessLayout = lastSegment.startsWith('__');
   const isWithoutLayoutPath = lastSegment.includes('.');
   let routePath = isRoot || isPathlessLayout ? '/' : `${lastSegment}`;
-
   if (isWithoutLayoutPath) {
     routePath = lastSegment.split('.').join('/');
   }
-
   routePath = replaceDynamicPath(routePath);
   const route = {
     path: routePath,
     children: []
   };
   const items = await _utils.fs.readdir(dirname);
-
   for (const item of items) {
     const itemPath = path.join(dirname, item);
     const extname = path.extname(item);
     const itemWithoutExt = item.slice(0, -extname.length);
     const isDirectory = (await _utils.fs.stat(itemPath)).isDirectory();
-
     if (isDirectory) {
-      const childRoute = await walk(itemPath, rootDir, alias);
-
+      const childRoute = await walk(itemPath, rootDir, alias, entryName);
       if (childRoute) {
         var _route$children;
-
         (_route$children = route.children) === null || _route$children === void 0 ? void 0 : _route$children.push(childRoute);
       }
     }
-
     if (extname && (!_constants.JS_EXTENSIONS.includes(extname) || !conventionNames.includes(itemWithoutExt))) {
       continue;
     }
-
     if (itemWithoutExt === LAYOUT_FILE) {
       route._component = (0, _utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
     }
-
     if (itemWithoutExt === PAGE_FILE) {
       var _route$children2;
-
       const childRoute = createIndexRoute({
         _component: (0, _utils2.replaceWithAlias)(alias.basename, itemPath, alias.name)
-      }, rootDir, itemPath);
+      }, rootDir, itemPath, entryName);
       (_route$children2 = route.children) === null || _route$children2 === void 0 ? void 0 : _route$children2.push(childRoute);
     }
-
     if (itemWithoutExt === LOADER_FILE) {
       route.loader = (0, _utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
     }
-
     if (itemWithoutExt === LOADING_FILE) {
       route.loading = (0, _utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
     }
-
     if (itemWithoutExt === ERROR_FILE) {
       route.error = (0, _utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
     }
   }
+  const finalRoute = createRoute(route, rootDir, path.join(dirname, `${LAYOUT_FILE}.ts`), entryName);
 
-  const finalRoute = createRoute(route, rootDir, path.join(dirname, `${LAYOUT_FILE}.ts`));
   /**
    * when the url is /, the __auth/layout.tsx component should not be rendered
    * - routes
@@ -133,12 +103,9 @@ const walk = async (dirname, rootDir, alias) => {
    *    - layout.tsx
    *  - layout.tsx
    */
-
   if (isPathlessLayout) {
     delete finalRoute.path;
   }
-
   return finalRoute;
 };
-
 exports.walk = walk;

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

@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.routesForServer = exports.renderFunction = exports.index = exports.html = exports.fileSystemRoutes = void 0;
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 const index = ({
   mountId,
   imports,
@@ -35,9 +31,7 @@ AppWrapper = render();
 
 ${exportStatement};
 `;
-
 exports.index = index;
-
 const renderFunction = ({
   plugins,
   customBootstrap,
@@ -59,9 +53,7 @@ const renderFunction = ({
 
   return AppWrapper
 `;
-
 exports.renderFunction = renderFunction;
-
 const html = partials => `
 <!DOCTYPE html>
 <html>
@@ -92,9 +84,7 @@ const html = partials => `
 
 </html>
 `;
-
 exports.html = html;
-
 const routesForServer = ({
   routes,
   alias
@@ -104,37 +94,28 @@ const routesForServer = ({
     basename
   } = alias;
   const loaders = [];
-
   const traverseRouteTree = route => {
     let children;
-
     if ('children' in route && route.children) {
       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') {
       if (route.loader) {
         loaders.push(route.loader);
         loader = `loader_${loaders.length - 1}`;
       }
     }
-
     const finalRoute = _objectSpread(_objectSpread({}, route), {}, {
       loader,
       children
     });
-
     return finalRoute;
   };
-
   let routesCode = `
   export const routes = [
   `;
-
   for (const route of routes) {
     if ('type' in route) {
       const newRoute = traverseRouteTree(route);
@@ -143,7 +124,6 @@ const routesForServer = ({
       routesCode += `${JSON.stringify(route, null, 2)}`;
     }
   }
-
   routesCode += `\n];`;
   const importLoadersCode = loaders.map((loader, index) => {
     const realLoaderPath = loader.replace(name, basename);
@@ -154,93 +134,89 @@ const routesForServer = ({
     ${routesCode}
   `;
 };
-
 exports.routesForServer = routesForServer;
-
 const fileSystemRoutes = ({
   routes,
   ssrMode,
-  nestedRoutesEntry
+  nestedRoutesEntry,
+  entryName
 }) => {
-  const importLazyCode = ssrMode === 'stream' ? 'import { lazy } from "react";' : `import loadable from '@modern-js/runtime/loadable'`;
+  // The legacy mode and pages dir routes should use loadable
+  // nested routes + renderTostring should use loadable.lazy
+  // nested routes + renderToStream should use react.lazy
+  const importLazyCode = `
+    import { lazy } from "react";
+    import loadable, { lazy as loadableLazy } from "@modern-js/runtime/loadable"
+  `;
   let dataLoaderPath = '';
-
   if (ssrMode) {
     dataLoaderPath = require.resolve(`@modern-js/plugin-data-loader/loader`);
-
     if (nestedRoutesEntry) {
-      dataLoaderPath = `${dataLoaderPath}?routesDir=${nestedRoutesEntry}!`;
+      dataLoaderPath = `${dataLoaderPath}?routesDir=${nestedRoutesEntry}&entryName=${entryName}!`;
     }
   }
-
   const loadings = [];
   const errors = [];
   const loaders = [];
-
   const traverseRouteTree = route => {
     let children;
-
     if ('children' in route && route.children) {
       var _route$children2;
-
       children = route === null || route === void 0 ? void 0 : (_route$children2 = route.children) === null || _route$children2 === void 0 ? void 0 : _route$children2.map(traverseRouteTree);
     }
-
     let loading;
     let error;
     let loader;
-
+    let component = '';
     if (route.type === 'nested') {
       if (route.loading) {
         loadings.push(route.loading);
         loading = `loading_${loadings.length - 1}`;
       }
-
       if (route.error) {
         errors.push(route.error);
         error = `error_${errors.length - 1}`;
       }
-
       if (route.loader) {
         loaders.push(route.loader);
         loader = `loader_${loaders.length - 1}`;
       }
+      if (route._component) {
+        if (ssrMode === 'stream') {
+          component = `lazy(() => import(/* webpackChunkName: "${route.id}" */  /* webpackMode: "lazy-once" */ '${route._component}'))`;
+        } else {
+          component = `loadable(() => import(/* webpackChunkName: "${route.id}" */  /* webpackMode: "lazy-once" */ '${route._component}'))`;
+        }
+      }
+    } else if (route._component) {
+      component = `loadable(() => import('${route._component}'))`;
     }
-
     const finalRoute = _objectSpread(_objectSpread({}, route), {}, {
       loading,
       loader,
       error,
       children
     });
-
     if (route._component) {
-      const component = ssrMode === 'stream' ? `lazy(() => import('${route._component}'))` : `loadable(() => import('${route._component}'))`;
       finalRoute.component = component;
     }
-
     return finalRoute;
   };
-
   let routeComponentsCode = `
     export const routes = [
   `;
-
   for (const route of routes) {
     if ('type' in route) {
       const newRoute = traverseRouteTree(route);
-      routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable[^"]*)"/g, '$1').replace(/"(lazy[^"]*)"/g, '$1').replace(/"(loading_[^"])"/g, '$1').replace(/"(loader_[^"])"/g, '$1').replace(/"(error_[^"])"/g, '$1')},`;
+      routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, '$1').replace(/"(loadableLazy.*\))"/g, '$1').replace(/"(lazy.*\))"/g, '$1').replace(/"(loading_[^"])"/g, '$1').replace(/"(loader_[^"])"/g, '$1').replace(/"(error_[^"])"/g, '$1').replace(/\\"/g, '"')},`;
     } else {
-      const component = ssrMode === 'stream' ? `lazy(() => import('${route._component}'))` : `loadable(() => import('${route._component}'))`;
-
+      const component = `loadable(() => import('${route._component}'))`;
       const finalRoute = _objectSpread(_objectSpread({}, route), {}, {
         component
       });
-
       routeComponentsCode += `${JSON.stringify(finalRoute, null, 2).replace(/"(loadable[^"]*)"/g, '$1').replace(/"(lazy[^"]*)"/g, '$1')},`;
     }
   }
-
   routeComponentsCode += `\n];`;
   const importLoadingCode = loadings.map((loading, index) => {
     return `import loading_${index} from '${loading}';\n`;
@@ -259,5 +235,4 @@ const fileSystemRoutes = ({
     ${routeComponentsCode}
   `;
 };
-
 exports.fileSystemRoutes = fileSystemRoutes;