@modern-js/app-tools 2.0.0-beta.2 → 2.0.0-beta.4

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.
Files changed (236) hide show
  1. package/CHANGELOG.md +556 -0
  2. package/bin/modern.js +11 -1
  3. package/dist/js/modern/analyze/Builder.js +39 -0
  4. package/dist/js/modern/analyze/constants.js +38 -16
  5. package/dist/js/modern/analyze/generateCode.js +272 -211
  6. package/dist/js/modern/analyze/getBundleEntry.js +34 -32
  7. package/dist/js/modern/analyze/getClientRoutes/getRoutes.js +93 -49
  8. package/dist/js/modern/analyze/getClientRoutes/getRoutesLegacy.js +89 -47
  9. package/dist/js/modern/analyze/getClientRoutes/index.js +6 -2
  10. package/dist/js/modern/analyze/getClientRoutes/utils.js +23 -10
  11. package/dist/js/modern/analyze/getFileSystemEntry.js +43 -22
  12. package/dist/js/modern/analyze/getHtmlTemplate.js +89 -49
  13. package/dist/js/modern/analyze/getServerRoutes.js +122 -126
  14. package/dist/js/modern/analyze/index.js +201 -160
  15. package/dist/js/modern/analyze/isDefaultExportFunction.js +30 -16
  16. package/dist/js/modern/analyze/makeLegalIdentifier.js +10 -11
  17. package/dist/js/modern/analyze/nestedRoutes.js +110 -53
  18. package/dist/js/modern/analyze/templates.js +191 -77
  19. package/dist/js/modern/analyze/utils.js +98 -51
  20. package/dist/js/modern/builder/builderPlugins/compatModern.js +125 -107
  21. package/dist/js/modern/builder/index.js +124 -89
  22. package/dist/js/modern/builder/loaders/routerLoader.js +17 -0
  23. package/dist/js/modern/builder/loaders/serverModuleLoader.js +7 -0
  24. package/dist/js/modern/builder/share.js +23 -21
  25. package/dist/js/modern/builder/webpackPlugins/htmlAsyncChunkPlugin.js +23 -22
  26. package/dist/js/modern/builder/webpackPlugins/htmlBottomTemplate.js +31 -27
  27. package/dist/js/modern/builder/webpackPlugins/routerPlugin.js +100 -84
  28. package/dist/js/modern/commands/build.js +67 -42
  29. package/dist/js/modern/commands/deploy.js +27 -4
  30. package/dist/js/modern/commands/dev.js +93 -47
  31. package/dist/js/modern/commands/index.js +1 -1
  32. package/dist/js/modern/commands/inspect.js +30 -5
  33. package/dist/js/modern/commands/start.js +37 -16
  34. package/dist/js/modern/config/default.js +103 -114
  35. package/dist/js/modern/config/index.js +8 -2
  36. package/dist/js/modern/config/initial/createHtmlConfig.js +5 -2
  37. package/dist/js/modern/config/initial/createOutputConfig.js +11 -9
  38. package/dist/js/modern/config/initial/createSourceConfig.js +5 -2
  39. package/dist/js/modern/config/initial/createToolsConfig.js +7 -6
  40. package/dist/js/modern/config/initial/index.js +9 -4
  41. package/dist/js/modern/config/initial/inits.js +109 -73
  42. package/dist/js/modern/config/initial/transformNormalizedConfig.js +6 -3
  43. package/dist/js/modern/defineConfig.js +26 -11
  44. package/dist/js/modern/exports/server.js +4 -1
  45. package/dist/js/modern/hooks.js +15 -4
  46. package/dist/js/modern/index.js +178 -90
  47. package/dist/js/modern/initialize/index.js +98 -51
  48. package/dist/js/modern/locale/en.js +20 -21
  49. package/dist/js/modern/locale/index.js +6 -6
  50. package/dist/js/modern/locale/zh.js +21 -22
  51. package/dist/js/modern/schema/Schema.js +6 -5
  52. package/dist/js/modern/schema/index.js +51 -100
  53. package/dist/js/modern/schema/legacy.js +96 -231
  54. package/dist/js/modern/types/config/index.js +0 -1
  55. package/dist/js/modern/types/index.js +0 -1
  56. package/dist/js/modern/types/legacyConfig/output.js +0 -1
  57. package/dist/js/modern/utils/commands.js +5 -2
  58. package/dist/js/modern/utils/config.js +102 -41
  59. package/dist/js/modern/utils/createFileWatcher.js +84 -51
  60. package/dist/js/modern/utils/createServer.js +63 -17
  61. package/dist/js/modern/utils/getSpecifiedEntries.js +46 -19
  62. package/dist/js/modern/utils/language.js +6 -3
  63. package/dist/js/modern/utils/printInstructions.js +27 -8
  64. package/dist/js/modern/utils/restart.js +43 -16
  65. package/dist/js/modern/utils/routes.js +29 -12
  66. package/dist/js/node/analyze/Builder.js +58 -0
  67. package/dist/js/node/analyze/constants.js +54 -35
  68. package/dist/js/node/analyze/generateCode.js +291 -228
  69. package/dist/js/node/analyze/getBundleEntry.js +58 -44
  70. package/dist/js/node/analyze/getClientRoutes/getRoutes.js +132 -76
  71. package/dist/js/node/analyze/getClientRoutes/getRoutesLegacy.js +128 -74
  72. package/dist/js/node/analyze/getClientRoutes/index.js +23 -17
  73. package/dist/js/node/analyze/getClientRoutes/utils.js +44 -21
  74. package/dist/js/node/analyze/getFileSystemEntry.js +70 -39
  75. package/dist/js/node/analyze/getHtmlTemplate.js +116 -61
  76. package/dist/js/node/analyze/getServerRoutes.js +143 -137
  77. package/dist/js/node/analyze/index.js +247 -174
  78. package/dist/js/node/analyze/isDefaultExportFunction.js +55 -26
  79. package/dist/js/node/analyze/makeLegalIdentifier.js +27 -15
  80. package/dist/js/node/analyze/nestedRoutes.js +140 -67
  81. package/dist/js/node/analyze/templates.js +212 -84
  82. package/dist/js/node/analyze/utils.js +123 -62
  83. package/dist/js/node/builder/builderPlugins/compatModern.js +153 -120
  84. package/dist/js/node/builder/index.js +152 -98
  85. package/dist/js/node/builder/loaders/routerLoader.js +36 -0
  86. package/dist/js/node/builder/loaders/serverModuleLoader.js +26 -0
  87. package/dist/js/node/builder/share.js +46 -26
  88. package/dist/js/node/builder/webpackPlugins/htmlAsyncChunkPlugin.js +39 -26
  89. package/dist/js/node/builder/webpackPlugins/htmlBottomTemplate.js +47 -31
  90. package/dist/js/node/builder/webpackPlugins/routerPlugin.js +118 -90
  91. package/dist/js/node/commands/build.js +89 -52
  92. package/dist/js/node/commands/deploy.js +45 -10
  93. package/dist/js/node/commands/dev.js +115 -61
  94. package/dist/js/node/commands/index.js +19 -38
  95. package/dist/js/node/commands/inspect.js +48 -11
  96. package/dist/js/node/commands/start.js +65 -27
  97. package/dist/js/node/config/default.js +119 -118
  98. package/dist/js/node/config/index.js +25 -29
  99. package/dist/js/node/config/initial/createHtmlConfig.js +22 -6
  100. package/dist/js/node/config/initial/createOutputConfig.js +28 -13
  101. package/dist/js/node/config/initial/createSourceConfig.js +22 -6
  102. package/dist/js/node/config/initial/createToolsConfig.js +24 -10
  103. package/dist/js/node/config/initial/index.js +28 -17
  104. package/dist/js/node/config/initial/inits.js +126 -81
  105. package/dist/js/node/config/initial/transformNormalizedConfig.js +31 -15
  106. package/dist/js/node/defineConfig.js +43 -17
  107. package/dist/js/node/exports/server.js +21 -10
  108. package/dist/js/node/hooks.js +48 -29
  109. package/dist/js/node/index.js +225 -128
  110. package/dist/js/node/initialize/index.js +116 -61
  111. package/dist/js/node/locale/en.js +36 -25
  112. package/dist/js/node/locale/index.js +27 -15
  113. package/dist/js/node/locale/zh.js +37 -26
  114. package/dist/js/node/schema/Schema.js +23 -10
  115. package/dist/js/node/schema/index.js +77 -114
  116. package/dist/js/node/schema/legacy.js +117 -240
  117. package/dist/js/node/types/config/index.js +17 -16
  118. package/dist/js/node/types/index.js +19 -38
  119. package/dist/js/node/types/legacyConfig/output.js +0 -5
  120. package/dist/js/node/utils/commands.js +21 -6
  121. package/dist/js/node/utils/config.js +120 -51
  122. package/dist/js/node/utils/createFileWatcher.js +104 -60
  123. package/dist/js/node/utils/createServer.js +86 -25
  124. package/dist/js/node/utils/getSpecifiedEntries.js +64 -25
  125. package/dist/js/node/utils/language.js +24 -8
  126. package/dist/js/node/utils/printInstructions.js +47 -16
  127. package/dist/js/node/utils/restart.js +61 -21
  128. package/dist/js/node/utils/routes.js +53 -18
  129. package/dist/js/treeshaking/analyze/Builder.js +199 -0
  130. package/dist/js/treeshaking/analyze/constants.js +28 -16
  131. package/dist/js/treeshaking/analyze/generateCode.js +605 -355
  132. package/dist/js/treeshaking/analyze/getBundleEntry.js +55 -63
  133. package/dist/js/treeshaking/analyze/getClientRoutes/getRoutes.js +214 -168
  134. package/dist/js/treeshaking/analyze/getClientRoutes/getRoutesLegacy.js +215 -169
  135. package/dist/js/treeshaking/analyze/getClientRoutes/index.js +3 -2
  136. package/dist/js/treeshaking/analyze/getClientRoutes/utils.js +19 -20
  137. package/dist/js/treeshaking/analyze/getFileSystemEntry.js +89 -86
  138. package/dist/js/treeshaking/analyze/getHtmlTemplate.js +298 -125
  139. package/dist/js/treeshaking/analyze/getServerRoutes.js +210 -146
  140. package/dist/js/treeshaking/analyze/index.js +571 -304
  141. package/dist/js/treeshaking/analyze/isDefaultExportFunction.js +45 -26
  142. package/dist/js/treeshaking/analyze/makeLegalIdentifier.js +13 -16
  143. package/dist/js/treeshaking/analyze/nestedRoutes.js +414 -160
  144. package/dist/js/treeshaking/analyze/templates.js +432 -161
  145. package/dist/js/treeshaking/analyze/utils.js +361 -80
  146. package/dist/js/treeshaking/builder/builderPlugins/compatModern.js +282 -195
  147. package/dist/js/treeshaking/builder/index.js +371 -167
  148. package/dist/js/treeshaking/builder/loaders/routerLoader.js +13 -0
  149. package/dist/js/treeshaking/builder/loaders/serverModuleLoader.js +5 -0
  150. package/dist/js/treeshaking/builder/share.js +38 -44
  151. package/dist/js/treeshaking/builder/webpackPlugins/htmlAsyncChunkPlugin.js +108 -44
  152. package/dist/js/treeshaking/builder/webpackPlugins/htmlBottomTemplate.js +70 -39
  153. package/dist/js/treeshaking/builder/webpackPlugins/routerPlugin.js +334 -112
  154. package/dist/js/treeshaking/commands/build.js +286 -88
  155. package/dist/js/treeshaking/commands/deploy.js +153 -25
  156. package/dist/js/treeshaking/commands/dev.js +318 -132
  157. package/dist/js/treeshaking/commands/index.js +1 -1
  158. package/dist/js/treeshaking/commands/inspect.js +147 -32
  159. package/dist/js/treeshaking/commands/start.js +190 -68
  160. package/dist/js/treeshaking/config/default.js +210 -199
  161. package/dist/js/treeshaking/config/index.js +3 -2
  162. package/dist/js/treeshaking/config/initial/createHtmlConfig.js +19 -31
  163. package/dist/js/treeshaking/config/initial/createOutputConfig.js +43 -67
  164. package/dist/js/treeshaking/config/initial/createSourceConfig.js +37 -40
  165. package/dist/js/treeshaking/config/initial/createToolsConfig.js +23 -38
  166. package/dist/js/treeshaking/config/initial/index.js +10 -9
  167. package/dist/js/treeshaking/config/initial/inits.js +205 -106
  168. package/dist/js/treeshaking/config/initial/transformNormalizedConfig.js +27 -34
  169. package/dist/js/treeshaking/defineConfig.js +60 -13
  170. package/dist/js/treeshaking/exports/server.js +2 -1
  171. package/dist/js/treeshaking/hooks.js +30 -25
  172. package/dist/js/treeshaking/index.js +681 -256
  173. package/dist/js/treeshaking/initialize/index.js +290 -112
  174. package/dist/js/treeshaking/locale/en.js +34 -33
  175. package/dist/js/treeshaking/locale/index.js +5 -5
  176. package/dist/js/treeshaking/locale/zh.js +34 -33
  177. package/dist/js/treeshaking/schema/Schema.js +267 -69
  178. package/dist/js/treeshaking/schema/index.js +165 -121
  179. package/dist/js/treeshaking/schema/legacy.js +323 -256
  180. package/dist/js/treeshaking/types/config/deploy.js +1 -0
  181. package/dist/js/treeshaking/types/config/dev.js +1 -0
  182. package/dist/js/treeshaking/types/config/experiments.js +1 -0
  183. package/dist/js/treeshaking/types/config/html.js +1 -0
  184. package/dist/js/treeshaking/types/config/index.js +0 -1
  185. package/dist/js/treeshaking/types/config/output.js +1 -0
  186. package/dist/js/treeshaking/types/config/performance.js +1 -0
  187. package/dist/js/treeshaking/types/config/security.js +1 -0
  188. package/dist/js/treeshaking/types/config/source.js +1 -0
  189. package/dist/js/treeshaking/types/config/tools.js +1 -0
  190. package/dist/js/treeshaking/types/hooks.js +1 -0
  191. package/dist/js/treeshaking/types/index.js +0 -1
  192. package/dist/js/treeshaking/types/legacyConfig/deploy.js +1 -0
  193. package/dist/js/treeshaking/types/legacyConfig/dev.js +1 -0
  194. package/dist/js/treeshaking/types/legacyConfig/index.js +1 -0
  195. package/dist/js/treeshaking/types/legacyConfig/output.js +1 -1
  196. package/dist/js/treeshaking/types/legacyConfig/source.js +1 -0
  197. package/dist/js/treeshaking/types/legacyConfig/tools.js +1 -0
  198. package/dist/js/treeshaking/utils/commands.js +6 -5
  199. package/dist/js/treeshaking/utils/config.js +295 -117
  200. package/dist/js/treeshaking/utils/createFileWatcher.js +278 -118
  201. package/dist/js/treeshaking/utils/createServer.js +252 -67
  202. package/dist/js/treeshaking/utils/getSpecifiedEntries.js +182 -55
  203. package/dist/js/treeshaking/utils/language.js +6 -5
  204. package/dist/js/treeshaking/utils/printInstructions.js +151 -29
  205. package/dist/js/treeshaking/utils/restart.js +184 -42
  206. package/dist/js/treeshaking/utils/routes.js +151 -27
  207. package/dist/js/treeshaking/utils/types.js +1 -0
  208. package/dist/types/analyze/Builder.d.ts +8 -0
  209. package/dist/types/analyze/constants.d.ts +2 -0
  210. package/dist/types/analyze/index.d.ts +2 -0
  211. package/dist/types/analyze/templates.d.ts +10 -7
  212. package/dist/types/analyze/utils.d.ts +9 -1
  213. package/dist/types/builder/builderPlugins/compatModern.d.ts +2 -1
  214. package/dist/types/builder/index.d.ts +3 -3
  215. package/dist/types/builder/loaders/routerLoader.d.ts +3 -0
  216. package/dist/types/builder/loaders/serverModuleLoader.d.ts +3 -0
  217. package/dist/types/builder/webpackPlugins/routerPlugin.d.ts +1 -7
  218. package/dist/types/defineConfig.d.ts +1 -0
  219. package/dist/types/index.d.ts +6 -1
  220. package/dist/types/initialize/index.d.ts +2 -0
  221. package/dist/types/types/config/dev.d.ts +2 -2
  222. package/dist/types/types/config/index.d.ts +1 -0
  223. package/dist/types/types/config/output.d.ts +0 -1
  224. package/dist/types/types/config/source.d.ts +1 -0
  225. package/dist/types/types/config/tools.d.ts +10 -1
  226. package/dist/types/types/hooks.d.ts +7 -1
  227. package/dist/types/types/legacyConfig/dev.d.ts +1 -0
  228. package/dist/types/types/legacyConfig/output.d.ts +1 -1
  229. package/dist/types/types/legacyConfig/source.d.ts +1 -0
  230. package/dist/types/types/legacyConfig/tools.d.ts +1 -0
  231. package/dist/types/utils/config.d.ts +1 -0
  232. package/dist/types/utils/createFileWatcher.d.ts +2 -1
  233. package/dist/types/utils/createServer.d.ts +1 -0
  234. package/dist/types/utils/restart.d.ts +1 -1
  235. package/lib/types.d.ts +1 -1
  236. package/package.json +26 -22
@@ -1,114 +1,213 @@
1
- import _typeof from "@babel/runtime/helpers/esm/typeof";
2
- import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
3
- import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
4
- import path, { dirname, isAbsolute, posix, sep } from 'path';
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
- export function initSourceConfig(config, appContext) {
28
- config.source.include = createBuilderInclude(config, appContext);
29
- config.source.moduleScopes = createBuilderModuleScope(config);
30
- function createBuilderInclude(config, appContext) {
31
- var include = config.source.include;
32
- var defaultInclude = [appContext.internalDirectory];
33
- var transformInclude = (include || []).map(function (include) {
34
- if (typeof include === 'string') {
35
- if (isAbsolute(include)) {
36
- return include;
37
- }
38
- return new RegExp(include);
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 transformInclude;
57
- }
58
- function createBuilderModuleScope(config) {
59
- var moduleScopes = config.source.moduleScopes;
60
- if (moduleScopes) {
61
- var builderModuleScope = [];
62
- var DEFAULT_SCOPES = ['./src', './shared', /node_modules/];
63
- if (Array.isArray(moduleScopes)) {
64
- if (isPrimitiveScope(moduleScopes)) {
65
- builderModuleScope = DEFAULT_SCOPES.concat(moduleScopes);
66
- } else {
67
- builderModuleScope = [DEFAULT_SCOPES].concat(_toConsumableArray(moduleScopes));
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
- } else {
70
- builderModuleScope = [DEFAULT_SCOPES, moduleScopes];
71
- }
72
- return builderModuleScope;
73
- } else {
74
- return undefined;
37
+ ownKeys.forEach(function(key) {
38
+ _defineProperty(target, key, source[key]);
39
+ });
75
40
  }
76
- function isPrimitiveScope(items) {
77
- return items.every(function (item) {
78
- return typeof item === 'string' || Object.prototype.toString.call(item) === '[object RegExp]';
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
- export function initToolsConfig(config) {
84
- var defaultTsChecker = {
85
- issue: {
86
- include: [{
87
- file: '**/src/**/*'
88
- }],
89
- exclude: [{
90
- file: '**/*.(spec|test).ts'
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
- var _config$tools = config.tools,
97
- tsChecker = _config$tools.tsChecker,
98
- tsLoader = _config$tools.tsLoader,
99
- htmlPlugin = _config$tools.htmlPlugin;
100
- config.tools.tsChecker = applyOptionsChain(defaultTsChecker, tsChecker);
101
- tsLoader && (config.tools.tsLoader = function (tsLoaderConfig, utils) {
102
- applyOptionsChain(_objectSpread(_objectSpread({}, tsLoaderConfig), {}, {
103
- transpileOnly: false,
104
- allowTsInNodeModules: true
105
- }), tsLoader || {}, utils);
106
- });
107
- config.tools.htmlPlugin = [function (config) {
108
- return _objectSpread(_objectSpread({}, config), {}, {
109
- minify: _typeof(config.minify) === 'object' ? _objectSpread(_objectSpread({}, config.minify), {}, {
110
- removeComments: false
111
- }) : config.minify
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
- }].concat(_toConsumableArray(Array.isArray(htmlPlugin) ? htmlPlugin : htmlPlugin ? [htmlPlugin] : []));
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 };
@@ -2,37 +2,30 @@ import { createToolsConfig } from "./createToolsConfig";
2
2
  import { createSourceConfig } from "./createSourceConfig";
3
3
  import { createOutputConfig } from "./createOutputConfig";
4
4
  import { createHtmlConfig } from "./createHtmlConfig";
5
- export function transformNormalizedConfig(config) {
6
- var html = createHtmlConfig(config);
7
- var output = createOutputConfig(config);
8
- var source = createSourceConfig(config);
9
- var tools = createToolsConfig(config);
10
- var bff = config.bff,
11
- dev = config.dev,
12
- deploy = config.deploy,
13
- runtime = config.runtime,
14
- runtimeByEntries = config.runtimeByEntries,
15
- server = config.server,
16
- cliOptions = config.cliOptions,
17
- plugins = config.plugins,
18
- testing = config.testing;
19
- return {
20
- source: source,
21
- html: html,
22
- output: output,
23
- tools: tools,
24
- bff: bff,
25
- dev: dev,
26
- deploy: deploy,
27
- runtime: runtime,
28
- runtimeByEntries: runtimeByEntries,
29
- server: server,
30
- cliOptions: cliOptions,
31
- testing: testing,
32
- plugins: plugins,
33
- security: {},
34
- _raw: {},
35
- experiments: {},
36
- performance: {}
37
- };
38
- }
5
+ function transformNormalizedConfig(config) {
6
+ var html = createHtmlConfig(config);
7
+ var output = createOutputConfig(config);
8
+ var source = createSourceConfig(config);
9
+ var tools = createToolsConfig(config);
10
+ var bff = config.bff, dev = config.dev, deploy = config.deploy, runtime = config.runtime, runtimeByEntries = config.runtimeByEntries, server = config.server, cliOptions = config.cliOptions, plugins = config.plugins, testing = config.testing;
11
+ return {
12
+ source: source,
13
+ html: html,
14
+ output: output,
15
+ tools: tools,
16
+ bff: bff,
17
+ dev: dev,
18
+ deploy: deploy,
19
+ runtime: runtime,
20
+ runtimeByEntries: runtimeByEntries,
21
+ server: server,
22
+ cliOptions: cliOptions,
23
+ testing: testing,
24
+ plugins: plugins,
25
+ security: {},
26
+ _raw: {},
27
+ experiments: {},
28
+ performance: {}
29
+ };
30
+ }
31
+ export { transformNormalizedConfig };
@@ -1,14 +1,61 @@
1
- import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
- export var defineConfig = function defineConfig(config) {
3
- return config;
1
+ function _defineProperty(obj, key, value) {
2
+ if (key in obj) {
3
+ Object.defineProperty(obj, key, {
4
+ value: value,
5
+ enumerable: true,
6
+ configurable: true,
7
+ writable: true
8
+ });
9
+ } else {
10
+ obj[key] = value;
11
+ }
12
+ return obj;
13
+ }
14
+ function _objectSpread(target) {
15
+ for(var i = 1; i < arguments.length; i++){
16
+ var source = arguments[i] != null ? arguments[i] : {};
17
+ var ownKeys = Object.keys(source);
18
+ if (typeof Object.getOwnPropertySymbols === "function") {
19
+ ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
20
+ return Object.getOwnPropertyDescriptor(source, sym).enumerable;
21
+ }));
22
+ }
23
+ ownKeys.forEach(function(key) {
24
+ _defineProperty(target, key, source[key]);
25
+ });
26
+ }
27
+ return target;
28
+ }
29
+ function ownKeys(object, enumerableOnly) {
30
+ var keys = Object.keys(object);
31
+ if (Object.getOwnPropertySymbols) {
32
+ var symbols = Object.getOwnPropertySymbols(object);
33
+ if (enumerableOnly) {
34
+ symbols = symbols.filter(function(sym) {
35
+ return Object.getOwnPropertyDescriptor(object, sym).enumerable;
36
+ });
37
+ }
38
+ keys.push.apply(keys, symbols);
39
+ }
40
+ return keys;
41
+ }
42
+ function _objectSpreadProps(target, source) {
43
+ source = source != null ? source : {};
44
+ if (Object.getOwnPropertyDescriptors) {
45
+ Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
46
+ } else {
47
+ ownKeys(Object(source)).forEach(function(key) {
48
+ Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
49
+ });
50
+ }
51
+ return target;
52
+ }
53
+ var defineConfig = function(config) {
54
+ return config;
4
55
  };
5
-
6
- /**
7
- * @deprecated
8
- * Using defineConfig first.
9
- */
10
- export var defineLegacyConfig = function defineLegacyConfig(config) {
11
- return _objectSpread(_objectSpread({}, config), {}, {
12
- legacy: true
13
- });
14
- };
56
+ var defineLegacyConfig = function(config) {
57
+ return _objectSpreadProps(_objectSpread({}, config), {
58
+ legacy: true
59
+ });
60
+ };
61
+ export { defineConfig, defineLegacyConfig };
@@ -1 +1,2 @@
1
- export { defineServerConfig as defineConfig } from "../utils/config";
1
+ import { defineServerConfig } from "../utils/config";
2
+ export { defineServerConfig as defineConfig };
@@ -1,25 +1,30 @@
1
- import { createAsyncWaterfall, createAsyncWorkflow, createParallelWorkflow } from '@modern-js/plugin';
2
- export var hooks = {
3
- modifyEntryExport: createAsyncWaterfall(),
4
- modifyEntryImports: createAsyncWaterfall(),
5
- modifyEntryRuntimePlugins: createAsyncWaterfall(),
6
- modifyEntryRenderFunction: createAsyncWaterfall(),
7
- modifyAsyncEntry: createAsyncWaterfall(),
8
- modifyFileSystemRoutes: createAsyncWaterfall(),
9
- modifyServerRoutes: createAsyncWaterfall(),
10
- htmlPartials: createAsyncWaterfall(),
11
- beforeGenerateRoutes: createAsyncWaterfall(),
12
- addDefineTypes: createAsyncWaterfall(),
13
- beforeDev: createAsyncWorkflow(),
14
- afterDev: createAsyncWorkflow(),
15
- beforeCreateCompiler: createAsyncWorkflow(),
16
- afterCreateCompiler: createAsyncWorkflow(),
17
- beforePrintInstructions: createAsyncWaterfall(),
18
- beforeBuild: createAsyncWorkflow(),
19
- afterBuild: createAsyncWorkflow(),
20
- beforeDeploy: createAsyncWorkflow(),
21
- afterDeploy: createAsyncWorkflow(),
22
- watchFiles: createParallelWorkflow(),
23
- fileChange: createAsyncWorkflow(),
24
- beforeRestart: createAsyncWorkflow()
25
- };
1
+ import { createAsyncWaterfall, createAsyncWorkflow, createParallelWorkflow } from "@modern-js/plugin";
2
+ var hooks = {
3
+ modifyEntryExport: createAsyncWaterfall(),
4
+ modifyEntryImports: createAsyncWaterfall(),
5
+ modifyEntryRuntimePlugins: createAsyncWaterfall(),
6
+ modifyEntryRenderFunction: createAsyncWaterfall(),
7
+ modifyAsyncEntry: createAsyncWaterfall(),
8
+ modifyFileSystemRoutes: createAsyncWaterfall(),
9
+ modifyServerRoutes: createAsyncWaterfall(),
10
+ htmlPartials: createAsyncWaterfall(),
11
+ beforeGenerateRoutes: createAsyncWaterfall(),
12
+ addDefineTypes: createAsyncWaterfall(),
13
+ beforeDev: createAsyncWorkflow(),
14
+ afterDev: createAsyncWorkflow(),
15
+ beforeCreateCompiler: createAsyncWorkflow(),
16
+ afterCreateCompiler: createAsyncWorkflow(),
17
+ beforePrintInstructions: createAsyncWaterfall(),
18
+ beforeBuild: createAsyncWorkflow(),
19
+ afterBuild: createAsyncWorkflow(),
20
+ beforeDeploy: createAsyncWorkflow(),
21
+ afterDeploy: createAsyncWorkflow(),
22
+ watchFiles: createParallelWorkflow(),
23
+ fileChange: createAsyncWorkflow(),
24
+ beforeRestart: createAsyncWorkflow(),
25
+ registerDev: createParallelWorkflow(),
26
+ beforeDevTask: createParallelWorkflow(),
27
+ registerBuildPlatform: createParallelWorkflow(),
28
+ beforeBuildPlatform: createParallelWorkflow()
29
+ };
30
+ export { hooks };