@modern-js/app-tools 2.19.1 → 2.21.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 +115 -0
- package/bin/modern.js +0 -1
- package/dist/cjs/analyze/generateCode.js +22 -48
- package/dist/cjs/analyze/getBundleEntry.js +3 -7
- package/dist/cjs/analyze/getClientRoutes/getRoutes.js +2 -6
- package/dist/cjs/analyze/getClientRoutes/getRoutesLegacy.js +2 -6
- package/dist/cjs/analyze/getClientRoutes/utils.js +2 -6
- package/dist/cjs/analyze/getFileSystemEntry.js +3 -7
- package/dist/cjs/analyze/getHtmlTemplate.js +4 -47
- package/dist/cjs/analyze/getServerRoutes.js +5 -7
- package/dist/cjs/analyze/index.js +11 -48
- package/dist/cjs/analyze/isDefaultExportFunction.js +5 -48
- package/dist/cjs/analyze/nestedRoutes.js +2 -41
- package/dist/cjs/analyze/templates.js +2 -6
- package/dist/cjs/analyze/utils.js +3 -7
- package/dist/cjs/builder/builder-rspack/adapterCopy.js +4 -21
- package/dist/cjs/builder/builder-webpack/index.js +2 -41
- package/dist/cjs/builder/generator/index.js +3 -42
- package/dist/cjs/builder/index.js +4 -43
- package/dist/cjs/builder/shared/builderPlugins/adapterHtml.js +6 -56
- package/dist/cjs/builder/shared/builderPlugins/adapterSSR.js +6 -45
- package/dist/cjs/builder/shared/builderPlugins/index.js +4 -16
- package/dist/cjs/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js +3 -15
- package/dist/cjs/builder/shared/bundlerPlugins/HtmlBottomTemplate.js +5 -17
- package/dist/cjs/builder/shared/bundlerPlugins/RouterPlugin.js +2 -6
- package/dist/cjs/builder/shared/bundlerPlugins/index.js +4 -16
- package/dist/cjs/builder/shared/createCopyInfo.js +2 -6
- package/dist/cjs/builder/shared/index.js +4 -16
- package/dist/cjs/commands/index.js +4 -16
- package/dist/cjs/commands/serve.js +2 -6
- package/dist/cjs/config/index.js +4 -16
- package/dist/cjs/config/initialize/inits.js +2 -41
- package/dist/cjs/index.js +41 -80
- package/dist/cjs/schema/Schema.js +2 -14
- package/dist/cjs/schema/index.js +2 -6
- package/dist/cjs/types/config/index.js +2 -14
- package/dist/cjs/types/index.js +4 -16
- package/dist/cjs/utils/config.js +2 -41
- package/dist/cjs/utils/generateWatchFiles.js +2 -6
- package/dist/cjs/utils/routes.js +2 -6
- package/dist/esm/analyze/generateCode.js +13 -170
- package/dist/esm/analyze/getBundleEntry.js +1 -1
- package/dist/esm/analyze/getClientRoutes/getRoutes.js +2 -52
- package/dist/esm/analyze/getClientRoutes/getRoutesLegacy.js +2 -52
- package/dist/esm/analyze/getHtmlTemplate.js +6 -151
- package/dist/esm/analyze/getServerRoutes.js +6 -118
- package/dist/esm/analyze/index.js +19 -251
- package/dist/esm/analyze/nestedRoutes.js +5 -184
- package/dist/esm/analyze/templates.js +6 -242
- package/dist/esm/analyze/utils.js +6 -205
- package/dist/esm/builder/builder-rspack/adapterCopy.js +10 -235
- package/dist/esm/builder/builder-webpack/adapterModern.js +1 -34
- package/dist/esm/builder/builder-webpack/index.js +7 -219
- package/dist/esm/builder/generator/createBuilderProviderConfig.js +2 -52
- package/dist/esm/builder/generator/index.js +4 -133
- package/dist/esm/builder/index.js +3 -132
- package/dist/esm/builder/shared/builderPlugins/adapterHtml.js +9 -191
- package/dist/esm/builder/shared/builderPlugins/adapterSSR.js +10 -139
- package/dist/esm/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js +4 -69
- package/dist/esm/builder/shared/bundlerPlugins/HtmlBottomTemplate.js +3 -35
- package/dist/esm/builder/shared/bundlerPlugins/RouterPlugin.js +7 -226
- package/dist/esm/commands/build.js +5 -184
- package/dist/esm/commands/deploy.js +3 -132
- package/dist/esm/commands/dev.js +6 -185
- package/dist/esm/commands/inspect.js +3 -132
- package/dist/esm/commands/serve.js +6 -185
- package/dist/esm/config/default.js +3 -52
- package/dist/esm/config/initialize/inits.js +3 -86
- package/dist/esm/defineConfig.js +2 -52
- package/dist/esm/index.js +49 -207
- package/dist/esm/initialize/index.js +6 -185
- package/dist/esm/schema/Schema.js +8 -213
- package/dist/esm/schema/index.js +1 -13
- package/dist/esm/schema/legacy.js +1 -13
- package/dist/esm/utils/config.js +7 -186
- package/dist/esm/utils/createServer.js +6 -185
- package/dist/esm/utils/generateWatchFiles.js +5 -167
- package/dist/esm/utils/getSelectedEntries.js +3 -132
- package/dist/esm/utils/getServerInternalPlugins.js +5 -184
- package/dist/esm/utils/printInstructions.js +3 -132
- package/dist/esm/utils/restart.js +3 -132
- package/dist/esm/utils/routes.js +3 -132
- package/dist/esm-node/analyze/generateCode.js +19 -2
- package/dist/esm-node/analyze/getBundleEntry.js +1 -1
- package/dist/esm-node/analyze/getServerRoutes.js +2 -0
- package/dist/esm-node/analyze/index.js +4 -2
- package/dist/esm-node/builder/builder-rspack/adapterCopy.js +1 -14
- package/dist/esm-node/builder/shared/builderPlugins/adapterHtml.js +2 -6
- package/dist/esm-node/builder/shared/builderPlugins/adapterSSR.js +5 -5
- package/dist/esm-node/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js +1 -13
- package/dist/esm-node/builder/shared/bundlerPlugins/HtmlBottomTemplate.js +1 -13
- package/dist/esm-node/index.js +22 -6
- package/dist/esm-node/schema/Schema.js +1 -13
- package/dist/types/analyze/index.d.ts +0 -2
- package/dist/types/builder/builder-rspack/index.d.ts +1 -1
- package/dist/types/builder/builder-webpack/adapterModern.d.ts +0 -1
- package/dist/types/builder/generator/index.d.ts +1 -2
- package/dist/types/builder/shared/builderPlugins/adapterBasic.d.ts +0 -1
- package/dist/types/builder/shared/builderPlugins/adapterHtml.d.ts +2 -3
- package/dist/types/defineConfig.d.ts +0 -1
- package/dist/types/index.d.ts +0 -2
- package/dist/types/initialize/index.d.ts +0 -2
- package/dist/types/types/config/index.d.ts +2 -2
- package/dist/types/types/config/output.d.ts +1 -0
- package/dist/types/types/config/security.d.ts +2 -0
- package/dist/types/types/config/source.d.ts +0 -1
- package/dist/types/types/config/tools.d.ts +0 -2
- package/dist/types/types/hooks.d.ts +3 -1
- package/dist/types/types/legacyConfig/dev.d.ts +0 -1
- package/dist/types/types/legacyConfig/output.d.ts +2 -3
- package/dist/types/types/legacyConfig/source.d.ts +0 -1
- package/dist/types/types/legacyConfig/tools.d.ts +0 -1
- package/dist/types/utils/config.d.ts +0 -1
- package/dist/types/utils/getSelectedEntries.d.ts +0 -1
- package/lib/types.d.ts +8 -8
- package/package.json +29 -29
|
@@ -1,170 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
for (var i = 0, arr2 = new Array(len); i < len; i++)
|
|
5
|
-
arr2[i] = arr[i];
|
|
6
|
-
return arr2;
|
|
7
|
-
}
|
|
8
|
-
function _array_without_holes(arr) {
|
|
9
|
-
if (Array.isArray(arr))
|
|
10
|
-
return _array_like_to_array(arr);
|
|
11
|
-
}
|
|
12
|
-
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
|
|
13
|
-
try {
|
|
14
|
-
var info = gen[key](arg);
|
|
15
|
-
var value = info.value;
|
|
16
|
-
} catch (error) {
|
|
17
|
-
reject(error);
|
|
18
|
-
return;
|
|
19
|
-
}
|
|
20
|
-
if (info.done) {
|
|
21
|
-
resolve(value);
|
|
22
|
-
} else {
|
|
23
|
-
Promise.resolve(value).then(_next, _throw);
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
function _async_to_generator(fn) {
|
|
27
|
-
return function() {
|
|
28
|
-
var self = this, args = arguments;
|
|
29
|
-
return new Promise(function(resolve, reject) {
|
|
30
|
-
var gen = fn.apply(self, args);
|
|
31
|
-
function _next(value) {
|
|
32
|
-
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
|
|
33
|
-
}
|
|
34
|
-
function _throw(err) {
|
|
35
|
-
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
|
|
36
|
-
}
|
|
37
|
-
_next(void 0);
|
|
38
|
-
});
|
|
39
|
-
};
|
|
40
|
-
}
|
|
41
|
-
function _iterable_to_array(iter) {
|
|
42
|
-
if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null)
|
|
43
|
-
return Array.from(iter);
|
|
44
|
-
}
|
|
45
|
-
function _non_iterable_spread() {
|
|
46
|
-
throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
|
|
47
|
-
}
|
|
48
|
-
function _to_consumable_array(arr) {
|
|
49
|
-
return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
|
|
50
|
-
}
|
|
51
|
-
function _unsupported_iterable_to_array(o, minLen) {
|
|
52
|
-
if (!o)
|
|
53
|
-
return;
|
|
54
|
-
if (typeof o === "string")
|
|
55
|
-
return _array_like_to_array(o, minLen);
|
|
56
|
-
var n = Object.prototype.toString.call(o).slice(8, -1);
|
|
57
|
-
if (n === "Object" && o.constructor)
|
|
58
|
-
n = o.constructor.name;
|
|
59
|
-
if (n === "Map" || n === "Set")
|
|
60
|
-
return Array.from(n);
|
|
61
|
-
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))
|
|
62
|
-
return _array_like_to_array(o, minLen);
|
|
63
|
-
}
|
|
64
|
-
var __generator = function(thisArg, body) {
|
|
65
|
-
var f, y, t, g, _ = {
|
|
66
|
-
label: 0,
|
|
67
|
-
sent: function() {
|
|
68
|
-
if (t[0] & 1)
|
|
69
|
-
throw t[1];
|
|
70
|
-
return t[1];
|
|
71
|
-
},
|
|
72
|
-
trys: [],
|
|
73
|
-
ops: []
|
|
74
|
-
};
|
|
75
|
-
return g = {
|
|
76
|
-
next: verb(0),
|
|
77
|
-
"throw": verb(1),
|
|
78
|
-
"return": verb(2)
|
|
79
|
-
}, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
|
|
80
|
-
return this;
|
|
81
|
-
}), g;
|
|
82
|
-
function verb(n) {
|
|
83
|
-
return function(v) {
|
|
84
|
-
return step([
|
|
85
|
-
n,
|
|
86
|
-
v
|
|
87
|
-
]);
|
|
88
|
-
};
|
|
89
|
-
}
|
|
90
|
-
function step(op) {
|
|
91
|
-
if (f)
|
|
92
|
-
throw new TypeError("Generator is already executing.");
|
|
93
|
-
while (_)
|
|
94
|
-
try {
|
|
95
|
-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done)
|
|
96
|
-
return t;
|
|
97
|
-
if (y = 0, t)
|
|
98
|
-
op = [
|
|
99
|
-
op[0] & 2,
|
|
100
|
-
t.value
|
|
101
|
-
];
|
|
102
|
-
switch (op[0]) {
|
|
103
|
-
case 0:
|
|
104
|
-
case 1:
|
|
105
|
-
t = op;
|
|
106
|
-
break;
|
|
107
|
-
case 4:
|
|
108
|
-
_.label++;
|
|
109
|
-
return {
|
|
110
|
-
value: op[1],
|
|
111
|
-
done: false
|
|
112
|
-
};
|
|
113
|
-
case 5:
|
|
114
|
-
_.label++;
|
|
115
|
-
y = op[1];
|
|
116
|
-
op = [
|
|
117
|
-
0
|
|
118
|
-
];
|
|
119
|
-
continue;
|
|
120
|
-
case 7:
|
|
121
|
-
op = _.ops.pop();
|
|
122
|
-
_.trys.pop();
|
|
123
|
-
continue;
|
|
124
|
-
default:
|
|
125
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
|
|
126
|
-
_ = 0;
|
|
127
|
-
continue;
|
|
128
|
-
}
|
|
129
|
-
if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
|
|
130
|
-
_.label = op[1];
|
|
131
|
-
break;
|
|
132
|
-
}
|
|
133
|
-
if (op[0] === 6 && _.label < t[1]) {
|
|
134
|
-
_.label = t[1];
|
|
135
|
-
t = op;
|
|
136
|
-
break;
|
|
137
|
-
}
|
|
138
|
-
if (t && _.label < t[2]) {
|
|
139
|
-
_.label = t[2];
|
|
140
|
-
_.ops.push(op);
|
|
141
|
-
break;
|
|
142
|
-
}
|
|
143
|
-
if (t[2])
|
|
144
|
-
_.ops.pop();
|
|
145
|
-
_.trys.pop();
|
|
146
|
-
continue;
|
|
147
|
-
}
|
|
148
|
-
op = body.call(thisArg, _);
|
|
149
|
-
} catch (e) {
|
|
150
|
-
op = [
|
|
151
|
-
6,
|
|
152
|
-
e
|
|
153
|
-
];
|
|
154
|
-
y = 0;
|
|
155
|
-
} finally {
|
|
156
|
-
f = t = 0;
|
|
157
|
-
}
|
|
158
|
-
if (op[0] & 5)
|
|
159
|
-
throw op[1];
|
|
160
|
-
return {
|
|
161
|
-
value: op[0] ? op[1] : void 0,
|
|
162
|
-
done: true
|
|
163
|
-
};
|
|
164
|
-
}
|
|
165
|
-
};
|
|
1
|
+
import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
|
|
2
|
+
import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
|
|
3
|
+
import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
|
|
166
4
|
import path from "path";
|
|
167
|
-
import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
|
|
5
|
+
import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger, SERVER_RENDER_FUNCTION_NAME } from "@modern-js/utils";
|
|
168
6
|
import * as templates from "./templates";
|
|
169
7
|
import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
|
|
170
8
|
import { FILE_SYSTEM_ROUTES_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME } from "./constants";
|
|
@@ -262,8 +100,8 @@ export var generateCode = function() {
|
|
|
262
100
|
}
|
|
263
101
|
function _generateEntryCode() {
|
|
264
102
|
_generateEntryCode = _async_to_generator(function(entrypoint) {
|
|
265
|
-
var entryName, isAutoMount, customBootstrap, fileSystemRoutes, _config_output, initialRoutes, nestedRoute, routes, _$config, ssr, useSSG, mode, hasPageRoute, code, _, _tmp, routesServerFile, code1, serverLoaderCombined, serverLoaderFile, _ref2, importStatements, plugins, _ref1, renderFunction, exportStatement, code2, entryFile, _ref22, asyncEntryCode, bootstrapFile;
|
|
266
|
-
return
|
|
103
|
+
var entryName, isAutoMount, customBootstrap, fileSystemRoutes, _config_output, initialRoutes, nestedRoute, routes, _$config, ssr, useSSG, mode, hasPageRoute, code, _, _tmp, routesServerFile, code1, serverLoaderCombined, serverLoaderFile, _ref2, importStatements, plugins, _ref1, renderFunction, exportStatement, code2, entryFile, rawAsyncEntryCode, ssr1, _ref22, asyncEntryCode, bootstrapFile;
|
|
104
|
+
return _ts_generator(this, function(_state) {
|
|
267
105
|
switch (_state.label) {
|
|
268
106
|
case 0:
|
|
269
107
|
entryName = entrypoint.entryName, isAutoMount = entrypoint.isAutoMount, customBootstrap = entrypoint.customBootstrap, fileSystemRoutes = entrypoint.fileSystemRoutes;
|
|
@@ -455,11 +293,16 @@ export var generateCode = function() {
|
|
|
455
293
|
3,
|
|
456
294
|
17
|
|
457
295
|
];
|
|
296
|
+
rawAsyncEntryCode = "import('./".concat(ENTRY_BOOTSTRAP_FILE_NAME, "');");
|
|
297
|
+
ssr1 = getEntryOptions(entryName, config.server.ssr, config.server.ssrByEntries, packageName);
|
|
298
|
+
if (ssr1) {
|
|
299
|
+
rawAsyncEntryCode = "\n export const ".concat(SERVER_RENDER_FUNCTION_NAME, " = async (...args) => {\n let entry = await ").concat(rawAsyncEntryCode, ";\n if (entry.default instanceof Promise){\n entry = await entry.default;\n return entry.default.").concat(SERVER_RENDER_FUNCTION_NAME, ".apply(null, args);\n }\n return entry.").concat(SERVER_RENDER_FUNCTION_NAME, ".apply(null, args);\n };\n if(typeof window!=='undefined'){\n ").concat(rawAsyncEntryCode, "\n }\n ");
|
|
300
|
+
}
|
|
458
301
|
return [
|
|
459
302
|
4,
|
|
460
303
|
hookRunners.modifyAsyncEntry({
|
|
461
304
|
entrypoint: entrypoint,
|
|
462
|
-
code:
|
|
305
|
+
code: rawAsyncEntryCode
|
|
463
306
|
})
|
|
464
307
|
];
|
|
465
308
|
case 16:
|
|
@@ -483,7 +326,7 @@ export var generateCode = function() {
|
|
|
483
326
|
});
|
|
484
327
|
return _generateEntryCode.apply(this, arguments);
|
|
485
328
|
}
|
|
486
|
-
return
|
|
329
|
+
return _ts_generator(this, function(_state) {
|
|
487
330
|
switch (_state.label) {
|
|
488
331
|
case 0:
|
|
489
332
|
internalDirectory = appContext.internalDirectory, srcDirectory = appContext.srcDirectory, internalDirAlias = appContext.internalDirAlias, internalSrcAlias = appContext.internalSrcAlias, packageName = appContext.packageName;
|
|
@@ -43,7 +43,7 @@ export var getBundleEntry = function(appContext, config) {
|
|
|
43
43
|
customBootstrap: value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
|
|
44
44
|
fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value.entry)).isDirectory() ? {} : void 0
|
|
45
45
|
};
|
|
46
|
-
if (entrypoint.fileSystemRoutes && isRouterV5(config)) {
|
|
46
|
+
if (entrypoint.fileSystemRoutes && !isRouterV5(config)) {
|
|
47
47
|
entrypoint.nestedRoutesEntry = entrypoint.entry;
|
|
48
48
|
}
|
|
49
49
|
if (!ifAlreadyExists(defaults, entrypoint)) {
|
|
@@ -1,55 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(obj, key, {
|
|
4
|
-
value: value,
|
|
5
|
-
enumerable: true,
|
|
6
|
-
configurable: true,
|
|
7
|
-
writable: true
|
|
8
|
-
});
|
|
9
|
-
} else {
|
|
10
|
-
obj[key] = value;
|
|
11
|
-
}
|
|
12
|
-
return obj;
|
|
13
|
-
}
|
|
14
|
-
function _object_spread(target) {
|
|
15
|
-
for (var i = 1; i < arguments.length; i++) {
|
|
16
|
-
var source = arguments[i] != null ? arguments[i] : {};
|
|
17
|
-
var ownKeys2 = Object.keys(source);
|
|
18
|
-
if (typeof Object.getOwnPropertySymbols === "function") {
|
|
19
|
-
ownKeys2 = ownKeys2.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
|
|
20
|
-
return Object.getOwnPropertyDescriptor(source, sym).enumerable;
|
|
21
|
-
}));
|
|
22
|
-
}
|
|
23
|
-
ownKeys2.forEach(function(key) {
|
|
24
|
-
_define_property(target, key, source[key]);
|
|
25
|
-
});
|
|
26
|
-
}
|
|
27
|
-
return target;
|
|
28
|
-
}
|
|
29
|
-
function ownKeys(object, enumerableOnly) {
|
|
30
|
-
var keys = Object.keys(object);
|
|
31
|
-
if (Object.getOwnPropertySymbols) {
|
|
32
|
-
var symbols = Object.getOwnPropertySymbols(object);
|
|
33
|
-
if (enumerableOnly) {
|
|
34
|
-
symbols = symbols.filter(function(sym) {
|
|
35
|
-
return Object.getOwnPropertyDescriptor(object, sym).enumerable;
|
|
36
|
-
});
|
|
37
|
-
}
|
|
38
|
-
keys.push.apply(keys, symbols);
|
|
39
|
-
}
|
|
40
|
-
return keys;
|
|
41
|
-
}
|
|
42
|
-
function _object_spread_props(target, source) {
|
|
43
|
-
source = source != null ? source : {};
|
|
44
|
-
if (Object.getOwnPropertyDescriptors) {
|
|
45
|
-
Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
|
|
46
|
-
} else {
|
|
47
|
-
ownKeys(Object(source)).forEach(function(key) {
|
|
48
|
-
Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
|
|
49
|
-
});
|
|
50
|
-
}
|
|
51
|
-
return target;
|
|
52
|
-
}
|
|
1
|
+
import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
|
|
2
|
+
import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
|
|
53
3
|
import path from "path";
|
|
54
4
|
import { fs } from "@modern-js/utils";
|
|
55
5
|
import { makeLegalIdentifier } from "../makeLegalIdentifier";
|
|
@@ -1,55 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(obj, key, {
|
|
4
|
-
value: value,
|
|
5
|
-
enumerable: true,
|
|
6
|
-
configurable: true,
|
|
7
|
-
writable: true
|
|
8
|
-
});
|
|
9
|
-
} else {
|
|
10
|
-
obj[key] = value;
|
|
11
|
-
}
|
|
12
|
-
return obj;
|
|
13
|
-
}
|
|
14
|
-
function _object_spread(target) {
|
|
15
|
-
for (var i = 1; i < arguments.length; i++) {
|
|
16
|
-
var source = arguments[i] != null ? arguments[i] : {};
|
|
17
|
-
var ownKeys2 = Object.keys(source);
|
|
18
|
-
if (typeof Object.getOwnPropertySymbols === "function") {
|
|
19
|
-
ownKeys2 = ownKeys2.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
|
|
20
|
-
return Object.getOwnPropertyDescriptor(source, sym).enumerable;
|
|
21
|
-
}));
|
|
22
|
-
}
|
|
23
|
-
ownKeys2.forEach(function(key) {
|
|
24
|
-
_define_property(target, key, source[key]);
|
|
25
|
-
});
|
|
26
|
-
}
|
|
27
|
-
return target;
|
|
28
|
-
}
|
|
29
|
-
function ownKeys(object, enumerableOnly) {
|
|
30
|
-
var keys = Object.keys(object);
|
|
31
|
-
if (Object.getOwnPropertySymbols) {
|
|
32
|
-
var symbols = Object.getOwnPropertySymbols(object);
|
|
33
|
-
if (enumerableOnly) {
|
|
34
|
-
symbols = symbols.filter(function(sym) {
|
|
35
|
-
return Object.getOwnPropertyDescriptor(object, sym).enumerable;
|
|
36
|
-
});
|
|
37
|
-
}
|
|
38
|
-
keys.push.apply(keys, symbols);
|
|
39
|
-
}
|
|
40
|
-
return keys;
|
|
41
|
-
}
|
|
42
|
-
function _object_spread_props(target, source) {
|
|
43
|
-
source = source != null ? source : {};
|
|
44
|
-
if (Object.getOwnPropertyDescriptors) {
|
|
45
|
-
Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
|
|
46
|
-
} else {
|
|
47
|
-
ownKeys(Object(source)).forEach(function(key) {
|
|
48
|
-
Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
|
|
49
|
-
});
|
|
50
|
-
}
|
|
51
|
-
return target;
|
|
52
|
-
}
|
|
1
|
+
import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
|
|
2
|
+
import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
|
|
53
3
|
import path from "path";
|
|
54
4
|
import { fs } from "@modern-js/utils";
|
|
55
5
|
import { makeLegalIdentifier } from "../makeLegalIdentifier";
|
|
@@ -1,151 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var value = info.value;
|
|
5
|
-
} catch (error) {
|
|
6
|
-
reject(error);
|
|
7
|
-
return;
|
|
8
|
-
}
|
|
9
|
-
if (info.done) {
|
|
10
|
-
resolve(value);
|
|
11
|
-
} else {
|
|
12
|
-
Promise.resolve(value).then(_next, _throw);
|
|
13
|
-
}
|
|
14
|
-
}
|
|
15
|
-
function _async_to_generator(fn) {
|
|
16
|
-
return function() {
|
|
17
|
-
var self = this, args = arguments;
|
|
18
|
-
return new Promise(function(resolve, reject) {
|
|
19
|
-
var gen = fn.apply(self, args);
|
|
20
|
-
function _next(value) {
|
|
21
|
-
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
|
|
22
|
-
}
|
|
23
|
-
function _throw(err) {
|
|
24
|
-
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
|
|
25
|
-
}
|
|
26
|
-
_next(void 0);
|
|
27
|
-
});
|
|
28
|
-
};
|
|
29
|
-
}
|
|
30
|
-
var __generator = function(thisArg, body) {
|
|
31
|
-
var f, y, t, g, _ = {
|
|
32
|
-
label: 0,
|
|
33
|
-
sent: function() {
|
|
34
|
-
if (t[0] & 1)
|
|
35
|
-
throw t[1];
|
|
36
|
-
return t[1];
|
|
37
|
-
},
|
|
38
|
-
trys: [],
|
|
39
|
-
ops: []
|
|
40
|
-
};
|
|
41
|
-
return g = {
|
|
42
|
-
next: verb(0),
|
|
43
|
-
"throw": verb(1),
|
|
44
|
-
"return": verb(2)
|
|
45
|
-
}, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
|
|
46
|
-
return this;
|
|
47
|
-
}), g;
|
|
48
|
-
function verb(n) {
|
|
49
|
-
return function(v) {
|
|
50
|
-
return step([
|
|
51
|
-
n,
|
|
52
|
-
v
|
|
53
|
-
]);
|
|
54
|
-
};
|
|
55
|
-
}
|
|
56
|
-
function step(op) {
|
|
57
|
-
if (f)
|
|
58
|
-
throw new TypeError("Generator is already executing.");
|
|
59
|
-
while (_)
|
|
60
|
-
try {
|
|
61
|
-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done)
|
|
62
|
-
return t;
|
|
63
|
-
if (y = 0, t)
|
|
64
|
-
op = [
|
|
65
|
-
op[0] & 2,
|
|
66
|
-
t.value
|
|
67
|
-
];
|
|
68
|
-
switch (op[0]) {
|
|
69
|
-
case 0:
|
|
70
|
-
case 1:
|
|
71
|
-
t = op;
|
|
72
|
-
break;
|
|
73
|
-
case 4:
|
|
74
|
-
_.label++;
|
|
75
|
-
return {
|
|
76
|
-
value: op[1],
|
|
77
|
-
done: false
|
|
78
|
-
};
|
|
79
|
-
case 5:
|
|
80
|
-
_.label++;
|
|
81
|
-
y = op[1];
|
|
82
|
-
op = [
|
|
83
|
-
0
|
|
84
|
-
];
|
|
85
|
-
continue;
|
|
86
|
-
case 7:
|
|
87
|
-
op = _.ops.pop();
|
|
88
|
-
_.trys.pop();
|
|
89
|
-
continue;
|
|
90
|
-
default:
|
|
91
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
|
|
92
|
-
_ = 0;
|
|
93
|
-
continue;
|
|
94
|
-
}
|
|
95
|
-
if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
|
|
96
|
-
_.label = op[1];
|
|
97
|
-
break;
|
|
98
|
-
}
|
|
99
|
-
if (op[0] === 6 && _.label < t[1]) {
|
|
100
|
-
_.label = t[1];
|
|
101
|
-
t = op;
|
|
102
|
-
break;
|
|
103
|
-
}
|
|
104
|
-
if (t && _.label < t[2]) {
|
|
105
|
-
_.label = t[2];
|
|
106
|
-
_.ops.push(op);
|
|
107
|
-
break;
|
|
108
|
-
}
|
|
109
|
-
if (t[2])
|
|
110
|
-
_.ops.pop();
|
|
111
|
-
_.trys.pop();
|
|
112
|
-
continue;
|
|
113
|
-
}
|
|
114
|
-
op = body.call(thisArg, _);
|
|
115
|
-
} catch (e) {
|
|
116
|
-
op = [
|
|
117
|
-
6,
|
|
118
|
-
e
|
|
119
|
-
];
|
|
120
|
-
y = 0;
|
|
121
|
-
} finally {
|
|
122
|
-
f = t = 0;
|
|
123
|
-
}
|
|
124
|
-
if (op[0] & 5)
|
|
125
|
-
throw op[1];
|
|
126
|
-
return {
|
|
127
|
-
value: op[0] ? op[1] : void 0,
|
|
128
|
-
done: true
|
|
129
|
-
};
|
|
130
|
-
}
|
|
131
|
-
};
|
|
132
|
-
var __values = function(o) {
|
|
133
|
-
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
134
|
-
if (m)
|
|
135
|
-
return m.call(o);
|
|
136
|
-
if (o && typeof o.length === "number")
|
|
137
|
-
return {
|
|
138
|
-
next: function() {
|
|
139
|
-
if (o && i >= o.length)
|
|
140
|
-
o = void 0;
|
|
141
|
-
return {
|
|
142
|
-
value: o && o[i++],
|
|
143
|
-
done: !o
|
|
144
|
-
};
|
|
145
|
-
}
|
|
146
|
-
};
|
|
147
|
-
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
148
|
-
};
|
|
1
|
+
import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
|
|
2
|
+
import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
|
|
3
|
+
import { _ as _ts_values } from "@swc/helpers/_/_ts_values";
|
|
149
4
|
import path from "path";
|
|
150
5
|
import { fs, findExists, MAIN_ENTRY_NAME } from "@modern-js/utils";
|
|
151
6
|
import { HTML_PARTIALS_EXTENSIONS, HTML_PARTIALS_FOLDER } from "./constants";
|
|
@@ -176,7 +31,7 @@ var findPartials = function(dir, entryName, position) {
|
|
|
176
31
|
export var getHtmlTemplate = function() {
|
|
177
32
|
var _ref = _async_to_generator(function(entrypoints, api, param) {
|
|
178
33
|
var appContext, config, appDirectory, internalDirectory, configDir, htmlDir, htmlTemplates, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _loop, _iterator, _step, err;
|
|
179
|
-
return
|
|
34
|
+
return _ts_generator(this, function(_state) {
|
|
180
35
|
switch (_state.label) {
|
|
181
36
|
case 0:
|
|
182
37
|
appContext = param.appContext, config = param.config;
|
|
@@ -195,7 +50,7 @@ export var getHtmlTemplate = function() {
|
|
|
195
50
|
]);
|
|
196
51
|
_loop = function() {
|
|
197
52
|
var entrypoint, entryName, name, customIndexTemplate, hookRunners, partials, templatePath, bottomTemplate;
|
|
198
|
-
return
|
|
53
|
+
return _ts_generator(this, function(_state2) {
|
|
199
54
|
switch (_state2.label) {
|
|
200
55
|
case 0:
|
|
201
56
|
entrypoint = _step.value;
|
|
@@ -262,7 +117,7 @@ export var getHtmlTemplate = function() {
|
|
|
262
117
|
];
|
|
263
118
|
return [
|
|
264
119
|
5,
|
|
265
|
-
|
|
120
|
+
_ts_values(_loop())
|
|
266
121
|
];
|
|
267
122
|
case 3:
|
|
268
123
|
_state.sent();
|
|
@@ -1,121 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
arr2[i] = arr[i];
|
|
6
|
-
return arr2;
|
|
7
|
-
}
|
|
8
|
-
function _array_without_holes(arr) {
|
|
9
|
-
if (Array.isArray(arr))
|
|
10
|
-
return _array_like_to_array(arr);
|
|
11
|
-
}
|
|
12
|
-
function _define_property(obj, key, value) {
|
|
13
|
-
if (key in obj) {
|
|
14
|
-
Object.defineProperty(obj, key, {
|
|
15
|
-
value: value,
|
|
16
|
-
enumerable: true,
|
|
17
|
-
configurable: true,
|
|
18
|
-
writable: true
|
|
19
|
-
});
|
|
20
|
-
} else {
|
|
21
|
-
obj[key] = value;
|
|
22
|
-
}
|
|
23
|
-
return obj;
|
|
24
|
-
}
|
|
25
|
-
function _iterable_to_array(iter) {
|
|
26
|
-
if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null)
|
|
27
|
-
return Array.from(iter);
|
|
28
|
-
}
|
|
29
|
-
function _non_iterable_spread() {
|
|
30
|
-
throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
|
|
31
|
-
}
|
|
32
|
-
function _object_spread(target) {
|
|
33
|
-
for (var i = 1; i < arguments.length; i++) {
|
|
34
|
-
var source = arguments[i] != null ? arguments[i] : {};
|
|
35
|
-
var ownKeys2 = Object.keys(source);
|
|
36
|
-
if (typeof Object.getOwnPropertySymbols === "function") {
|
|
37
|
-
ownKeys2 = ownKeys2.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
|
|
38
|
-
return Object.getOwnPropertyDescriptor(source, sym).enumerable;
|
|
39
|
-
}));
|
|
40
|
-
}
|
|
41
|
-
ownKeys2.forEach(function(key) {
|
|
42
|
-
_define_property(target, key, source[key]);
|
|
43
|
-
});
|
|
44
|
-
}
|
|
45
|
-
return target;
|
|
46
|
-
}
|
|
47
|
-
function ownKeys(object, enumerableOnly) {
|
|
48
|
-
var keys = Object.keys(object);
|
|
49
|
-
if (Object.getOwnPropertySymbols) {
|
|
50
|
-
var symbols = Object.getOwnPropertySymbols(object);
|
|
51
|
-
if (enumerableOnly) {
|
|
52
|
-
symbols = symbols.filter(function(sym) {
|
|
53
|
-
return Object.getOwnPropertyDescriptor(object, sym).enumerable;
|
|
54
|
-
});
|
|
55
|
-
}
|
|
56
|
-
keys.push.apply(keys, symbols);
|
|
57
|
-
}
|
|
58
|
-
return keys;
|
|
59
|
-
}
|
|
60
|
-
function _object_spread_props(target, source) {
|
|
61
|
-
source = source != null ? source : {};
|
|
62
|
-
if (Object.getOwnPropertyDescriptors) {
|
|
63
|
-
Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
|
|
64
|
-
} else {
|
|
65
|
-
ownKeys(Object(source)).forEach(function(key) {
|
|
66
|
-
Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
|
|
67
|
-
});
|
|
68
|
-
}
|
|
69
|
-
return target;
|
|
70
|
-
}
|
|
71
|
-
function _object_without_properties(source, excluded) {
|
|
72
|
-
if (source == null)
|
|
73
|
-
return {};
|
|
74
|
-
var target = _object_without_properties_loose(source, excluded);
|
|
75
|
-
var key, i;
|
|
76
|
-
if (Object.getOwnPropertySymbols) {
|
|
77
|
-
var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
|
|
78
|
-
for (i = 0; i < sourceSymbolKeys.length; i++) {
|
|
79
|
-
key = sourceSymbolKeys[i];
|
|
80
|
-
if (excluded.indexOf(key) >= 0)
|
|
81
|
-
continue;
|
|
82
|
-
if (!Object.prototype.propertyIsEnumerable.call(source, key))
|
|
83
|
-
continue;
|
|
84
|
-
target[key] = source[key];
|
|
85
|
-
}
|
|
86
|
-
}
|
|
87
|
-
return target;
|
|
88
|
-
}
|
|
89
|
-
function _object_without_properties_loose(source, excluded) {
|
|
90
|
-
if (source == null)
|
|
91
|
-
return {};
|
|
92
|
-
var target = {};
|
|
93
|
-
var sourceKeys = Object.keys(source);
|
|
94
|
-
var key, i;
|
|
95
|
-
for (i = 0; i < sourceKeys.length; i++) {
|
|
96
|
-
key = sourceKeys[i];
|
|
97
|
-
if (excluded.indexOf(key) >= 0)
|
|
98
|
-
continue;
|
|
99
|
-
target[key] = source[key];
|
|
100
|
-
}
|
|
101
|
-
return target;
|
|
102
|
-
}
|
|
103
|
-
function _to_consumable_array(arr) {
|
|
104
|
-
return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
|
|
105
|
-
}
|
|
106
|
-
function _unsupported_iterable_to_array(o, minLen) {
|
|
107
|
-
if (!o)
|
|
108
|
-
return;
|
|
109
|
-
if (typeof o === "string")
|
|
110
|
-
return _array_like_to_array(o, minLen);
|
|
111
|
-
var n = Object.prototype.toString.call(o).slice(8, -1);
|
|
112
|
-
if (n === "Object" && o.constructor)
|
|
113
|
-
n = o.constructor.name;
|
|
114
|
-
if (n === "Map" || n === "Set")
|
|
115
|
-
return Array.from(n);
|
|
116
|
-
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))
|
|
117
|
-
return _array_like_to_array(o, minLen);
|
|
118
|
-
}
|
|
1
|
+
import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
|
|
2
|
+
import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
|
|
3
|
+
import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
|
|
4
|
+
import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
|
|
119
5
|
import path from "path";
|
|
120
6
|
import fs from "fs";
|
|
121
7
|
import { urlJoin, isPlainObject, removeLeadingSlash, getEntryOptions, SERVER_BUNDLE_DIRECTORY, MAIN_ENTRY_NAME, removeTailSlash, SERVER_WORKER_BUNDLE_DIRECTORY } from "@modern-js/utils";
|
|
@@ -192,12 +78,14 @@ var collectHtmlRoutes = function(entrypoints, appContext, config) {
|
|
|
192
78
|
var entryOptions = getEntryOptions(entryName, ssr, ssrByEntries, packageName);
|
|
193
79
|
var isSSR = Boolean(entryOptions);
|
|
194
80
|
var isWorker = Boolean(workerSSR);
|
|
81
|
+
var isStream = typeof entryOptions === "object" && entryOptions.mode === "stream";
|
|
195
82
|
var resHeaders = ((routes === null || routes === void 0 ? void 0 : routes[entryName]) || {}).resHeaders;
|
|
196
83
|
var route = {
|
|
197
84
|
urlPath: "/".concat(entryName === MAIN_ENTRY_NAME ? "" : entryName),
|
|
198
85
|
entryName: entryName,
|
|
199
86
|
entryPath: removeLeadingSlash(path.posix.normalize("".concat(htmlPath, "/").concat(entryName).concat(disableHtmlFolder ? ".html" : "/index.html"))),
|
|
200
87
|
isSPA: true,
|
|
88
|
+
isStream: isStream,
|
|
201
89
|
isSSR: isSSR,
|
|
202
90
|
responseHeaders: resHeaders,
|
|
203
91
|
worker: isWorker ? "".concat(SERVER_WORKER_BUNDLE_DIRECTORY, "/").concat(entryName, ".js") : void 0,
|