@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,185 +1,231 @@
1
- import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
- import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
3
- import path from 'path';
4
- import { fs } from '@modern-js/utils';
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
+ import path from "path";
54
+ import { fs } from "@modern-js/utils";
5
55
  import { makeLegalIdentifier } from "../makeLegalIdentifier";
6
56
  import { FILE_SYSTEM_ROUTES_COMPONENTS_DIR, FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP, FILE_SYSTEM_ROUTES_INDEX, FILE_SYSTEM_ROUTES_LAYOUT } from "../constants";
7
57
  import { replaceWithAlias } from "../utils";
8
58
  import { debug, findLayout, shouldSkip, getRouteWeight } from "./utils";
9
- var compName = function compName(srcDirectory, filePath) {
10
- var legalCompName = makeLegalIdentifier(path.relative(srcDirectory, filePath));
11
- return "Comp_".concat(legalCompName);
59
+ var compName = function(srcDirectory, filePath) {
60
+ var legalCompName = makeLegalIdentifier(path.relative(srcDirectory, filePath));
61
+ return "Comp_".concat(legalCompName);
12
62
  };
13
- var layoutNameAbbr = function layoutNameAbbr(filePath) {
14
- var prefix = 'L_';
15
- var dirName = path.dirname(filePath).split('/').pop() || '';
16
- return "".concat(prefix).concat(makeLegalIdentifier(dirName));
63
+ var layoutNameAbbr = function(filePath) {
64
+ var prefix = "L_";
65
+ var dirName = path.dirname(filePath).split("/").pop() || "";
66
+ return "".concat(prefix).concat(makeLegalIdentifier(dirName));
17
67
  };
18
68
  var parents = [];
19
-
20
- /* eslint-disable no-param-reassign */
21
- var recursiveReadDirLegacy = function recursiveReadDirLegacy(_ref) {
22
- var dir = _ref.dir,
23
- routes = _ref.routes,
24
- _ref$basePath = _ref.basePath,
25
- basePath = _ref$basePath === void 0 ? '/' : _ref$basePath,
26
- srcDirectory = _ref.srcDirectory,
27
- srcAlias = _ref.srcAlias;
28
- var hasDynamicRoute = false;
29
- var resetParent = false;
30
- var parent = parents[parents.length - 1];
31
- var layout = findLayout(dir);
32
- if (layout) {
33
- if (basePath === '/') {
34
- throw new Error("should use _app instead of _layout in ".concat(dir));
35
- } else {
36
- var alias = replaceWithAlias(srcDirectory, layout, srcAlias);
37
- var componentName = compName(srcDirectory, layout);
38
- var route = {
39
- path: "".concat(basePath.substring(0, basePath.length - 1)),
40
- exact: false,
41
- routes: [],
42
- _component: alias,
43
- component: componentName,
44
- parent: parent
45
- };
46
- parent = route;
47
- resetParent = true;
48
- routes.push(route);
49
- parents.push(route);
50
- routes = route.routes;
51
- }
52
- }
53
- var _iterator = _createForOfIteratorHelper(fs.readdirSync(dir)),
54
- _step;
55
- try {
56
- for (_iterator.s(); !(_step = _iterator.n()).done;) {
57
- var relative = _step.value;
58
- var filePath = path.join(dir, relative);
59
- if (!shouldSkip(filePath)) {
60
- var filename = path.basename(filePath, path.extname(filePath));
61
- var _alias = replaceWithAlias(srcDirectory, filePath, srcAlias);
62
- var _componentName = compName(srcDirectory, filePath);
63
- var dynamicRouteMatched = FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP.exec(filename);
64
- if (dynamicRouteMatched) {
65
- if (hasDynamicRoute) {
66
- throw new Error("Can't set two dynamic route in one directory: ".concat(dir));
67
- } else {
68
- hasDynamicRoute = true;
69
- }
70
- }
71
- var _route = {
72
- path: "".concat(basePath).concat(dynamicRouteMatched ? ":".concat(dynamicRouteMatched[1]).concat(dynamicRouteMatched[2]) : filename),
73
- _component: _alias,
74
- component: _componentName,
75
- exact: true,
76
- parent: parent
77
- };
78
- if (fs.statSync(filePath).isDirectory()) {
79
- recursiveReadDirLegacy({
80
- dir: filePath,
81
- routes: routes,
82
- basePath: "".concat(_route.path, "/"),
83
- srcDirectory: srcDirectory,
84
- srcAlias: srcAlias
85
- });
86
- continue;
69
+ var recursiveReadDirLegacy = function(param) {
70
+ var dir = param.dir, routes = param.routes, _basePath = param.basePath, basePath = _basePath === void 0 ? "/" : _basePath, srcDirectory = param.srcDirectory, srcAlias = param.srcAlias;
71
+ var hasDynamicRoute = false;
72
+ var resetParent = false;
73
+ var parent = parents[parents.length - 1];
74
+ var layout = findLayout(dir);
75
+ if (layout) {
76
+ if (basePath === "/") {
77
+ throw new Error("should use _app instead of _layout in ".concat(dir));
78
+ } else {
79
+ var alias = replaceWithAlias(srcDirectory, layout, srcAlias);
80
+ var componentName = compName(srcDirectory, layout);
81
+ var route = {
82
+ path: "".concat(basePath.substring(0, basePath.length - 1)),
83
+ exact: false,
84
+ routes: [],
85
+ _component: alias,
86
+ component: componentName,
87
+ parent: parent
88
+ };
89
+ parent = route;
90
+ resetParent = true;
91
+ routes.push(route);
92
+ parents.push(route);
93
+ routes = route.routes;
87
94
  }
88
- if (filename === FILE_SYSTEM_ROUTES_LAYOUT) {
89
- continue;
90
- }
91
- if (filename === FILE_SYSTEM_ROUTES_INDEX) {
92
- _route.path = basePath === '/' ? basePath : "".concat(basePath.substring(0, basePath.length - 1));
95
+ }
96
+ var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
97
+ try {
98
+ for(var _iterator = fs.readdirSync(dir)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
99
+ var relative = _step.value;
100
+ var filePath = path.join(dir, relative);
101
+ if (!shouldSkip(filePath)) {
102
+ var filename = path.basename(filePath, path.extname(filePath));
103
+ var alias1 = replaceWithAlias(srcDirectory, filePath, srcAlias);
104
+ var componentName1 = compName(srcDirectory, filePath);
105
+ var dynamicRouteMatched = FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP.exec(filename);
106
+ if (dynamicRouteMatched) {
107
+ if (hasDynamicRoute) {
108
+ throw new Error("Can't set two dynamic route in one directory: ".concat(dir));
109
+ } else {
110
+ hasDynamicRoute = true;
111
+ }
112
+ }
113
+ var route1 = {
114
+ path: "".concat(basePath).concat(dynamicRouteMatched ? ":".concat(dynamicRouteMatched[1]).concat(dynamicRouteMatched[2]) : filename),
115
+ _component: alias1,
116
+ component: componentName1,
117
+ exact: true,
118
+ parent: parent
119
+ };
120
+ if (fs.statSync(filePath).isDirectory()) {
121
+ recursiveReadDirLegacy({
122
+ dir: filePath,
123
+ routes: routes,
124
+ basePath: "".concat(route1.path, "/"),
125
+ srcDirectory: srcDirectory,
126
+ srcAlias: srcAlias
127
+ });
128
+ continue;
129
+ }
130
+ if (filename === FILE_SYSTEM_ROUTES_LAYOUT) {
131
+ continue;
132
+ }
133
+ if (filename === FILE_SYSTEM_ROUTES_INDEX) {
134
+ route1.path = basePath === "/" ? basePath : "".concat(basePath.substring(0, basePath.length - 1));
135
+ }
136
+ if (filename === "404" && basePath === "/") {
137
+ route1.path = "*";
138
+ route1.exact = false;
139
+ }
140
+ routes.push(route1);
141
+ }
93
142
  }
94
- if (filename === '404' && basePath === '/') {
95
- _route.path = '*';
96
- _route.exact = false;
143
+ } catch (err) {
144
+ _didIteratorError = true;
145
+ _iteratorError = err;
146
+ } finally{
147
+ try {
148
+ if (!_iteratorNormalCompletion && _iterator.return != null) {
149
+ _iterator.return();
150
+ }
151
+ } finally{
152
+ if (_didIteratorError) {
153
+ throw _iteratorError;
154
+ }
97
155
  }
98
- routes.push(_route);
99
- }
100
156
  }
101
- } catch (err) {
102
- _iterator.e(err);
103
- } finally {
104
- _iterator.f();
105
- }
106
- if (resetParent) {
107
- parents.pop();
108
- }
109
- };
110
- /* eslint-enable no-param-reassign */
111
-
112
- var normalizeNestedRoutes = function normalizeNestedRoutes(nested, internalComponentsDir, internalDirectory, internalDirAlias) {
113
- var flat = function flat(routes) {
114
- return routes.reduce(function (memo, route) {
115
- return memo.concat(Array.isArray(route.routes) ? flat(route.routes) : [route]);
116
- }, []);
117
- };
118
- var generate = function generate(route) {
119
- var codes = [];
120
- var lastComponent = route.component;
121
- var imports = ["import React from 'react';", "import ".concat(lastComponent, " from '").concat(route._component, "'")];
122
-
123
- // eslint-disable-next-line no-param-reassign, no-cond-assign
124
- while (route = route.parent) {
125
- var layoutComponent = route.component;
126
- var layoutComponentAbbr = layoutNameAbbr(route._component);
127
- imports.push("import ".concat(layoutComponent, " from '").concat(route._component, "';"));
128
- var currentComponent = "".concat(layoutComponentAbbr, "_").concat(lastComponent);
129
- codes.push("const ".concat(currentComponent, " = props => <").concat(layoutComponent, " Component={").concat(lastComponent, "} {...props} />;"));
130
- lastComponent = currentComponent;
157
+ if (resetParent) {
158
+ parents.pop();
131
159
  }
132
- var file = path.resolve(internalComponentsDir, "".concat(lastComponent, ".jsx"));
133
- fs.outputFileSync(file, "".concat(imports.join('\n'), "\n").concat(codes.join('\n'), "\nexport default ").concat(lastComponent));
134
- return {
135
- component: lastComponent,
136
- _component: replaceWithAlias(internalDirectory, file, internalDirAlias)
160
+ };
161
+ var normalizeNestedRoutes = function(nested, internalComponentsDir, internalDirectory, internalDirAlias) {
162
+ var flat = function(routes) {
163
+ return routes.reduce(function(memo, route) {
164
+ return memo.concat(Array.isArray(route.routes) ? flat(route.routes) : [
165
+ route
166
+ ]);
167
+ }, []);
168
+ };
169
+ var generate = function(route) {
170
+ var codes = [];
171
+ var lastComponent = route.component;
172
+ var imports = [
173
+ "import React from 'react';",
174
+ "import ".concat(lastComponent, " from '").concat(route._component, "'")
175
+ ];
176
+ while(route = route.parent){
177
+ var layoutComponent = route.component;
178
+ var layoutComponentAbbr = layoutNameAbbr(route._component);
179
+ imports.push("import ".concat(layoutComponent, " from '").concat(route._component, "';"));
180
+ var currentComponent = "".concat(layoutComponentAbbr, "_").concat(lastComponent);
181
+ codes.push("const ".concat(currentComponent, " = props => <").concat(layoutComponent, " Component={").concat(lastComponent, "} {...props} />;"));
182
+ lastComponent = currentComponent;
183
+ }
184
+ var file = path.resolve(internalComponentsDir, "".concat(lastComponent, ".jsx"));
185
+ fs.outputFileSync(file, "".concat(imports.join("\n"), "\n").concat(codes.join("\n"), "\nexport default ").concat(lastComponent));
186
+ return {
187
+ component: lastComponent,
188
+ _component: replaceWithAlias(internalDirectory, file, internalDirAlias)
189
+ };
137
190
  };
138
- };
139
- var normalized = flat(nested).map(function (route) {
140
- return route.parent ? _objectSpread(_objectSpread(_objectSpread({}, route), generate(route)), {}, {
141
- parent: undefined
142
- }) : _objectSpread(_objectSpread({}, route), {}, {
143
- parent: undefined
191
+ var normalized = flat(nested).map(function(route) {
192
+ return route.parent ? _objectSpreadProps(_objectSpread({}, route, generate(route)), {
193
+ parent: void 0
194
+ }) : _objectSpreadProps(_objectSpread({}, route), {
195
+ parent: void 0
196
+ });
144
197
  });
145
- });
146
- return normalized;
198
+ return normalized;
147
199
  };
148
- export var getClientRoutes = function getClientRoutes(_ref2) {
149
- var entrypoint = _ref2.entrypoint,
150
- srcDirectory = _ref2.srcDirectory,
151
- srcAlias = _ref2.srcAlias,
152
- internalDirectory = _ref2.internalDirectory,
153
- internalDirAlias = _ref2.internalDirAlias;
154
- var entry = entrypoint.entry,
155
- entryName = entrypoint.entryName;
156
- if (!fs.existsSync(entry)) {
157
- throw new Error("generate file system routes error, ".concat(entry, " directory not found."));
158
- }
159
- if (!(fs.existsSync(entry) && fs.statSync(entry).isDirectory())) {
160
- throw new Error("generate file system routes error, ".concat(entry, " should be directory."));
161
- }
162
- var routes = [];
163
- recursiveReadDirLegacy({
164
- dir: entry,
165
- routes: routes,
166
- basePath: '/',
167
- srcDirectory: srcDirectory,
168
- srcAlias: srcAlias
169
- });
170
- var internalComponentsDir = path.resolve(internalDirectory, "".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_COMPONENTS_DIR));
171
- fs.emptyDirSync(internalComponentsDir);
172
- routes = normalizeNestedRoutes(routes, internalComponentsDir, internalDirectory, internalDirAlias);
173
- parents.length = 0;
174
-
175
- // FIXME: support more situations
176
- routes.sort(function (a, b) {
177
- var delta = getRouteWeight(a.path) - getRouteWeight(b.path);
178
- if (delta === 0) {
179
- return a.path.length - b.path.length;
200
+ var getClientRoutes = function(param) {
201
+ var entrypoint = param.entrypoint, srcDirectory = param.srcDirectory, srcAlias = param.srcAlias, internalDirectory = param.internalDirectory, internalDirAlias = param.internalDirAlias;
202
+ var entry = entrypoint.entry, entryName = entrypoint.entryName;
203
+ if (!fs.existsSync(entry)) {
204
+ throw new Error("generate file system routes error, ".concat(entry, " directory not found."));
205
+ }
206
+ if (!(fs.existsSync(entry) && fs.statSync(entry).isDirectory())) {
207
+ throw new Error("generate file system routes error, ".concat(entry, " should be directory."));
180
208
  }
181
- return delta;
182
- });
183
- debug("fileSystem routes: %o", routes);
184
- return routes;
185
- };
209
+ var routes = [];
210
+ recursiveReadDirLegacy({
211
+ dir: entry,
212
+ routes: routes,
213
+ basePath: "/",
214
+ srcDirectory: srcDirectory,
215
+ srcAlias: srcAlias
216
+ });
217
+ var internalComponentsDir = path.resolve(internalDirectory, "".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_COMPONENTS_DIR));
218
+ fs.emptyDirSync(internalComponentsDir);
219
+ routes = normalizeNestedRoutes(routes, internalComponentsDir, internalDirectory, internalDirAlias);
220
+ parents.length = 0;
221
+ routes.sort(function(a, b) {
222
+ var delta = getRouteWeight(a.path) - getRouteWeight(b.path);
223
+ if (delta === 0) {
224
+ return a.path.length - b.path.length;
225
+ }
226
+ return delta;
227
+ });
228
+ debug("fileSystem routes: %o", routes);
229
+ return routes;
230
+ };
231
+ export { getClientRoutes };
@@ -1,2 +1,3 @@
1
- export { getClientRoutes } from "./getRoutes";
2
- export { getClientRoutes as getClientRoutesLegacy } from "./getRoutesLegacy";
1
+ import { getClientRoutes } from "./getRoutes";
2
+ import { getClientRoutes as getClientRoutes2 } from "./getRoutesLegacy";
3
+ export { getClientRoutes, getClientRoutes2 as getClientRoutesLegacy };
@@ -1,24 +1,23 @@
1
- import path from 'path';
2
- import { createDebugger, findExists, fs } from '@modern-js/utils';
1
+ import path from "path";
2
+ import { createDebugger, findExists, fs } from "@modern-js/utils";
3
3
  import { JS_EXTENSIONS, FILE_SYSTEM_ROUTES_LAYOUT, FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT, FILE_SYSTEM_ROUTES_IGNORED_REGEX } from "../constants";
4
- var debug = createDebugger('get-client-routes');
5
- export { debug };
6
- export var findLayout = function findLayout(dir) {
7
- return findExists(JS_EXTENSIONS.map(function (ext) {
8
- return path.resolve(dir, "".concat(FILE_SYSTEM_ROUTES_LAYOUT).concat(ext));
9
- }));
4
+ var debug = createDebugger("get-client-routes");
5
+ var findLayout = function(dir) {
6
+ return findExists(JS_EXTENSIONS.map(function(ext) {
7
+ return path.resolve(dir, "".concat(FILE_SYSTEM_ROUTES_LAYOUT).concat(ext));
8
+ }));
10
9
  };
11
- export var getRouteWeight = function getRouteWeight(route) {
12
- return route === '*' ? 999 : route.split(':').length - 1;
10
+ var getRouteWeight = function(route) {
11
+ return route === "*" ? 999 : route.split(":").length - 1;
13
12
  };
14
- export var shouldSkip = function shouldSkip(file) {
15
- // should not skip directory.
16
- if (fs.statSync(file).isDirectory()) {
13
+ var shouldSkip = function(file) {
14
+ if (fs.statSync(file).isDirectory()) {
15
+ return false;
16
+ }
17
+ var ext = path.extname(file);
18
+ if (FILE_SYSTEM_ROUTES_IGNORED_REGEX.test(file) || !JS_EXTENSIONS.includes(ext) || FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT === path.basename(file, ext)) {
19
+ return true;
20
+ }
17
21
  return false;
18
- }
19
- var ext = path.extname(file);
20
- if (FILE_SYSTEM_ROUTES_IGNORED_REGEX.test(file) || !JS_EXTENSIONS.includes(ext) || FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT === path.basename(file, ext)) {
21
- return true;
22
- }
23
- return false;
24
- };
22
+ };
23
+ export { debug, findLayout, getRouteWeight, shouldSkip };
@@ -1,96 +1,99 @@
1
- import fs from 'fs';
2
- import path from 'path';
3
- import { findExists, ensureAbsolutePath } from '@modern-js/utils';
1
+ import fs from "fs";
2
+ import path from "path";
3
+ import { findExists, ensureAbsolutePath } from "@modern-js/utils";
4
4
  import { isDefaultExportFunction } from "./isDefaultExportFunction";
5
5
  import { JS_EXTENSIONS, INDEX_FILE_NAME, APP_FILE_NAME, PAGES_DIR_NAME, FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT, NESTED_ROUTES_DIR } from "./constants";
6
- var hasIndex = function hasIndex(dir) {
7
- return findExists(JS_EXTENSIONS.map(function (ext) {
8
- return path.resolve(dir, "".concat(INDEX_FILE_NAME).concat(ext));
9
- }));
6
+ var hasIndex = function(dir) {
7
+ return findExists(JS_EXTENSIONS.map(function(ext) {
8
+ return path.resolve(dir, "".concat(INDEX_FILE_NAME).concat(ext));
9
+ }));
10
10
  };
11
- var hasApp = function hasApp(dir) {
12
- return findExists(JS_EXTENSIONS.map(function (ext) {
13
- return path.resolve(dir, "".concat(APP_FILE_NAME).concat(ext));
14
- }));
11
+ var hasApp = function(dir) {
12
+ return findExists(JS_EXTENSIONS.map(function(ext) {
13
+ return path.resolve(dir, "".concat(APP_FILE_NAME).concat(ext));
14
+ }));
15
15
  };
16
- var hasPages = function hasPages(dir) {
17
- return fs.existsSync(path.join(dir, PAGES_DIR_NAME));
16
+ var hasPages = function(dir) {
17
+ return fs.existsSync(path.join(dir, PAGES_DIR_NAME));
18
18
  };
19
- var hasNestedRoutes = function hasNestedRoutes(dir) {
20
- return fs.existsSync(path.join(dir, NESTED_ROUTES_DIR));
19
+ var hasNestedRoutes = function(dir) {
20
+ return fs.existsSync(path.join(dir, NESTED_ROUTES_DIR));
21
21
  };
22
- var isBundleEntry = function isBundleEntry(dir) {
23
- return hasApp(dir) || hasPages(dir) || hasIndex(dir) || hasNestedRoutes(dir);
22
+ var isBundleEntry = function(dir) {
23
+ return hasApp(dir) || hasPages(dir) || hasIndex(dir) || hasNestedRoutes(dir);
24
24
  };
25
- var scanDir = function scanDir(dirs) {
26
- return dirs.map(function (dir) {
27
- var indexFile = hasIndex(dir);
28
- var customBootstrap = isDefaultExportFunction(indexFile) ? indexFile : false;
29
- var entryName = path.basename(dir);
30
- if (indexFile && !customBootstrap) {
31
- return {
32
- entryName: entryName,
33
- entry: indexFile,
34
- absoluteEntryDir: path.resolve(dir),
35
- isAutoMount: false
36
- };
37
- }
38
- var isHasApp = hasApp(dir);
39
- if (isHasApp) {
40
- return {
41
- entryName: entryName,
42
- entry: path.join(dir, APP_FILE_NAME),
43
- isAutoMount: true,
44
- absoluteEntryDir: path.resolve(dir),
45
- customBootstrap: customBootstrap
46
- };
47
- }
48
- var isHasNestedRoutes = hasNestedRoutes(dir);
49
- var isHasPages = hasPages(dir);
50
- if (isHasNestedRoutes || isHasPages) {
51
- var entrypoint = {
52
- entryName: entryName,
53
- entry: '',
54
- fileSystemRoutes: {
55
- globalApp: findExists(JS_EXTENSIONS.map(function (ext) {
56
- return path.resolve(dir, "./".concat(PAGES_DIR_NAME, "/").concat(FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT).concat(ext));
57
- }))
58
- },
59
- isAutoMount: true,
60
- absoluteEntryDir: path.resolve(dir),
61
- customBootstrap: customBootstrap
62
- };
63
- if (isHasPages) {
64
- entrypoint.entry = path.join(dir, PAGES_DIR_NAME);
65
- }
66
- if (isHasNestedRoutes) {
67
- entrypoint.nestedRoutesEntry = path.join(dir, NESTED_ROUTES_DIR);
68
- }
69
- return entrypoint;
70
- }
71
- return {
72
- entryName: entryName,
73
- entry: indexFile,
74
- absoluteEntryDir: path.resolve(dir),
75
- isAutoMount: false
76
- };
77
- });
25
+ var scanDir = function(dirs) {
26
+ return dirs.map(function(dir) {
27
+ var indexFile = hasIndex(dir);
28
+ var customBootstrap = isDefaultExportFunction(indexFile) ? indexFile : false;
29
+ var entryName = path.basename(dir);
30
+ if (indexFile && !customBootstrap) {
31
+ return {
32
+ entryName: entryName,
33
+ entry: indexFile,
34
+ absoluteEntryDir: path.resolve(dir),
35
+ isAutoMount: false
36
+ };
37
+ }
38
+ var isHasApp = hasApp(dir);
39
+ if (isHasApp) {
40
+ return {
41
+ entryName: entryName,
42
+ entry: path.join(dir, APP_FILE_NAME),
43
+ isAutoMount: true,
44
+ absoluteEntryDir: path.resolve(dir),
45
+ customBootstrap: customBootstrap
46
+ };
47
+ }
48
+ var isHasNestedRoutes = hasNestedRoutes(dir);
49
+ var isHasPages = hasPages(dir);
50
+ if (isHasNestedRoutes || isHasPages) {
51
+ var entrypoint = {
52
+ entryName: entryName,
53
+ entry: "",
54
+ fileSystemRoutes: {
55
+ globalApp: findExists(JS_EXTENSIONS.map(function(ext) {
56
+ return path.resolve(dir, "./".concat(PAGES_DIR_NAME, "/").concat(FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT).concat(ext));
57
+ }))
58
+ },
59
+ isAutoMount: true,
60
+ absoluteEntryDir: path.resolve(dir),
61
+ customBootstrap: customBootstrap
62
+ };
63
+ if (isHasPages) {
64
+ entrypoint.entry = path.join(dir, PAGES_DIR_NAME);
65
+ }
66
+ if (isHasNestedRoutes) {
67
+ entrypoint.nestedRoutesEntry = path.join(dir, NESTED_ROUTES_DIR);
68
+ }
69
+ return entrypoint;
70
+ }
71
+ return {
72
+ entryName: entryName,
73
+ entry: indexFile,
74
+ absoluteEntryDir: path.resolve(dir),
75
+ isAutoMount: false
76
+ };
77
+ });
78
78
  };
79
- export var getFileSystemEntry = function getFileSystemEntry(appContext, config) {
80
- var appDirectory = appContext.appDirectory;
81
- var entriesDir = config.source.entriesDir;
82
- var src = ensureAbsolutePath(appDirectory, entriesDir || '');
83
- if (fs.existsSync(src)) {
84
- if (fs.statSync(src).isDirectory()) {
85
- return scanDir(isBundleEntry(src) ? [src] : fs.readdirSync(src).map(function (file) {
86
- return path.join(src, file);
87
- }).filter(function (file) {
88
- return fs.statSync(file).isDirectory() && isBundleEntry(file);
89
- }));
79
+ var getFileSystemEntry = function(appContext, config) {
80
+ var appDirectory = appContext.appDirectory;
81
+ var entriesDir = config.source.entriesDir;
82
+ var src = ensureAbsolutePath(appDirectory, entriesDir || "");
83
+ if (fs.existsSync(src)) {
84
+ if (fs.statSync(src).isDirectory()) {
85
+ return scanDir(isBundleEntry(src) ? [
86
+ src
87
+ ] : fs.readdirSync(src).map(function(file) {
88
+ return path.join(src, file);
89
+ }).filter(function(file) {
90
+ return fs.statSync(file).isDirectory() && isBundleEntry(file);
91
+ }));
92
+ } else {
93
+ throw Error("source.entriesDir accept a directory.");
94
+ }
90
95
  } else {
91
- throw Error("source.entriesDir accept a directory.");
96
+ throw Error("src dir ".concat(entriesDir, " not found."));
92
97
  }
93
- } else {
94
- throw Error("src dir ".concat(entriesDir, " not found."));
95
- }
96
- };
98
+ };
99
+ export { getFileSystemEntry };