@modern-js/core 0.0.0-options-202112061451 → 0.0.0-runtime-2021112193858

package/CHANGELOG.md

@@ -1,5 +1,55 @@
 # @modern-js/core
 
+## 0.0.0-runtime-2021112193858
+
+### Patch Changes
+
+- 8698465e: fix: dependence version
+- e04914ce: add route types, fix metrics types
+- e04914ce: add route types, fix metrics types
+- Updated dependencies [8698465e]
+  - @modern-js/load-config@0.0.0-runtime-2021112193858
+  - @modern-js/plugin@0.0.0-runtime-2021112193858
+  - @modern-js/utils@0.0.0-runtime-2021112193858
+
+## 1.1.4
+
+### Patch Changes
+
+- d73ff455: support multi process product
+- d73ff455: support multi process product
+- d73ff455: support multi process product
+- d73ff455: support multi process product
+- d73ff455: support multi process product
+- Updated dependencies [d927bc83]
+- Updated dependencies [d73ff455]
+- Updated dependencies [9c1ab865]
+- Updated dependencies [d73ff455]
+- Updated dependencies [d73ff455]
+- Updated dependencies [d73ff455]
+- Updated dependencies [d73ff455]
+  - @modern-js/utils@1.1.4
+
+## 1.1.3
+
+### Patch Changes
+
+- 085a6a58: refactor server plugin
+- 085a6a58: refactor server plugin
+- 085a6a58: refactor server conifg
+- d4fcc73a: add options.plugins:
+- 085a6a58: support server runtime
+- ed1f6b12: feat: support build --analyze
+- a5ebbb00: fix: remove enableUsageBuiltIns config
+- 085a6a58: feat: refactor server plugin
+- Updated dependencies [085a6a58]
+- Updated dependencies [085a6a58]
+- Updated dependencies [085a6a58]
+- Updated dependencies [d280ea33]
+- Updated dependencies [085a6a58]
+- Updated dependencies [085a6a58]
+  - @modern-js/utils@1.1.3
+
 ## 1.1.2
 
 ### Patch Changes

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

@@ -1,6 +1,6 @@
-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 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 = 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; }
+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; }
 

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

@@ -107,9 +107,6 @@ export const output = {
     enableLatestDecorators: {
       type: 'boolean'
     },
-    enableUsageBuiltIns: {
-      type: 'boolean'
-    },
     enableTsLoader: {
       type: 'boolean'
     },

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

@@ -157,7 +157,7 @@ export const server = {
     logger: {
       type: 'object'
     },
-    measure: {
+    metrics: {
       type: 'object'
     },
     proxy: {

package/dist/js/modern/index.js

@@ -1,6 +1,6 @@
-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 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 = 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; }
+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; }
 
@@ -37,7 +37,7 @@ export const {
   useRunner: mountHook
 } = manager;
 export const usePlugins = plugins => plugins.forEach(plugin => manager.usePlugin(compatRequire(require.resolve(plugin))));
-export { defineConfig, AppContext, useAppContext, useConfigContext, useResolvedConfigContext };
+export { defineConfig, AppContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext, ConfigContext };
 
 const initAppDir = async () => {
   const pkg = await pkgUp({

package/dist/js/modern/loadPlugins.js

@@ -60,7 +60,9 @@ export const loadPlugins = (appDirectory, pluginConfig, internalPlugins) => {
     });
     return {
       cli: cli && compatRequire(cli),
-      server: server && compatRequire(server)
+      cliPath: typeof plugin === 'string' ? plugin : plugin.cli,
+      server: server && compatRequire(server),
+      serverPath: typeof plugin === 'string' ? undefined : plugin.server
     };
   });
 };

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

@@ -44,9 +44,9 @@ var _schema = require("./schema");
 
 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 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 = 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; }
+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; }
 

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

@@ -115,9 +115,6 @@ const output = {
     enableLatestDecorators: {
       type: 'boolean'
     },
-    enableUsageBuiltIns: {
-      type: 'boolean'
-    },
     enableTsLoader: {
       type: 'boolean'
     },

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

@@ -165,7 +165,7 @@ const server = {
     logger: {
       type: 'object'
     },
-    measure: {
+    metrics: {
       type: 'object'
     },
     proxy: {

package/dist/js/node/index.js

@@ -16,7 +16,9 @@ var _exportNames = {
   defaultsConfig: true,
   mergeConfig: true,
   AppContext: true,
+  ConfigContext: true,
   initAppContext: true,
+  ResolvedConfigContext: true,
   useAppContext: true,
   useConfigContext: true,
   useResolvedConfigContext: true
@@ -27,6 +29,18 @@ Object.defineProperty(exports, "AppContext", {
     return _context.AppContext;
   }
 });
+Object.defineProperty(exports, "ConfigContext", {
+  enumerable: true,
+  get: function () {
+    return _context.ConfigContext;
+  }
+});
+Object.defineProperty(exports, "ResolvedConfigContext", {
+  enumerable: true,
+  get: function () {
+    return _context.ResolvedConfigContext;
+  }
+});
 exports.createPlugin = exports.cli = void 0;
 Object.defineProperty(exports, "defaultsConfig", {
   enumerable: true,
@@ -127,9 +141,9 @@ 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 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 = 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; }
+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; }
 

package/dist/js/node/loadPlugins.js

@@ -68,7 +68,9 @@ const loadPlugins = (appDirectory, pluginConfig, internalPlugins) => {
     });
     return {
       cli: cli && (0, _utils.compatRequire)(cli),
-      server: server && (0, _utils.compatRequire)(server)
+      cliPath: typeof plugin === 'string' ? plugin : plugin.cli,
+      server: server && (0, _utils.compatRequire)(server),
+      serverPath: typeof plugin === 'string' ? undefined : plugin.server
     };
   });
 };

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

@@ -72,8 +72,8 @@ export interface ServerConfig {
   ssrByEntries?: Record<string, boolean | Record<string, unknown>>;
   baseUrl?: string | Array<string>;
   port?: number;
-  logger?: Record<string, string>;
-  measure?: Record<string, string>;
+  logger?: Record<string, any>;
+  metrics?: Record<string, any>;
   enableMicroFrontendDebug?: boolean;
 }
 export interface DevConfig {

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

@@ -17,6 +17,7 @@ export interface NormalizedToolsConfig extends Omit<ToolsConfig, 'webpack' | 'ba
 export interface NormalizedConfig extends Omit<Required<UserConfig>, 'source' | 'tools'> {
   source: NormalizedSourceConfig;
   tools: NormalizedToolsConfig;
+  cliOptions?: Record<string, any>;
   _raw: UserConfig;
 }
 /**

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

@@ -173,9 +173,6 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
         enableLatestDecorators: {
           type: string;
         };
-        enableUsageBuiltIns: {
-          type: string;
-        };
         enableTsLoader: {
           type: string;
         };
@@ -382,7 +379,7 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
         logger: {
           type: string;
         };
-        measure: {
+        metrics: {
           type: string;
         };
         proxy: {

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

@@ -106,9 +106,6 @@ export declare const output: {
     enableLatestDecorators: {
       type: string;
     };
-    enableUsageBuiltIns: {
-      type: string;
-    };
     enableTsLoader: {
       type: string;
     };

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

@@ -169,7 +169,7 @@ export declare const server: {
     logger: {
       type: string;
     };
-    measure: {
+    metrics: {
       type: string;
     };
     proxy: {

package/dist/types/index.d.ts

@@ -3,7 +3,7 @@ import { ParallelWorkflow, AsyncWorkflow, Progresses2Runners, AsyncWaterfall } f
 import type { Hooks } from '@modern-js/types';
 import { Command } from './utils/commander';
 import { defineConfig, loadUserConfig, UserConfig, ToolsConfig } from './config';
-import { AppContext, IAppContext, initAppContext, useAppContext, useConfigContext, useResolvedConfigContext } from './context';
+import { AppContext, ConfigContext, IAppContext, initAppContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext } from './context';
 import { NormalizedConfig } from './config/mergeConfig';
 export type { Hooks };
 export { defaultsConfig, mergeConfig } from './config';
@@ -88,7 +88,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, AppContext, useAppContext, useConfigContext, useResolvedConfigContext };
+export { defineConfig, AppContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext, ConfigContext };
 export type { NormalizedConfig, IAppContext, UserConfig, ToolsConfig };
 declare const initAppDir: () => Promise<string>;
 export interface CoreOptions {
@@ -96,7 +96,9 @@ export interface CoreOptions {
   plugins?: typeof INTERNAL_PLUGINS;
   beforeUsePlugins: (plugins: any, config: any) => {
     cli: any;
+    cliPath: any;
     server: any;
+    serverPath: any;
   }[];
 }
 export declare const cli: {

package/dist/types/loadPlugins.d.ts

@@ -17,5 +17,7 @@ export declare const loadPlugins: (appDirectory: string, pluginConfig: PluginCon
   };
 } | undefined) => {
   cli: any;
+  cliPath: string | undefined;
   server: any;
+  serverPath: string | undefined;
 }[];

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-options-202112061451",
+  "version": "0.0.0-runtime-2021112193858",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -35,20 +35,12 @@
     }
   },
   "bin": "./bin/modern-js.js",
-  "scripts": {
-    "prepare": "pnpm build",
-    "prepublishOnly": "pnpm build -- --platform",
-    "new": "modern new",
-    "build": "modern build",
-    "dev": "modern build --watch",
-    "test": "modern test --passWithNoTests"
-  },
   "dependencies": {
     "@babel/code-frame": "^7.14.5",
     "@babel/runtime": "^7",
-    "@modern-js/load-config": "^1.1.1",
-    "@modern-js/plugin": "^1.1.2",
-    "@modern-js/utils": "^1.1.2",
+    "@modern-js/load-config": "^0.0.0-runtime-2021112193858",
+    "@modern-js/plugin": "^0.0.0-runtime-2021112193858",
+    "@modern-js/utils": "^0.0.0-runtime-2021112193858",
     "address": "^1.1.2",
     "ajv": "^8.6.2",
     "ajv-keywords": "^5.0.0",
@@ -65,7 +57,7 @@
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.0.3",
-    "@modern-js/types": "^1.1.2",
+    "@modern-js/types": "^0.0.0-runtime-2021112193858",
     "@types/jest": "^26",
     "@types/lodash.clonedeep": "^4.5.6",
     "@types/lodash.mergewith": "^4.6.6",
@@ -73,9 +65,9 @@
     "@types/react": "^17",
     "@types/react-dom": "^17",
     "@types/signale": "^1.4.2",
-    "typescript": "^4",
-    "@modern-js/plugin-testing": "^1.1.1",
-    "@modern-js/module-tools": "^1.1.1"
+    "typescript": "^4.4.4",
+    "@modern-js/plugin-testing": "^0.0.0-runtime-2021112193858",
+    "@modern-js/module-tools": "^0.0.0-runtime-2021112193858"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -86,5 +78,11 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
+  },
+  "scripts": {
+    "new": "modern new",
+    "build": "modern build",
+    "dev": "modern build --watch",
+    "test": "modern test --passWithNoTests"
   }
-}
+}

package/src/config/index.ts

@@ -106,8 +106,8 @@ export interface ServerConfig {
   ssrByEntries?: Record<string, boolean | Record<string, unknown>>;
   baseUrl?: string | Array<string>;
   port?: number;
-  logger?: Record<string, string>;
-  measure?: Record<string, string>;
+  logger?: Record<string, any>;
+  metrics?: Record<string, any>;
   enableMicroFrontendDebug?: boolean;
 }
 

package/src/config/mergeConfig.ts

@@ -43,6 +43,7 @@ export interface NormalizedConfig
   extends Omit<Required<UserConfig>, 'source' | 'tools'> {
   source: NormalizedSourceConfig;
   tools: NormalizedToolsConfig;
+  cliOptions?: Record<string, any>;
   _raw: UserConfig;
 }
 

package/src/config/schema/output.ts

@@ -46,7 +46,6 @@ export const output = {
     disableInlineRuntimeChunk: { type: 'boolean' },
     disableAssetsCache: { type: 'boolean' },
     enableLatestDecorators: { type: 'boolean' },
-    enableUsageBuiltIns: { type: 'boolean' },
     enableTsLoader: { type: 'boolean' },
     dataUriLimit: { type: 'number' },
     templateParameters: { type: 'object' },

package/src/config/schema/server.ts

@@ -99,7 +99,7 @@ export const server = {
     middleware: { instanceof: ['Array', 'Function'] },
     renderHook: { instanceof: 'Function' },
     logger: { type: 'object' },
-    measure: { type: 'object' },
+    metrics: { type: 'object' },
     proxy: { type: 'object' },
     enableMicroFrontendDebug: { type: 'boolean' },
   },

package/src/index.ts

@@ -119,9 +119,11 @@ export const usePlugins = (plugins: string[]) =>
 export {
   defineConfig,
   AppContext,
+  ResolvedConfigContext,
   useAppContext,
   useConfigContext,
   useResolvedConfigContext,
+  ConfigContext,
 };
 
 export type { NormalizedConfig, IAppContext, UserConfig, ToolsConfig };
@@ -141,7 +143,10 @@ const initAppDir = async (): Promise<string> => {
 export interface CoreOptions {
   configFile?: string;
   plugins?: typeof INTERNAL_PLUGINS;
-  beforeUsePlugins: (plugins: any, config: any) => { cli: any; server: any }[];
+  beforeUsePlugins: (
+    plugins: any,
+    config: any,
+  ) => { cli: any; cliPath: any; server: any; serverPath: any }[];
 }
 
 const createCli = () => {

package/src/loadPlugins.ts

@@ -77,7 +77,9 @@ export const loadPlugins = (
 
     return {
       cli: cli && compatRequire(cli),
+      cliPath: typeof plugin === 'string' ? plugin : plugin.cli,
       server: server && compatRequire(server),
+      serverPath: typeof plugin === 'string' ? undefined : plugin.server,
     };
   });
 };

package/tests/loadPlugin.test.ts

@@ -14,8 +14,8 @@ describe('load plugins', () => {
     ]);
 
     expect(plugins).toEqual([
-      { cli: { name: 'a' } },
-      { server: { name: 'b' } },
+      { cli: { name: 'a' }, cliPath: path.join(fixture, './test-plugin-a.js') },
+      { server: { name: 'b' }, serverPath: './test-plugin-b' },
     ]);
   });