@modern-js/server 2.4.1-beta.0 → 2.5.0
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 +23 -4
- package/dist/{js/node → cjs}/constants.js +0 -0
- package/dist/{js/node → cjs}/dev-tools/dev-middleware/hmr-client/createSocketUrl.js +0 -0
- package/dist/{js/node → cjs}/dev-tools/dev-middleware/hmr-client/index.js +0 -0
- package/dist/{js/node → cjs}/dev-tools/dev-middleware/index.js +6 -39
- package/dist/{js/node → cjs}/dev-tools/dev-middleware/socket-server.js +0 -0
- package/dist/{js/node → cjs}/dev-tools/https/index.js +4 -24
- package/dist/{js/node → cjs}/dev-tools/mock/getMockData.js +9 -53
- package/dist/{js/node → cjs}/dev-tools/mock/index.js +19 -23
- package/dist/{js/node → cjs}/dev-tools/register/index.js +10 -23
- package/dist/{js/node → cjs}/dev-tools/watcher/dependency-tree.js +0 -0
- package/dist/{js/node → cjs}/dev-tools/watcher/index.js +7 -16
- package/dist/{js/node → cjs}/dev-tools/watcher/stats-cache.js +0 -0
- package/dist/{js/node → cjs}/index.js +0 -0
- package/dist/{js/node → cjs}/server/dev-server.js +92 -135
- package/dist/{js/node → cjs}/server/index.js +0 -0
- package/dist/{js/node → cjs}/types.js +0 -0
- package/dist/{js/treeshaking → esm}/constants.js +0 -0
- package/dist/{js/treeshaking → esm}/dev-tools/dev-middleware/hmr-client/createSocketUrl.js +0 -0
- package/dist/{js/treeshaking → esm}/dev-tools/dev-middleware/hmr-client/index.js +0 -0
- package/dist/{js/treeshaking → esm}/dev-tools/dev-middleware/index.js +0 -0
- package/dist/{js/treeshaking → esm}/dev-tools/dev-middleware/socket-server.js +0 -0
- package/dist/{js/treeshaking → esm}/dev-tools/https/index.js +0 -0
- package/dist/{js/treeshaking → esm}/dev-tools/mock/getMockData.js +1 -10
- package/dist/{js/treeshaking → esm}/dev-tools/mock/index.js +19 -3
- package/dist/{js/treeshaking → esm}/dev-tools/register/index.js +1 -0
- package/dist/{js/treeshaking → esm}/dev-tools/watcher/dependency-tree.js +0 -0
- package/dist/{js/treeshaking → esm}/dev-tools/watcher/index.js +0 -0
- package/dist/{js/treeshaking → esm}/dev-tools/watcher/stats-cache.js +0 -0
- package/dist/{js/treeshaking → esm}/index.js +0 -0
- package/dist/{js/treeshaking → esm}/server/dev-server.js +1 -0
- package/dist/{js/treeshaking → esm}/server/index.js +0 -0
- package/dist/{js/treeshaking → esm}/types.js +0 -0
- package/dist/{js/modern → esm-node}/constants.js +0 -0
- package/dist/{js/modern → esm-node}/dev-tools/dev-middleware/hmr-client/createSocketUrl.js +0 -0
- package/dist/{js/modern → esm-node}/dev-tools/dev-middleware/hmr-client/index.js +0 -0
- package/dist/{js/modern → esm-node}/dev-tools/dev-middleware/index.js +6 -41
- package/dist/{js/modern → esm-node}/dev-tools/dev-middleware/socket-server.js +0 -0
- package/dist/{js/modern → esm-node}/dev-tools/https/index.js +4 -24
- package/dist/esm-node/dev-tools/mock/getMockData.js +68 -0
- package/dist/{js/modern → esm-node}/dev-tools/mock/index.js +20 -24
- package/dist/{js/modern → esm-node}/dev-tools/register/index.js +10 -25
- package/dist/{js/modern → esm-node}/dev-tools/watcher/dependency-tree.js +0 -0
- package/dist/{js/modern → esm-node}/dev-tools/watcher/index.js +7 -18
- package/dist/{js/modern → esm-node}/dev-tools/watcher/stats-cache.js +0 -0
- package/dist/{js/modern → esm-node}/index.js +0 -0
- package/dist/esm-node/server/dev-server.js +247 -0
- package/dist/{js/modern → esm-node}/server/index.js +0 -0
- package/dist/{js/modern → esm-node}/types.js +0 -0
- package/dist/types/dev-tools/mock/getMockData.d.ts +1 -1
- package/package.json +13 -14
- package/dist/js/modern/dev-tools/mock/getMockData.js +0 -114
- package/dist/js/modern/server/dev-server.js +0 -293
|
@@ -1,293 +0,0 @@
|
|
|
1
|
-
var __defProp = Object.defineProperty;
|
|
2
|
-
var __defProps = Object.defineProperties;
|
|
3
|
-
var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
|
|
4
|
-
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
5
|
-
var __getProtoOf = Object.getPrototypeOf;
|
|
6
|
-
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
7
|
-
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
8
|
-
var __reflectGet = Reflect.get;
|
|
9
|
-
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
10
|
-
var __spreadValues = (a, b) => {
|
|
11
|
-
for (var prop in b || (b = {}))
|
|
12
|
-
if (__hasOwnProp.call(b, prop))
|
|
13
|
-
__defNormalProp(a, prop, b[prop]);
|
|
14
|
-
if (__getOwnPropSymbols)
|
|
15
|
-
for (var prop of __getOwnPropSymbols(b)) {
|
|
16
|
-
if (__propIsEnum.call(b, prop))
|
|
17
|
-
__defNormalProp(a, prop, b[prop]);
|
|
18
|
-
}
|
|
19
|
-
return a;
|
|
20
|
-
};
|
|
21
|
-
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
22
|
-
var __superGet = (cls, obj, key) => __reflectGet(__getProtoOf(cls), key, obj);
|
|
23
|
-
var __async = (__this, __arguments, generator) => {
|
|
24
|
-
return new Promise((resolve, reject) => {
|
|
25
|
-
var fulfilled = (value) => {
|
|
26
|
-
try {
|
|
27
|
-
step(generator.next(value));
|
|
28
|
-
} catch (e) {
|
|
29
|
-
reject(e);
|
|
30
|
-
}
|
|
31
|
-
};
|
|
32
|
-
var rejected = (value) => {
|
|
33
|
-
try {
|
|
34
|
-
step(generator.throw(value));
|
|
35
|
-
} catch (e) {
|
|
36
|
-
reject(e);
|
|
37
|
-
}
|
|
38
|
-
};
|
|
39
|
-
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
40
|
-
step((generator = generator.apply(__this, __arguments)).next());
|
|
41
|
-
});
|
|
42
|
-
};
|
|
43
|
-
import { createServer } from "http";
|
|
44
|
-
import path from "path";
|
|
45
|
-
import { createServer as createHttpsServer } from "https";
|
|
46
|
-
import {
|
|
47
|
-
API_DIR,
|
|
48
|
-
SERVER_BUNDLE_DIRECTORY,
|
|
49
|
-
SERVER_DIR,
|
|
50
|
-
SHARED_DIR
|
|
51
|
-
} from "@modern-js/utils";
|
|
52
|
-
import {
|
|
53
|
-
createProxyHandler,
|
|
54
|
-
ModernServer,
|
|
55
|
-
AGGRED_DIR
|
|
56
|
-
} from "@modern-js/prod-server";
|
|
57
|
-
import { LOADABLE_STATS_FILE } from "@modern-js/utils/constants";
|
|
58
|
-
import { getDefaultDevOptions } from "../constants";
|
|
59
|
-
import { createMockHandler } from "../dev-tools/mock";
|
|
60
|
-
import { enableRegister } from "../dev-tools/register";
|
|
61
|
-
import Watcher, { mergeWatchOptions } from "../dev-tools/watcher";
|
|
62
|
-
import DevMiddleware from "../dev-tools/dev-middleware";
|
|
63
|
-
class ModernDevServer extends ModernServer {
|
|
64
|
-
constructor(options) {
|
|
65
|
-
super(options);
|
|
66
|
-
this.mockHandler = null;
|
|
67
|
-
this.workDir = this.pwd;
|
|
68
|
-
this.dev = this.getDevOptions(options);
|
|
69
|
-
this.devMiddleware = new DevMiddleware({
|
|
70
|
-
dev: this.dev,
|
|
71
|
-
devMiddleware: options.devMiddleware
|
|
72
|
-
});
|
|
73
|
-
enableRegister(this.pwd, this.conf);
|
|
74
|
-
}
|
|
75
|
-
getDevOptions(options) {
|
|
76
|
-
const devOptions = typeof options.dev === "boolean" ? {} : options.dev;
|
|
77
|
-
const defaultOptions = getDefaultDevOptions();
|
|
78
|
-
return __spreadProps(__spreadValues(__spreadValues({}, defaultOptions), devOptions), {
|
|
79
|
-
client: __spreadValues(__spreadValues({}, defaultOptions.client), devOptions == null ? void 0 : devOptions.client)
|
|
80
|
-
});
|
|
81
|
-
}
|
|
82
|
-
addMiddlewareHandler(handlers) {
|
|
83
|
-
handlers.forEach((handler) => {
|
|
84
|
-
this.addHandler((ctx, next) => {
|
|
85
|
-
const { req, res } = ctx;
|
|
86
|
-
return handler(req, res, next);
|
|
87
|
-
});
|
|
88
|
-
});
|
|
89
|
-
}
|
|
90
|
-
applySetupMiddlewares() {
|
|
91
|
-
const setupMiddlewares = this.dev.setupMiddlewares || [];
|
|
92
|
-
const serverOptions = {
|
|
93
|
-
sockWrite: (type, data) => this.devMiddleware.sockWrite(type, data)
|
|
94
|
-
};
|
|
95
|
-
const befores = [];
|
|
96
|
-
const afters = [];
|
|
97
|
-
setupMiddlewares.forEach((handler) => {
|
|
98
|
-
handler(
|
|
99
|
-
{
|
|
100
|
-
unshift: (...handlers) => befores.unshift(...handlers),
|
|
101
|
-
push: (...handlers) => afters.push(...handlers)
|
|
102
|
-
},
|
|
103
|
-
serverOptions
|
|
104
|
-
);
|
|
105
|
-
});
|
|
106
|
-
return { befores, afters };
|
|
107
|
-
}
|
|
108
|
-
onInit(runner, app) {
|
|
109
|
-
return __async(this, null, function* () {
|
|
110
|
-
this.runner = runner;
|
|
111
|
-
const { dev } = this;
|
|
112
|
-
const { befores, afters } = this.applySetupMiddlewares();
|
|
113
|
-
const beforeHandlers = yield this.setupBeforeDevMiddleware();
|
|
114
|
-
this.addMiddlewareHandler([...beforeHandlers, ...befores]);
|
|
115
|
-
yield this.applyDefaultMiddlewares(app);
|
|
116
|
-
const afterHandlers = yield this.setupAfterDevMiddleware();
|
|
117
|
-
this.addMiddlewareHandler([...afters, ...afterHandlers]);
|
|
118
|
-
yield __superGet(ModernDevServer.prototype, this, "onInit").call(this, runner, app);
|
|
119
|
-
if (dev.watch) {
|
|
120
|
-
this.startWatcher();
|
|
121
|
-
app.on("close", () => __async(this, null, function* () {
|
|
122
|
-
var _a;
|
|
123
|
-
yield (_a = this.watcher) == null ? void 0 : _a.close();
|
|
124
|
-
}));
|
|
125
|
-
}
|
|
126
|
-
});
|
|
127
|
-
}
|
|
128
|
-
applyDefaultMiddlewares(app) {
|
|
129
|
-
return __async(this, null, function* () {
|
|
130
|
-
const { pwd, dev, devMiddleware } = this;
|
|
131
|
-
this.addHandler((ctx, next) => {
|
|
132
|
-
ctx.res.setHeader("Access-Control-Allow-Origin", "*");
|
|
133
|
-
if (ctx.path.includes("hot-update")) {
|
|
134
|
-
ctx.res.setHeader("Access-Control-Allow-Credentials", "false");
|
|
135
|
-
}
|
|
136
|
-
const confHeaders = dev.headers;
|
|
137
|
-
if (confHeaders) {
|
|
138
|
-
for (const [key, value] of Object.entries(confHeaders)) {
|
|
139
|
-
ctx.res.setHeader(key, value);
|
|
140
|
-
}
|
|
141
|
-
}
|
|
142
|
-
next();
|
|
143
|
-
});
|
|
144
|
-
this.mockHandler = createMockHandler({ pwd });
|
|
145
|
-
this.addHandler((ctx, next) => {
|
|
146
|
-
if (this.mockHandler) {
|
|
147
|
-
this.mockHandler(ctx, next);
|
|
148
|
-
} else {
|
|
149
|
-
next();
|
|
150
|
-
}
|
|
151
|
-
});
|
|
152
|
-
const proxyHandlers = createProxyHandler(dev.proxy);
|
|
153
|
-
if (proxyHandlers) {
|
|
154
|
-
proxyHandlers.forEach((handler) => {
|
|
155
|
-
this.addHandler(handler);
|
|
156
|
-
});
|
|
157
|
-
}
|
|
158
|
-
devMiddleware.init(app);
|
|
159
|
-
devMiddleware.on("change", (stats) => {
|
|
160
|
-
if (stats.toJson({ all: false }).name === "client") {
|
|
161
|
-
this.onRepack({ routes: this.getRoutes() });
|
|
162
|
-
}
|
|
163
|
-
});
|
|
164
|
-
this.addHandler((ctx, next) => {
|
|
165
|
-
const { req, res } = ctx;
|
|
166
|
-
if (devMiddleware.middleware) {
|
|
167
|
-
devMiddleware.middleware(req, res, next);
|
|
168
|
-
} else {
|
|
169
|
-
next();
|
|
170
|
-
}
|
|
171
|
-
});
|
|
172
|
-
if (dev.historyApiFallback) {
|
|
173
|
-
const { default: connectHistoryApiFallback } = yield import("connect-history-api-fallback");
|
|
174
|
-
const historyApiFallbackMiddleware = connectHistoryApiFallback(
|
|
175
|
-
typeof dev.historyApiFallback === "boolean" ? {} : dev.historyApiFallback
|
|
176
|
-
);
|
|
177
|
-
this.addHandler(
|
|
178
|
-
(ctx, next) => historyApiFallbackMiddleware(ctx.req, ctx.res, next)
|
|
179
|
-
);
|
|
180
|
-
}
|
|
181
|
-
});
|
|
182
|
-
}
|
|
183
|
-
onRepack(options = {}) {
|
|
184
|
-
if (Array.isArray(options.routes)) {
|
|
185
|
-
this.router.reset(this.filterRoutes(options.routes));
|
|
186
|
-
}
|
|
187
|
-
this.cleanSSRCache();
|
|
188
|
-
this.reader.updateFile();
|
|
189
|
-
super.onRepack(options);
|
|
190
|
-
}
|
|
191
|
-
createHTTPServer(handler) {
|
|
192
|
-
return __async(this, null, function* () {
|
|
193
|
-
const { dev } = this;
|
|
194
|
-
const devHttpsOption = typeof dev === "object" && dev.https;
|
|
195
|
-
if (devHttpsOption) {
|
|
196
|
-
const { genHttpsOptions } = require("../dev-tools/https");
|
|
197
|
-
const httpsOptions = yield genHttpsOptions(devHttpsOption, this.pwd);
|
|
198
|
-
return createHttpsServer(httpsOptions, handler);
|
|
199
|
-
} else {
|
|
200
|
-
return createServer(handler);
|
|
201
|
-
}
|
|
202
|
-
});
|
|
203
|
-
}
|
|
204
|
-
warmupSSRBundle() {
|
|
205
|
-
}
|
|
206
|
-
onServerChange({
|
|
207
|
-
filepath,
|
|
208
|
-
event
|
|
209
|
-
}) {
|
|
210
|
-
const { pwd } = this;
|
|
211
|
-
const { mock } = AGGRED_DIR;
|
|
212
|
-
const mockPath = path.normalize(path.join(pwd, mock));
|
|
213
|
-
this.runner.reset();
|
|
214
|
-
if (filepath.startsWith(mockPath)) {
|
|
215
|
-
this.mockHandler = createMockHandler({ pwd });
|
|
216
|
-
} else {
|
|
217
|
-
try {
|
|
218
|
-
const success = this.runner.onApiChange([
|
|
219
|
-
{ filename: filepath, event }
|
|
220
|
-
]);
|
|
221
|
-
if (success !== true) {
|
|
222
|
-
super.onServerChange({ filepath });
|
|
223
|
-
}
|
|
224
|
-
} catch (e) {
|
|
225
|
-
this.logger.error(e);
|
|
226
|
-
}
|
|
227
|
-
}
|
|
228
|
-
}
|
|
229
|
-
createContext(req, res) {
|
|
230
|
-
return super.createContext(req, res, { etag: true });
|
|
231
|
-
}
|
|
232
|
-
setupBeforeDevMiddleware() {
|
|
233
|
-
return __async(this, null, function* () {
|
|
234
|
-
const { runner, conf, dev } = this;
|
|
235
|
-
const setupMids = dev.before || [];
|
|
236
|
-
const pluginMids = yield runner.beforeDevServer(conf);
|
|
237
|
-
return [...setupMids, ...pluginMids].flat();
|
|
238
|
-
});
|
|
239
|
-
}
|
|
240
|
-
setupAfterDevMiddleware() {
|
|
241
|
-
return __async(this, null, function* () {
|
|
242
|
-
const { runner, conf, dev } = this;
|
|
243
|
-
const setupMids = dev.after || [];
|
|
244
|
-
const pluginMids = yield runner.afterDevServer(conf);
|
|
245
|
-
return [...pluginMids, ...setupMids].flat();
|
|
246
|
-
});
|
|
247
|
-
}
|
|
248
|
-
cleanSSRCache() {
|
|
249
|
-
const { distDir } = this;
|
|
250
|
-
const bundles = this.router.getBundles();
|
|
251
|
-
bundles.forEach((bundle) => {
|
|
252
|
-
const filepath = path.join(distDir, bundle);
|
|
253
|
-
if (require.cache[filepath]) {
|
|
254
|
-
delete require.cache[filepath];
|
|
255
|
-
}
|
|
256
|
-
});
|
|
257
|
-
const loadable = path.join(distDir, LOADABLE_STATS_FILE);
|
|
258
|
-
if (require.cache[loadable]) {
|
|
259
|
-
delete require.cache[loadable];
|
|
260
|
-
}
|
|
261
|
-
}
|
|
262
|
-
startWatcher() {
|
|
263
|
-
var _a;
|
|
264
|
-
const { pwd, distDir } = this;
|
|
265
|
-
const { mock } = AGGRED_DIR;
|
|
266
|
-
const defaultWatched = [
|
|
267
|
-
`${mock}/**/*`,
|
|
268
|
-
`${SERVER_DIR}/**/*`,
|
|
269
|
-
`${API_DIR}/**`,
|
|
270
|
-
`${SHARED_DIR}/**/*`,
|
|
271
|
-
`${distDir}/${SERVER_BUNDLE_DIRECTORY}/*-server-loaders.js`
|
|
272
|
-
];
|
|
273
|
-
const watchOptions = mergeWatchOptions((_a = this.conf.server) == null ? void 0 : _a.watchOptions);
|
|
274
|
-
const defaultWatchedPaths = defaultWatched.map((p) => {
|
|
275
|
-
const finalPath = path.isAbsolute(p) ? p : path.join(pwd, p);
|
|
276
|
-
return path.normalize(finalPath);
|
|
277
|
-
});
|
|
278
|
-
const watcher = new Watcher();
|
|
279
|
-
watcher.createDepTree();
|
|
280
|
-
watcher.listen(defaultWatchedPaths, watchOptions, (filepath, event) => {
|
|
281
|
-
watcher.updateDepTree();
|
|
282
|
-
watcher.cleanDepCache(filepath);
|
|
283
|
-
this.onServerChange({
|
|
284
|
-
filepath,
|
|
285
|
-
event
|
|
286
|
-
});
|
|
287
|
-
});
|
|
288
|
-
this.watcher = watcher;
|
|
289
|
-
}
|
|
290
|
-
}
|
|
291
|
-
export {
|
|
292
|
-
ModernDevServer
|
|
293
|
-
};
|