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

package/dist/js/treeshaking/builder/webpackPlugins/routerPlugin.js

@@ -0,0 +1,121 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import path from 'path';
+import { fs, ROUTE_MANIFEST, logger, ROUTE_MINIFEST_FILE } from '@modern-js/utils';
+var PLUGIN_NAME = 'ModernjsRoutePlugin';
+var RouterPlugin = /*#__PURE__*/function () {
+  function RouterPlugin(options) {
+    _classCallCheck(this, RouterPlugin);
+    _defineProperty(this, "existNestedRoutes", void 0);
+    this.existNestedRoutes = options.existNestedRoutes;
+  }
+  _createClass(RouterPlugin, [{
+    key: "apply",
+    value: function apply(compiler) {
+      var existNestedRoutes = this.existNestedRoutes;
+      var target = compiler.options.target;
+      if (target === 'node' || Array.isArray(target) && target.includes('node')) {
+        return;
+      }
+      if (!existNestedRoutes) {
+        return;
+      }
+      var webpack = compiler.webpack;
+      var Compilation = webpack.Compilation,
+        sources = webpack.sources;
+      var RawSource = sources.RawSource;
+      var PROCESS_ASSETS_STAGE_REPORT = Compilation.PROCESS_ASSETS_STAGE_REPORT;
+      var outputPath = compiler.options.output.path;
+      var newAssetsMap = new Map();
+      var normalizePath = function normalizePath(path) {
+        if (!path.endsWith('/')) {
+          return "".concat(path, "/");
+        }
+        return path;
+      };
+      compiler.hooks.thisCompilation.tap(PLUGIN_NAME, function (compilation) {
+        compilation.hooks.processAssets.tapPromise({
+          name: PLUGIN_NAME,
+          stage: PROCESS_ASSETS_STAGE_REPORT
+        }, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+          var stats, publicPath, routeAssets, namedChunkGroups, assetsByChunkName, _i, _Object$entries, _Object$entries$_i, name, chunkGroup, manifest, injectedContent, entrypointsArray, entryChunkIds, entryChunks, entryChunkFiles, _iterator, _step, file, asset, newContent, filename;
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  stats = compilation.getStats().toJson({
+                    chunkGroups: true,
+                    chunks: true
+                  });
+                  publicPath = stats.publicPath;
+                  routeAssets = {};
+                  namedChunkGroups = stats.namedChunkGroups, assetsByChunkName = stats.assetsByChunkName;
+                  if (!(!namedChunkGroups || !assetsByChunkName)) {
+                    _context.next = 7;
+                    break;
+                  }
+                  logger.warn('Route manifest does not exist, performance will be affected');
+                  return _context.abrupt("return");
+                case 7:
+                  for (_i = 0, _Object$entries = Object.entries(namedChunkGroups); _i < _Object$entries.length; _i++) {
+                    _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2), name = _Object$entries$_i[0], chunkGroup = _Object$entries$_i[1];
+                    routeAssets[name] = {
+                      chunkIds: chunkGroup.chunks,
+                      assets: assetsByChunkName[name].map(function (item) {
+                        return publicPath ? normalizePath(publicPath) + item : item;
+                      })
+                    };
+                  }
+                  manifest = {
+                    routeAssets: routeAssets
+                  };
+                  injectedContent = "\n            ;(function(){\n              window.".concat(ROUTE_MANIFEST, " = ").concat(JSON.stringify(manifest), ";\n            })();\n          ");
+                  entrypointsArray = Array.from(compilation.entrypoints.entries());
+                  entryChunkIds = entrypointsArray.map(function (entrypoint) {
+                    return entrypoint[0];
+                  });
+                  entryChunks = _toConsumableArray(compilation.chunks).filter(function (chunk) {
+                    return entryChunkIds.includes(chunk.name);
+                  });
+                  entryChunkFiles = entryChunks.map(function (chunk) {
+                    return _toConsumableArray(chunk.files)[0];
+                  });
+                  _iterator = _createForOfIteratorHelper(entryChunkFiles);
+                  try {
+                    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                      file = _step.value;
+                      asset = compilation.assets[file];
+                      newContent = "".concat(injectedContent).concat(asset.source().toString());
+                      newAssetsMap.set(path.join(outputPath, file), newContent);
+                      compilation.updateAsset(file, new RawSource(newContent));
+                    }
+                  } catch (err) {
+                    _iterator.e(err);
+                  } finally {
+                    _iterator.f();
+                  }
+                  filename = path.join(outputPath, ROUTE_MINIFEST_FILE);
+                  _context.next = 19;
+                  return fs.ensureFile(filename);
+                case 19:
+                  _context.next = 21;
+                  return fs.writeFile(filename, JSON.stringify(manifest, null, 2));
+                case 21:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        })));
+      });
+    }
+  }]);
+  return RouterPlugin;
+}();
+export { RouterPlugin as default };

package/dist/js/treeshaking/commands/build.js

@@ -2,166 +2,91 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import { ResolvedConfigContext } from '@modern-js/core';
-import { logger, isUseSSRBundle, printBuildError } from '@modern-js/utils';
+import { logger, printBuildError } from '@modern-js/utils';
 import { generateRoutes } from "../utils/routes";
-import { buildServerConfig, emitResolvedConfig } from "../utils/config";
-import createBuilder from "../builder";
+import { buildServerConfig } from "../utils/config";
 export var build = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(api, options) {
-    var resolvedConfig, appContext, hookRunners, apiOnly, _appDirectory, _distDirectory, _serverConfigFile, distDirectory, appDirectory, serverConfigFile, targets, builder;
-
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(api, options) {
+    var resolvedConfig, appContext, hookRunners, apiOnly, _appDirectory, _distDirectory, _serverConfigFile, distDirectory, appDirectory, serverConfigFile;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
-        switch (_context3.prev = _context3.next) {
+        switch (_context.prev = _context.next) {
           case 0:
+            if (options !== null && options !== void 0 && options.analyze) {
+              // Builder will read this env var to enable bundle analyzer
+              process.env.BUNDLE_ANALYZE = 'true';
+            }
             resolvedConfig = api.useResolvedConfigContext();
             appContext = api.useAppContext();
             hookRunners = api.useHookRunners();
             apiOnly = appContext.apiOnly;
-
             if (!apiOnly) {
-              _context3.next = 15;
+              _context.next = 16;
               break;
             }
-
             _appDirectory = appContext.appDirectory, _distDirectory = appContext.distDirectory, _serverConfigFile = appContext.serverConfigFile;
-            _context3.next = 8;
+            _context.next = 9;
             return hookRunners.beforeBuild({
               // "null" bundlerConfigs
               bundlerConfigs: undefined
             });
-
-          case 8:
-            _context3.next = 10;
+          case 9:
+            _context.next = 11;
             return buildServerConfig({
               appDirectory: _appDirectory,
               distDirectory: _distDirectory,
               configFile: _serverConfigFile
             });
-
-          case 10:
-            _context3.next = 12;
+          case 11:
+            _context.next = 13;
             return generateRoutes(appContext);
-
-          case 12:
-            _context3.next = 14;
+          case 13:
+            _context.next = 15;
             return hookRunners.afterBuild({
               // "null" stats
               stats: undefined
             });
-
-          case 14:
-            return _context3.abrupt("return");
-
           case 15:
+            return _context.abrupt("return");
+          case 16:
             resolvedConfig = _objectSpread(_objectSpread({}, resolvedConfig), {}, {
               cliOptions: options
             });
             ResolvedConfigContext.set(resolvedConfig);
             distDirectory = appContext.distDirectory, appDirectory = appContext.appDirectory, serverConfigFile = appContext.serverConfigFile;
-            _context3.next = 20;
+            _context.next = 21;
             return buildServerConfig({
               appDirectory: appDirectory,
               distDirectory: distDirectory,
               configFile: serverConfigFile
             });
-
-          case 20:
-            targets = ['web'];
-
-            if (resolvedConfig.output.enableModernMode) {
-              targets.push('modern-web');
-            }
-
-            if (isUseSSRBundle(resolvedConfig)) {
-              targets.push('node');
-            }
-
-            _context3.prev = 23;
-            _context3.next = 26;
-            return createBuilder({
-              target: targets,
-              appContext: appContext,
-              normalizedConfig: resolvedConfig,
-              compatPluginConfig: {
-                onBeforeBuild: function onBeforeBuild(_ref2) {
-                  return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-                    var bundlerConfigs;
-                    return _regeneratorRuntime().wrap(function _callee$(_context) {
-                      while (1) {
-                        switch (_context.prev = _context.next) {
-                          case 0:
-                            bundlerConfigs = _ref2.bundlerConfigs;
-                            _context.next = 3;
-                            return generateRoutes(appContext);
-
-                          case 3:
-                            _context.next = 5;
-                            return hookRunners.beforeBuild({
-                              bundlerConfigs: bundlerConfigs
-                            });
-
-                          case 5:
-                          case "end":
-                            return _context.stop();
-                        }
-                      }
-                    }, _callee);
-                  }))();
-                },
-                onAfterBuild: function onAfterBuild(_ref3) {
-                  return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-                    var stats;
-                    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-                      while (1) {
-                        switch (_context2.prev = _context2.next) {
-                          case 0:
-                            stats = _ref3.stats;
-                            _context2.next = 3;
-                            return hookRunners.afterBuild({
-                              stats: stats
-                            });
-
-                          case 3:
-                            _context2.next = 5;
-                            return emitResolvedConfig(appDirectory, resolvedConfig);
-
-                          case 5:
-                          case "end":
-                            return _context2.stop();
-                        }
-                      }
-                    }, _callee2);
-                  }))();
-                }
-              }
-            });
-
-          case 26:
-            builder = _context3.sent;
+          case 21:
+            _context.prev = 21;
             logger.info('Create a production build...\n');
-            _context3.next = 30;
-            return builder.build();
-
-          case 30:
-            _context3.next = 36;
+            if (appContext.builder) {
+              _context.next = 25;
+              break;
+            }
+            throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
+          case 25:
+            _context.next = 27;
+            return appContext.builder.build();
+          case 27:
+            _context.next = 33;
             break;
-
-          case 32:
-            _context3.prev = 32;
-            _context3.t0 = _context3["catch"](23);
-            printBuildError(_context3.t0); // eslint-disable-next-line no-process-exit
-
+          case 29:
+            _context.prev = 29;
+            _context.t0 = _context["catch"](21);
+            printBuildError(_context.t0);
+            // eslint-disable-next-line no-process-exit
             process.exit(1);
-
-          case 36:
+          case 33:
           case "end":
-            return _context3.stop();
+            return _context.stop();
         }
       }
-    }, _callee3, null, [[23, 32]]);
+    }, _callee, null, [[21, 29]]);
   }));
-
   return function build(_x, _x2) {
     return _ref.apply(this, arguments);
   };

package/dist/js/treeshaking/commands/deploy.js

@@ -10,11 +10,9 @@ export var deploy = /*#__PURE__*/function () {
             hookRunners = api.useHookRunners();
             _context.next = 3;
             return hookRunners.beforeDeploy(options);
-
           case 3:
             _context.next = 5;
             return hookRunners.afterDeploy(options);
-
           case 5:
           case "end":
             return _context.stop();
@@ -22,7 +20,6 @@ export var deploy = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-
   return function deploy(_x, _x2) {
     return _ref.apply(this, arguments);
   };

package/dist/js/treeshaking/commands/dev.js

@@ -1,39 +1,43 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import { logger, isSSR } from '@modern-js/utils';
+import { logger } from '@modern-js/utils';
 import { ResolvedConfigContext } from '@modern-js/core';
+import { createFileWatcher } from "../utils/createFileWatcher";
 import { printInstructions } from "../utils/printInstructions";
-import { createDevCompiler } from "../utils/createCompiler";
 import { createServer, injectDataLoaderPlugin } from "../utils/createServer";
 import { generateRoutes } from "../utils/routes";
 import { getSpecifiedEntries } from "../utils/getSpecifiedEntries";
 import { buildServerConfig } from "../utils/config";
 export var dev = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(api, options) {
-    var userConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, entrypoints, serverConfigFile, serverInternalPlugins, checkedEntries, compiler, target, app;
+    var _normalizedConfig$too;
+    var normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, entrypoints, serverConfigFile, serverInternalPlugins, checkedEntries, compiler, app;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            userConfig = api.useResolvedConfigContext();
+            if (options.analyze) {
+              // Builder will read this env var to enable bundle analyzer
+              process.env.BUNDLE_ANALYZE = 'true';
+            }
+            normalizedConfig = api.useResolvedConfigContext();
             appContext = api.useAppContext();
             hookRunners = api.useHookRunners();
-            userConfig = _objectSpread(_objectSpread({}, userConfig), {}, {
+            normalizedConfig = _objectSpread(_objectSpread({}, normalizedConfig), {}, {
               cliOptions: options
             });
-            ResolvedConfigContext.set(userConfig);
+            ResolvedConfigContext.set(normalizedConfig);
             appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, port = appContext.port, apiOnly = appContext.apiOnly, entrypoints = appContext.entrypoints, serverConfigFile = appContext.serverConfigFile, serverInternalPlugins = appContext.serverInternalPlugins;
-            _context2.next = 8;
+            _context2.next = 9;
             return getSpecifiedEntries(options.entry || false, entrypoints);
-
-          case 8:
+          case 9:
             checkedEntries = _context2.sent;
             api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
               checkedEntries: checkedEntries
             }));
             appContext.checkedEntries = checkedEntries;
-            _context2.next = 13;
+            _context2.next = 14;
             return buildServerConfig({
               appDirectory: appDirectory,
               distDirectory: distDirectory,
@@ -44,37 +48,30 @@ export var dev = /*#__PURE__*/function () {
                 }
               }
             });
-
-          case 13:
-            _context2.next = 15;
+          case 14:
+            _context2.next = 16;
             return hookRunners.beforeDev();
-
-          case 15:
+          case 16:
             compiler = null;
-
             if (apiOnly) {
-              _context2.next = 21;
+              _context2.next = 23;
               break;
             }
-
-            target = isSSR(userConfig) ? ['web', 'node'] : ['web'];
-            _context2.next = 20;
-            return createDevCompiler({
-              target: target,
-              api: api,
-              normalizedConfig: userConfig,
-              appContext: appContext
-            });
-
+            if (appContext.builder) {
+              _context2.next = 20;
+              break;
+            }
+            throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
           case 20:
+            _context2.next = 22;
+            return appContext.builder.createCompiler();
+          case 22:
             compiler = _context2.sent;
-
-          case 21:
-            _context2.next = 23;
-            return generateRoutes(appContext);
-
           case 23:
             _context2.next = 25;
+            return generateRoutes(appContext);
+          case 25:
+            _context2.next = 27;
             return createServer({
               dev: _objectSpread(_objectSpread({}, {
                 client: {
@@ -88,16 +85,15 @@ export var dev = /*#__PURE__*/function () {
                 hot: true,
                 liveReload: true,
                 port: port,
-                https: userConfig.dev.https
-              }), userConfig.tools.devServer),
+                https: normalizedConfig.dev.https
+              }), (_normalizedConfig$too = normalizedConfig.tools) === null || _normalizedConfig$too === void 0 ? void 0 : _normalizedConfig$too.devServer),
               compiler: compiler,
               pwd: appDirectory,
-              config: userConfig,
+              config: normalizedConfig,
               serverConfigFile: serverConfigFile,
               internalPlugins: injectDataLoaderPlugin(serverInternalPlugins)
             });
-
-          case 25:
+          case 27:
             app = _context2.sent;
             app.listen(port, /*#__PURE__*/function () {
               var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(err) {
@@ -109,16 +105,13 @@ export var dev = /*#__PURE__*/function () {
                           _context.next = 2;
                           break;
                         }
-
                         throw err;
-
                       case 2:
                         if (!apiOnly) {
-                          logger.info("Starting dev server...");
+                          logger.info("Starting dev server...\n");
                         } else {
-                          printInstructions(hookRunners, appContext, userConfig);
+                          printInstructions(hookRunners, appContext, normalizedConfig);
                         }
-
                       case 3:
                       case "end":
                         return _context.stop();
@@ -126,20 +119,19 @@ export var dev = /*#__PURE__*/function () {
                   }
                 }, _callee);
               }));
-
               return function (_x3) {
                 return _ref2.apply(this, arguments);
               };
             }());
-
-          case 27:
+            _context2.next = 31;
+            return createFileWatcher(appContext, normalizedConfig.source.configDir, hookRunners);
+          case 31:
           case "end":
             return _context2.stop();
         }
       }
     }, _callee2);
   }));
-
   return function dev(_x, _x2) {
     return _ref.apply(this, arguments);
   };

package/dist/js/treeshaking/commands/inspect.js

@@ -1,51 +1,33 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import { join } from 'path';
-import { isUseSSRBundle } from '@modern-js/utils';
-import createBuilder from "../builder";
 export var inspect = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(api, options) {
-    var resolvedConfig, appContext, targets, builder;
+    var appContext;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            resolvedConfig = api.useResolvedConfigContext();
             appContext = api.useAppContext();
-            targets = ['web'];
-
-            if (resolvedConfig.output.enableModernMode) {
-              targets.push('modern-web');
+            if (appContext.builder) {
+              _context.next = 3;
+              break;
             }
-
-            if (isUseSSRBundle(resolvedConfig)) {
-              targets.push('node');
-            }
-
-            _context.next = 7;
-            return createBuilder({
-              target: targets,
-              appContext: appContext,
-              normalizedConfig: resolvedConfig
-            });
-
-          case 7:
-            builder = _context.sent;
-            return _context.abrupt("return", builder.inspectConfig({
+            throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
+          case 3:
+            return _context.abrupt("return", appContext.builder.inspectConfig({
               env: options.env,
               verbose: options.verbose,
-              outputPath: join(builder.context.distPath, options.output),
+              outputPath: join(appContext === null || appContext === void 0 ? void 0 : appContext.builder.context.distPath, options.output),
               writeToDisk: true
             }));
-
-          case 9:
+          case 4:
           case "end":
             return _context.stop();
         }
       }
     }, _callee);
   }));
-
   return function inspect(_x, _x2) {
     return _ref.apply(this, arguments);
   };

package/dist/js/treeshaking/commands/start.js

@@ -7,7 +7,6 @@ import { injectDataLoaderPlugin } from "../utils/createServer";
 export var start = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(api) {
     var _userConfig$source;
-
     var appContext, userConfig, hookRunners, appDirectory, port, serverConfigFile, apiOnly, app;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
@@ -20,18 +19,17 @@ export var start = /*#__PURE__*/function () {
             logger.log(chalk.cyan("Starting the modern server..."));
             _context2.next = 7;
             return isApiOnly(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$source = userConfig.source) === null || _userConfig$source === void 0 ? void 0 : _userConfig$source.entriesDir);
-
           case 7:
             apiOnly = _context2.sent;
             _context2.next = 10;
             return server({
               pwd: appDirectory,
+              // FIXME: remove the `any` type
               config: userConfig,
               serverConfigFile: serverConfigFile,
               internalPlugins: injectDataLoaderPlugin(appContext.serverInternalPlugins),
               apiOnly: apiOnly
             });
-
           case 10:
             app = _context2.sent;
             app.listen(port, /*#__PURE__*/function () {
@@ -44,13 +42,10 @@ export var start = /*#__PURE__*/function () {
                           _context.next = 2;
                           break;
                         }
-
                         throw err;
-
                       case 2:
                         _context.next = 4;
                         return printInstructions(hookRunners, appContext, userConfig);
-
                       case 4:
                       case "end":
                         return _context.stop();
@@ -58,12 +53,10 @@ export var start = /*#__PURE__*/function () {
                   }
                 }, _callee);
               }));
-
               return function (_x2) {
                 return _ref2.apply(this, arguments);
               };
             }());
-
           case 12:
           case "end":
             return _context2.stop();
@@ -71,7 +64,6 @@ export var start = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-
   return function start(_x) {
     return _ref.apply(this, arguments);
   };