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

package/CHANGELOG.md

@@ -1,5 +1,199 @@
 # @modern-js/app-tools
 
+## 2.0.0-beta.2
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Minor Changes
+
+- edd1cfb1af: feat: modernjs Access builder compiler
+  feat: modernjs 接入 builder 构建
+- 543be9558e: feat: compile server loader and support handle loader request
+  feat: 编译 server loader 并支持处理 loader 的请求
+
+### Patch Changes
+
+- c9f912ca4d: feat(app-tools): improve build logs of dev and build command
+
+  feat(app-tools): 优化 dev 和 build 过程中的日志展示
+
+- 103973cde9: fix: builder tools.webpackChain config args not match the Modernjs tools.webpackChain
+  fix: builder tools.webpackChain 配置传参无法匹配 Modernjs tools.webpackChain
+- 0b2d1ef02b: fix: repeat register `babel-plugin-lodash`
+  fix: 重复注册 `babel-plugin-lodash`
+- 82cef85ed7: fix: specify builder compiler framework
+  fix: 指明 builder 构建时框架
+- 3e57f2b: feat: add document feature with plugin
+
+  feat: 增加 document 功能插件
+
+- 85edee888c: feat(app-tools): support tools.htmlPlugin config
+
+  feat(app-tools): 支持 tools.htmlPlugin 配置项
+
+- 5402fdb: feat(Builder): add output.disableTsChecker config
+
+  feat(Builder): 新增 output.disableTsChecker 配置项
+
+- dc8eeb9cbb: fix: clear distDirectory in prepare hook & inject data loader plugin to server
+  fix: 在 prepare hook 中清理 dist 目录，并且向 server 中注入 data loader plugin
+- cc971eabfc: refactor: move server plugin load logic in `@modern-js/core`
+  refactor：移除在 `@modern-js/core` 中的 server 插件加载逻辑
+- 5b9049f2e9: feat: inject async js chunk when streaming ssr
+  feat: streaming ssr 时, 注入 async 类型的 js chunk
+- d4a4566: chore: rename plugin-jarvis to plugin-lint
+
+  chore: 重命名 plugin-jarvis 为 plugin-lint
+
+- 6bda14ed71: feat: refactor router with react-router@6.4
+
+  feat: 使用 react-router@6.4 重构路由模块
+
+- d36c6ee126: fix(app-tools): failed to run inspect command
+
+  fix(app-tools): 修复运行 inspect 命令失败的问题
+
+- 92004d1: feat: support load chunks parallelly
+  feat: 支持并行加载 chunks
+- b8bbe036c7: feat: change type logic
+  feat: 修改类型相关的逻辑
+- 40ed587: feat: inject css chunk into html for streaming ssr
+  feat: streaming ssr 返回的 html 注入 css chunk
+- af4422d67f: feat(builder): complete utils of tools.webpack
+
+  feat(builder): 补全 tools.webpack 提供的 utils 方法
+
+- 87c1ff8: feat(app-tools): attach builder instance to appContext
+
+  feat(app-tools): 将 builder 实例挂载到 appContext 上
+
+- c258e34202: fix: add builder hooks `beforeBuild` params
+  fix: 新增 builder hooks `beforeBuild` 的参数
+- 3b3d709: fix(app-tools): cli --analyze option not work
+
+  fix(app-tools): 修复 --analyze 命令行参数不生效的问题
+
+- 8b8e1bb571: feat: support nested routes
+  feat: 支持嵌套路由
+- a2c8cc3: fix: change tools define userconfig type
+  fix: 修改工程定义的 UserConfig 类型
+- 7de97ae: fix: `deploy` command has't load `builder` instance
+  fix: `deploy` 命令没有加载 builder 实例
+- c3b7de4: fix(app-tools): dev.assetPrefix not work
+
+  fix(app-tools): 修复 dev.assetPrefix 配置项不生效的问题
+
+- 92004d1: fix: use loadable lazy instead of loadable
+  fix: 使用 loadable lazy 组件替代 loadable
+- c677befc22: fix(app-tools): compat legacy resolve behavior
+
+  fix(app-tools): 兼容旧版本 node_modules 解析逻辑
+
+- 3f7cde5caa: fix: builder plugin setup can't get config
+  fix: builder 插件在 setup 阶段无法拿到 config
+- 99213e4bae: fix: process does't exit when exec command
+  fix: 修复执行命令时进程未退出的问题
+- b16fd964da: fix: `modern-js/app-tools` pass error config to builder.
+  fix: `modern-js/app-tools` 传递错误的 config 给 builder.
+- 7eefedd7ca: fix: add html-webpack-plugin `__internal__` options, for bottom template
+  fix: 为了 bottom template, 增加 `html-webpack-plugin` `__internal__` 配置项，
+- 14b712da84: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [c9f912ca4d]
+- Updated dependencies [95be7cc49c]
+- Updated dependencies [e439457a51]
+- Updated dependencies [4d1545f8c0]
+- Updated dependencies [2bc090c089]
+- Updated dependencies [f96a725211]
+- Updated dependencies [828f42f9ce]
+- Updated dependencies [060abd4]
+- Updated dependencies [309cd71]
+- Updated dependencies [c7456864a8]
+- Updated dependencies [c9e800d39a]
+- Updated dependencies [0ff846fb56]
+- Updated dependencies [3cf9633]
+- Updated dependencies [57077b2c64]
+- Updated dependencies [d032d49]
+- Updated dependencies [2ff6167]
+- Updated dependencies [287f298990]
+- Updated dependencies [15bf09d9c8]
+- Updated dependencies [423188db70]
+- Updated dependencies [fd2d652c03]
+- Updated dependencies [0c2d8dae31]
+- Updated dependencies [2edad29]
+- Updated dependencies [85edee888c]
+- Updated dependencies [a2509bfbdb]
+- Updated dependencies [3998875791]
+- Updated dependencies [ab3924a]
+- Updated dependencies [3998875791]
+- Updated dependencies [ba86b8b711]
+- Updated dependencies [61f21d1e77]
+- Updated dependencies [5402fdb]
+- Updated dependencies [2ae58176fe]
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [5d67c26cdb]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [d4a4566]
+- Updated dependencies [18360a38d7]
+- Updated dependencies [6bda14ed71]
+- Updated dependencies [0b314e6946]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [5911154]
+- Updated dependencies [40ed587]
+- Updated dependencies [af4422d67f]
+- Updated dependencies [705adc1]
+- Updated dependencies [87c1ff8]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [102d32e4ba]
+- Updated dependencies [c258e34202]
+- Updated dependencies [812913c]
+- Updated dependencies [7248342e4d]
+- Updated dependencies [568eab1e42]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [ae71096d45]
+- Updated dependencies [73cd29dd9f]
+- Updated dependencies [a23010138d]
+- Updated dependencies [75d1b2657c]
+- Updated dependencies [18aaf42]
+- Updated dependencies [f179749]
+- Updated dependencies [3fae2d0]
+- Updated dependencies [8a6d45f105]
+- Updated dependencies [ebbeed1]
+- Updated dependencies [90e2879520]
+- Updated dependencies [df41d71]
+- Updated dependencies [f727e5c6cc]
+- Updated dependencies [5e3cecd523]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [da2d1fc3c2]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/builder-webpack-provider@2.0.0-beta.2
+  - @modern-js/builder-shared@2.0.0-beta.2
+  - @modern-js/core@2.0.0-beta.2
+  - @modern-js/prod-server@2.0.0-beta.2
+  - @modern-js/builder-plugin-esbuild@2.0.0-beta.2
+  - @modern-js/server@2.0.0-beta.2
+  - @modern-js/node-bundle-require@2.0.0-beta.2
+  - @modern-js/utils@2.0.0-beta.2
+  - @modern-js/builder-plugin-node-polyfill@2.0.0-beta.2
+  - @modern-js/types@2.0.0-beta.2
+  - @modern-js/plugin-lint@2.0.0-beta.2
+  - @modern-js/plugin@2.0.0-beta.2
+  - @modern-js/builder@2.0.0-beta.2
+  - @modern-js/plugin-data-loader@2.0.0-beta.2
+  - @modern-js/plugin-i18n@2.0.0-beta.2
+  - @modern-js/new-action@2.0.0-beta.2
+  - @modern-js/upgrade@2.0.0-beta.2
+
 ## 2.0.0-beta.1
 
 ### Major Changes

package/dist/js/modern/analyze/generateCode.js

@@ -113,7 +113,7 @@ export 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 ? getClientRoutesLegacy : getClientRoutes;
   await Promise.all(entrypoints.map(generateEntryCode));
   async function generateEntryCode(entrypoint) {

package/dist/js/modern/analyze/getBundleEntry.js

@@ -56,7 +56,7 @@ export const getBundleEntry = (appContext, config) => {
   }
   if (!disableDefaultEntries) {
     // find main entry point which server route is '/'.
-    const entriesDirAbs = ensureAbsolutePath(appDirectory, entriesDir);
+    const entriesDirAbs = ensureAbsolutePath(appDirectory, entriesDir || '');
     const found = defaults.find(({
       entryName,
       entry,

package/dist/js/modern/analyze/getFileSystemEntry.js

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

package/dist/js/modern/analyze/getHtmlTemplate.js

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

package/dist/js/modern/analyze/getServerRoutes.js

@@ -94,10 +94,13 @@ const applyRouteOptions = (original, routeOptions) => {
  */
 const collectHtmlRoutes = (entrypoints, appContext, config) => {
   const {
+    html: {
+      disableHtmlFolder
+    },
     output: {
-      htmlPath,
-      disableHtmlFolder,
-      enableModernMode
+      distPath: {
+        html: htmlPath
+      } = {}
     },
     server: {
       baseUrl,
@@ -124,7 +127,8 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
       isSPA: true,
       isSSR,
       responseHeaders: resHeaders,
-      enableModernMode: Boolean(enableModernMode),
+      // FIXME: remove the config.enableModernMode
+      // enableModernMode: Boolean(enableModernMode),
       bundle: isSSR ? `${SERVER_BUNDLE_DIRECTORY}/${entryName}.js` : undefined
     };
     if (routes !== null && routes !== void 0 && routes.hasOwnProperty(entryName)) {
@@ -157,14 +161,14 @@ const collectStaticRoutes = (appContext, config) => {
       publicRoutes = {}
     }
   } = config;
-  const publicFolder = path.resolve(appDirectory, configDir, 'public');
+  const publicFolder = path.resolve(appDirectory, configDir || '', 'public');
   return fs.existsSync(publicFolder) ? walkDirectory(publicFolder).map(filePath => {
     const urlPath = `${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/modern/analyze/index.js

@@ -2,7 +2,6 @@ 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; }
 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";
@@ -10,34 +9,11 @@ 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";
 const debug = createDebugger('plugin-analyze');
-export const modifyEntryImports = createAsyncWaterfall();
-export const modifyEntryExport = createAsyncWaterfall();
-export const addRuntimeExports = createAsyncWaterfall();
-export const modifyEntryRuntimePlugins = createAsyncWaterfall();
-export const modifyEntryRenderFunction = createAsyncWaterfall();
-export const modifyAsyncEntry = createAsyncWaterfall();
-export const modifyFileSystemRoutes = createAsyncWaterfall();
-export const modifyServerRoutes = createAsyncWaterfall();
-export const htmlPartials = createAsyncWaterfall();
-export const beforeGenerateRoutes = createAsyncWaterfall();
-export const addDefineTypes = createAsyncWaterfall();
 export default (() => ({
   name: '@modern-js/plugin-analyze',
-  registerHook: {
-    modifyAsyncEntry,
-    modifyEntryImports,
-    modifyEntryExport,
-    modifyEntryRuntimePlugins,
-    modifyEntryRenderFunction,
-    modifyFileSystemRoutes,
-    modifyServerRoutes,
-    htmlPartials,
-    addRuntimeExports,
-    beforeGenerateRoutes,
-    addDefineTypes
-  },
   setup: api => {
     let pagesDir = [];
     let originEntrypoints = [];
@@ -52,7 +28,7 @@ export default (() => ({
         } catch (_unused) {
           // FIXME:
         }
-        const apiOnly = await 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 isApiOnly(appContext.appDirectory, (_resolvedConfig$sourc = resolvedConfig.source) === null || _resolvedConfig$sourc === void 0 ? void 0 : _resolvedConfig$sourc.entriesDir);
         await hookRunners.addRuntimeExports();
         if (apiOnly) {
           const {
@@ -119,7 +95,7 @@ export default (() => ({
         if (buildCommands.includes(command)) {
           const normalizedConfig = api.useResolvedConfigContext();
           const builder = await createBuilderForEdenX({
-            normalizedConfig,
+            normalizedConfig: normalizedConfig,
             appContext,
             compatPluginConfig: {
               async onBeforeBuild({
@@ -180,6 +156,15 @@ export default (() => ({
       watchFiles() {
         return pagesDir;
       },
+      resolvedConfig({
+        resolved
+      }) {
+        const appContext = api.useAppContext();
+        const config = initialNormalizedConfig(resolved, appContext);
+        return {
+          resolved: config
+        };
+      },
       async fileChange(e) {
         const appContext = api.useAppContext();
         const {

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

@@ -62,14 +62,15 @@ export const PluginCompatModern = (appContext, modernConfig, options) => ({
       }
 
       // apply copy plugin
-      // const copyPatterns = createCopyPatterns(chain, appContext, modernConfig);
-      const defaultCopyPattern = 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 = 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;
@@ -167,9 +168,9 @@ function applyBottomHtmlWebpackPlugin({
     // FIXME: the only need necessary
     const baseTemplateParams = _objectSpread({
       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(`${CHAIN_ID.PLUGIN.HTML}-${entryName}`).tap(args => [_objectSpread(_objectSpread({}, args[0] || {}), {}, {
       __internal__: true,
       bottomTemplate: appContext.htmlTemplates[`__${entryName}-bottom__`] && lodashTemplate(appContext.htmlTemplates[`__${entryName}-bottom__`])(baseTemplateParams)

package/dist/js/modern/builder/index.js

@@ -1,11 +1,11 @@
+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; }
 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) {
   const targets = ['web'];
   if (normalizedConfig.output.enableModernMode && !targets.includes('modern-web')) {
@@ -21,8 +21,8 @@ export async function createBuilderForEdenX({
   appContext,
   compatPluginConfig
 }) {
-  const builderConfig = createBuilderProviderConfig(normalizedConfig, appContext);
   // create webpack provider
+  const builderConfig = createBuilderProviderConfig(normalizedConfig, appContext);
   const webpackProvider = builderWebpackProvider({
     builderConfig
   });
@@ -32,25 +32,42 @@ export async function createBuilderForEdenX({
   await applyBuilderPlugins(builder, normalizedConfig, appContext, compatPluginConfig);
   return builder;
 }
-function createBuilderProviderConfig(normalizedConfig, appContext) {
-  const source = createSourceConfig(normalizedConfig, appContext);
-  const html = createHtmlConfig(normalizedConfig, appContext);
+export function createBuilderProviderConfig(normalizedConfig, appContext) {
   const output = createOutputConfig(normalizedConfig, appContext);
-  const tools = createToolsConfig(normalizedConfig);
-  return {
-    source,
-    html,
+  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 = 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
+    });
+  }
 }
 export function createBuilderOptions(target, appContext) {
   // create entries

package/dist/js/modern/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) {
-  const configDir = path.resolve(appContext.appDirectory, config.source.configDir);
+  const configDir = path.resolve(appContext.appDirectory, config.source.configDir || './config');
   const uploadDir = path.posix.join(configDir.replace(/\\/g, '/'), 'upload');
   const publicDir = path.posix.join(configDir.replace(/\\/g, '/'), 'public');
   const minifiedJsRexExp = /\.min\.js/;

package/dist/js/modern/commands/build.js

@@ -6,6 +6,10 @@ import { logger, printBuildError } from '@modern-js/utils';
 import { generateRoutes } from "../utils/routes";
 import { buildServerConfig } from "../utils/config";
 export 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();
@@ -49,9 +53,11 @@ export const build = async (api, options) => {
     configFile: serverConfigFile
   });
   try {
-    var _appContext$builder;
     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) {
     printBuildError(error);
     // eslint-disable-next-line no-process-exit

package/dist/js/modern/commands/dev.js

@@ -3,19 +3,25 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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; }
 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";
 import { getSpecifiedEntries } from "../utils/getSpecifiedEntries";
 import { buildServerConfig } from "../utils/config";
 export 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
   });
-  ResolvedConfigContext.set(userConfig);
+  ResolvedConfigContext.set(normalizedConfig);
   const {
     appDirectory,
     distDirectory,
@@ -43,8 +49,10 @@ export 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 generateRoutes(appContext);
   const app = await createServer({
@@ -58,11 +66,11 @@ export 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: injectDataLoaderPlugin(serverInternalPlugins)
   });
@@ -73,7 +81,8 @@ export const dev = async (api, options) => {
     if (!apiOnly) {
       logger.info(`Starting dev server...\n`);
     } else {
-      printInstructions(hookRunners, appContext, userConfig);
+      printInstructions(hookRunners, appContext, normalizedConfig);
     }
   });
+  await createFileWatcher(appContext, normalizedConfig.source.configDir, hookRunners);
 };

package/dist/js/modern/commands/inspect.js

@@ -1,8 +1,10 @@
 import { join } from 'path';
 export 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: join(appContext === null || appContext === void 0 ? void 0 : appContext.builder.context.distPath, options.output),

package/dist/js/modern/commands/start.js

@@ -16,6 +16,7 @@ export const start = async api => {
   const apiOnly = await 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 server({
     pwd: appDirectory,
+    // FIXME: remove the `any` type
     config: userConfig,
     serverConfigFile,
     internalPlugins: injectDataLoaderPlugin(appContext.serverInternalPlugins),