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

package/dist/js/node/index.js

@@ -3,20 +3,27 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {
+  manager: true,
+  createPlugin: true,
+  registerHook: true,
+  mountHook: true,
+  usePlugins: true,
+  cli: true,
+  defineConfig: true,
+  defaultsConfig: true,
+  AppContext: true,
+  useAppContext: true,
+  useConfigContext: true,
+  useResolvedConfigContext: true
+};
 Object.defineProperty(exports, "AppContext", {
   enumerable: true,
   get: function () {
     return _context.AppContext;
   }
 });
-exports.cli = void 0;
-Object.defineProperty(exports, "createContext", {
-  enumerable: true,
-  get: function () {
-    return _plugin.createContext;
-  }
-});
-exports.createPlugin = void 0;
+exports.createPlugin = exports.cli = void 0;
 Object.defineProperty(exports, "defaultsConfig", {
   enumerable: true,
   get: function () {
@@ -50,13 +57,35 @@ Object.defineProperty(exports, "useResolvedConfigContext", {
   }
 });
 
-var _path = _interopRequireDefault(require("path"));
+var _utils = require("@modern-js/utils");
 
 var _plugin = require("@modern-js/plugin");
 
+Object.keys(_plugin).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _plugin[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _plugin[key];
+    }
+  });
+});
+
 var _node = require("@modern-js/plugin/node");
 
-var _utils = require("@modern-js/utils");
+Object.keys(_node).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _node[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _node[key];
+    }
+  });
+});
 
 var _commander = require("./utils/commander");
 
@@ -70,8 +99,6 @@ var _initWatcher = require("./initWatcher");
 
 var _loadEnv = require("./loadEnv");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -102,7 +129,7 @@ exports.mountHook = mountHook;
 exports.registerHook = registerHook;
 exports.createPlugin = createPlugin;
 
-const usePlugins = plugins => plugins.forEach(plugin => manager.usePlugin((0, _utils.compatRequire)(require.resolve(plugin))));
+const usePlugins = plugins => plugins.forEach(plugin => manager.usePlugin((0, _utils.compatRequire)(_utils.upath.normalize(require.resolve(plugin)))));
 
 exports.usePlugins = usePlugins;
 
@@ -115,7 +142,7 @@ const initAppDir = async () => {
     throw new Error(`no package.json found in current work dir: ${process.cwd()}`);
   }
 
-  return _path.default.dirname(pkg);
+  return _utils.path.dirname(pkg);
 };
 
 const createCli = () => {
@@ -123,6 +150,7 @@ const createCli = () => {
   let isRestart = false;
 
   const init = async (argv = []) => {
+    (0, _node.enable)();
     manager.clear();
     const appDirectory = await initAppDir();
     (0, _loadEnv.loadEnv)(appDirectory);
@@ -173,32 +201,35 @@ const createCli = () => {
   };
 
   async function run(argv) {
-    (0, _node.enable)();
     const {
       loadedConfig,
       appContext,
       resolved
     } = await init(argv);
-    (0, _initWatcher.initWatcher)(loadedConfig, appContext.appDirectory, resolved, hooksRunner, argv);
     await hooksRunner.commands({
       program: _commander.program
     });
+    (0, _initWatcher.initWatcher)(loadedConfig, appContext.appDirectory, resolved.source.configDir, hooksRunner, argv);
     manager.run(() => _commander.program.parse(process.argv));
   }
 
   async function restart() {
     isRestart = true;
 
-    try {
-      _utils.logger.info('Restart...\n');
+    _utils.logger.info('Restart...\n');
+
+    let hasGetError = false;
 
-      await init();
-      return true;
+    try {
+      await init(process.argv.slice(2));
     } catch (err) {
-      _utils.logger.error(err);
+      console.error(err);
+      hasGetError = true;
+    } finally {
+      if (!hasGetError) {
+        manager.run(() => _commander.program.parse(process.argv));
+      }
     }
-
-    return false;
   }
 
   return {

package/dist/js/node/initWatcher.js

@@ -5,16 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.initWatcher = void 0;
 
-var _path = _interopRequireDefault(require("path"));
-
 var _crypto = _interopRequireDefault(require("crypto"));
 
 var _fs = _interopRequireDefault(require("fs"));
 
-var _chokidar = _interopRequireDefault(require("chokidar"));
-
 var _utils = require("@modern-js/utils");
 
+var _chokidar = _interopRequireDefault(require("chokidar"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const debug = (0, _utils.createDebugger)('watch-files');
@@ -23,17 +21,12 @@ const md5 = data => _crypto.default.createHash('md5').update(data).digest('hex')
 
 const hashMap = new Map();
 
-const initWatcher = async (loaded, appDirectory, resovledConfig, hooksRunner, argv) => {
+const initWatcher = async (loaded, appDirectory, configDir, hooksRunner, argv) => {
   // only add fs watcher on dev mode.
   if ((0, _utils.isDev)() && argv[0] === 'dev') {
-    const {
-      source: {
-        configDir
-      }
-    } = resovledConfig;
     const extraFiles = await hooksRunner.watchFiles();
 
-    const configPath = _path.default.join(appDirectory, configDir);
+    const configPath = _utils.path.join(appDirectory, configDir);
 
     const watched = [`${configPath}/html`, ...extraFiles, loaded === null || loaded === void 0 ? void 0 : loaded.filePath, ...loaded.dependencies].filter(Boolean);
     debug(`watched: %o`, watched);
@@ -46,7 +39,7 @@ const initWatcher = async (loaded, appDirectory, resovledConfig, hooksRunner, ar
 
     watcher.on('change', changed => {
       const lastHash = hashMap.get(changed);
-      const currentHash = md5(_fs.default.readFileSync(_path.default.join(appDirectory, changed), 'utf8'));
+      const currentHash = md5(_fs.default.readFileSync(_utils.path.join(appDirectory, changed), 'utf8'));
 
       if (currentHash !== lastHash) {
         debug(`file change: %s`, changed);

package/dist/js/node/loadEnv.js

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.loadEnv = void 0;
 
-var _path = _interopRequireDefault(require("path"));
-
 var _fs = _interopRequireDefault(require("fs"));
 
+var _utils = require("@modern-js/utils");
+
 var _dotenv = _interopRequireDefault(require("dotenv"));
 
 var _dotenvExpand = _interopRequireDefault(require("dotenv-expand"));
@@ -16,7 +16,7 @@ var _dotenvExpand = _interopRequireDefault(require("dotenv-expand"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const loadEnv = (appDirectory, mode = process.env.NODE_ENV) => {
-  [`.env.${mode}`, '.env'].map(name => _path.default.resolve(appDirectory, name)).filter(filePath => _fs.default.existsSync(filePath) && !_fs.default.statSync(filePath).isDirectory()).forEach(filePath => {
+  [`.env.${mode}`, '.env'].map(name => _utils.path.resolve(appDirectory, name)).filter(filePath => _fs.default.existsSync(filePath) && !_fs.default.statSync(filePath).isDirectory()).forEach(filePath => {
     const envConfig = _dotenv.default.config({
       path: filePath
     });

package/dist/js/node/loadPlugins.js

@@ -20,9 +20,9 @@ const resolvePlugin = (appDirectory, plugin) => {
     let filePath = '';
 
     try {
-      filePath = require.resolve(name, {
+      filePath = _utils.upath.normalizeSafe(require.resolve(name, {
         paths: [appDirectory]
-      });
+      }));
       delete require.cache[filePath];
     } catch (err) {
       if (err.code === 'MODULE_NOT_FOUND') {

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

@@ -5,6 +5,7 @@ export declare const defaults: {
   server: ServerConfig;
   dev: {
     assetPrefix: boolean;
+    https: boolean;
   };
   deploy: {
     domain: string;

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

@@ -73,14 +73,14 @@ export interface ServerConfig {
   port?: number;
   logger?: Record<string, string>;
   measure?: Record<string, string>;
+  enableMicroFrontendDebug?: boolean;
 }
 export interface DevConfig {
   assetPrefix?: string | boolean;
+  https?: boolean;
 }
 export interface DeployConfig {
-  microFrontend?: {
-    enableHtmlEntry?: boolean;
-  };
+  microFrontend?: boolean | Record<string, unknown>;
   domain?: string | Array<string>;
   domainByEntries?: Record<string, string | Array<string>>;
 }

package/dist/types/config/schema/deploy.d.ts

@@ -2,21 +2,7 @@ export declare const deploy: {
   type: string;
   properties: {
     microFrontend: {
-      type: string;
-      dependencies: {
-        enableHtmlEntry: {
-          properties: {
-            enableLegacy: {
-              enum: boolean[];
-            };
-          };
-        };
-      };
-      properties: {
-        enableHtmlEntry: {
-          type: string;
-        };
-      };
+      type: string[];
     };
     domain: {
       type: string[];

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

@@ -388,27 +388,16 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
         proxy: {
           type: string;
         };
+        enableMicroFrontendDebug: {
+          type: string;
+        };
       };
     };
     deploy: {
       type: string;
       properties: {
         microFrontend: {
-          type: string;
-          dependencies: {
-            enableHtmlEntry: {
-              properties: {
-                enableLegacy: {
-                  enum: boolean[];
-                };
-              };
-            };
-          };
-          properties: {
-            enableHtmlEntry: {
-              type: string;
-            };
-          };
+          type: string[];
         };
         domain: {
           type: string[];
@@ -433,6 +422,9 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
         assetPrefix: {
           type: string[];
         };
+        https: {
+          type: string;
+        };
       };
       additionalProperties: boolean;
     };

package/dist/types/config/schema/server.d.ts

@@ -175,5 +175,8 @@ export declare const server: {
     proxy: {
       type: string;
     };
+    enableMicroFrontendDebug: {
+      type: string;
+    };
   };
 };

package/dist/types/context.d.ts

@@ -5,15 +5,9 @@ export type { IAppContext };
 export declare const AppContext: import("@modern-js/plugin").Context<IAppContext>;
 export declare const ConfigContext: import("@modern-js/plugin").Context<UserConfig>;
 export declare const ResolvedConfigContext: import("@modern-js/plugin").Context<NormalizedConfig>;
-export declare const useAppContext: () => {
-  value: IAppContext;
-};
-export declare const useConfigContext: () => {
-  value: UserConfig;
-};
-export declare const useResolvedConfigContext: () => {
-  value: NormalizedConfig;
-};
+export declare const useAppContext: () => IAppContext;
+export declare const useConfigContext: () => UserConfig;
+export declare const useResolvedConfigContext: () => NormalizedConfig;
 export declare const initAppContext: (appDirectory: string, plugins: Array<{
   cli: any;
   server: any;

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
-import { createContext, ParallelWorkflow, AsyncWorkflow, Progresses2Runners } from '@modern-js/plugin';
+import { ParallelWorkflow, AsyncWorkflow, Progresses2Runners } from '@modern-js/plugin';
 import type { Hooks } from '@modern-js/types';
 import { Command } from './utils/commander';
 import { defineConfig, UserConfig, ToolsConfig } from './config';
@@ -6,6 +6,8 @@ import { AppContext, IAppContext, useAppContext, useConfigContext, useResolvedCo
 import { NormalizedConfig } from './config/mergeConfig';
 export type { Hooks };
 export { defaultsConfig } from './config';
+export * from '@modern-js/plugin';
+export * from '@modern-js/plugin/node';
 export declare type HooksRunner = Progresses2Runners<{
   config: ParallelWorkflow<void>;
   validateSchema: ParallelWorkflow<void>;
@@ -70,7 +72,7 @@ export declare const createPlugin: (initializer: import("@modern-js/plugin").Asy
   beforeExit: AsyncWorkflow<void, void>;
 } & import("@modern-js/plugin").ClearDraftProgress<Hooks>>;
 export declare const usePlugins: (plugins: string[]) => void;
-export { defineConfig, createContext, AppContext, useAppContext, useConfigContext, useResolvedConfigContext };
+export { defineConfig, AppContext, useAppContext, useConfigContext, useResolvedConfigContext };
 export type { NormalizedConfig, IAppContext, UserConfig, ToolsConfig };
 export interface CoreOption {
   dryRun?: boolean;
@@ -82,5 +84,5 @@ export declare const cli: {
     resolved: NormalizedConfig;
   }>;
   run: (argv: string[]) => Promise<void>;
-  restart: () => Promise<boolean>;
+  restart: () => Promise<void>;
 };

package/dist/types/initWatcher.d.ts

@@ -1,4 +1,3 @@
-import { NormalizedConfig } from './config/mergeConfig';
 import { LoadedConfig } from './config';
 import { HooksRunner } from '.';
-export declare const initWatcher: (loaded: LoadedConfig, appDirectory: string, resovledConfig: NormalizedConfig, hooksRunner: HooksRunner, argv: string[]) => Promise<void>;
+export declare const initWatcher: (loaded: LoadedConfig, appDirectory: string, configDir: string | undefined, hooksRunner: HooksRunner, argv: string[]) => Promise<void>;

package/package.json

@@ -1,6 +1,17 @@
 {
   "name": "@modern-js/core",
-  "version": "1.0.0-rc.5",
+  "description": "The meta-framework suite designed from scratch for frontend-focused modern web development.",
+  "homepage": "https://modernjs.dev",
+  "bugs": "https://github.com/modern-js-dev/modern.js/issues",
+  "repository": "modern-js-dev/modern.js",
+  "license": "MIT",
+  "keywords": [
+    "react",
+    "framework",
+    "modern",
+    "modern.js"
+  ],
+  "version": "1.0.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -25,11 +36,11 @@
   },
   "bin": "./bin/modern-js.js",
   "dependencies": {
-    "@babel/runtime": "^7",
     "@babel/code-frame": "^7.14.5",
-    "@modern-js/load-config": "^1.0.0-rc.5",
-    "@modern-js/plugin": "^1.0.0-rc.5",
-    "@modern-js/utils": "^1.0.0-rc.5",
+    "@babel/runtime": "^7",
+    "@modern-js/load-config": "^1.0.0",
+    "@modern-js/plugin": "^1.0.0",
+    "@modern-js/utils": "^1.0.0",
     "address": "^1.1.2",
     "ajv": "^8.6.2",
     "ajv-keywords": "^5.0.0",
@@ -46,7 +57,7 @@
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.0.3",
-    "@modern-js/types": "^1.0.0-rc.5",
+    "@modern-js/types": "^1.0.0",
     "@types/jest": "^26",
     "@types/lodash.clonedeep": "^4.5.6",
     "@types/lodash.mergewith": "^4.6.6",
@@ -55,8 +66,8 @@
     "@types/react-dom": "^17",
     "@types/signale": "^1.4.2",
     "typescript": "^4",
-    "@modern-js/plugin-testing": "^1.0.0-rc.5",
-    "@modern-js/module-tools": "^1.0.0-rc.5"
+    "@modern-js/plugin-testing": "^1.0.0",
+    "@modern-js/module-tools": "^1.0.0"
   },
   "sideEffects": false,
   "modernConfig": {

package/src/config/defaults.ts

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

package/src/config/index.ts

@@ -107,16 +107,16 @@ export interface ServerConfig {
   port?: number;
   logger?: Record<string, string>;
   measure?: Record<string, string>;
+  enableMicroFrontendDebug?: boolean;
 }
 
 export interface DevConfig {
   assetPrefix?: string | boolean;
+  https?: boolean;
 }
 
 export interface DeployConfig {
-  microFrontend?: {
-    enableHtmlEntry?: boolean;
-  };
+  microFrontend?: boolean | Record<string, unknown>;
   domain?: string | Array<string>;
   domainByEntries?: Record<string, string | Array<string>>;
 }
@@ -175,7 +175,7 @@ export const loadUserConfig = async (
   appDirectory: string,
   filePath?: string,
 ): Promise<LoadedConfig> => {
-  const loaded = loadConfig<ConfigParam>(appDirectory, filePath);
+  const loaded = await loadConfig<ConfigParam>(appDirectory, filePath);
 
   const config = !loaded
     ? {}

package/src/config/schema/deploy.ts

@@ -4,13 +4,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'] },
     domainByEntries: {

package/src/config/schema/index.ts

@@ -16,7 +16,12 @@ const plugins = {
 
 const dev = {
   type: 'object',
-  properties: { assetPrefix: { type: ['boolean', 'string'] } },
+  properties: {
+    assetPrefix: { type: ['boolean', 'string'] },
+    https: {
+      type: 'boolean',
+    },
+  },
   additionalProperties: false,
 };
 export interface PluginValidateSchema {

package/src/config/schema/server.ts

@@ -101,5 +101,6 @@ export const server = {
     logger: { type: 'object' },
     measure: { type: 'object' },
     proxy: { type: 'object' },
+    enableMicroFrontendDebug: { type: 'boolean' },
   },
 };

package/src/context.ts

@@ -1,4 +1,4 @@
-import path from 'path';
+import { path } from '@modern-js/utils';
 import { createContext } from '@modern-js/plugin';
 import address from 'address';
 import type { IAppContext } from '@modern-js/types';
@@ -15,11 +15,11 @@ export const ResolvedConfigContext = createContext<NormalizedConfig>(
   {} as NormalizedConfig,
 );
 
-export const useAppContext = () => AppContext.use();
+export const useAppContext = () => AppContext.use().value;
 
-export const useConfigContext = () => ConfigContext.use();
+export const useConfigContext = () => ConfigContext.use().value;
 
-export const useResolvedConfigContext = () => ResolvedConfigContext.use();
+export const useResolvedConfigContext = () => ResolvedConfigContext.use().value;
 
 export const initAppContext = (
   appDirectory: string,

package/src/index.ts

@@ -1,7 +1,13 @@
-import path from 'path';
+import {
+  path,
+  upath,
+  compatRequire,
+  pkgUp,
+  ensureAbsolutePath,
+  logger,
+} from '@modern-js/utils';
 import {
   createAsyncManager,
-  createContext,
   createAsyncWorkflow,
   createParallelWorkflow,
   ParallelWorkflow,
@@ -9,12 +15,7 @@ import {
   Progresses2Runners,
 } from '@modern-js/plugin';
 import { enable } from '@modern-js/plugin/node';
-import {
-  compatRequire,
-  pkgUp,
-  ensureAbsolutePath,
-  logger,
-} from '@modern-js/utils';
+
 import type { Hooks } from '@modern-js/types';
 import { program, Command } from './utils/commander';
 import {
@@ -42,6 +43,9 @@ import { loadEnv } from './loadEnv';
 export type { Hooks };
 export { defaultsConfig } from './config';
 
+export * from '@modern-js/plugin';
+export * from '@modern-js/plugin/node';
+
 program
   .name('modern')
   .usage('<command> [options]')
@@ -101,12 +105,11 @@ export const {
 
 export const usePlugins = (plugins: string[]) =>
   plugins.forEach(plugin =>
-    manager.usePlugin(compatRequire(require.resolve(plugin))),
+    manager.usePlugin(compatRequire(upath.normalize(require.resolve(plugin)))),
   );
 
 export {
   defineConfig,
-  createContext,
   AppContext,
   useAppContext,
   useConfigContext,
@@ -136,6 +139,8 @@ const createCli = () => {
   let isRestart = false;
 
   const init = async (argv: string[] = []) => {
+    enable();
+
     manager.clear();
 
     const appDirectory = await initAppDir();
@@ -201,33 +206,36 @@ const createCli = () => {
   };
 
   async function run(argv: string[]) {
-    enable();
-
     const { loadedConfig, appContext, resolved } = await init(argv);
 
+    await hooksRunner.commands({ program });
+
     initWatcher(
       loadedConfig,
       appContext.appDirectory,
-      resolved,
+      resolved.source.configDir,
       hooksRunner,
       argv,
     );
-
-    await hooksRunner.commands({ program });
-
     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;
-    } catch (err) {
-      logger.error(err as string);
+      await init(process.argv.slice(2));
+    } catch(err) {
+      console.error(err)
+      hasGetError = true
+    } finally {
+      if (!hasGetError) {
+        manager.run(() => program.parse(process.argv));
+      }
     }
-    return false;
   }
 
   return {