@modern-js/app-tools 2.0.0-beta.2 → 2.0.0-canary.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 +251 -0
- package/bin/modern.js +10 -1
- package/dist/js/modern/analyze/constants.js +38 -16
- package/dist/js/modern/analyze/generateCode.js +271 -211
- package/dist/js/modern/analyze/getBundleEntry.js +31 -32
- package/dist/js/modern/analyze/getClientRoutes/getRoutes.js +93 -49
- package/dist/js/modern/analyze/getClientRoutes/getRoutesLegacy.js +89 -47
- package/dist/js/modern/analyze/getClientRoutes/index.js +6 -2
- package/dist/js/modern/analyze/getClientRoutes/utils.js +23 -10
- package/dist/js/modern/analyze/getFileSystemEntry.js +43 -22
- package/dist/js/modern/analyze/getHtmlTemplate.js +89 -49
- package/dist/js/modern/analyze/getServerRoutes.js +122 -126
- package/dist/js/modern/analyze/index.js +193 -159
- package/dist/js/modern/analyze/isDefaultExportFunction.js +30 -16
- package/dist/js/modern/analyze/makeLegalIdentifier.js +10 -11
- package/dist/js/modern/analyze/nestedRoutes.js +110 -53
- package/dist/js/modern/analyze/templates.js +190 -77
- package/dist/js/modern/analyze/utils.js +98 -51
- package/dist/js/modern/builder/builderPlugins/compatModern.js +124 -107
- package/dist/js/modern/builder/index.js +123 -86
- package/dist/js/modern/builder/loaders/routerLoader.js +17 -0
- package/dist/js/modern/builder/loaders/serverModuleLoader.js +7 -0
- package/dist/js/modern/builder/share.js +22 -20
- package/dist/js/modern/builder/webpackPlugins/htmlAsyncChunkPlugin.js +23 -22
- package/dist/js/modern/builder/webpackPlugins/htmlBottomTemplate.js +31 -27
- package/dist/js/modern/builder/webpackPlugins/routerPlugin.js +98 -84
- package/dist/js/modern/commands/build.js +67 -42
- package/dist/js/modern/commands/deploy.js +27 -4
- package/dist/js/modern/commands/dev.js +93 -47
- package/dist/js/modern/commands/index.js +1 -1
- package/dist/js/modern/commands/inspect.js +30 -5
- package/dist/js/modern/commands/start.js +37 -16
- package/dist/js/modern/config/default.js +103 -114
- package/dist/js/modern/config/index.js +8 -2
- package/dist/js/modern/config/initial/createHtmlConfig.js +5 -2
- package/dist/js/modern/config/initial/createOutputConfig.js +11 -9
- package/dist/js/modern/config/initial/createSourceConfig.js +5 -2
- package/dist/js/modern/config/initial/createToolsConfig.js +7 -6
- package/dist/js/modern/config/initial/index.js +9 -4
- package/dist/js/modern/config/initial/inits.js +109 -73
- package/dist/js/modern/config/initial/transformNormalizedConfig.js +6 -3
- package/dist/js/modern/defineConfig.js +26 -11
- package/dist/js/modern/exports/server.js +4 -1
- package/dist/js/modern/hooks.js +10 -3
- package/dist/js/modern/index.js +140 -89
- package/dist/js/modern/initialize/index.js +98 -51
- package/dist/js/modern/locale/en.js +20 -21
- package/dist/js/modern/locale/index.js +6 -6
- package/dist/js/modern/locale/zh.js +21 -22
- package/dist/js/modern/schema/Schema.js +6 -5
- package/dist/js/modern/schema/index.js +51 -100
- package/dist/js/modern/schema/legacy.js +96 -231
- package/dist/js/modern/types/config/index.js +0 -1
- package/dist/js/modern/types/index.js +0 -1
- package/dist/js/modern/types/legacyConfig/output.js +0 -1
- package/dist/js/modern/utils/commands.js +5 -2
- package/dist/js/modern/utils/config.js +102 -41
- package/dist/js/modern/utils/createFileWatcher.js +84 -51
- package/dist/js/modern/utils/createServer.js +63 -17
- package/dist/js/modern/utils/getSpecifiedEntries.js +46 -19
- package/dist/js/modern/utils/language.js +6 -3
- package/dist/js/modern/utils/printInstructions.js +27 -8
- package/dist/js/modern/utils/restart.js +43 -16
- package/dist/js/modern/utils/routes.js +29 -12
- package/dist/js/node/analyze/constants.js +54 -35
- package/dist/js/node/analyze/generateCode.js +290 -228
- package/dist/js/node/analyze/getBundleEntry.js +55 -44
- package/dist/js/node/analyze/getClientRoutes/getRoutes.js +132 -76
- package/dist/js/node/analyze/getClientRoutes/getRoutesLegacy.js +128 -74
- package/dist/js/node/analyze/getClientRoutes/index.js +23 -17
- package/dist/js/node/analyze/getClientRoutes/utils.js +44 -21
- package/dist/js/node/analyze/getFileSystemEntry.js +70 -39
- package/dist/js/node/analyze/getHtmlTemplate.js +116 -61
- package/dist/js/node/analyze/getServerRoutes.js +143 -137
- package/dist/js/node/analyze/index.js +240 -174
- package/dist/js/node/analyze/isDefaultExportFunction.js +55 -26
- package/dist/js/node/analyze/makeLegalIdentifier.js +27 -15
- package/dist/js/node/analyze/nestedRoutes.js +140 -67
- package/dist/js/node/analyze/templates.js +211 -84
- package/dist/js/node/analyze/utils.js +123 -62
- package/dist/js/node/builder/builderPlugins/compatModern.js +152 -120
- package/dist/js/node/builder/index.js +151 -95
- package/dist/js/node/builder/loaders/routerLoader.js +36 -0
- package/dist/js/node/builder/loaders/serverModuleLoader.js +26 -0
- package/dist/js/node/builder/share.js +45 -25
- package/dist/js/node/builder/webpackPlugins/htmlAsyncChunkPlugin.js +39 -26
- package/dist/js/node/builder/webpackPlugins/htmlBottomTemplate.js +47 -31
- package/dist/js/node/builder/webpackPlugins/routerPlugin.js +116 -90
- package/dist/js/node/commands/build.js +89 -52
- package/dist/js/node/commands/deploy.js +45 -10
- package/dist/js/node/commands/dev.js +115 -61
- package/dist/js/node/commands/index.js +19 -38
- package/dist/js/node/commands/inspect.js +48 -11
- package/dist/js/node/commands/start.js +65 -27
- package/dist/js/node/config/default.js +119 -118
- package/dist/js/node/config/index.js +25 -29
- package/dist/js/node/config/initial/createHtmlConfig.js +22 -6
- package/dist/js/node/config/initial/createOutputConfig.js +28 -13
- package/dist/js/node/config/initial/createSourceConfig.js +22 -6
- package/dist/js/node/config/initial/createToolsConfig.js +24 -10
- package/dist/js/node/config/initial/index.js +28 -17
- package/dist/js/node/config/initial/inits.js +126 -81
- package/dist/js/node/config/initial/transformNormalizedConfig.js +31 -15
- package/dist/js/node/defineConfig.js +43 -17
- package/dist/js/node/exports/server.js +21 -10
- package/dist/js/node/hooks.js +44 -29
- package/dist/js/node/index.js +190 -130
- package/dist/js/node/initialize/index.js +116 -61
- package/dist/js/node/locale/en.js +36 -25
- package/dist/js/node/locale/index.js +27 -15
- package/dist/js/node/locale/zh.js +37 -26
- package/dist/js/node/schema/Schema.js +23 -10
- package/dist/js/node/schema/index.js +77 -114
- package/dist/js/node/schema/legacy.js +117 -240
- package/dist/js/node/types/config/index.js +17 -16
- package/dist/js/node/types/index.js +19 -38
- package/dist/js/node/types/legacyConfig/output.js +0 -5
- package/dist/js/node/utils/commands.js +21 -6
- package/dist/js/node/utils/config.js +120 -51
- package/dist/js/node/utils/createFileWatcher.js +104 -60
- package/dist/js/node/utils/createServer.js +86 -25
- package/dist/js/node/utils/getSpecifiedEntries.js +64 -25
- package/dist/js/node/utils/language.js +24 -8
- package/dist/js/node/utils/printInstructions.js +47 -16
- package/dist/js/node/utils/restart.js +61 -21
- package/dist/js/node/utils/routes.js +53 -18
- package/dist/js/treeshaking/analyze/constants.js +28 -16
- package/dist/js/treeshaking/analyze/generateCode.js +604 -355
- package/dist/js/treeshaking/analyze/getBundleEntry.js +52 -63
- package/dist/js/treeshaking/analyze/getClientRoutes/getRoutes.js +214 -168
- package/dist/js/treeshaking/analyze/getClientRoutes/getRoutesLegacy.js +215 -169
- package/dist/js/treeshaking/analyze/getClientRoutes/index.js +3 -2
- package/dist/js/treeshaking/analyze/getClientRoutes/utils.js +19 -20
- package/dist/js/treeshaking/analyze/getFileSystemEntry.js +89 -86
- package/dist/js/treeshaking/analyze/getHtmlTemplate.js +298 -125
- package/dist/js/treeshaking/analyze/getServerRoutes.js +210 -146
- package/dist/js/treeshaking/analyze/index.js +558 -303
- package/dist/js/treeshaking/analyze/isDefaultExportFunction.js +45 -26
- package/dist/js/treeshaking/analyze/makeLegalIdentifier.js +13 -16
- package/dist/js/treeshaking/analyze/nestedRoutes.js +414 -160
- package/dist/js/treeshaking/analyze/templates.js +432 -161
- package/dist/js/treeshaking/analyze/utils.js +361 -80
- package/dist/js/treeshaking/builder/builderPlugins/compatModern.js +281 -195
- package/dist/js/treeshaking/builder/index.js +371 -165
- package/dist/js/treeshaking/builder/loaders/routerLoader.js +13 -0
- package/dist/js/treeshaking/builder/loaders/serverModuleLoader.js +5 -0
- package/dist/js/treeshaking/builder/share.js +41 -44
- package/dist/js/treeshaking/builder/webpackPlugins/htmlAsyncChunkPlugin.js +108 -44
- package/dist/js/treeshaking/builder/webpackPlugins/htmlBottomTemplate.js +70 -39
- package/dist/js/treeshaking/builder/webpackPlugins/routerPlugin.js +332 -112
- package/dist/js/treeshaking/commands/build.js +286 -88
- package/dist/js/treeshaking/commands/deploy.js +153 -25
- package/dist/js/treeshaking/commands/dev.js +318 -132
- package/dist/js/treeshaking/commands/index.js +1 -1
- package/dist/js/treeshaking/commands/inspect.js +147 -32
- package/dist/js/treeshaking/commands/start.js +190 -68
- package/dist/js/treeshaking/config/default.js +210 -199
- package/dist/js/treeshaking/config/index.js +3 -2
- package/dist/js/treeshaking/config/initial/createHtmlConfig.js +19 -31
- package/dist/js/treeshaking/config/initial/createOutputConfig.js +43 -67
- package/dist/js/treeshaking/config/initial/createSourceConfig.js +37 -40
- package/dist/js/treeshaking/config/initial/createToolsConfig.js +23 -38
- package/dist/js/treeshaking/config/initial/index.js +10 -9
- package/dist/js/treeshaking/config/initial/inits.js +205 -106
- package/dist/js/treeshaking/config/initial/transformNormalizedConfig.js +27 -34
- package/dist/js/treeshaking/defineConfig.js +60 -13
- package/dist/js/treeshaking/exports/server.js +2 -1
- package/dist/js/treeshaking/hooks.js +26 -25
- package/dist/js/treeshaking/index.js +465 -257
- package/dist/js/treeshaking/initialize/index.js +290 -112
- package/dist/js/treeshaking/locale/en.js +34 -33
- package/dist/js/treeshaking/locale/index.js +5 -5
- package/dist/js/treeshaking/locale/zh.js +34 -33
- package/dist/js/treeshaking/schema/Schema.js +267 -69
- package/dist/js/treeshaking/schema/index.js +165 -121
- package/dist/js/treeshaking/schema/legacy.js +323 -256
- package/dist/js/treeshaking/types/config/deploy.js +1 -0
- package/dist/js/treeshaking/types/config/dev.js +1 -0
- package/dist/js/treeshaking/types/config/experiments.js +1 -0
- package/dist/js/treeshaking/types/config/html.js +1 -0
- package/dist/js/treeshaking/types/config/index.js +0 -1
- package/dist/js/treeshaking/types/config/output.js +1 -0
- package/dist/js/treeshaking/types/config/performance.js +1 -0
- package/dist/js/treeshaking/types/config/security.js +1 -0
- package/dist/js/treeshaking/types/config/source.js +1 -0
- package/dist/js/treeshaking/types/config/tools.js +1 -0
- package/dist/js/treeshaking/types/hooks.js +1 -0
- package/dist/js/treeshaking/types/index.js +0 -1
- package/dist/js/treeshaking/types/legacyConfig/deploy.js +1 -0
- package/dist/js/treeshaking/types/legacyConfig/dev.js +1 -0
- package/dist/js/treeshaking/types/legacyConfig/index.js +1 -0
- package/dist/js/treeshaking/types/legacyConfig/output.js +1 -1
- package/dist/js/treeshaking/types/legacyConfig/source.js +1 -0
- package/dist/js/treeshaking/types/legacyConfig/tools.js +1 -0
- package/dist/js/treeshaking/utils/commands.js +6 -5
- package/dist/js/treeshaking/utils/config.js +295 -117
- package/dist/js/treeshaking/utils/createFileWatcher.js +278 -118
- package/dist/js/treeshaking/utils/createServer.js +252 -67
- package/dist/js/treeshaking/utils/getSpecifiedEntries.js +182 -55
- package/dist/js/treeshaking/utils/language.js +6 -5
- package/dist/js/treeshaking/utils/printInstructions.js +151 -29
- package/dist/js/treeshaking/utils/restart.js +184 -42
- package/dist/js/treeshaking/utils/routes.js +151 -27
- package/dist/js/treeshaking/utils/types.js +1 -0
- package/dist/types/analyze/constants.d.ts +2 -0
- package/dist/types/analyze/index.d.ts +2 -0
- package/dist/types/analyze/templates.d.ts +8 -7
- package/dist/types/analyze/utils.d.ts +9 -1
- package/dist/types/builder/builderPlugins/compatModern.d.ts +2 -1
- package/dist/types/builder/index.d.ts +2 -2
- package/dist/types/builder/loaders/routerLoader.d.ts +3 -0
- package/dist/types/builder/loaders/serverModuleLoader.d.ts +3 -0
- package/dist/types/builder/webpackPlugins/routerPlugin.d.ts +1 -7
- package/dist/types/defineConfig.d.ts +1 -0
- package/dist/types/index.d.ts +2 -0
- package/dist/types/initialize/index.d.ts +2 -0
- package/dist/types/types/config/index.d.ts +1 -0
- package/dist/types/types/config/output.d.ts +0 -1
- package/dist/types/types/config/source.d.ts +1 -0
- package/dist/types/types/config/tools.d.ts +10 -1
- package/dist/types/types/hooks.d.ts +2 -1
- package/dist/types/types/legacyConfig/dev.d.ts +1 -0
- package/dist/types/types/legacyConfig/output.d.ts +1 -1
- package/dist/types/types/legacyConfig/source.d.ts +1 -0
- package/dist/types/types/legacyConfig/tools.d.ts +1 -0
- package/dist/types/utils/config.d.ts +1 -0
- package/dist/types/utils/createFileWatcher.d.ts +2 -1
- package/dist/types/utils/createServer.d.ts +1 -0
- package/dist/types/utils/restart.d.ts +1 -1
- package/lib/types.d.ts +1 -1
- package/package.json +27 -23
|
@@ -1,79 +1,124 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
1
|
+
var __create = Object.create;
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
6
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
7
|
+
var __export = (target, all) => {
|
|
8
|
+
for (var name in all)
|
|
9
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
10
|
+
};
|
|
11
|
+
var __copyProps = (to, from, except, desc) => {
|
|
12
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
13
|
+
for (let key of __getOwnPropNames(from))
|
|
14
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
15
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
16
|
+
}
|
|
17
|
+
return to;
|
|
18
|
+
};
|
|
19
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
20
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
21
|
+
mod
|
|
22
|
+
));
|
|
23
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
24
|
+
var stdin_exports = {};
|
|
25
|
+
__export(stdin_exports, {
|
|
26
|
+
initHtmlConfig: () => initHtmlConfig,
|
|
27
|
+
initSourceConfig: () => initSourceConfig,
|
|
28
|
+
initToolsConfig: () => initToolsConfig
|
|
5
29
|
});
|
|
6
|
-
exports
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
var
|
|
10
|
-
var
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
30
|
+
module.exports = __toCommonJS(stdin_exports);
|
|
31
|
+
var import_path = __toESM(require("path"));
|
|
32
|
+
var import_utils = require("@modern-js/utils");
|
|
33
|
+
var __defProp2 = Object.defineProperty;
|
|
34
|
+
var __defProps = Object.defineProperties;
|
|
35
|
+
var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
|
|
36
|
+
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
37
|
+
var __hasOwnProp2 = Object.prototype.hasOwnProperty;
|
|
38
|
+
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
39
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
40
|
+
var __spreadValues = (a, b) => {
|
|
41
|
+
for (var prop in b || (b = {}))
|
|
42
|
+
if (__hasOwnProp2.call(b, prop))
|
|
43
|
+
__defNormalProp(a, prop, b[prop]);
|
|
44
|
+
if (__getOwnPropSymbols)
|
|
45
|
+
for (var prop of __getOwnPropSymbols(b)) {
|
|
46
|
+
if (__propIsEnum.call(b, prop))
|
|
47
|
+
__defNormalProp(a, prop, b[prop]);
|
|
48
|
+
}
|
|
49
|
+
return a;
|
|
50
|
+
};
|
|
51
|
+
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
16
52
|
function initHtmlConfig(config, appContext) {
|
|
17
|
-
const ICON_EXTENSIONS = [
|
|
53
|
+
const ICON_EXTENSIONS = ["png", "jpg", "jpeg", "svg", "ico"];
|
|
18
54
|
config.html.appIcon = createBuilderAppIcon(config, appContext);
|
|
19
55
|
config.html.favicon = createBuilderFavicon(config, appContext);
|
|
20
56
|
return config.html;
|
|
21
|
-
function createBuilderAppIcon(
|
|
22
|
-
const {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
57
|
+
function createBuilderAppIcon(config2, appContext2) {
|
|
58
|
+
const { configDir } = config2.source;
|
|
59
|
+
const appIcon = (0, import_utils.findExists)(
|
|
60
|
+
ICON_EXTENSIONS.map(
|
|
61
|
+
(ext) => import_path.default.resolve(
|
|
62
|
+
appContext2.appDirectory,
|
|
63
|
+
configDir || "./config",
|
|
64
|
+
`icon.${ext}`
|
|
65
|
+
)
|
|
66
|
+
)
|
|
67
|
+
);
|
|
68
|
+
return typeof appIcon === "string" ? appIcon : void 0;
|
|
27
69
|
}
|
|
28
|
-
function createBuilderFavicon(
|
|
29
|
-
const {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
70
|
+
function createBuilderFavicon(config2, appContext2) {
|
|
71
|
+
const { configDir } = config2.source;
|
|
72
|
+
const { favicon } = config2.html;
|
|
73
|
+
const defaultFavicon = (0, import_utils.findExists)(
|
|
74
|
+
ICON_EXTENSIONS.map(
|
|
75
|
+
(ext) => import_path.default.resolve(
|
|
76
|
+
appContext2.appDirectory,
|
|
77
|
+
configDir || "./config",
|
|
78
|
+
`favicon.${ext}`
|
|
79
|
+
)
|
|
80
|
+
)
|
|
81
|
+
);
|
|
82
|
+
return favicon || defaultFavicon || void 0;
|
|
37
83
|
}
|
|
38
84
|
}
|
|
39
85
|
function initSourceConfig(config, appContext) {
|
|
40
86
|
config.source.include = createBuilderInclude(config, appContext);
|
|
41
87
|
config.source.moduleScopes = createBuilderModuleScope(config);
|
|
42
|
-
function createBuilderInclude(
|
|
43
|
-
const {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
if ((0, _path.isAbsolute)(include)) {
|
|
50
|
-
return include;
|
|
88
|
+
function createBuilderInclude(config2, appContext2) {
|
|
89
|
+
const { include } = config2.source;
|
|
90
|
+
const defaultInclude = [appContext2.internalDirectory];
|
|
91
|
+
const transformInclude = (include || []).map((include2) => {
|
|
92
|
+
if (typeof include2 === "string") {
|
|
93
|
+
if ((0, import_path.isAbsolute)(include2)) {
|
|
94
|
+
return include2;
|
|
51
95
|
}
|
|
52
|
-
return new RegExp(
|
|
96
|
+
return new RegExp(include2);
|
|
53
97
|
}
|
|
54
|
-
return
|
|
55
|
-
}).concat(defaultInclude);
|
|
56
|
-
|
|
57
|
-
const root = (0, _utils.findMonorepoRoot)(appContext.appDirectory);
|
|
98
|
+
return include2;
|
|
99
|
+
}).concat(defaultInclude);
|
|
100
|
+
const root = (0, import_utils.findMonorepoRoot)(appContext2.appDirectory);
|
|
58
101
|
if (!root) {
|
|
59
102
|
return transformInclude;
|
|
60
103
|
}
|
|
61
|
-
const modernjsMonorepo = (0,
|
|
104
|
+
const modernjsMonorepo = (0, import_utils.isModernjsMonorepo)(root);
|
|
62
105
|
if (modernjsMonorepo) {
|
|
63
|
-
const paths =
|
|
64
|
-
ignore: [
|
|
65
|
-
}).map(pathname => (0,
|
|
106
|
+
const paths = import_utils.globby.sync(import_path.posix.join(root, "features", "**", "package.json"), {
|
|
107
|
+
ignore: ["**/node_modules/**/*"]
|
|
108
|
+
}).map((pathname) => (0, import_path.dirname)(pathname) + import_path.sep);
|
|
66
109
|
return [...paths, ...transformInclude];
|
|
67
110
|
}
|
|
68
111
|
return transformInclude;
|
|
69
112
|
}
|
|
70
|
-
function createBuilderModuleScope(
|
|
71
|
-
const {
|
|
72
|
-
moduleScopes
|
|
73
|
-
} = config.source;
|
|
113
|
+
function createBuilderModuleScope(config2) {
|
|
114
|
+
const { moduleScopes } = config2.source;
|
|
74
115
|
if (moduleScopes) {
|
|
75
116
|
let builderModuleScope = [];
|
|
76
|
-
const DEFAULT_SCOPES = [
|
|
117
|
+
const DEFAULT_SCOPES = [
|
|
118
|
+
"./src",
|
|
119
|
+
"./shared",
|
|
120
|
+
/node_modules/
|
|
121
|
+
];
|
|
77
122
|
if (Array.isArray(moduleScopes)) {
|
|
78
123
|
if (isPrimitiveScope(moduleScopes)) {
|
|
79
124
|
builderModuleScope = DEFAULT_SCOPES.concat(moduleScopes);
|
|
@@ -85,43 +130,43 @@ function initSourceConfig(config, appContext) {
|
|
|
85
130
|
}
|
|
86
131
|
return builderModuleScope;
|
|
87
132
|
} else {
|
|
88
|
-
return
|
|
133
|
+
return void 0;
|
|
89
134
|
}
|
|
90
135
|
function isPrimitiveScope(items) {
|
|
91
|
-
return items.every(
|
|
136
|
+
return items.every(
|
|
137
|
+
(item) => typeof item === "string" || Object.prototype.toString.call(item) === "[object RegExp]"
|
|
138
|
+
);
|
|
92
139
|
}
|
|
93
140
|
}
|
|
94
141
|
}
|
|
95
142
|
function initToolsConfig(config) {
|
|
96
143
|
const defaultTsChecker = {
|
|
97
144
|
issue: {
|
|
98
|
-
include: [{
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
}, {
|
|
104
|
-
file: '**/node_modules/**/*'
|
|
105
|
-
}]
|
|
145
|
+
include: [{ file: "**/src/**/*" }],
|
|
146
|
+
exclude: [
|
|
147
|
+
{ file: "**/*.(spec|test).ts" },
|
|
148
|
+
{ file: "**/node_modules/**/*" }
|
|
149
|
+
]
|
|
106
150
|
}
|
|
107
151
|
};
|
|
108
|
-
const {
|
|
109
|
-
|
|
110
|
-
tsLoader,
|
|
111
|
-
htmlPlugin
|
|
112
|
-
} = config.tools;
|
|
113
|
-
config.tools.tsChecker = (0, _utils.applyOptionsChain)(defaultTsChecker, tsChecker);
|
|
152
|
+
const { tsChecker, tsLoader, htmlPlugin } = config.tools;
|
|
153
|
+
config.tools.tsChecker = (0, import_utils.applyOptionsChain)(defaultTsChecker, tsChecker);
|
|
114
154
|
tsLoader && (config.tools.tsLoader = (tsLoaderConfig, utils) => {
|
|
115
|
-
(0,
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
155
|
+
(0, import_utils.applyOptionsChain)(
|
|
156
|
+
__spreadProps(__spreadValues({}, tsLoaderConfig), {
|
|
157
|
+
transpileOnly: false,
|
|
158
|
+
allowTsInNodeModules: true
|
|
159
|
+
}),
|
|
160
|
+
tsLoader || {},
|
|
161
|
+
utils
|
|
162
|
+
);
|
|
119
163
|
});
|
|
120
|
-
config.tools.htmlPlugin = [
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
164
|
+
config.tools.htmlPlugin = [
|
|
165
|
+
(config2) => __spreadProps(__spreadValues({}, config2), {
|
|
166
|
+
minify: typeof config2.minify === "object" ? __spreadProps(__spreadValues({}, config2.minify), {
|
|
167
|
+
removeComments: false
|
|
168
|
+
}) : config2.minify
|
|
169
|
+
}),
|
|
170
|
+
...Array.isArray(htmlPlugin) ? htmlPlugin : htmlPlugin ? [htmlPlugin] : []
|
|
171
|
+
];
|
|
172
|
+
}
|
|
@@ -1,18 +1,34 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
3
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
4
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
+
var __export = (target, all) => {
|
|
6
|
+
for (var name in all)
|
|
7
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
8
|
+
};
|
|
9
|
+
var __copyProps = (to, from, except, desc) => {
|
|
10
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
11
|
+
for (let key of __getOwnPropNames(from))
|
|
12
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
13
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
14
|
+
}
|
|
15
|
+
return to;
|
|
16
|
+
};
|
|
17
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
+
var stdin_exports = {};
|
|
19
|
+
__export(stdin_exports, {
|
|
20
|
+
transformNormalizedConfig: () => transformNormalizedConfig
|
|
5
21
|
});
|
|
6
|
-
exports
|
|
7
|
-
var
|
|
8
|
-
var
|
|
9
|
-
var
|
|
10
|
-
var
|
|
22
|
+
module.exports = __toCommonJS(stdin_exports);
|
|
23
|
+
var import_createToolsConfig = require("./createToolsConfig");
|
|
24
|
+
var import_createSourceConfig = require("./createSourceConfig");
|
|
25
|
+
var import_createOutputConfig = require("./createOutputConfig");
|
|
26
|
+
var import_createHtmlConfig = require("./createHtmlConfig");
|
|
11
27
|
function transformNormalizedConfig(config) {
|
|
12
|
-
const html = (0,
|
|
13
|
-
const output = (0,
|
|
14
|
-
const source = (0,
|
|
15
|
-
const tools = (0,
|
|
28
|
+
const html = (0, import_createHtmlConfig.createHtmlConfig)(config);
|
|
29
|
+
const output = (0, import_createOutputConfig.createOutputConfig)(config);
|
|
30
|
+
const source = (0, import_createSourceConfig.createSourceConfig)(config);
|
|
31
|
+
const tools = (0, import_createToolsConfig.createToolsConfig)(config);
|
|
16
32
|
const {
|
|
17
33
|
bff,
|
|
18
34
|
dev,
|
|
@@ -37,10 +53,10 @@ function transformNormalizedConfig(config) {
|
|
|
37
53
|
server,
|
|
38
54
|
cliOptions,
|
|
39
55
|
testing,
|
|
40
|
-
plugins
|
|
56
|
+
plugins,
|
|
41
57
|
security: {},
|
|
42
58
|
_raw: {},
|
|
43
59
|
experiments: {},
|
|
44
60
|
performance: {}
|
|
45
61
|
};
|
|
46
|
-
}
|
|
62
|
+
}
|
|
@@ -1,20 +1,46 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
3
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
4
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
+
var __export = (target, all) => {
|
|
6
|
+
for (var name in all)
|
|
7
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
8
|
+
};
|
|
9
|
+
var __copyProps = (to, from, except, desc) => {
|
|
10
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
11
|
+
for (let key of __getOwnPropNames(from))
|
|
12
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
13
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
14
|
+
}
|
|
15
|
+
return to;
|
|
16
|
+
};
|
|
17
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
+
var stdin_exports = {};
|
|
19
|
+
__export(stdin_exports, {
|
|
20
|
+
defineConfig: () => defineConfig,
|
|
21
|
+
defineLegacyConfig: () => defineLegacyConfig
|
|
5
22
|
});
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
23
|
+
module.exports = __toCommonJS(stdin_exports);
|
|
24
|
+
var __defProp2 = Object.defineProperty;
|
|
25
|
+
var __defProps = Object.defineProperties;
|
|
26
|
+
var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
|
|
27
|
+
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
28
|
+
var __hasOwnProp2 = Object.prototype.hasOwnProperty;
|
|
29
|
+
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
30
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
31
|
+
var __spreadValues = (a, b) => {
|
|
32
|
+
for (var prop in b || (b = {}))
|
|
33
|
+
if (__hasOwnProp2.call(b, prop))
|
|
34
|
+
__defNormalProp(a, prop, b[prop]);
|
|
35
|
+
if (__getOwnPropSymbols)
|
|
36
|
+
for (var prop of __getOwnPropSymbols(b)) {
|
|
37
|
+
if (__propIsEnum.call(b, prop))
|
|
38
|
+
__defNormalProp(a, prop, b[prop]);
|
|
39
|
+
}
|
|
40
|
+
return a;
|
|
41
|
+
};
|
|
42
|
+
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
43
|
+
const defineConfig = (config) => config;
|
|
44
|
+
const defineLegacyConfig = (config) => __spreadProps(__spreadValues({}, config), {
|
|
18
45
|
legacy: true
|
|
19
46
|
});
|
|
20
|
-
exports.defineLegacyConfig = defineLegacyConfig;
|
|
@@ -1,12 +1,23 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
3
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
4
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
+
var __export = (target, all) => {
|
|
6
|
+
for (var name in all)
|
|
7
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
8
|
+
};
|
|
9
|
+
var __copyProps = (to, from, except, desc) => {
|
|
10
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
11
|
+
for (let key of __getOwnPropNames(from))
|
|
12
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
13
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
10
14
|
}
|
|
15
|
+
return to;
|
|
16
|
+
};
|
|
17
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
+
var stdin_exports = {};
|
|
19
|
+
__export(stdin_exports, {
|
|
20
|
+
defineConfig: () => import_config.defineServerConfig
|
|
11
21
|
});
|
|
12
|
-
|
|
22
|
+
module.exports = __toCommonJS(stdin_exports);
|
|
23
|
+
var import_config = require("../utils/config");
|
package/dist/js/node/hooks.js
CHANGED
|
@@ -1,32 +1,47 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
3
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
4
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
+
var __export = (target, all) => {
|
|
6
|
+
for (var name in all)
|
|
7
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
8
|
+
};
|
|
9
|
+
var __copyProps = (to, from, except, desc) => {
|
|
10
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
11
|
+
for (let key of __getOwnPropNames(from))
|
|
12
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
13
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
14
|
+
}
|
|
15
|
+
return to;
|
|
16
|
+
};
|
|
17
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
+
var stdin_exports = {};
|
|
19
|
+
__export(stdin_exports, {
|
|
20
|
+
hooks: () => hooks
|
|
5
21
|
});
|
|
6
|
-
exports
|
|
7
|
-
var
|
|
22
|
+
module.exports = __toCommonJS(stdin_exports);
|
|
23
|
+
var import_plugin = require("@modern-js/plugin");
|
|
8
24
|
const hooks = {
|
|
9
|
-
modifyEntryExport: (0,
|
|
10
|
-
modifyEntryImports: (0,
|
|
11
|
-
modifyEntryRuntimePlugins: (0,
|
|
12
|
-
modifyEntryRenderFunction: (0,
|
|
13
|
-
modifyAsyncEntry: (0,
|
|
14
|
-
modifyFileSystemRoutes: (0,
|
|
15
|
-
modifyServerRoutes: (0,
|
|
16
|
-
htmlPartials: (0,
|
|
17
|
-
beforeGenerateRoutes: (0,
|
|
18
|
-
addDefineTypes: (0,
|
|
19
|
-
beforeDev: (0,
|
|
20
|
-
afterDev: (0,
|
|
21
|
-
beforeCreateCompiler: (0,
|
|
22
|
-
afterCreateCompiler: (0,
|
|
23
|
-
beforePrintInstructions: (0,
|
|
24
|
-
beforeBuild: (0,
|
|
25
|
-
afterBuild: (0,
|
|
26
|
-
beforeDeploy: (0,
|
|
27
|
-
afterDeploy: (0,
|
|
28
|
-
watchFiles: (0,
|
|
29
|
-
fileChange: (0,
|
|
30
|
-
beforeRestart: (0,
|
|
25
|
+
modifyEntryExport: (0, import_plugin.createAsyncWaterfall)(),
|
|
26
|
+
modifyEntryImports: (0, import_plugin.createAsyncWaterfall)(),
|
|
27
|
+
modifyEntryRuntimePlugins: (0, import_plugin.createAsyncWaterfall)(),
|
|
28
|
+
modifyEntryRenderFunction: (0, import_plugin.createAsyncWaterfall)(),
|
|
29
|
+
modifyAsyncEntry: (0, import_plugin.createAsyncWaterfall)(),
|
|
30
|
+
modifyFileSystemRoutes: (0, import_plugin.createAsyncWaterfall)(),
|
|
31
|
+
modifyServerRoutes: (0, import_plugin.createAsyncWaterfall)(),
|
|
32
|
+
htmlPartials: (0, import_plugin.createAsyncWaterfall)(),
|
|
33
|
+
beforeGenerateRoutes: (0, import_plugin.createAsyncWaterfall)(),
|
|
34
|
+
addDefineTypes: (0, import_plugin.createAsyncWaterfall)(),
|
|
35
|
+
beforeDev: (0, import_plugin.createAsyncWorkflow)(),
|
|
36
|
+
afterDev: (0, import_plugin.createAsyncWorkflow)(),
|
|
37
|
+
beforeCreateCompiler: (0, import_plugin.createAsyncWorkflow)(),
|
|
38
|
+
afterCreateCompiler: (0, import_plugin.createAsyncWorkflow)(),
|
|
39
|
+
beforePrintInstructions: (0, import_plugin.createAsyncWaterfall)(),
|
|
40
|
+
beforeBuild: (0, import_plugin.createAsyncWorkflow)(),
|
|
41
|
+
afterBuild: (0, import_plugin.createAsyncWorkflow)(),
|
|
42
|
+
beforeDeploy: (0, import_plugin.createAsyncWorkflow)(),
|
|
43
|
+
afterDeploy: (0, import_plugin.createAsyncWorkflow)(),
|
|
44
|
+
watchFiles: (0, import_plugin.createParallelWorkflow)(),
|
|
45
|
+
fileChange: (0, import_plugin.createAsyncWorkflow)(),
|
|
46
|
+
beforeRestart: (0, import_plugin.createAsyncWorkflow)()
|
|
31
47
|
};
|
|
32
|
-
exports.hooks = hooks;
|