@modern-js/core 1.0.0-rc.5 → 1.0.0

package/CHANGELOG.md

@@ -1,5 +1,279 @@
 # @modern-js/core
 
+## 1.0.0
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 30ac27c: feat: add generator package description
+- 0fd196e: feat: fix bugs
+- 204c626: feat: initial
+- 63be0a5: fix: #118 #104
+- Updated dependencies [224f7fe]
+- Updated dependencies [30ac27c]
+- Updated dependencies [0fd196e]
+- Updated dependencies [204c626]
+- Updated dependencies [63be0a5]
+  - @modern-js/load-config@1.0.0
+  - @modern-js/plugin@1.0.0
+  - @modern-js/utils@1.0.0
+
+## 1.0.0-rc.23
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 30ac27c: feat: add generator package description
+- 0fd196e: feat: fix bugs
+- 204c626: feat: initial
+- 63be0a5: fix: #118 #104
+- Updated dependencies [224f7fe]
+- Updated dependencies [30ac27c]
+- Updated dependencies [0fd196e]
+- Updated dependencies [204c626]
+- Updated dependencies [63be0a5]
+  - @modern-js/load-config@1.0.0-rc.28
+  - @modern-js/plugin@1.0.0-rc.23
+  - @modern-js/utils@1.0.0-rc.23
+
+## 1.0.0-rc.22
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 30ac27c: feat: add generator package description
+- 0fd196e: feat: fix bugs
+- 204c626: feat: initial
+- 63be0a5: fix: #118 #104
+- Updated dependencies [224f7fe]
+- Updated dependencies [30ac27c]
+- Updated dependencies [0fd196e]
+- Updated dependencies [204c626]
+- Updated dependencies [63be0a5]
+  - @modern-js/load-config@1.0.0-rc.27
+  - @modern-js/plugin@1.0.0-rc.22
+  - @modern-js/utils@1.0.0-rc.22
+
+## 1.0.0-rc.21
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 30ac27c: feat: add generator package description
+- 0fd196e: feat: fix bugs
+- 204c626: feat: initial
+- 63be0a5: fix: #118 #104
+- Updated dependencies [224f7fe]
+- Updated dependencies [30ac27c]
+- Updated dependencies [0fd196e]
+- Updated dependencies [204c626]
+- Updated dependencies [63be0a5]
+  - @modern-js/load-config@1.0.0-rc.26
+  - @modern-js/plugin@1.0.0-rc.21
+  - @modern-js/utils@1.0.0-rc.21
+
+## 1.0.0-rc.20
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 30ac27c: feat: add generator package description
+- feat: fix bugs
+- 204c626: feat: initial
+- 63be0a5: fix: #118 #104
+- Updated dependencies [224f7fe]
+- Updated dependencies [30ac27c]
+- Updated dependencies [undefined]
+- Updated dependencies [204c626]
+- Updated dependencies [63be0a5]
+  - @modern-js/load-config@1.0.0-rc.24
+  - @modern-js/plugin@1.0.0-rc.20
+  - @modern-js/utils@1.0.0-rc.20
+
+## 1.0.0-rc.19
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 30ac27c: feat: add generator package description
+- 204c626: feat: initial
+- 63be0a5: fix: #118 #104
+- Updated dependencies [224f7fe]
+- Updated dependencies [30ac27c]
+- Updated dependencies [204c626]
+- Updated dependencies [63be0a5]
+  - @modern-js/load-config@1.0.0-rc.23
+  - @modern-js/plugin@1.0.0-rc.19
+  - @modern-js/utils@1.0.0-rc.19
+
+## 1.0.0-rc.18
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 30ac27c: feat: add generator package description
+- 204c626: feat: initial
+- 63be0a5: fix: #118 #104
+- Updated dependencies [224f7fe]
+- Updated dependencies [30ac27c]
+- Updated dependencies [204c626]
+- Updated dependencies [63be0a5]
+  - @modern-js/load-config@1.0.0-rc.22
+  - @modern-js/plugin@1.0.0-rc.18
+  - @modern-js/utils@1.0.0-rc.18
+
+## 1.0.0-rc.17
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 30ac27c: feat: add generator package description
+- 204c626: feat: initial
+- fix: #118 #104
+- Updated dependencies [224f7fe]
+- Updated dependencies [30ac27c]
+- Updated dependencies [204c626]
+- Updated dependencies [undefined]
+  - @modern-js/load-config@1.0.0-rc.17
+  - @modern-js/plugin@1.0.0-rc.17
+  - @modern-js/utils@1.0.0-rc.17
+
+## 1.0.0-rc.16
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 30ac27c: feat: add generator package description
+- 204c626: feat: initial
+- Updated dependencies [224f7fe]
+- Updated dependencies [30ac27c]
+- Updated dependencies [204c626]
+  - @modern-js/load-config@1.0.0-rc.16
+  - @modern-js/plugin@1.0.0-rc.16
+  - @modern-js/utils@1.0.0-rc.16
+
+## 1.0.0-rc.15
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 30ac27c: feat: add generator package description
+- 204c626: feat: initial
+- Updated dependencies [224f7fe]
+- Updated dependencies [30ac27c]
+- Updated dependencies [204c626]
+  - @modern-js/load-config@1.0.0-rc.15
+  - @modern-js/plugin@1.0.0-rc.15
+  - @modern-js/utils@1.0.0-rc.15
+
+## 1.0.0-rc.14
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 204c626: feat: initial
+- Updated dependencies [224f7fe]
+- Updated dependencies [204c626]
+  - @modern-js/load-config@1.0.0-rc.14
+  - @modern-js/plugin@1.0.0-rc.14
+  - @modern-js/utils@1.0.0-rc.14
+
+## 1.0.0-rc.13
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 204c626: feat: initial
+- Updated dependencies [224f7fe]
+- Updated dependencies [204c626]
+  - @modern-js/load-config@1.0.0-rc.13
+  - @modern-js/plugin@1.0.0-rc.13
+  - @modern-js/utils@1.0.0-rc.13
+
+## 1.0.0-rc.12
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 204c626: feat: initial
+- Updated dependencies [224f7fe]
+- Updated dependencies [204c626]
+  - @modern-js/load-config@1.0.0-rc.12
+  - @modern-js/plugin@1.0.0-rc.12
+  - @modern-js/utils@1.0.0-rc.12
+
+## 1.0.0-rc.11
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 204c626: feat: initial
+- Updated dependencies [224f7fe]
+- Updated dependencies [204c626]
+  - @modern-js/load-config@1.0.0-rc.11
+  - @modern-js/plugin@1.0.0-rc.11
+  - @modern-js/utils@1.0.0-rc.11
+
+## 1.0.0-rc.10
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 204c626: feat: initial
+- Updated dependencies [224f7fe]
+- Updated dependencies [204c626]
+  - @modern-js/load-config@1.0.0-rc.10
+  - @modern-js/plugin@1.0.0-rc.10
+  - @modern-js/utils@1.0.0-rc.10
+
+## 1.0.0-rc.9
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 204c626: feat: initial
+- Updated dependencies [224f7fe]
+- Updated dependencies [204c626]
+  - @modern-js/load-config@1.0.0-rc.9
+  - @modern-js/plugin@1.0.0-rc.9
+  - @modern-js/utils@1.0.0-rc.9
+
+## 1.0.0-rc.8
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 204c626: feat: initial
+- Updated dependencies [224f7fe]
+- Updated dependencies [204c626]
+  - @modern-js/load-config@1.0.0-rc.8
+  - @modern-js/plugin@1.0.0-rc.8
+  - @modern-js/utils@1.0.0-rc.8
+
+## 1.0.0-rc.7
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 204c626: feat: initial
+- Updated dependencies [224f7fe]
+- Updated dependencies [204c626]
+  - @modern-js/load-config@1.0.0-rc.7
+  - @modern-js/plugin@1.0.0-rc.7
+  - @modern-js/utils@1.0.0-rc.7
+
+## 1.0.0-rc.6
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 204c626: feat: initial
+- Updated dependencies [224f7fe]
+- Updated dependencies [204c626]
+  - @modern-js/load-config@1.0.0-rc.6
+  - @modern-js/plugin@1.0.0-rc.6
+  - @modern-js/utils@1.0.0-rc.6
+
 ## 1.0.0-rc.5
 
 ### Patch Changes

package/README.md

@@ -2,31 +2,32 @@
 <p align="center">
   <a href="https://modernjs.dev" target="blank"><img src="https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png" width="300" alt="Modern.js Logo" /></a>
 </p>
+<p align="center">
+现代 Web 工程体系
+  <br/>
+  <a href="https://modernjs.dev" target="blank">
+    modernjs.dev
+  </a>
+</p>
+<p align="center">
+  The meta-framework suite designed from scratch for frontend-focused modern web development
+</p>
+
+# Introduction
 
-<p align="center">现代 Web 工程体系</p>
+> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.
 
-## 背景
+- 介绍 Modern.js (即将上线)
 - [迈入现代 Web 开发](https://zhuanlan.zhihu.com/p/386607009)
 - [现代 Web 开发者问卷调查报告](https://zhuanlan.zhihu.com/p/403206195)
+- [字节跳动是如何落地微前端的](https://mp.weixin.qq.com/s/L9wbfNG5fTXF5bx7dcgj4Q)
 
-## 计划
-
-Modern.js 的 1.0.0.rc 版已经发到 npm，目前在做测试改进，README 文档之后统一提供（现阶段加入测试和开发，可以发 [issue](https://github.com/modern-js-dev/modern.js/issues) 留微信联系），完整的文档站计划在10月14日上线
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+## Getting Started
 
+- [Quick Start](https://modernjs.dev/docs/start)
+- [Guides](https://modernjs.dev/docs/guides)
+- [API References](https://modernjs.dev/docs/apis)
 
+## Contributing
 
+- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)

package/dist/js/modern/config/defaults.js

@@ -72,7 +72,8 @@ const serverDefaults = {
   port: 8080
 };
 const devDefaults = {
-  assetPrefix: false
+  assetPrefix: false,
+  https: false
 };
 const deployDefaults = {
   domain: '',

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

@@ -20,7 +20,7 @@ const debug = createDebugger('resolve-config');
 export { defaults as defaultsConfig };
 export const defineConfig = config => config;
 export const loadUserConfig = async (appDirectory, filePath) => {
-  const loaded = loadConfig(appDirectory, filePath);
+  const loaded = await loadConfig(appDirectory, filePath);
   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) || {}),

package/dist/js/modern/config/schema/deploy.js

@@ -3,21 +3,7 @@ export const deploy = {
   type: 'object',
   properties: {
     microFrontend: {
-      type: 'object',
-      dependencies: {
-        enableHtmlEntry: {
-          properties: {
-            enableLegacy: {
-              enum: [false]
-            }
-          }
-        }
-      },
-      properties: {
-        enableHtmlEntry: {
-          type: 'boolean'
-        }
-      }
+      type: ['boolean', 'object']
     },
     domain: {
       type: ['array', 'string']

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

@@ -15,6 +15,9 @@ const dev = {
   properties: {
     assetPrefix: {
       type: ['boolean', 'string']
+    },
+    https: {
+      type: 'boolean'
     }
   },
   additionalProperties: false

package/dist/js/modern/config/schema/server.js

@@ -162,6 +162,9 @@ export const server = {
     },
     proxy: {
       type: 'object'
+    },
+    enableMicroFrontendDebug: {
+      type: 'boolean'
     }
   }
 };

package/dist/js/modern/context.js

@@ -1,12 +1,12 @@
-import path from 'path';
+import { path } from '@modern-js/utils';
 import { createContext } from '@modern-js/plugin';
 import address from 'address';
 export const AppContext = createContext({});
 export const ConfigContext = createContext({});
 export const ResolvedConfigContext = createContext({});
-export const useAppContext = () => AppContext.use();
-export const useConfigContext = () => ConfigContext.use();
-export const useResolvedConfigContext = () => ResolvedConfigContext.use();
+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,

package/dist/js/modern/index.js

@@ -4,10 +4,9 @@ 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 path from 'path';
-import { createAsyncManager, createContext, createAsyncWorkflow, createParallelWorkflow } from '@modern-js/plugin';
+import { path, upath, compatRequire, pkgUp, ensureAbsolutePath, logger } from '@modern-js/utils';
+import { createAsyncManager, createAsyncWorkflow, createParallelWorkflow } from '@modern-js/plugin';
 import { enable } from '@modern-js/plugin/node';
-import { compatRequire, pkgUp, ensureAbsolutePath, logger } from '@modern-js/utils';
 import { program } from "./utils/commander";
 import { resolveConfig, defineConfig, loadUserConfig } from "./config";
 import { loadPlugins } from "./loadPlugins";
@@ -15,6 +14,8 @@ import { AppContext, ConfigContext, initAppContext, ResolvedConfigContext, useAp
 import { initWatcher } from "./initWatcher";
 import { loadEnv } from "./loadEnv";
 export { defaultsConfig } 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');
 const hooksMap = {
   config: createParallelWorkflow(),
@@ -33,8 +34,8 @@ export const {
   registe: registerHook,
   useRunner: mountHook
 } = manager;
-export const usePlugins = plugins => plugins.forEach(plugin => manager.usePlugin(compatRequire(require.resolve(plugin))));
-export { defineConfig, createContext, AppContext, useAppContext, useConfigContext, useResolvedConfigContext };
+export const usePlugins = plugins => plugins.forEach(plugin => manager.usePlugin(compatRequire(upath.normalize(require.resolve(plugin)))));
+export { defineConfig, AppContext, useAppContext, useConfigContext, useResolvedConfigContext };
 
 const initAppDir = async () => {
   const pkg = await pkgUp({
@@ -53,6 +54,7 @@ const createCli = () => {
   let isRestart = false;
 
   const init = async (argv = []) => {
+    enable();
     manager.clear();
     const appDirectory = await initAppDir();
     loadEnv(appDirectory);
@@ -100,31 +102,33 @@ const createCli = () => {
   };
 
   async function run(argv) {
-    enable();
     const {
       loadedConfig,
       appContext,
       resolved
     } = await init(argv);
-    initWatcher(loadedConfig, appContext.appDirectory, resolved, hooksRunner, argv);
     await hooksRunner.commands({
       program
     });
+    initWatcher(loadedConfig, appContext.appDirectory, resolved.source.configDir, hooksRunner, argv);
     manager.run(() => program.parse(process.argv));
   }
 
   async function restart() {
     isRestart = true;
+    logger.info('Restart...\n');
+    let hasGetError = false;
 
     try {
-      logger.info('Restart...\n');
-      await init();
-      return true;
+      await init(process.argv.slice(2));
     } catch (err) {
-      logger.error(err);
+      console.error(err);
+      hasGetError = true;
+    } finally {
+      if (!hasGetError) {
+        manager.run(() => program.parse(process.argv));
+      }
     }
-
-    return false;
   }
 
   return {

package/dist/js/modern/initWatcher.js

@@ -1,21 +1,15 @@
-import path from 'path';
 import crypto from 'crypto';
 import fs from 'fs';
+import { path, isDev, createDebugger } from '@modern-js/utils';
 import chokidar from 'chokidar';
-import { isDev, createDebugger } from '@modern-js/utils';
 const debug = createDebugger('watch-files');
 
 const md5 = data => crypto.createHash('md5').update(data).digest('hex');
 
 const hashMap = new Map();
-export const initWatcher = async (loaded, appDirectory, resovledConfig, hooksRunner, argv) => {
+export const initWatcher = async (loaded, appDirectory, configDir, hooksRunner, argv) => {
   // only add fs watcher on dev mode.
   if (isDev() && argv[0] === 'dev') {
-    const {
-      source: {
-        configDir
-      }
-    } = resovledConfig;
     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);

package/dist/js/modern/loadEnv.js

@@ -1,5 +1,5 @@
-import path from 'path';
 import fs from 'fs';
+import { path } from '@modern-js/utils';
 import dotenv from 'dotenv';
 import dotenvExpand from 'dotenv-expand';
 export const loadEnv = (appDirectory, mode = process.env.NODE_ENV) => {

package/dist/js/modern/loadPlugins.js

@@ -1,4 +1,4 @@
-import { isDepExists, createDebugger, compatRequire, INTERNAL_PLUGINS } from '@modern-js/utils';
+import { isDepExists, createDebugger, compatRequire, INTERNAL_PLUGINS, upath } from '@modern-js/utils';
 const debug = createDebugger('load-plugins');
 
 /**
@@ -12,9 +12,9 @@ const resolvePlugin = (appDirectory, plugin) => {
     let filePath = '';
 
     try {
-      filePath = require.resolve(name, {
+      filePath = upath.normalizeSafe(require.resolve(name, {
         paths: [appDirectory]
-      });
+      }));
       delete require.cache[filePath];
     } catch (err) {
       if (err.code === 'MODULE_NOT_FOUND') {

package/dist/js/node/config/defaults.js

@@ -78,7 +78,8 @@ const serverDefaults = {
   port: 8080
 };
 const devDefaults = {
-  assetPrefix: false
+  assetPrefix: false,
+  https: false
 };
 const deployDefaults = {
   domain: '',

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

@@ -50,7 +50,7 @@ const defineConfig = config => config;
 exports.defineConfig = defineConfig;
 
 const loadUserConfig = async (appDirectory, filePath) => {
-  const loaded = (0, _loadConfig.loadConfig)(appDirectory, filePath);
+  const loaded = await (0, _loadConfig.loadConfig)(appDirectory, filePath);
   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) || {}),

package/dist/js/node/config/schema/deploy.js

@@ -11,21 +11,7 @@ const deploy = {
   type: 'object',
   properties: {
     microFrontend: {
-      type: 'object',
-      dependencies: {
-        enableHtmlEntry: {
-          properties: {
-            enableLegacy: {
-              enum: [false]
-            }
-          }
-        }
-      },
-      properties: {
-        enableHtmlEntry: {
-          type: 'boolean'
-        }
-      }
+      type: ['boolean', 'object']
     },
     domain: {
       type: ['array', 'string']

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

@@ -31,6 +31,9 @@ const dev = {
   properties: {
     assetPrefix: {
       type: ['boolean', 'string']
+    },
+    https: {
+      type: 'boolean'
     }
   },
   additionalProperties: false

package/dist/js/node/config/schema/server.js

@@ -170,6 +170,9 @@ const server = {
     },
     proxy: {
       type: 'object'
+    },
+    enableMicroFrontendDebug: {
+      type: 'boolean'
     }
   }
 };

package/dist/js/node/context.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useResolvedConfigContext = exports.useConfigContext = exports.useAppContext = exports.initAppContext = exports.ResolvedConfigContext = exports.ConfigContext = exports.AppContext = void 0;
 
-var _path = _interopRequireDefault(require("path"));
+var _utils = require("@modern-js/utils");
 
 var _plugin = require("@modern-js/plugin");
 
@@ -20,15 +20,15 @@ exports.ConfigContext = ConfigContext;
 const ResolvedConfigContext = (0, _plugin.createContext)({});
 exports.ResolvedConfigContext = ResolvedConfigContext;
 
-const useAppContext = () => AppContext.use();
+const useAppContext = () => AppContext.use().value;
 
 exports.useAppContext = useAppContext;
 
-const useConfigContext = () => ConfigContext.use();
+const useConfigContext = () => ConfigContext.use().value;
 
 exports.useConfigContext = useConfigContext;
 
-const useResolvedConfigContext = () => ResolvedConfigContext.use();
+const useResolvedConfigContext = () => ResolvedConfigContext.use().value;
 
 exports.useResolvedConfigContext = useResolvedConfigContext;
 
@@ -37,12 +37,12 @@ const initAppContext = (appDirectory, plugins, configFile) => ({
   configFile,
   ip: _address.default.ip(),
   port: 0,
-  packageName: require(_path.default.resolve(appDirectory, './package.json')).name,
-  srcDirectory: _path.default.resolve(appDirectory, './src'),
+  packageName: require(_utils.path.resolve(appDirectory, './package.json')).name,
+  srcDirectory: _utils.path.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'),
+  sharedDirectory: _utils.path.resolve(appDirectory, './shared'),
+  nodeModulesDirectory: _utils.path.resolve(appDirectory, './node_modules'),
+  internalDirectory: _utils.path.resolve(appDirectory, './node_modules/.modern-js'),
   plugins,
   htmlTemplates: {},
   serverRoutes: [],