@modern-js/plugin-server 0.0.0-next-20240509075042 → 0.0.0-next-20240510030044
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.
- package/dist/cjs/server.js +2 -7
- package/dist/cjs/utils.js +1 -2
- package/dist/esm/server.js +2 -9
- package/dist/esm/utils.js +2 -4
- package/dist/esm-node/server.js +2 -7
- package/dist/esm-node/utils.js +1 -2
- package/dist/types/utils.d.ts +2 -4
- package/package.json +9 -9
package/dist/cjs/server.js
CHANGED
|
@@ -38,7 +38,6 @@ class Storage {
|
|
|
38
38
|
}
|
|
39
39
|
constructor() {
|
|
40
40
|
this.middlewares = [];
|
|
41
|
-
this.unstableMiddlewares = [];
|
|
42
41
|
this.hooks = {};
|
|
43
42
|
}
|
|
44
43
|
}
|
|
@@ -76,7 +75,7 @@ var server_default = () => ({
|
|
|
76
75
|
const pwd = (0, import_utils.isProd)() ? distDirectory : appDirectory;
|
|
77
76
|
const loadMod = () => {
|
|
78
77
|
const { middleware: unstableMiddleware } = (0, import_utils2.loadMiddleware)(pwd);
|
|
79
|
-
const { defaultExports, hooks, middleware
|
|
78
|
+
const { defaultExports, hooks, middleware } = (0, import_utils2.loadServerMod)(pwd);
|
|
80
79
|
if (defaultExports) {
|
|
81
80
|
defaultExports(transformAPI);
|
|
82
81
|
}
|
|
@@ -92,7 +91,6 @@ var server_default = () => ({
|
|
|
92
91
|
storage.middlewares = [].concat(middleware);
|
|
93
92
|
}
|
|
94
93
|
storage.middlewares = storage.middlewares.concat(unstableMiddleware);
|
|
95
|
-
storage.unstableMiddlewares.push(...unstableMiddlewares || []);
|
|
96
94
|
};
|
|
97
95
|
return {
|
|
98
96
|
prepare() {
|
|
@@ -115,10 +113,7 @@ var server_default = () => ({
|
|
|
115
113
|
return storage.hooks.afterRender(context, next);
|
|
116
114
|
},
|
|
117
115
|
prepareWebServer() {
|
|
118
|
-
const { middlewares
|
|
119
|
-
if (unstableMiddlewares.length > 0) {
|
|
120
|
-
return unstableMiddlewares;
|
|
121
|
-
}
|
|
116
|
+
const { middlewares } = storage;
|
|
122
117
|
const factory = compose(middlewares);
|
|
123
118
|
return (ctx) => {
|
|
124
119
|
const { source: { res } } = ctx;
|
package/dist/cjs/utils.js
CHANGED
|
@@ -50,10 +50,9 @@ const loadServerMod = (pwd = process.cwd()) => {
|
|
|
50
50
|
const mod = (0, import_utils.requireExistModule)(webAppPath, {
|
|
51
51
|
interop: false
|
|
52
52
|
});
|
|
53
|
-
const { default: defaultExports, middleware,
|
|
53
|
+
const { default: defaultExports, middleware, ...hooks } = mod || {};
|
|
54
54
|
return {
|
|
55
55
|
defaultExports,
|
|
56
|
-
unstableMiddleware,
|
|
57
56
|
hooks,
|
|
58
57
|
middleware
|
|
59
58
|
};
|
package/dist/esm/server.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
|
|
2
|
-
import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
|
|
3
2
|
import { isProd, logger } from "@modern-js/utils";
|
|
4
3
|
import { loadMiddleware, loadServerMod } from "./utils";
|
|
5
4
|
var HOOKS;
|
|
@@ -12,7 +11,6 @@ var Storage = /* @__PURE__ */ function() {
|
|
|
12
11
|
function Storage2() {
|
|
13
12
|
_class_call_check(this, Storage2);
|
|
14
13
|
this.middlewares = [];
|
|
15
|
-
this.unstableMiddlewares = [];
|
|
16
14
|
this.hooks = {};
|
|
17
15
|
}
|
|
18
16
|
var _proto = Storage2.prototype;
|
|
@@ -60,9 +58,8 @@ function server_default() {
|
|
|
60
58
|
var transformAPI = createTransformAPI(storage);
|
|
61
59
|
var pwd = isProd() ? distDirectory : appDirectory;
|
|
62
60
|
var loadMod = function() {
|
|
63
|
-
var _storage_unstableMiddlewares;
|
|
64
61
|
var _loadMiddleware = loadMiddleware(pwd), unstableMiddleware = _loadMiddleware.middleware;
|
|
65
|
-
var _loadServerMod = loadServerMod(pwd), defaultExports = _loadServerMod.defaultExports, hooks = _loadServerMod.hooks, middleware = _loadServerMod.middleware
|
|
62
|
+
var _loadServerMod = loadServerMod(pwd), defaultExports = _loadServerMod.defaultExports, hooks = _loadServerMod.hooks, middleware = _loadServerMod.middleware;
|
|
66
63
|
if (defaultExports) {
|
|
67
64
|
defaultExports(transformAPI);
|
|
68
65
|
}
|
|
@@ -78,7 +75,6 @@ function server_default() {
|
|
|
78
75
|
storage.middlewares = [].concat(middleware);
|
|
79
76
|
}
|
|
80
77
|
storage.middlewares = storage.middlewares.concat(unstableMiddleware);
|
|
81
|
-
(_storage_unstableMiddlewares = storage.unstableMiddlewares).push.apply(_storage_unstableMiddlewares, _to_consumable_array(unstableMiddlewares || []));
|
|
82
78
|
};
|
|
83
79
|
return {
|
|
84
80
|
prepare: function prepare() {
|
|
@@ -101,10 +97,7 @@ function server_default() {
|
|
|
101
97
|
return storage.hooks.afterRender(context, next);
|
|
102
98
|
},
|
|
103
99
|
prepareWebServer: function prepareWebServer() {
|
|
104
|
-
var middlewares = storage.middlewares
|
|
105
|
-
if (unstableMiddlewares.length > 0) {
|
|
106
|
-
return unstableMiddlewares;
|
|
107
|
-
}
|
|
100
|
+
var middlewares = storage.middlewares;
|
|
108
101
|
var factory = compose(middlewares);
|
|
109
102
|
return function(ctx) {
|
|
110
103
|
var res = ctx.source.res;
|
package/dist/esm/utils.js
CHANGED
|
@@ -19,14 +19,12 @@ var loadServerMod = function() {
|
|
|
19
19
|
var mod = requireExistModule(webAppPath, {
|
|
20
20
|
interop: false
|
|
21
21
|
});
|
|
22
|
-
var _ref = mod || {}, defaultExports = _ref.default, middleware = _ref.middleware,
|
|
22
|
+
var _ref = mod || {}, defaultExports = _ref.default, middleware = _ref.middleware, hooks = _object_without_properties(_ref, [
|
|
23
23
|
"default",
|
|
24
|
-
"middleware"
|
|
25
|
-
"unstableMiddleware"
|
|
24
|
+
"middleware"
|
|
26
25
|
]);
|
|
27
26
|
return {
|
|
28
27
|
defaultExports,
|
|
29
|
-
unstableMiddleware,
|
|
30
28
|
hooks,
|
|
31
29
|
middleware
|
|
32
30
|
};
|
package/dist/esm-node/server.js
CHANGED
|
@@ -12,7 +12,6 @@ class Storage {
|
|
|
12
12
|
}
|
|
13
13
|
constructor() {
|
|
14
14
|
this.middlewares = [];
|
|
15
|
-
this.unstableMiddlewares = [];
|
|
16
15
|
this.hooks = {};
|
|
17
16
|
}
|
|
18
17
|
}
|
|
@@ -50,7 +49,7 @@ var server_default = () => ({
|
|
|
50
49
|
const pwd = isProd() ? distDirectory : appDirectory;
|
|
51
50
|
const loadMod = () => {
|
|
52
51
|
const { middleware: unstableMiddleware } = loadMiddleware(pwd);
|
|
53
|
-
const { defaultExports, hooks, middleware
|
|
52
|
+
const { defaultExports, hooks, middleware } = loadServerMod(pwd);
|
|
54
53
|
if (defaultExports) {
|
|
55
54
|
defaultExports(transformAPI);
|
|
56
55
|
}
|
|
@@ -66,7 +65,6 @@ var server_default = () => ({
|
|
|
66
65
|
storage.middlewares = [].concat(middleware);
|
|
67
66
|
}
|
|
68
67
|
storage.middlewares = storage.middlewares.concat(unstableMiddleware);
|
|
69
|
-
storage.unstableMiddlewares.push(...unstableMiddlewares || []);
|
|
70
68
|
};
|
|
71
69
|
return {
|
|
72
70
|
prepare() {
|
|
@@ -89,10 +87,7 @@ var server_default = () => ({
|
|
|
89
87
|
return storage.hooks.afterRender(context, next);
|
|
90
88
|
},
|
|
91
89
|
prepareWebServer() {
|
|
92
|
-
const { middlewares
|
|
93
|
-
if (unstableMiddlewares.length > 0) {
|
|
94
|
-
return unstableMiddlewares;
|
|
95
|
-
}
|
|
90
|
+
const { middlewares } = storage;
|
|
96
91
|
const factory = compose(middlewares);
|
|
97
92
|
return (ctx) => {
|
|
98
93
|
const { source: { res } } = ctx;
|
package/dist/esm-node/utils.js
CHANGED
|
@@ -16,10 +16,9 @@ const loadServerMod = (pwd = process.cwd()) => {
|
|
|
16
16
|
const mod = requireExistModule(webAppPath, {
|
|
17
17
|
interop: false
|
|
18
18
|
});
|
|
19
|
-
const { default: defaultExports, middleware,
|
|
19
|
+
const { default: defaultExports, middleware, ...hooks } = mod || {};
|
|
20
20
|
return {
|
|
21
21
|
defaultExports,
|
|
22
|
-
unstableMiddleware,
|
|
23
22
|
hooks,
|
|
24
23
|
middleware
|
|
25
24
|
};
|
package/dist/types/utils.d.ts
CHANGED
|
@@ -3,8 +3,7 @@ export type Hook = (ctx: HookContext, next: NextFunction) => void;
|
|
|
3
3
|
export type Middleware = (ctx: MiddlewareContext, next: NextFunction) => void;
|
|
4
4
|
export type ServerMod = {
|
|
5
5
|
default: (args: any) => void;
|
|
6
|
-
middleware: Middleware[];
|
|
7
|
-
unstableMiddleware: any | any[];
|
|
6
|
+
middleware: Middleware | Middleware[];
|
|
8
7
|
afterMatch: Hook;
|
|
9
8
|
afterRender: Hook;
|
|
10
9
|
};
|
|
@@ -13,10 +12,9 @@ export declare const loadMiddleware: (pwd?: string) => {
|
|
|
13
12
|
};
|
|
14
13
|
export declare const loadServerMod: (pwd?: string) => {
|
|
15
14
|
defaultExports: (args: any) => void;
|
|
16
|
-
unstableMiddleware: any;
|
|
17
15
|
hooks: {
|
|
18
16
|
afterMatch: Hook;
|
|
19
17
|
afterRender: Hook;
|
|
20
18
|
};
|
|
21
|
-
middleware: Middleware[];
|
|
19
|
+
middleware: Middleware | Middleware[];
|
|
22
20
|
};
|
package/package.json
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"modern",
|
|
16
16
|
"modern.js"
|
|
17
17
|
],
|
|
18
|
-
"version": "0.0.0-next-
|
|
18
|
+
"version": "0.0.0-next-20240510030044",
|
|
19
19
|
"types": "./dist/types/cli.d.ts",
|
|
20
20
|
"jsnext:source": "./src/cli",
|
|
21
21
|
"main": "./dist/cjs/cli.js",
|
|
@@ -51,20 +51,20 @@
|
|
|
51
51
|
},
|
|
52
52
|
"dependencies": {
|
|
53
53
|
"@swc/helpers": "0.5.3",
|
|
54
|
-
"@modern-js/
|
|
55
|
-
"@modern-js/utils": "0.0.0-next-
|
|
54
|
+
"@modern-js/utils": "0.0.0-next-20240510030044",
|
|
55
|
+
"@modern-js/server-utils": "0.0.0-next-20240510030044"
|
|
56
56
|
},
|
|
57
57
|
"devDependencies": {
|
|
58
58
|
"typescript": "^5",
|
|
59
59
|
"@types/jest": "^29",
|
|
60
60
|
"@types/node": "^14",
|
|
61
61
|
"jest": "^29",
|
|
62
|
-
"@modern-js/
|
|
63
|
-
"@modern-js/core": "0.0.0-next-
|
|
64
|
-
"@modern-js/
|
|
65
|
-
"@
|
|
66
|
-
"@scripts/
|
|
67
|
-
"@
|
|
62
|
+
"@modern-js/app-tools": "0.0.0-next-20240510030044",
|
|
63
|
+
"@modern-js/server-core": "0.0.0-next-20240510030044",
|
|
64
|
+
"@modern-js/core": "0.0.0-next-20240510030044",
|
|
65
|
+
"@scripts/build": "0.0.0-next-20240510030044",
|
|
66
|
+
"@scripts/jest-config": "0.0.0-next-20240510030044",
|
|
67
|
+
"@modern-js/types": "0.0.0-next-20240510030044"
|
|
68
68
|
},
|
|
69
69
|
"sideEffects": [
|
|
70
70
|
"*.css",
|