@modern-js/server 1.4.6 → 1.4.7-canary.2

package/dist/js/modern/dev-tools/dev-server-plugin.js

@@ -1,4 +1,11 @@
+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 Webpack from 'webpack';
+import { DEFAULT_DEV_OPTIONS } from "../constants";
 const {
   EntryPlugin
 } = Webpack;
@@ -12,9 +19,12 @@ export default class DevServerPlugin {
     const {
       options
     } = this;
-    const host = `&host=${options.client.host || 'localhost'}`;
-    const path = `&path=${options.client.path}`;
-    const port = `&port=${options.client.port}`;
+
+    const client = _objectSpread(_objectSpread({}, DEFAULT_DEV_OPTIONS.client), options.client);
+
+    const host = `&host=${client.host}`;
+    const path = `&path=${client.path}`;
+    const port = `&port=${client.port}`;
     const clientEntry = `${require.resolve('@modern-js/hmr-client')}?${host}${path}${port}`;
 
     const hotEntry = require.resolve('webpack/hot/dev-server');

package/dist/js/modern/server/dev-server.js

@@ -232,7 +232,13 @@ export class ModernDevServer extends ModernServer {
   }
 
   setupDevMiddleware(compiler) {
+    var _conf$tools2, _conf$tools2$devServe;
+
+    const {
+      conf
+    } = this;
     this.devMiddleware = webpackDevMiddleware(compiler, {
+      headers: (_conf$tools2 = conf.tools) === null || _conf$tools2 === void 0 ? void 0 : (_conf$tools2$devServe = _conf$tools2.devServer) === null || _conf$tools2$devServe === void 0 ? void 0 : _conf$tools2$devServe.headers,
       publicPath: '/',
       writeToDisk: this.dev.dev.writeToDisk,
       stats: false

package/dist/js/node/dev-tools/dev-server-plugin.js

@@ -7,8 +7,16 @@ exports.default = void 0;
 
 var _webpack = _interopRequireDefault(require("webpack"));
 
+var _constants = require("../constants");
+
 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); 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 {
   EntryPlugin
 } = _webpack.default;
@@ -23,9 +31,12 @@ class DevServerPlugin {
     const {
       options
     } = this;
-    const host = `&host=${options.client.host || 'localhost'}`;
-    const path = `&path=${options.client.path}`;
-    const port = `&port=${options.client.port}`;
+
+    const client = _objectSpread(_objectSpread({}, _constants.DEFAULT_DEV_OPTIONS.client), options.client);
+
+    const host = `&host=${client.host}`;
+    const path = `&path=${client.path}`;
+    const port = `&port=${client.port}`;
     const clientEntry = `${require.resolve('@modern-js/hmr-client')}?${host}${path}${port}`;
 
     const hotEntry = require.resolve('webpack/hot/dev-server');

package/dist/js/node/server/dev-server.js

@@ -256,7 +256,13 @@ class ModernDevServer extends _prodServer.ModernServer {
   }
 
   setupDevMiddleware(compiler) {
+    var _conf$tools2, _conf$tools2$devServe;
+
+    const {
+      conf
+    } = this;
     this.devMiddleware = (0, _webpackDevMiddleware.default)(compiler, {
+      headers: (_conf$tools2 = conf.tools) === null || _conf$tools2 === void 0 ? void 0 : (_conf$tools2$devServe = _conf$tools2.devServer) === null || _conf$tools2$devServe === void 0 ? void 0 : _conf$tools2$devServe.headers,
       publicPath: '/',
       writeToDisk: this.dev.dev.writeToDisk,
       stats: false

package/package.json

@@ -11,9 +11,9 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.6",
+  "version": "1.4.7-canary.2",
   "jsnext:source": "./src/index.ts",
-  "types": "./dist/types/index.d.ts",
+  "types": "./src/index.ts",
   "main": "./dist/js/node/index.js",
   "module": "./dist/js/treeshaking/index.js",
   "jsnext:modern": "./dist/js/modern/index.js",
@@ -27,6 +27,14 @@
       "default": "./dist/js/treeshaking/index.js"
     }
   },
+  "scripts": {
+    "prepare": "pnpm build",
+    "prepublishOnly": "pnpm build --platform",
+    "new": "modern new",
+    "build": "modern build",
+    "dev": "modern build --watch",
+    "test": "jest"
+  },
   "dependencies": {
     "@modern-js/prod-server": "^1.0.2",
     "@babel/register": "^7.15.3",
@@ -46,7 +54,7 @@
   "devDependencies": {
     "@modern-js/server-core": "^1.2.2",
     "@modern-js/core": "^1.4.6",
-    "@scripts/build": "0.0.0",
+    "@scripts/build": "*",
     "@modern-js/types": "^1.3.4",
     "@types/jest": "^26",
     "@types/minimatch": "^3.0.5",
@@ -56,7 +64,7 @@
     "jest": "^27",
     "typescript": "^4",
     "webpack": "^5.54.0",
-    "@scripts/jest-config": "0.0.0",
+    "@scripts/jest-config": "*",
     "websocket": "^1"
   },
   "peerDependencies": {
@@ -70,13 +78,7 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
-  },
-  "scripts": {
-    "new": "modern new",
-    "build": "modern build",
-    "dev": "modern build --watch",
-    "test": "jest"
-  },
-  "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"
-}
+    "access": "public",
+    "types": "./dist/types/index.d.ts"
+  }
+}

package/tests/watcher.test.ts

@@ -39,9 +39,13 @@ describe('watcher', () => {
         ignored: /api\/typings\/.*/,
       },
       async () => {
-        callback();
-        expect(callback).toHaveBeenCalledTimes(1);
-        await watcher.close();
+        try {
+          callback();
+          expect(callback).toHaveBeenCalledTimes(1);
+          await watcher.close();
+        } catch (e) {
+          console.error(e);
+        }
         done();
       },
     );