@modern-js/core 1.3.0 → 1.4.1

package/CHANGELOG.md

@@ -1,5 +1,61 @@
 # @modern-js/core
 
+## 1.4.1
+
+### Patch Changes
+
+- 53aca274: modify garfish-plugin config type
+- 78279953: compiler entry bug fix and dev build console
+- e116ace5: fix: coreOptions types
+- 4d72edea: support dev compiler by entry
+- Updated dependencies [78279953]
+- Updated dependencies [4d72edea]
+  - @modern-js/utils@1.3.1
+
+## 1.4.0
+
+### Minor Changes
+
+- bada2879: refactor plugin-garfish:
+  - change @modern-js/plugin-micro-frontend => @modern-js/plugin-garfish
+  - remove disableCustomerRouter logic
+  - adding unit test
+  - fix plugin-garfish type error
+
+### Patch Changes
+
+- d9cc5ea9: support resatrt options transfer
+- bd819a8d: fix: file route changed not trigger hot reload
+- d099e5c5: fix error when modify modern.config.js
+- 24f616ca: feat: support custom meta info
+- Updated dependencies [ec4dbffb]
+- Updated dependencies [d099e5c5]
+- Updated dependencies [bada2879]
+- Updated dependencies [24f616ca]
+- Updated dependencies [bd819a8d]
+  - @modern-js/utils@1.3.0
+
+## 1.3.2
+
+### Patch Changes
+
+- 83166714: change .npmignore
+- c3de9882: fix: internalDirectory path
+- 33ff48af: feat: extend CoreOptions
+- Updated dependencies [83166714]
+  - @modern-js/load-config@1.2.1
+  - @modern-js/plugin@1.2.1
+  - @modern-js/utils@1.2.2
+
+## 1.3.1
+
+### Patch Changes
+
+- 4584cc04: export DeployConfig interface
+- 7c19fd94: use existing port number for AppContext when dev server is restarted
+- Updated dependencies [823809c6]
+  - @modern-js/utils@1.2.1
+
 ## 1.3.0
 
 ### Minor Changes

package/dist/js/modern/config/index.js

@@ -45,7 +45,7 @@ const showAdditionalPropertiesError = error => {
 /* eslint-disable max-statements, max-params */
 
 
-export const resolveConfig = async (loaded, configs, schemas, isRestart, argv) => {
+export const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort, argv) => {
   var _validate$errors;
 
   const {
@@ -95,8 +95,14 @@ export const resolveConfig = async (loaded, configs, schemas, isRestart, argv) =
   const resolved = mergeConfig([defaults, ...configs, userConfig]);
   resolved._raw = loaded.config;
 
-  if (isDev() && argv[0] === 'dev' && !isRestart) {
-    resolved.server.port = await getPort(resolved.server.port);
+  if (isDev() && argv[0] === 'dev') {
+    if (restartWithExistingPort > 0) {
+      // dev server is restarted, should use existing port number
+      resolved.server.port = restartWithExistingPort;
+    } else {
+      // get port for new dev server
+      resolved.server.port = await getPort(resolved.server.port);
+    }
   }
 
   debug('resolved %o', resolved);

package/dist/js/modern/context.js

@@ -7,19 +7,32 @@ export const ResolvedConfigContext = createContext({});
 export const useAppContext = () => AppContext.use().value;
 export const useConfigContext = () => ConfigContext.use().value;
 export const useResolvedConfigContext = () => ResolvedConfigContext.use().value;
-export const initAppContext = (appDirectory, plugins, configFile) => ({
-  appDirectory,
-  configFile,
-  ip: address.ip(),
-  port: 0,
-  packageName: require(path.resolve(appDirectory, './package.json')).name,
-  srcDirectory: path.resolve(appDirectory, './src'),
-  distDirectory: '',
-  sharedDirectory: path.resolve(appDirectory, './shared'),
-  nodeModulesDirectory: path.resolve(appDirectory, './node_modules'),
-  internalDirectory: path.resolve(appDirectory, './node_modules/.modern-js'),
-  plugins,
-  htmlTemplates: {},
-  serverRoutes: [],
-  entrypoints: []
-});
+export const initAppContext = (appDirectory, plugins, configFile, options) => {
+  const {
+    metaName = 'modern-js',
+    srcDir = 'src',
+    distDir = '',
+    sharedDir = 'shared'
+  } = options || {};
+  return {
+    metaName,
+    appDirectory,
+    configFile,
+    ip: address.ip(),
+    port: 0,
+    packageName: require(path.resolve(appDirectory, './package.json')).name,
+    srcDirectory: path.resolve(appDirectory, srcDir),
+    distDirectory: distDir,
+    sharedDirectory: path.resolve(appDirectory, sharedDir),
+    nodeModulesDirectory: path.resolve(appDirectory, './node_modules'),
+    internalDirectory: path.resolve(appDirectory, `./node_modules/.${metaName}`),
+    plugins,
+    htmlTemplates: {},
+    serverRoutes: [],
+    entrypoints: [],
+    checkedEntries: [],
+    existSrc: true,
+    internalDirAlias: `@_${metaName.replace(/-/g, '_')}_internal`,
+    internalSrcAlias: `@_${metaName.replace(/-/g, '_')}_src`
+  };
+};

package/dist/js/modern/index.js

@@ -9,12 +9,12 @@ import { compatRequire, pkgUp, ensureAbsolutePath, logger } from '@modern-js/uti
 import { createAsyncManager, createAsyncWorkflow, createParallelWorkflow, createAsyncWaterfall } from '@modern-js/plugin';
 import { enable } from '@modern-js/plugin/node';
 import { program } from "./utils/commander";
-import { resolveConfig, defineConfig, loadUserConfig } from "./config";
+import { resolveConfig, loadUserConfig } from "./config";
 import { loadPlugins } from "./loadPlugins";
 import { AppContext, ConfigContext, initAppContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext } from "./context";
 import { initWatcher } from "./initWatcher";
 import { loadEnv } from "./loadEnv";
-export { defaultsConfig, mergeConfig } from "./config";
+export * from "./config";
 export * from '@modern-js/plugin';
 export * from '@modern-js/plugin/node';
 program.name('modern').usage('<command> [options]').version(process.env.MODERN_JS_VERSION || '0.1.0');
@@ -28,7 +28,9 @@ const hooksMap = {
   watchFiles: createParallelWorkflow(),
   fileChange: createAsyncWorkflow(),
   // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
-  beforeExit: createAsyncWorkflow()
+  beforeExit: createAsyncWorkflow(),
+  // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+  beforeRestart: createAsyncWorkflow()
 };
 export const manager = createAsyncManager(hooksMap);
 export const {
@@ -37,7 +39,7 @@ export const {
   useRunner: mountHook
 } = manager;
 export const usePlugins = plugins => plugins.forEach(plugin => manager.usePlugin(compatRequire(require.resolve(plugin))));
-export { defineConfig, AppContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext, ConfigContext };
+export { AppContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext, ConfigContext };
 
 const initAppDir = async cwd => {
   if (!cwd) {
@@ -59,10 +61,13 @@ const initAppDir = async cwd => {
 const createCli = () => {
   let hooksRunner;
   let isRestart = false;
+  let restartWithExistingPort = 0;
+  let restartOptions; // eslint-disable-next-line max-statements
 
   const init = async (argv = [], options) => {
     enable();
     manager.clear();
+    restartOptions = options;
     const appDirectory = await initAppDir();
     loadEnv(appDirectory);
     const loaded = await loadUserConfig(appDirectory, options === null || options === void 0 ? void 0 : options.configFile, options === null || options === void 0 ? void 0 : options.packageJsonConfig);
@@ -73,7 +78,7 @@ const createCli = () => {
     }
 
     plugins.forEach(plugin => plugin.cli && manager.usePlugin(plugin.cli));
-    const appContext = initAppContext(appDirectory, plugins, loaded.filePath);
+    const appContext = initAppContext(appDirectory, plugins, loaded.filePath, options === null || options === void 0 ? void 0 : options.options);
     manager.run(() => {
       ConfigContext.set(loaded.config);
       AppContext.set(appContext);
@@ -95,7 +100,7 @@ const createCli = () => {
     });
     const extraConfigs = await hooksRunner.config();
     const extraSchemas = await hooksRunner.validateSchema();
-    const config = await resolveConfig(loaded, extraConfigs, extraSchemas, isRestart, argv);
+    const config = await resolveConfig(loaded, extraConfigs, extraSchemas, restartWithExistingPort, argv);
     const {
       resolved
     } = await hooksRunner.resolvedConfig({
@@ -132,12 +137,17 @@ const createCli = () => {
   }
 
   async function restart() {
+    var _AppContext$use$value, _AppContext$use$value2;
+
     isRestart = true;
+    restartWithExistingPort = isRestart ? (_AppContext$use$value = (_AppContext$use$value2 = AppContext.use().value) === null || _AppContext$use$value2 === void 0 ? void 0 : _AppContext$use$value2.port) !== null && _AppContext$use$value !== void 0 ? _AppContext$use$value : 0 : 0;
     logger.info('Restart...\n');
     let hasGetError = false;
+    const runner = manager.useRunner();
+    await runner.beforeRestart();
 
     try {
-      await init(process.argv.slice(2));
+      await init(process.argv.slice(2), restartOptions);
     } catch (err) {
       console.error(err);
       hasGetError = true;
@@ -156,4 +166,4 @@ const createCli = () => {
 };
 
 export const cli = createCli();
-export { loadUserConfig, initAppDir, initAppContext };
+export { initAppDir, initAppContext };

package/dist/js/modern/initWatcher.js

@@ -1,7 +1,7 @@
 import crypto from 'crypto';
 import fs from 'fs';
 import path from 'path';
-import { isDev, createDebugger } from '@modern-js/utils';
+import { isDev, createDebugger, isTest } from '@modern-js/utils';
 import chokidar from 'chokidar';
 const debug = createDebugger('watch-files');
 
@@ -10,7 +10,7 @@ const md5 = data => crypto.createHash('md5').update(data).digest('hex');
 const hashMap = new Map();
 export const initWatcher = async (loaded, appDirectory, configDir, hooksRunner, argv) => {
   // only add fs watcher on dev mode.
-  if (isDev() && argv[0] === 'dev') {
+  if ((isDev() || isTest()) && argv[0] === 'dev') {
     const extraFiles = await hooksRunner.watchFiles();
     const configPath = path.join(appDirectory, configDir);
     const watched = [`${configPath}/html`, ...extraFiles, loaded === null || loaded === void 0 ? void 0 : loaded.filePath, ...loaded.dependencies].filter(Boolean);
@@ -28,19 +28,35 @@ export const initWatcher = async (loaded, appDirectory, configDir, hooksRunner,
         debug(`file change: %s`, changed);
         hashMap.set(changed, currentHash);
         hooksRunner.fileChange({
-          filename: changed
+          filename: changed,
+          eventType: 'change'
         });
       }
     });
+    watcher.on('add', name => {
+      debug(`add file: %s`, name);
+      const currentHash = md5(fs.readFileSync(path.join(appDirectory, name), 'utf8'));
+      hashMap.set(name, currentHash);
+      hooksRunner.fileChange({
+        filename: name,
+        eventType: 'add'
+      });
+    });
     watcher.on('unlink', name => {
       debug(`remove file: %s`, name);
 
       if (hashMap.has(name)) {
         hashMap.delete(name);
       }
+
+      hooksRunner.fileChange({
+        filename: name,
+        eventType: 'unlink'
+      });
     });
     watcher.on('error', err => {
       throw err;
     });
+    return watcher;
   }
 };

package/dist/js/modern/loadPlugins.js

@@ -81,12 +81,13 @@ export const loadPlugins = (appDirectory, pluginConfig, internalPlugins) => {
 
     const cliPlugin = cli && _objectSpread(_objectSpread({}, compatRequire(cli)), {}, {
       pluginPath: cli
-    });
+    }); // server plugin should be required by server
 
-    const serverPlugin = server && _objectSpread(_objectSpread({}, compatRequire(server)), {}, {
-      pluginPath: server
-    });
 
+    const serverPlugin = server && {
+      // ...compatRequire(server),
+      pluginPath: server
+    };
     return {
       cli: cliPlugin,
       cliPath: typeof plugin === 'string' ? plugin : plugin.cli,

package/dist/js/node/config/index.js

@@ -83,7 +83,7 @@ const showAdditionalPropertiesError = error => {
 /* eslint-disable max-statements, max-params */
 
 
-const resolveConfig = async (loaded, configs, schemas, isRestart, argv) => {
+const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort, argv) => {
   var _validate$errors;
 
   const {
@@ -136,8 +136,14 @@ const resolveConfig = async (loaded, configs, schemas, isRestart, argv) => {
   const resolved = (0, _mergeConfig.mergeConfig)([_defaults.defaults, ...configs, userConfig]);
   resolved._raw = loaded.config;
 
-  if ((0, _utils.isDev)() && argv[0] === 'dev' && !isRestart) {
-    resolved.server.port = await (0, _utils.getPort)(resolved.server.port);
+  if ((0, _utils.isDev)() && argv[0] === 'dev') {
+    if (restartWithExistingPort > 0) {
+      // dev server is restarted, should use existing port number
+      resolved.server.port = restartWithExistingPort;
+    } else {
+      // get port for new dev server
+      resolved.server.port = await (0, _utils.getPort)(resolved.server.port);
+    }
   }
 
   debug('resolved %o', resolved);

package/dist/js/node/context.js

@@ -32,21 +32,34 @@ const useResolvedConfigContext = () => ResolvedConfigContext.use().value;
 
 exports.useResolvedConfigContext = useResolvedConfigContext;
 
-const initAppContext = (appDirectory, plugins, configFile) => ({
-  appDirectory,
-  configFile,
-  ip: _address.default.ip(),
-  port: 0,
-  packageName: require(_path.default.resolve(appDirectory, './package.json')).name,
-  srcDirectory: _path.default.resolve(appDirectory, './src'),
-  distDirectory: '',
-  sharedDirectory: _path.default.resolve(appDirectory, './shared'),
-  nodeModulesDirectory: _path.default.resolve(appDirectory, './node_modules'),
-  internalDirectory: _path.default.resolve(appDirectory, './node_modules/.modern-js'),
-  plugins,
-  htmlTemplates: {},
-  serverRoutes: [],
-  entrypoints: []
-});
+const initAppContext = (appDirectory, plugins, configFile, options) => {
+  const {
+    metaName = 'modern-js',
+    srcDir = 'src',
+    distDir = '',
+    sharedDir = 'shared'
+  } = options || {};
+  return {
+    metaName,
+    appDirectory,
+    configFile,
+    ip: _address.default.ip(),
+    port: 0,
+    packageName: require(_path.default.resolve(appDirectory, './package.json')).name,
+    srcDirectory: _path.default.resolve(appDirectory, srcDir),
+    distDirectory: distDir,
+    sharedDirectory: _path.default.resolve(appDirectory, sharedDir),
+    nodeModulesDirectory: _path.default.resolve(appDirectory, './node_modules'),
+    internalDirectory: _path.default.resolve(appDirectory, `./node_modules/.${metaName}`),
+    plugins,
+    htmlTemplates: {},
+    serverRoutes: [],
+    entrypoints: [],
+    checkedEntries: [],
+    existSrc: true,
+    internalDirAlias: `@_${metaName.replace(/-/g, '_')}_internal`,
+    internalSrcAlias: `@_${metaName.replace(/-/g, '_')}_src`
+  };
+};
 
 exports.initAppContext = initAppContext;

package/dist/js/node/index.js

@@ -11,10 +11,6 @@ var _exportNames = {
   usePlugins: true,
   cli: true,
   initAppDir: true,
-  defineConfig: true,
-  loadUserConfig: true,
-  defaultsConfig: true,
-  mergeConfig: true,
   AppContext: true,
   ConfigContext: true,
   initAppContext: true,
@@ -42,39 +38,13 @@ Object.defineProperty(exports, "ResolvedConfigContext", {
   }
 });
 exports.createPlugin = exports.cli = void 0;
-Object.defineProperty(exports, "defaultsConfig", {
-  enumerable: true,
-  get: function () {
-    return _config.defaultsConfig;
-  }
-});
-Object.defineProperty(exports, "defineConfig", {
-  enumerable: true,
-  get: function () {
-    return _config.defineConfig;
-  }
-});
 Object.defineProperty(exports, "initAppContext", {
   enumerable: true,
   get: function () {
     return _context.initAppContext;
   }
 });
-exports.initAppDir = void 0;
-Object.defineProperty(exports, "loadUserConfig", {
-  enumerable: true,
-  get: function () {
-    return _config.loadUserConfig;
-  }
-});
-exports.manager = void 0;
-Object.defineProperty(exports, "mergeConfig", {
-  enumerable: true,
-  get: function () {
-    return _config.mergeConfig;
-  }
-});
-exports.registerHook = exports.mountHook = void 0;
+exports.registerHook = exports.mountHook = exports.manager = exports.initAppDir = void 0;
 Object.defineProperty(exports, "useAppContext", {
   enumerable: true,
   get: function () {
@@ -131,6 +101,18 @@ var _commander = require("./utils/commander");
 
 var _config = require("./config");
 
+Object.keys(_config).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _config[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _config[key];
+    }
+  });
+});
+
 var _loadPlugins = require("./loadPlugins");
 
 var _context = require("./context");
@@ -159,7 +141,9 @@ const hooksMap = {
   watchFiles: (0, _plugin.createParallelWorkflow)(),
   fileChange: (0, _plugin.createAsyncWorkflow)(),
   // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
-  beforeExit: (0, _plugin.createAsyncWorkflow)()
+  beforeExit: (0, _plugin.createAsyncWorkflow)(),
+  // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+  beforeRestart: (0, _plugin.createAsyncWorkflow)()
 };
 const manager = (0, _plugin.createAsyncManager)(hooksMap);
 exports.manager = manager;
@@ -198,10 +182,13 @@ exports.initAppDir = initAppDir;
 const createCli = () => {
   let hooksRunner;
   let isRestart = false;
+  let restartWithExistingPort = 0;
+  let restartOptions; // eslint-disable-next-line max-statements
 
   const init = async (argv = [], options) => {
     (0, _node.enable)();
     manager.clear();
+    restartOptions = options;
     const appDirectory = await initAppDir();
     (0, _loadEnv.loadEnv)(appDirectory);
     const loaded = await (0, _config.loadUserConfig)(appDirectory, options === null || options === void 0 ? void 0 : options.configFile, options === null || options === void 0 ? void 0 : options.packageJsonConfig);
@@ -212,7 +199,7 @@ const createCli = () => {
     }
 
     plugins.forEach(plugin => plugin.cli && manager.usePlugin(plugin.cli));
-    const appContext = (0, _context.initAppContext)(appDirectory, plugins, loaded.filePath);
+    const appContext = (0, _context.initAppContext)(appDirectory, plugins, loaded.filePath, options === null || options === void 0 ? void 0 : options.options);
     manager.run(() => {
       _context.ConfigContext.set(loaded.config);
 
@@ -235,7 +222,7 @@ const createCli = () => {
     });
     const extraConfigs = await hooksRunner.config();
     const extraSchemas = await hooksRunner.validateSchema();
-    const config = await (0, _config.resolveConfig)(loaded, extraConfigs, extraSchemas, isRestart, argv);
+    const config = await (0, _config.resolveConfig)(loaded, extraConfigs, extraSchemas, restartWithExistingPort, argv);
     const {
       resolved
     } = await hooksRunner.resolvedConfig({
@@ -274,14 +261,19 @@ const createCli = () => {
   }
 
   async function restart() {
+    var _AppContext$use$value, _AppContext$use$value2;
+
     isRestart = true;
+    restartWithExistingPort = isRestart ? (_AppContext$use$value = (_AppContext$use$value2 = _context.AppContext.use().value) === null || _AppContext$use$value2 === void 0 ? void 0 : _AppContext$use$value2.port) !== null && _AppContext$use$value !== void 0 ? _AppContext$use$value : 0 : 0;
 
     _utils.logger.info('Restart...\n');
 
     let hasGetError = false;
+    const runner = manager.useRunner();
+    await runner.beforeRestart();
 
     try {
-      await init(process.argv.slice(2));
+      await init(process.argv.slice(2), restartOptions);
     } catch (err) {
       console.error(err);
       hasGetError = true;

package/dist/js/node/initWatcher.js

@@ -25,7 +25,7 @@ const hashMap = new Map();
 
 const initWatcher = async (loaded, appDirectory, configDir, hooksRunner, argv) => {
   // only add fs watcher on dev mode.
-  if ((0, _utils.isDev)() && argv[0] === 'dev') {
+  if (((0, _utils.isDev)() || (0, _utils.isTest)()) && argv[0] === 'dev') {
     const extraFiles = await hooksRunner.watchFiles();
 
     const configPath = _path.default.join(appDirectory, configDir);
@@ -47,20 +47,36 @@ const initWatcher = async (loaded, appDirectory, configDir, hooksRunner, argv) =
         debug(`file change: %s`, changed);
         hashMap.set(changed, currentHash);
         hooksRunner.fileChange({
-          filename: changed
+          filename: changed,
+          eventType: 'change'
         });
       }
     });
+    watcher.on('add', name => {
+      debug(`add file: %s`, name);
+      const currentHash = md5(_fs.default.readFileSync(_path.default.join(appDirectory, name), 'utf8'));
+      hashMap.set(name, currentHash);
+      hooksRunner.fileChange({
+        filename: name,
+        eventType: 'add'
+      });
+    });
     watcher.on('unlink', name => {
       debug(`remove file: %s`, name);
 
       if (hashMap.has(name)) {
         hashMap.delete(name);
       }
+
+      hooksRunner.fileChange({
+        filename: name,
+        eventType: 'unlink'
+      });
     });
     watcher.on('error', err => {
       throw err;
     });
+    return watcher;
   }
 };
 

package/dist/js/node/loadPlugins.js

@@ -91,12 +91,13 @@ const loadPlugins = (appDirectory, pluginConfig, internalPlugins) => {
 
     const cliPlugin = cli && _objectSpread(_objectSpread({}, (0, _utils.compatRequire)(cli)), {}, {
       pluginPath: cli
-    });
+    }); // server plugin should be required by server
 
-    const serverPlugin = server && _objectSpread(_objectSpread({}, (0, _utils.compatRequire)(server)), {}, {
-      pluginPath: server
-    });
 
+    const serverPlugin = server && {
+      // ...compatRequire(server),
+      pluginPath: server
+    };
     return {
       cli: cliPlugin,
       cliPath: typeof plugin === 'string' ? plugin : plugin.cli,

package/dist/types/config/index.d.ts

@@ -5,7 +5,7 @@ import { mergeConfig, NormalizedConfig } from './mergeConfig';
 import { PluginValidateSchema } from './schema';
 export { defaults as defaultsConfig };
 export { mergeConfig };
-export interface SourceConfig {
+interface SourceConfig {
   entries?: Record<string, string | {
     entry: string;
     enableFileSystemRoutes?: boolean;
@@ -21,7 +21,7 @@ export interface SourceConfig {
   moduleScopes?: Array<string | RegExp> | ((scopes: Array<string | RegExp>) => Array<string | RegExp>);
   include?: Array<string | RegExp>;
 }
-export interface OutputConfig {
+interface OutputConfig {
   assetPrefix?: string;
   htmlPath?: string;
   jsPath?: string;
@@ -60,7 +60,7 @@ export interface OutputConfig {
   disableNodePolyfill?: boolean;
   enableTsLoader?: boolean;
 }
-export interface ServerConfig {
+interface ServerConfig {
   routes?: Record<string, string | {
     route: string | string[];
     disableSpa?: boolean;
@@ -76,17 +76,22 @@ export interface ServerConfig {
   metrics?: Record<string, any>;
   enableMicroFrontendDebug?: boolean;
 }
-export interface DevConfig {
+interface DevConfig {
   assetPrefix?: string | boolean;
   https?: boolean;
 }
-export interface DeployConfig {
-  microFrontend?: boolean & Record<string, unknown>;
+interface MicroFrontend {
+  enableHtmlEntry?: boolean;
+  externalBasicLibrary?: boolean;
+  moduleApp?: string;
+}
+interface DeployConfig {
+  microFrontend?: false | MicroFrontend;
   domain?: string | Array<string>;
   domainByEntries?: Record<string, string | Array<string>>;
 }
 declare type ConfigFunction = Record<string, unknown> | ((config: Record<string, unknown>) => Record<string, unknown> | void);
-export interface ToolsConfig {
+interface ToolsConfig {
   webpack?: ConfigFunction;
   babel?: ConfigFunction;
   autoprefixer?: ConfigFunction;
@@ -98,11 +103,11 @@ export interface ToolsConfig {
   minifyCss?: ConfigFunction;
   esbuild?: Record<string, unknown>;
 }
-export declare type RuntimeConfig = Record<string, any>;
-export interface RuntimeByEntriesConfig {
+declare type RuntimeConfig = Record<string, any>;
+interface RuntimeByEntriesConfig {
   [name: string]: RuntimeConfig;
 }
-export interface UserConfig {
+interface UserConfig {
   source?: SourceConfig;
   output?: OutputConfig;
   server?: ServerConfig;
@@ -113,8 +118,8 @@ export interface UserConfig {
   runtime?: RuntimeConfig;
   runtimeByEntries?: RuntimeByEntriesConfig;
 }
-export declare type ConfigParam = UserConfig | Promise<UserConfig> | ((env: any) => UserConfig | Promise<UserConfig>);
-export interface LoadedConfig {
+declare type ConfigParam = UserConfig | Promise<UserConfig> | ((env: any) => UserConfig | Promise<UserConfig>);
+interface LoadedConfig {
   config: UserConfig;
   filePath: string | false;
   dependencies: string[];
@@ -123,4 +128,5 @@ export interface LoadedConfig {
 }
 export declare const defineConfig: (config: ConfigParam) => ConfigParam;
 export declare const loadUserConfig: (appDirectory: string, filePath?: string | undefined, packageJsonConfig?: string | undefined) => Promise<LoadedConfig>;
-export declare const resolveConfig: (loaded: LoadedConfig, configs: UserConfig[], schemas: PluginValidateSchema[], isRestart: boolean, argv: string[]) => Promise<NormalizedConfig>;
+export declare const resolveConfig: (loaded: LoadedConfig, configs: UserConfig[], schemas: PluginValidateSchema[], restartWithExistingPort: number, argv: string[]) => Promise<NormalizedConfig>;
+export type { SourceConfig, OutputConfig, ServerConfig, DevConfig, DeployConfig, ToolsConfig, RuntimeConfig, RuntimeByEntriesConfig, UserConfig, ConfigParam, LoadedConfig };

package/dist/types/context.d.ts

@@ -11,4 +11,9 @@ export declare const useResolvedConfigContext: () => NormalizedConfig;
 export declare const initAppContext: (appDirectory: string, plugins: Array<{
   cli: any;
   server: any;
-}>, configFile: string | false) => IAppContext;
+}>, configFile: string | false, options?: {
+  metaName?: string | undefined;
+  srcDir?: string | undefined;
+  distDir?: string | undefined;
+  sharedDir?: string | undefined;
+} | undefined) => IAppContext;