@modern-js/server 2.58.1 → 2.58.3

package/dist/cjs/createDevServer.js

@@ -34,14 +34,14 @@ module.exports = __toCommonJS(createDevServer_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_server_core = require("@modern-js/server-core");
 var import_node = require("@modern-js/server-core/node");
-var import_helpers = require("./helpers");
 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 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 = (0, import_node.loadServerRuntimeConfig)(distDir, serverConfigFile, serverConfigPath);
+  const serverConfig = await (0, import_node.loadServerRuntimeConfig)(distDir, serverConfigFile, serverConfigPath);
   const prodServerOptions = {
     ...options,
     pwd: distDir

package/dist/cjs/dev-tools/watcher/statsCache.js

@@ -31,8 +31,8 @@ __export(statsCache_exports, {
   StatsCache: () => StatsCache
 });
 module.exports = __toCommonJS(statsCache_exports);
-var import_fs = __toESM(require("fs"));
 var import_crypto = __toESM(require("crypto"));
+var import_fs = __toESM(require("fs"));
 class StatsCache {
   add(files) {
     const { cachedHash, cachedSize } = this;

package/dist/cjs/dev.js

@@ -33,10 +33,12 @@ const devPlugin = (options) => ({
     return {
       async prepare() {
         var _dev_after, _dev_before;
-        const { middlewares: builderMiddlewares, close, onHTTPUpgrade } = builderDevServer || {};
+        const { middlewares: builderMiddlewares, close, connectWebSocket } = builderDevServer || {};
         close && closeCb.push(close);
         const { middlewares, distDirectory, nodeServer, apiDirectory, sharedDirectory, serverBase } = api.useAppContext();
-        onHTTPUpgrade && (nodeServer === null || nodeServer === void 0 ? void 0 : nodeServer.on("upgrade", onHTTPUpgrade));
+        connectWebSocket && nodeServer && connectWebSocket({
+          server: nodeServer
+        });
         const runner = api.useHookRunners();
         builder === null || builder === void 0 ? void 0 : builder.onDevCompileDone(({ stats }) => {
           if (stats.toJson({

package/dist/cjs/helpers/index.js

@@ -33,11 +33,11 @@ __export(helpers_exports, {
 });
 module.exports = __toCommonJS(helpers_exports);
 var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
 var import_server_core = require("@modern-js/server-core");
+var import_utils = require("@modern-js/utils");
 var import_watcher = __toESM(require("../dev-tools/watcher"));
-var import_utils2 = require("./utils");
 var import_mock = require("./mock");
+var import_utils2 = require("./utils");
 __reExport(helpers_exports, require("./repack"), module.exports);
 __reExport(helpers_exports, require("./devOptions"), module.exports);
 __reExport(helpers_exports, require("./fileReader"), module.exports);

package/dist/cjs/helpers/mock.js

@@ -34,9 +34,9 @@ __export(mock_exports, {
 });
 module.exports = __toCommonJS(mock_exports);
 var import_node_path = __toESM(require("node:path"));
-var import_utils = require("@modern-js/utils");
 var import_server_core = require("@modern-js/server-core");
 var import_node = require("@modern-js/server-core/node");
+var import_utils = require("@modern-js/utils");
 var import_path_to_regexp = require("path-to-regexp");
 let mockAPIs = [];
 let mockConfig;

package/dist/esm/createDevServer.js

@@ -5,8 +5,8 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "node:path";
 import { createServerBase } from "@modern-js/server-core";
 import { createNodeServer, loadServerRuntimeConfig } from "@modern-js/server-core/node";
-import { getDevOptions } from "./helpers";
 import { devPlugin } from "./dev";
+import { getDevOptions } from "./helpers";
 function createDevServer(options, applyPlugins) {
   return _createDevServer.apply(this, arguments);
 }
@@ -19,7 +19,12 @@ function _createDevServer() {
           config = options.config, pwd = options.pwd, serverConfigFile = options.serverConfigFile, serverConfigPath = options.serverConfigPath, builder = options.builder;
           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");
-          serverConfig = loadServerRuntimeConfig(distDir, serverConfigFile, serverConfigPath);
+          return [
+            4,
+            loadServerRuntimeConfig(distDir, serverConfigFile, serverConfigPath)
+          ];
+        case 1:
+          serverConfig = _state.sent();
           prodServerOptions = _object_spread_props(_object_spread({}, options), {
             pwd: distDir
           });
@@ -31,46 +36,46 @@ function _createDevServer() {
           if (!devHttpsOption)
             return [
               3,
-              4
+              5
             ];
           return [
             4,
             import("./dev-tools/https")
           ];
-        case 1:
+        case 2:
           genHttpsOptions = _state.sent().genHttpsOptions;
           return [
             4,
             genHttpsOptions(devHttpsOption, pwd)
           ];
-        case 2:
+        case 3:
           httpsOptions = _state.sent();
           return [
             4,
             createNodeServer(server.handle.bind(server), httpsOptions)
           ];
-        case 3:
+        case 4:
           nodeServer = _state.sent();
           return [
             3,
-            6
+            7
           ];
-        case 4:
+        case 5:
           return [
             4,
             createNodeServer(server.handle.bind(server))
           ];
-        case 5:
-          nodeServer = _state.sent();
-          _state.label = 6;
         case 6:
+          nodeServer = _state.sent();
+          _state.label = 7;
+        case 7:
           return [
             4,
             builder === null || builder === void 0 ? void 0 : builder.createDevServer({
               runCompile: options.runCompile
             })
           ];
-        case 7:
+        case 8:
           builderDevServer = _state.sent();
           server.addPlugins([
             devPlugin(_object_spread_props(_object_spread({}, options), {
@@ -81,13 +86,13 @@ function _createDevServer() {
             4,
             applyPlugins(server, prodServerOptions, nodeServer)
           ];
-        case 8:
+        case 9:
           _state.sent();
           return [
             4,
             server.init()
           ];
-        case 9:
+        case 10:
           _state.sent();
           afterListen = function() {
             var _ref = _async_to_generator(function() {

package/dist/esm/dev-tools/watcher/statsCache.js

@@ -1,6 +1,6 @@
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
-import fs from "fs";
 import crypto from "crypto";
+import fs from "fs";
 var StatsCache = /* @__PURE__ */ function() {
   "use strict";
   function StatsCache2() {

package/dist/esm/dev.js

@@ -3,7 +3,7 @@ import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 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 { startWatcher, onRepack, getDevOptions, initFileReader, getMockMiddleware } from "./helpers";
+import { getDevOptions, getMockMiddleware, initFileReader, onRepack, startWatcher } from "./helpers";
 var devPlugin = function(options) {
   return {
     name: "@modern-js/plugin-dev",
@@ -14,14 +14,16 @@ var devPlugin = function(options) {
       return {
         prepare: function prepare() {
           return _async_to_generator(function() {
-            var _dev_after, _dev_before, _ref, builderMiddlewares, close, onHTTPUpgrade, _api_useAppContext, middlewares, distDirectory, nodeServer, apiDirectory, sharedDirectory, serverBase, runner, watchOptions, watcher, before, after, _dev_setupMiddlewares, setupMiddlewares, mockMiddleware;
+            var _dev_after, _dev_before, _ref, builderMiddlewares, close, connectWebSocket, _api_useAppContext, middlewares, distDirectory, nodeServer, apiDirectory, sharedDirectory, serverBase, runner, watchOptions, watcher, before, after, _dev_setupMiddlewares, setupMiddlewares, mockMiddleware;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
-                  _ref = builderDevServer || {}, builderMiddlewares = _ref.middlewares, close = _ref.close, onHTTPUpgrade = _ref.onHTTPUpgrade;
+                  _ref = builderDevServer || {}, builderMiddlewares = _ref.middlewares, close = _ref.close, connectWebSocket = _ref.connectWebSocket;
                   close && closeCb.push(close);
                   _api_useAppContext = api.useAppContext(), middlewares = _api_useAppContext.middlewares, distDirectory = _api_useAppContext.distDirectory, nodeServer = _api_useAppContext.nodeServer, apiDirectory = _api_useAppContext.apiDirectory, sharedDirectory = _api_useAppContext.sharedDirectory, serverBase = _api_useAppContext.serverBase;
-                  onHTTPUpgrade && (nodeServer === null || nodeServer === void 0 ? void 0 : nodeServer.on("upgrade", onHTTPUpgrade));
+                  connectWebSocket && nodeServer && connectWebSocket({
+                    server: nodeServer
+                  });
                   runner = api.useHookRunners();
                   builder === null || builder === void 0 ? void 0 : builder.onDevCompileDone(function(param) {
                     var stats = param.stats;

package/dist/esm/helpers/index.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 path from "path";
-import { SERVER_BUNDLE_DIRECTORY, SERVER_DIR, logger } from "@modern-js/utils";
 import { AGGRED_DIR } from "@modern-js/server-core";
+import { SERVER_BUNDLE_DIRECTORY, SERVER_DIR, logger } from "@modern-js/utils";
 import Watcher, { mergeWatchOptions } from "../dev-tools/watcher";
-import { debug } from "./utils";
 import { initOrUpdateMockMiddlewares } from "./mock";
+import { debug } from "./utils";
 export * from "./repack";
 export * from "./devOptions";
 export * from "./fileReader";

package/dist/esm/helpers/mock.js

@@ -2,9 +2,9 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "node:path";
-import { fs } from "@modern-js/utils";
 import { AGGRED_DIR } from "@modern-js/server-core";
 import { connectMid2HonoMid } from "@modern-js/server-core/node";
+import { fs } from "@modern-js/utils";
 import { match } from "path-to-regexp";
 var mockAPIs = [];
 var mockConfig;

package/dist/esm-node/createDevServer.js

@@ -1,14 +1,14 @@
 import path from "node:path";
 import { createServerBase } from "@modern-js/server-core";
 import { createNodeServer, loadServerRuntimeConfig } from "@modern-js/server-core/node";
-import { getDevOptions } from "./helpers";
 import { devPlugin } from "./dev";
+import { getDevOptions } from "./helpers";
 async function createDevServer(options, applyPlugins) {
   var _config_output_distPath;
   const { config, pwd, serverConfigFile, serverConfigPath, builder } = 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 = loadServerRuntimeConfig(distDir, serverConfigFile, serverConfigPath);
+  const serverConfig = await loadServerRuntimeConfig(distDir, serverConfigFile, serverConfigPath);
   const prodServerOptions = {
     ...options,
     pwd: distDir

package/dist/esm-node/dev-tools/watcher/statsCache.js

@@ -1,5 +1,5 @@
-import fs from "fs";
 import crypto from "crypto";
+import fs from "fs";
 class StatsCache {
   add(files) {
     const { cachedHash, cachedSize } = this;

package/dist/esm-node/dev.js

@@ -1,6 +1,6 @@
 import { connectMid2HonoMid } from "@modern-js/server-core/node";
 import { API_DIR, SHARED_DIR } from "@modern-js/utils";
-import { startWatcher, onRepack, getDevOptions, initFileReader, getMockMiddleware } from "./helpers";
+import { getDevOptions, getMockMiddleware, initFileReader, onRepack, startWatcher } from "./helpers";
 const devPlugin = (options) => ({
   name: "@modern-js/plugin-dev",
   setup(api) {
@@ -10,10 +10,12 @@ const devPlugin = (options) => ({
     return {
       async prepare() {
         var _dev_after, _dev_before;
-        const { middlewares: builderMiddlewares, close, onHTTPUpgrade } = builderDevServer || {};
+        const { middlewares: builderMiddlewares, close, connectWebSocket } = builderDevServer || {};
         close && closeCb.push(close);
         const { middlewares, distDirectory, nodeServer, apiDirectory, sharedDirectory, serverBase } = api.useAppContext();
-        onHTTPUpgrade && (nodeServer === null || nodeServer === void 0 ? void 0 : nodeServer.on("upgrade", onHTTPUpgrade));
+        connectWebSocket && nodeServer && connectWebSocket({
+          server: nodeServer
+        });
         const runner = api.useHookRunners();
         builder === null || builder === void 0 ? void 0 : builder.onDevCompileDone(({ stats }) => {
           if (stats.toJson({

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

@@ -1,9 +1,9 @@
 import path from "path";
-import { SERVER_BUNDLE_DIRECTORY, SERVER_DIR, logger } from "@modern-js/utils";
 import { AGGRED_DIR } from "@modern-js/server-core";
+import { SERVER_BUNDLE_DIRECTORY, SERVER_DIR, logger } from "@modern-js/utils";
 import Watcher, { mergeWatchOptions } from "../dev-tools/watcher";
-import { debug } from "./utils";
 import { initOrUpdateMockMiddlewares } from "./mock";
+import { debug } from "./utils";
 export * from "./repack";
 export * from "./devOptions";
 export * from "./fileReader";

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

@@ -1,7 +1,7 @@
 import path from "node:path";
-import { fs } from "@modern-js/utils";
 import { AGGRED_DIR } from "@modern-js/server-core";
 import { connectMid2HonoMid } from "@modern-js/server-core/node";
+import { fs } from "@modern-js/utils";
 import { match } from "path-to-regexp";
 let mockAPIs = [];
 let mockConfig;

package/dist/types/createDevServer.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { ApplyPlugins, ModernDevServerOptions } from './types';
+import type { ApplyPlugins, ModernDevServerOptions } from './types';
 export declare function createDevServer(options: ModernDevServerOptions, applyPlugins: ApplyPlugins): Promise<{
     server: (import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse> | import("https").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>) & {
         getRequestListener: () => (req: import("http").IncomingMessage, res: import("http").ServerResponse) => Promise<void>;

package/dist/types/dev-tools/watcher/index.d.ts

@@ -1,4 +1,4 @@
-import { FSWatcher, WatchOptions } from '@modern-js/utils';
+import { type FSWatcher, type WatchOptions } from '@modern-js/utils';
 export type WatchEvent = 'add' | 'change' | 'unlink';
 export declare const defaultWatchOptions: {
     ignoreInitial: boolean;

package/dist/types/dev.d.ts

@@ -1,6 +1,6 @@
-import { ServerPlugin, ServerBaseOptions } from '@modern-js/server-core';
-import { UniBuilderInstance } from '@modern-js/uni-builder';
-import { ModernDevServerOptions } from './types';
+import type { ServerBaseOptions, ServerPlugin } from '@modern-js/server-core';
+import type { UniBuilderInstance } from '@modern-js/uni-builder';
+import type { ModernDevServerOptions } from './types';
 type BuilderDevServer = Awaited<ReturnType<UniBuilderInstance['createDevServer']>>;
 export type DevPluginOptions = ModernDevServerOptions<ServerBaseOptions> & {
     builderDevServer?: BuilderDevServer;

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

@@ -1,2 +1,2 @@
-import { DevServerOptions } from '../types';
+import type { DevServerOptions } from '../types';
 export declare const getDefaultDevOptions: () => DevServerOptions;

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

@@ -1,4 +1,4 @@
-import { ModernDevServerOptions } from '../types';
+import type { ModernDevServerOptions } from '../types';
 export declare const getDevOptions: (options: ModernDevServerOptions) => import("@modern-js/types/server/devServer").DevServerOptions & Pick<import("@modern-js/types/server/devServer").DevServerOptions, "watch" | "https"> & {
     port?: number | undefined;
     host?: string | undefined;

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

@@ -1,2 +1,2 @@
-import { Middleware } from '@modern-js/server-core';
+import type { Middleware } from '@modern-js/server-core';
 export declare const initFileReader: () => Middleware;

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

@@ -1,5 +1,5 @@
-import { WatchOptions } from '@modern-js/utils';
-import { ServerBase } from '@modern-js/server-core';
+import { type ServerBase } from '@modern-js/server-core';
+import { type WatchOptions } from '@modern-js/utils';
 import Watcher from '../dev-tools/watcher';
 export * from './repack';
 export * from './devOptions';

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

@@ -1,7 +1,7 @@
 /// <reference types="node" />
-import { IncomingMessage, ServerResponse } from 'node:http';
-import { NextFunction } from '@modern-js/types';
-import { type Middleware, InternalRequest } from '@modern-js/server-core';
+import type { IncomingMessage, ServerResponse } from 'node:http';
+import { type InternalRequest, type Middleware } from '@modern-js/server-core';
+import type { NextFunction } from '@modern-js/types';
 /** Types: Mock  */
 type MockHandler = {
     data: any;

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

@@ -1,2 +1,2 @@
-import { ServerHookRunner } from '@modern-js/server-core';
+import type { ServerHookRunner } from '@modern-js/server-core';
 export declare const onRepack: (distDir: string, runner: ServerHookRunner) => void;

package/dist/types/types.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
+import type { DevServerHttpsOptions, DevServerOptions } from '@modern-js/types';
 import type { UniBuilderInstance } from '@modern-js/uni-builder';
-import type { DevServerOptions, DevServerHttpsOptions } from '@modern-js/types';
-import { NodeServer, ServerBase, ServerBaseOptions } from '@modern-js/server-core';
+import type { NodeServer, ServerBase, ServerBaseOptions } from '@modern-js/server-core';
 export type { DevServerOptions, DevServerHttpsOptions };
 export type ExtraOptions = {
     dev: Pick<DevServerOptions, 'watch' | 'https'> & {

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.1",
+  "version": "2.58.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -42,17 +42,17 @@
     "@babel/core": "^7.24.7",
     "@babel/register": "^7.22.15",
     "@swc/helpers": "0.5.3",
-    "axios": "^1.6.0",
+    "axios": "^1.7.4",
     "connect-history-api-fallback": "^2.0.0",
     "http-compression": "1.0.6",
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
     "ws": "^8.13.0",
-    "@modern-js/server-core": "2.58.1",
-    "@modern-js/server-utils": "2.58.1",
-    "@modern-js/runtime-utils": "2.58.1",
-    "@modern-js/types": "2.58.1",
-    "@modern-js/utils": "2.58.1"
+    "@modern-js/runtime-utils": "2.58.3",
+    "@modern-js/server-utils": "2.58.3",
+    "@modern-js/types": "2.58.3",
+    "@modern-js/server-core": "2.58.3",
+    "@modern-js/utils": "2.58.3"
   },
   "devDependencies": {
     "@types/connect-history-api-fallback": "^1.3.5",
@@ -67,9 +67,9 @@
     "typescript": "^5",
     "webpack": "^5.93.0",
     "websocket": "^1",
-    "@scripts/build": "2.58.1",
-    "@scripts/jest-config": "2.58.1",
-    "@modern-js/uni-builder": "2.58.1"
+    "@modern-js/uni-builder": "2.58.3",
+    "@scripts/build": "2.58.3",
+    "@scripts/jest-config": "2.58.3"
   },
   "peerDependencies": {
     "devcert": "^1.2.2",