@modern-js/core 1.2.1-rc.0 → 1.4.0

package/CHANGELOG.md

@@ -1,13 +1,65 @@
 # @modern-js/core
 
-## 1.2.1-rc.0
+## 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
 
-- Updated dependencies [b7fb82ec]
-  - @modern-js/utils@1.1.6-rc.0
-  - @modern-js/load-config@1.1.2-rc.0
-  - @modern-js/plugin@1.1.2
+- 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
+
+- fc71e36f: support custom property name for the config in package.json
+- cfe11628: Make Modern.js self bootstraping
+
+### Patch Changes
+
+- Updated dependencies [2da09c69]
+- Updated dependencies [fc71e36f]
+- Updated dependencies [c3d46ee4]
+- Updated dependencies [cfe11628]
+  - @modern-js/utils@1.2.0
+  - @modern-js/load-config@1.2.0
+  - @modern-js/plugin@1.2.0
 
 ## 1.2.0
 

package/dist/js/modern/cli.js

@@ -0,0 +1,29 @@
+// 这个文件跟 bin/modern-js.js 基本一样
+// 在开发阶段，因为 package.json 的 exports['./bin']['jsnext:source'] 配置
+// 了这个文件，所以需要保留, 后续如果找到更好的方式之后会移除这个文件
+import path from 'path';
+import { cli } from ".";
+
+const {
+  version
+} = require("../../package.json"); // XXX: 通过这个方式去掉了 package.json 里面对于 @modern-js/module-tools 的 devDependencies 依赖
+// 然后可以正常的执行 modern build
+
+
+const kModuleToolsCliPath = path.resolve(__dirname, '../../../solutions/module-tools/src/index.ts');
+process.env.MODERN_JS_VERSION = version;
+
+if (!process.env.NODE_ENV) {
+  process.env.NODE_ENV = // eslint-disable-next-line no-nested-ternary
+  ['build', 'start', 'deploy'].includes(process.argv[2]) ? 'production' : process.argv[2] === 'test' ? 'test' : 'development';
+}
+
+cli.run(process.argv.slice(2), {
+  plugins: {
+    '@modern-js/module-tools': {
+      cli: kModuleToolsCliPath,
+      // 是否需要强制加载这个组件，跳过 loadPlugins 里面 filter 的检测逻辑
+      forced: true
+    }
+  }
+});

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

@@ -20,8 +20,8 @@ const debug = createDebugger('resolve-config');
 export { defaults as defaultsConfig };
 export { mergeConfig };
 export const defineConfig = config => config;
-export const loadUserConfig = async (appDirectory, filePath) => {
-  const loaded = await loadConfig(appDirectory, filePath);
+export const loadUserConfig = async (appDirectory, filePath, packageJsonConfig) => {
+  const loaded = await loadConfig(appDirectory, filePath, packageJsonConfig);
   const config = !loaded ? {} : await (typeof loaded.config === 'function' ? loaded.config(0) : loaded.config);
   return {
     config: mergeWith({}, config || {}, (loaded === null || loaded === void 0 ? void 0 : loaded.pkgConfig) || {}),
@@ -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,31 @@ 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: [],
+    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,15 +39,20 @@ 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) {
+    // eslint-disable-next-line no-param-reassign
+    cwd = process.cwd();
+  }
 
-const initAppDir = async () => {
   const pkg = await pkgUp({
-    cwd: process.cwd()
+    cwd
   });
 
   if (!pkg) {
-    throw new Error(`no package.json found in current work dir: ${process.cwd()}`);
+    throw new Error(`no package.json found in current work dir: ${cwd}`);
   }
 
   return path.dirname(pkg);
@@ -54,13 +61,16 @@ const initAppDir = async () => {
 const createCli = () => {
   let hooksRunner;
   let isRestart = false;
+  let restartWithExistingPort = 0;
+  let restartOptions;
 
   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);
+    const loaded = await loadUserConfig(appDirectory, options === null || options === void 0 ? void 0 : options.configFile, options === null || options === void 0 ? void 0 : options.packageJsonConfig);
     let plugins = loadPlugins(appDirectory, loaded.config.plugins || [], options === null || options === void 0 ? void 0 : options.plugins);
 
     if (options !== null && options !== void 0 && options.beforeUsePlugins) {
@@ -68,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);
@@ -90,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({
@@ -127,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;
@@ -151,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

@@ -45,6 +45,21 @@ const resolvePlugin = (appDirectory, plugin) => {
 
   return resolved;
 };
+
+export function getAppPlugins(appDirectory, pluginConfig, internalPlugins) {
+  const allPlugins = internalPlugins || INTERNAL_PLUGINS;
+  const appPlugins = [...Object.keys(allPlugins).filter(name => {
+    const config = allPlugins[name];
+
+    if (config.forced === true) {
+      // 参考 packages/cli/core/src/cli.ts 文件
+      return true;
+    }
+
+    return isDepExists(appDirectory, name);
+  }).map(name => allPlugins[name]), ...pluginConfig];
+  return appPlugins;
+}
 /**
  * Load internal plugins which in @modern-js scope and user's custom plugins.
  * @param appDirectory - Application root directory.
@@ -52,9 +67,8 @@ const resolvePlugin = (appDirectory, plugin) => {
  * @returns Plugin Objects has been required.
  */
 
-
 export const loadPlugins = (appDirectory, pluginConfig, internalPlugins) => {
-  const plugins = [...Object.keys(internalPlugins || INTERNAL_PLUGINS).filter(name => isDepExists(appDirectory, name)).map(name => (internalPlugins || INTERNAL_PLUGINS)[name]), ...pluginConfig];
+  const plugins = getAppPlugins(appDirectory, pluginConfig, internalPlugins);
   return plugins.map(plugin => {
     const {
       cli,
@@ -67,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/cli.js

@@ -0,0 +1,35 @@
+"use strict";
+
+var _path = _interopRequireDefault(require("path"));
+
+var _ = require(".");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// 这个文件跟 bin/modern-js.js 基本一样
+// 在开发阶段，因为 package.json 的 exports['./bin']['jsnext:source'] 配置
+// 了这个文件，所以需要保留, 后续如果找到更好的方式之后会移除这个文件
+const {
+  version
+} = require("../../package.json"); // XXX: 通过这个方式去掉了 package.json 里面对于 @modern-js/module-tools 的 devDependencies 依赖
+// 然后可以正常的执行 modern build
+
+
+const kModuleToolsCliPath = _path.default.resolve(__dirname, '../../../solutions/module-tools/src/index.ts');
+
+process.env.MODERN_JS_VERSION = version;
+
+if (!process.env.NODE_ENV) {
+  process.env.NODE_ENV = // eslint-disable-next-line no-nested-ternary
+  ['build', 'start', 'deploy'].includes(process.argv[2]) ? 'production' : process.argv[2] === 'test' ? 'test' : 'development';
+}
+
+_.cli.run(process.argv.slice(2), {
+  plugins: {
+    '@modern-js/module-tools': {
+      cli: kModuleToolsCliPath,
+      // 是否需要强制加载这个组件，跳过 loadPlugins 里面 filter 的检测逻辑
+      forced: true
+    }
+  }
+});

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

@@ -56,8 +56,8 @@ const defineConfig = config => config;
 
 exports.defineConfig = defineConfig;
 
-const loadUserConfig = async (appDirectory, filePath) => {
-  const loaded = await (0, _loadConfig.loadConfig)(appDirectory, filePath);
+const loadUserConfig = async (appDirectory, filePath, packageJsonConfig) => {
+  const loaded = await (0, _loadConfig.loadConfig)(appDirectory, filePath, packageJsonConfig);
   const config = !loaded ? {} : await (typeof loaded.config === 'function' ? loaded.config(0) : loaded.config);
   return {
     config: (0, _lodash.default)({}, config || {}, (loaded === null || loaded === void 0 ? void 0 : loaded.pkgConfig) || {}),
@@ -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,33 @@ 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: [],
+    existSrc: true,
+    internalDirAlias: `@_${metaName.replace(/-/g, '_')}_internal`,
+    internalSrcAlias: `@_${metaName.replace(/-/g, '_')}_src`
+  };
+};
 
 exports.initAppContext = initAppContext;