@modern-js/server 1.4.16 → 1.4.19-beta.0

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @modern-js/server
 
+## 1.4.18
+
+### Patch Changes
+
+- 8d508c6ed: feat(devServer): support disable hmr or live reload
+- a1198d509: feat: bump babel 7.18.0
+- Updated dependencies [8d508c6ed]
+- Updated dependencies [a1198d509]
+- Updated dependencies [29728812e]
+- Updated dependencies [147e090f7]
+- Updated dependencies [18892c65c]
+- Updated dependencies [a1198d509]
+  - @modern-js/webpack@1.10.0
+  - @modern-js/bff-utils@1.2.9
+  - @modern-js/hmr-client@1.2.8
+  - @modern-js/prod-server@1.1.8
+  - @modern-js/server-utils@1.2.10
+
+## 1.4.17
+
+### Patch Changes
+
+- d4afeba71: fix: remove cors for prod-server
+- f8e713253: fix(server): using correct webpack instance
+- Updated dependencies [6c8ab42dd]
+- Updated dependencies [ed90859ba]
+- Updated dependencies [0ef2431cb]
+- Updated dependencies [d4afeba71]
+  - @modern-js/webpack@1.9.1
+  - @modern-js/prod-server@1.1.7
+
 ## 1.4.16
 
 ### Patch Changes

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

@@ -1,9 +1,9 @@
 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 { webpack } from '@modern-js/webpack';
 const {
   EntryPlugin
-} = Webpack;
+} = webpack;
 export default class DevServerPlugin {
   constructor(options) {
     _defineProperty(this, "options", void 0);
@@ -11,29 +11,32 @@ export default class DevServerPlugin {
     this.options = options;
   }
 
-  apply(compiler) {
+  injectHMRClient(compiler) {
     const {
       client
     } = this.options;
     const host = client.host ? `&host=${client.host}` : '';
     const path = client.path ? `&path=${client.path}` : '';
     const port = client.port ? `&port=${client.port}` : '';
-    const clientEntry = `${require.resolve('@modern-js/hmr-client')}?${host}${path}${port}`;
-    const additionalEntries = [clientEntry]; // use a hook to add entries if available
+    const clientEntry = `${require.resolve('@modern-js/hmr-client')}?${host}${path}${port}`; // use a hook to add entries if available
+
+    new EntryPlugin(compiler.context, clientEntry, {
+      name: undefined
+    }).apply(compiler);
+  }
 
-    for (const additionalEntry of additionalEntries) {
-      new EntryPlugin(compiler.context, additionalEntry, {
-        name: undefined
-      }).apply(compiler);
+  apply(compiler) {
+    if (this.options.hot || this.options.liveReload) {
+      this.injectHMRClient(compiler);
     } // Todo remove, client must inject.
 
 
     const compilerOptions = compiler.options;
     compilerOptions.plugins = compilerOptions.plugins || [];
 
-    if (!compilerOptions.plugins.find(p => p.constructor === Webpack.HotModuleReplacementPlugin)) {
+    if (!compilerOptions.plugins.find(p => p.constructor === webpack.HotModuleReplacementPlugin)) {
       // apply the HMR plugin, if it didn't exist before.
-      const plugin = new Webpack.HotModuleReplacementPlugin();
+      const plugin = new webpack.HotModuleReplacementPlugin();
       plugin.apply(compiler);
     }
   }

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

@@ -69,6 +69,26 @@ export class ModernDevServer extends ModernServer {
         } = ctx;
         return handler(req, res, next);
       });
+    });
+    this.addHandler((ctx, next) => {
+      var _this$conf$tools$devS;
+
+      // allow hmr request cross-domain, because the user may use global proxy
+      if (ctx.path.includes('hot-update')) {
+        ctx.res.setHeader('Access-Control-Allow-Origin', '*');
+        ctx.res.setHeader('Access-Control-Allow-Credentials', 'false');
+      } // 用户在 devServer 上配置的 headers 不会对 html 的请求生效，加入下面代码，使配置的 headers 对所有请求生效
+
+
+      const confHeaders = (_this$conf$tools$devS = this.conf.tools.devServer) === null || _this$conf$tools$devS === void 0 ? void 0 : _this$conf$tools$devS.headers;
+
+      if (confHeaders) {
+        for (const [key, value] of Object.entries(confHeaders)) {
+          ctx.res.setHeader(key, value);
+        }
+      }
+
+      next();
     }); // mock handler
 
     this.mockHandler = createMockHandler({

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

@@ -5,15 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _webpack = _interopRequireDefault(require("webpack"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _webpack = require("@modern-js/webpack");
 
 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;
+} = _webpack.webpack;
 
 class DevServerPlugin {
   constructor(options) {
@@ -22,29 +20,32 @@ class DevServerPlugin {
     this.options = options;
   }
 
-  apply(compiler) {
+  injectHMRClient(compiler) {
     const {
       client
     } = this.options;
     const host = client.host ? `&host=${client.host}` : '';
     const path = client.path ? `&path=${client.path}` : '';
     const port = client.port ? `&port=${client.port}` : '';
-    const clientEntry = `${require.resolve('@modern-js/hmr-client')}?${host}${path}${port}`;
-    const additionalEntries = [clientEntry]; // use a hook to add entries if available
+    const clientEntry = `${require.resolve('@modern-js/hmr-client')}?${host}${path}${port}`; // use a hook to add entries if available
 
-    for (const additionalEntry of additionalEntries) {
-      new EntryPlugin(compiler.context, additionalEntry, {
-        name: undefined
-      }).apply(compiler);
+    new EntryPlugin(compiler.context, clientEntry, {
+      name: undefined
+    }).apply(compiler);
+  }
+
+  apply(compiler) {
+    if (this.options.hot || this.options.liveReload) {
+      this.injectHMRClient(compiler);
     } // Todo remove, client must inject.
 
 
     const compilerOptions = compiler.options;
     compilerOptions.plugins = compilerOptions.plugins || [];
 
-    if (!compilerOptions.plugins.find(p => p.constructor === _webpack.default.HotModuleReplacementPlugin)) {
+    if (!compilerOptions.plugins.find(p => p.constructor === _webpack.webpack.HotModuleReplacementPlugin)) {
       // apply the HMR plugin, if it didn't exist before.
-      const plugin = new _webpack.default.HotModuleReplacementPlugin();
+      const plugin = new _webpack.webpack.HotModuleReplacementPlugin();
       plugin.apply(compiler);
     }
   }

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

@@ -90,6 +90,26 @@ class ModernDevServer extends _prodServer.ModernServer {
         } = ctx;
         return handler(req, res, next);
       });
+    });
+    this.addHandler((ctx, next) => {
+      var _this$conf$tools$devS;
+
+      // allow hmr request cross-domain, because the user may use global proxy
+      if (ctx.path.includes('hot-update')) {
+        ctx.res.setHeader('Access-Control-Allow-Origin', '*');
+        ctx.res.setHeader('Access-Control-Allow-Credentials', 'false');
+      } // 用户在 devServer 上配置的 headers 不会对 html 的请求生效，加入下面代码，使配置的 headers 对所有请求生效
+
+
+      const confHeaders = (_this$conf$tools$devS = this.conf.tools.devServer) === null || _this$conf$tools$devS === void 0 ? void 0 : _this$conf$tools$devS.headers;
+
+      if (confHeaders) {
+        for (const [key, value] of Object.entries(confHeaders)) {
+          ctx.res.setHeader(key, value);
+        }
+      }
+
+      next();
     }); // mock handler
 
     this.mockHandler = (0, _mock.createMockHandler)({

package/dist/types/dev-tools/dev-server-plugin.d.ts

@@ -1,7 +1,8 @@
-import Webpack from 'webpack';
+import { webpack } from '@modern-js/webpack';
 import { DevServerOptions } from '../types';
 export default class DevServerPlugin {
   private readonly options;
   constructor(options: DevServerOptions);
-  apply(compiler: Webpack.Compiler): void;
+  injectHMRClient(compiler: webpack.Compiler): void;
+  apply(compiler: webpack.Compiler): void;
 }

package/dist/types/dev-tools/socket-server.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { Server } from 'http';
 import ws from 'ws';
-import type { Stats } from 'webpack';
+import type { webpack } from '@modern-js/webpack';
 import { DevServerOptions } from '../types';
 export default class SocketServer {
   private wsServer;
@@ -12,7 +12,7 @@ export default class SocketServer {
   private timer;
   constructor(options: DevServerOptions);
   prepare(app: Server): void;
-  updateStats(stats: Stats): void;
+  updateStats(stats: webpack.Stats): void;
   sockWrite(type: string, data?: Record<string, any> | string | boolean): void;
   singleWrite(socket: ws, type: string, data?: Record<string, any> | string | boolean): void;
   close(): void;

package/dist/types/types.d.ts

@@ -1,5 +1,5 @@
 import { ModernServerOptions } from '@modern-js/prod-server';
-import type Webpack from 'webpack';
+import type { webpack } from '@modern-js/webpack';
 export declare type DevServerOptions = {
   client: {
     path?: string;
@@ -23,6 +23,6 @@ export declare type DevServerOptions = {
 };
 export declare type ExtraOptions = {
   dev?: boolean | Partial<DevServerOptions>;
-  compiler?: Webpack.MultiCompiler | Webpack.Compiler | null;
+  compiler?: webpack.MultiCompiler | webpack.Compiler | null;
 };
 export declare type ModernDevServerOptions = ModernServerOptions & ExtraOptions;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.16",
+  "version": "1.4.19-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -30,7 +30,6 @@
   "dependencies": {
     "@babel/core": "^7.17.0",
     "@babel/register": "^7.15.3",
-    "@modern-js/bff-utils": "^1.2.8",
     "@modern-js/hmr-client": "^1.2.7",
     "@modern-js/prod-server": "^1.1.6",
     "@modern-js/server-utils": "^1.2.9",
@@ -42,7 +41,7 @@
     "ws": "^8.2.0"
   },
   "devDependencies": {
-    "@modern-js/core": "1.11.1",
+    "@modern-js/core": "1.11.2",
     "@modern-js/server-core": "1.3.5",
     "@modern-js/types": "1.5.4",
     "@scripts/build": "0.0.0",
@@ -53,7 +52,6 @@
     "@types/ws": "^7.4.7",
     "jest": "^27",
     "typescript": "^4",
-    "webpack": "^5.71.0",
     "websocket": "^1"
   },
   "sideEffects": false,
@@ -64,7 +62,8 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./dist/types/index.d.ts"
   },
   "wireit": {
     "build": {