@modern-js/server 1.4.3 → 1.4.5
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,76 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.render = void 0;
|
|
7
|
-
|
|
8
|
-
var _path = _interopRequireDefault(require("path"));
|
|
9
|
-
|
|
10
|
-
var _utils = require("@modern-js/utils");
|
|
11
|
-
|
|
12
|
-
var _mimeTypes = _interopRequireDefault(require("mime-types"));
|
|
13
|
-
|
|
14
|
-
var _cookie = _interopRequireDefault(require("cookie"));
|
|
15
|
-
|
|
16
|
-
var _cache = _interopRequireDefault(require("./cache"));
|
|
17
|
-
|
|
18
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
19
|
-
|
|
20
|
-
const render = async (ctx, renderOptions, runner) => {
|
|
21
|
-
const {
|
|
22
|
-
urlPath,
|
|
23
|
-
bundle,
|
|
24
|
-
distDir,
|
|
25
|
-
template,
|
|
26
|
-
entryName,
|
|
27
|
-
staticGenerate
|
|
28
|
-
} = renderOptions;
|
|
29
|
-
|
|
30
|
-
const bundleJS = _path.default.join(distDir, bundle);
|
|
31
|
-
|
|
32
|
-
const context = {
|
|
33
|
-
request: {
|
|
34
|
-
baseUrl: urlPath,
|
|
35
|
-
params: ctx.params,
|
|
36
|
-
pathname: ctx.path,
|
|
37
|
-
host: ctx.host,
|
|
38
|
-
query: ctx.query,
|
|
39
|
-
url: ctx.href,
|
|
40
|
-
cookieMap: _cookie.default.parse(ctx.headers.cookie || ''),
|
|
41
|
-
headers: ctx.headers
|
|
42
|
-
},
|
|
43
|
-
redirection: {},
|
|
44
|
-
template,
|
|
45
|
-
entryName,
|
|
46
|
-
distDir,
|
|
47
|
-
staticGenerate,
|
|
48
|
-
logger: ctx.logger,
|
|
49
|
-
metrics: ctx.metrics
|
|
50
|
-
};
|
|
51
|
-
runner.extendSSRContext(context);
|
|
52
|
-
|
|
53
|
-
const serverRender = require(bundleJS)[_utils.SERVER_RENDER_FUNCTION_NAME];
|
|
54
|
-
|
|
55
|
-
const html = await (0, _cache.default)(serverRender, ctx)(context);
|
|
56
|
-
const {
|
|
57
|
-
url,
|
|
58
|
-
status = 302
|
|
59
|
-
} = context.redirection;
|
|
60
|
-
|
|
61
|
-
if (url) {
|
|
62
|
-
return {
|
|
63
|
-
content: url,
|
|
64
|
-
contentType: '',
|
|
65
|
-
statusCode: status,
|
|
66
|
-
redirect: true
|
|
67
|
-
};
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
return {
|
|
71
|
-
content: html,
|
|
72
|
-
contentType: _mimeTypes.default.contentType('html')
|
|
73
|
-
};
|
|
74
|
-
};
|
|
75
|
-
|
|
76
|
-
exports.render = render;
|
|
@@ -1,62 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.handleDirectory = handleDirectory;
|
|
7
|
-
|
|
8
|
-
var _path = _interopRequireDefault(require("path"));
|
|
9
|
-
|
|
10
|
-
var _mimeTypes = _interopRequireDefault(require("mime-types"));
|
|
11
|
-
|
|
12
|
-
var _reader = require("./reader");
|
|
13
|
-
|
|
14
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
15
|
-
|
|
16
|
-
async function handleDirectory(ctx, entryPath, urlPath) {
|
|
17
|
-
const {
|
|
18
|
-
path: pathname
|
|
19
|
-
} = ctx;
|
|
20
|
-
|
|
21
|
-
const filepath = _path.default.join(entryPath, trimLeft(pathname, urlPath)); // If can match accurately, always return the one that matches accurately
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
let content = await (0, _reader.readFile)(filepath);
|
|
25
|
-
|
|
26
|
-
let contentType = _mimeTypes.default.contentType(_path.default.extname(filepath) || ''); // automatic addressing
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
if (!content) {
|
|
30
|
-
if (pathname.endsWith('/')) {
|
|
31
|
-
content = await (0, _reader.readFile)(`${filepath}index.html`);
|
|
32
|
-
} else if (!pathname.includes('.')) {
|
|
33
|
-
content = await (0, _reader.readFile)(`${filepath}.html`);
|
|
34
|
-
|
|
35
|
-
if (!content) {
|
|
36
|
-
content = await (0, _reader.readFile)(`${filepath}/index.html`);
|
|
37
|
-
}
|
|
38
|
-
} // set content-type as html
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
if (content) {
|
|
42
|
-
contentType = _mimeTypes.default.contentType('html');
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
if (!content) {
|
|
47
|
-
return null;
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
return {
|
|
51
|
-
content,
|
|
52
|
-
contentType: contentType || ''
|
|
53
|
-
};
|
|
54
|
-
}
|
|
55
|
-
|
|
56
|
-
const trimLeft = (str, prefix) => {
|
|
57
|
-
if (str.startsWith(prefix)) {
|
|
58
|
-
return str.substring(prefix.length);
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
return str;
|
|
62
|
-
};
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.RenderLevel = void 0;
|
|
7
|
-
let RenderLevel;
|
|
8
|
-
exports.RenderLevel = RenderLevel;
|
|
9
|
-
|
|
10
|
-
(function (RenderLevel) {
|
|
11
|
-
RenderLevel[RenderLevel["CLIENT_RENDER"] = 0] = "CLIENT_RENDER";
|
|
12
|
-
RenderLevel[RenderLevel["SERVER_PREFETCH"] = 1] = "SERVER_PREFETCH";
|
|
13
|
-
RenderLevel[RenderLevel["SERVER_RENDER"] = 2] = "SERVER_RENDER";
|
|
14
|
-
})(RenderLevel || (exports.RenderLevel = RenderLevel = {}));
|
|
@@ -1,83 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.RouteMatchManager = void 0;
|
|
7
|
-
Object.defineProperty(exports, "RouteMatcher", {
|
|
8
|
-
enumerable: true,
|
|
9
|
-
get: function () {
|
|
10
|
-
return _matcher.RouteMatcher;
|
|
11
|
-
}
|
|
12
|
-
});
|
|
13
|
-
|
|
14
|
-
var _matcher = require("./matcher");
|
|
15
|
-
|
|
16
|
-
class RouteMatchManager {
|
|
17
|
-
constructor() {
|
|
18
|
-
this.matchers = void 0;
|
|
19
|
-
this.specs = [];
|
|
20
|
-
this.matchers = [];
|
|
21
|
-
} // get all routes matches pathname
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
filter(pathname) {
|
|
25
|
-
return this.matchers.reduce((matches, matcher) => {
|
|
26
|
-
if (matcher.matchUrlPath(pathname)) {
|
|
27
|
-
matches.push(matcher);
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
return matches;
|
|
31
|
-
}, []);
|
|
32
|
-
} // get best match from a set of matches
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
best(pathname, matches) {
|
|
36
|
-
let best;
|
|
37
|
-
let matchedLen = 0;
|
|
38
|
-
|
|
39
|
-
for (const match of matches) {
|
|
40
|
-
const len = match.matchLength(pathname);
|
|
41
|
-
|
|
42
|
-
if (len === null) {
|
|
43
|
-
continue;
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
if (len > matchedLen) {
|
|
47
|
-
best = match;
|
|
48
|
-
matchedLen = len;
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
return best;
|
|
53
|
-
} // reset routes matcher
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
reset(specs) {
|
|
57
|
-
this.specs = specs;
|
|
58
|
-
const matchers = specs.reduce((ms, spec) => {
|
|
59
|
-
ms.push(new _matcher.RouteMatcher(spec));
|
|
60
|
-
return ms;
|
|
61
|
-
}, []);
|
|
62
|
-
this.matchers = matchers;
|
|
63
|
-
} // get best match from all matcher in manager
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
match(pathname) {
|
|
67
|
-
const matches = this.filter(pathname);
|
|
68
|
-
const best = this.best(pathname, matches);
|
|
69
|
-
return best;
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
matchEntry(entryname) {
|
|
73
|
-
return this.matchers.find(matcher => matcher.matchEntry(entryname));
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
getBundles() {
|
|
77
|
-
const bundles = this.specs.filter(route => route.isSSR).map(route => route.bundle);
|
|
78
|
-
return bundles;
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
exports.RouteMatchManager = RouteMatchManager;
|
|
@@ -1,108 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.RouteMatcher = void 0;
|
|
7
|
-
|
|
8
|
-
var _utils = require("@modern-js/utils");
|
|
9
|
-
|
|
10
|
-
var _pathToRegexp = require("path-to-regexp");
|
|
11
|
-
|
|
12
|
-
var _utils2 = require("../../utils");
|
|
13
|
-
|
|
14
|
-
var _route = require("./route");
|
|
15
|
-
|
|
16
|
-
// eslint-disable-next-line no-useless-escape
|
|
17
|
-
const regCharsDetector = /[^a-zA-Z\-_0-9\/\.]/;
|
|
18
|
-
|
|
19
|
-
class RouteMatcher {
|
|
20
|
-
constructor(spec) {
|
|
21
|
-
this.spec = void 0;
|
|
22
|
-
this.urlPath = '';
|
|
23
|
-
this.urlMatcher = void 0;
|
|
24
|
-
this.urlReg = void 0;
|
|
25
|
-
this.spec = spec;
|
|
26
|
-
this.setupUrlPath();
|
|
27
|
-
} // generate modern route object
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
generate(url) {
|
|
31
|
-
const route = new _route.ModernRoute(this.spec);
|
|
32
|
-
|
|
33
|
-
if (this.urlPath) {
|
|
34
|
-
const params = this.parseURLParams(url);
|
|
35
|
-
route.urlPath = (0, _utils2.toPath)(route.urlPath, params);
|
|
36
|
-
route.params = params;
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
return route;
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
parseURLParams(pathname) {
|
|
43
|
-
if (!this.urlMatcher) {
|
|
44
|
-
return {};
|
|
45
|
-
} else {
|
|
46
|
-
const matchResult = this.urlMatcher(pathname);
|
|
47
|
-
return matchResult.params;
|
|
48
|
-
}
|
|
49
|
-
} // get match url length
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
matchLength(pathname) {
|
|
53
|
-
if (!this.urlReg) {
|
|
54
|
-
return this.urlPath.length;
|
|
55
|
-
} else {
|
|
56
|
-
var _result$;
|
|
57
|
-
|
|
58
|
-
const result = this.urlReg.exec(pathname);
|
|
59
|
-
return (result === null || result === void 0 ? void 0 : (_result$ = result[0]) === null || _result$ === void 0 ? void 0 : _result$.length) || null;
|
|
60
|
-
}
|
|
61
|
-
} // if match url path
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
matchUrlPath(requestUrl) {
|
|
65
|
-
const urlWithoutSlash = requestUrl.endsWith('/') && requestUrl !== '/' ? requestUrl.slice(0, -1) : requestUrl;
|
|
66
|
-
|
|
67
|
-
if (this.urlMatcher) {
|
|
68
|
-
return Boolean(this.urlMatcher(urlWithoutSlash));
|
|
69
|
-
} else {
|
|
70
|
-
if (urlWithoutSlash.startsWith(this.urlPath)) {
|
|
71
|
-
// avoid /abcd match /a
|
|
72
|
-
if (this.urlPath !== '/' && urlWithoutSlash.length > this.urlPath.length && !urlWithoutSlash.startsWith(`${this.urlPath}/`)) {
|
|
73
|
-
return false;
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
return true;
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
return false;
|
|
80
|
-
}
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
matchEntry(entryName) {
|
|
84
|
-
return this.spec.entryName === entryName;
|
|
85
|
-
} // compiler urlPath to regexp if necessary
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
setupUrlPath() {
|
|
89
|
-
const {
|
|
90
|
-
urlPath
|
|
91
|
-
} = this.spec;
|
|
92
|
-
this.urlPath = urlPath === '/' ? urlPath : (0, _utils.removeTailSlash)(urlPath);
|
|
93
|
-
const useReg = regCharsDetector.test(urlPath);
|
|
94
|
-
|
|
95
|
-
if (useReg) {
|
|
96
|
-
this.urlMatcher = (0, _pathToRegexp.match)(urlPath, {
|
|
97
|
-
end: false,
|
|
98
|
-
decode: decodeURIComponent
|
|
99
|
-
});
|
|
100
|
-
this.urlReg = (0, _pathToRegexp.pathToRegexp)(urlPath, [], {
|
|
101
|
-
end: false
|
|
102
|
-
});
|
|
103
|
-
}
|
|
104
|
-
}
|
|
105
|
-
|
|
106
|
-
}
|
|
107
|
-
|
|
108
|
-
exports.RouteMatcher = RouteMatcher;
|
|
@@ -1,33 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.ModernRoute = void 0;
|
|
7
|
-
|
|
8
|
-
class ModernRoute {
|
|
9
|
-
constructor(routeSpec) {
|
|
10
|
-
var _routeSpec$enableMode;
|
|
11
|
-
|
|
12
|
-
this.entryName = void 0;
|
|
13
|
-
this.urlPath = void 0;
|
|
14
|
-
this.entryPath = void 0;
|
|
15
|
-
this.bundle = void 0;
|
|
16
|
-
this.isApi = void 0;
|
|
17
|
-
this.isSSR = void 0;
|
|
18
|
-
this.isSPA = void 0;
|
|
19
|
-
this.enableModernMode = void 0;
|
|
20
|
-
this.params = {};
|
|
21
|
-
this.entryName = routeSpec.entryName || '';
|
|
22
|
-
this.urlPath = routeSpec.urlPath;
|
|
23
|
-
this.entryPath = routeSpec.entryPath || '';
|
|
24
|
-
this.isSSR = routeSpec.isSSR || false;
|
|
25
|
-
this.isSPA = routeSpec.isSPA || false;
|
|
26
|
-
this.isApi = routeSpec.isApi || false;
|
|
27
|
-
this.bundle = routeSpec.bundle || '';
|
|
28
|
-
this.enableModernMode = (_routeSpec$enableMode = routeSpec.enableModernMode) !== null && _routeSpec$enableMode !== void 0 ? _routeSpec$enableMode : false;
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
exports.ModernRoute = ModernRoute;
|
|
@@ -1,41 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.createStaticFileHandler = void 0;
|
|
7
|
-
|
|
8
|
-
var _serveStatic = _interopRequireDefault(require("serve-static"));
|
|
9
|
-
|
|
10
|
-
var _utils = require("@modern-js/utils");
|
|
11
|
-
|
|
12
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
13
|
-
|
|
14
|
-
// Todo 看看是不是能 fork 一份,即使命中也返回
|
|
15
|
-
const createStaticFileHandler = rules => // eslint-disable-next-line consistent-return
|
|
16
|
-
async (context, next) => {
|
|
17
|
-
const {
|
|
18
|
-
url: requestUrl,
|
|
19
|
-
req,
|
|
20
|
-
res
|
|
21
|
-
} = context;
|
|
22
|
-
const hitRule = rules.find(item => {
|
|
23
|
-
if ((0, _utils.isString)(item.path) && requestUrl.startsWith(item.path)) {
|
|
24
|
-
return true;
|
|
25
|
-
} else if ((0, _utils.isRegExp)(item.path) && item.path.test(requestUrl)) {
|
|
26
|
-
return true;
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
return false;
|
|
30
|
-
});
|
|
31
|
-
|
|
32
|
-
if (hitRule) {
|
|
33
|
-
(0, _serveStatic.default)(hitRule.target)(req, res, () => {
|
|
34
|
-
next();
|
|
35
|
-
});
|
|
36
|
-
} else {
|
|
37
|
-
return next();
|
|
38
|
-
}
|
|
39
|
-
};
|
|
40
|
-
|
|
41
|
-
exports.createStaticFileHandler = createStaticFileHandler;
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
Object.defineProperty(exports, "ModernAPIDevServer", {
|
|
7
|
-
enumerable: true,
|
|
8
|
-
get: function () {
|
|
9
|
-
return _devServerSplit.ModernAPIDevServer;
|
|
10
|
-
}
|
|
11
|
-
});
|
|
12
|
-
Object.defineProperty(exports, "ModernDevServer", {
|
|
13
|
-
enumerable: true,
|
|
14
|
-
get: function () {
|
|
15
|
-
return _devServer.ModernDevServer;
|
|
16
|
-
}
|
|
17
|
-
});
|
|
18
|
-
Object.defineProperty(exports, "ModernSSRDevServer", {
|
|
19
|
-
enumerable: true,
|
|
20
|
-
get: function () {
|
|
21
|
-
return _devServerSplit.ModernSSRDevServer;
|
|
22
|
-
}
|
|
23
|
-
});
|
|
24
|
-
|
|
25
|
-
var _devServerSplit = require("./dev-server-split");
|
|
26
|
-
|
|
27
|
-
var _devServer = require("./dev-server");
|
|
@@ -1,97 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.ModernWebServer = exports.ModernSSRServer = exports.ModernAPIServer = void 0;
|
|
7
|
-
|
|
8
|
-
var _modernServer = require("./modern-server");
|
|
9
|
-
|
|
10
|
-
class ModernSSRServer extends _modernServer.ModernServer {
|
|
11
|
-
// Todo should not invoke any route hook in modernSSRServer
|
|
12
|
-
async warmupSSRBundle() {// empty
|
|
13
|
-
}
|
|
14
|
-
|
|
15
|
-
verifyMatch(context, matched) {
|
|
16
|
-
if (matched.generate(context.url).isApi) {
|
|
17
|
-
this.render404(context);
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
prepareAPIHandler(_m, _) {
|
|
22
|
-
return null;
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
async prepareWebHandler(extension) {
|
|
26
|
-
return super.prepareWebHandler(extension);
|
|
27
|
-
} // protected filterRoutes(routes: ModernRouteInterface[]) {
|
|
28
|
-
// return routes.filter(route => route.entryName);
|
|
29
|
-
// }
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
async preServerInit() {// empty
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
exports.ModernSSRServer = ModernSSRServer;
|
|
38
|
-
|
|
39
|
-
class ModernAPIServer extends _modernServer.ModernServer {
|
|
40
|
-
async emitRouteHook(_, _input) {// empty
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
async warmupSSRBundle() {// empty
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
prepareWebHandler(_) {
|
|
47
|
-
return null;
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
async prepareAPIHandler(mode, extension) {
|
|
51
|
-
return super.prepareAPIHandler(mode, extension);
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
filterRoutes(routes) {
|
|
55
|
-
return routes.filter(route => route.isApi);
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
async preServerInit() {// empty
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
exports.ModernAPIServer = ModernAPIServer;
|
|
64
|
-
|
|
65
|
-
class ModernWebServer extends _modernServer.ModernServer {
|
|
66
|
-
async warmupSSRBundle() {// empty
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
async handleAPI(context) {
|
|
70
|
-
const {
|
|
71
|
-
proxyTarget
|
|
72
|
-
} = this;
|
|
73
|
-
|
|
74
|
-
if (!(proxyTarget !== null && proxyTarget !== void 0 && proxyTarget.api)) {
|
|
75
|
-
this.proxy();
|
|
76
|
-
} else {
|
|
77
|
-
this.render404(context);
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
async handleWeb(context, route) {
|
|
82
|
-
const {
|
|
83
|
-
proxyTarget
|
|
84
|
-
} = this;
|
|
85
|
-
|
|
86
|
-
if (route.isSSR && proxyTarget !== null && proxyTarget !== void 0 && proxyTarget.ssr) {
|
|
87
|
-
return this.proxy();
|
|
88
|
-
} else {
|
|
89
|
-
// if no proxyTarget but access web server, degradation to csr
|
|
90
|
-
route.isSSR = false;
|
|
91
|
-
return super.handleWeb(context, route);
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
|
|
95
|
-
}
|
|
96
|
-
|
|
97
|
-
exports.ModernWebServer = ModernWebServer;
|