@modern-js/server-core 2.54.0 → 2.54.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.
|
@@ -21,9 +21,9 @@ __export(serverConfig_exports, {
|
|
|
21
21
|
loadConfig: () => loadConfig
|
|
22
22
|
});
|
|
23
23
|
module.exports = __toCommonJS(serverConfig_exports);
|
|
24
|
-
var
|
|
24
|
+
var import_ts_deepmerge = require("ts-deepmerge");
|
|
25
25
|
const loadConfig = ({ cliConfig, serverConfig }) => {
|
|
26
|
-
const config = (0,
|
|
26
|
+
const config = (0, import_ts_deepmerge.merge)({
|
|
27
27
|
...cliConfig,
|
|
28
28
|
plugins: []
|
|
29
29
|
}, serverConfig);
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
|
|
2
2
|
import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
|
|
3
|
-
import {
|
|
3
|
+
import { merge } from "ts-deepmerge";
|
|
4
4
|
var loadConfig = function(param) {
|
|
5
5
|
var cliConfig = param.cliConfig, serverConfig = param.serverConfig;
|
|
6
|
-
var config =
|
|
6
|
+
var config = merge(_object_spread_props(_object_spread({}, cliConfig), {
|
|
7
7
|
plugins: []
|
|
8
8
|
}), serverConfig);
|
|
9
9
|
return config;
|
package/package.json
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"modern",
|
|
16
16
|
"modern.js"
|
|
17
17
|
],
|
|
18
|
-
"version": "2.54.
|
|
18
|
+
"version": "2.54.2",
|
|
19
19
|
"jsnext:source": "./src/index.ts",
|
|
20
20
|
"types": "./dist/types/index.d.ts",
|
|
21
21
|
"main": "./dist/cjs/index.js",
|
|
@@ -51,11 +51,11 @@
|
|
|
51
51
|
"@web-std/stream": "^1.0.3",
|
|
52
52
|
"@web-std/file": "^3.0.3",
|
|
53
53
|
"hono": "^3.12.2",
|
|
54
|
-
"deepmerge
|
|
54
|
+
"ts-deepmerge": "7.0.0",
|
|
55
55
|
"isbot": "3.8.0",
|
|
56
|
-
"@modern-js/
|
|
57
|
-
"@modern-js/utils": "2.54.
|
|
58
|
-
"@modern-js/
|
|
56
|
+
"@modern-js/plugin": "2.54.2",
|
|
57
|
+
"@modern-js/utils": "2.54.2",
|
|
58
|
+
"@modern-js/runtime-utils": "2.54.2"
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
|
61
61
|
"@types/jest": "^29",
|
|
@@ -65,9 +65,9 @@
|
|
|
65
65
|
"jest": "^29",
|
|
66
66
|
"ts-jest": "^29.1.0",
|
|
67
67
|
"typescript": "^5",
|
|
68
|
-
"@scripts/build": "2.54.
|
|
69
|
-
"@modern-js/types": "2.54.
|
|
70
|
-
"@scripts/jest-config": "2.54.
|
|
68
|
+
"@scripts/build": "2.54.2",
|
|
69
|
+
"@modern-js/types": "2.54.2",
|
|
70
|
+
"@scripts/jest-config": "2.54.2"
|
|
71
71
|
},
|
|
72
72
|
"sideEffects": false,
|
|
73
73
|
"publishConfig": {
|