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

package/dist/js/node/utils/restart.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.restart = restart;
+var _core = require("@modern-js/core");
+var _utils = require("@modern-js/utils");
+async function restart(hooksRunner) {
+  _utils.logger.info('Restart...\n');
+  let hasGetError = false;
+  await hooksRunner.beforeRestart();
+  try {
+    await _core.cli.init(_core.cli.initOptions);
+  } catch (err) {
+    console.error(err);
+    hasGetError = true;
+  } finally {
+    if (!hasGetError) {
+      _utils.program.parse(process.argv);
+    }
+  }
+}

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

@@ -352,7 +352,7 @@ export var generateCode = /*#__PURE__*/function () {
             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));

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

@@ -55,7 +55,7 @@ export var getBundleEntry = function getBundleEntry(appContext, config) {
   }
   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,

package/dist/js/treeshaking/analyze/getFileSystemEntry.js

@@ -79,7 +79,7 @@ var scanDir = function scanDir(dirs) {
 export var getFileSystemEntry = function getFileSystemEntry(appContext, config) {
   var appDirectory = appContext.appDirectory;
   var entriesDir = config.source.entriesDir;
-  var src = ensureAbsolutePath(appDirectory, entriesDir);
+  var src = ensureAbsolutePath(appDirectory, entriesDir || '');
   if (fs.existsSync(src)) {
     if (fs.statSync(src).isDirectory()) {
       return scanDir(isBundleEntry(src) ? [src] : fs.readdirSync(src).map(function (file) {

package/dist/js/treeshaking/analyze/getHtmlTemplate.js

@@ -40,7 +40,7 @@ export var getHtmlTemplate = /*#__PURE__*/function () {
             appContext = _ref.appContext, config = _ref.config;
             appDirectory = appContext.appDirectory, internalDirectory = appContext.internalDirectory;
             configDir = config.source.configDir;
-            htmlDir = path.resolve(appDirectory, configDir, HTML_PARTIALS_FOLDER);
+            htmlDir = path.resolve(appDirectory, configDir || '', HTML_PARTIALS_FOLDER);
             htmlTemplates = {};
             _iterator = _createForOfIteratorHelper(entrypoints);
             _context2.prev = 6;

package/dist/js/treeshaking/analyze/getServerRoutes.js

@@ -87,10 +87,10 @@ var applyRouteOptions = function applyRouteOptions(original, routeOptions) {
  * @returns entrypoint Routes
  */
 var collectHtmlRoutes = function collectHtmlRoutes(entrypoints, appContext, config) {
-  var _config$output = config.output,
-    htmlPath = _config$output.htmlPath,
-    disableHtmlFolder = _config$output.disableHtmlFolder,
-    enableModernMode = _config$output.enableModernMode,
+  var disableHtmlFolder = config.html.disableHtmlFolder,
+    _config$output$distPa = config.output.distPath;
+  _config$output$distPa = _config$output$distPa === void 0 ? {} : _config$output$distPa;
+  var htmlPath = _config$output$distPa.html,
     _config$server = config.server,
     baseUrl = _config$server.baseUrl,
     routes = _config$server.routes,
@@ -110,7 +110,8 @@ var collectHtmlRoutes = function collectHtmlRoutes(entrypoints, appContext, conf
       isSPA: true,
       isSSR: isSSR,
       responseHeaders: resHeaders,
-      enableModernMode: Boolean(enableModernMode),
+      // FIXME: remove the config.enableModernMode
+      // enableModernMode: Boolean(enableModernMode),
       bundle: isSSR ? "".concat(SERVER_BUNDLE_DIRECTORY, "/").concat(entryName, ".js") : undefined
     };
     if (routes !== null && routes !== void 0 && routes.hasOwnProperty(entryName)) {
@@ -136,14 +137,14 @@ var collectStaticRoutes = function collectStaticRoutes(appContext, config) {
   var configDir = config.source.configDir,
     _config$server$public = config.server.publicRoutes,
     publicRoutes = _config$server$public === void 0 ? {} : _config$server$public;
-  var publicFolder = path.resolve(appDirectory, configDir, 'public');
+  var publicFolder = path.resolve(appDirectory, configDir || '', 'public');
   return fs.existsSync(publicFolder) ? walkDirectory(publicFolder).map(function (filePath) {
     var urlPath = "".concat(urlJoin(toPosix(filePath).slice(toPosix(publicFolder).length)));
     return {
       urlPath: publicRoutes[removeLeadingSlash(urlPath)] || urlPath,
       isSPA: true,
       isSSR: false,
-      entryPath: toPosix(path.relative(path.resolve(appDirectory, configDir), filePath))
+      entryPath: toPosix(path.relative(path.resolve(appDirectory, configDir || ''), filePath))
     };
   }) : [];
 };

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

@@ -3,7 +3,6 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 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";
@@ -11,35 +10,12 @@ import { printInstructions } from "../utils/printInstructions";
 import { generateRoutes } from "../utils/routes";
 import { emitResolvedConfig } from "../utils/config";
 import { getCommand } from "../utils/commands";
+import { initialNormalizedConfig } from "../config";
 import { isRouteComponentFile } from "./utils";
 var debug = createDebugger('plugin-analyze');
-export var modifyEntryImports = createAsyncWaterfall();
-export var modifyEntryExport = createAsyncWaterfall();
-export var addRuntimeExports = createAsyncWaterfall();
-export var modifyEntryRuntimePlugins = createAsyncWaterfall();
-export var modifyEntryRenderFunction = createAsyncWaterfall();
-export var modifyAsyncEntry = createAsyncWaterfall();
-export var modifyFileSystemRoutes = createAsyncWaterfall();
-export var modifyServerRoutes = createAsyncWaterfall();
-export var htmlPartials = createAsyncWaterfall();
-export var beforeGenerateRoutes = createAsyncWaterfall();
-export var addDefineTypes = createAsyncWaterfall();
 export default (function () {
   return {
     name: '@modern-js/plugin-analyze',
-    registerHook: {
-      modifyAsyncEntry: modifyAsyncEntry,
-      modifyEntryImports: modifyEntryImports,
-      modifyEntryExport: modifyEntryExport,
-      modifyEntryRuntimePlugins: modifyEntryRuntimePlugins,
-      modifyEntryRenderFunction: modifyEntryRenderFunction,
-      modifyFileSystemRoutes: modifyFileSystemRoutes,
-      modifyServerRoutes: modifyServerRoutes,
-      htmlPartials: htmlPartials,
-      addRuntimeExports: addRuntimeExports,
-      beforeGenerateRoutes: beforeGenerateRoutes,
-      addDefineTypes: addDefineTypes
-    },
     setup: function setup(api) {
       var pagesDir = [];
       var originEntrypoints = [];
@@ -61,7 +37,7 @@ export default (function () {
                       // FIXME:
                     }
                     _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);
+                    return isApiOnly(appContext.appDirectory, (_resolvedConfig$sourc = resolvedConfig.source) === null || _resolvedConfig$sourc === void 0 ? void 0 : _resolvedConfig$sourc.entriesDir);
                   case 6:
                     apiOnly = _context6.sent;
                     _context6.next = 9;
@@ -291,6 +267,14 @@ export default (function () {
         watchFiles: function watchFiles() {
           return pagesDir;
         },
+        resolvedConfig: function resolvedConfig(_ref6) {
+          var resolved = _ref6.resolved;
+          var appContext = api.useAppContext();
+          var config = initialNormalizedConfig(resolved, appContext);
+          return {
+            resolved: config
+          };
+        },
         fileChange: function fileChange(e) {
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
             var appContext, appDirectory, filename, eventType, isPageFile, absoluteFilePath, isRouteComponent, resolvedConfig, _yield$import, generateCode, entrypoints;

package/dist/js/treeshaking/builder/builderPlugins/compatModern.js

@@ -62,14 +62,15 @@ export var PluginCompatModern = function PluginCompatModern(appContext, modernCo
         }
 
         // apply copy plugin
-        // const copyPatterns = createCopyPatterns(chain, appContext, modernConfig);
-        var defaultCopyPattern = createCopyPattern(appContext, modernConfig, 'public', chain);
-        chain.plugin(CHAIN_ID.PLUGIN.COPY).tap(function (args) {
-          var _args$;
-          return [{
-            patterns: [].concat(_toConsumableArray(((_args$ = args[0]) === null || _args$ === void 0 ? void 0 : _args$.patterns) || []), [defaultCopyPattern])
-          }];
-        });
+        if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
+          var defaultCopyPattern = createCopyPattern(appContext, modernConfig, 'public', chain);
+          chain.plugin(CHAIN_ID.PLUGIN.COPY).tap(function (args) {
+            var _args$;
+            return [{
+              patterns: [].concat(_toConsumableArray(((_args$ = args[0]) === null || _args$ === void 0 ? void 0 : _args$.patterns) || []), [defaultCopyPattern])
+            }];
+          });
+        }
         var entrypoints = appContext.entrypoints;
         var existNestedRoutes = entrypoints.some(function (entrypoint) {
           return entrypoint.nestedRoutesEntry;
@@ -165,9 +166,9 @@ function applyBottomHtmlWebpackPlugin(_ref3) {
     // FIXME: the only need necessary
     var baseTemplateParams = _objectSpread({
       entryName: entryName,
-      title: getEntryOptions(entryName, modernConfig.output.title, modernConfig.output.titleByEntries, appContext.packageName),
-      mountId: modernConfig.output.mountId
-    }, getEntryOptions(entryName, modernConfig.output.templateParameters, modernConfig.output.templateParametersByEntries, appContext.packageName));
+      title: getEntryOptions(entryName, modernConfig.html.title, modernConfig.html.titleByEntries, appContext.packageName),
+      mountId: modernConfig.html.mountId
+    }, getEntryOptions(entryName, modernConfig.html.templateParameters, modernConfig.html.templateParametersByEntries, appContext.packageName));
     chain.plugin("".concat(CHAIN_ID.PLUGIN.HTML, "-").concat(entryName)).tap(function (args) {
       return [_objectSpread(_objectSpread({}, args[0] || {}), {}, {
         __internal__: true,

package/dist/js/treeshaking/builder/index.js

@@ -1,14 +1,13 @@
 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 _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import { createBuilder } from '@modern-js/builder';
 import { builderWebpackProvider } from '@modern-js/builder-webpack-provider';
 import { applyOptionsChain, isUseSSRBundle } from '@modern-js/utils';
 import { PluginCompatModern } from "./builderPlugins/compatModern";
-import { createHtmlConfig } from "./createHtmlConfig";
-import { createOutputConfig } from "./createOutputConfig";
-import { createSourceConfig } from "./createSourceConfig";
-import { createToolsConfig } from "./createToolsConfig";
+import { createCopyPattern } from "./share";
 function getBuilderTargets(normalizedConfig) {
   var targets = ['web'];
   if (normalizedConfig.output.enableModernMode && !targets.includes('modern-web')) {
@@ -30,7 +29,8 @@ function _createBuilderForEdenX() {
         switch (_context.prev = _context.next) {
           case 0:
             normalizedConfig = _ref.normalizedConfig, appContext = _ref.appContext, compatPluginConfig = _ref.compatPluginConfig;
-            builderConfig = createBuilderProviderConfig(normalizedConfig, appContext); // create webpack provider
+            // create webpack provider
+            builderConfig = createBuilderProviderConfig(normalizedConfig, appContext);
             webpackProvider = builderWebpackProvider({
               builderConfig: builderConfig
             });
@@ -53,25 +53,40 @@ function _createBuilderForEdenX() {
   }));
   return _createBuilderForEdenX.apply(this, arguments);
 }
-function createBuilderProviderConfig(normalizedConfig, appContext) {
-  var source = createSourceConfig(normalizedConfig, appContext);
-  var html = createHtmlConfig(normalizedConfig, appContext);
+export function createBuilderProviderConfig(normalizedConfig, appContext) {
   var output = createOutputConfig(normalizedConfig, appContext);
-  var tools = createToolsConfig(normalizedConfig);
-  return {
-    source: source,
-    html: html,
+  return _objectSpread(_objectSpread({}, normalizedConfig), {}, {
+    source: _objectSpread(_objectSpread({}, normalizedConfig.source), {}, {
+      resolveExtensionPrefix: '.web'
+    }),
     output: output,
-    tools: tools,
     dev: {
       https: normalizedConfig.dev.https,
       assetPrefix: normalizedConfig.dev.assetPrefix
     },
-    performance: {
+    html: _objectSpread(_objectSpread({}, normalizedConfig.html), {}, {
+      templateByEntries: normalizedConfig.html.templateByEntries || appContext.htmlTemplates
+    }),
+    performance: _objectSpread(_objectSpread({}, normalizedConfig.performance), {}, {
       // `@modern-js/webpack` used to remove moment locale by default
       removeMomentLocale: true
-    }
-  };
+    })
+  });
+  function createOutputConfig(config, appContext) {
+    var defaultCopyPattern = createCopyPattern(appContext, config, 'upload');
+    var copy = config.output.copy;
+    var copyOptions = Array.isArray(copy) ? copy : copy === null || copy === void 0 ? void 0 : copy.patterns;
+    var builderCopy = [].concat(_toConsumableArray(copyOptions || []), [defaultCopyPattern]);
+    return _objectSpread(_objectSpread({}, config.output), {}, {
+      copy: builderCopy,
+      // We need to do this in the app-tools prepare hook because some files will be generated into the dist directory in the analyze process
+      cleanDistPath: false,
+      // `@modern-js/webpack` used to generate asset manifest by default
+      enableAssetManifest: true,
+      // compatible the modern-js with fallback behavior
+      enableAssetFallback: true
+    });
+  }
 }
 export function createBuilderOptions(target, appContext) {
   // create entries

package/dist/js/treeshaking/builder/share.js

@@ -2,7 +2,7 @@ import path from 'path';
 import { template as lodashTemplate } from '@modern-js/utils/lodash';
 import { removeTailSlash } from '@modern-js/utils';
 export function createCopyPattern(appContext, config, patternsType, chain) {
-  var configDir = path.resolve(appContext.appDirectory, config.source.configDir);
+  var configDir = path.resolve(appContext.appDirectory, config.source.configDir || './config');
   var uploadDir = path.posix.join(configDir.replace(/\\/g, '/'), 'upload');
   var publicDir = path.posix.join(configDir.replace(/\\/g, '/'), 'public');
   var minifiedJsRexExp = /\.min\.js/;

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

@@ -7,75 +7,85 @@ import { generateRoutes } from "../utils/routes";
 import { buildServerConfig } from "../utils/config";
 export var build = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(api, options) {
-    var resolvedConfig, appContext, hookRunners, apiOnly, _appDirectory, _distDirectory, _serverConfigFile, distDirectory, appDirectory, serverConfigFile, _appContext$builder;
+    var resolvedConfig, appContext, hookRunners, apiOnly, _appDirectory, _distDirectory, _serverConfigFile, distDirectory, appDirectory, serverConfigFile;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         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) {
-              _context.next = 15;
+              _context.next = 16;
               break;
             }
             _appDirectory = appContext.appDirectory, _distDirectory = appContext.distDirectory, _serverConfigFile = appContext.serverConfigFile;
-            _context.next = 8;
+            _context.next = 9;
             return hookRunners.beforeBuild({
               // "null" bundlerConfigs
               bundlerConfigs: undefined
             });
-          case 8:
-            _context.next = 10;
+          case 9:
+            _context.next = 11;
             return buildServerConfig({
               appDirectory: _appDirectory,
               distDirectory: _distDirectory,
               configFile: _serverConfigFile
             });
-          case 10:
-            _context.next = 12;
+          case 11:
+            _context.next = 13;
             return generateRoutes(appContext);
-          case 12:
-            _context.next = 14;
+          case 13:
+            _context.next = 15;
             return hookRunners.afterBuild({
               // "null" stats
               stats: undefined
             });
-          case 14:
-            return _context.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;
-            _context.next = 20;
+            _context.next = 21;
             return buildServerConfig({
               appDirectory: appDirectory,
               distDirectory: distDirectory,
               configFile: serverConfigFile
             });
-          case 20:
-            _context.prev = 20;
+          case 21:
+            _context.prev = 21;
             logger.info('Create a production build...\n');
-            _context.next = 24;
-            return (_appContext$builder = appContext.builder) === null || _appContext$builder === void 0 ? void 0 : _appContext$builder.build();
-          case 24:
-            _context.next = 30;
+            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 26:
-            _context.prev = 26;
-            _context.t0 = _context["catch"](20);
+          case 29:
+            _context.prev = 29;
+            _context.t0 = _context["catch"](21);
             printBuildError(_context.t0);
             // eslint-disable-next-line no-process-exit
             process.exit(1);
-          case 30:
+          case 33:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[20, 26]]);
+    }, _callee, null, [[21, 29]]);
   }));
   return function build(_x, _x2) {
     return _ref.apply(this, arguments);

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

@@ -3,6 +3,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import { logger } from '@modern-js/utils';
 import { ResolvedConfigContext } from '@modern-js/core';
+import { createFileWatcher } from "../utils/createFileWatcher";
 import { printInstructions } from "../utils/printInstructions";
 import { createServer, injectDataLoaderPlugin } from "../utils/createServer";
 import { generateRoutes } from "../utils/routes";
@@ -10,28 +11,33 @@ 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, _appContext$builder, 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,
@@ -42,24 +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 = 23;
+              break;
+            }
+            if (appContext.builder) {
               _context2.next = 20;
               break;
             }
-            _context2.next = 19;
-            return (_appContext$builder = appContext.builder) === null || _appContext$builder === void 0 ? void 0 : _appContext$builder.createCompiler();
-          case 19:
-            compiler = _context2.sent;
+            throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
           case 20:
             _context2.next = 22;
-            return generateRoutes(appContext);
+            return appContext.builder.createCompiler();
           case 22:
-            _context2.next = 24;
+            compiler = _context2.sent;
+          case 23:
+            _context2.next = 25;
+            return generateRoutes(appContext);
+          case 25:
+            _context2.next = 27;
             return createServer({
               dev: _objectSpread(_objectSpread({}, {
                 client: {
@@ -73,15 +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 24:
+          case 27:
             app = _context2.sent;
             app.listen(port, /*#__PURE__*/function () {
               var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(err) {
@@ -98,7 +110,7 @@ export var dev = /*#__PURE__*/function () {
                         if (!apiOnly) {
                           logger.info("Starting dev server...\n");
                         } else {
-                          printInstructions(hookRunners, appContext, userConfig);
+                          printInstructions(hookRunners, appContext, normalizedConfig);
                         }
                       case 3:
                       case "end":
@@ -111,7 +123,9 @@ export var dev = /*#__PURE__*/function () {
                 return _ref2.apply(this, arguments);
               };
             }());
-          case 26:
+            _context2.next = 31;
+            return createFileWatcher(appContext, normalizedConfig.source.configDir, hookRunners);
+          case 31:
           case "end":
             return _context2.stop();
         }

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

@@ -3,20 +3,25 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import { join } from 'path';
 export var inspect = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(api, options) {
-    var _appContext$builder;
     var appContext;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             appContext = api.useAppContext();
-            return _context.abrupt("return", (_appContext$builder = appContext.builder) === null || _appContext$builder === void 0 ? void 0 : _appContext$builder.inspectConfig({
+            if (appContext.builder) {
+              _context.next = 3;
+              break;
+            }
+            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(appContext === null || appContext === void 0 ? void 0 : appContext.builder.context.distPath, options.output),
               writeToDisk: true
             }));
-          case 2:
+          case 4:
           case "end":
             return _context.stop();
         }

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

@@ -24,6 +24,7 @@ export var start = /*#__PURE__*/function () {
             _context2.next = 10;
             return server({
               pwd: appDirectory,
+              // FIXME: remove the `any` type
               config: userConfig,
               serverConfigFile: serverConfigFile,
               internalPlugins: injectDataLoaderPlugin(appContext.serverInternalPlugins),