@modern-js/server 2.67.3 → 2.67.4

package/dist/cjs/createDevServer.js

@@ -38,17 +38,24 @@ var import_dev = require("./dev");
 var import_helpers = require("./helpers");
 async function createDevServer(options, applyPlugins) {
   var _config_output_distPath;
-  const { config, pwd, serverConfigFile, serverConfigPath, builder } = options;
+  const { config, pwd, serverConfigFile, serverConfigPath, builder, metaName } = options;
   const dev = (0, import_helpers.getDevOptions)(options);
   const distDir = import_node_path.default.resolve(pwd, ((_config_output_distPath = config.output.distPath) === null || _config_output_distPath === void 0 ? void 0 : _config_output_distPath.root) || "dist");
-  const serverConfig = await (0, import_node.loadServerRuntimeConfig)(distDir, serverConfigFile, serverConfigPath);
+  const serverConfig = await (0, import_node.loadServerRuntimeConfig)(distDir, serverConfigFile, serverConfigPath, metaName) || {};
   const prodServerOptions = {
     ...options,
-    pwd: distDir
+    pwd: distDir,
+    serverConfig,
+    /**
+    * 1. server plugins from modern.server.ts
+    * 2. server plugins register by cli use _internalServerPlugins
+    * Merge plugins, the plugins from modern.server.ts will run first
+    */
+    plugins: [
+      ...serverConfig.plugins || [],
+      ...options.plugins || []
+    ]
   };
-  if (serverConfig) {
-    prodServerOptions.serverConfig = serverConfig;
-  }
   const server = (0, import_server_core.createServerBase)(prodServerOptions);
   const devHttpsOption = typeof dev === "object" && dev.https;
   const isHttp2 = devHttpsOption && typeof dev.proxy === "undefined";
@@ -63,7 +70,7 @@ async function createDevServer(options, applyPlugins) {
   const promise = (0, import_helpers.getDevAssetPrefix)(builder);
   const builderDevServer = await (builder === null || builder === void 0 ? void 0 : builder.createDevServer({
     runCompile: options.runCompile,
-    compiler: options.compilier
+    compiler: options.compiler
   }));
   server.addPlugins([
     (0, import_dev.devPlugin)({

package/dist/esm/createDevServer.js

@@ -1,6 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "node:path";
@@ -13,25 +14,29 @@ function createDevServer(options, applyPlugins) {
 }
 function _createDevServer() {
   _createDevServer = _async_to_generator(function(options, applyPlugins) {
-    var _config_output_distPath, config, pwd, serverConfigFile, serverConfigPath, builder, 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, builderDevServer, assetPrefix, afterListen;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          config = options.config, pwd = options.pwd, serverConfigFile = options.serverConfigFile, serverConfigPath = options.serverConfigPath, builder = options.builder;
+          config = options.config, pwd = options.pwd, serverConfigFile = options.serverConfigFile, serverConfigPath = options.serverConfigPath, builder = options.builder, metaName = options.metaName;
           dev = getDevOptions(options);
           distDir = path.resolve(pwd, ((_config_output_distPath = config.output.distPath) === null || _config_output_distPath === void 0 ? void 0 : _config_output_distPath.root) || "dist");
           return [
             4,
-            loadServerRuntimeConfig(distDir, serverConfigFile, serverConfigPath)
+            loadServerRuntimeConfig(distDir, serverConfigFile, serverConfigPath, metaName)
           ];
         case 1:
-          serverConfig = _state.sent();
+          serverConfig = _state.sent() || {};
           prodServerOptions = _object_spread_props(_object_spread({}, options), {
-            pwd: distDir
+            pwd: distDir,
+            serverConfig,
+            /**
+            * 1. server plugins from modern.server.ts
+            * 2. server plugins register by cli use _internalServerPlugins
+            * Merge plugins, the plugins from modern.server.ts will run first
+            */
+            plugins: _to_consumable_array(serverConfig.plugins || []).concat(_to_consumable_array(options.plugins || []))
           });
-          if (serverConfig) {
-            prodServerOptions.serverConfig = serverConfig;
-          }
           server = createServerBase(prodServerOptions);
           devHttpsOption = (typeof dev === "undefined" ? "undefined" : _type_of(dev)) === "object" && dev.https;
           isHttp2 = devHttpsOption && typeof dev.proxy === "undefined";
@@ -76,7 +81,7 @@ function _createDevServer() {
             4,
             builder === null || builder === void 0 ? void 0 : builder.createDevServer({
               runCompile: options.runCompile,
-              compiler: options.compilier
+              compiler: options.compiler
             })
           ];
         case 8:

package/dist/esm-node/createDevServer.js

@@ -5,17 +5,24 @@ import { devPlugin } from "./dev";
 import { getDevAssetPrefix, getDevOptions } from "./helpers";
 async function createDevServer(options, applyPlugins) {
   var _config_output_distPath;
-  const { config, pwd, serverConfigFile, serverConfigPath, builder } = options;
+  const { config, pwd, serverConfigFile, serverConfigPath, builder, metaName } = options;
   const dev = getDevOptions(options);
   const distDir = path.resolve(pwd, ((_config_output_distPath = config.output.distPath) === null || _config_output_distPath === void 0 ? void 0 : _config_output_distPath.root) || "dist");
-  const serverConfig = await loadServerRuntimeConfig(distDir, serverConfigFile, serverConfigPath);
+  const serverConfig = await loadServerRuntimeConfig(distDir, serverConfigFile, serverConfigPath, metaName) || {};
   const prodServerOptions = {
     ...options,
-    pwd: distDir
+    pwd: distDir,
+    serverConfig,
+    /**
+    * 1. server plugins from modern.server.ts
+    * 2. server plugins register by cli use _internalServerPlugins
+    * Merge plugins, the plugins from modern.server.ts will run first
+    */
+    plugins: [
+      ...serverConfig.plugins || [],
+      ...options.plugins || []
+    ]
   };
-  if (serverConfig) {
-    prodServerOptions.serverConfig = serverConfig;
-  }
   const server = createServerBase(prodServerOptions);
   const devHttpsOption = typeof dev === "object" && dev.https;
   const isHttp2 = devHttpsOption && typeof dev.proxy === "undefined";
@@ -30,7 +37,7 @@ async function createDevServer(options, applyPlugins) {
   const promise = getDevAssetPrefix(builder);
   const builderDevServer = await (builder === null || builder === void 0 ? void 0 : builder.createDevServer({
     runCompile: options.runCompile,
-    compiler: options.compilier
+    compiler: options.compiler
   }));
   server.addPlugins([
     devPlugin({

package/dist/types/types.d.ts

@@ -2,7 +2,7 @@ import type { Server as NodeServer } from 'node:http';
 import type { Http2SecureServer } from 'node:http2';
 import type { DevServerHttpsOptions, DevServerOptions } from '@modern-js/types';
 import type { Rspack, UniBuilderInstance } from '@modern-js/uni-builder';
-import type { ServerBase, ServerBaseOptions } from '@modern-js/server-core';
+import type { ServerBase, ServerBaseOptions, ServerPlugin, ServerPluginLegacy } from '@modern-js/server-core';
 export type { DevServerOptions, DevServerHttpsOptions };
 export type ExtraOptions = {
     dev: Pick<DevServerOptions, 'watch' | 'https'> & {
@@ -13,11 +13,12 @@ export type ExtraOptions = {
     /**
      * The existing compiler can be used here.
      */
-    compilier?: Rspack.Compiler | Rspack.MultiCompiler;
+    compiler?: Rspack.Compiler | Rspack.MultiCompiler;
     /** compat, the default value is modern.server-runtime.config.ts  */
     serverConfigFile?: string;
-    serverConfigPath?: string;
+    serverConfigPath: string;
     builder?: UniBuilderInstance;
+    plugins?: (ServerPlugin | ServerPluginLegacy)[];
 };
 export type ModernDevServerOptions<O extends ServerBaseOptions = ServerBaseOptions> = O & ExtraOptions;
-export type ApplyPlugins<O extends ServerBaseOptions = ServerBaseOptions> = (server: ServerBase, options: O, nodeServer?: NodeServer | Http2SecureServer) => Promise<void>;
+export type ApplyPlugins<O extends ServerBaseOptions = ServerBaseOptions> = (server: ServerBase, options: ModernDevServerOptions<O>, nodeServer?: NodeServer | Http2SecureServer) => Promise<void>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.67.3",
+  "version": "2.67.4",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -48,11 +48,11 @@
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
     "ws": "^8.13.0",
-    "@modern-js/runtime-utils": "2.67.3",
-    "@modern-js/server-core": "2.67.3",
-    "@modern-js/server-utils": "2.67.3",
-    "@modern-js/types": "2.67.3",
-    "@modern-js/utils": "2.67.3"
+    "@modern-js/runtime-utils": "2.67.4",
+    "@modern-js/server-core": "2.67.4",
+    "@modern-js/types": "2.67.4",
+    "@modern-js/server-utils": "2.67.4",
+    "@modern-js/utils": "2.67.4"
   },
   "devDependencies": {
     "@types/connect-history-api-fallback": "^1.3.5",
@@ -67,7 +67,7 @@
     "typescript": "^5",
     "webpack": "^5.98.0",
     "websocket": "^1",
-    "@modern-js/uni-builder": "2.67.3",
+    "@modern-js/uni-builder": "2.67.4",
     "@scripts/build": "2.66.0",
     "@scripts/jest-config": "2.66.0"
   },