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

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

@@ -4,37 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.generateCode = exports.createImportStatements = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 var _core = require("@modern-js/core");
-
 var _esbuild = _interopRequireDefault(require("esbuild"));
-
 var _commands = require("../utils/commands");
-
 var templates = _interopRequireWildcard(require("./templates"));
-
 var _getClientRoutes = require("./getClientRoutes");
-
 var _constants = require("./constants");
-
 var _utils2 = require("./utils");
-
 var _nestedRoutes = require("./nestedRoutes");
-
 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 createImportSpecifier = specifiers => {
   let defaults = '';
   const named = [];
-
   for (const {
     local,
     imported
@@ -47,7 +32,6 @@ const createImportSpecifier = specifiers => {
       named.push(imported);
     }
   }
-
   if (defaults && named.length) {
     return `${defaults}, { ${named.join(', ')} }`;
   } else if (defaults) {
@@ -56,12 +40,10 @@ const createImportSpecifier = specifiers => {
     return `{ ${named.join(', ')} }`;
   }
 };
-
 const createImportStatements = statements => {
   // merge import statements with the same value.
   const deDuplicated = [];
   const seen = new Map();
-
   for (const {
     value,
     specifiers,
@@ -76,24 +58,20 @@ const createImportStatements = statements => {
       seen.set(value, specifiers);
     } else {
       var _deDuplicated$modifyI, _deDuplicated$modifyI2;
-
-      seen.get(value).push(...specifiers); // make "initialize" param can be connected when multiple plugins were imported from same package
-
+      seen.get(value).push(...specifiers);
+      // make "initialize" param can be connected when multiple plugins were imported from same package
       const modifyIndex = deDuplicated.findIndex(v => v.value === value);
       const originInitialize = (_deDuplicated$modifyI = (_deDuplicated$modifyI2 = deDuplicated[modifyIndex]) === null || _deDuplicated$modifyI2 === void 0 ? void 0 : _deDuplicated$modifyI2.initialize) !== null && _deDuplicated$modifyI !== void 0 ? _deDuplicated$modifyI : '';
       deDuplicated[modifyIndex].initialize = originInitialize.concat(`\n${initialize || ''}`);
     }
   }
-
   return deDuplicated.map(({
     value,
     specifiers,
     initialize
   }) => `import ${createImportSpecifier(specifiers)} from '${value}';\n${initialize || ''}`).join('\n');
 };
-
 exports.createImportStatements = createImportStatements;
-
 const buildLoader = async (entry, outfile) => {
   const loader = {
     '.js': 'jsx',
@@ -113,32 +91,27 @@ const buildLoader = async (entry, outfile) => {
     outfile,
     plugins: [{
       name: 'make-all-packages-external',
-
       setup(build) {
         // https://github.com/evanw/esbuild/issues/619#issuecomment-751995294
         build.onResolve({
           filter: EXTERNAL_REGEXP
         }, args => {
-          let external = true; // FIXME: windows external entrypoint
-
+          let external = true;
+          // FIXME: windows external entrypoint
           if (args.kind === 'entry-point') {
             external = false;
           }
-
           return {
             path: args.path,
             external
           };
         });
       }
-
     }]
   });
 };
-
 const generateCode = async (appContext, config, entrypoints, api) => {
   var _config$runtime, _config$runtime$route;
-
   const {
     internalDirectory,
     distDirectory,
@@ -150,10 +123,9 @@ const generateCode = async (appContext, config, entrypoints, api) => {
   const 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);
   const {
     mountId
-  } = config.output;
+  } = config.html;
   const getRoutes = islegacy ? _getClientRoutes.getClientRoutesLegacy : _getClientRoutes.getClientRoutes;
   await Promise.all(entrypoints.map(generateEntryCode));
-
   async function generateEntryCode(entrypoint) {
     const {
       entryName,
@@ -161,13 +133,11 @@ const generateCode = async (appContext, config, entrypoints, api) => {
       customBootstrap,
       fileSystemRoutes
     } = entrypoint;
-
     if (isAutoMount) {
       // generate routes file for file system routes entrypoint.
       if (fileSystemRoutes) {
         let initialRoutes = [];
         let nestedRoute = null;
-
         if (entrypoint.entry) {
           initialRoutes = getRoutes({
             entrypoint,
@@ -177,25 +147,21 @@ const generateCode = async (appContext, config, entrypoints, api) => {
             internalDirAlias
           });
         }
-
         if (entrypoint.nestedRoutesEntry) {
           if (!islegacy) {
             nestedRoute = await (0, _nestedRoutes.walk)(entrypoint.nestedRoutesEntry, entrypoint.nestedRoutesEntry, {
               name: internalSrcAlias,
               basename: srcDirectory
-            });
-
+            }, entrypoint.entryName);
             if (nestedRoute) {
               initialRoutes.unshift(nestedRoute);
             }
           } else {
-            _utils.logger.error('Nested routes is not supported in legacy mode.'); // eslint-disable-next-line no-process-exit
-
-
+            _utils.logger.error('Nested routes is not supported in legacy mode.');
+            // eslint-disable-next-line no-process-exit
             process.exit(1);
           }
         }
-
         const {
           routes
         } = await hookRunners.modifyFileSystemRoutes({
@@ -205,13 +171,19 @@ const generateCode = async (appContext, config, entrypoints, api) => {
         const config = (0, _core.useResolvedConfigContext)();
         const ssr = config === null || config === void 0 ? void 0 : config.server.ssr;
         let mode;
-
         if (ssr) {
           mode = typeof ssr === 'object' ? ssr.mode || 'string' : 'string';
         } else {
           mode = false;
         }
-
+        if (mode === 'stream') {
+          const hasPageRoute = routes.some(route => 'type' in route && route.type === 'page');
+          if (hasPageRoute) {
+            _utils.logger.error('streaming ssr is not supported when pages dir exists');
+            // eslint-disable-next-line no-process-exit
+            process.exit(1);
+          }
+        }
         const {
           code
         } = await hookRunners.beforeGenerateRoutes({
@@ -219,15 +191,15 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           code: templates.fileSystemRoutes({
             routes,
             ssrMode: mode,
-            nestedRoutesEntry: entrypoint.nestedRoutesEntry
+            nestedRoutesEntry: entrypoint.nestedRoutesEntry,
+            entryName: entrypoint.entryName
           })
-        }); // extract nested router loaders
+        });
 
+        // extract nested router loaders
         if (entrypoint.nestedRoutesEntry) {
           const routesServerFile = _path.default.join(internalDirectory, entryName, 'routes.server.js');
-
           const outputRoutesServerFile = _path.default.join(distDirectory, 'loader-routes', entryName, 'index.js');
-
           const code = templates.routesForServer({
             routes: routes,
             alias: {
@@ -239,11 +211,10 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           await _utils.fs.writeFile(routesServerFile, code);
           await buildLoader(routesServerFile, outputRoutesServerFile);
         }
-
         _utils.fs.outputFileSync(_path.default.resolve(internalDirectory, `./${entryName}/${_constants.FILE_SYSTEM_ROUTES_FILE_NAME}`), code, 'utf8');
-      } // call modifyEntryImports hook
-
+      }
 
+      // call modifyEntryImports hook
       const {
         imports: importStatements
       } = await hookRunners.modifyEntryImports({
@@ -255,15 +226,17 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           internalDirAlias,
           internalDirectory
         })
-      }); // call modifyEntryRuntimePlugins hook
+      });
 
+      // call modifyEntryRuntimePlugins hook
       const {
         plugins
       } = await hookRunners.modifyEntryRuntimePlugins({
         entrypoint,
         plugins: []
-      }); // call modifyEntryRenderFunction hook
+      });
 
+      // call modifyEntryRenderFunction hook
       const {
         code: renderFunction
       } = await hookRunners.modifyEntryRenderFunction({
@@ -273,8 +246,9 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           customBootstrap,
           fileSystemRoutes
         })
-      }); // call modifyEntryExport hook
+      });
 
+      // call modifyEntryExport hook
       const {
         exportStatement
       } = await hookRunners.modifyEntryExport({
@@ -287,11 +261,10 @@ const generateCode = async (appContext, config, entrypoints, api) => {
         renderFunction,
         exportStatement
       });
-
       const entryFile = _path.default.resolve(internalDirectory, `./${entryName}/${_constants.ENTRY_POINT_FILE_NAME}`);
+      entrypoint.entry = entryFile;
 
-      entrypoint.entry = entryFile; // generate entry file.
-
+      // generate entry file.
       if (config.source.enableAsyncEntry) {
         const {
           code: asyncEntryCode
@@ -299,11 +272,8 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           entrypoint,
           code: `import('./${_constants.ENTRY_BOOTSTRAP_FILE_NAME}');`
         });
-
         _utils.fs.outputFileSync(entryFile, asyncEntryCode, 'utf8');
-
         const bootstrapFile = _path.default.resolve(internalDirectory, `./${entryName}/${_constants.ENTRY_BOOTSTRAP_FILE_NAME}`);
-
         _utils.fs.outputFileSync(bootstrapFile, code, 'utf8');
       } else {
         _utils.fs.outputFileSync(entryFile, code, 'utf8');
@@ -311,5 +281,4 @@ const generateCode = async (appContext, config, entrypoints, api) => {
     }
   }
 };
-
 exports.generateCode = generateCode;

package/dist/js/node/analyze/getBundleEntry.js

@@ -4,40 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getBundleEntry = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 var _getFileSystemEntry = require("./getFileSystemEntry");
-
 var _constants = require("./constants");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const ensureExtensions = file => {
   if (!_path.default.extname(file)) {
     return (0, _utils.findExists)(_constants.JS_EXTENSIONS.map(ext => `${file}${ext}`)) || file;
   }
-
   return file;
 };
-
 const ifAlreadyExists = (entrypoints, checked) => entrypoints.some(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: ${checked.entry}.\n Default entrypoint: ${entrypoint.entry}\n Please reset source.entries or set source.disableDefaultEntries to disable the default entry rules.`);
   }
-
   return false;
 });
-
 const getBundleEntry = (appContext, config) => {
   const {
     appDirectory,
@@ -50,8 +39,9 @@ const getBundleEntry = (appContext, config) => {
       entriesDir
     }
   } = config;
-  const defaults = disableDefaultEntries ? [] : (0, _getFileSystemEntry.getFileSystemEntry)(appContext, config); // merge entrypoints from user config with directory convention.
+  const defaults = disableDefaultEntries ? [] : (0, _getFileSystemEntry.getFileSystemEntry)(appContext, config);
 
+  // merge entrypoints from user config with directory convention.
   if (entries) {
     Object.keys(entries).forEach(name => {
       const value = entries[name];
@@ -66,16 +56,14 @@ const 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 '/'.
-    const entriesDirAbs = (0, _utils.ensureAbsolutePath)(appDirectory, entriesDir);
+    const entriesDirAbs = (0, _utils.ensureAbsolutePath)(appDirectory, entriesDir || '');
     const found = defaults.find(({
       entryName,
       entry,
@@ -83,8 +71,6 @@ const getBundleEntry = (appContext, config) => {
     }) => entryName === packageName || _path.default.dirname(entry) === entriesDirAbs || _path.default.dirname(_nestedRoutesEntry) === entriesDirAbs);
     found && (found.entryName = _utils.MAIN_ENTRY_NAME);
   }
-
   return defaults;
 };
-
 exports.getBundleEntry = getBundleEntry;

package/dist/js/node/analyze/getClientRoutes/getRoutes.js

@@ -4,41 +4,28 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getClientRoutes = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 var _makeLegalIdentifier = require("../makeLegalIdentifier");
-
 var _constants = require("../constants");
-
 var _utils2 = require("../utils");
-
 var _utils3 = require("./utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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 compName = (srcDirectory, filePath) => {
   const legalCompName = (0, _makeLegalIdentifier.makeLegalIdentifier)(_path.default.relative(srcDirectory, filePath));
   return `Comp_${legalCompName}`;
 };
-
 const layoutNameAbbr = filePath => {
   const prefix = 'L_';
   const dirName = _path.default.dirname(filePath).split('/').pop() || '';
   return `${prefix}${(0, _makeLegalIdentifier.makeLegalIdentifier)(dirName)}`;
 };
-
 const parents = [];
-/* eslint-disable no-param-reassign */
 
+/* eslint-disable no-param-reassign */
 const recursiveReadDir = ({
   dir,
   routes,
@@ -50,7 +37,6 @@ const recursiveReadDir = ({
   let resetParent = false;
   let parent = parents[parents.length - 1];
   const layout = (0, _utils3.findLayout)(dir);
-
   if (layout) {
     if (_basePath === '/') {
       throw new Error(`should use _app instead of _layout in ${dir}`);
@@ -72,18 +58,13 @@ const recursiveReadDir = ({
       routes = route.children;
     }
   }
-
   for (const relative of _utils.fs.readdirSync(dir)) {
     const filePath = _path.default.join(dir, relative);
-
     if (!(0, _utils3.shouldSkip)(filePath)) {
       const filename = _path.default.basename(filePath, _path.default.extname(filePath));
-
       const alias = (0, _utils2.replaceWithAlias)(srcDirectory, filePath, srcAlias);
       const componentName = compName(srcDirectory, filePath);
-
       const dynamicRouteMatched = _constants.FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP.exec(filename);
-
       if (dynamicRouteMatched) {
         if (hasDynamicRoute) {
           throw new Error(`Can't set two dynamic route in one directory: ${dir}`);
@@ -91,7 +72,6 @@ const recursiveReadDir = ({
           hasDynamicRoute = true;
         }
       }
-
       const route = {
         path: `${_basePath}${dynamicRouteMatched ? `:${dynamicRouteMatched[1]}${dynamicRouteMatched[2]}` : filename}`,
         _component: alias,
@@ -99,7 +79,6 @@ const recursiveReadDir = ({
         parent,
         type: 'page'
       };
-
       if (_utils.fs.statSync(filePath).isDirectory()) {
         recursiveReadDir({
           dir: filePath,
@@ -110,38 +89,32 @@ const recursiveReadDir = ({
         });
         continue;
       }
-
       if (filename === _constants.FILE_SYSTEM_ROUTES_LAYOUT) {
         continue;
       }
-
       if (filename === _constants.FILE_SYSTEM_ROUTES_INDEX) {
         route.path = _basePath === '/' ? _basePath : `${_basePath.substring(0, _basePath.length - 1)}`;
       }
-
       if (filename === '404' && _basePath === '/') {
         route.path = '*';
       }
-
       routes.push(route);
     }
   }
-
   if (resetParent) {
     parents.pop();
   }
 };
 /* eslint-enable  no-param-reassign */
 
-
 const normalizeNestedRoutes = (nested, internalComponentsDir, internalDirectory, internalDirAlias) => {
   const flat = routes => routes.reduce((memo, route) => memo.concat(Array.isArray(route.children) ? flat(route.children) : [route]), []);
-
   const generate = route => {
     const codes = [];
     let lastComponent = route.component;
-    const imports = [`import React from 'react';`, `import ${lastComponent} from '${route._component}'`]; // eslint-disable-next-line no-param-reassign, no-cond-assign
+    const imports = [`import React from 'react';`, `import ${lastComponent} from '${route._component}'`];
 
+    // eslint-disable-next-line no-param-reassign, no-cond-assign
     while (route = route.parent) {
       const layoutComponent = route.component;
       const layoutComponentAbbr = layoutNameAbbr(route._component);
@@ -150,17 +123,13 @@ const normalizeNestedRoutes = (nested, internalComponentsDir, internalDirectory,
       codes.push(`const ${currentComponent} = props => <${layoutComponent} Component={${lastComponent}} {...props} />;`);
       lastComponent = currentComponent;
     }
-
     const file = _path.default.resolve(internalComponentsDir, `${lastComponent}.jsx`);
-
     _utils.fs.outputFileSync(file, `${imports.join('\n')}\n${codes.join('\n')}\nexport default ${lastComponent}`);
-
     return {
       component: lastComponent,
       _component: (0, _utils2.replaceWithAlias)(internalDirectory, file, internalDirAlias)
     };
   };
-
   const normalized = flat(nested).map(route => route.parent ? _objectSpread(_objectSpread(_objectSpread({}, route), generate(route)), {}, {
     parent: undefined
   }) : _objectSpread(_objectSpread({}, route), {}, {
@@ -168,7 +137,6 @@ const normalizeNestedRoutes = (nested, internalComponentsDir, internalDirectory,
   }));
   return normalized;
 };
-
 const getClientRoutes = ({
   entrypoint,
   srcDirectory,
@@ -180,15 +148,12 @@ const getClientRoutes = ({
     entry,
     entryName
   } = entrypoint;
-
   if (!_utils.fs.existsSync(entry)) {
     throw new Error(`generate file system routes error, ${entry} directory not found.`);
   }
-
   if (!(_utils.fs.existsSync(entry) && _utils.fs.statSync(entry).isDirectory())) {
     throw new Error(`generate file system routes error, ${entry} should be directory.`);
   }
-
   let routes = [];
   recursiveReadDir({
     dir: entry,
@@ -197,25 +162,20 @@ const getClientRoutes = ({
     srcDirectory,
     srcAlias
   });
-
   const internalComponentsDir = _path.default.resolve(internalDirectory, `${entryName}/${_constants.FILE_SYSTEM_ROUTES_COMPONENTS_DIR}`);
-
   _utils.fs.emptyDirSync(internalComponentsDir);
-
   routes = normalizeNestedRoutes(routes, internalComponentsDir, internalDirectory, internalDirAlias);
-  parents.length = 0; // FIXME: support more situations
+  parents.length = 0;
 
+  // FIXME: support more situations
   routes.sort((a, b) => {
     const delta = (0, _utils3.getRouteWeight)(a.path) - (0, _utils3.getRouteWeight)(b.path);
-
     if (delta === 0) {
       return a.path.length - b.path.length;
     }
-
     return delta;
   });
   (0, _utils3.debug)(`fileSystem routes: %o`, routes);
   return routes;
 };
-
 exports.getClientRoutes = getClientRoutes;