@modern-js/plugin-server 0.0.0-next-20221114141431 → 0.0.0-next-20221114142803
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/CHANGELOG.md +14 -13
- package/dist/js/modern/cli.js +6 -0
- package/dist/js/modern/server.js +40 -6
- package/dist/js/node/cli.js +19 -0
- package/dist/js/node/server.js +47 -6
- package/dist/js/treeshaking/cli.js +7 -0
- package/dist/js/treeshaking/server.js +31 -6
- package/dist/types/cli.d.ts +2 -0
- package/dist/types/server.d.ts +2 -0
- package/package.json +9 -9
package/CHANGELOG.md
CHANGED
|
@@ -1,22 +1,23 @@
|
|
|
1
1
|
# @modern-js/plugin-server
|
|
2
2
|
|
|
3
|
-
## 0.0.0-next-
|
|
3
|
+
## 0.0.0-next-20221114142803
|
|
4
4
|
|
|
5
5
|
### Patch Changes
|
|
6
6
|
|
|
7
|
-
-
|
|
7
|
+
- 3bbea92b: feat: support Hook、Middleware new API
|
|
8
8
|
feat: 支持 Hook、Middleware 的新 API
|
|
9
|
-
- Updated dependencies [
|
|
10
|
-
- Updated dependencies [
|
|
11
|
-
- Updated dependencies [
|
|
12
|
-
- Updated dependencies [
|
|
13
|
-
- Updated dependencies [
|
|
14
|
-
- Updated dependencies [
|
|
15
|
-
- Updated dependencies [
|
|
16
|
-
- Updated dependencies [
|
|
17
|
-
|
|
18
|
-
- @modern-js/utils@0.0.0-next-
|
|
19
|
-
- @modern-js/
|
|
9
|
+
- Updated dependencies [9b915e0c]
|
|
10
|
+
- Updated dependencies [edd1cfb1]
|
|
11
|
+
- Updated dependencies [cc971eab]
|
|
12
|
+
- Updated dependencies [a8642da5]
|
|
13
|
+
- Updated dependencies [b8bbe036]
|
|
14
|
+
- Updated dependencies [d5a31df7]
|
|
15
|
+
- Updated dependencies [3bbea92b]
|
|
16
|
+
- Updated dependencies [543be955]
|
|
17
|
+
- Updated dependencies [14b712da]
|
|
18
|
+
- @modern-js/server-utils@0.0.0-next-20221114142803
|
|
19
|
+
- @modern-js/utils@0.0.0-next-20221114142803
|
|
20
|
+
- @modern-js/babel-compiler@0.0.0-next-20221114142803
|
|
20
21
|
|
|
21
22
|
## 1.21.2
|
|
22
23
|
|
package/dist/js/modern/cli.js
CHANGED
|
@@ -9,6 +9,7 @@ export default (() => ({
|
|
|
9
9
|
config() {
|
|
10
10
|
return {};
|
|
11
11
|
},
|
|
12
|
+
|
|
12
13
|
async afterBuild() {
|
|
13
14
|
const {
|
|
14
15
|
appDirectory,
|
|
@@ -20,12 +21,15 @@ export default (() => ({
|
|
|
20
21
|
const sharedDir = path.resolve(appDirectory, SHARED_DIR);
|
|
21
22
|
const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
|
|
22
23
|
const sourceDirs = [];
|
|
24
|
+
|
|
23
25
|
if (fs.existsSync(serverDir)) {
|
|
24
26
|
sourceDirs.push(serverDir);
|
|
25
27
|
}
|
|
28
|
+
|
|
26
29
|
if (fs.existsSync(sharedDir)) {
|
|
27
30
|
sourceDirs.push(sharedDir);
|
|
28
31
|
}
|
|
32
|
+
|
|
29
33
|
const {
|
|
30
34
|
server
|
|
31
35
|
} = modernConfig;
|
|
@@ -37,6 +41,7 @@ export default (() => ({
|
|
|
37
41
|
const {
|
|
38
42
|
babel
|
|
39
43
|
} = modernConfig.tools;
|
|
44
|
+
|
|
40
45
|
if (sourceDirs.length > 0) {
|
|
41
46
|
await compile(appDirectory, {
|
|
42
47
|
server,
|
|
@@ -51,5 +56,6 @@ export default (() => ({
|
|
|
51
56
|
});
|
|
52
57
|
}
|
|
53
58
|
}
|
|
59
|
+
|
|
54
60
|
})
|
|
55
61
|
}));
|
package/dist/js/modern/server.js
CHANGED
|
@@ -1,50 +1,69 @@
|
|
|
1
1
|
const _excluded = ["default", "middleware"];
|
|
2
|
+
|
|
2
3
|
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
4
|
+
|
|
3
5
|
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
6
|
+
|
|
4
7
|
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
8
|
+
|
|
5
9
|
import path from 'path';
|
|
6
10
|
import { isProd, logger, requireExistModule, SERVER_DIR } from '@modern-js/utils';
|
|
7
11
|
const WEB_APP_NAME = 'index';
|
|
8
12
|
var HOOKS;
|
|
13
|
+
|
|
9
14
|
(function (HOOKS) {
|
|
10
15
|
HOOKS["AFTER_MATCH"] = "afterMatch";
|
|
11
16
|
HOOKS["AFTER_RENDER"] = "afterRender";
|
|
12
17
|
})(HOOKS || (HOOKS = {}));
|
|
18
|
+
|
|
13
19
|
class Storage {
|
|
14
20
|
constructor() {
|
|
15
21
|
_defineProperty(this, "middlewares", []);
|
|
22
|
+
|
|
16
23
|
_defineProperty(this, "hooks", {});
|
|
17
24
|
}
|
|
25
|
+
|
|
18
26
|
reset() {
|
|
19
27
|
this.middlewares = [];
|
|
20
28
|
this.hooks = {};
|
|
21
29
|
}
|
|
30
|
+
|
|
22
31
|
}
|
|
32
|
+
|
|
23
33
|
const createTransformAPI = storage => new Proxy({}, {
|
|
24
34
|
get(target, name) {
|
|
25
35
|
if (name === 'addMiddleware') {
|
|
26
36
|
return fn => storage.middlewares.push(fn);
|
|
27
37
|
}
|
|
38
|
+
|
|
28
39
|
return fn => {
|
|
29
40
|
logger.warn('declare hook in default export is to be deprecated, use named export instead');
|
|
30
41
|
storage.hooks[name] = fn;
|
|
31
42
|
};
|
|
32
43
|
}
|
|
44
|
+
|
|
33
45
|
});
|
|
46
|
+
|
|
34
47
|
const compose = middlewares => {
|
|
35
48
|
return (ctx, resolve, reject) => {
|
|
36
49
|
let i = 0;
|
|
50
|
+
|
|
37
51
|
const dispatch = () => {
|
|
38
52
|
var _handler, _handler$catch;
|
|
53
|
+
|
|
39
54
|
const handler = middlewares[i++];
|
|
55
|
+
|
|
40
56
|
if (!handler) {
|
|
41
57
|
return resolve();
|
|
42
58
|
}
|
|
59
|
+
|
|
43
60
|
return (_handler = handler(ctx, dispatch)) === null || _handler === void 0 ? void 0 : (_handler$catch = _handler.catch) === null || _handler$catch === void 0 ? void 0 : _handler$catch.call(_handler, reject);
|
|
44
61
|
};
|
|
62
|
+
|
|
45
63
|
return dispatch;
|
|
46
64
|
};
|
|
47
65
|
};
|
|
66
|
+
|
|
48
67
|
export default (() => ({
|
|
49
68
|
name: '@modern-js/plugin-server',
|
|
50
69
|
setup: api => {
|
|
@@ -56,38 +75,46 @@ export default (() => ({
|
|
|
56
75
|
const transformAPI = createTransformAPI(storage);
|
|
57
76
|
const pwd = isProd() ? distDirectory : appDirectory;
|
|
58
77
|
const webAppPath = path.resolve(pwd, SERVER_DIR, WEB_APP_NAME);
|
|
78
|
+
|
|
59
79
|
const loadMod = () => {
|
|
60
80
|
const mod = requireExistModule(webAppPath, {
|
|
61
81
|
interop: false
|
|
62
82
|
});
|
|
83
|
+
|
|
63
84
|
const {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
85
|
+
default: defaultExports,
|
|
86
|
+
middleware
|
|
87
|
+
} = mod,
|
|
88
|
+
hooks = _objectWithoutProperties(mod, _excluded);
|
|
89
|
+
|
|
68
90
|
if (defaultExports) {
|
|
69
91
|
defaultExports(transformAPI);
|
|
70
|
-
}
|
|
92
|
+
} // named export hooks will overrides hooks in default export function
|
|
93
|
+
|
|
71
94
|
|
|
72
|
-
// named export hooks will overrides hooks in default export function
|
|
73
95
|
Object.values(HOOKS).forEach(key => {
|
|
74
96
|
const fn = hooks[key];
|
|
97
|
+
|
|
75
98
|
if (fn) {
|
|
76
99
|
storage.hooks[key] = fn;
|
|
77
100
|
}
|
|
78
101
|
});
|
|
102
|
+
|
|
79
103
|
if (middleware) {
|
|
80
104
|
storage.middlewares = [].concat(middleware);
|
|
81
105
|
}
|
|
82
106
|
};
|
|
107
|
+
|
|
83
108
|
return {
|
|
84
109
|
prepare() {
|
|
85
110
|
loadMod();
|
|
86
111
|
},
|
|
112
|
+
|
|
87
113
|
reset() {
|
|
88
114
|
storage.reset();
|
|
89
115
|
loadMod();
|
|
90
116
|
},
|
|
117
|
+
|
|
91
118
|
gather({
|
|
92
119
|
addWebMiddleware
|
|
93
120
|
}) {
|
|
@@ -95,18 +122,23 @@ export default (() => ({
|
|
|
95
122
|
addWebMiddleware(mid);
|
|
96
123
|
});
|
|
97
124
|
},
|
|
125
|
+
|
|
98
126
|
afterMatch(context, next) {
|
|
99
127
|
if (!storage.hooks.afterMatch) {
|
|
100
128
|
return next();
|
|
101
129
|
}
|
|
130
|
+
|
|
102
131
|
return storage.hooks.afterMatch(context, next);
|
|
103
132
|
},
|
|
133
|
+
|
|
104
134
|
afterRender(context, next) {
|
|
105
135
|
if (!storage.hooks.afterRender) {
|
|
106
136
|
return next();
|
|
107
137
|
}
|
|
138
|
+
|
|
108
139
|
return storage.hooks.afterRender(context, next);
|
|
109
140
|
},
|
|
141
|
+
|
|
110
142
|
prepareWebServer({
|
|
111
143
|
config
|
|
112
144
|
}) {
|
|
@@ -125,6 +157,7 @@ export default (() => ({
|
|
|
125
157
|
if (err) {
|
|
126
158
|
return reject(err);
|
|
127
159
|
}
|
|
160
|
+
|
|
128
161
|
return resolve();
|
|
129
162
|
});
|
|
130
163
|
const dispatch = factory(ctx, resolve, reject);
|
|
@@ -132,6 +165,7 @@ export default (() => ({
|
|
|
132
165
|
});
|
|
133
166
|
};
|
|
134
167
|
}
|
|
168
|
+
|
|
135
169
|
};
|
|
136
170
|
}
|
|
137
171
|
}));
|
package/dist/js/node/cli.js
CHANGED
|
@@ -4,35 +4,51 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
+
|
|
7
8
|
var _fs = _interopRequireDefault(require("fs"));
|
|
9
|
+
|
|
8
10
|
var _path = _interopRequireDefault(require("path"));
|
|
11
|
+
|
|
9
12
|
var _serverUtils = require("@modern-js/server-utils");
|
|
13
|
+
|
|
10
14
|
var _utils = require("@modern-js/utils");
|
|
15
|
+
|
|
11
16
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
17
|
+
|
|
12
18
|
const TS_CONFIG_FILENAME = 'tsconfig.json';
|
|
19
|
+
|
|
13
20
|
var _default = () => ({
|
|
14
21
|
name: '@modern-js/plugin-server',
|
|
15
22
|
setup: api => ({
|
|
16
23
|
config() {
|
|
17
24
|
return {};
|
|
18
25
|
},
|
|
26
|
+
|
|
19
27
|
async afterBuild() {
|
|
20
28
|
const {
|
|
21
29
|
appDirectory,
|
|
22
30
|
distDirectory
|
|
23
31
|
} = api.useAppContext();
|
|
24
32
|
const modernConfig = api.useResolvedConfigContext();
|
|
33
|
+
|
|
25
34
|
const distDir = _path.default.resolve(distDirectory);
|
|
35
|
+
|
|
26
36
|
const serverDir = _path.default.resolve(appDirectory, _utils.SERVER_DIR);
|
|
37
|
+
|
|
27
38
|
const sharedDir = _path.default.resolve(appDirectory, _utils.SHARED_DIR);
|
|
39
|
+
|
|
28
40
|
const tsconfigPath = _path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
|
|
41
|
+
|
|
29
42
|
const sourceDirs = [];
|
|
43
|
+
|
|
30
44
|
if (_fs.default.existsSync(serverDir)) {
|
|
31
45
|
sourceDirs.push(serverDir);
|
|
32
46
|
}
|
|
47
|
+
|
|
33
48
|
if (_fs.default.existsSync(sharedDir)) {
|
|
34
49
|
sourceDirs.push(sharedDir);
|
|
35
50
|
}
|
|
51
|
+
|
|
36
52
|
const {
|
|
37
53
|
server
|
|
38
54
|
} = modernConfig;
|
|
@@ -44,6 +60,7 @@ var _default = () => ({
|
|
|
44
60
|
const {
|
|
45
61
|
babel
|
|
46
62
|
} = modernConfig.tools;
|
|
63
|
+
|
|
47
64
|
if (sourceDirs.length > 0) {
|
|
48
65
|
await (0, _serverUtils.compile)(appDirectory, {
|
|
49
66
|
server,
|
|
@@ -58,6 +75,8 @@ var _default = () => ({
|
|
|
58
75
|
});
|
|
59
76
|
}
|
|
60
77
|
}
|
|
78
|
+
|
|
61
79
|
})
|
|
62
80
|
});
|
|
81
|
+
|
|
63
82
|
exports.default = _default;
|
package/dist/js/node/server.js
CHANGED
|
@@ -4,54 +4,78 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
+
|
|
7
8
|
var _path = _interopRequireDefault(require("path"));
|
|
9
|
+
|
|
8
10
|
var _utils = require("@modern-js/utils");
|
|
11
|
+
|
|
9
12
|
const _excluded = ["default", "middleware"];
|
|
13
|
+
|
|
10
14
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
15
|
+
|
|
11
16
|
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
17
|
+
|
|
12
18
|
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
19
|
+
|
|
13
20
|
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
21
|
+
|
|
14
22
|
const WEB_APP_NAME = 'index';
|
|
15
23
|
var HOOKS;
|
|
24
|
+
|
|
16
25
|
(function (HOOKS) {
|
|
17
26
|
HOOKS["AFTER_MATCH"] = "afterMatch";
|
|
18
27
|
HOOKS["AFTER_RENDER"] = "afterRender";
|
|
19
28
|
})(HOOKS || (HOOKS = {}));
|
|
29
|
+
|
|
20
30
|
class Storage {
|
|
21
31
|
constructor() {
|
|
22
32
|
_defineProperty(this, "middlewares", []);
|
|
33
|
+
|
|
23
34
|
_defineProperty(this, "hooks", {});
|
|
24
35
|
}
|
|
36
|
+
|
|
25
37
|
reset() {
|
|
26
38
|
this.middlewares = [];
|
|
27
39
|
this.hooks = {};
|
|
28
40
|
}
|
|
41
|
+
|
|
29
42
|
}
|
|
43
|
+
|
|
30
44
|
const createTransformAPI = storage => new Proxy({}, {
|
|
31
45
|
get(target, name) {
|
|
32
46
|
if (name === 'addMiddleware') {
|
|
33
47
|
return fn => storage.middlewares.push(fn);
|
|
34
48
|
}
|
|
49
|
+
|
|
35
50
|
return fn => {
|
|
36
51
|
_utils.logger.warn('declare hook in default export is to be deprecated, use named export instead');
|
|
52
|
+
|
|
37
53
|
storage.hooks[name] = fn;
|
|
38
54
|
};
|
|
39
55
|
}
|
|
56
|
+
|
|
40
57
|
});
|
|
58
|
+
|
|
41
59
|
const compose = middlewares => {
|
|
42
60
|
return (ctx, resolve, reject) => {
|
|
43
61
|
let i = 0;
|
|
62
|
+
|
|
44
63
|
const dispatch = () => {
|
|
45
64
|
var _handler, _handler$catch;
|
|
65
|
+
|
|
46
66
|
const handler = middlewares[i++];
|
|
67
|
+
|
|
47
68
|
if (!handler) {
|
|
48
69
|
return resolve();
|
|
49
70
|
}
|
|
71
|
+
|
|
50
72
|
return (_handler = handler(ctx, dispatch)) === null || _handler === void 0 ? void 0 : (_handler$catch = _handler.catch) === null || _handler$catch === void 0 ? void 0 : _handler$catch.call(_handler, reject);
|
|
51
73
|
};
|
|
74
|
+
|
|
52
75
|
return dispatch;
|
|
53
76
|
};
|
|
54
77
|
};
|
|
78
|
+
|
|
55
79
|
var _default = () => ({
|
|
56
80
|
name: '@modern-js/plugin-server',
|
|
57
81
|
setup: api => {
|
|
@@ -62,39 +86,48 @@ var _default = () => ({
|
|
|
62
86
|
const storage = new Storage();
|
|
63
87
|
const transformAPI = createTransformAPI(storage);
|
|
64
88
|
const pwd = (0, _utils.isProd)() ? distDirectory : appDirectory;
|
|
89
|
+
|
|
65
90
|
const webAppPath = _path.default.resolve(pwd, _utils.SERVER_DIR, WEB_APP_NAME);
|
|
91
|
+
|
|
66
92
|
const loadMod = () => {
|
|
67
93
|
const mod = (0, _utils.requireExistModule)(webAppPath, {
|
|
68
94
|
interop: false
|
|
69
95
|
});
|
|
96
|
+
|
|
70
97
|
const {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
98
|
+
default: defaultExports,
|
|
99
|
+
middleware
|
|
100
|
+
} = mod,
|
|
101
|
+
hooks = _objectWithoutProperties(mod, _excluded);
|
|
102
|
+
|
|
75
103
|
if (defaultExports) {
|
|
76
104
|
defaultExports(transformAPI);
|
|
77
|
-
}
|
|
105
|
+
} // named export hooks will overrides hooks in default export function
|
|
106
|
+
|
|
78
107
|
|
|
79
|
-
// named export hooks will overrides hooks in default export function
|
|
80
108
|
Object.values(HOOKS).forEach(key => {
|
|
81
109
|
const fn = hooks[key];
|
|
110
|
+
|
|
82
111
|
if (fn) {
|
|
83
112
|
storage.hooks[key] = fn;
|
|
84
113
|
}
|
|
85
114
|
});
|
|
115
|
+
|
|
86
116
|
if (middleware) {
|
|
87
117
|
storage.middlewares = [].concat(middleware);
|
|
88
118
|
}
|
|
89
119
|
};
|
|
120
|
+
|
|
90
121
|
return {
|
|
91
122
|
prepare() {
|
|
92
123
|
loadMod();
|
|
93
124
|
},
|
|
125
|
+
|
|
94
126
|
reset() {
|
|
95
127
|
storage.reset();
|
|
96
128
|
loadMod();
|
|
97
129
|
},
|
|
130
|
+
|
|
98
131
|
gather({
|
|
99
132
|
addWebMiddleware
|
|
100
133
|
}) {
|
|
@@ -102,18 +135,23 @@ var _default = () => ({
|
|
|
102
135
|
addWebMiddleware(mid);
|
|
103
136
|
});
|
|
104
137
|
},
|
|
138
|
+
|
|
105
139
|
afterMatch(context, next) {
|
|
106
140
|
if (!storage.hooks.afterMatch) {
|
|
107
141
|
return next();
|
|
108
142
|
}
|
|
143
|
+
|
|
109
144
|
return storage.hooks.afterMatch(context, next);
|
|
110
145
|
},
|
|
146
|
+
|
|
111
147
|
afterRender(context, next) {
|
|
112
148
|
if (!storage.hooks.afterRender) {
|
|
113
149
|
return next();
|
|
114
150
|
}
|
|
151
|
+
|
|
115
152
|
return storage.hooks.afterRender(context, next);
|
|
116
153
|
},
|
|
154
|
+
|
|
117
155
|
prepareWebServer({
|
|
118
156
|
config
|
|
119
157
|
}) {
|
|
@@ -132,6 +170,7 @@ var _default = () => ({
|
|
|
132
170
|
if (err) {
|
|
133
171
|
return reject(err);
|
|
134
172
|
}
|
|
173
|
+
|
|
135
174
|
return resolve();
|
|
136
175
|
});
|
|
137
176
|
const dispatch = factory(ctx, resolve, reject);
|
|
@@ -139,7 +178,9 @@ var _default = () => ({
|
|
|
139
178
|
});
|
|
140
179
|
};
|
|
141
180
|
}
|
|
181
|
+
|
|
142
182
|
};
|
|
143
183
|
}
|
|
144
184
|
});
|
|
185
|
+
|
|
145
186
|
exports.default = _default;
|
|
@@ -16,6 +16,7 @@ export default (function () {
|
|
|
16
16
|
afterBuild: function afterBuild() {
|
|
17
17
|
return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
18
18
|
var _api$useAppContext, appDirectory, distDirectory, modernConfig, distDir, serverDir, sharedDir, tsconfigPath, sourceDirs, server, _modernConfig$source, alias, envVars, globalVars, babel;
|
|
19
|
+
|
|
19
20
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
20
21
|
while (1) {
|
|
21
22
|
switch (_context.prev = _context.next) {
|
|
@@ -27,19 +28,24 @@ export default (function () {
|
|
|
27
28
|
sharedDir = path.resolve(appDirectory, SHARED_DIR);
|
|
28
29
|
tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
|
|
29
30
|
sourceDirs = [];
|
|
31
|
+
|
|
30
32
|
if (fs.existsSync(serverDir)) {
|
|
31
33
|
sourceDirs.push(serverDir);
|
|
32
34
|
}
|
|
35
|
+
|
|
33
36
|
if (fs.existsSync(sharedDir)) {
|
|
34
37
|
sourceDirs.push(sharedDir);
|
|
35
38
|
}
|
|
39
|
+
|
|
36
40
|
server = modernConfig.server;
|
|
37
41
|
_modernConfig$source = modernConfig.source, alias = _modernConfig$source.alias, envVars = _modernConfig$source.envVars, globalVars = _modernConfig$source.globalVars;
|
|
38
42
|
babel = modernConfig.tools.babel;
|
|
43
|
+
|
|
39
44
|
if (!(sourceDirs.length > 0)) {
|
|
40
45
|
_context.next = 15;
|
|
41
46
|
break;
|
|
42
47
|
}
|
|
48
|
+
|
|
43
49
|
_context.next = 15;
|
|
44
50
|
return compile(appDirectory, {
|
|
45
51
|
server: server,
|
|
@@ -52,6 +58,7 @@ export default (function () {
|
|
|
52
58
|
distDir: distDir,
|
|
53
59
|
tsconfigPath: tsconfigPath
|
|
54
60
|
});
|
|
61
|
+
|
|
55
62
|
case 15:
|
|
56
63
|
case "end":
|
|
57
64
|
return _context.stop();
|
|
@@ -7,16 +7,21 @@ import path from 'path';
|
|
|
7
7
|
import { isProd, logger, requireExistModule, SERVER_DIR } from '@modern-js/utils';
|
|
8
8
|
var WEB_APP_NAME = 'index';
|
|
9
9
|
var HOOKS;
|
|
10
|
+
|
|
10
11
|
(function (HOOKS) {
|
|
11
12
|
HOOKS["AFTER_MATCH"] = "afterMatch";
|
|
12
13
|
HOOKS["AFTER_RENDER"] = "afterRender";
|
|
13
14
|
})(HOOKS || (HOOKS = {}));
|
|
15
|
+
|
|
14
16
|
var Storage = /*#__PURE__*/function () {
|
|
15
17
|
function Storage() {
|
|
16
18
|
_classCallCheck(this, Storage);
|
|
19
|
+
|
|
17
20
|
_defineProperty(this, "middlewares", []);
|
|
21
|
+
|
|
18
22
|
_defineProperty(this, "hooks", {});
|
|
19
23
|
}
|
|
24
|
+
|
|
20
25
|
_createClass(Storage, [{
|
|
21
26
|
key: "reset",
|
|
22
27
|
value: function reset() {
|
|
@@ -24,8 +29,10 @@ var Storage = /*#__PURE__*/function () {
|
|
|
24
29
|
this.hooks = {};
|
|
25
30
|
}
|
|
26
31
|
}]);
|
|
32
|
+
|
|
27
33
|
return Storage;
|
|
28
34
|
}();
|
|
35
|
+
|
|
29
36
|
var createTransformAPI = function createTransformAPI(storage) {
|
|
30
37
|
return new Proxy({}, {
|
|
31
38
|
get: function get(target, name) {
|
|
@@ -34,6 +41,7 @@ var createTransformAPI = function createTransformAPI(storage) {
|
|
|
34
41
|
return storage.middlewares.push(fn);
|
|
35
42
|
};
|
|
36
43
|
}
|
|
44
|
+
|
|
37
45
|
return function (fn) {
|
|
38
46
|
logger.warn('declare hook in default export is to be deprecated, use named export instead');
|
|
39
47
|
storage.hooks[name] = fn;
|
|
@@ -41,53 +49,67 @@ var createTransformAPI = function createTransformAPI(storage) {
|
|
|
41
49
|
}
|
|
42
50
|
});
|
|
43
51
|
};
|
|
52
|
+
|
|
44
53
|
var compose = function compose(middlewares) {
|
|
45
54
|
return function (ctx, resolve, reject) {
|
|
46
55
|
var i = 0;
|
|
56
|
+
|
|
47
57
|
var dispatch = function dispatch() {
|
|
48
58
|
var _handler, _handler$catch;
|
|
59
|
+
|
|
49
60
|
var handler = middlewares[i++];
|
|
61
|
+
|
|
50
62
|
if (!handler) {
|
|
51
63
|
return resolve();
|
|
52
64
|
}
|
|
65
|
+
|
|
53
66
|
return (_handler = handler(ctx, dispatch)) === null || _handler === void 0 ? void 0 : (_handler$catch = _handler["catch"]) === null || _handler$catch === void 0 ? void 0 : _handler$catch.call(_handler, reject);
|
|
54
67
|
};
|
|
68
|
+
|
|
55
69
|
return dispatch;
|
|
56
70
|
};
|
|
57
71
|
};
|
|
72
|
+
|
|
58
73
|
export default (function () {
|
|
59
74
|
return {
|
|
60
75
|
name: '@modern-js/plugin-server',
|
|
61
76
|
setup: function setup(api) {
|
|
62
77
|
var _api$useAppContext = api.useAppContext(),
|
|
63
|
-
|
|
64
|
-
|
|
78
|
+
appDirectory = _api$useAppContext.appDirectory,
|
|
79
|
+
distDirectory = _api$useAppContext.distDirectory;
|
|
80
|
+
|
|
65
81
|
var storage = new Storage();
|
|
66
82
|
var transformAPI = createTransformAPI(storage);
|
|
67
83
|
var pwd = isProd() ? distDirectory : appDirectory;
|
|
68
84
|
var webAppPath = path.resolve(pwd, SERVER_DIR, WEB_APP_NAME);
|
|
85
|
+
|
|
69
86
|
var loadMod = function loadMod() {
|
|
70
87
|
var mod = requireExistModule(webAppPath, {
|
|
71
88
|
interop: false
|
|
72
89
|
});
|
|
90
|
+
|
|
73
91
|
var defaultExports = mod["default"],
|
|
74
|
-
|
|
75
|
-
|
|
92
|
+
middleware = mod.middleware,
|
|
93
|
+
hooks = _objectWithoutProperties(mod, _excluded);
|
|
94
|
+
|
|
76
95
|
if (defaultExports) {
|
|
77
96
|
defaultExports(transformAPI);
|
|
78
|
-
}
|
|
97
|
+
} // named export hooks will overrides hooks in default export function
|
|
98
|
+
|
|
79
99
|
|
|
80
|
-
// named export hooks will overrides hooks in default export function
|
|
81
100
|
Object.values(HOOKS).forEach(function (key) {
|
|
82
101
|
var fn = hooks[key];
|
|
102
|
+
|
|
83
103
|
if (fn) {
|
|
84
104
|
storage.hooks[key] = fn;
|
|
85
105
|
}
|
|
86
106
|
});
|
|
107
|
+
|
|
87
108
|
if (middleware) {
|
|
88
109
|
storage.middlewares = [].concat(middleware);
|
|
89
110
|
}
|
|
90
111
|
};
|
|
112
|
+
|
|
91
113
|
return {
|
|
92
114
|
prepare: function prepare() {
|
|
93
115
|
loadMod();
|
|
@@ -106,12 +128,14 @@ export default (function () {
|
|
|
106
128
|
if (!storage.hooks.afterMatch) {
|
|
107
129
|
return next();
|
|
108
130
|
}
|
|
131
|
+
|
|
109
132
|
return storage.hooks.afterMatch(context, next);
|
|
110
133
|
},
|
|
111
134
|
afterRender: function afterRender(context, next) {
|
|
112
135
|
if (!storage.hooks.afterRender) {
|
|
113
136
|
return next();
|
|
114
137
|
}
|
|
138
|
+
|
|
115
139
|
return storage.hooks.afterRender(context, next);
|
|
116
140
|
},
|
|
117
141
|
prepareWebServer: function prepareWebServer(_ref2) {
|
|
@@ -125,6 +149,7 @@ export default (function () {
|
|
|
125
149
|
if (err) {
|
|
126
150
|
return reject(err);
|
|
127
151
|
}
|
|
152
|
+
|
|
128
153
|
return resolve();
|
|
129
154
|
});
|
|
130
155
|
var dispatch = factory(ctx, resolve, reject);
|
package/dist/types/cli.d.ts
CHANGED
package/dist/types/server.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"modern",
|
|
12
12
|
"modern.js"
|
|
13
13
|
],
|
|
14
|
-
"version": "0.0.0-next-
|
|
14
|
+
"version": "0.0.0-next-20221114142803",
|
|
15
15
|
"types": "./dist/types/server.d.ts",
|
|
16
16
|
"jsnext:source": "./src/server.ts",
|
|
17
17
|
"main": "./dist/js/node/server.js",
|
|
@@ -48,20 +48,20 @@
|
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
50
|
"@babel/runtime": "^7.18.0",
|
|
51
|
-
"@modern-js/babel-compiler": "0.0.0-next-
|
|
52
|
-
"@modern-js/server-utils": "0.0.0-next-
|
|
53
|
-
"@modern-js/utils": "0.0.0-next-
|
|
51
|
+
"@modern-js/babel-compiler": "0.0.0-next-20221114142803",
|
|
52
|
+
"@modern-js/server-utils": "0.0.0-next-20221114142803",
|
|
53
|
+
"@modern-js/utils": "0.0.0-next-20221114142803"
|
|
54
54
|
},
|
|
55
55
|
"devDependencies": {
|
|
56
|
-
"@modern-js/server-core": "0.0.0-next-
|
|
57
|
-
"@modern-js/core": "0.0.0-next-
|
|
58
|
-
"@scripts/build": "0.0.0-next-
|
|
59
|
-
"@modern-js/types": "0.0.0-next-
|
|
56
|
+
"@modern-js/server-core": "0.0.0-next-20221114142803",
|
|
57
|
+
"@modern-js/core": "0.0.0-next-20221114142803",
|
|
58
|
+
"@scripts/build": "0.0.0-next-20221114142803",
|
|
59
|
+
"@modern-js/types": "0.0.0-next-20221114142803",
|
|
60
60
|
"typescript": "^4",
|
|
61
61
|
"@types/jest": "^27",
|
|
62
62
|
"@types/node": "^14",
|
|
63
63
|
"jest": "^27",
|
|
64
|
-
"@scripts/jest-config": "0.0.0-next-
|
|
64
|
+
"@scripts/jest-config": "0.0.0-next-20221114142803"
|
|
65
65
|
},
|
|
66
66
|
"sideEffects": [
|
|
67
67
|
"*.css",
|