@modern-js/core 1.1.4 → 1.1.5-beta.0

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/loadPlugins.js

@@ -1,3 +1,9 @@
+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 = 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; }
+
 import { isDepExists, createDebugger, compatRequire, INTERNAL_PLUGINS } from '@modern-js/utils';
 const debug = createDebugger('load-plugins');
 
@@ -58,10 +64,19 @@ export const loadPlugins = (appDirectory, pluginConfig, internalPlugins) => {
       cli,
       server
     });
+
+    const cliPlugin = cli && _objectSpread(_objectSpread({}, compatRequire(cli)), {}, {
+      pluginPath: cli
+    });
+
+    const serverPlugin = server && _objectSpread(_objectSpread({}, compatRequire(server)), {}, {
+      pluginPath: server
+    });
+
     return {
-      cli: cli && compatRequire(cli),
+      cli: cliPlugin,
       cliPath: typeof plugin === 'string' ? plugin : plugin.cli,
-      server: server && compatRequire(server),
+      server: serverPlugin,
       serverPath: typeof plugin === 'string' ? undefined : plugin.server
     };
   });

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/loadPlugins.js

@@ -7,6 +7,12 @@ exports.loadPlugins = void 0;
 
 var _utils = require("@modern-js/utils");
 
+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 = 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; }
+
 const debug = (0, _utils.createDebugger)('load-plugins');
 
 /**
@@ -66,10 +72,19 @@ const loadPlugins = (appDirectory, pluginConfig, internalPlugins) => {
       cli,
       server
     });
+
+    const cliPlugin = cli && _objectSpread(_objectSpread({}, (0, _utils.compatRequire)(cli)), {}, {
+      pluginPath: cli
+    });
+
+    const serverPlugin = server && _objectSpread(_objectSpread({}, (0, _utils.compatRequire)(server)), {}, {
+      pluginPath: server
+    });
+
     return {
-      cli: cli && (0, _utils.compatRequire)(cli),
+      cli: cliPlugin,
       cliPath: typeof plugin === 'string' ? plugin : plugin.cli,
-      server: server && (0, _utils.compatRequire)(server),
+      server: serverPlugin,
       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 {
@@ -81,7 +81,7 @@ export interface DevConfig {
   https?: boolean;
 }
 export interface DeployConfig {
-  microFrontend?: boolean | Record<string, unknown>;
+  microFrontend?: boolean & Record<string, unknown>;
   domain?: string | Array<string>;
   domainByEntries?: Record<string, string | Array<string>>;
 }

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

@@ -379,7 +379,7 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
         logger: {
           type: string;
         };
-        measure: {
+        metrics: {
           type: string;
         };
         proxy: {

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/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.4",
+  "version": "1.1.5-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -35,12 +35,20 @@
     }
   },
   "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.4",
+    "@modern-js/load-config": "workspace:^1.1.1",
+    "@modern-js/plugin": "workspace:^1.1.2",
+    "@modern-js/utils": "workspace:^1.1.4",
     "address": "^1.1.2",
     "ajv": "^8.6.2",
     "ajv-keywords": "^5.0.0",
@@ -57,7 +65,7 @@
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.0.3",
-    "@modern-js/types": "^1.1.3",
+    "@modern-js/types": "workspace:^1.1.3",
     "@types/jest": "^26",
     "@types/lodash.clonedeep": "^4.5.6",
     "@types/lodash.mergewith": "^4.6.6",
@@ -67,7 +75,7 @@
     "@types/signale": "^1.4.2",
     "typescript": "^4",
     "@modern-js/plugin-testing": "^1.1.1",
-    "@modern-js/module-tools": "^1.1.1"
+    "@modern-js/module-tools": "^1.1.2"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -78,12 +86,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
-  },
-  "scripts": {
-    "new": "modern new",
-    "build": "modern build",
-    "dev": "modern build --watch",
-    "test": "modern test --passWithNoTests"
-  },
-  "readme": "\n<p align=\"center\">\n  <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>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> 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.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
-}
+  }
+}

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;
 }
 
@@ -117,7 +117,7 @@ export interface DevConfig {
 }
 
 export interface DeployConfig {
-  microFrontend?: boolean | Record<string, unknown>;
+  microFrontend?: boolean & Record<string, unknown>;
   domain?: string | Array<string>;
   domainByEntries?: Record<string, string | Array<string>>;
 }

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/loadPlugins.ts

@@ -75,10 +75,16 @@ export const loadPlugins = (
       server,
     });
 
+    const cliPlugin = cli && { ...compatRequire(cli), pluginPath: cli };
+    const serverPlugin = server && {
+      ...compatRequire(server),
+      pluginPath: server,
+    };
+
     return {
-      cli: cli && compatRequire(cli),
+      cli: cliPlugin,
       cliPath: typeof plugin === 'string' ? plugin : plugin.cli,
-      server: server && compatRequire(server),
+      server: serverPlugin,
       serverPath: typeof plugin === 'string' ? undefined : plugin.server,
     };
   });

package/tests/loadPlugin.test.ts

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