@modern-js/server 2.48.1 → 2.48.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/cjs/server/devServer.js +2 -29
  2. package/dist/esm/server/devServer.js +4 -33
  3. package/dist/esm-node/server/devServer.js +2 -29
  4. package/dist/types/types.d.ts +1 -1
  5. package/package.json +9 -9
package/dist/cjs/server/devServer.js CHANGED
@@ -43,31 +43,6 @@ var import_mock = require("../dev-tools/mock");
43
43
  var import_register = require("../dev-tools/register");
44
44
  var import_watcher = __toESM(require("../dev-tools/watcher"));
45
45
  var import_workerSSRRender = require("./workerSSRRender");
46
- const transformToRsbuildServerOptions = (dev) => {
47
- var _dev_devMiddleware, _dev_before, _dev_after;
48
- const rsbuildOptions = {
49
- hmr: Boolean(dev.hot),
50
- client: dev.client,
51
- writeToDisk: (_dev_devMiddleware = dev.devMiddleware) === null || _dev_devMiddleware === void 0 ? void 0 : _dev_devMiddleware.writeToDisk,
52
- compress: dev.compress,
53
- headers: dev.headers,
54
- historyApiFallback: dev.historyApiFallback,
55
- proxy: dev.proxy,
56
- publicDir: false
57
- };
58
- if (((_dev_before = dev.before) === null || _dev_before === void 0 ? void 0 : _dev_before.length) || ((_dev_after = dev.after) === null || _dev_after === void 0 ? void 0 : _dev_after.length)) {
59
- rsbuildOptions.setupMiddlewares = [
60
- ...dev.setupMiddlewares || [],
61
- (middlewares) => {
62
- middlewares.unshift(...dev.before || []);
63
- middlewares.push(...dev.after || []);
64
- }
65
- ];
66
- } else if (dev.setupMiddlewares) {
67
- rsbuildOptions.setupMiddlewares = dev.setupMiddlewares;
68
- }
69
- return rsbuildOptions;
70
- };
71
46
  class ModernDevServer extends import_prod_server.ModernServer {
72
47
  getDevOptions(options) {
73
48
  const devOptions = options.dev;
@@ -95,10 +70,8 @@ class ModernDevServer extends import_prod_server.ModernServer {
95
70
  const { middlewares: rsbuildMiddlewares, close, onUpgrade } = (
96
71
  // https://github.com/web-infra-dev/rsbuild/blob/32fbb85e22158d5c4655505ce75e3452ce22dbb1/packages/shared/src/types/server.ts#L112
97
72
  await this.getMiddlewares({
98
- ...transformToRsbuildServerOptions(this.dev),
99
- compress: !isUseStreamingSSR(this.getRoutes()) && !isUseSSRPreload() && dev.compress,
100
- htmlFallback: false,
101
- publicDir: false
73
+ // TODO: move to uni-builder
74
+ compress: !isUseStreamingSSR(this.getRoutes()) && !isUseSSRPreload() && dev.compress
102
75
  })
103
76
  );
104
77
  app.on("upgrade", onUpgrade);
package/dist/esm/server/devServer.js CHANGED
@@ -3,9 +3,6 @@ import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
3
3
  import { _ as _get } from "@swc/helpers/_/_get";
4
4
  import { _ as _get_prototype_of } from "@swc/helpers/_/_get_prototype_of";
5
5
  import { _ as _inherits } from "@swc/helpers/_/_inherits";
6
- import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
7
- import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
8
- import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
9
6
  import { _ as _create_super } from "@swc/helpers/_/_create_super";
10
7
  import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
11
8
  import { createServer } from "http";
@@ -20,31 +17,6 @@ import { createMockHandler } from "../dev-tools/mock";
20
17
  import { enableRegister } from "../dev-tools/register";
21
18
  import Watcher, { mergeWatchOptions } from "../dev-tools/watcher";
22
19
  import { workerSSRRender } from "./workerSSRRender";
23
- var transformToRsbuildServerOptions = function(dev) {
24
- var _dev_devMiddleware, _dev_before, _dev_after;
25
- var rsbuildOptions = {
26
- hmr: Boolean(dev.hot),
27
- client: dev.client,
28
- writeToDisk: (_dev_devMiddleware = dev.devMiddleware) === null || _dev_devMiddleware === void 0 ? void 0 : _dev_devMiddleware.writeToDisk,
29
- compress: dev.compress,
30
- headers: dev.headers,
31
- historyApiFallback: dev.historyApiFallback,
32
- proxy: dev.proxy,
33
- publicDir: false
34
- };
35
- if (((_dev_before = dev.before) === null || _dev_before === void 0 ? void 0 : _dev_before.length) || ((_dev_after = dev.after) === null || _dev_after === void 0 ? void 0 : _dev_after.length)) {
36
- rsbuildOptions.setupMiddlewares = _to_consumable_array(dev.setupMiddlewares || []).concat([
37
- function(middlewares) {
38
- var _middlewares, _middlewares1;
39
- (_middlewares = middlewares).unshift.apply(_middlewares, _to_consumable_array(dev.before || []));
40
- (_middlewares1 = middlewares).push.apply(_middlewares1, _to_consumable_array(dev.after || []));
41
- }
42
- ]);
43
- } else if (dev.setupMiddlewares) {
44
- rsbuildOptions.setupMiddlewares = dev.setupMiddlewares;
45
- }
46
- return rsbuildOptions;
47
- };
48
20
  var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
49
21
  "use strict";
50
22
  _inherits(ModernDevServer2, ModernServer2);
@@ -107,11 +79,10 @@ var ModernDevServer = /* @__PURE__ */ function(ModernServer2) {
107
79
  };
108
80
  return [
109
81
  4,
110
- _this1.getMiddlewares(_object_spread_props(_object_spread({}, transformToRsbuildServerOptions(_this1.dev)), {
111
- compress: !isUseStreamingSSR(_this1.getRoutes()) && !isUseSSRPreload() && dev.compress,
112
- htmlFallback: false,
113
- publicDir: false
114
- }))
82
+ _this1.getMiddlewares({
83
+ // TODO: move to uni-builder
84
+ compress: !isUseStreamingSSR(_this1.getRoutes()) && !isUseSSRPreload() && dev.compress
85
+ })
115
86
  ];
116
87
  case 1:
117
88
  _ref = _state.sent(), rsbuildMiddlewares = _ref.middlewares, close = _ref.close, onUpgrade = _ref.onUpgrade;
package/dist/esm-node/server/devServer.js CHANGED
@@ -10,31 +10,6 @@ import { createMockHandler } from "../dev-tools/mock";
10
10
  import { enableRegister } from "../dev-tools/register";
11
11
  import Watcher, { mergeWatchOptions } from "../dev-tools/watcher";
12
12
  import { workerSSRRender } from "./workerSSRRender";
13
- const transformToRsbuildServerOptions = (dev) => {
14
- var _dev_devMiddleware, _dev_before, _dev_after;
15
- const rsbuildOptions = {
16
- hmr: Boolean(dev.hot),
17
- client: dev.client,
18
- writeToDisk: (_dev_devMiddleware = dev.devMiddleware) === null || _dev_devMiddleware === void 0 ? void 0 : _dev_devMiddleware.writeToDisk,
19
- compress: dev.compress,
20
- headers: dev.headers,
21
- historyApiFallback: dev.historyApiFallback,
22
- proxy: dev.proxy,
23
- publicDir: false
24
- };
25
- if (((_dev_before = dev.before) === null || _dev_before === void 0 ? void 0 : _dev_before.length) || ((_dev_after = dev.after) === null || _dev_after === void 0 ? void 0 : _dev_after.length)) {
26
- rsbuildOptions.setupMiddlewares = [
27
- ...dev.setupMiddlewares || [],
28
- (middlewares) => {
29
- middlewares.unshift(...dev.before || []);
30
- middlewares.push(...dev.after || []);
31
- }
32
- ];
33
- } else if (dev.setupMiddlewares) {
34
- rsbuildOptions.setupMiddlewares = dev.setupMiddlewares;
35
- }
36
- return rsbuildOptions;
37
- };
38
13
  class ModernDevServer extends ModernServer {
39
14
  getDevOptions(options) {
40
15
  const devOptions = options.dev;
@@ -62,10 +37,8 @@ class ModernDevServer extends ModernServer {
62
37
  const { middlewares: rsbuildMiddlewares, close, onUpgrade } = (
63
38
  // https://github.com/web-infra-dev/rsbuild/blob/32fbb85e22158d5c4655505ce75e3452ce22dbb1/packages/shared/src/types/server.ts#L112
64
39
  await this.getMiddlewares({
65
- ...transformToRsbuildServerOptions(this.dev),
66
- compress: !isUseStreamingSSR(this.getRoutes()) && !isUseSSRPreload() && dev.compress,
67
- htmlFallback: false,
68
- publicDir: false
40
+ // TODO: move to uni-builder
41
+ compress: !isUseStreamingSSR(this.getRoutes()) && !isUseSSRPreload() && dev.compress
69
42
  })
70
43
  );
71
44
  app.on("upgrade", onUpgrade);
package/dist/types/types.d.ts CHANGED
@@ -40,7 +40,7 @@ export type ExtraOptions = {
40
40
  };
41
41
  export type ModernDevServerOptions = ModernServerOptions & ExtraOptions;
42
42
  export type ExtraOptionsNew = {
43
- dev: Partial<DevServerOptions>;
43
+ dev: Pick<DevServerOptions, 'watch' | 'https' | 'compress' | 'devMiddleware'>;
44
44
  useSSRWorker?: boolean;
45
45
  rsbuild: RsbuildInstance;
46
46
  getMiddlewares: (overrides?: DevMiddlewaresConfig) => ReturnType<DevServerAPIs['getMiddlewares']>;
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.48.1",
18
+ "version": "2.48.2",
19
19
  "jsnext:source": "./src/index.ts",
20
20
  "types": "./dist/types/index.d.ts",
21
21
  "main": "./dist/cjs/index.js",
@@ -48,11 +48,11 @@
48
48
  "path-to-regexp": "^6.2.0",
49
49
  "ws": "^8.13.0",
50
50
  "axios": "^1.6.0",
51
- "@modern-js/prod-server": "2.48.1",
52
- "@modern-js/server-utils": "2.48.1",
53
- "@modern-js/types": "2.48.1",
54
- "@modern-js/utils": "2.48.1",
55
- "@modern-js/runtime-utils": "2.48.1"
51
+ "@modern-js/prod-server": "2.48.2",
52
+ "@modern-js/server-utils": "2.48.2",
53
+ "@modern-js/types": "2.48.2",
54
+ "@modern-js/utils": "2.48.2",
55
+ "@modern-js/runtime-utils": "2.48.2"
56
56
  },
57
57
  "devDependencies": {
58
58
  "@rsbuild/shared": "0.4.15",
@@ -68,9 +68,9 @@
68
68
  "typescript": "^5",
69
69
  "webpack": "^5.89.0",
70
70
  "websocket": "^1",
71
- "@modern-js/server-core": "2.48.1",
72
- "@scripts/build": "2.48.1",
73
- "@scripts/jest-config": "2.48.1"
71
+ "@scripts/build": "2.48.2",
72
+ "@modern-js/server-core": "2.48.2",
73
+ "@scripts/jest-config": "2.48.2"
74
74
  },
75
75
  "peerDependencies": {
76
76
  "devcert": "^1.2.2",