@modern-js/app-tools 2.14.0 → 2.16.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 +74 -0
- package/dist/cjs/analyze/constants.js +37 -61
- package/dist/cjs/analyze/generateCode.js +102 -127
- package/dist/cjs/analyze/getBundleEntry.js +33 -66
- package/dist/cjs/analyze/getClientRoutes/getRoutes.js +61 -117
- package/dist/cjs/analyze/getClientRoutes/getRoutesLegacy.js +61 -115
- package/dist/cjs/analyze/getClientRoutes/index.js +15 -28
- package/dist/cjs/analyze/getClientRoutes/utils.js +24 -48
- package/dist/cjs/analyze/getFileSystemEntry.js +39 -79
- package/dist/cjs/analyze/getHtmlTemplate.js +88 -98
- package/dist/cjs/analyze/getServerRoutes.js +67 -110
- package/dist/cjs/analyze/index.js +265 -257
- package/dist/cjs/analyze/isDefaultExportFunction.js +66 -44
- package/dist/cjs/analyze/makeLegalIdentifier.js +7 -25
- package/dist/cjs/analyze/nestedRoutes.js +99 -104
- package/dist/cjs/analyze/templates.js +49 -110
- package/dist/cjs/analyze/utils.js +98 -102
- package/dist/cjs/builder/builder-rspack/adapterCopy.js +58 -100
- package/dist/cjs/builder/builder-rspack/index.js +14 -30
- package/dist/cjs/builder/builder-webpack/adapterModern.js +33 -50
- package/dist/cjs/builder/builder-webpack/createCopyPattern.js +16 -32
- package/dist/cjs/builder/builder-webpack/index.js +65 -46
- package/dist/cjs/builder/generator/createBuilderOptions.js +10 -26
- package/dist/cjs/builder/generator/createBuilderProviderConfig.js +11 -27
- package/dist/cjs/builder/generator/getBuilderTargets.js +13 -29
- package/dist/cjs/builder/generator/index.js +61 -55
- package/dist/cjs/builder/index.js +53 -43
- package/dist/cjs/builder/shared/builderPlugins/adapterBasic.js +13 -36
- package/dist/cjs/builder/shared/builderPlugins/adapterHtml.js +90 -90
- package/dist/cjs/builder/shared/builderPlugins/adapterSSR.js +108 -111
- package/dist/cjs/builder/shared/builderPlugins/index.js +20 -19
- package/dist/cjs/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js +30 -30
- package/dist/cjs/builder/shared/bundlerPlugins/HtmlBottomTemplate.js +32 -38
- package/dist/cjs/builder/shared/bundlerPlugins/RouterPlugin.js +86 -116
- package/dist/cjs/builder/shared/bundlerPlugins/index.js +20 -19
- package/dist/cjs/builder/shared/createCopyInfo.js +16 -42
- package/dist/cjs/builder/shared/index.js +20 -19
- package/dist/cjs/builder/shared/loaders/serverModuleLoader.js +8 -24
- package/dist/cjs/builder/shared/types.js +4 -15
- package/dist/cjs/commands/build.js +23 -40
- package/dist/cjs/commands/deploy.js +7 -25
- package/dist/cjs/commands/dev.js +38 -57
- package/dist/cjs/commands/index.js +20 -19
- package/dist/cjs/commands/inspect.js +10 -30
- package/dist/cjs/commands/serve.js +28 -66
- package/dist/cjs/config/default.js +34 -34
- package/dist/cjs/config/index.js +20 -19
- package/dist/cjs/config/initialize/index.js +11 -29
- package/dist/cjs/config/initialize/inits.js +103 -82
- package/dist/cjs/config/legacy/createHtmlConfig.js +8 -40
- package/dist/cjs/config/legacy/createOutputConfig.js +8 -51
- package/dist/cjs/config/legacy/createSourceConfig.js +8 -38
- package/dist/cjs/config/legacy/createToolsConfig.js +8 -43
- package/dist/cjs/config/legacy/index.js +22 -46
- package/dist/cjs/defineConfig.js +16 -31
- package/dist/cjs/exports/server.js +7 -25
- package/dist/cjs/hooks.js +33 -51
- package/dist/cjs/index.js +185 -166
- package/dist/cjs/initialize/index.js +84 -100
- package/dist/cjs/locale/en.js +13 -27
- package/dist/cjs/locale/index.js +18 -28
- package/dist/cjs/locale/zh.js +13 -27
- package/dist/cjs/schema/Schema.js +27 -31
- package/dist/cjs/schema/index.js +141 -71
- package/dist/cjs/schema/legacy.js +273 -96
- package/dist/cjs/types/config/deploy.js +4 -15
- package/dist/cjs/types/config/dev.js +4 -15
- package/dist/cjs/types/config/experiments.js +4 -15
- package/dist/cjs/types/config/html.js +4 -15
- package/dist/cjs/types/config/index.js +18 -17
- package/dist/cjs/types/config/output.js +4 -15
- package/dist/cjs/types/config/performance.js +4 -15
- package/dist/cjs/types/config/security.js +4 -15
- package/dist/cjs/types/config/source.js +4 -15
- package/dist/cjs/types/config/tools.js +4 -15
- package/dist/cjs/types/hooks.js +4 -15
- package/dist/cjs/types/index.js +20 -19
- package/dist/cjs/types/legacyConfig/deploy.js +4 -15
- package/dist/cjs/types/legacyConfig/dev.js +4 -15
- package/dist/cjs/types/legacyConfig/index.js +4 -15
- package/dist/cjs/types/legacyConfig/output.js +4 -15
- package/dist/cjs/types/legacyConfig/source.js +4 -15
- package/dist/cjs/types/legacyConfig/tools.js +4 -15
- package/dist/cjs/types/utils.js +4 -15
- package/dist/cjs/utils/config.js +74 -79
- package/dist/cjs/utils/createServer.js +16 -42
- package/dist/cjs/utils/env.js +7 -25
- package/dist/cjs/utils/generateWatchFiles.js +31 -52
- package/dist/cjs/utils/getSelectedEntries.js +13 -35
- package/dist/cjs/utils/getServerInternalPlugins.js +8 -29
- package/dist/cjs/utils/printInstructions.js +10 -28
- package/dist/cjs/utils/restart.js +13 -31
- package/dist/cjs/utils/routes.js +18 -39
- package/dist/cjs/utils/types.js +4 -15
- package/dist/esm/analyze/constants.js +40 -41
- package/dist/esm/analyze/generateCode.js +477 -455
- package/dist/esm/analyze/getBundleEntry.js +53 -54
- package/dist/esm/analyze/getClientRoutes/getRoutes.js +201 -202
- package/dist/esm/analyze/getClientRoutes/getRoutesLegacy.js +199 -200
- package/dist/esm/analyze/getClientRoutes/index.js +2 -3
- package/dist/esm/analyze/getClientRoutes/utils.js +15 -15
- package/dist/esm/analyze/getFileSystemEntry.js +86 -87
- package/dist/esm/analyze/getHtmlTemplate.js +289 -278
- package/dist/esm/analyze/getServerRoutes.js +203 -190
- package/dist/esm/analyze/index.js +679 -651
- package/dist/esm/analyze/isDefaultExportFunction.js +38 -39
- package/dist/esm/analyze/makeLegalIdentifier.js +8 -9
- package/dist/esm/analyze/nestedRoutes.js +400 -392
- package/dist/esm/analyze/templates.js +536 -509
- package/dist/esm/analyze/utils.js +357 -336
- package/dist/esm/builder/builder-rspack/adapterCopy.js +347 -330
- package/dist/esm/builder/builder-rspack/index.js +8 -9
- package/dist/esm/builder/builder-webpack/adapterModern.js +51 -43
- package/dist/esm/builder/builder-webpack/createCopyPattern.js +31 -32
- package/dist/esm/builder/builder-webpack/index.js +266 -249
- package/dist/esm/builder/generator/createBuilderOptions.js +37 -38
- package/dist/esm/builder/generator/createBuilderProviderConfig.js +62 -63
- package/dist/esm/builder/generator/getBuilderTargets.js +13 -14
- package/dist/esm/builder/generator/index.js +203 -196
- package/dist/esm/builder/index.js +183 -176
- package/dist/esm/builder/shared/builderPlugins/adapterBasic.js +90 -91
- package/dist/esm/builder/shared/builderPlugins/adapterHtml.js +300 -291
- package/dist/esm/builder/shared/builderPlugins/adapterSSR.js +337 -329
- package/dist/esm/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js +108 -97
- package/dist/esm/builder/shared/bundlerPlugins/HtmlBottomTemplate.js +66 -64
- package/dist/esm/builder/shared/bundlerPlugins/RouterPlugin.js +364 -337
- package/dist/esm/builder/shared/createCopyInfo.js +9 -10
- package/dist/esm/builder/shared/loaders/serverModuleLoader.js +2 -3
- package/dist/esm/builder/shared/types.js +1 -1
- package/dist/esm/commands/build.js +279 -272
- package/dist/esm/commands/deploy.js +150 -144
- package/dist/esm/commands/dev.js +296 -289
- package/dist/esm/commands/inspect.js +144 -138
- package/dist/esm/commands/serve.js +241 -235
- package/dist/esm/config/default.js +202 -203
- package/dist/esm/config/initialize/index.js +7 -8
- package/dist/esm/config/initialize/inits.js +189 -181
- package/dist/esm/config/legacy/createHtmlConfig.js +17 -18
- package/dist/esm/config/legacy/createOutputConfig.js +41 -42
- package/dist/esm/config/legacy/createSourceConfig.js +38 -39
- package/dist/esm/config/legacy/createToolsConfig.js +24 -25
- package/dist/esm/config/legacy/index.js +31 -32
- package/dist/esm/defineConfig.js +52 -53
- package/dist/esm/exports/server.js +1 -2
- package/dist/esm/hooks.js +26 -27
- package/dist/esm/index.js +685 -671
- package/dist/esm/initialize/index.js +276 -269
- package/dist/esm/locale/en.js +36 -37
- package/dist/esm/locale/index.js +2 -2
- package/dist/esm/locale/zh.js +36 -37
- package/dist/esm/schema/Schema.js +255 -244
- package/dist/esm/schema/index.js +165 -165
- package/dist/esm/schema/legacy.js +316 -317
- package/dist/esm/types/config/deploy.js +1 -1
- package/dist/esm/types/config/dev.js +1 -1
- package/dist/esm/types/config/experiments.js +1 -1
- package/dist/esm/types/config/html.js +1 -1
- package/dist/esm/types/config/output.js +1 -1
- package/dist/esm/types/config/performance.js +1 -1
- package/dist/esm/types/config/security.js +1 -1
- package/dist/esm/types/config/source.js +1 -1
- package/dist/esm/types/config/tools.js +1 -1
- package/dist/esm/types/hooks.js +1 -1
- package/dist/esm/types/legacyConfig/deploy.js +1 -1
- package/dist/esm/types/legacyConfig/dev.js +1 -1
- package/dist/esm/types/legacyConfig/index.js +1 -1
- package/dist/esm/types/legacyConfig/output.js +1 -1
- package/dist/esm/types/legacyConfig/source.js +1 -1
- package/dist/esm/types/legacyConfig/tools.js +1 -1
- package/dist/esm/types/utils.js +1 -1
- package/dist/esm/utils/config.js +285 -278
- package/dist/esm/utils/createServer.js +242 -234
- package/dist/esm/utils/env.js +11 -12
- package/dist/esm/utils/generateWatchFiles.js +205 -190
- package/dist/esm/utils/getSelectedEntries.js +180 -173
- package/dist/esm/utils/getServerInternalPlugins.js +197 -191
- package/dist/esm/utils/printInstructions.js +147 -141
- package/dist/esm/utils/restart.js +179 -173
- package/dist/esm/utils/routes.js +146 -139
- package/dist/esm/utils/types.js +1 -1
- package/dist/esm-node/analyze/constants.js +31 -46
- package/dist/esm-node/analyze/generateCode.js +28 -94
- package/dist/esm-node/analyze/getBundleEntry.js +8 -27
- package/dist/esm-node/analyze/getClientRoutes/getRoutes.js +24 -65
- package/dist/esm-node/analyze/getClientRoutes/getRoutesLegacy.js +24 -63
- package/dist/esm-node/analyze/getClientRoutes/index.js +2 -6
- package/dist/esm-node/analyze/getClientRoutes/utils.js +5 -19
- package/dist/esm-node/analyze/getFileSystemEntry.js +10 -37
- package/dist/esm-node/analyze/getHtmlTemplate.js +29 -59
- package/dist/esm-node/analyze/getServerRoutes.js +43 -75
- package/dist/esm-node/analyze/index.js +208 -230
- package/dist/esm-node/analyze/isDefaultExportFunction.js +7 -5
- package/dist/esm-node/analyze/makeLegalIdentifier.js +1 -4
- package/dist/esm-node/analyze/nestedRoutes.js +23 -43
- package/dist/esm-node/analyze/templates.js +22 -69
- package/dist/esm-node/analyze/utils.js +66 -60
- package/dist/esm-node/builder/builder-rspack/adapterCopy.js +40 -62
- package/dist/esm-node/builder/builder-rspack/index.js +4 -5
- package/dist/esm-node/builder/builder-webpack/adapterModern.js +24 -26
- package/dist/esm-node/builder/builder-webpack/createCopyPattern.js +3 -10
- package/dist/esm-node/builder/builder-webpack/index.js +13 -11
- package/dist/esm-node/builder/generator/createBuilderOptions.js +4 -5
- package/dist/esm-node/builder/generator/createBuilderProviderConfig.js +5 -6
- package/dist/esm-node/builder/generator/getBuilderTargets.js +5 -11
- package/dist/esm-node/builder/generator/index.js +7 -16
- package/dist/esm-node/builder/index.js +2 -7
- package/dist/esm-node/builder/shared/builderPlugins/adapterBasic.js +2 -6
- package/dist/esm-node/builder/shared/builderPlugins/adapterHtml.js +34 -60
- package/dist/esm-node/builder/shared/builderPlugins/adapterSSR.js +54 -74
- package/dist/esm-node/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js +23 -8
- package/dist/esm-node/builder/shared/bundlerPlugins/HtmlBottomTemplate.js +25 -16
- package/dist/esm-node/builder/shared/bundlerPlugins/RouterPlugin.js +66 -76
- package/dist/esm-node/builder/shared/createCopyInfo.js +2 -8
- package/dist/esm-node/builder/shared/loaders/serverModuleLoader.js +1 -4
- package/dist/esm-node/builder/shared/types.js +1 -0
- package/dist/esm-node/commands/build.js +7 -9
- package/dist/esm-node/commands/deploy.js +1 -4
- package/dist/esm-node/commands/dev.js +19 -27
- package/dist/esm-node/commands/inspect.js +3 -8
- package/dist/esm-node/commands/serve.js +7 -25
- package/dist/esm-node/config/default.js +20 -11
- package/dist/esm-node/config/initialize/index.js +1 -4
- package/dist/esm-node/config/initialize/inits.js +48 -54
- package/dist/esm-node/config/legacy/createHtmlConfig.js +2 -19
- package/dist/esm-node/config/legacy/createOutputConfig.js +2 -30
- package/dist/esm-node/config/legacy/createSourceConfig.js +2 -17
- package/dist/esm-node/config/legacy/createToolsConfig.js +2 -22
- package/dist/esm-node/config/legacy/index.js +3 -18
- package/dist/esm-node/defineConfig.js +7 -13
- package/dist/esm-node/exports/server.js +1 -4
- package/dist/esm-node/hooks.js +2 -9
- package/dist/esm-node/index.js +95 -120
- package/dist/esm-node/initialize/index.js +74 -87
- package/dist/esm-node/locale/en.js +7 -6
- package/dist/esm-node/locale/index.js +5 -5
- package/dist/esm-node/locale/zh.js +7 -6
- package/dist/esm-node/schema/Schema.js +19 -8
- package/dist/esm-node/schema/index.js +121 -36
- package/dist/esm-node/schema/legacy.js +262 -72
- package/dist/esm-node/types/config/deploy.js +1 -0
- package/dist/esm-node/types/config/dev.js +1 -0
- package/dist/esm-node/types/config/experiments.js +1 -0
- package/dist/esm-node/types/config/html.js +1 -0
- package/dist/esm-node/types/config/output.js +1 -0
- package/dist/esm-node/types/config/performance.js +1 -0
- package/dist/esm-node/types/config/security.js +1 -0
- package/dist/esm-node/types/config/source.js +1 -0
- package/dist/esm-node/types/config/tools.js +1 -0
- package/dist/esm-node/types/hooks.js +1 -0
- package/dist/esm-node/types/legacyConfig/deploy.js +1 -0
- package/dist/esm-node/types/legacyConfig/dev.js +1 -0
- package/dist/esm-node/types/legacyConfig/index.js +1 -0
- package/dist/esm-node/types/legacyConfig/output.js +1 -0
- package/dist/esm-node/types/legacyConfig/source.js +1 -0
- package/dist/esm-node/types/legacyConfig/tools.js +1 -0
- package/dist/esm-node/types/utils.js +1 -0
- package/dist/esm-node/utils/config.js +16 -47
- package/dist/esm-node/utils/createServer.js +5 -12
- package/dist/esm-node/utils/env.js +1 -4
- package/dist/esm-node/utils/generateWatchFiles.js +13 -20
- package/dist/esm-node/utils/getSelectedEntries.js +2 -9
- package/dist/esm-node/utils/getServerInternalPlugins.js +2 -8
- package/dist/esm-node/utils/printInstructions.js +1 -4
- package/dist/esm-node/utils/restart.js +2 -11
- package/dist/esm-node/utils/routes.js +4 -4
- package/dist/esm-node/utils/types.js +1 -0
- package/dist/types/index.d.ts +2 -2
- package/lib/types.d.ts +1 -0
- package/package.json +29 -25
|
@@ -1,184 +1,205 @@
|
|
|
1
|
-
function
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
function _array_like_to_array(arr, len) {
|
|
2
|
+
if (len == null || len > arr.length)
|
|
3
|
+
len = arr.length;
|
|
4
|
+
for (var i = 0, arr2 = new Array(len); i < len; i++)
|
|
5
|
+
arr2[i] = arr[i];
|
|
6
|
+
return arr2;
|
|
5
7
|
}
|
|
6
|
-
function
|
|
7
|
-
|
|
8
|
+
function _array_with_holes(arr) {
|
|
9
|
+
if (Array.isArray(arr))
|
|
10
|
+
return arr;
|
|
8
11
|
}
|
|
9
|
-
function
|
|
10
|
-
|
|
12
|
+
function _array_without_holes(arr) {
|
|
13
|
+
if (Array.isArray(arr))
|
|
14
|
+
return _array_like_to_array(arr);
|
|
11
15
|
}
|
|
12
16
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
17
|
+
try {
|
|
18
|
+
var info = gen[key](arg);
|
|
19
|
+
var value = info.value;
|
|
20
|
+
} catch (error) {
|
|
21
|
+
reject(error);
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
if (info.done) {
|
|
25
|
+
resolve(value);
|
|
26
|
+
} else {
|
|
27
|
+
Promise.resolve(value).then(_next, _throw);
|
|
28
|
+
}
|
|
25
29
|
}
|
|
26
|
-
function
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
30
|
+
function _async_to_generator(fn) {
|
|
31
|
+
return function() {
|
|
32
|
+
var self = this, args = arguments;
|
|
33
|
+
return new Promise(function(resolve, reject) {
|
|
34
|
+
var gen = fn.apply(self, args);
|
|
35
|
+
function _next(value) {
|
|
36
|
+
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
|
|
37
|
+
}
|
|
38
|
+
function _throw(err) {
|
|
39
|
+
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
|
|
40
|
+
}
|
|
41
|
+
_next(void 0);
|
|
42
|
+
});
|
|
43
|
+
};
|
|
40
44
|
}
|
|
41
|
-
function
|
|
42
|
-
|
|
45
|
+
function _iterable_to_array(iter) {
|
|
46
|
+
if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null)
|
|
47
|
+
return Array.from(iter);
|
|
43
48
|
}
|
|
44
|
-
function
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
49
|
+
function _iterable_to_array_limit(arr, i) {
|
|
50
|
+
var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
|
|
51
|
+
if (_i == null)
|
|
52
|
+
return;
|
|
53
|
+
var _arr = [];
|
|
54
|
+
var _n = true;
|
|
55
|
+
var _d = false;
|
|
56
|
+
var _s, _e;
|
|
57
|
+
try {
|
|
58
|
+
for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) {
|
|
59
|
+
_arr.push(_s.value);
|
|
60
|
+
if (i && _arr.length === i)
|
|
61
|
+
break;
|
|
62
|
+
}
|
|
63
|
+
} catch (err) {
|
|
64
|
+
_d = true;
|
|
65
|
+
_e = err;
|
|
66
|
+
} finally {
|
|
51
67
|
try {
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
_d = true;
|
|
58
|
-
_e = err;
|
|
59
|
-
} finally{
|
|
60
|
-
try {
|
|
61
|
-
if (!_n && _i["return"] != null) _i["return"]();
|
|
62
|
-
} finally{
|
|
63
|
-
if (_d) throw _e;
|
|
64
|
-
}
|
|
68
|
+
if (!_n && _i["return"] != null)
|
|
69
|
+
_i["return"]();
|
|
70
|
+
} finally {
|
|
71
|
+
if (_d)
|
|
72
|
+
throw _e;
|
|
65
73
|
}
|
|
66
|
-
|
|
74
|
+
}
|
|
75
|
+
return _arr;
|
|
67
76
|
}
|
|
68
|
-
function
|
|
69
|
-
|
|
77
|
+
function _non_iterable_rest() {
|
|
78
|
+
throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
|
|
70
79
|
}
|
|
71
|
-
function
|
|
72
|
-
|
|
80
|
+
function _non_iterable_spread() {
|
|
81
|
+
throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
|
|
73
82
|
}
|
|
74
|
-
function
|
|
75
|
-
|
|
83
|
+
function _sliced_to_array(arr, i) {
|
|
84
|
+
return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
|
|
76
85
|
}
|
|
77
|
-
function
|
|
78
|
-
|
|
86
|
+
function _to_consumable_array(arr) {
|
|
87
|
+
return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
|
|
79
88
|
}
|
|
80
|
-
function
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
89
|
+
function _unsupported_iterable_to_array(o, minLen) {
|
|
90
|
+
if (!o)
|
|
91
|
+
return;
|
|
92
|
+
if (typeof o === "string")
|
|
93
|
+
return _array_like_to_array(o, minLen);
|
|
94
|
+
var n = Object.prototype.toString.call(o).slice(8, -1);
|
|
95
|
+
if (n === "Object" && o.constructor)
|
|
96
|
+
n = o.constructor.name;
|
|
97
|
+
if (n === "Map" || n === "Set")
|
|
98
|
+
return Array.from(n);
|
|
99
|
+
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))
|
|
100
|
+
return _array_like_to_array(o, minLen);
|
|
87
101
|
}
|
|
88
|
-
var __generator =
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
102
|
+
var __generator = function(thisArg, body) {
|
|
103
|
+
var f, y, t, g, _ = {
|
|
104
|
+
label: 0,
|
|
105
|
+
sent: function() {
|
|
106
|
+
if (t[0] & 1)
|
|
107
|
+
throw t[1];
|
|
108
|
+
return t[1];
|
|
109
|
+
},
|
|
110
|
+
trys: [],
|
|
111
|
+
ops: []
|
|
112
|
+
};
|
|
113
|
+
return g = {
|
|
114
|
+
next: verb(0),
|
|
115
|
+
"throw": verb(1),
|
|
116
|
+
"return": verb(2)
|
|
117
|
+
}, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
|
|
118
|
+
return this;
|
|
119
|
+
}), g;
|
|
120
|
+
function verb(n) {
|
|
121
|
+
return function(v) {
|
|
122
|
+
return step([
|
|
123
|
+
n,
|
|
124
|
+
v
|
|
125
|
+
]);
|
|
97
126
|
};
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
break;
|
|
126
|
-
case 4:
|
|
127
|
-
_.label++;
|
|
128
|
-
return {
|
|
129
|
-
value: op[1],
|
|
130
|
-
done: false
|
|
131
|
-
};
|
|
132
|
-
case 5:
|
|
133
|
-
_.label++;
|
|
134
|
-
y = op[1];
|
|
135
|
-
op = [
|
|
136
|
-
0
|
|
137
|
-
];
|
|
138
|
-
continue;
|
|
139
|
-
case 7:
|
|
140
|
-
op = _.ops.pop();
|
|
141
|
-
_.trys.pop();
|
|
142
|
-
continue;
|
|
143
|
-
default:
|
|
144
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
|
|
145
|
-
_ = 0;
|
|
146
|
-
continue;
|
|
147
|
-
}
|
|
148
|
-
if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
|
|
149
|
-
_.label = op[1];
|
|
150
|
-
break;
|
|
151
|
-
}
|
|
152
|
-
if (op[0] === 6 && _.label < t[1]) {
|
|
153
|
-
_.label = t[1];
|
|
154
|
-
t = op;
|
|
155
|
-
break;
|
|
156
|
-
}
|
|
157
|
-
if (t && _.label < t[2]) {
|
|
158
|
-
_.label = t[2];
|
|
159
|
-
_.ops.push(op);
|
|
160
|
-
break;
|
|
161
|
-
}
|
|
162
|
-
if (t[2]) _.ops.pop();
|
|
163
|
-
_.trys.pop();
|
|
164
|
-
continue;
|
|
165
|
-
}
|
|
166
|
-
op = body.call(thisArg, _);
|
|
167
|
-
} catch (e) {
|
|
127
|
+
}
|
|
128
|
+
function step(op) {
|
|
129
|
+
if (f)
|
|
130
|
+
throw new TypeError("Generator is already executing.");
|
|
131
|
+
while (_)
|
|
132
|
+
try {
|
|
133
|
+
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)
|
|
134
|
+
return t;
|
|
135
|
+
if (y = 0, t)
|
|
136
|
+
op = [
|
|
137
|
+
op[0] & 2,
|
|
138
|
+
t.value
|
|
139
|
+
];
|
|
140
|
+
switch (op[0]) {
|
|
141
|
+
case 0:
|
|
142
|
+
case 1:
|
|
143
|
+
t = op;
|
|
144
|
+
break;
|
|
145
|
+
case 4:
|
|
146
|
+
_.label++;
|
|
147
|
+
return {
|
|
148
|
+
value: op[1],
|
|
149
|
+
done: false
|
|
150
|
+
};
|
|
151
|
+
case 5:
|
|
152
|
+
_.label++;
|
|
153
|
+
y = op[1];
|
|
168
154
|
op = [
|
|
169
|
-
|
|
170
|
-
e
|
|
155
|
+
0
|
|
171
156
|
];
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
157
|
+
continue;
|
|
158
|
+
case 7:
|
|
159
|
+
op = _.ops.pop();
|
|
160
|
+
_.trys.pop();
|
|
161
|
+
continue;
|
|
162
|
+
default:
|
|
163
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
|
|
164
|
+
_ = 0;
|
|
165
|
+
continue;
|
|
166
|
+
}
|
|
167
|
+
if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
|
|
168
|
+
_.label = op[1];
|
|
169
|
+
break;
|
|
170
|
+
}
|
|
171
|
+
if (op[0] === 6 && _.label < t[1]) {
|
|
172
|
+
_.label = t[1];
|
|
173
|
+
t = op;
|
|
174
|
+
break;
|
|
175
|
+
}
|
|
176
|
+
if (t && _.label < t[2]) {
|
|
177
|
+
_.label = t[2];
|
|
178
|
+
_.ops.push(op);
|
|
179
|
+
break;
|
|
180
|
+
}
|
|
181
|
+
if (t[2])
|
|
182
|
+
_.ops.pop();
|
|
183
|
+
_.trys.pop();
|
|
184
|
+
continue;
|
|
175
185
|
}
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
186
|
+
op = body.call(thisArg, _);
|
|
187
|
+
} catch (e) {
|
|
188
|
+
op = [
|
|
189
|
+
6,
|
|
190
|
+
e
|
|
191
|
+
];
|
|
192
|
+
y = 0;
|
|
193
|
+
} finally {
|
|
194
|
+
f = t = 0;
|
|
195
|
+
}
|
|
196
|
+
if (op[0] & 5)
|
|
197
|
+
throw op[1];
|
|
198
|
+
return {
|
|
199
|
+
value: op[0] ? op[1] : void 0,
|
|
200
|
+
done: true
|
|
201
|
+
};
|
|
202
|
+
}
|
|
182
203
|
};
|
|
183
204
|
import fs from "fs";
|
|
184
205
|
import path from "path";
|
|
@@ -186,196 +207,196 @@ import { isReact18, normalizeToPosixPath, fs as fse } from "@modern-js/utils";
|
|
|
186
207
|
import { transform } from "esbuild";
|
|
187
208
|
import { parse } from "es-module-lexer";
|
|
188
209
|
import { FILE_SYSTEM_ROUTES_FILE_NAME, JS_EXTENSIONS, LOADER_EXPORT_NAME } from "./constants";
|
|
189
|
-
var walkDirectory = function(dir) {
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
210
|
+
export var walkDirectory = function(dir) {
|
|
211
|
+
return fs.readdirSync(dir).reduce(function(previous, filename) {
|
|
212
|
+
var filePath = path.join(dir, filename);
|
|
213
|
+
if (fs.statSync(filePath).isDirectory()) {
|
|
214
|
+
return _to_consumable_array(previous).concat(_to_consumable_array(walkDirectory(filePath)));
|
|
215
|
+
} else {
|
|
216
|
+
return _to_consumable_array(previous).concat([
|
|
217
|
+
filePath
|
|
218
|
+
]);
|
|
219
|
+
}
|
|
220
|
+
}, []);
|
|
200
221
|
};
|
|
201
|
-
var getDefaultImports = function(param) {
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
222
|
+
export var getDefaultImports = function(param) {
|
|
223
|
+
var entrypoint = param.entrypoint, srcDirectory = param.srcDirectory, internalSrcAlias = param.internalSrcAlias, internalDirAlias = param.internalDirAlias, internalDirectory = param.internalDirectory;
|
|
224
|
+
var entryName = entrypoint.entryName, fileSystemRoutes = entrypoint.fileSystemRoutes, customBootstrap = entrypoint.customBootstrap, entry = entrypoint.entry;
|
|
225
|
+
var imports = [
|
|
226
|
+
{
|
|
227
|
+
specifiers: [
|
|
205
228
|
{
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
229
|
+
local: "React"
|
|
230
|
+
}
|
|
231
|
+
],
|
|
232
|
+
value: "react"
|
|
233
|
+
},
|
|
234
|
+
{
|
|
235
|
+
specifiers: [
|
|
213
236
|
{
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
237
|
+
local: "ReactDOM"
|
|
238
|
+
}
|
|
239
|
+
],
|
|
240
|
+
value: isReact18(path.join(internalDirectory, "../../")) ? "react-dom/client" : "react-dom"
|
|
241
|
+
},
|
|
242
|
+
{
|
|
243
|
+
specifiers: [
|
|
221
244
|
{
|
|
222
|
-
|
|
223
|
-
{
|
|
224
|
-
imported: "createApp"
|
|
225
|
-
},
|
|
226
|
-
{
|
|
227
|
-
imported: "bootstrap"
|
|
228
|
-
}
|
|
229
|
-
],
|
|
230
|
-
value: "@modern-js/runtime"
|
|
245
|
+
imported: "createApp"
|
|
231
246
|
},
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
{
|
|
235
|
-
local: "customBootstrap"
|
|
236
|
-
}
|
|
237
|
-
],
|
|
238
|
-
value: normalizeToPosixPath(customBootstrap.replace(srcDirectory, internalSrcAlias))
|
|
247
|
+
{
|
|
248
|
+
imported: "bootstrap"
|
|
239
249
|
}
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
value: normalizeToPosixPath(fileSystemRoutes.globalApp.replace(srcDirectory, internalSrcAlias))
|
|
258
|
-
});
|
|
259
|
-
} else {
|
|
260
|
-
route.initialize = "const App = false;";
|
|
250
|
+
],
|
|
251
|
+
value: "@modern-js/runtime"
|
|
252
|
+
},
|
|
253
|
+
customBootstrap && {
|
|
254
|
+
specifiers: [
|
|
255
|
+
{
|
|
256
|
+
local: "customBootstrap"
|
|
257
|
+
}
|
|
258
|
+
],
|
|
259
|
+
value: normalizeToPosixPath(customBootstrap.replace(srcDirectory, internalSrcAlias))
|
|
260
|
+
}
|
|
261
|
+
].filter(Boolean);
|
|
262
|
+
if (fileSystemRoutes) {
|
|
263
|
+
var route = {
|
|
264
|
+
specifiers: [
|
|
265
|
+
{
|
|
266
|
+
imported: "routes"
|
|
261
267
|
}
|
|
262
|
-
|
|
268
|
+
],
|
|
269
|
+
value: normalizeToPosixPath("".concat(internalDirAlias, "/").concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_FILE_NAME.replace(".js", "")))
|
|
270
|
+
};
|
|
271
|
+
if (fileSystemRoutes.globalApp) {
|
|
272
|
+
imports.push({
|
|
273
|
+
specifiers: [
|
|
274
|
+
{
|
|
275
|
+
local: "App"
|
|
276
|
+
}
|
|
277
|
+
],
|
|
278
|
+
value: normalizeToPosixPath(fileSystemRoutes.globalApp.replace(srcDirectory, internalSrcAlias))
|
|
279
|
+
});
|
|
263
280
|
} else {
|
|
264
|
-
|
|
265
|
-
specifiers: [
|
|
266
|
-
{
|
|
267
|
-
local: "App"
|
|
268
|
-
}
|
|
269
|
-
],
|
|
270
|
-
value: normalizeToPosixPath(entry.replace(srcDirectory, internalSrcAlias))
|
|
271
|
-
});
|
|
281
|
+
route.initialize = "const App = false;";
|
|
272
282
|
}
|
|
273
|
-
|
|
283
|
+
imports.push(route);
|
|
284
|
+
} else {
|
|
285
|
+
imports.push({
|
|
286
|
+
specifiers: [
|
|
287
|
+
{
|
|
288
|
+
local: "App"
|
|
289
|
+
}
|
|
290
|
+
],
|
|
291
|
+
value: normalizeToPosixPath(entry.replace(srcDirectory, internalSrcAlias))
|
|
292
|
+
});
|
|
293
|
+
}
|
|
294
|
+
return imports;
|
|
274
295
|
};
|
|
275
|
-
var isPageComponentFile = function(filePath) {
|
|
276
|
-
|
|
277
|
-
return false;
|
|
278
|
-
}
|
|
279
|
-
if ([
|
|
280
|
-
".js",
|
|
281
|
-
".jsx",
|
|
282
|
-
".ts",
|
|
283
|
-
".tsx"
|
|
284
|
-
].includes(path.extname(filePath))) {
|
|
285
|
-
return true;
|
|
286
|
-
}
|
|
296
|
+
export var isPageComponentFile = function(filePath) {
|
|
297
|
+
if (/\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/.test(filePath)) {
|
|
287
298
|
return false;
|
|
299
|
+
}
|
|
300
|
+
if ([
|
|
301
|
+
".js",
|
|
302
|
+
".jsx",
|
|
303
|
+
".ts",
|
|
304
|
+
".tsx"
|
|
305
|
+
].includes(path.extname(filePath))) {
|
|
306
|
+
return true;
|
|
307
|
+
}
|
|
308
|
+
return false;
|
|
288
309
|
};
|
|
289
|
-
var replaceWithAlias = function(base, filePath, alias) {
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
310
|
+
export var replaceWithAlias = function(base, filePath, alias) {
|
|
311
|
+
if (filePath.includes(base)) {
|
|
312
|
+
return normalizeToPosixPath(path.join(alias, path.relative(base, filePath)));
|
|
313
|
+
} else {
|
|
314
|
+
return filePath;
|
|
315
|
+
}
|
|
295
316
|
};
|
|
296
|
-
var parseModule = function() {
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
317
|
+
export var parseModule = function() {
|
|
318
|
+
var _ref = _async_to_generator(function(param) {
|
|
319
|
+
var source, filename, content, result;
|
|
320
|
+
return __generator(this, function(_state) {
|
|
321
|
+
switch (_state.label) {
|
|
322
|
+
case 0:
|
|
323
|
+
source = param.source, filename = param.filename;
|
|
324
|
+
content = source;
|
|
325
|
+
if (!JS_EXTENSIONS.some(function(ext) {
|
|
326
|
+
return filename.endsWith(ext);
|
|
327
|
+
}))
|
|
328
|
+
return [
|
|
329
|
+
3,
|
|
330
|
+
2
|
|
331
|
+
];
|
|
332
|
+
return [
|
|
333
|
+
4,
|
|
334
|
+
transform(content, {
|
|
335
|
+
loader: path.extname(filename).slice(1),
|
|
336
|
+
format: "esm"
|
|
337
|
+
})
|
|
338
|
+
];
|
|
339
|
+
case 1:
|
|
340
|
+
result = _state.sent();
|
|
341
|
+
content = result.code;
|
|
342
|
+
_state.label = 2;
|
|
343
|
+
case 2:
|
|
344
|
+
return [
|
|
345
|
+
4,
|
|
346
|
+
parse(content)
|
|
347
|
+
];
|
|
348
|
+
case 3:
|
|
349
|
+
return [
|
|
350
|
+
2,
|
|
351
|
+
_state.sent()
|
|
352
|
+
];
|
|
353
|
+
}
|
|
333
354
|
});
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
355
|
+
});
|
|
356
|
+
return function parseModule2(_) {
|
|
357
|
+
return _ref.apply(this, arguments);
|
|
358
|
+
};
|
|
337
359
|
}();
|
|
338
|
-
var hasLoader = function() {
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
});
|
|
360
|
+
export var hasLoader = function() {
|
|
361
|
+
var _ref = _async_to_generator(function(filename) {
|
|
362
|
+
var source, _ref2, moduleExports;
|
|
363
|
+
return __generator(this, function(_state) {
|
|
364
|
+
switch (_state.label) {
|
|
365
|
+
case 0:
|
|
366
|
+
return [
|
|
367
|
+
4,
|
|
368
|
+
fse.readFile(filename)
|
|
369
|
+
];
|
|
370
|
+
case 1:
|
|
371
|
+
source = _state.sent();
|
|
372
|
+
return [
|
|
373
|
+
4,
|
|
374
|
+
parseModule({
|
|
375
|
+
source: source.toString(),
|
|
376
|
+
filename
|
|
377
|
+
})
|
|
378
|
+
];
|
|
379
|
+
case 2:
|
|
380
|
+
_ref2 = _sliced_to_array.apply(void 0, [
|
|
381
|
+
_state.sent(),
|
|
382
|
+
2
|
|
383
|
+
]), moduleExports = _ref2[1];
|
|
384
|
+
return [
|
|
385
|
+
2,
|
|
386
|
+
moduleExports.some(function(e) {
|
|
387
|
+
return e.n === LOADER_EXPORT_NAME;
|
|
388
|
+
})
|
|
389
|
+
];
|
|
390
|
+
}
|
|
370
391
|
});
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
392
|
+
});
|
|
393
|
+
return function hasLoader2(filename) {
|
|
394
|
+
return _ref.apply(this, arguments);
|
|
395
|
+
};
|
|
374
396
|
}();
|
|
375
|
-
var getServerLoadersFile = function(internalDirectory, entryName) {
|
|
376
|
-
|
|
397
|
+
export var getServerLoadersFile = function(internalDirectory, entryName) {
|
|
398
|
+
return path.join(internalDirectory, entryName, "route-server-loaders.js");
|
|
377
399
|
};
|
|
378
|
-
var getServerCombinedModueFile = function(internalDirectory, entryName) {
|
|
379
|
-
|
|
400
|
+
export var getServerCombinedModueFile = function(internalDirectory, entryName) {
|
|
401
|
+
return path.join(internalDirectory, entryName, "server-loader-combined.js");
|
|
380
402
|
};
|
|
381
|
-
export { getDefaultImports, getServerCombinedModueFile, getServerLoadersFile, hasLoader, isPageComponentFile, parseModule, replaceWithAlias, walkDirectory };
|