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

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

@@ -123,7 +123,7 @@ 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) {

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

@@ -63,7 +63,7 @@ const getBundleEntry = (appContext, config) => {
   }
   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,

package/dist/js/node/analyze/getFileSystemEntry.js

@@ -74,7 +74,7 @@ const getFileSystemEntry = (appContext, config) => {
       entriesDir
     }
   } = config;
-  const src = (0, _utils.ensureAbsolutePath)(appDirectory, entriesDir);
+  const src = (0, _utils.ensureAbsolutePath)(appDirectory, entriesDir || '');
   if (_fs.default.existsSync(src)) {
     if (_fs.default.statSync(src).isDirectory()) {
       return scanDir(isBundleEntry(src) ? [src] : _fs.default.readdirSync(src).map(file => _path.default.join(src, file)).filter(file => _fs.default.statSync(file).isDirectory() && isBundleEntry(file)));

package/dist/js/node/analyze/getHtmlTemplate.js

@@ -45,7 +45,7 @@ const getHtmlTemplate = async (entrypoints, api, {
       configDir
     }
   } = config;
-  const htmlDir = _path.default.resolve(appDirectory, configDir, _constants.HTML_PARTIALS_FOLDER);
+  const htmlDir = _path.default.resolve(appDirectory, configDir || '', _constants.HTML_PARTIALS_FOLDER);
   const htmlTemplates = {};
   for (const entrypoint of entrypoints) {
     const {

package/dist/js/node/analyze/getServerRoutes.js

@@ -100,10 +100,13 @@ const applyRouteOptions = (original, routeOptions) => {
  */
 const collectHtmlRoutes = (entrypoints, appContext, config) => {
   const {
+    html: {
+      disableHtmlFolder
+    },
     output: {
-      htmlPath,
-      disableHtmlFolder,
-      enableModernMode
+      distPath: {
+        html: htmlPath
+      } = {}
     },
     server: {
       baseUrl,
@@ -130,7 +133,8 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
       isSPA: true,
       isSSR,
       responseHeaders: resHeaders,
-      enableModernMode: Boolean(enableModernMode),
+      // FIXME: remove the config.enableModernMode
+      // enableModernMode: Boolean(enableModernMode),
       bundle: isSSR ? `${_utils.SERVER_BUNDLE_DIRECTORY}/${entryName}.js` : undefined
     };
     if (routes !== null && routes !== void 0 && routes.hasOwnProperty(entryName)) {
@@ -163,14 +167,14 @@ const collectStaticRoutes = (appContext, config) => {
       publicRoutes = {}
     }
   } = config;
-  const publicFolder = _path.default.resolve(appDirectory, configDir, 'public');
+  const publicFolder = _path.default.resolve(appDirectory, configDir || '', 'public');
   return _fs.default.existsSync(publicFolder) ? (0, _utils2.walkDirectory)(publicFolder).map(filePath => {
     const urlPath = `${(0, _utils.urlJoin)(toPosix(filePath).slice(toPosix(publicFolder).length))}`;
     return {
       urlPath: publicRoutes[(0, _utils.removeLeadingSlash)(urlPath)] || urlPath,
       isSPA: true,
       isSSR: false,
-      entryPath: toPosix(_path.default.relative(_path.default.resolve(appDirectory, configDir), filePath))
+      entryPath: toPosix(_path.default.relative(_path.default.resolve(appDirectory, configDir || ''), filePath))
     };
   }) : [];
 };

package/dist/js/node/analyze/index.js

@@ -3,9 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.modifyServerRoutes = exports.modifyFileSystemRoutes = exports.modifyEntryRuntimePlugins = exports.modifyEntryRenderFunction = exports.modifyEntryImports = exports.modifyEntryExport = exports.modifyAsyncEntry = exports.htmlPartials = exports.default = exports.beforeGenerateRoutes = exports.addRuntimeExports = exports.addDefineTypes = void 0;
+exports.default = void 0;
 var path = _interopRequireWildcard(require("path"));
-var _plugin = require("@modern-js/plugin");
 var _utils = require("@modern-js/utils");
 var _lodash = require("@modern-js/utils/lodash");
 var _builder = require("../builder");
@@ -13,6 +12,7 @@ var _printInstructions = require("../utils/printInstructions");
 var _routes = require("../utils/routes");
 var _config = require("../utils/config");
 var _commands = require("../utils/commands");
+var _config2 = require("../config");
 var _utils2 = require("./utils");
 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; }
@@ -20,43 +20,8 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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 debug = (0, _utils.createDebugger)('plugin-analyze');
-const modifyEntryImports = (0, _plugin.createAsyncWaterfall)();
-exports.modifyEntryImports = modifyEntryImports;
-const modifyEntryExport = (0, _plugin.createAsyncWaterfall)();
-exports.modifyEntryExport = modifyEntryExport;
-const addRuntimeExports = (0, _plugin.createAsyncWaterfall)();
-exports.addRuntimeExports = addRuntimeExports;
-const modifyEntryRuntimePlugins = (0, _plugin.createAsyncWaterfall)();
-exports.modifyEntryRuntimePlugins = modifyEntryRuntimePlugins;
-const modifyEntryRenderFunction = (0, _plugin.createAsyncWaterfall)();
-exports.modifyEntryRenderFunction = modifyEntryRenderFunction;
-const modifyAsyncEntry = (0, _plugin.createAsyncWaterfall)();
-exports.modifyAsyncEntry = modifyAsyncEntry;
-const modifyFileSystemRoutes = (0, _plugin.createAsyncWaterfall)();
-exports.modifyFileSystemRoutes = modifyFileSystemRoutes;
-const modifyServerRoutes = (0, _plugin.createAsyncWaterfall)();
-exports.modifyServerRoutes = modifyServerRoutes;
-const htmlPartials = (0, _plugin.createAsyncWaterfall)();
-exports.htmlPartials = htmlPartials;
-const beforeGenerateRoutes = (0, _plugin.createAsyncWaterfall)();
-exports.beforeGenerateRoutes = beforeGenerateRoutes;
-const addDefineTypes = (0, _plugin.createAsyncWaterfall)();
-exports.addDefineTypes = addDefineTypes;
 var _default = () => ({
   name: '@modern-js/plugin-analyze',
-  registerHook: {
-    modifyAsyncEntry,
-    modifyEntryImports,
-    modifyEntryExport,
-    modifyEntryRuntimePlugins,
-    modifyEntryRenderFunction,
-    modifyFileSystemRoutes,
-    modifyServerRoutes,
-    htmlPartials,
-    addRuntimeExports,
-    beforeGenerateRoutes,
-    addDefineTypes
-  },
   setup: api => {
     let pagesDir = [];
     let originEntrypoints = [];
@@ -71,7 +36,7 @@ var _default = () => ({
         } catch (_unused) {
           // FIXME:
         }
-        const apiOnly = await (0, _utils.isApiOnly)(appContext.appDirectory, resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig$sourc = resolvedConfig.source) === null || _resolvedConfig$sourc === void 0 ? void 0 : _resolvedConfig$sourc.entriesDir);
+        const apiOnly = await (0, _utils.isApiOnly)(appContext.appDirectory, (_resolvedConfig$sourc = resolvedConfig.source) === null || _resolvedConfig$sourc === void 0 ? void 0 : _resolvedConfig$sourc.entriesDir);
         await hookRunners.addRuntimeExports();
         if (apiOnly) {
           const {
@@ -138,7 +103,7 @@ var _default = () => ({
         if (buildCommands.includes(command)) {
           const normalizedConfig = api.useResolvedConfigContext();
           const builder = await (0, _builder.createBuilderForEdenX)({
-            normalizedConfig,
+            normalizedConfig: normalizedConfig,
             appContext,
             compatPluginConfig: {
               async onBeforeBuild({
@@ -199,6 +164,15 @@ var _default = () => ({
       watchFiles() {
         return pagesDir;
       },
+      resolvedConfig({
+        resolved
+      }) {
+        const appContext = api.useAppContext();
+        const config = (0, _config2.initialNormalizedConfig)(resolved, appContext);
+        return {
+          resolved: config
+        };
+      },
       async fileChange(e) {
         const appContext = api.useAppContext();
         const {

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

@@ -69,14 +69,15 @@ const PluginCompatModern = (appContext, modernConfig, options) => ({
       }
 
       // apply copy plugin
-      // const copyPatterns = createCopyPatterns(chain, appContext, modernConfig);
-      const defaultCopyPattern = (0, _share.createCopyPattern)(appContext, modernConfig, 'public', chain);
-      chain.plugin(CHAIN_ID.PLUGIN.COPY).tap(args => {
-        var _args$;
-        return [{
-          patterns: [...(((_args$ = args[0]) === null || _args$ === void 0 ? void 0 : _args$.patterns) || []), defaultCopyPattern]
-        }];
-      });
+      if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
+        const defaultCopyPattern = (0, _share.createCopyPattern)(appContext, modernConfig, 'public', chain);
+        chain.plugin(CHAIN_ID.PLUGIN.COPY).tap(args => {
+          var _args$;
+          return [{
+            patterns: [...(((_args$ = args[0]) === null || _args$ === void 0 ? void 0 : _args$.patterns) || []), defaultCopyPattern]
+          }];
+        });
+      }
       const {
         entrypoints
       } = appContext;
@@ -175,9 +176,9 @@ function applyBottomHtmlWebpackPlugin({
     // FIXME: the only need necessary
     const baseTemplateParams = _objectSpread({
       entryName,
-      title: (0, _utils.getEntryOptions)(entryName, modernConfig.output.title, modernConfig.output.titleByEntries, appContext.packageName),
-      mountId: modernConfig.output.mountId
-    }, (0, _utils.getEntryOptions)(entryName, modernConfig.output.templateParameters, modernConfig.output.templateParametersByEntries, appContext.packageName));
+      title: (0, _utils.getEntryOptions)(entryName, modernConfig.html.title, modernConfig.html.titleByEntries, appContext.packageName),
+      mountId: modernConfig.html.mountId
+    }, (0, _utils.getEntryOptions)(entryName, modernConfig.html.templateParameters, modernConfig.html.templateParametersByEntries, appContext.packageName));
     chain.plugin(`${CHAIN_ID.PLUGIN.HTML}-${entryName}`).tap(args => [_objectSpread(_objectSpread({}, args[0] || {}), {}, {
       __internal__: true,
       bottomTemplate: appContext.htmlTemplates[`__${entryName}-bottom__`] && (0, _lodash.template)(appContext.htmlTemplates[`__${entryName}-bottom__`])(baseTemplateParams)

package/dist/js/node/builder/index.js

@@ -5,16 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createBuilderForEdenX = createBuilderForEdenX;
 exports.createBuilderOptions = createBuilderOptions;
+exports.createBuilderProviderConfig = createBuilderProviderConfig;
 var _builder = require("@modern-js/builder");
 var _builderWebpackProvider = require("@modern-js/builder-webpack-provider");
 var _utils = require("@modern-js/utils");
 var _compatModern = require("./builderPlugins/compatModern");
-var _createHtmlConfig = require("./createHtmlConfig");
-var _createOutputConfig = require("./createOutputConfig");
-var _createSourceConfig = require("./createSourceConfig");
-var _createToolsConfig = require("./createToolsConfig");
+var _share = require("./share");
 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 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; }
 function getBuilderTargets(normalizedConfig) {
   const targets = ['web'];
   if (normalizedConfig.output.enableModernMode && !targets.includes('modern-web')) {
@@ -30,8 +31,8 @@ async function createBuilderForEdenX({
   appContext,
   compatPluginConfig
 }) {
-  const builderConfig = createBuilderProviderConfig(normalizedConfig, appContext);
   // create webpack provider
+  const builderConfig = createBuilderProviderConfig(normalizedConfig, appContext);
   const webpackProvider = (0, _builderWebpackProvider.builderWebpackProvider)({
     builderConfig
   });
@@ -42,24 +43,41 @@ async function createBuilderForEdenX({
   return builder;
 }
 function createBuilderProviderConfig(normalizedConfig, appContext) {
-  const source = (0, _createSourceConfig.createSourceConfig)(normalizedConfig, appContext);
-  const html = (0, _createHtmlConfig.createHtmlConfig)(normalizedConfig, appContext);
-  const output = (0, _createOutputConfig.createOutputConfig)(normalizedConfig, appContext);
-  const tools = (0, _createToolsConfig.createToolsConfig)(normalizedConfig);
-  return {
-    source,
-    html,
+  const output = createOutputConfig(normalizedConfig, appContext);
+  return _objectSpread(_objectSpread({}, normalizedConfig), {}, {
+    source: _objectSpread(_objectSpread({}, normalizedConfig.source), {}, {
+      resolveExtensionPrefix: '.web'
+    }),
     output,
-    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) {
+    const defaultCopyPattern = (0, _share.createCopyPattern)(appContext, config, 'upload');
+    const {
+      copy
+    } = config.output;
+    const copyOptions = Array.isArray(copy) ? copy : copy === null || copy === void 0 ? void 0 : copy.patterns;
+    const builderCopy = [...(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
+    });
+  }
 }
 function createBuilderOptions(target, appContext) {
   // create entries

package/dist/js/node/builder/share.js

@@ -9,7 +9,7 @@ var _lodash = require("@modern-js/utils/lodash");
 var _utils = require("@modern-js/utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function createCopyPattern(appContext, config, patternsType, chain) {
-  const configDir = _path.default.resolve(appContext.appDirectory, config.source.configDir);
+  const configDir = _path.default.resolve(appContext.appDirectory, config.source.configDir || './config');
   const uploadDir = _path.default.posix.join(configDir.replace(/\\/g, '/'), 'upload');
   const publicDir = _path.default.posix.join(configDir.replace(/\\/g, '/'), 'public');
   const minifiedJsRexExp = /\.min\.js/;

package/dist/js/node/commands/build.js

@@ -12,6 +12,10 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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 build = async (api, options) => {
+  if (options !== null && options !== void 0 && options.analyze) {
+    // Builder will read this env var to enable bundle analyzer
+    process.env.BUNDLE_ANALYZE = 'true';
+  }
   let resolvedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
   const hookRunners = api.useHookRunners();
@@ -55,9 +59,11 @@ const build = async (api, options) => {
     configFile: serverConfigFile
   });
   try {
-    var _appContext$builder;
     _utils.logger.info('Create a production build...\n');
-    await ((_appContext$builder = appContext.builder) === null || _appContext$builder === void 0 ? void 0 : _appContext$builder.build());
+    if (!appContext.builder) {
+      throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
+    }
+    await appContext.builder.build();
   } catch (error) {
     (0, _utils.printBuildError)(error);
     // eslint-disable-next-line no-process-exit

package/dist/js/node/commands/dev.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.dev = void 0;
 var _utils = require("@modern-js/utils");
 var _core = require("@modern-js/core");
+var _createFileWatcher = require("../utils/createFileWatcher");
 var _printInstructions = require("../utils/printInstructions");
 var _createServer = require("../utils/createServer");
 var _routes = require("../utils/routes");
@@ -15,13 +16,18 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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 dev = async (api, options) => {
-  let userConfig = api.useResolvedConfigContext();
+  var _normalizedConfig$too;
+  if (options.analyze) {
+    // Builder will read this env var to enable bundle analyzer
+    process.env.BUNDLE_ANALYZE = 'true';
+  }
+  let normalizedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
   const hookRunners = api.useHookRunners();
-  userConfig = _objectSpread(_objectSpread({}, userConfig), {}, {
+  normalizedConfig = _objectSpread(_objectSpread({}, normalizedConfig), {}, {
     cliOptions: options
   });
-  _core.ResolvedConfigContext.set(userConfig);
+  _core.ResolvedConfigContext.set(normalizedConfig);
   const {
     appDirectory,
     distDirectory,
@@ -49,8 +55,10 @@ const dev = async (api, options) => {
   await hookRunners.beforeDev();
   let compiler = null;
   if (!apiOnly) {
-    var _appContext$builder;
-    compiler = await ((_appContext$builder = appContext.builder) === null || _appContext$builder === void 0 ? void 0 : _appContext$builder.createCompiler());
+    if (!appContext.builder) {
+      throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
+    }
+    compiler = await appContext.builder.createCompiler();
   }
   await (0, _routes.generateRoutes)(appContext);
   const app = await (0, _createServer.createServer)({
@@ -64,11 +72,11 @@ const dev = async (api, options) => {
       hot: true,
       liveReload: true,
       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,
     pwd: appDirectory,
-    config: userConfig,
+    config: normalizedConfig,
     serverConfigFile,
     internalPlugins: (0, _createServer.injectDataLoaderPlugin)(serverInternalPlugins)
   });
@@ -79,8 +87,9 @@ const dev = async (api, options) => {
     if (!apiOnly) {
       _utils.logger.info(`Starting dev server...\n`);
     } else {
-      (0, _printInstructions.printInstructions)(hookRunners, appContext, userConfig);
+      (0, _printInstructions.printInstructions)(hookRunners, appContext, normalizedConfig);
     }
   });
+  await (0, _createFileWatcher.createFileWatcher)(appContext, normalizedConfig.source.configDir, hookRunners);
 };
 exports.dev = dev;

package/dist/js/node/commands/inspect.js

@@ -6,9 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.inspect = void 0;
 var _path = require("path");
 const inspect = async (api, options) => {
-  var _appContext$builder;
   const appContext = api.useAppContext();
-  return (_appContext$builder = appContext.builder) === null || _appContext$builder === void 0 ? void 0 : _appContext$builder.inspectConfig({
+  if (!appContext.builder) {
+    throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
+  }
+  return appContext.builder.inspectConfig({
     env: options.env,
     verbose: options.verbose,
     outputPath: (0, _path.join)(appContext === null || appContext === void 0 ? void 0 : appContext.builder.context.distPath, options.output),

package/dist/js/node/commands/start.js

@@ -23,6 +23,7 @@ const start = async api => {
   const apiOnly = await (0, _utils.isApiOnly)(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$source = userConfig.source) === null || _userConfig$source === void 0 ? void 0 : _userConfig$source.entriesDir);
   const app = await (0, _prodServer.default)({
     pwd: appDirectory,
+    // FIXME: remove the `any` type
     config: userConfig,
     serverConfigFile,
     internalPlugins: (0, _createServer.injectDataLoaderPlugin)(appContext.serverInternalPlugins),

package/dist/js/node/config/default.js

@@ -0,0 +1,214 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createDefaultConfig = createDefaultConfig;
+exports.createLegacyDefaultConfig = createLegacyDefaultConfig;
+function createDefaultConfig(appContext) {
+  const defaultAlias = appContext ? {
+    [appContext.internalDirAlias]: appContext.internalDirectory,
+    [appContext.internalSrcAlias]: appContext.srcDirectory,
+    '@': appContext.srcDirectory,
+    '@shared': appContext.sharedDirectory
+  } : {};
+  const source = {
+    entries: undefined,
+    enableAsyncEntry: false,
+    disableDefaultEntries: false,
+    entriesDir: './src',
+    configDir: './config',
+    globalVars: undefined,
+    moduleScopes: undefined,
+    include: [],
+    alias: defaultAlias
+  };
+  const output = {
+    assetPrefix: '/',
+    distPath: {
+      html: 'html',
+      js: 'static/js',
+      css: 'static/css',
+      media: 'static/media',
+      root: 'dist'
+    },
+    copy: undefined,
+    disableCssModuleExtension: false,
+    enableCssModuleTSDeclaration: false,
+    disableMinimize: false,
+    enableInlineStyles: false,
+    enableInlineScripts: false,
+    disableSourceMap: false,
+    disableInlineRuntimeChunk: false,
+    disableFilenameHash: false,
+    enableLatestDecorators: false,
+    polyfill: 'entry',
+    dataUriLimit: 10000,
+    cssModuleLocalIdentName: undefined
+  };
+  const html = {
+    title: '',
+    titleByEntries: undefined,
+    meta: {
+      charset: {
+        charset: 'utf-8'
+      },
+      viewport: 'width=device-width, initial-scale=1.0, shrink-to-fit=no, viewport-fit=cover, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no',
+      'http-equiv': {
+        'http-equiv': 'x-ua-compatible',
+        content: 'ie=edge'
+      },
+      renderer: 'webkit',
+      layoutmode: 'standard',
+      imagemode: 'force',
+      'wap-font-scale': 'no',
+      'format-detection': 'telephone=no'
+    },
+    metaByEntries: undefined,
+    inject: 'head',
+    injectByEntries: undefined,
+    mountId: 'root',
+    favicon: '',
+    faviconByEntries: undefined,
+    disableHtmlFolder: false,
+    templateParameters: {},
+    templateParametersByEntries: undefined
+  };
+  const server = {
+    routes: undefined,
+    publicRoutes: undefined,
+    ssr: undefined,
+    ssrByEntries: undefined,
+    baseUrl: '/',
+    port: 8080
+  };
+  const dev = {
+    assetPrefix: false,
+    https: false
+  };
+  const tools = {
+    webpack: undefined,
+    babel: undefined,
+    postcss: undefined,
+    autoprefixer: undefined,
+    devServer: undefined,
+    tsLoader: undefined,
+    terser: undefined,
+    minifyCss: undefined
+  };
+  return {
+    source,
+    output,
+    server,
+    dev,
+    html,
+    tools,
+    plugins: [],
+    runtime: {},
+    runtimeByEntries: {}
+  };
+}
+function createLegacyDefaultConfig(appContext) {
+  const defaultAlias = appContext ? {
+    [appContext.internalDirAlias]: appContext.internalDirectory,
+    [appContext.internalSrcAlias]: appContext.srcDirectory,
+    '@': appContext.srcDirectory,
+    '@shared': appContext.sharedDirectory
+  } : {};
+  const sourceDefaults = {
+    entries: undefined,
+    enableAsyncEntry: false,
+    disableDefaultEntries: false,
+    entriesDir: './src',
+    configDir: './config',
+    apiDir: './api',
+    envVars: [],
+    globalVars: undefined,
+    alias: defaultAlias,
+    moduleScopes: undefined,
+    include: []
+  };
+  const outputDefaults = {
+    assetPrefix: '/',
+    htmlPath: 'html',
+    jsPath: 'static/js',
+    cssPath: 'static/css',
+    mediaPath: 'static/media',
+    path: 'dist',
+    title: '',
+    titleByEntries: undefined,
+    meta: {
+      charset: {
+        charset: 'utf-8'
+      },
+      viewport: 'width=device-width, initial-scale=1.0, shrink-to-fit=no, viewport-fit=cover, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no',
+      'http-equiv': {
+        'http-equiv': 'x-ua-compatible',
+        content: 'ie=edge'
+      },
+      renderer: 'webkit',
+      layoutmode: 'standard',
+      imagemode: 'force',
+      'wap-font-scale': 'no',
+      'format-detection': 'telephone=no'
+    },
+    metaByEntries: undefined,
+    inject: 'head',
+    injectByEntries: undefined,
+    mountId: 'root',
+    favicon: '',
+    faviconByEntries: undefined,
+    copy: undefined,
+    disableHtmlFolder: false,
+    disableCssModuleExtension: false,
+    disableCssExtract: false,
+    enableCssModuleTSDeclaration: false,
+    disableMinimize: false,
+    enableInlineStyles: false,
+    enableInlineScripts: false,
+    disableSourceMap: false,
+    disableInlineRuntimeChunk: false,
+    disableAssetsCache: false,
+    enableLatestDecorators: false,
+    polyfill: 'entry',
+    dataUriLimit: 10000,
+    templateParameters: {},
+    templateParametersByEntries: undefined,
+    cssModuleLocalIdentName: undefined,
+    enableModernMode: false,
+    disableNodePolyfill: false,
+    enableTsLoader: false
+  };
+  const serverDefaults = {
+    routes: undefined,
+    publicRoutes: undefined,
+    ssr: undefined,
+    ssrByEntries: undefined,
+    baseUrl: '/',
+    port: 8080
+  };
+  const devDefaults = {
+    assetPrefix: false,
+    https: false
+  };
+  const toolsDefaults = {
+    webpack: undefined,
+    babel: undefined,
+    postcss: undefined,
+    autoprefixer: undefined,
+    lodash: undefined,
+    devServer: undefined,
+    tsLoader: undefined,
+    terser: undefined,
+    minifyCss: undefined
+  };
+  return {
+    source: sourceDefaults,
+    output: outputDefaults,
+    server: serverDefaults,
+    dev: devDefaults,
+    tools: toolsDefaults,
+    runtime: {},
+    runtimeByEntries: {}
+  };
+}