@modern-js/server 1.16.0 → 1.17.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @modern-js/server
 
+## 1.17.0
+
+### Patch Changes
+
+- 151329d: chore(dev-server): no longer depend on @modern-js/webpack
+
+  chore(dev-server): 不再依赖 @modern-js/webpack
+
+- Updated dependencies [1b9176f]
+- Updated dependencies [77d3a38]
+- Updated dependencies [151329d]
+- Updated dependencies [5af9472]
+- Updated dependencies [6b6a534]
+- Updated dependencies [6b43a2b]
+- Updated dependencies [a7be124]
+- Updated dependencies [31547b4]
+  - @modern-js/utils@1.17.0
+  - @modern-js/prod-server@1.17.0
+  - @modern-js/server-utils@1.17.0
+
 ## 1.16.0
 
 ### Patch Changes

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

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

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

@@ -8,7 +8,7 @@ import { createServer } from 'http';
 import path from 'path';
 import { createServer as createHttpsServer } from 'https';
 import { API_DIR, SERVER_DIR, SHARED_DIR } from '@modern-js/utils';
-import webpackDevMiddleware from '@modern-js/webpack/webpack-dev-middleware';
+import webpackDevMiddleware from '@modern-js/utils/webpack-dev-middleware';
 import { createProxyHandler, ModernServer, AGGRED_DIR } from '@modern-js/prod-server';
 import { getDefaultDevOptions } from "../constants";
 import { createMockHandler } from "../dev-tools/mock";

package/dist/js/modern/types.js

@@ -1 +0,0 @@
-export {};

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

@@ -5,14 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-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.webpack;
-
 class DevServerPlugin {
   constructor(options) {
     _defineProperty(this, "options", void 0);
@@ -29,7 +23,7 @@ class DevServerPlugin {
     const port = client.port ? `&port=${client.port}` : '';
     const clientEntry = `${require.resolve("../hmr-client")}?${host}${path}${port}`; // use a hook to add entries if available
 
-    new EntryPlugin(compiler.context, clientEntry, {
+    new compiler.webpack.EntryPlugin(compiler.context, clientEntry, {
       name: undefined
     }).apply(compiler);
   }
@@ -41,11 +35,14 @@ class DevServerPlugin {
 
 
     const compilerOptions = compiler.options;
+    const {
+      HotModuleReplacementPlugin
+    } = compiler.webpack;
     compilerOptions.plugins = compilerOptions.plugins || [];
 
-    if (!compilerOptions.plugins.find(p => p.constructor === _webpack.webpack.HotModuleReplacementPlugin)) {
+    if (!compilerOptions.plugins.find(p => p.constructor === HotModuleReplacementPlugin)) {
       // apply the HMR plugin, if it didn't exist before.
-      const plugin = new _webpack.webpack.HotModuleReplacementPlugin();
+      const plugin = new HotModuleReplacementPlugin();
       plugin.apply(compiler);
     }
   }

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

@@ -13,7 +13,7 @@ var _https = require("https");
 
 var _utils = require("@modern-js/utils");
 
-var _webpackDevMiddleware = _interopRequireDefault(require("@modern-js/webpack/webpack-dev-middleware"));
+var _webpackDevMiddleware = _interopRequireDefault(require("@modern-js/utils/webpack-dev-middleware"));
 
 var _prodServer = require("@modern-js/prod-server");
 

package/dist/js/node/types.js

@@ -1,5 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});

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

@@ -1,5 +1,5 @@
-import { webpack } from '@modern-js/webpack';
-import { DevServerOptions } from '../types';
+import type webpack from 'webpack';
+import type { DevServerOptions } from '../types';
 export default class DevServerPlugin {
   private readonly options;
   constructor(options: DevServerOptions);

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

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import { Server } from 'http';
 import ws from 'ws';
-import type { webpack } from '@modern-js/webpack';
-import { DevServerOptions } from '../types';
+import type webpack from 'webpack';
+import type { DevServerOptions } from '../types';
 export default class SocketServer {
   private wsServer;
   private readonly sockets;

package/dist/types/types.d.ts

@@ -1,5 +1,5 @@
-import { ModernServerOptions } from '@modern-js/prod-server';
-import type { webpack } from '@modern-js/webpack';
+import type webpack from 'webpack';
+import type { ModernServerOptions } from '@modern-js/prod-server';
 export declare type DevServerOptions = {
   client: {
     path?: string;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.16.0",
+  "version": "1.17.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -30,21 +30,20 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/register": "^7.17.7",
-    "@modern-js/prod-server": "1.16.0",
-    "@modern-js/server-utils": "1.16.0",
-    "@modern-js/webpack": "1.16.0",
-    "@modern-js/utils": "1.16.0",
+    "@modern-js/prod-server": "1.17.0",
+    "@modern-js/server-utils": "1.17.0",
+    "@modern-js/utils": "1.17.0",
     "devcert": "^1.2.2",
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
     "ws": "^8.2.0"
   },
   "devDependencies": {
-    "@modern-js/core": "1.16.0",
-    "@modern-js/server-core": "1.16.0",
-    "@modern-js/types": "1.16.0",
-    "@scripts/build": "1.15.0",
-    "@scripts/jest-config": "1.15.0",
+    "@modern-js/core": "1.17.0",
+    "@modern-js/server-core": "1.17.0",
+    "@modern-js/types": "1.17.0",
+    "@scripts/build": "1.17.0",
+    "@scripts/jest-config": "1.17.0",
     "@types/jest": "^27",
     "@types/minimatch": "^3.0.5",
     "@types/node": "^14",