@modern-js/server 1.4.3 → 1.4.4-beta.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/dist/js/modern/dev-tools/mock/index.js +1 -1
- package/dist/js/modern/dev-tools/socket-server.js +2 -2
- package/dist/js/modern/index.js +1 -1
- package/dist/js/modern/server/{dev-server/dev-server-split.js → dev-server-split.js} +0 -0
- package/dist/js/modern/server/{dev-server/dev-server.js → dev-server.js} +15 -14
- package/dist/js/modern/server/index.js +15 -138
- package/dist/js/modern/{libs/render/cache/type.js → types.js} +0 -0
- package/dist/js/node/dev-tools/mock/index.js +2 -2
- package/dist/js/node/dev-tools/socket-server.js +2 -3
- package/dist/js/node/index.js +2 -2
- package/dist/js/node/server/{dev-server/dev-server-split.js → dev-server-split.js} +0 -0
- package/dist/js/node/server/{dev-server/dev-server.js → dev-server.js} +18 -24
- package/dist/js/node/server/index.js +17 -152
- package/dist/js/node/{libs/render/cache/type.js → types.js} +0 -0
- package/dist/types/dev-tools/babel/register.d.ts +1 -2
- package/dist/types/dev-tools/dev-server-plugin.d.ts +1 -1
- package/dist/types/dev-tools/launch-editor/index.d.ts +1 -2
- package/dist/types/dev-tools/mock/getMockData.d.ts +1 -2
- package/dist/types/dev-tools/mock/index.d.ts +1 -2
- package/dist/types/dev-tools/socket-server.d.ts +1 -1
- package/dist/types/index.d.ts +4 -5
- package/dist/types/server/{dev-server/dev-server-split.d.ts → dev-server-split.d.ts} +6 -5
- package/dist/types/server/{dev-server/dev-server.d.ts → dev-server.d.ts} +4 -3
- package/dist/types/server/index.d.ts +4 -19
- package/dist/types/types.d.ts +28 -0
- package/modern.config.js +5 -1
- package/package.json +11 -41
- package/tests/server.test.ts +10 -3
- package/dist/js/modern/constants.js +0 -26
- package/dist/js/modern/libs/context/context.js +0 -180
- package/dist/js/modern/libs/context/index.js +0 -3
- package/dist/js/modern/libs/hook-api/route.js +0 -39
- package/dist/js/modern/libs/hook-api/template.js +0 -61
- package/dist/js/modern/libs/metrics.js +0 -12
- package/dist/js/modern/libs/proxy.js +0 -33
- package/dist/js/modern/libs/render/cache/__tests__/cache.fun.test.js +0 -70
- package/dist/js/modern/libs/render/cache/__tests__/cache.test.js +0 -233
- package/dist/js/modern/libs/render/cache/__tests__/cacheable.js +0 -53
- package/dist/js/modern/libs/render/cache/__tests__/error-configuration.js +0 -35
- package/dist/js/modern/libs/render/cache/__tests__/matched-cache.js +0 -121
- package/dist/js/modern/libs/render/cache/index.js +0 -74
- package/dist/js/modern/libs/render/cache/page-caches/index.js +0 -9
- package/dist/js/modern/libs/render/cache/page-caches/lru.js +0 -35
- package/dist/js/modern/libs/render/cache/spr.js +0 -280
- package/dist/js/modern/libs/render/cache/util.js +0 -79
- package/dist/js/modern/libs/render/index.js +0 -65
- package/dist/js/modern/libs/render/modern/browser-list.js +0 -7
- package/dist/js/modern/libs/render/modern/index.js +0 -42
- package/dist/js/modern/libs/render/reader.js +0 -112
- package/dist/js/modern/libs/render/ssr.js +0 -58
- package/dist/js/modern/libs/render/static.js +0 -46
- package/dist/js/modern/libs/render/type.js +0 -7
- package/dist/js/modern/libs/route/index.js +0 -68
- package/dist/js/modern/libs/route/matcher.js +0 -94
- package/dist/js/modern/libs/route/route.js +0 -24
- package/dist/js/modern/libs/serve-file.js +0 -28
- package/dist/js/modern/server/dev-server/index.js +0 -2
- package/dist/js/modern/server/modern-server-split.js +0 -81
- package/dist/js/modern/server/modern-server.js +0 -584
- package/dist/js/modern/type.js +0 -1
- package/dist/js/modern/utils.js +0 -112
- package/dist/js/node/constants.js +0 -36
- package/dist/js/node/libs/context/context.js +0 -194
- package/dist/js/node/libs/context/index.js +0 -18
- package/dist/js/node/libs/hook-api/route.js +0 -48
- package/dist/js/node/libs/hook-api/template.js +0 -69
- package/dist/js/node/libs/metrics.js +0 -18
- package/dist/js/node/libs/proxy.js +0 -44
- package/dist/js/node/libs/render/cache/__tests__/cache.fun.test.js +0 -77
- package/dist/js/node/libs/render/cache/__tests__/cache.test.js +0 -238
- package/dist/js/node/libs/render/cache/__tests__/cacheable.js +0 -60
- package/dist/js/node/libs/render/cache/__tests__/error-configuration.js +0 -42
- package/dist/js/node/libs/render/cache/__tests__/matched-cache.js +0 -128
- package/dist/js/node/libs/render/cache/index.js +0 -86
- package/dist/js/node/libs/render/cache/page-caches/index.js +0 -17
- package/dist/js/node/libs/render/cache/page-caches/lru.js +0 -47
- package/dist/js/node/libs/render/cache/spr.js +0 -298
- package/dist/js/node/libs/render/cache/util.js +0 -105
- package/dist/js/node/libs/render/index.js +0 -91
- package/dist/js/node/libs/render/modern/browser-list.js +0 -14
- package/dist/js/node/libs/render/modern/index.js +0 -58
- package/dist/js/node/libs/render/reader.js +0 -139
- package/dist/js/node/libs/render/ssr.js +0 -76
- package/dist/js/node/libs/render/static.js +0 -62
- package/dist/js/node/libs/render/type.js +0 -14
- package/dist/js/node/libs/route/index.js +0 -83
- package/dist/js/node/libs/route/matcher.js +0 -108
- package/dist/js/node/libs/route/route.js +0 -33
- package/dist/js/node/libs/serve-file.js +0 -41
- package/dist/js/node/server/dev-server/index.js +0 -27
- package/dist/js/node/server/modern-server-split.js +0 -97
- package/dist/js/node/server/modern-server.js +0 -622
- package/dist/js/node/type.js +0 -5
- package/dist/js/node/utils.js +0 -143
- package/dist/types/constants.d.ts +0 -20
- package/dist/types/libs/context/context.d.ts +0 -61
- package/dist/types/libs/context/index.d.ts +0 -4
- package/dist/types/libs/hook-api/route.d.ts +0 -14
- package/dist/types/libs/hook-api/template.d.ts +0 -14
- package/dist/types/libs/metrics.d.ts +0 -3
- package/dist/types/libs/proxy.d.ts +0 -4
- package/dist/types/libs/render/cache/__tests__/cache.fun.test.d.ts +0 -1
- package/dist/types/libs/render/cache/__tests__/cache.test.d.ts +0 -1
- package/dist/types/libs/render/cache/__tests__/cacheable.d.ts +0 -62
- package/dist/types/libs/render/cache/__tests__/error-configuration.d.ts +0 -28
- package/dist/types/libs/render/cache/__tests__/matched-cache.d.ts +0 -124
- package/dist/types/libs/render/cache/index.d.ts +0 -6
- package/dist/types/libs/render/cache/page-caches/index.d.ts +0 -2
- package/dist/types/libs/render/cache/page-caches/lru.d.ts +0 -15
- package/dist/types/libs/render/cache/spr.d.ts +0 -24
- package/dist/types/libs/render/cache/type.d.ts +0 -48
- package/dist/types/libs/render/cache/util.d.ts +0 -17
- package/dist/types/libs/render/index.d.ts +0 -18
- package/dist/types/libs/render/modern/browser-list.d.ts +0 -1
- package/dist/types/libs/render/modern/index.d.ts +0 -3
- package/dist/types/libs/render/reader.d.ts +0 -18
- package/dist/types/libs/render/ssr.d.ts +0 -10
- package/dist/types/libs/render/static.d.ts +0 -3
- package/dist/types/libs/render/type.d.ts +0 -34
- package/dist/types/libs/route/index.d.ts +0 -15
- package/dist/types/libs/route/matcher.d.ts +0 -15
- package/dist/types/libs/route/route.d.ts +0 -14
- package/dist/types/libs/serve-file.d.ts +0 -8
- package/dist/types/server/dev-server/index.d.ts +0 -2
- package/dist/types/server/modern-server-split.d.ts +0 -26
- package/dist/types/server/modern-server.d.ts +0 -72
- package/dist/types/type.d.ts +0 -80
- package/dist/types/utils.d.ts +0 -19
- package/tests/context.test.ts +0 -52
- package/tests/fixtures/hosting-files/static/index.js +0 -1
- package/tests/fixtures/reader/index.ts +0 -3
- package/tests/fixtures/route-spec/dynamic.json +0 -13
- package/tests/fixtures/route-spec/index.json +0 -29
- package/tests/fixtures/ssr/bundle.js +0 -5
- package/tests/fixtures/static-dir/bar.html +0 -11
- package/tests/fixtures/static-dir/baz/index.html +0 -11
- package/tests/fixtures/static-dir/foo/index.html +0 -11
- package/tests/helper.ts +0 -8
- package/tests/hook.test.ts +0 -44
- package/tests/middleware.test.ts +0 -179
- package/tests/render.test.ts +0 -102
- package/tests/route.test.ts +0 -77
- package/tests/utils.test.ts +0 -106
|
@@ -1,68 +0,0 @@
|
|
|
1
|
-
import { RouteMatcher } from "./matcher";
|
|
2
|
-
export class RouteMatchManager {
|
|
3
|
-
constructor() {
|
|
4
|
-
this.matchers = void 0;
|
|
5
|
-
this.specs = [];
|
|
6
|
-
this.matchers = [];
|
|
7
|
-
} // get all routes matches pathname
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
filter(pathname) {
|
|
11
|
-
return this.matchers.reduce((matches, matcher) => {
|
|
12
|
-
if (matcher.matchUrlPath(pathname)) {
|
|
13
|
-
matches.push(matcher);
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
return matches;
|
|
17
|
-
}, []);
|
|
18
|
-
} // get best match from a set of matches
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
best(pathname, matches) {
|
|
22
|
-
let best;
|
|
23
|
-
let matchedLen = 0;
|
|
24
|
-
|
|
25
|
-
for (const match of matches) {
|
|
26
|
-
const len = match.matchLength(pathname);
|
|
27
|
-
|
|
28
|
-
if (len === null) {
|
|
29
|
-
continue;
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
if (len > matchedLen) {
|
|
33
|
-
best = match;
|
|
34
|
-
matchedLen = len;
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
return best;
|
|
39
|
-
} // reset routes matcher
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
reset(specs) {
|
|
43
|
-
this.specs = specs;
|
|
44
|
-
const matchers = specs.reduce((ms, spec) => {
|
|
45
|
-
ms.push(new RouteMatcher(spec));
|
|
46
|
-
return ms;
|
|
47
|
-
}, []);
|
|
48
|
-
this.matchers = matchers;
|
|
49
|
-
} // get best match from all matcher in manager
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
match(pathname) {
|
|
53
|
-
const matches = this.filter(pathname);
|
|
54
|
-
const best = this.best(pathname, matches);
|
|
55
|
-
return best;
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
matchEntry(entryname) {
|
|
59
|
-
return this.matchers.find(matcher => matcher.matchEntry(entryname));
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
getBundles() {
|
|
63
|
-
const bundles = this.specs.filter(route => route.isSSR).map(route => route.bundle);
|
|
64
|
-
return bundles;
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
}
|
|
68
|
-
export { RouteMatcher };
|
|
@@ -1,94 +0,0 @@
|
|
|
1
|
-
import { removeTailSlash } from '@modern-js/utils';
|
|
2
|
-
import { match, pathToRegexp } from 'path-to-regexp';
|
|
3
|
-
import { toPath } from "../../utils";
|
|
4
|
-
import { ModernRoute } from "./route"; // eslint-disable-next-line no-useless-escape
|
|
5
|
-
|
|
6
|
-
const regCharsDetector = /[^a-zA-Z\-_0-9\/\.]/;
|
|
7
|
-
export class RouteMatcher {
|
|
8
|
-
constructor(spec) {
|
|
9
|
-
this.spec = void 0;
|
|
10
|
-
this.urlPath = '';
|
|
11
|
-
this.urlMatcher = void 0;
|
|
12
|
-
this.urlReg = void 0;
|
|
13
|
-
this.spec = spec;
|
|
14
|
-
this.setupUrlPath();
|
|
15
|
-
} // generate modern route object
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
generate(url) {
|
|
19
|
-
const route = new ModernRoute(this.spec);
|
|
20
|
-
|
|
21
|
-
if (this.urlPath) {
|
|
22
|
-
const params = this.parseURLParams(url);
|
|
23
|
-
route.urlPath = toPath(route.urlPath, params);
|
|
24
|
-
route.params = params;
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
return route;
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
parseURLParams(pathname) {
|
|
31
|
-
if (!this.urlMatcher) {
|
|
32
|
-
return {};
|
|
33
|
-
} else {
|
|
34
|
-
const matchResult = this.urlMatcher(pathname);
|
|
35
|
-
return matchResult.params;
|
|
36
|
-
}
|
|
37
|
-
} // get match url length
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
matchLength(pathname) {
|
|
41
|
-
if (!this.urlReg) {
|
|
42
|
-
return this.urlPath.length;
|
|
43
|
-
} else {
|
|
44
|
-
var _result$;
|
|
45
|
-
|
|
46
|
-
const result = this.urlReg.exec(pathname);
|
|
47
|
-
return (result === null || result === void 0 ? void 0 : (_result$ = result[0]) === null || _result$ === void 0 ? void 0 : _result$.length) || null;
|
|
48
|
-
}
|
|
49
|
-
} // if match url path
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
matchUrlPath(requestUrl) {
|
|
53
|
-
const urlWithoutSlash = requestUrl.endsWith('/') && requestUrl !== '/' ? requestUrl.slice(0, -1) : requestUrl;
|
|
54
|
-
|
|
55
|
-
if (this.urlMatcher) {
|
|
56
|
-
return Boolean(this.urlMatcher(urlWithoutSlash));
|
|
57
|
-
} else {
|
|
58
|
-
if (urlWithoutSlash.startsWith(this.urlPath)) {
|
|
59
|
-
// avoid /abcd match /a
|
|
60
|
-
if (this.urlPath !== '/' && urlWithoutSlash.length > this.urlPath.length && !urlWithoutSlash.startsWith(`${this.urlPath}/`)) {
|
|
61
|
-
return false;
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
return true;
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
return false;
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
matchEntry(entryName) {
|
|
72
|
-
return this.spec.entryName === entryName;
|
|
73
|
-
} // compiler urlPath to regexp if necessary
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
setupUrlPath() {
|
|
77
|
-
const {
|
|
78
|
-
urlPath
|
|
79
|
-
} = this.spec;
|
|
80
|
-
this.urlPath = urlPath === '/' ? urlPath : removeTailSlash(urlPath);
|
|
81
|
-
const useReg = regCharsDetector.test(urlPath);
|
|
82
|
-
|
|
83
|
-
if (useReg) {
|
|
84
|
-
this.urlMatcher = match(urlPath, {
|
|
85
|
-
end: false,
|
|
86
|
-
decode: decodeURIComponent
|
|
87
|
-
});
|
|
88
|
-
this.urlReg = pathToRegexp(urlPath, [], {
|
|
89
|
-
end: false
|
|
90
|
-
});
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
|
-
|
|
94
|
-
}
|
|
@@ -1,24 +0,0 @@
|
|
|
1
|
-
export class ModernRoute {
|
|
2
|
-
constructor(routeSpec) {
|
|
3
|
-
var _routeSpec$enableMode;
|
|
4
|
-
|
|
5
|
-
this.entryName = void 0;
|
|
6
|
-
this.urlPath = void 0;
|
|
7
|
-
this.entryPath = void 0;
|
|
8
|
-
this.bundle = void 0;
|
|
9
|
-
this.isApi = void 0;
|
|
10
|
-
this.isSSR = void 0;
|
|
11
|
-
this.isSPA = void 0;
|
|
12
|
-
this.enableModernMode = void 0;
|
|
13
|
-
this.params = {};
|
|
14
|
-
this.entryName = routeSpec.entryName || '';
|
|
15
|
-
this.urlPath = routeSpec.urlPath;
|
|
16
|
-
this.entryPath = routeSpec.entryPath || '';
|
|
17
|
-
this.isSSR = routeSpec.isSSR || false;
|
|
18
|
-
this.isSPA = routeSpec.isSPA || false;
|
|
19
|
-
this.isApi = routeSpec.isApi || false;
|
|
20
|
-
this.bundle = routeSpec.bundle || '';
|
|
21
|
-
this.enableModernMode = (_routeSpec$enableMode = routeSpec.enableModernMode) !== null && _routeSpec$enableMode !== void 0 ? _routeSpec$enableMode : false;
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
}
|
|
@@ -1,28 +0,0 @@
|
|
|
1
|
-
// Todo 看看是不是能 fork 一份,即使命中也返回
|
|
2
|
-
import serve from 'serve-static';
|
|
3
|
-
import { isString, isRegExp } from '@modern-js/utils';
|
|
4
|
-
export const createStaticFileHandler = rules => // eslint-disable-next-line consistent-return
|
|
5
|
-
async (context, next) => {
|
|
6
|
-
const {
|
|
7
|
-
url: requestUrl,
|
|
8
|
-
req,
|
|
9
|
-
res
|
|
10
|
-
} = context;
|
|
11
|
-
const hitRule = rules.find(item => {
|
|
12
|
-
if (isString(item.path) && requestUrl.startsWith(item.path)) {
|
|
13
|
-
return true;
|
|
14
|
-
} else if (isRegExp(item.path) && item.path.test(requestUrl)) {
|
|
15
|
-
return true;
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
return false;
|
|
19
|
-
});
|
|
20
|
-
|
|
21
|
-
if (hitRule) {
|
|
22
|
-
serve(hitRule.target)(req, res, () => {
|
|
23
|
-
next();
|
|
24
|
-
});
|
|
25
|
-
} else {
|
|
26
|
-
return next();
|
|
27
|
-
}
|
|
28
|
-
};
|
|
@@ -1,81 +0,0 @@
|
|
|
1
|
-
import { ModernServer } from "./modern-server";
|
|
2
|
-
export class ModernSSRServer extends ModernServer {
|
|
3
|
-
// Todo should not invoke any route hook in modernSSRServer
|
|
4
|
-
async warmupSSRBundle() {// empty
|
|
5
|
-
}
|
|
6
|
-
|
|
7
|
-
verifyMatch(context, matched) {
|
|
8
|
-
if (matched.generate(context.url).isApi) {
|
|
9
|
-
this.render404(context);
|
|
10
|
-
}
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
prepareAPIHandler(_m, _) {
|
|
14
|
-
return null;
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
async prepareWebHandler(extension) {
|
|
18
|
-
return super.prepareWebHandler(extension);
|
|
19
|
-
} // protected filterRoutes(routes: ModernRouteInterface[]) {
|
|
20
|
-
// return routes.filter(route => route.entryName);
|
|
21
|
-
// }
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
async preServerInit() {// empty
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
}
|
|
28
|
-
export class ModernAPIServer extends ModernServer {
|
|
29
|
-
async emitRouteHook(_, _input) {// empty
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
async warmupSSRBundle() {// empty
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
prepareWebHandler(_) {
|
|
36
|
-
return null;
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
async prepareAPIHandler(mode, extension) {
|
|
40
|
-
return super.prepareAPIHandler(mode, extension);
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
filterRoutes(routes) {
|
|
44
|
-
return routes.filter(route => route.isApi);
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
async preServerInit() {// empty
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
}
|
|
51
|
-
export class ModernWebServer extends ModernServer {
|
|
52
|
-
async warmupSSRBundle() {// empty
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
async handleAPI(context) {
|
|
56
|
-
const {
|
|
57
|
-
proxyTarget
|
|
58
|
-
} = this;
|
|
59
|
-
|
|
60
|
-
if (!(proxyTarget !== null && proxyTarget !== void 0 && proxyTarget.api)) {
|
|
61
|
-
this.proxy();
|
|
62
|
-
} else {
|
|
63
|
-
this.render404(context);
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
async handleWeb(context, route) {
|
|
68
|
-
const {
|
|
69
|
-
proxyTarget
|
|
70
|
-
} = this;
|
|
71
|
-
|
|
72
|
-
if (route.isSSR && proxyTarget !== null && proxyTarget !== void 0 && proxyTarget.ssr) {
|
|
73
|
-
return this.proxy();
|
|
74
|
-
} else {
|
|
75
|
-
// if no proxyTarget but access web server, degradation to csr
|
|
76
|
-
route.isSSR = false;
|
|
77
|
-
return super.handleWeb(context, route);
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
}
|