@modern-js/plugin-worker 0.0.0-next-20230207110201 → 0.0.0-next-20230209112307
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 +5 -7
- package/dist/js/modern/code.js +8 -1
- package/dist/js/modern/index.js +16 -5
- package/dist/js/node/code.js +8 -1
- package/dist/js/node/index.js +15 -4
- package/dist/js/treeshaking/code.js +1 -1
- package/dist/js/treeshaking/index.js +21 -5
- package/package.json +8 -8
package/CHANGELOG.md
CHANGED
|
@@ -1,15 +1,13 @@
|
|
|
1
1
|
# @modern-js/plugin-worker
|
|
2
2
|
|
|
3
|
-
## 0.0.0-next-
|
|
3
|
+
## 0.0.0-next-20230209112307
|
|
4
4
|
|
|
5
5
|
### Patch Changes
|
|
6
6
|
|
|
7
|
-
-
|
|
7
|
+
- 3e7a7d800: feat: ssr support deploy worker
|
|
8
8
|
|
|
9
9
|
feat: ssr 支持边缘部署
|
|
10
10
|
|
|
11
|
-
- Updated dependencies [
|
|
12
|
-
-
|
|
13
|
-
-
|
|
14
|
-
- @modern-js/utils@0.0.0-next-20230207110201
|
|
15
|
-
- @modern-js/server-utils@0.0.0-next-20230207110201
|
|
11
|
+
- Updated dependencies [3e7a7d800]
|
|
12
|
+
- @modern-js/utils@0.0.0-next-20230209112307
|
|
13
|
+
- @modern-js/server-utils@0.0.0-next-20230209112307
|
package/dist/js/modern/code.js
CHANGED
|
@@ -1,12 +1,19 @@
|
|
|
1
1
|
const worker = () => `
|
|
2
2
|
// work entry code
|
|
3
3
|
import { createHandler, handleUrl } from "@modern-js/prod-server/worker";
|
|
4
|
+
import loadableStats from "../loadable-stats.json";
|
|
5
|
+
import routeManifest from "../routes-manifest.json";
|
|
4
6
|
import { manifest } from "./manifest";
|
|
5
7
|
async function handleRequest(request) {
|
|
6
8
|
const context = {
|
|
7
|
-
request
|
|
9
|
+
request: {
|
|
10
|
+
...request,
|
|
11
|
+
url: request.url,
|
|
12
|
+
},
|
|
8
13
|
url: handleUrl(request.url),
|
|
9
14
|
body: null,
|
|
15
|
+
loadableStats,
|
|
16
|
+
routeManifest,
|
|
10
17
|
};
|
|
11
18
|
const handler = createHandler(manifest);
|
|
12
19
|
await handler(context);
|
package/dist/js/modern/index.js
CHANGED
|
@@ -22,7 +22,7 @@ import path from "path";
|
|
|
22
22
|
import {
|
|
23
23
|
fs,
|
|
24
24
|
getPackageManager,
|
|
25
|
-
|
|
25
|
+
isServerWorker,
|
|
26
26
|
ROUTE_SPEC_FILE
|
|
27
27
|
} from "@modern-js/utils";
|
|
28
28
|
import {
|
|
@@ -39,11 +39,20 @@ var src_default = () => ({
|
|
|
39
39
|
name: "@modern-js/plugin-worker",
|
|
40
40
|
setup: (ctx) => {
|
|
41
41
|
return {
|
|
42
|
+
config() {
|
|
43
|
+
return __async(this, null, function* () {
|
|
44
|
+
return {
|
|
45
|
+
output: {
|
|
46
|
+
disableNodePolyfill: false
|
|
47
|
+
}
|
|
48
|
+
};
|
|
49
|
+
});
|
|
50
|
+
},
|
|
42
51
|
beforeDeploy() {
|
|
43
52
|
return __async(this, null, function* () {
|
|
44
53
|
const { appDirectory, distDirectory } = ctx.useAppContext();
|
|
45
54
|
const configContext = ctx.useResolvedConfigContext();
|
|
46
|
-
if (!
|
|
55
|
+
if (!isServerWorker(configContext)) {
|
|
47
56
|
return;
|
|
48
57
|
}
|
|
49
58
|
const workServerDir = path.join(distDirectory, WORKER_SERVER);
|
|
@@ -60,14 +69,16 @@ var src_default = () => ({
|
|
|
60
69
|
const routeArr = [];
|
|
61
70
|
routes.forEach(
|
|
62
71
|
(route) => {
|
|
63
|
-
|
|
72
|
+
if (route.isSSR) {
|
|
73
|
+
importStr += `import { serverRender as ${route.entryName}ServerRender } from "../${route.worker}";
|
|
64
74
|
`;
|
|
75
|
+
}
|
|
65
76
|
importStr += `import ${route.entryName}template from "../${route.entryPath}";
|
|
66
77
|
`;
|
|
67
78
|
pageStr += `"${route.urlPath}": {
|
|
68
79
|
entryName: "${route.entryName}",
|
|
69
80
|
template: ${route.entryName}template,
|
|
70
|
-
serverRender: ${route.entryName}ServerRender,
|
|
81
|
+
serverRender: ${route.isSSR ? `${route.entryName}ServerRender` : void 0},
|
|
71
82
|
},`;
|
|
72
83
|
routeArr.push({
|
|
73
84
|
entryName: route.entryName,
|
|
@@ -94,7 +105,7 @@ export const manifest = {
|
|
|
94
105
|
name: pkg.name,
|
|
95
106
|
version: pkg.version,
|
|
96
107
|
dependencies: {
|
|
97
|
-
"@modern-js/prod-server": "0.0.0-next-
|
|
108
|
+
"@modern-js/prod-server": "0.0.0-next-20230208120929",
|
|
98
109
|
wrangler: "^2.9.0"
|
|
99
110
|
},
|
|
100
111
|
resolutions: pkg.resolutions || {},
|
package/dist/js/node/code.js
CHANGED
|
@@ -23,12 +23,19 @@ module.exports = __toCommonJS(code_exports);
|
|
|
23
23
|
const worker = () => `
|
|
24
24
|
// work entry code
|
|
25
25
|
import { createHandler, handleUrl } from "@modern-js/prod-server/worker";
|
|
26
|
+
import loadableStats from "../loadable-stats.json";
|
|
27
|
+
import routeManifest from "../routes-manifest.json";
|
|
26
28
|
import { manifest } from "./manifest";
|
|
27
29
|
async function handleRequest(request) {
|
|
28
30
|
const context = {
|
|
29
|
-
request
|
|
31
|
+
request: {
|
|
32
|
+
...request,
|
|
33
|
+
url: request.url,
|
|
34
|
+
},
|
|
30
35
|
url: handleUrl(request.url),
|
|
31
36
|
body: null,
|
|
37
|
+
loadableStats,
|
|
38
|
+
routeManifest,
|
|
32
39
|
};
|
|
33
40
|
const handler = createHandler(manifest);
|
|
34
41
|
await handler(context);
|
package/dist/js/node/index.js
CHANGED
|
@@ -55,11 +55,20 @@ var src_default = () => ({
|
|
|
55
55
|
name: "@modern-js/plugin-worker",
|
|
56
56
|
setup: (ctx) => {
|
|
57
57
|
return {
|
|
58
|
+
config() {
|
|
59
|
+
return __async(this, null, function* () {
|
|
60
|
+
return {
|
|
61
|
+
output: {
|
|
62
|
+
disableNodePolyfill: false
|
|
63
|
+
}
|
|
64
|
+
};
|
|
65
|
+
});
|
|
66
|
+
},
|
|
58
67
|
beforeDeploy() {
|
|
59
68
|
return __async(this, null, function* () {
|
|
60
69
|
const { appDirectory, distDirectory } = ctx.useAppContext();
|
|
61
70
|
const configContext = ctx.useResolvedConfigContext();
|
|
62
|
-
if (!(0, import_utils.
|
|
71
|
+
if (!(0, import_utils.isServerWorker)(configContext)) {
|
|
63
72
|
return;
|
|
64
73
|
}
|
|
65
74
|
const workServerDir = import_path.default.join(distDirectory, import_constants.WORKER_SERVER);
|
|
@@ -76,14 +85,16 @@ var src_default = () => ({
|
|
|
76
85
|
const routeArr = [];
|
|
77
86
|
routes.forEach(
|
|
78
87
|
(route) => {
|
|
79
|
-
|
|
88
|
+
if (route.isSSR) {
|
|
89
|
+
importStr += `import { serverRender as ${route.entryName}ServerRender } from "../${route.worker}";
|
|
80
90
|
`;
|
|
91
|
+
}
|
|
81
92
|
importStr += `import ${route.entryName}template from "../${route.entryPath}";
|
|
82
93
|
`;
|
|
83
94
|
pageStr += `"${route.urlPath}": {
|
|
84
95
|
entryName: "${route.entryName}",
|
|
85
96
|
template: ${route.entryName}template,
|
|
86
|
-
serverRender: ${route.entryName}ServerRender,
|
|
97
|
+
serverRender: ${route.isSSR ? `${route.entryName}ServerRender` : void 0},
|
|
87
98
|
},`;
|
|
88
99
|
routeArr.push({
|
|
89
100
|
entryName: route.entryName,
|
|
@@ -110,7 +121,7 @@ export const manifest = {
|
|
|
110
121
|
name: pkg.name,
|
|
111
122
|
version: pkg.version,
|
|
112
123
|
dependencies: {
|
|
113
|
-
"@modern-js/prod-server": "0.0.0-next-
|
|
124
|
+
"@modern-js/prod-server": "0.0.0-next-20230208120929",
|
|
114
125
|
wrangler: "^2.9.0"
|
|
115
126
|
},
|
|
116
127
|
resolutions: pkg.resolutions || {},
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
var worker = function() {
|
|
2
|
-
return '\n// work entry code\nimport { createHandler, handleUrl } from "@modern-js/prod-server/worker";\nimport { manifest } from "./manifest";\nasync function handleRequest(request) {\n const context = {\n request,\n url: handleUrl(request.url),\n body: null,\n };\n const handler = createHandler(manifest);\n await handler(context);\n return new Response(context.body, {\n headers: {\n \'content-type\': \'text/html;charset=UTF-8\',\n },\n });\n}\n\naddEventListener("fetch", (event) => {\n event.respondWith(handleRequest(event.request));\n});\n';
|
|
2
|
+
return '\n// work entry code\nimport { createHandler, handleUrl } from "@modern-js/prod-server/worker";\nimport loadableStats from "../loadable-stats.json";\nimport routeManifest from "../routes-manifest.json";\nimport { manifest } from "./manifest";\nasync function handleRequest(request) {\n const context = {\n request: {\n ...request,\n url: request.url,\n },\n url: handleUrl(request.url),\n body: null,\n loadableStats,\n routeManifest,\n };\n const handler = createHandler(manifest);\n await handler(context);\n return new Response(context.body, {\n headers: {\n \'content-type\': \'text/html;charset=UTF-8\',\n },\n });\n}\n\naddEventListener("fetch", (event) => {\n event.respondWith(handleRequest(event.request));\n});\n';
|
|
3
3
|
};
|
|
4
4
|
export { worker };
|
|
@@ -123,7 +123,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
|
|
|
123
123
|
}
|
|
124
124
|
};
|
|
125
125
|
import path from "path";
|
|
126
|
-
import { fs, getPackageManager,
|
|
126
|
+
import { fs, getPackageManager, isServerWorker, ROUTE_SPEC_FILE } from "@modern-js/utils";
|
|
127
127
|
import { LOCK_FILE, MANIFEST_FILE, PKG_FILE, WORKER_SERVER, WORKER_SERVER_ENTRY, WRANGLER_FILE } from "./constants";
|
|
128
128
|
import { worker } from "./code";
|
|
129
129
|
import { copyfile } from "./utils";
|
|
@@ -132,6 +132,20 @@ var src_default = function() {
|
|
|
132
132
|
name: "@modern-js/plugin-worker",
|
|
133
133
|
setup: function(ctx) {
|
|
134
134
|
return {
|
|
135
|
+
config: function config() {
|
|
136
|
+
return _asyncToGenerator(function() {
|
|
137
|
+
return __generator(this, function(_state) {
|
|
138
|
+
return [
|
|
139
|
+
2,
|
|
140
|
+
{
|
|
141
|
+
output: {
|
|
142
|
+
disableNodePolyfill: false
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
];
|
|
146
|
+
});
|
|
147
|
+
})();
|
|
148
|
+
},
|
|
135
149
|
beforeDeploy: function beforeDeploy() {
|
|
136
150
|
return _asyncToGenerator(function() {
|
|
137
151
|
var _ctx_useAppContext, appDirectory, distDirectory, configContext, workServerDir, routeJSON, routes, importStr, pageStr, routeArr, manifest, pkg, manager, lockfile;
|
|
@@ -140,7 +154,7 @@ var src_default = function() {
|
|
|
140
154
|
case 0:
|
|
141
155
|
_ctx_useAppContext = ctx.useAppContext(), appDirectory = _ctx_useAppContext.appDirectory, distDirectory = _ctx_useAppContext.distDirectory;
|
|
142
156
|
configContext = ctx.useResolvedConfigContext();
|
|
143
|
-
if (!
|
|
157
|
+
if (!isServerWorker(configContext)) {
|
|
144
158
|
return [
|
|
145
159
|
2
|
|
146
160
|
];
|
|
@@ -155,9 +169,11 @@ var src_default = function() {
|
|
|
155
169
|
pageStr = "";
|
|
156
170
|
routeArr = [];
|
|
157
171
|
routes.forEach(function(route) {
|
|
158
|
-
|
|
172
|
+
if (route.isSSR) {
|
|
173
|
+
importStr += "import { serverRender as ".concat(route.entryName, 'ServerRender } from "../').concat(route.worker, '";\n');
|
|
174
|
+
}
|
|
159
175
|
importStr += "import ".concat(route.entryName, 'template from "../').concat(route.entryPath, '";\n');
|
|
160
|
-
pageStr += '"'.concat(route.urlPath, '": {\n entryName: "').concat(route.entryName, '",\n template: ').concat(route.entryName, "template,\n serverRender: ").concat(route.entryName, "ServerRender,\n },");
|
|
176
|
+
pageStr += '"'.concat(route.urlPath, '": {\n entryName: "').concat(route.entryName, '",\n template: ').concat(route.entryName, "template,\n serverRender: ").concat(route.isSSR ? "".concat(route.entryName, "ServerRender") : void 0, ",\n },");
|
|
161
177
|
routeArr.push({
|
|
162
178
|
entryName: route.entryName,
|
|
163
179
|
isSSR: route.isSSR,
|
|
@@ -173,7 +189,7 @@ var src_default = function() {
|
|
|
173
189
|
name: pkg.name,
|
|
174
190
|
version: pkg.version,
|
|
175
191
|
dependencies: {
|
|
176
|
-
"@modern-js/prod-server": "0.0.0-next-
|
|
192
|
+
"@modern-js/prod-server": "0.0.0-next-20230208120929",
|
|
177
193
|
wrangler: "^2.9.0"
|
|
178
194
|
},
|
|
179
195
|
resolutions: pkg.resolutions || {},
|
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-20230209112307",
|
|
15
15
|
"types": "./dist/types/cli.d.ts",
|
|
16
16
|
"jsnext:source": "./src/index.ts",
|
|
17
17
|
"main": "./dist/js/node/index.js",
|
|
@@ -37,19 +37,19 @@
|
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
39
|
"@babel/runtime": "^7.18.0",
|
|
40
|
-
"@modern-js/server-utils": "0.0.0-next-
|
|
41
|
-
"@modern-js/utils": "0.0.0-next-
|
|
40
|
+
"@modern-js/server-utils": "0.0.0-next-20230209112307",
|
|
41
|
+
"@modern-js/utils": "0.0.0-next-20230209112307"
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
44
|
"typescript": "^4",
|
|
45
45
|
"@types/jest": "^27",
|
|
46
46
|
"@types/node": "^14",
|
|
47
47
|
"jest": "^27",
|
|
48
|
-
"@modern-js/app-tools": "0.0.0-next-
|
|
49
|
-
"@modern-js/core": "0.0.0-next-
|
|
50
|
-
"@scripts/build": "0.0.0-next-
|
|
51
|
-
"@modern-js/types": "0.0.0-next-
|
|
52
|
-
"@scripts/jest-config": "0.0.0-next-
|
|
48
|
+
"@modern-js/app-tools": "0.0.0-next-20230209112307",
|
|
49
|
+
"@modern-js/core": "0.0.0-next-20230209112307",
|
|
50
|
+
"@scripts/build": "0.0.0-next-20230209112307",
|
|
51
|
+
"@modern-js/types": "0.0.0-next-20230209112307",
|
|
52
|
+
"@scripts/jest-config": "0.0.0-next-20230209112307"
|
|
53
53
|
},
|
|
54
54
|
"sideEffects": [
|
|
55
55
|
"*.css",
|