@modern-js/server 2.68.16 → 2.68.18

package/dist/cjs/createDevServer.js

@@ -71,6 +71,10 @@ async function createDevServer(options, applyPlugins) {
     nodeServer = await (0, import_node.createNodeServer)(server.handle.bind(server));
   }
   const promise = (0, import_helpers.getDevAssetPrefix)(builder);
+  let compiler = null;
+  builder === null || builder === void 0 ? void 0 : builder.onAfterCreateCompiler((context) => {
+    compiler = context.compiler;
+  });
   const builderDevServer = await (builder === null || builder === void 0 ? void 0 : builder.createDevServer({
     runCompile: options.runCompile,
     compiler: options.compiler
@@ -79,7 +83,7 @@ async function createDevServer(options, applyPlugins) {
     (0, import_dev.devPlugin)({
       ...options,
       builderDevServer
-    })
+    }, compiler)
   ]);
   const assetPrefix = await promise;
   if (assetPrefix) {

package/dist/cjs/dev.js

@@ -24,7 +24,7 @@ module.exports = __toCommonJS(dev_exports);
 var import_node = require("@modern-js/server-core/node");
 var import_utils = require("@modern-js/utils");
 var import_helpers = require("./helpers");
-const devPlugin = (options) => ({
+const devPlugin = (options, compiler) => ({
   name: "@modern-js/plugin-dev",
   setup(api) {
     const { config, pwd, builder, builderDevServer } = options;
@@ -105,7 +105,7 @@ const devPlugin = (options) => ({
         });
         middlewares.push({
           name: "init-file-reader",
-          handler: (0, import_helpers.initFileReader)()
+          handler: (0, import_helpers.initFileReader)(compiler)
         });
       }
     };

package/dist/cjs/helpers/fileReader.js

@@ -22,21 +22,18 @@ __export(fileReader_exports, {
 });
 module.exports = __toCommonJS(fileReader_exports);
 var import_fileReader = require("@modern-js/runtime-utils/fileReader");
-const initFileReader = () => {
+const initFileReader = (compiler) => {
   let isInit = false;
   return async (ctx, next) => {
-    var _res_locals;
     if (isInit) {
       return next();
     }
     isInit = true;
-    const { res } = ctx.env.node;
-    if (!((_res_locals = res.locals) === null || _res_locals === void 0 ? void 0 : _res_locals.webpack)) {
+    if (!compiler) {
       import_fileReader.fileReader.reset();
       return next();
     }
-    const { devMiddleware: webpackDevMid } = res.locals.webpack;
-    const { outputFileSystem } = webpackDevMid;
+    const { outputFileSystem } = "compilers" in compiler ? compiler.compilers[0] : compiler;
     if (outputFileSystem) {
       import_fileReader.fileReader.reset(outputFileSystem);
     } else {

package/dist/esm/createDevServer.js

@@ -14,7 +14,7 @@ function createDevServer(options, applyPlugins) {
 }
 function _createDevServer() {
   _createDevServer = _async_to_generator(function(options, applyPlugins) {
-    var _config_output_distPath, config, pwd, serverConfigFile, serverConfigPath, builder, metaName, dev, distDir, serverConfig, prodServerOptions, server, devHttpsOption, isHttp2, nodeServer, genHttpsOptions, httpsOptions, promise, builderDevServer, assetPrefix, afterListen;
+    var _config_output_distPath, config, pwd, serverConfigFile, serverConfigPath, builder, metaName, dev, distDir, serverConfig, prodServerOptions, server, devHttpsOption, isHttp2, nodeServer, genHttpsOptions, httpsOptions, promise, compiler, builderDevServer, assetPrefix, afterListen;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -77,6 +77,10 @@ function _createDevServer() {
           _state.label = 7;
         case 7:
           promise = getDevAssetPrefix(builder);
+          compiler = null;
+          builder === null || builder === void 0 ? void 0 : builder.onAfterCreateCompiler(function(context) {
+            compiler = context.compiler;
+          });
           return [
             4,
             builder === null || builder === void 0 ? void 0 : builder.createDevServer({
@@ -89,7 +93,7 @@ function _createDevServer() {
           server.addPlugins([
             devPlugin(_object_spread_props(_object_spread({}, options), {
               builderDevServer
-            }))
+            }), compiler)
           ]);
           return [
             4,

package/dist/esm/dev.js

@@ -4,7 +4,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { connectMid2HonoMid } from "@modern-js/server-core/node";
 import { API_DIR, SHARED_DIR } from "@modern-js/utils";
 import { getDevOptions, getMockMiddleware, initFileReader, onRepack, startWatcher } from "./helpers";
-var devPlugin = function(options) {
+var devPlugin = function(options, compiler) {
   return {
     name: "@modern-js/plugin-dev",
     setup: function setup(api) {
@@ -108,7 +108,7 @@ var devPlugin = function(options) {
                   });
                   middlewares.push({
                     name: "init-file-reader",
-                    handler: initFileReader()
+                    handler: initFileReader(compiler)
                   });
                   return [
                     2

package/dist/esm/helpers/fileReader.js

@@ -1,11 +1,11 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { fileReader } from "@modern-js/runtime-utils/fileReader";
-var initFileReader = function() {
+var initFileReader = function(compiler) {
   var isInit = false;
   return function() {
     var _ref = _async_to_generator(function(ctx, next) {
-      var _res_locals, res, _res_locals_webpack, webpackDevMid, outputFileSystem;
+      var outputFileSystem;
       return _ts_generator(this, function(_state) {
         if (isInit) {
           return [
@@ -14,16 +14,14 @@ var initFileReader = function() {
           ];
         }
         isInit = true;
-        res = ctx.env.node.res;
-        if (!((_res_locals = res.locals) === null || _res_locals === void 0 ? void 0 : _res_locals.webpack)) {
+        if (!compiler) {
           fileReader.reset();
           return [
             2,
             next()
           ];
         }
-        _res_locals_webpack = res.locals.webpack, webpackDevMid = _res_locals_webpack.devMiddleware;
-        outputFileSystem = webpackDevMid.outputFileSystem;
+        outputFileSystem = ("compilers" in compiler ? compiler.compilers[0] : compiler).outputFileSystem;
         if (outputFileSystem) {
           fileReader.reset(outputFileSystem);
         } else {

package/dist/esm-node/createDevServer.js

@@ -38,6 +38,10 @@ async function createDevServer(options, applyPlugins) {
     nodeServer = await createNodeServer(server.handle.bind(server));
   }
   const promise = getDevAssetPrefix(builder);
+  let compiler = null;
+  builder === null || builder === void 0 ? void 0 : builder.onAfterCreateCompiler((context) => {
+    compiler = context.compiler;
+  });
   const builderDevServer = await (builder === null || builder === void 0 ? void 0 : builder.createDevServer({
     runCompile: options.runCompile,
     compiler: options.compiler
@@ -46,7 +50,7 @@ async function createDevServer(options, applyPlugins) {
     devPlugin({
       ...options,
       builderDevServer
-    })
+    }, compiler)
   ]);
   const assetPrefix = await promise;
   if (assetPrefix) {

package/dist/esm-node/dev.js

@@ -1,7 +1,7 @@
 import { connectMid2HonoMid } from "@modern-js/server-core/node";
 import { API_DIR, SHARED_DIR } from "@modern-js/utils";
 import { getDevOptions, getMockMiddleware, initFileReader, onRepack, startWatcher } from "./helpers";
-const devPlugin = (options) => ({
+const devPlugin = (options, compiler) => ({
   name: "@modern-js/plugin-dev",
   setup(api) {
     const { config, pwd, builder, builderDevServer } = options;
@@ -82,7 +82,7 @@ const devPlugin = (options) => ({
         });
         middlewares.push({
           name: "init-file-reader",
-          handler: initFileReader()
+          handler: initFileReader(compiler)
         });
       }
     };

package/dist/esm-node/helpers/fileReader.js

@@ -1,19 +1,16 @@
 import { fileReader } from "@modern-js/runtime-utils/fileReader";
-const initFileReader = () => {
+const initFileReader = (compiler) => {
   let isInit = false;
   return async (ctx, next) => {
-    var _res_locals;
     if (isInit) {
       return next();
     }
     isInit = true;
-    const { res } = ctx.env.node;
-    if (!((_res_locals = res.locals) === null || _res_locals === void 0 ? void 0 : _res_locals.webpack)) {
+    if (!compiler) {
       fileReader.reset();
       return next();
     }
-    const { devMiddleware: webpackDevMid } = res.locals.webpack;
-    const { outputFileSystem } = webpackDevMid;
+    const { outputFileSystem } = "compilers" in compiler ? compiler.compilers[0] : compiler;
     if (outputFileSystem) {
       fileReader.reset(outputFileSystem);
     } else {

package/dist/types/dev.d.ts

@@ -1,9 +1,9 @@
 import type { ServerBaseOptions, ServerPluginLegacy } from '@modern-js/server-core';
-import type { UniBuilderInstance } from '@modern-js/uni-builder';
+import type { Rspack, UniBuilderInstance } from '@modern-js/uni-builder';
 import type { ModernDevServerOptions } from './types';
 type BuilderDevServer = Awaited<ReturnType<UniBuilderInstance['createDevServer']>>;
 export type DevPluginOptions = ModernDevServerOptions<ServerBaseOptions> & {
     builderDevServer?: BuilderDevServer;
 };
-export declare const devPlugin: (options: DevPluginOptions) => ServerPluginLegacy;
+export declare const devPlugin: (options: DevPluginOptions, compiler: Rspack.Compiler | Rspack.MultiCompiler | null) => ServerPluginLegacy;
 export {};

package/dist/types/helpers/fileReader.d.ts

@@ -1,2 +1,3 @@
 import type { Middleware } from '@modern-js/server-core';
-export declare const initFileReader: () => Middleware;
+import type { Rspack } from '@modern-js/uni-builder';
+export declare const initFileReader: (compiler: Rspack.Compiler | Rspack.MultiCompiler | null) => Middleware;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.68.16",
+  "version": "2.68.18",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -48,11 +48,11 @@
     "minimatch": "^3.1.2",
     "path-to-regexp": "^6.3.0",
     "ws": "^8.13.0",
-    "@modern-js/runtime-utils": "2.68.16",
-    "@modern-js/server-core": "2.68.16",
-    "@modern-js/server-utils": "2.68.16",
-    "@modern-js/utils": "2.68.16",
-    "@modern-js/types": "2.68.16"
+    "@modern-js/runtime-utils": "2.68.18",
+    "@modern-js/server-core": "2.68.18",
+    "@modern-js/server-utils": "2.68.18",
+    "@modern-js/types": "2.68.18",
+    "@modern-js/utils": "2.68.18"
   },
   "devDependencies": {
     "@types/connect-history-api-fallback": "^1.3.5",
@@ -65,9 +65,9 @@
     "ts-node": "^10.9.1",
     "tsconfig-paths": "4.2.0",
     "typescript": "^5",
-    "webpack": "^5.101.3",
+    "webpack": "^5.102.1",
     "websocket": "^1.0.35",
-    "@modern-js/uni-builder": "2.68.16",
+    "@modern-js/uni-builder": "2.68.18",
     "@scripts/build": "2.66.0",
     "@scripts/jest-config": "2.66.0"
   },