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

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

@@ -13,20 +13,16 @@ import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
 import { FILE_SYSTEM_ROUTES_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME } from "./constants";
 import { getDefaultImports } from "./utils";
 import { walk } from "./nestedRoutes";
-
 var createImportSpecifier = function createImportSpecifier(specifiers) {
   var defaults = '';
   var named = [];
-
   var _iterator = _createForOfIteratorHelper(specifiers),
-      _step;
-
+    _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var _step$value = _step.value,
-          local = _step$value.local,
-          imported = _step$value.imported;
-
+        local = _step$value.local,
+        imported = _step$value.imported;
       if (local && imported) {
         named.push("".concat(imported, " as ").concat(local));
       } else if (local) {
@@ -40,7 +36,6 @@ var createImportSpecifier = function createImportSpecifier(specifiers) {
   } finally {
     _iterator.f();
   }
-
   if (defaults && named.length) {
     return "".concat(defaults, ", { ").concat(named.join(', '), " }");
   } else if (defaults) {
@@ -49,22 +44,18 @@ var createImportSpecifier = function createImportSpecifier(specifiers) {
     return "{ ".concat(named.join(', '), " }");
   }
 };
-
 export var createImportStatements = function createImportStatements(statements) {
   // merge import statements with the same value.
   var deDuplicated = [];
   var seen = new Map();
-
   var _iterator2 = _createForOfIteratorHelper(statements),
-      _step2;
-
+    _step2;
   try {
     var _loop = function _loop() {
       var _step2$value = _step2.value,
-          value = _step2$value.value,
-          specifiers = _step2$value.specifiers,
-          initialize = _step2$value.initialize;
-
+        value = _step2$value.value,
+        specifiers = _step2$value.specifiers,
+        initialize = _step2$value.initialize;
       if (!seen.has(value)) {
         deDuplicated.push({
           value: value,
@@ -74,10 +65,8 @@ export var createImportStatements = function createImportStatements(statements)
         seen.set(value, specifiers);
       } else {
         var _seen$get, _deDuplicated$modifyI, _deDuplicated$modifyI2;
-
-        (_seen$get = seen.get(value)).push.apply(_seen$get, _toConsumableArray(specifiers)); // make "initialize" param can be connected when multiple plugins were imported from same package
-
-
+        (_seen$get = seen.get(value)).push.apply(_seen$get, _toConsumableArray(specifiers));
+        // make "initialize" param can be connected when multiple plugins were imported from same package
         var modifyIndex = deDuplicated.findIndex(function (v) {
           return v.value === value;
         });
@@ -85,7 +74,6 @@ export var createImportStatements = function createImportStatements(statements)
         deDuplicated[modifyIndex].initialize = originInitialize.concat("\n".concat(initialize || ''));
       }
     };
-
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       _loop();
     }
@@ -94,15 +82,13 @@ export var createImportStatements = function createImportStatements(statements)
   } finally {
     _iterator2.f();
   }
-
   return deDuplicated.map(function (_ref) {
     var value = _ref.value,
-        specifiers = _ref.specifiers,
-        initialize = _ref.initialize;
+      specifiers = _ref.specifiers,
+      initialize = _ref.initialize;
     return "import ".concat(createImportSpecifier(specifiers), " from '").concat(value, "';\n").concat(initialize || '');
   }).join('\n');
 };
-
 var buildLoader = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(entry, outfile) {
     var loader, EXTERNAL_REGEXP, command;
@@ -134,12 +120,11 @@ var buildLoader = /*#__PURE__*/function () {
                   build.onResolve({
                     filter: EXTERNAL_REGEXP
                   }, function (args) {
-                    var external = true; // FIXME: windows external entrypoint
-
+                    var external = true;
+                    // FIXME: windows external entrypoint
                     if (args.kind === 'entry-point') {
                       external = false;
                     }
-
                     return {
                       path: args.path,
                       external: external
@@ -148,7 +133,6 @@ var buildLoader = /*#__PURE__*/function () {
                 }
               }]
             });
-
           case 5:
           case "end":
             return _context.stop();
@@ -156,45 +140,36 @@ var buildLoader = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-
   return function buildLoader(_x, _x2) {
     return _ref2.apply(this, arguments);
   };
 }();
-
 export var generateCode = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(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) {
       while (1) {
         switch (_context3.prev = _context3.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, _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;
-
+                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) {
                   while (1) {
                     switch (_context2.prev = _context2.next) {
                       case 0:
                         entryName = entrypoint.entryName, isAutoMount = entrypoint.isAutoMount, customBootstrap = entrypoint.customBootstrap, fileSystemRoutes = entrypoint.fileSystemRoutes;
-
                         if (!isAutoMount) {
-                          _context2.next = 68;
+                          _context2.next = 69;
                           break;
                         }
-
                         if (!fileSystemRoutes) {
-                          _context2.next = 38;
+                          _context2.next = 39;
                           break;
                         }
-
                         initialRoutes = [];
                         nestedRoute = null;
-
                         if (entrypoint.entry) {
                           initialRoutes = getRoutes({
                             entrypoint: entrypoint,
@@ -204,76 +179,73 @@ export var generateCode = /*#__PURE__*/function () {
                             internalDirAlias: internalDirAlias
                           });
                         }
-
                         if (!entrypoint.nestedRoutesEntry) {
                           _context2.next = 16;
                           break;
                         }
-
                         if (islegacy) {
                           _context2.next = 14;
                           break;
                         }
-
                         _context2.next = 10;
                         return walk(entrypoint.nestedRoutesEntry, entrypoint.nestedRoutesEntry, {
                           name: internalSrcAlias,
                           basename: srcDirectory
-                        });
-
+                        }, entrypoint.entryName);
                       case 10:
                         nestedRoute = _context2.sent;
-
                         if (nestedRoute) {
                           initialRoutes.unshift(nestedRoute);
                         }
-
                         _context2.next = 16;
                         break;
-
                       case 14:
-                        logger.error('Nested routes is not supported in legacy mode.'); // eslint-disable-next-line no-process-exit
-
+                        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;
                         return hookRunners.modifyFileSystemRoutes({
                           entrypoint: entrypoint,
                           routes: initialRoutes
                         });
-
                       case 18:
                         _yield$hookRunners$mo = _context2.sent;
                         routes = _yield$hookRunners$mo.routes;
                         _config = useResolvedConfigContext();
                         ssr = _config === null || _config === void 0 ? void 0 : _config.server.ssr;
-
                         if (ssr) {
                           mode = _typeof(ssr) === 'object' ? ssr.mode || 'string' : 'string';
                         } else {
                           mode = false;
                         }
-
-                        _context2.next = 25;
+                        if (mode === 'stream') {
+                          hasPageRoute = routes.some(function (route) {
+                            return 'type' in route && route.type === 'page';
+                          });
+                          if (hasPageRoute) {
+                            logger.error('streaming ssr is not supported when pages dir exists');
+                            // eslint-disable-next-line no-process-exit
+                            process.exit(1);
+                          }
+                        }
+                        _context2.next = 26;
                         return hookRunners.beforeGenerateRoutes({
                           entrypoint: entrypoint,
                           code: templates.fileSystemRoutes({
                             routes: routes,
                             ssrMode: mode,
-                            nestedRoutesEntry: entrypoint.nestedRoutesEntry
+                            nestedRoutesEntry: entrypoint.nestedRoutesEntry,
+                            entryName: entrypoint.entryName
                           })
                         });
-
-                      case 25:
+                      case 26:
                         _yield$hookRunners$be = _context2.sent;
                         _code = _yield$hookRunners$be.code;
-
                         if (!entrypoint.nestedRoutesEntry) {
-                          _context2.next = 37;
+                          _context2.next = 38;
                           break;
                         }
-
                         routesServerFile = path.join(internalDirectory, entryName, 'routes.server.js');
                         outputRoutesServerFile = path.join(distDirectory, 'loader-routes', entryName, 'index.js');
                         _code2 = templates.routesForServer({
@@ -283,22 +255,18 @@ export var generateCode = /*#__PURE__*/function () {
                             basename: srcDirectory
                           }
                         });
-                        _context2.next = 33;
+                        _context2.next = 34;
                         return fs.ensureFile(routesServerFile);
-
-                      case 33:
-                        _context2.next = 35;
+                      case 34:
+                        _context2.next = 36;
                         return fs.writeFile(routesServerFile, _code2);
-
-                      case 35:
-                        _context2.next = 37;
+                      case 36:
+                        _context2.next = 38;
                         return buildLoader(routesServerFile, outputRoutesServerFile);
-
-                      case 37:
-                        fs.outputFileSync(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_FILE_NAME)), _code, 'utf8');
-
                       case 38:
-                        _context2.next = 40;
+                        fs.outputFileSync(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_FILE_NAME)), _code, 'utf8');
+                      case 39:
+                        _context2.next = 41;
                         return hookRunners.modifyEntryImports({
                           entrypoint: entrypoint,
                           imports: getDefaultImports({
@@ -309,20 +277,18 @@ export var generateCode = /*#__PURE__*/function () {
                             internalDirectory: internalDirectory
                           })
                         });
-
-                      case 40:
+                      case 41:
                         _yield$hookRunners$mo2 = _context2.sent;
                         importStatements = _yield$hookRunners$mo2.imports;
-                        _context2.next = 44;
+                        _context2.next = 45;
                         return hookRunners.modifyEntryRuntimePlugins({
                           entrypoint: entrypoint,
                           plugins: []
                         });
-
-                      case 44:
+                      case 45:
                         _yield$hookRunners$mo3 = _context2.sent;
                         plugins = _yield$hookRunners$mo3.plugins;
-                        _context2.next = 48;
+                        _context2.next = 49;
                         return hookRunners.modifyEntryRenderFunction({
                           entrypoint: entrypoint,
                           code: templates.renderFunction({
@@ -331,17 +297,15 @@ export var generateCode = /*#__PURE__*/function () {
                             fileSystemRoutes: fileSystemRoutes
                           })
                         });
-
-                      case 48:
+                      case 49:
                         _yield$hookRunners$mo4 = _context2.sent;
                         renderFunction = _yield$hookRunners$mo4.code;
-                        _context2.next = 52;
+                        _context2.next = 53;
                         return hookRunners.modifyEntryExport({
                           entrypoint: entrypoint,
                           exportStatement: 'export default AppWrapper;'
                         });
-
-                      case 52:
+                      case 53:
                         _yield$hookRunners$mo5 = _context2.sent;
                         exportStatement = _yield$hookRunners$mo5.exportStatement;
                         code = templates.index({
@@ -351,32 +315,29 @@ export var generateCode = /*#__PURE__*/function () {
                           exportStatement: exportStatement
                         });
                         entryFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_POINT_FILE_NAME));
-                        entrypoint.entry = entryFile; // generate entry file.
+                        entrypoint.entry = entryFile;
 
+                        // generate entry file.
                         if (!config.source.enableAsyncEntry) {
-                          _context2.next = 67;
+                          _context2.next = 68;
                           break;
                         }
-
-                        _context2.next = 60;
+                        _context2.next = 61;
                         return hookRunners.modifyAsyncEntry({
                           entrypoint: entrypoint,
                           code: "import('./".concat(ENTRY_BOOTSTRAP_FILE_NAME, "');")
                         });
-
-                      case 60:
+                      case 61:
                         _yield$hookRunners$mo6 = _context2.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 = 68;
+                        _context2.next = 69;
                         break;
-
-                      case 67:
-                        fs.outputFileSync(entryFile, code, 'utf8');
-
                       case 68:
+                        fs.outputFileSync(entryFile, code, 'utf8');
+                      case 69:
                       case "end":
                         return _context2.stop();
                     }
@@ -385,19 +346,16 @@ export var generateCode = /*#__PURE__*/function () {
               }));
               return _generateEntryCode.apply(this, arguments);
             };
-
             generateEntryCode = function _generateEntryCode2(_x7) {
               return _generateEntryCode.apply(this, arguments);
             };
-
             internalDirectory = appContext.internalDirectory, distDirectory = appContext.distDirectory, srcDirectory = appContext.srcDirectory, internalDirAlias = appContext.internalDirAlias, internalSrcAlias = appContext.internalSrcAlias;
             hookRunners = api.useHookRunners();
             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.output.mountId;
+            mountId = config.html.mountId;
             getRoutes = islegacy ? getClientRoutesLegacy : getClientRoutes;
             _context3.next = 9;
             return Promise.all(entrypoints.map(generateEntryCode));
-
           case 9:
           case "end":
             return _context3.stop();
@@ -405,7 +363,6 @@ export var generateCode = /*#__PURE__*/function () {
       }
     }, _callee3);
   }));
-
   return function generateCode(_x3, _x4, _x5, _x6) {
     return _ref3.apply(this, arguments);
   };

package/dist/js/treeshaking/analyze/getBundleEntry.js

@@ -2,43 +2,38 @@ import path from 'path';
 import { ensureAbsolutePath, fs, findExists, MAIN_ENTRY_NAME } from '@modern-js/utils';
 import { getFileSystemEntry } from "./getFileSystemEntry";
 import { JS_EXTENSIONS } from "./constants";
-
 var ensureExtensions = function ensureExtensions(file) {
   if (!path.extname(file)) {
     return findExists(JS_EXTENSIONS.map(function (ext) {
       return "".concat(file).concat(ext);
     })) || file;
   }
-
   return file;
 };
-
 var ifAlreadyExists = function ifAlreadyExists(entrypoints, checked) {
   return entrypoints.some(function (entrypoint) {
     if (ensureExtensions(entrypoint.entry) === ensureExtensions(checked.entry)) {
       // reset entryName
       checked.entryName = entrypoint.entryName;
       return true;
-    } // filesystem routes entrypoint conflict with normal entrypoint.
-
-
+    }
+    // filesystem routes entrypoint conflict with normal entrypoint.
     if (entrypoint.entry.startsWith(checked.entry) || checked.entry.startsWith(entrypoint.entry)) {
       throw new Error("Entry configuration conflicts\n Your configuration: ".concat(checked.entry, ".\n Default entrypoint: ").concat(entrypoint.entry, "\n Please reset source.entries or set source.disableDefaultEntries to disable the default entry rules."));
     }
-
     return false;
   });
 };
-
 export var getBundleEntry = function getBundleEntry(appContext, config) {
   var appDirectory = appContext.appDirectory,
-      packageName = appContext.packageName;
+    packageName = appContext.packageName;
   var _config$source = config.source,
-      disableDefaultEntries = _config$source.disableDefaultEntries,
-      entries = _config$source.entries,
-      entriesDir = _config$source.entriesDir;
-  var defaults = disableDefaultEntries ? [] : getFileSystemEntry(appContext, config); // merge entrypoints from user config with directory convention.
+    disableDefaultEntries = _config$source.disableDefaultEntries,
+    entries = _config$source.entries,
+    entriesDir = _config$source.entriesDir;
+  var defaults = disableDefaultEntries ? [] : getFileSystemEntry(appContext, config);
 
+  // merge entrypoints from user config with directory convention.
   if (entries) {
     Object.keys(entries).forEach(function (name) {
       var value = entries[name];
@@ -53,25 +48,22 @@ export var getBundleEntry = function getBundleEntry(appContext, config) {
         isAutoMount: !value.disableMount,
         fileSystemRoutes: value.enableFileSystemRoutes ? {} : undefined
       };
-
       if (!ifAlreadyExists(defaults, entrypoint)) {
         defaults.push(entrypoint);
       }
     });
   }
-
   if (!disableDefaultEntries) {
     // find main entry point which server route is '/'.
-    var entriesDirAbs = ensureAbsolutePath(appDirectory, entriesDir);
+    var entriesDirAbs = ensureAbsolutePath(appDirectory, entriesDir || '');
     var found = defaults.find(function (_ref) {
       var entryName = _ref.entryName,
-          entry = _ref.entry,
-          _ref$nestedRoutesEntr = _ref.nestedRoutesEntry,
-          nestedRoutesEntry = _ref$nestedRoutesEntr === void 0 ? '' : _ref$nestedRoutesEntr;
+        entry = _ref.entry,
+        _ref$nestedRoutesEntr = _ref.nestedRoutesEntry,
+        nestedRoutesEntry = _ref$nestedRoutesEntr === void 0 ? '' : _ref$nestedRoutesEntr;
       return entryName === packageName || path.dirname(entry) === entriesDirAbs || path.dirname(nestedRoutesEntry) === entriesDirAbs;
     });
     found && (found.entryName = MAIN_ENTRY_NAME);
   }
-
   return defaults;
 };