@modern-js/app-tools 2.0.0-beta.3 → 2.0.0-beta.6
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 +619 -0
- package/bin/modern.js +3 -0
- package/dist/js/modern/analyze/Builder.js +39 -0
- package/dist/js/modern/analyze/constants.js +48 -18
- package/dist/js/modern/analyze/generateCode.js +264 -225
- package/dist/js/modern/analyze/getBundleEntry.js +34 -32
- package/dist/js/modern/analyze/getClientRoutes/getRoutes.js +99 -52
- 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 +52 -23
- 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 +204 -161
- 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 +118 -65
- package/dist/js/modern/analyze/templates.js +170 -81
- package/dist/js/modern/analyze/utils.js +104 -67
- package/dist/js/modern/builder/builderPlugins/compatModern.js +128 -109
- package/dist/js/modern/builder/index.js +120 -89
- package/dist/js/modern/builder/loaders/routerLoader.js +9 -12
- package/dist/js/modern/builder/loaders/serverModuleLoader.js +4 -1
- package/dist/js/modern/builder/share.js +23 -21
- 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 +100 -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 +81 -34
- package/dist/js/modern/commands/index.js +1 -1
- package/dist/js/modern/commands/inspect.js +30 -5
- package/dist/js/modern/commands/serve.js +54 -0
- package/dist/js/modern/config/default.js +112 -145
- 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 +10 -13
- package/dist/js/modern/config/initial/createSourceConfig.js +10 -3
- 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 +11 -4
- package/dist/js/modern/defineConfig.js +26 -11
- package/dist/js/modern/exports/server.js +4 -1
- package/dist/js/modern/hooks.js +16 -4
- package/dist/js/modern/index.js +178 -90
- package/dist/js/modern/initialize/index.js +100 -52
- 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 +53 -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 +10 -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/getServerInternalPlugins.js +58 -0
- 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/Builder.js +64 -0
- package/dist/js/node/analyze/constants.js +86 -39
- package/dist/js/node/analyze/generateCode.js +285 -239
- package/dist/js/node/analyze/getBundleEntry.js +62 -44
- package/dist/js/node/analyze/getClientRoutes/getRoutes.js +138 -77
- package/dist/js/node/analyze/getClientRoutes/getRoutesLegacy.js +130 -74
- package/dist/js/node/analyze/getClientRoutes/index.js +27 -16
- package/dist/js/node/analyze/getClientRoutes/utils.js +51 -21
- package/dist/js/node/analyze/getFileSystemEntry.js +82 -39
- package/dist/js/node/analyze/getHtmlTemplate.js +120 -61
- package/dist/js/node/analyze/getServerRoutes.js +145 -137
- package/dist/js/node/analyze/index.js +233 -174
- package/dist/js/node/analyze/isDefaultExportFunction.js +59 -26
- package/dist/js/node/analyze/makeLegalIdentifier.js +31 -15
- package/dist/js/node/analyze/nestedRoutes.js +150 -79
- package/dist/js/node/analyze/templates.js +198 -90
- package/dist/js/node/analyze/utils.js +136 -81
- package/dist/js/node/builder/builderPlugins/compatModern.js +158 -122
- package/dist/js/node/builder/index.js +142 -98
- package/dist/js/node/builder/loaders/routerLoader.js +29 -18
- package/dist/js/node/builder/loaders/serverModuleLoader.js +24 -7
- package/dist/js/node/builder/share.js +50 -26
- package/dist/js/node/builder/webpackPlugins/htmlAsyncChunkPlugin.js +43 -26
- package/dist/js/node/builder/webpackPlugins/htmlBottomTemplate.js +51 -31
- package/dist/js/node/builder/webpackPlugins/routerPlugin.js +120 -90
- package/dist/js/node/commands/build.js +91 -52
- package/dist/js/node/commands/deploy.js +49 -10
- package/dist/js/node/commands/dev.js +105 -48
- package/dist/js/node/commands/index.js +19 -38
- package/dist/js/node/commands/inspect.js +52 -11
- package/dist/js/node/commands/serve.js +83 -0
- package/dist/js/node/config/default.js +131 -149
- package/dist/js/node/config/index.js +31 -28
- package/dist/js/node/config/initial/createHtmlConfig.js +26 -6
- package/dist/js/node/config/initial/createOutputConfig.js +31 -17
- package/dist/js/node/config/initial/createSourceConfig.js +31 -7
- package/dist/js/node/config/initial/createToolsConfig.js +28 -10
- package/dist/js/node/config/initial/index.js +34 -17
- package/dist/js/node/config/initial/inits.js +130 -81
- package/dist/js/node/config/initial/transformNormalizedConfig.js +40 -16
- package/dist/js/node/defineConfig.js +46 -17
- package/dist/js/node/exports/server.js +25 -10
- package/dist/js/node/hooks.js +53 -29
- package/dist/js/node/index.js +213 -129
- package/dist/js/node/initialize/index.js +117 -61
- package/dist/js/node/locale/en.js +40 -25
- package/dist/js/node/locale/index.js +31 -14
- package/dist/js/node/locale/zh.js +41 -26
- package/dist/js/node/schema/Schema.js +27 -10
- package/dist/js/node/schema/index.js +84 -114
- package/dist/js/node/schema/legacy.js +119 -240
- package/dist/js/node/types/config/deploy.js +15 -0
- package/dist/js/node/types/config/dev.js +15 -0
- package/dist/js/node/types/config/experiments.js +15 -0
- package/dist/js/node/types/config/html.js +15 -0
- package/dist/js/node/types/config/index.js +17 -16
- package/dist/js/node/types/config/output.js +15 -0
- package/dist/js/node/types/config/performance.js +15 -0
- package/dist/js/node/types/config/security.js +15 -0
- package/dist/js/node/types/config/source.js +15 -0
- package/dist/js/node/types/config/tools.js +15 -0
- package/dist/js/node/types/hooks.js +15 -0
- package/dist/js/node/types/index.js +19 -38
- package/dist/js/node/types/legacyConfig/deploy.js +15 -0
- package/dist/js/node/types/legacyConfig/dev.js +15 -0
- package/dist/js/node/types/legacyConfig/index.js +15 -0
- package/dist/js/node/types/legacyConfig/output.js +15 -5
- package/dist/js/node/types/legacyConfig/source.js +15 -0
- package/dist/js/node/types/legacyConfig/tools.js +15 -0
- package/dist/js/node/utils/commands.js +31 -6
- package/dist/js/node/utils/config.js +125 -51
- package/dist/js/node/utils/createFileWatcher.js +109 -61
- package/dist/js/node/utils/createServer.js +92 -25
- package/dist/js/node/utils/getServerInternalPlugins.js +79 -0
- package/dist/js/node/utils/getSpecifiedEntries.js +68 -25
- package/dist/js/node/utils/language.js +28 -8
- package/dist/js/node/utils/printInstructions.js +51 -16
- package/dist/js/node/utils/restart.js +65 -21
- package/dist/js/node/utils/routes.js +58 -19
- package/dist/js/node/utils/types.js +15 -0
- package/dist/js/treeshaking/analyze/Builder.js +199 -0
- package/dist/js/treeshaking/analyze/constants.js +37 -18
- package/dist/js/treeshaking/analyze/generateCode.js +597 -407
- package/dist/js/treeshaking/analyze/getBundleEntry.js +55 -63
- package/dist/js/treeshaking/analyze/getClientRoutes/getRoutes.js +217 -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 +97 -86
- package/dist/js/treeshaking/analyze/getHtmlTemplate.js +298 -125
- package/dist/js/treeshaking/analyze/getServerRoutes.js +210 -147
- package/dist/js/treeshaking/analyze/index.js +575 -305
- 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 +419 -201
- package/dist/js/treeshaking/analyze/templates.js +438 -236
- package/dist/js/treeshaking/analyze/utils.js +367 -153
- package/dist/js/treeshaking/builder/builderPlugins/compatModern.js +285 -199
- package/dist/js/treeshaking/builder/index.js +365 -165
- package/dist/js/treeshaking/builder/loaders/routerLoader.js +11 -12
- package/dist/js/treeshaking/builder/loaders/serverModuleLoader.js +3 -2
- package/dist/js/treeshaking/builder/share.js +38 -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 +334 -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 +313 -131
- package/dist/js/treeshaking/commands/index.js +1 -1
- package/dist/js/treeshaking/commands/inspect.js +147 -32
- package/dist/js/treeshaking/commands/serve.js +199 -0
- package/dist/js/treeshaking/config/default.js +207 -198
- 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 +41 -70
- package/dist/js/treeshaking/config/initial/createSourceConfig.js +41 -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 +31 -34
- package/dist/js/treeshaking/defineConfig.js +60 -13
- package/dist/js/treeshaking/exports/server.js +2 -1
- package/dist/js/treeshaking/hooks.js +31 -25
- package/dist/js/treeshaking/index.js +681 -256
- package/dist/js/treeshaking/initialize/index.js +292 -113
- 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 +171 -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 +10 -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/getServerInternalPlugins.js +210 -0
- 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/Builder.d.ts +8 -0
- package/dist/types/analyze/constants.d.ts +10 -1
- package/dist/types/analyze/index.d.ts +2 -0
- package/dist/types/analyze/templates.d.ts +3 -1
- package/dist/types/analyze/utils.d.ts +2 -1
- package/dist/types/builder/builderPlugins/compatModern.d.ts +2 -1
- package/dist/types/builder/index.d.ts +3 -3
- package/dist/types/builder/webpackPlugins/routerPlugin.d.ts +1 -7
- package/dist/types/commands/index.d.ts +1 -1
- package/dist/types/commands/{start.d.ts → serve.d.ts} +0 -0
- package/dist/types/defineConfig.d.ts +1 -0
- package/dist/types/index.d.ts +7 -1
- package/dist/types/initialize/index.d.ts +2 -0
- package/dist/types/locale/en.d.ts +1 -1
- package/dist/types/locale/index.d.ts +2 -2
- package/dist/types/locale/zh.d.ts +1 -1
- package/dist/types/types/config/dev.d.ts +2 -2
- package/dist/types/types/config/index.d.ts +4 -0
- package/dist/types/types/config/output.d.ts +0 -1
- package/dist/types/types/config/source.d.ts +2 -0
- package/dist/types/types/config/tools.d.ts +2 -0
- package/dist/types/types/hooks.d.ts +8 -0
- 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/commands.d.ts +2 -1
- package/dist/types/utils/config.d.ts +1 -0
- package/dist/types/utils/createServer.d.ts +1 -0
- package/dist/types/utils/getServerInternalPlugins.d.ts +2 -0
- package/dist/types/utils/restart.d.ts +1 -1
- package/package.json +26 -22
- package/dist/js/modern/commands/start.js +0 -30
- package/dist/js/node/commands/start.js +0 -38
- package/dist/js/treeshaking/commands/start.js +0 -69
|
@@ -1,70 +1,41 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
dataUriLimit: {
|
|
43
|
-
svg: dataUriLimit,
|
|
44
|
-
image: dataUriLimit,
|
|
45
|
-
font: dataUriLimit,
|
|
46
|
-
media: dataUriLimit
|
|
47
|
-
},
|
|
48
|
-
disableCssExtract: disableCssExtract,
|
|
49
|
-
disableCssModuleExtension: disableCssModuleExtension,
|
|
50
|
-
disableInlineRuntimeChunk: disableInlineRuntimeChunk,
|
|
51
|
-
disableMinimize: disableMinimize,
|
|
52
|
-
disableSourceMap: disableSourceMap,
|
|
53
|
-
disableTsChecker: disableTsChecker || enableTsLoader,
|
|
54
|
-
enableCssModuleTSDeclaration: enableCssModuleTSDeclaration,
|
|
55
|
-
enableInlineScripts: enableInlineScripts,
|
|
56
|
-
enableInlineStyles: enableInlineStyles,
|
|
57
|
-
polyfill: polyfill,
|
|
58
|
-
disableFilenameHash: disableAssetsCache,
|
|
59
|
-
enableLatestDecorators: enableLatestDecorators,
|
|
60
|
-
filename: {
|
|
61
|
-
css: cssModuleLocalIdentName
|
|
62
|
-
},
|
|
63
|
-
ssg: ssg,
|
|
64
|
-
// set `true`, only in legacy config
|
|
65
|
-
enableAssetFallback: true,
|
|
66
|
-
enableAssetManifest: true,
|
|
67
|
-
enableModernMode: enableModernMode,
|
|
68
|
-
disableNodePolyfill: disableNodePolyfill
|
|
69
|
-
};
|
|
70
|
-
}
|
|
1
|
+
function createOutputConfig(config) {
|
|
2
|
+
var _output = config.output, assetPrefix = _output.assetPrefix, copy = _output.copy, cssModuleLocalIdentName = _output.cssModuleLocalIdentName, cssPath = _output.cssPath, jsPath = _output.jsPath, htmlPath = _output.htmlPath, mediaPath = _output.mediaPath, enableTsLoader = _output.enableTsLoader, path = _output.path, disableInlineRuntimeChunk = _output.disableInlineRuntimeChunk, disableCssExtract = _output.disableCssExtract, disableMinimize = _output.disableMinimize, disableSourceMap = _output.disableSourceMap, disableTsChecker = _output.disableTsChecker, enableCssModuleTSDeclaration = _output.enableCssModuleTSDeclaration, enableInlineScripts = _output.enableInlineScripts, enableInlineStyles = _output.enableInlineStyles, polyfill = _output.polyfill, dataUriLimit = _output.dataUriLimit, disableAssetsCache = _output.disableAssetsCache, enableLatestDecorators = _output.enableLatestDecorators, disableCssModuleExtension = _output.disableCssModuleExtension, ssg = _output.ssg, disableNodePolyfill = _output.disableNodePolyfill;
|
|
3
|
+
return {
|
|
4
|
+
assetPrefix: assetPrefix,
|
|
5
|
+
copy: copy,
|
|
6
|
+
distPath: {
|
|
7
|
+
root: path,
|
|
8
|
+
css: cssPath,
|
|
9
|
+
js: jsPath,
|
|
10
|
+
html: htmlPath,
|
|
11
|
+
svg: mediaPath || "media",
|
|
12
|
+
image: mediaPath || "media",
|
|
13
|
+
font: mediaPath || "media",
|
|
14
|
+
media: mediaPath || "media"
|
|
15
|
+
},
|
|
16
|
+
dataUriLimit: {
|
|
17
|
+
svg: dataUriLimit,
|
|
18
|
+
image: dataUriLimit,
|
|
19
|
+
font: dataUriLimit,
|
|
20
|
+
media: dataUriLimit
|
|
21
|
+
},
|
|
22
|
+
cssModuleLocalIdentName: cssModuleLocalIdentName,
|
|
23
|
+
disableCssExtract: disableCssExtract,
|
|
24
|
+
disableCssModuleExtension: disableCssModuleExtension,
|
|
25
|
+
disableInlineRuntimeChunk: disableInlineRuntimeChunk,
|
|
26
|
+
disableMinimize: disableMinimize,
|
|
27
|
+
disableSourceMap: disableSourceMap,
|
|
28
|
+
disableTsChecker: disableTsChecker || enableTsLoader,
|
|
29
|
+
enableCssModuleTSDeclaration: enableCssModuleTSDeclaration,
|
|
30
|
+
enableInlineScripts: enableInlineScripts,
|
|
31
|
+
enableInlineStyles: enableInlineStyles,
|
|
32
|
+
polyfill: polyfill,
|
|
33
|
+
disableFilenameHash: disableAssetsCache,
|
|
34
|
+
enableLatestDecorators: enableLatestDecorators,
|
|
35
|
+
ssg: ssg,
|
|
36
|
+
enableAssetFallback: true,
|
|
37
|
+
enableAssetManifest: true,
|
|
38
|
+
disableNodePolyfill: disableNodePolyfill
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
export { createOutputConfig };
|
|
@@ -1,41 +1,42 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
1
|
+
function createSourceConfig(config) {
|
|
2
|
+
var _source = config.source, alias = _source.alias, envVars = _source.envVars, globalVars = _source.globalVars, include = _source.include, moduleScopes = _source.moduleScopes, preEntry = _source.preEntry, entries = _source.entries, enableAsyncEntry = _source.enableAsyncEntry, disableDefaultEntries = _source.disableDefaultEntries, entriesDir = _source.entriesDir, configDir = _source.configDir;
|
|
3
|
+
var builderGlobalVars = globalVars || {};
|
|
4
|
+
var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
|
|
5
|
+
try {
|
|
6
|
+
for(var _iterator = (envVars || [])[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
|
|
7
|
+
var envVar = _step.value;
|
|
8
|
+
var envVarValue = process.env[envVar];
|
|
9
|
+
envVarValue && (builderGlobalVars["process.env.".concat(envVar)] = envVarValue);
|
|
10
|
+
}
|
|
11
|
+
} catch (err) {
|
|
12
|
+
_didIteratorError = true;
|
|
13
|
+
_iteratorError = err;
|
|
14
|
+
} finally{
|
|
15
|
+
try {
|
|
16
|
+
if (!_iteratorNormalCompletion && _iterator.return != null) {
|
|
17
|
+
_iterator.return();
|
|
18
|
+
}
|
|
19
|
+
} finally{
|
|
20
|
+
if (_didIteratorError) {
|
|
21
|
+
throw _iteratorError;
|
|
22
|
+
}
|
|
23
|
+
}
|
|
23
24
|
}
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
}
|
|
25
|
+
return {
|
|
26
|
+
alias: alias,
|
|
27
|
+
moduleScopes: moduleScopes,
|
|
28
|
+
globalVars: builderGlobalVars,
|
|
29
|
+
include: include,
|
|
30
|
+
preEntry: preEntry,
|
|
31
|
+
entries: entries,
|
|
32
|
+
enableAsyncEntry: enableAsyncEntry,
|
|
33
|
+
disableDefaultEntries: disableDefaultEntries,
|
|
34
|
+
entriesDir: entriesDir,
|
|
35
|
+
configDir: configDir,
|
|
36
|
+
resolveExtensionPrefix: {
|
|
37
|
+
web: ".web",
|
|
38
|
+
node: ".node"
|
|
39
|
+
}
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
export { createSourceConfig };
|
|
@@ -1,38 +1,23 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
minifyCss: minifyCss,
|
|
25
|
-
terser: terser,
|
|
26
|
-
webpack: webpack,
|
|
27
|
-
webpackChain: webpackChain,
|
|
28
|
-
styledComponents: styledComponents,
|
|
29
|
-
sass: sass,
|
|
30
|
-
postcss: postcss,
|
|
31
|
-
less: less,
|
|
32
|
-
htmlPlugin: htmlPlugin,
|
|
33
|
-
devServer: devServer,
|
|
34
|
-
tailwindcss: tailwindcss,
|
|
35
|
-
jest: jest,
|
|
36
|
-
esbuild: esbuild
|
|
37
|
-
};
|
|
38
|
-
}
|
|
1
|
+
function createToolsConfig(config) {
|
|
2
|
+
var _tools = config.tools, autoprefixer = _tools.autoprefixer, babel = _tools.babel, minifyCss = _tools.minifyCss, terser = _tools.terser, webpack = _tools.webpack, webpackChain = _tools.webpackChain, tsLoader = _tools.tsLoader, styledComponents = _tools.styledComponents, sass = _tools.sass, postcss = _tools.postcss, less = _tools.less, htmlPlugin = _tools.htmlPlugin, devServer = _tools.devServer, tailwindcss = _tools.tailwindcss, jest = _tools.jest, esbuild = _tools.esbuild;
|
|
3
|
+
var enableTsLoader = config.output.enableTsLoader;
|
|
4
|
+
return {
|
|
5
|
+
tsLoader: enableTsLoader ? tsLoader : void 0,
|
|
6
|
+
autoprefixer: autoprefixer,
|
|
7
|
+
babel: babel,
|
|
8
|
+
minifyCss: minifyCss,
|
|
9
|
+
terser: terser,
|
|
10
|
+
webpack: webpack,
|
|
11
|
+
webpackChain: webpackChain,
|
|
12
|
+
styledComponents: styledComponents,
|
|
13
|
+
sass: sass,
|
|
14
|
+
postcss: postcss,
|
|
15
|
+
less: less,
|
|
16
|
+
htmlPlugin: htmlPlugin,
|
|
17
|
+
devServer: devServer,
|
|
18
|
+
tailwindcss: tailwindcss,
|
|
19
|
+
jest: jest,
|
|
20
|
+
esbuild: esbuild
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
export { createToolsConfig };
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { initHtmlConfig, initSourceConfig, initToolsConfig } from "./inits";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
2
|
+
import { transformNormalizedConfig } from "./transformNormalizedConfig";
|
|
3
|
+
function checkIsLegacyConfig(config) {
|
|
4
|
+
return Boolean(config.legacy);
|
|
5
5
|
}
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
}
|
|
6
|
+
function initialNormalizedConfig(config, appContext) {
|
|
7
|
+
initHtmlConfig(config, appContext);
|
|
8
|
+
initSourceConfig(config, appContext);
|
|
9
|
+
initToolsConfig(config);
|
|
10
|
+
return config;
|
|
11
|
+
}
|
|
12
|
+
export { checkIsLegacyConfig, initialNormalizedConfig, transformNormalizedConfig };
|
|
@@ -1,114 +1,213 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
import { applyOptionsChain, findExists, findMonorepoRoot, globby, isModernjsMonorepo } from '@modern-js/utils';
|
|
6
|
-
export function initHtmlConfig(config, appContext) {
|
|
7
|
-
var ICON_EXTENSIONS = ['png', 'jpg', 'jpeg', 'svg', 'ico'];
|
|
8
|
-
config.html.appIcon = createBuilderAppIcon(config, appContext);
|
|
9
|
-
config.html.favicon = createBuilderFavicon(config, appContext);
|
|
10
|
-
return config.html;
|
|
11
|
-
function createBuilderAppIcon(config, appContext) {
|
|
12
|
-
var configDir = config.source.configDir;
|
|
13
|
-
var appIcon = findExists(ICON_EXTENSIONS.map(function (ext) {
|
|
14
|
-
return path.resolve(appContext.appDirectory, configDir || './config', "icon.".concat(ext));
|
|
15
|
-
}));
|
|
16
|
-
return typeof appIcon === 'string' ? appIcon : undefined;
|
|
17
|
-
}
|
|
18
|
-
function createBuilderFavicon(config, appContext) {
|
|
19
|
-
var configDir = config.source.configDir;
|
|
20
|
-
var favicon = config.html.favicon;
|
|
21
|
-
var defaultFavicon = findExists(ICON_EXTENSIONS.map(function (ext) {
|
|
22
|
-
return path.resolve(appContext.appDirectory, configDir || './config', "favicon.".concat(ext));
|
|
23
|
-
}));
|
|
24
|
-
return favicon || defaultFavicon || undefined;
|
|
25
|
-
}
|
|
1
|
+
function _arrayLikeToArray(arr, len) {
|
|
2
|
+
if (len == null || len > arr.length) len = arr.length;
|
|
3
|
+
for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
|
|
4
|
+
return arr2;
|
|
26
5
|
}
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
return include;
|
|
41
|
-
}).concat(defaultInclude); // concat default Include
|
|
42
|
-
|
|
43
|
-
var root = findMonorepoRoot(appContext.appDirectory);
|
|
44
|
-
if (!root) {
|
|
45
|
-
return transformInclude;
|
|
46
|
-
}
|
|
47
|
-
var modernjsMonorepo = isModernjsMonorepo(root);
|
|
48
|
-
if (modernjsMonorepo) {
|
|
49
|
-
var paths = globby.sync(posix.join(root, 'features', '**', 'package.json'), {
|
|
50
|
-
ignore: ['**/node_modules/**/*']
|
|
51
|
-
}).map(function (pathname) {
|
|
52
|
-
return dirname(pathname) + sep;
|
|
53
|
-
});
|
|
54
|
-
return [].concat(_toConsumableArray(paths), _toConsumableArray(transformInclude));
|
|
6
|
+
function _arrayWithoutHoles(arr) {
|
|
7
|
+
if (Array.isArray(arr)) return _arrayLikeToArray(arr);
|
|
8
|
+
}
|
|
9
|
+
function _defineProperty(obj, key, value) {
|
|
10
|
+
if (key in obj) {
|
|
11
|
+
Object.defineProperty(obj, key, {
|
|
12
|
+
value: value,
|
|
13
|
+
enumerable: true,
|
|
14
|
+
configurable: true,
|
|
15
|
+
writable: true
|
|
16
|
+
});
|
|
17
|
+
} else {
|
|
18
|
+
obj[key] = value;
|
|
55
19
|
}
|
|
56
|
-
return
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
20
|
+
return obj;
|
|
21
|
+
}
|
|
22
|
+
function _iterableToArray(iter) {
|
|
23
|
+
if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
|
|
24
|
+
}
|
|
25
|
+
function _nonIterableSpread() {
|
|
26
|
+
throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
|
|
27
|
+
}
|
|
28
|
+
function _objectSpread(target) {
|
|
29
|
+
for(var i = 1; i < arguments.length; i++){
|
|
30
|
+
var source = arguments[i] != null ? arguments[i] : {};
|
|
31
|
+
var ownKeys = Object.keys(source);
|
|
32
|
+
if (typeof Object.getOwnPropertySymbols === "function") {
|
|
33
|
+
ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
|
|
34
|
+
return Object.getOwnPropertyDescriptor(source, sym).enumerable;
|
|
35
|
+
}));
|
|
68
36
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
return builderModuleScope;
|
|
73
|
-
} else {
|
|
74
|
-
return undefined;
|
|
37
|
+
ownKeys.forEach(function(key) {
|
|
38
|
+
_defineProperty(target, key, source[key]);
|
|
39
|
+
});
|
|
75
40
|
}
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
41
|
+
return target;
|
|
42
|
+
}
|
|
43
|
+
function ownKeys(object, enumerableOnly) {
|
|
44
|
+
var keys = Object.keys(object);
|
|
45
|
+
if (Object.getOwnPropertySymbols) {
|
|
46
|
+
var symbols = Object.getOwnPropertySymbols(object);
|
|
47
|
+
if (enumerableOnly) {
|
|
48
|
+
symbols = symbols.filter(function(sym) {
|
|
49
|
+
return Object.getOwnPropertyDescriptor(object, sym).enumerable;
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
keys.push.apply(keys, symbols);
|
|
80
53
|
}
|
|
81
|
-
|
|
54
|
+
return keys;
|
|
82
55
|
}
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
}, {
|
|
92
|
-
file: '**/node_modules/**/*'
|
|
93
|
-
}]
|
|
56
|
+
function _objectSpreadProps(target, source) {
|
|
57
|
+
source = source != null ? source : {};
|
|
58
|
+
if (Object.getOwnPropertyDescriptors) {
|
|
59
|
+
Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
|
|
60
|
+
} else {
|
|
61
|
+
ownKeys(Object(source)).forEach(function(key) {
|
|
62
|
+
Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
|
|
63
|
+
});
|
|
94
64
|
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
65
|
+
return target;
|
|
66
|
+
}
|
|
67
|
+
function _toConsumableArray(arr) {
|
|
68
|
+
return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
|
|
69
|
+
}
|
|
70
|
+
function _unsupportedIterableToArray(o, minLen) {
|
|
71
|
+
if (!o) return;
|
|
72
|
+
if (typeof o === "string") return _arrayLikeToArray(o, minLen);
|
|
73
|
+
var n = Object.prototype.toString.call(o).slice(8, -1);
|
|
74
|
+
if (n === "Object" && o.constructor) n = o.constructor.name;
|
|
75
|
+
if (n === "Map" || n === "Set") return Array.from(n);
|
|
76
|
+
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
|
|
77
|
+
}
|
|
78
|
+
import path, { dirname, isAbsolute, posix, sep } from "path";
|
|
79
|
+
import { applyOptionsChain, findExists, findMonorepoRoot, globby, isModernjsMonorepo } from "@modern-js/utils";
|
|
80
|
+
function initHtmlConfig(config, appContext) {
|
|
81
|
+
var createBuilderAppIcon = function createBuilderAppIcon(config2, appContext2) {
|
|
82
|
+
var configDir = config2.source.configDir;
|
|
83
|
+
var appIcon = findExists(ICON_EXTENSIONS.map(function(ext) {
|
|
84
|
+
return path.resolve(appContext2.appDirectory, configDir || "./config", "icon.".concat(ext));
|
|
85
|
+
}));
|
|
86
|
+
return typeof appIcon === "string" ? appIcon : void 0;
|
|
87
|
+
};
|
|
88
|
+
var createBuilderFavicon = function createBuilderFavicon(config2, appContext2) {
|
|
89
|
+
var configDir = config2.source.configDir;
|
|
90
|
+
var favicon = config2.html.favicon;
|
|
91
|
+
var defaultFavicon = findExists(ICON_EXTENSIONS.map(function(ext) {
|
|
92
|
+
return path.resolve(appContext2.appDirectory, configDir || "./config", "favicon.".concat(ext));
|
|
93
|
+
}));
|
|
94
|
+
return favicon || defaultFavicon || void 0;
|
|
95
|
+
};
|
|
96
|
+
var ICON_EXTENSIONS = [
|
|
97
|
+
"png",
|
|
98
|
+
"jpg",
|
|
99
|
+
"jpeg",
|
|
100
|
+
"svg",
|
|
101
|
+
"ico"
|
|
102
|
+
];
|
|
103
|
+
config.html.appIcon = createBuilderAppIcon(config, appContext);
|
|
104
|
+
config.html.favicon = createBuilderFavicon(config, appContext);
|
|
105
|
+
return config.html;
|
|
106
|
+
}
|
|
107
|
+
function initSourceConfig(config, appContext) {
|
|
108
|
+
var createBuilderInclude = function createBuilderInclude(config2, appContext2) {
|
|
109
|
+
var include = config2.source.include;
|
|
110
|
+
var defaultInclude = [
|
|
111
|
+
appContext2.internalDirectory
|
|
112
|
+
];
|
|
113
|
+
var transformInclude = (include || []).map(function(include2) {
|
|
114
|
+
if (typeof include2 === "string") {
|
|
115
|
+
if (isAbsolute(include2)) {
|
|
116
|
+
return include2;
|
|
117
|
+
}
|
|
118
|
+
return new RegExp(include2);
|
|
119
|
+
}
|
|
120
|
+
return include2;
|
|
121
|
+
}).concat(defaultInclude);
|
|
122
|
+
var root = findMonorepoRoot(appContext2.appDirectory);
|
|
123
|
+
if (!root) {
|
|
124
|
+
return transformInclude;
|
|
125
|
+
}
|
|
126
|
+
var modernjsMonorepo = isModernjsMonorepo(root);
|
|
127
|
+
if (modernjsMonorepo) {
|
|
128
|
+
var paths = globby.sync(posix.join(root, "features", "**", "package.json"), {
|
|
129
|
+
ignore: [
|
|
130
|
+
"**/node_modules/**/*"
|
|
131
|
+
]
|
|
132
|
+
}).map(function(pathname) {
|
|
133
|
+
return dirname(pathname) + sep;
|
|
134
|
+
});
|
|
135
|
+
return _toConsumableArray(paths).concat(_toConsumableArray(transformInclude));
|
|
136
|
+
}
|
|
137
|
+
return transformInclude;
|
|
138
|
+
};
|
|
139
|
+
var createBuilderModuleScope = function createBuilderModuleScope(config2) {
|
|
140
|
+
var moduleScopes = config2.source.moduleScopes;
|
|
141
|
+
if (moduleScopes) {
|
|
142
|
+
var builderModuleScope = [];
|
|
143
|
+
var DEFAULT_SCOPES = [
|
|
144
|
+
"./src",
|
|
145
|
+
"./shared",
|
|
146
|
+
/node_modules/
|
|
147
|
+
];
|
|
148
|
+
if (Array.isArray(moduleScopes)) {
|
|
149
|
+
if (isPrimitiveScope(moduleScopes)) {
|
|
150
|
+
builderModuleScope = DEFAULT_SCOPES.concat(moduleScopes);
|
|
151
|
+
} else {
|
|
152
|
+
builderModuleScope = [
|
|
153
|
+
DEFAULT_SCOPES
|
|
154
|
+
].concat(_toConsumableArray(moduleScopes));
|
|
155
|
+
}
|
|
156
|
+
} else {
|
|
157
|
+
builderModuleScope = [
|
|
158
|
+
DEFAULT_SCOPES,
|
|
159
|
+
moduleScopes
|
|
160
|
+
];
|
|
161
|
+
}
|
|
162
|
+
return builderModuleScope;
|
|
163
|
+
} else {
|
|
164
|
+
return void 0;
|
|
165
|
+
}
|
|
166
|
+
function isPrimitiveScope(items) {
|
|
167
|
+
return items.every(function(item) {
|
|
168
|
+
return typeof item === "string" || Object.prototype.toString.call(item) === "[object RegExp]";
|
|
169
|
+
});
|
|
170
|
+
}
|
|
171
|
+
};
|
|
172
|
+
config.source.include = createBuilderInclude(config, appContext);
|
|
173
|
+
config.source.moduleScopes = createBuilderModuleScope(config);
|
|
174
|
+
}
|
|
175
|
+
function initToolsConfig(config) {
|
|
176
|
+
var defaultTsChecker = {
|
|
177
|
+
issue: {
|
|
178
|
+
include: [
|
|
179
|
+
{
|
|
180
|
+
file: "**/src/**/*"
|
|
181
|
+
}
|
|
182
|
+
],
|
|
183
|
+
exclude: [
|
|
184
|
+
{
|
|
185
|
+
file: "**/*.(spec|test).ts"
|
|
186
|
+
},
|
|
187
|
+
{
|
|
188
|
+
file: "**/node_modules/**/*"
|
|
189
|
+
}
|
|
190
|
+
]
|
|
191
|
+
}
|
|
192
|
+
};
|
|
193
|
+
var _tools = config.tools, tsChecker = _tools.tsChecker, tsLoader = _tools.tsLoader, htmlPlugin = _tools.htmlPlugin;
|
|
194
|
+
config.tools.tsChecker = applyOptionsChain(defaultTsChecker, tsChecker);
|
|
195
|
+
tsLoader && (config.tools.tsLoader = function(tsLoaderConfig, utils) {
|
|
196
|
+
applyOptionsChain(_objectSpreadProps(_objectSpread({}, tsLoaderConfig), {
|
|
197
|
+
transpileOnly: false,
|
|
198
|
+
allowTsInNodeModules: true
|
|
199
|
+
}), tsLoader || {}, utils);
|
|
112
200
|
});
|
|
113
|
-
|
|
114
|
-
|
|
201
|
+
config.tools.htmlPlugin = [
|
|
202
|
+
function(config2) {
|
|
203
|
+
return _objectSpreadProps(_objectSpread({}, config2), {
|
|
204
|
+
minify: typeof config2.minify === "object" ? _objectSpreadProps(_objectSpread({}, config2.minify), {
|
|
205
|
+
removeComments: false
|
|
206
|
+
}) : config2.minify
|
|
207
|
+
});
|
|
208
|
+
}
|
|
209
|
+
].concat(_toConsumableArray(Array.isArray(htmlPlugin) ? htmlPlugin : htmlPlugin ? [
|
|
210
|
+
htmlPlugin
|
|
211
|
+
] : []));
|
|
212
|
+
}
|
|
213
|
+
export { initHtmlConfig, initSourceConfig, initToolsConfig };
|