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

package/dist/js/treeshaking/analyze/index.js

@@ -6,6 +6,11 @@ import * as path from 'path';
 import { createAsyncWaterfall } from '@modern-js/plugin';
 import { createDebugger, fs, isApiOnly } from '@modern-js/utils';
 import { cloneDeep } from '@modern-js/utils/lodash';
+import { createBuilderForEdenX } from "../builder";
+import { printInstructions } from "../utils/printInstructions";
+import { generateRoutes } from "../utils/routes";
+import { emitResolvedConfig } from "../utils/config";
+import { getCommand } from "../utils/commands";
 import { isRouteComponentFile } from "./utils";
 var debug = createDebugger('plugin-analyze');
 export var modifyEntryImports = createAsyncWaterfall();
@@ -40,59 +45,51 @@ export default (function () {
       var originEntrypoints = [];
       return {
         prepare: function prepare() {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
             var _resolvedConfig$sourc;
-
-            var appContext, resolvedConfig, hookRunners, apiOnly, _yield$hookRunners$mo, _routes, _yield$Promise$all, _yield$Promise$all2, getBundleEntry, getServerRoutes, generateCode, getHtmlTemplate, entrypoints, defaultChecked, initialRoutes, _yield$hookRunners$mo2, routes, nestedRouteEntries, htmlTemplates;
-
-            return _regeneratorRuntime().wrap(function _callee$(_context) {
+            var appContext, resolvedConfig, hookRunners, apiOnly, _yield$hookRunners$mo, _routes, _yield$Promise$all, _yield$Promise$all2, getBundleEntry, getServerRoutes, generateCode, getHtmlTemplate, entrypoints, defaultChecked, initialRoutes, _yield$hookRunners$mo2, routes, nestedRouteEntries, htmlTemplates, command, buildCommands, normalizedConfig, builder;
+            return _regeneratorRuntime().wrap(function _callee6$(_context6) {
               while (1) {
-                switch (_context.prev = _context.next) {
+                switch (_context6.prev = _context6.next) {
                   case 0:
                     appContext = api.useAppContext();
                     resolvedConfig = api.useResolvedConfigContext();
                     hookRunners = api.useHookRunners();
-
                     try {
                       fs.emptydirSync(appContext.internalDirectory);
-                    } catch (_unused) {// FIXME:
+                    } catch (_unused) {
+                      // FIXME:
                     }
-
-                    _context.next = 6;
+                    _context6.next = 6;
                     return isApiOnly(appContext.appDirectory, resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig$sourc = resolvedConfig.source) === null || _resolvedConfig$sourc === void 0 ? void 0 : _resolvedConfig$sourc.entriesDir);
-
                   case 6:
-                    apiOnly = _context.sent;
-                    _context.next = 9;
+                    apiOnly = _context6.sent;
+                    _context6.next = 9;
                     return hookRunners.addRuntimeExports();
-
                   case 9:
                     if (!apiOnly) {
-                      _context.next = 17;
+                      _context6.next = 18;
                       break;
                     }
-
-                    _context.next = 12;
+                    _context6.next = 12;
                     return hookRunners.modifyServerRoutes({
                       routes: []
                     });
-
                   case 12:
-                    _yield$hookRunners$mo = _context.sent;
+                    _yield$hookRunners$mo = _context6.sent;
                     _routes = _yield$hookRunners$mo.routes;
                     debug("server routes: %o", _routes);
-                    api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
+                    appContext = _objectSpread(_objectSpread({}, appContext), {}, {
                       apiOnly: apiOnly,
                       serverRoutes: _routes
-                    }));
-                    return _context.abrupt("return");
-
-                  case 17:
-                    _context.next = 19;
+                    });
+                    api.setAppContext(appContext);
+                    return _context6.abrupt("return");
+                  case 18:
+                    _context6.next = 20;
                     return Promise.all([import("./getBundleEntry"), import("./getServerRoutes"), import("./generateCode"), import("./getHtmlTemplate")]);
-
-                  case 19:
-                    _yield$Promise$all = _context.sent;
+                  case 20:
+                    _yield$Promise$all = _context6.sent;
                     _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 4);
                     getBundleEntry = _yield$Promise$all2[0].getBundleEntry;
                     getServerRoutes = _yield$Promise$all2[1].getServerRoutes;
@@ -107,19 +104,19 @@ export default (function () {
                       appContext: appContext,
                       config: resolvedConfig
                     });
-                    _context.next = 31;
+                    _context6.next = 32;
                     return hookRunners.modifyServerRoutes({
                       routes: initialRoutes
                     });
-
-                  case 31:
-                    _yield$hookRunners$mo2 = _context.sent;
+                  case 32:
+                    _yield$hookRunners$mo2 = _context6.sent;
                     routes = _yield$hookRunners$mo2.routes;
                     debug("server routes: %o", routes);
-                    api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
+                    appContext = _objectSpread(_objectSpread({}, appContext), {}, {
                       entrypoints: entrypoints,
                       serverRoutes: routes
-                    }));
+                    });
+                    api.setAppContext(appContext);
                     nestedRouteEntries = entrypoints.map(function (point) {
                       return point.nestedRoutesEntry;
                     }).filter(Boolean);
@@ -127,85 +124,208 @@ export default (function () {
                       return point.entry;
                     }).filter(Boolean).concat(nestedRouteEntries);
                     originEntrypoints = cloneDeep(entrypoints);
-                    _context.next = 40;
+                    _context6.next = 42;
                     return generateCode(appContext, resolvedConfig, entrypoints, api);
-
-                  case 40:
-                    _context.next = 42;
+                  case 42:
+                    _context6.next = 44;
                     return getHtmlTemplate(entrypoints, api, {
                       appContext: appContext,
                       config: resolvedConfig
                     });
-
-                  case 42:
-                    htmlTemplates = _context.sent;
+                  case 44:
+                    htmlTemplates = _context6.sent;
                     debug("html templates: %o", htmlTemplates);
-                    _context.next = 46;
+                    _context6.next = 48;
                     return hookRunners.addDefineTypes();
-
-                  case 46:
+                  case 48:
                     debug("add Define Types");
-                    api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
+                    appContext = _objectSpread(_objectSpread({}, appContext), {}, {
                       entrypoints: entrypoints,
                       checkedEntries: defaultChecked,
                       apiOnly: apiOnly,
                       serverRoutes: routes,
                       htmlTemplates: htmlTemplates
-                    }));
-
-                  case 48:
+                    });
+                    api.setAppContext(appContext);
+                    command = getCommand();
+                    buildCommands = ['dev', 'build', 'inspect', 'deploy'];
+                    if (!buildCommands.includes(command)) {
+                      _context6.next = 60;
+                      break;
+                    }
+                    normalizedConfig = api.useResolvedConfigContext();
+                    _context6.next = 57;
+                    return createBuilderForEdenX({
+                      normalizedConfig: normalizedConfig,
+                      appContext: appContext,
+                      compatPluginConfig: {
+                        onBeforeBuild: function onBeforeBuild(_ref) {
+                          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+                            var bundlerConfigs, hookRunners;
+                            return _regeneratorRuntime().wrap(function _callee$(_context) {
+                              while (1) {
+                                switch (_context.prev = _context.next) {
+                                  case 0:
+                                    bundlerConfigs = _ref.bundlerConfigs;
+                                    hookRunners = api.useHookRunners();
+                                    _context.next = 4;
+                                    return generateRoutes(appContext);
+                                  case 4:
+                                    _context.next = 6;
+                                    return hookRunners.beforeBuild({
+                                      bundlerConfigs: bundlerConfigs
+                                    });
+                                  case 6:
+                                  case "end":
+                                    return _context.stop();
+                                }
+                              }
+                            }, _callee);
+                          }))();
+                        },
+                        onAfterBuild: function onAfterBuild(_ref2) {
+                          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+                            var stats, hookRunners;
+                            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                              while (1) {
+                                switch (_context2.prev = _context2.next) {
+                                  case 0:
+                                    stats = _ref2.stats;
+                                    hookRunners = api.useHookRunners();
+                                    _context2.next = 4;
+                                    return hookRunners.afterBuild({
+                                      stats: stats
+                                    });
+                                  case 4:
+                                    _context2.next = 6;
+                                    return emitResolvedConfig(appContext.appDirectory, normalizedConfig);
+                                  case 6:
+                                  case "end":
+                                    return _context2.stop();
+                                }
+                              }
+                            }, _callee2);
+                          }))();
+                        },
+                        onDevCompileDone: function onDevCompileDone(_ref3) {
+                          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+                            var isFirstCompile, hookRunners;
+                            return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                              while (1) {
+                                switch (_context3.prev = _context3.next) {
+                                  case 0:
+                                    isFirstCompile = _ref3.isFirstCompile;
+                                    hookRunners = api.useHookRunners();
+                                    if (process.stdout.isTTY || isFirstCompile) {
+                                      hookRunners.afterDev();
+                                      if (isFirstCompile) {
+                                        printInstructions(hookRunners, appContext, normalizedConfig);
+                                      }
+                                    }
+                                  case 3:
+                                  case "end":
+                                    return _context3.stop();
+                                }
+                              }
+                            }, _callee3);
+                          }))();
+                        },
+                        onBeforeCreateCompiler: function onBeforeCreateCompiler(_ref4) {
+                          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+                            var bundlerConfigs, hookRunners;
+                            return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+                              while (1) {
+                                switch (_context4.prev = _context4.next) {
+                                  case 0:
+                                    bundlerConfigs = _ref4.bundlerConfigs;
+                                    hookRunners = api.useHookRunners(); // run modernjs framework `beforeCreateCompiler` hook
+                                    _context4.next = 4;
+                                    return hookRunners.beforeCreateCompiler({
+                                      bundlerConfigs: bundlerConfigs
+                                    });
+                                  case 4:
+                                  case "end":
+                                    return _context4.stop();
+                                }
+                              }
+                            }, _callee4);
+                          }))();
+                        },
+                        onAfterCreateCompiler: function onAfterCreateCompiler(_ref5) {
+                          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+                            var compiler, hookRunners;
+                            return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+                              while (1) {
+                                switch (_context5.prev = _context5.next) {
+                                  case 0:
+                                    compiler = _ref5.compiler;
+                                    hookRunners = api.useHookRunners(); // run modernjs framework afterCreateCompiler hooks
+                                    _context5.next = 4;
+                                    return hookRunners.afterCreateCompiler({
+                                      compiler: compiler
+                                    });
+                                  case 4:
+                                  case "end":
+                                    return _context5.stop();
+                                }
+                              }
+                            }, _callee5);
+                          }))();
+                        }
+                      }
+                    });
+                  case 57:
+                    builder = _context6.sent;
+                    appContext = _objectSpread(_objectSpread({}, appContext), {}, {
+                      builder: builder
+                    });
+                    api.setAppContext(appContext);
+                  case 60:
                   case "end":
-                    return _context.stop();
+                    return _context6.stop();
                 }
               }
-            }, _callee);
+            }, _callee6);
           }))();
         },
         watchFiles: function watchFiles() {
           return pagesDir;
         },
         fileChange: function fileChange(e) {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
             var appContext, appDirectory, filename, eventType, isPageFile, absoluteFilePath, isRouteComponent, resolvedConfig, _yield$import, generateCode, entrypoints;
-
-            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+            return _regeneratorRuntime().wrap(function _callee7$(_context7) {
               while (1) {
-                switch (_context2.prev = _context2.next) {
+                switch (_context7.prev = _context7.next) {
                   case 0:
                     appContext = api.useAppContext();
                     appDirectory = appContext.appDirectory;
                     filename = e.filename, eventType = e.eventType;
-
                     isPageFile = function isPageFile(name) {
                       return pagesDir.some(function (pageDir) {
                         return name.includes(pageDir);
                       });
                     };
-
                     absoluteFilePath = path.resolve(appDirectory, filename);
                     isRouteComponent = isPageFile(absoluteFilePath) && isRouteComponentFile(absoluteFilePath);
-
                     if (!(isRouteComponent && (eventType === 'add' || eventType === 'unlink'))) {
-                      _context2.next = 14;
+                      _context7.next = 14;
                       break;
                     }
-
                     resolvedConfig = api.useResolvedConfigContext();
-                    _context2.next = 10;
+                    _context7.next = 10;
                     return import("./generateCode");
-
                   case 10:
-                    _yield$import = _context2.sent;
+                    _yield$import = _context7.sent;
                     generateCode = _yield$import.generateCode;
                     entrypoints = cloneDeep(originEntrypoints);
                     generateCode(appContext, resolvedConfig, entrypoints, api);
-
                   case 14:
                   case "end":
-                    return _context2.stop();
+                    return _context7.stop();
                 }
               }
-            }, _callee2);
+            }, _callee7);
           }))();
         }
       };

package/dist/js/treeshaking/analyze/isDefaultExportFunction.js

@@ -2,16 +2,13 @@ import fs from 'fs';
 import { parse } from '@babel/parser';
 import traverse from '@babel/traverse';
 import * as t from '@babel/types';
-
 var isFunction = function isFunction(node) {
   return t.isFunctionDeclaration(node) || t.isFunctionExpression(node) || t.isArrowFunctionExpression(node);
 };
-
 export var isDefaultExportFunction = function isDefaultExportFunction(file) {
   if (!file || !fs.existsSync(file)) {
     return false;
   }
-
   var ast = parse(fs.readFileSync(file, 'utf8'), {
     sourceType: 'unambiguous',
     plugins: ['jsx', 'typescript', 'classProperties', 'dynamicImport', 'exportDefaultFrom', 'exportNamespaceFrom', 'decorators-legacy', 'functionBind', 'classPrivateMethods', ['pipelineOperator', {
@@ -22,7 +19,6 @@ export var isDefaultExportFunction = function isDefaultExportFunction(file) {
   traverse(ast, {
     ExportDefaultDeclaration: function ExportDefaultDeclaration(path) {
       var declaration = path.node.declaration;
-
       if (isFunction(declaration)) {
         isExportFunction = true;
       }

package/dist/js/treeshaking/analyze/makeLegalIdentifier.js

@@ -9,10 +9,8 @@ export function makeLegalIdentifier(str) {
   var identifier = str.replace(/-(\w)/g, function (_, letter) {
     return letter.toUpperCase();
   }).replace(/[^$_a-zA-Z0-9]/g, '_');
-
   if (/\d/.test(identifier[0]) || forbidList.has(identifier)) {
     return "_".concat(identifier);
   }
-
   return identifier || '_';
 }

package/dist/js/treeshaking/analyze/nestedRoutes.js

@@ -12,59 +12,47 @@ var LOADING_FILE = 'loading';
 var ERROR_FILE = 'error';
 var LOADER_FILE = 'loader';
 var conventionNames = [LAYOUT_FILE, PAGE_FILE, LOADING_FILE, ERROR_FILE, LOADER_FILE];
-
 var replaceDynamicPath = function replaceDynamicPath(routePath) {
   return routePath.replace(/\[(.*?)\]/g, ':$1');
 };
-
-var createIndexRoute = function createIndexRoute(routeInfo, rootDir, filename) {
+var createIndexRoute = function createIndexRoute(routeInfo, rootDir, filename, entryName) {
   return createRoute(_objectSpread(_objectSpread({}, routeInfo), {}, {
     index: true,
     children: undefined
-  }), rootDir, filename);
+  }), rootDir, filename, entryName);
 };
-
-var createRoute = function createRoute(routeInfo, rootDir, filename) {
-  var id = getRouteId(filename, rootDir);
+var createRoute = function createRoute(routeInfo, rootDir, filename, entryName) {
+  var id = getRouteId(filename, rootDir, entryName);
   return _objectSpread(_objectSpread({}, routeInfo), {}, {
     id: id,
     type: 'nested'
   });
 };
-
 export var walk = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(dirname, rootDir, alias) {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(dirname, rootDir, alias, entryName) {
     var isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, items, _iterator, _step, item, itemPath, extname, itemWithoutExt, _isDirectory, childRoute, _route$children, _route$children2, _childRoute, finalRoute;
-
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
             return fs.pathExists(dirname);
-
           case 2:
             if (_context.sent) {
               _context.next = 4;
               break;
             }
-
             return _context.abrupt("return", null);
-
           case 4:
             _context.next = 6;
             return fs.stat(dirname);
-
           case 6:
             isDirectory = _context.sent.isDirectory();
-
             if (isDirectory) {
               _context.next = 9;
               break;
             }
-
             return _context.abrupt("return", null);
-
           case 9:
             relativeDir = path.relative(rootDir, dirname);
             pathSegments = relativeDir.split(path.sep);
@@ -73,11 +61,9 @@ export var walk = /*#__PURE__*/function () {
             isPathlessLayout = lastSegment.startsWith('__');
             isWithoutLayoutPath = lastSegment.includes('.');
             routePath = isRoot || isPathlessLayout ? '/' : "".concat(lastSegment);
-
             if (isWithoutLayoutPath) {
               routePath = lastSegment.split('.').join('/');
             }
-
             routePath = replaceDynamicPath(routePath);
             route = {
               path: routePath,
@@ -85,100 +71,76 @@ export var walk = /*#__PURE__*/function () {
             };
             _context.next = 21;
             return fs.readdir(dirname);
-
           case 21:
             items = _context.sent;
             _iterator = _createForOfIteratorHelper(items);
             _context.prev = 23;
-
             _iterator.s();
-
           case 25:
             if ((_step = _iterator.n()).done) {
               _context.next = 47;
               break;
             }
-
             item = _step.value;
             itemPath = path.join(dirname, item);
             extname = path.extname(item);
             itemWithoutExt = item.slice(0, -extname.length);
             _context.next = 32;
             return fs.stat(itemPath);
-
           case 32:
             _isDirectory = _context.sent.isDirectory();
-
             if (!_isDirectory) {
               _context.next = 38;
               break;
             }
-
             _context.next = 36;
-            return walk(itemPath, rootDir, alias);
-
+            return walk(itemPath, rootDir, alias, entryName);
           case 36:
             childRoute = _context.sent;
-
             if (childRoute) {
               (_route$children = route.children) === null || _route$children === void 0 ? void 0 : _route$children.push(childRoute);
             }
-
           case 38:
             if (!(extname && (!JS_EXTENSIONS.includes(extname) || !conventionNames.includes(itemWithoutExt)))) {
               _context.next = 40;
               break;
             }
-
             return _context.abrupt("continue", 45);
-
           case 40:
             if (itemWithoutExt === LAYOUT_FILE) {
               route._component = replaceWithAlias(alias.basename, itemPath, alias.name);
             }
-
             if (itemWithoutExt === PAGE_FILE) {
               _childRoute = createIndexRoute({
                 _component: 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 = replaceWithAlias(alias.basename, itemPath, alias.name);
             }
-
             if (itemWithoutExt === LOADING_FILE) {
               route.loading = replaceWithAlias(alias.basename, itemPath, alias.name);
             }
-
             if (itemWithoutExt === ERROR_FILE) {
               route.error = replaceWithAlias(alias.basename, itemPath, alias.name);
             }
-
           case 45:
             _context.next = 25;
             break;
-
           case 47:
             _context.next = 52;
             break;
-
           case 49:
             _context.prev = 49;
             _context.t0 = _context["catch"](23);
-
             _iterator.e(_context.t0);
-
           case 52:
             _context.prev = 52;
-
             _iterator.f();
-
             return _context.finish(52);
-
           case 55:
-            finalRoute = createRoute(route, rootDir, path.join(dirname, "".concat(LAYOUT_FILE, ".ts")));
+            finalRoute = createRoute(route, rootDir, path.join(dirname, "".concat(LAYOUT_FILE, ".ts")), entryName);
             /**
              * when the url is /, the __auth/layout.tsx component should not be rendered
              * - routes
@@ -186,13 +148,10 @@ export var walk = /*#__PURE__*/function () {
              *    - layout.tsx
              *  - layout.tsx
              */
-
             if (isPathlessLayout) {
               delete finalRoute.path;
             }
-
             return _context.abrupt("return", finalRoute);
-
           case 58:
           case "end":
             return _context.stop();
@@ -200,8 +159,7 @@ export var walk = /*#__PURE__*/function () {
       }
     }, _callee, null, [[23, 49, 52, 55]]);
   }));
-
-  return function walk(_x, _x2, _x3) {
+  return function walk(_x, _x2, _x3, _x4) {
     return _ref.apply(this, arguments);
   };
 }();