@modern-js/server 2.67.6 → 2.67.8
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.
|
@@ -45,7 +45,10 @@ async function createDevServer(options, applyPlugins) {
|
|
|
45
45
|
const prodServerOptions = {
|
|
46
46
|
...options,
|
|
47
47
|
pwd: distDir,
|
|
48
|
-
serverConfig
|
|
48
|
+
serverConfig: {
|
|
49
|
+
...serverConfig,
|
|
50
|
+
...options.serverConfig
|
|
51
|
+
},
|
|
49
52
|
/**
|
|
50
53
|
* 1. server plugins from modern.server.ts
|
|
51
54
|
* 2. server plugins register by cli use _internalServerPlugins
|
|
@@ -29,7 +29,7 @@ function _createDevServer() {
|
|
|
29
29
|
serverConfig = _state.sent() || {};
|
|
30
30
|
prodServerOptions = _object_spread_props(_object_spread({}, options), {
|
|
31
31
|
pwd: distDir,
|
|
32
|
-
serverConfig,
|
|
32
|
+
serverConfig: _object_spread({}, serverConfig, options.serverConfig),
|
|
33
33
|
/**
|
|
34
34
|
* 1. server plugins from modern.server.ts
|
|
35
35
|
* 2. server plugins register by cli use _internalServerPlugins
|
|
@@ -12,7 +12,10 @@ async function createDevServer(options, applyPlugins) {
|
|
|
12
12
|
const prodServerOptions = {
|
|
13
13
|
...options,
|
|
14
14
|
pwd: distDir,
|
|
15
|
-
serverConfig
|
|
15
|
+
serverConfig: {
|
|
16
|
+
...serverConfig,
|
|
17
|
+
...options.serverConfig
|
|
18
|
+
},
|
|
16
19
|
/**
|
|
17
20
|
* 1. server plugins from modern.server.ts
|
|
18
21
|
* 2. server plugins register by cli use _internalServerPlugins
|
package/package.json
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"modern",
|
|
16
16
|
"modern.js"
|
|
17
17
|
],
|
|
18
|
-
"version": "2.67.
|
|
18
|
+
"version": "2.67.8",
|
|
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
|
"minimatch": "^3.0.4",
|
|
49
49
|
"path-to-regexp": "^6.2.0",
|
|
50
50
|
"ws": "^8.13.0",
|
|
51
|
-
"@modern-js/runtime-utils": "2.67.
|
|
52
|
-
"@modern-js/server-core": "2.67.
|
|
53
|
-
"@modern-js/server-utils": "2.67.
|
|
54
|
-
"@modern-js/types": "2.67.
|
|
55
|
-
"@modern-js/utils": "2.67.
|
|
51
|
+
"@modern-js/runtime-utils": "2.67.8",
|
|
52
|
+
"@modern-js/server-core": "2.67.8",
|
|
53
|
+
"@modern-js/server-utils": "2.67.8",
|
|
54
|
+
"@modern-js/types": "2.67.8",
|
|
55
|
+
"@modern-js/utils": "2.67.8"
|
|
56
56
|
},
|
|
57
57
|
"devDependencies": {
|
|
58
58
|
"@types/connect-history-api-fallback": "^1.3.5",
|
|
@@ -67,7 +67,7 @@
|
|
|
67
67
|
"typescript": "^5",
|
|
68
68
|
"webpack": "^5.99.8",
|
|
69
69
|
"websocket": "^1.0.35",
|
|
70
|
-
"@modern-js/uni-builder": "2.67.
|
|
70
|
+
"@modern-js/uni-builder": "2.67.8",
|
|
71
71
|
"@scripts/build": "2.66.0",
|
|
72
72
|
"@scripts/jest-config": "2.66.0"
|
|
73
73
|
},
|