@modern-js/app-tools 2.29.0 → 2.30.1-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (246) hide show
  1. package/CHANGELOG.md +42 -0
  2. package/bin/modern.js +1 -0
  3. package/dist/cjs/analyze/nestedRoutes.js +2 -1
  4. package/dist/cjs/analyze/templates.js +0 -3
  5. package/dist/esm/analyze/nestedRoutes.js +4 -1
  6. package/dist/esm/analyze/templates.js +1 -1
  7. package/dist/esm-node/analyze/nestedRoutes.js +2 -1
  8. package/dist/esm-node/analyze/templates.js +0 -3
  9. package/dist/js/modern/analyze/constants.js +54 -0
  10. package/dist/js/modern/analyze/generateCode.js +247 -0
  11. package/dist/js/modern/analyze/getBundleEntry.js +71 -0
  12. package/dist/js/modern/analyze/getClientRoutes/getRoutes.js +220 -0
  13. package/dist/js/modern/analyze/getClientRoutes/getRoutesLegacy.js +216 -0
  14. package/dist/js/modern/analyze/getClientRoutes/index.js +6 -0
  15. package/dist/js/modern/analyze/getClientRoutes/utils.js +31 -0
  16. package/dist/js/modern/analyze/getFileSystemEntry.js +109 -0
  17. package/dist/js/modern/analyze/getHtmlTemplate.js +115 -0
  18. package/dist/js/modern/analyze/getServerRoutes.js +175 -0
  19. package/dist/js/modern/analyze/index.js +332 -0
  20. package/dist/js/modern/analyze/isDefaultExportFunction.js +42 -0
  21. package/dist/js/modern/analyze/makeLegalIdentifier.js +13 -0
  22. package/dist/js/modern/analyze/nestedRoutes.js +157 -0
  23. package/dist/js/modern/analyze/templates.js +334 -0
  24. package/dist/js/modern/analyze/utils.js +141 -0
  25. package/dist/js/modern/builder/builderPlugins/compatModern.js +233 -0
  26. package/dist/js/modern/builder/index.js +159 -0
  27. package/dist/js/modern/builder/loaders/routerLoader.js +17 -0
  28. package/dist/js/modern/builder/loaders/serverModuleLoader.js +7 -0
  29. package/dist/js/modern/builder/share.js +46 -0
  30. package/dist/js/modern/builder/webpackPlugins/htmlAsyncChunkPlugin.js +30 -0
  31. package/dist/js/modern/builder/webpackPlugins/htmlBottomTemplate.js +37 -0
  32. package/dist/js/modern/builder/webpackPlugins/routerPlugin.js +113 -0
  33. package/dist/js/modern/commands/build.js +91 -0
  34. package/dist/js/modern/commands/deploy.js +28 -0
  35. package/dist/js/modern/commands/dev.js +109 -0
  36. package/dist/js/modern/commands/index.js +3 -0
  37. package/dist/js/modern/commands/inspect.js +38 -0
  38. package/dist/js/modern/commands/serve.js +54 -0
  39. package/dist/js/modern/config/default.js +175 -0
  40. package/dist/js/modern/config/index.js +8 -0
  41. package/dist/js/modern/config/initial/createHtmlConfig.js +35 -0
  42. package/dist/js/modern/config/initial/createOutputConfig.js +68 -0
  43. package/dist/js/modern/config/initial/createSourceConfig.js +39 -0
  44. package/dist/js/modern/config/initial/createToolsConfig.js +42 -0
  45. package/dist/js/modern/config/initial/index.js +16 -0
  46. package/dist/js/modern/config/initial/inits.js +152 -0
  47. package/dist/js/modern/config/initial/transformNormalizedConfig.js +47 -0
  48. package/dist/js/modern/defineConfig.js +27 -0
  49. package/dist/js/modern/exports/server.js +4 -0
  50. package/dist/js/modern/hooks.js +35 -0
  51. package/dist/js/modern/index.js +211 -0
  52. package/dist/js/modern/initialize/index.js +124 -0
  53. package/dist/js/modern/locale/en.js +36 -0
  54. package/dist/js/modern/locale/index.js +9 -0
  55. package/dist/js/modern/locale/zh.js +36 -0
  56. package/dist/js/modern/schema/Schema.js +40 -0
  57. package/dist/js/modern/schema/index.js +88 -0
  58. package/dist/js/modern/schema/legacy.js +148 -0
  59. package/dist/js/modern/types/config/deploy.js +0 -0
  60. package/dist/js/modern/types/config/dev.js +0 -0
  61. package/dist/js/modern/types/config/experiments.js +0 -0
  62. package/dist/js/modern/types/config/html.js +0 -0
  63. package/dist/js/modern/types/config/index.js +1 -0
  64. package/dist/js/modern/types/config/output.js +0 -0
  65. package/dist/js/modern/types/config/performance.js +0 -0
  66. package/dist/js/modern/types/config/security.js +0 -0
  67. package/dist/js/modern/types/config/source.js +0 -0
  68. package/dist/js/modern/types/config/tools.js +0 -0
  69. package/dist/js/modern/types/hooks.js +0 -0
  70. package/dist/js/modern/types/index.js +3 -0
  71. package/dist/js/modern/types/legacyConfig/deploy.js +0 -0
  72. package/dist/js/modern/types/legacyConfig/dev.js +0 -0
  73. package/dist/js/modern/types/legacyConfig/index.js +0 -0
  74. package/dist/js/modern/types/legacyConfig/output.js +0 -0
  75. package/dist/js/modern/types/legacyConfig/source.js +0 -0
  76. package/dist/js/modern/types/legacyConfig/tools.js +0 -0
  77. package/dist/js/modern/utils/config.js +128 -0
  78. package/dist/js/modern/utils/createServer.js +75 -0
  79. package/dist/js/modern/utils/env.js +15 -0
  80. package/dist/js/modern/utils/generateWatchFiles.js +55 -0
  81. package/dist/js/modern/utils/getSelectedEntries.js +58 -0
  82. package/dist/js/modern/utils/getServerInternalPlugins.js +58 -0
  83. package/dist/js/modern/utils/language.js +8 -0
  84. package/dist/js/modern/utils/printInstructions.js +31 -0
  85. package/dist/js/modern/utils/restart.js +44 -0
  86. package/dist/js/modern/utils/routes.js +30 -0
  87. package/dist/js/modern/utils/types.js +0 -0
  88. package/dist/js/node/analyze/constants.js +98 -0
  89. package/dist/js/node/analyze/generateCode.js +271 -0
  90. package/dist/js/node/analyze/getBundleEntry.js +95 -0
  91. package/dist/js/node/analyze/getClientRoutes/getRoutes.js +242 -0
  92. package/dist/js/node/analyze/getClientRoutes/getRoutesLegacy.js +238 -0
  93. package/dist/js/node/analyze/getClientRoutes/index.js +30 -0
  94. package/dist/js/node/analyze/getClientRoutes/utils.js +58 -0
  95. package/dist/js/node/analyze/getFileSystemEntry.js +131 -0
  96. package/dist/js/node/analyze/getHtmlTemplate.js +144 -0
  97. package/dist/js/node/analyze/getServerRoutes.js +194 -0
  98. package/dist/js/node/analyze/index.js +339 -0
  99. package/dist/js/node/analyze/isDefaultExportFunction.js +71 -0
  100. package/dist/js/node/analyze/makeLegalIdentifier.js +36 -0
  101. package/dist/js/node/analyze/nestedRoutes.js +184 -0
  102. package/dist/js/node/analyze/templates.js +365 -0
  103. package/dist/js/node/analyze/utils.js +172 -0
  104. package/dist/js/node/builder/builderPlugins/compatModern.js +258 -0
  105. package/dist/js/node/builder/index.js +177 -0
  106. package/dist/js/node/builder/loaders/routerLoader.js +38 -0
  107. package/dist/js/node/builder/loaders/serverModuleLoader.js +28 -0
  108. package/dist/js/node/builder/share.js +75 -0
  109. package/dist/js/node/builder/webpackPlugins/htmlAsyncChunkPlugin.js +53 -0
  110. package/dist/js/node/builder/webpackPlugins/htmlBottomTemplate.js +60 -0
  111. package/dist/js/node/builder/webpackPlugins/routerPlugin.js +135 -0
  112. package/dist/js/node/commands/build.js +112 -0
  113. package/dist/js/node/commands/deploy.js +51 -0
  114. package/dist/js/node/commands/dev.js +126 -0
  115. package/dist/js/node/commands/index.js +19 -0
  116. package/dist/js/node/commands/inspect.js +61 -0
  117. package/dist/js/node/commands/serve.js +83 -0
  118. package/dist/js/node/config/default.js +197 -0
  119. package/dist/js/node/config/index.js +34 -0
  120. package/dist/js/node/config/initial/createHtmlConfig.js +58 -0
  121. package/dist/js/node/config/initial/createOutputConfig.js +91 -0
  122. package/dist/js/node/config/initial/createSourceConfig.js +62 -0
  123. package/dist/js/node/config/initial/createToolsConfig.js +65 -0
  124. package/dist/js/node/config/initial/index.js +41 -0
  125. package/dist/js/node/config/initial/inits.js +175 -0
  126. package/dist/js/node/config/initial/transformNormalizedConfig.js +70 -0
  127. package/dist/js/node/defineConfig.js +49 -0
  128. package/dist/js/node/exports/server.js +27 -0
  129. package/dist/js/node/hooks.js +54 -0
  130. package/dist/js/node/index.js +235 -0
  131. package/dist/js/node/initialize/index.js +134 -0
  132. package/dist/js/node/locale/en.js +59 -0
  133. package/dist/js/node/locale/index.js +33 -0
  134. package/dist/js/node/locale/zh.js +59 -0
  135. package/dist/js/node/schema/Schema.js +63 -0
  136. package/dist/js/node/schema/index.js +118 -0
  137. package/dist/js/node/schema/legacy.js +169 -0
  138. package/dist/js/node/types/config/deploy.js +15 -0
  139. package/dist/js/node/types/config/dev.js +15 -0
  140. package/dist/js/node/types/config/experiments.js +15 -0
  141. package/dist/js/node/types/config/html.js +15 -0
  142. package/dist/js/node/types/config/index.js +17 -0
  143. package/dist/js/node/types/config/output.js +15 -0
  144. package/dist/js/node/types/config/performance.js +15 -0
  145. package/dist/js/node/types/config/security.js +15 -0
  146. package/dist/js/node/types/config/source.js +15 -0
  147. package/dist/js/node/types/config/tools.js +15 -0
  148. package/dist/js/node/types/hooks.js +15 -0
  149. package/dist/js/node/types/index.js +19 -0
  150. package/dist/js/node/types/legacyConfig/deploy.js +15 -0
  151. package/dist/js/node/types/legacyConfig/dev.js +15 -0
  152. package/dist/js/node/types/legacyConfig/index.js +15 -0
  153. package/dist/js/node/types/legacyConfig/output.js +15 -0
  154. package/dist/js/node/types/legacyConfig/source.js +15 -0
  155. package/dist/js/node/types/legacyConfig/tools.js +15 -0
  156. package/dist/js/node/utils/config.js +153 -0
  157. package/dist/js/node/utils/createServer.js +106 -0
  158. package/dist/js/node/utils/env.js +38 -0
  159. package/dist/js/node/utils/generateWatchFiles.js +85 -0
  160. package/dist/js/node/utils/getSelectedEntries.js +81 -0
  161. package/dist/js/node/utils/getServerInternalPlugins.js +79 -0
  162. package/dist/js/node/utils/language.js +31 -0
  163. package/dist/js/node/utils/printInstructions.js +54 -0
  164. package/dist/js/node/utils/restart.js +67 -0
  165. package/dist/js/node/utils/routes.js +59 -0
  166. package/dist/js/node/utils/types.js +15 -0
  167. package/dist/js/treeshaking/analyze/constants.js +40 -0
  168. package/dist/js/treeshaking/analyze/generateCode.js +485 -0
  169. package/dist/js/treeshaking/analyze/getBundleEntry.js +62 -0
  170. package/dist/js/treeshaking/analyze/getClientRoutes/getRoutes.js +233 -0
  171. package/dist/js/treeshaking/analyze/getClientRoutes/getRoutesLegacy.js +231 -0
  172. package/dist/js/treeshaking/analyze/getClientRoutes/index.js +3 -0
  173. package/dist/js/treeshaking/analyze/getClientRoutes/utils.js +23 -0
  174. package/dist/js/treeshaking/analyze/getFileSystemEntry.js +107 -0
  175. package/dist/js/treeshaking/analyze/getHtmlTemplate.js +302 -0
  176. package/dist/js/treeshaking/analyze/getServerRoutes.js +222 -0
  177. package/dist/js/treeshaking/analyze/index.js +697 -0
  178. package/dist/js/treeshaking/analyze/isDefaultExportFunction.js +47 -0
  179. package/dist/js/treeshaking/analyze/makeLegalIdentifier.js +13 -0
  180. package/dist/js/treeshaking/analyze/nestedRoutes.js +384 -0
  181. package/dist/js/treeshaking/analyze/templates.js +468 -0
  182. package/dist/js/treeshaking/analyze/utils.js +374 -0
  183. package/dist/js/treeshaking/builder/builderPlugins/compatModern.js +304 -0
  184. package/dist/js/treeshaking/builder/index.js +374 -0
  185. package/dist/js/treeshaking/builder/loaders/routerLoader.js +13 -0
  186. package/dist/js/treeshaking/builder/loaders/serverModuleLoader.js +5 -0
  187. package/dist/js/treeshaking/builder/share.js +40 -0
  188. package/dist/js/treeshaking/builder/webpackPlugins/htmlAsyncChunkPlugin.js +110 -0
  189. package/dist/js/treeshaking/builder/webpackPlugins/htmlBottomTemplate.js +72 -0
  190. package/dist/js/treeshaking/builder/webpackPlugins/routerPlugin.js +343 -0
  191. package/dist/js/treeshaking/commands/build.js +291 -0
  192. package/dist/js/treeshaking/commands/deploy.js +154 -0
  193. package/dist/js/treeshaking/commands/dev.js +301 -0
  194. package/dist/js/treeshaking/commands/index.js +3 -0
  195. package/dist/js/treeshaking/commands/inspect.js +149 -0
  196. package/dist/js/treeshaking/commands/serve.js +199 -0
  197. package/dist/js/treeshaking/config/default.js +210 -0
  198. package/dist/js/treeshaking/config/index.js +3 -0
  199. package/dist/js/treeshaking/config/initial/createHtmlConfig.js +19 -0
  200. package/dist/js/treeshaking/config/initial/createOutputConfig.js +41 -0
  201. package/dist/js/treeshaking/config/initial/createSourceConfig.js +42 -0
  202. package/dist/js/treeshaking/config/initial/createToolsConfig.js +23 -0
  203. package/dist/js/treeshaking/config/initial/index.js +12 -0
  204. package/dist/js/treeshaking/config/initial/inits.js +209 -0
  205. package/dist/js/treeshaking/config/initial/transformNormalizedConfig.js +35 -0
  206. package/dist/js/treeshaking/defineConfig.js +61 -0
  207. package/dist/js/treeshaking/exports/server.js +2 -0
  208. package/dist/js/treeshaking/hooks.js +29 -0
  209. package/dist/js/treeshaking/index.js +706 -0
  210. package/dist/js/treeshaking/initialize/index.js +276 -0
  211. package/dist/js/treeshaking/locale/en.js +38 -0
  212. package/dist/js/treeshaking/locale/index.js +9 -0
  213. package/dist/js/treeshaking/locale/zh.js +38 -0
  214. package/dist/js/treeshaking/schema/Schema.js +273 -0
  215. package/dist/js/treeshaking/schema/index.js +181 -0
  216. package/dist/js/treeshaking/schema/legacy.js +337 -0
  217. package/dist/js/treeshaking/types/config/deploy.js +1 -0
  218. package/dist/js/treeshaking/types/config/dev.js +1 -0
  219. package/dist/js/treeshaking/types/config/experiments.js +1 -0
  220. package/dist/js/treeshaking/types/config/html.js +1 -0
  221. package/dist/js/treeshaking/types/config/index.js +1 -0
  222. package/dist/js/treeshaking/types/config/output.js +1 -0
  223. package/dist/js/treeshaking/types/config/performance.js +1 -0
  224. package/dist/js/treeshaking/types/config/security.js +1 -0
  225. package/dist/js/treeshaking/types/config/source.js +1 -0
  226. package/dist/js/treeshaking/types/config/tools.js +1 -0
  227. package/dist/js/treeshaking/types/hooks.js +1 -0
  228. package/dist/js/treeshaking/types/index.js +3 -0
  229. package/dist/js/treeshaking/types/legacyConfig/deploy.js +1 -0
  230. package/dist/js/treeshaking/types/legacyConfig/dev.js +1 -0
  231. package/dist/js/treeshaking/types/legacyConfig/index.js +1 -0
  232. package/dist/js/treeshaking/types/legacyConfig/output.js +1 -0
  233. package/dist/js/treeshaking/types/legacyConfig/source.js +1 -0
  234. package/dist/js/treeshaking/types/legacyConfig/tools.js +1 -0
  235. package/dist/js/treeshaking/utils/config.js +302 -0
  236. package/dist/js/treeshaking/utils/createServer.js +258 -0
  237. package/dist/js/treeshaking/utils/env.js +13 -0
  238. package/dist/js/treeshaking/utils/generateWatchFiles.js +214 -0
  239. package/dist/js/treeshaking/utils/getSelectedEntries.js +186 -0
  240. package/dist/js/treeshaking/utils/getServerInternalPlugins.js +210 -0
  241. package/dist/js/treeshaking/utils/language.js +6 -0
  242. package/dist/js/treeshaking/utils/printInstructions.js +152 -0
  243. package/dist/js/treeshaking/utils/restart.js +187 -0
  244. package/dist/js/treeshaking/utils/routes.js +153 -0
  245. package/dist/js/treeshaking/utils/types.js +1 -0
  246. package/package.json +24 -24
package/CHANGELOG.md CHANGED
@@ -1,5 +1,47 @@
1
1
  # @modern-js/app-tools
2
2
 
3
+ ## 2.30.0
4
+
5
+ ### Patch Changes
6
+
7
+ - 276ace3: chore: remove noscript tag in html template
8
+ chore: 移除 HTML 模板中的 noscript 标签
9
+ - c03be09: feat(CLI): print solution name and version to terminal
10
+
11
+ feat(CLI): 在控制台输出 solution 的名称和版本
12
+
13
+ - Updated dependencies [9f21f28]
14
+ - Updated dependencies [a5ee81a]
15
+ - Updated dependencies [883692c]
16
+ - Updated dependencies [cc5f49e]
17
+ - Updated dependencies [f74064c]
18
+ - Updated dependencies [b6ab299]
19
+ - Updated dependencies [0ea763e]
20
+ - Updated dependencies [e6ae836]
21
+ - Updated dependencies [c03be09]
22
+ - Updated dependencies [7cb7b24]
23
+ - Updated dependencies [e94ad94]
24
+ - Updated dependencies [0e0b6e3]
25
+ - @modern-js/prod-server@2.30.0
26
+ - @modern-js/types@2.30.0
27
+ - @modern-js/server-core@2.30.0
28
+ - @modern-js/server@2.30.0
29
+ - @modern-js/builder-webpack-provider@2.30.0
30
+ - @modern-js/builder-shared@2.30.0
31
+ - @modern-js/builder-rspack-provider@2.30.0
32
+ - @modern-js/builder@2.30.0
33
+ - @modern-js/core@2.30.0
34
+ - @modern-js/plugin-data-loader@2.30.0
35
+ - @modern-js/utils@2.30.0
36
+ - @modern-js/builder-plugin-esbuild@2.30.0
37
+ - @modern-js/builder-plugin-node-polyfill@2.30.0
38
+ - @modern-js/plugin-lint@2.30.0
39
+ - @modern-js/plugin-i18n@2.30.0
40
+ - @modern-js/new-action@2.30.0
41
+ - @modern-js/node-bundle-require@2.30.0
42
+ - @modern-js/plugin@2.30.0
43
+ - @modern-js/upgrade@2.30.0
44
+
3
45
  ## 2.29.0
4
46
 
5
47
  ### Patch Changes
package/bin/modern.js CHANGED
@@ -11,4 +11,5 @@ require('@modern-js/core/runBin').run({
11
11
  server: INTERNAL_SERVER_PLUGINS,
12
12
  autoLoad: INTERNAL_APP_TOOLS_RUNTIME_PLUGINS,
13
13
  },
14
+ initialLog: `@modern-js/app-tools v${require('../package.json').version}`,
14
15
  });
package/dist/cjs/analyze/nestedRoutes.js CHANGED
@@ -66,7 +66,8 @@ const optimizeRoute = (routeTree) => {
66
66
  ];
67
67
  }
68
68
  const { children } = routeTree;
69
- if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config) {
69
+ const hasPage = children.some((child) => child.index);
70
+ if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config && !hasPage) {
70
71
  const newRoutes = children.map((child) => {
71
72
  const routePath = `${routeTree.path ? routeTree.path : ""}${child.path ? `/${child.path}` : ""}`;
72
73
  const newRoute = {
package/dist/cjs/analyze/templates.js CHANGED
@@ -94,9 +94,6 @@ const html = (partials) => `
94
94
  </head>
95
95
 
96
96
  <body>
97
- <noscript>
98
- We're sorry but react app doesn't work properly without JavaScript enabled. Please enable it to continue.
99
- </noscript>
100
97
  <div id="<%= mountId %>"><!--<?- html ?>--></div>
101
98
  ${partials.body.join("\n")}
102
99
  <!--<?- chunksMap.js ?>-->
package/dist/esm/analyze/nestedRoutes.js CHANGED
@@ -45,7 +45,10 @@ export var optimizeRoute = function(routeTree) {
45
45
  ];
46
46
  }
47
47
  var children = routeTree.children;
48
- if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config) {
48
+ var hasPage = children.some(function(child) {
49
+ return child.index;
50
+ });
51
+ if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config && !hasPage) {
49
52
  var newRoutes = children.map(function(child) {
50
53
  var routePath = "".concat(routeTree.path ? routeTree.path : "").concat(child.path ? "/".concat(child.path) : "");
51
54
  var newRoute = _object_spread_props(_object_spread({}, child), {
package/dist/esm/analyze/templates.js CHANGED
@@ -20,7 +20,7 @@ export var renderFunction = function(param) {
20
20
  }).join("\n"), "\n ]\n })(").concat(fileSystemRoutes2 ? "" : "App", ")\n\n\n if(!AppWrapper.init && typeof appInit !== 'undefined') {\n AppWrapper.init = appInit;\n }\n\n\n if (IS_BROWSER) {\n ").concat(customBootstrap ? "customBootstrap(AppWrapper, () => ".concat(bootstrap, ");") : "".concat(bootstrap, ";"), "\n }\n\n return AppWrapper\n");
21
21
  };
22
22
  export var html = function(partials) {
23
- return "\n<!DOCTYPE html>\n<html>\n<head>\n <%= meta %>\n <title><%= title %></title>\n\n ".concat(partials.top.join("\n"), "\n\n ").concat(partials.head.join("\n"), "\n\n</head>\n\n<body>\n <noscript>\n We're sorry but react app doesn't work properly without JavaScript enabled. Please enable it to continue.\n </noscript>\n <div id=\"<%= mountId %>\"><!--<?- html ?>--></div>\n ").concat(partials.body.join("\n"), "\n <!--<?- chunksMap.js ?>-->\n <!--<?- SSRDataScript ?>-->\n <!--<?- bottomTemplate ?>-->\n</body>\n\n</html>\n");
23
+ return "\n<!DOCTYPE html>\n<html>\n<head>\n <%= meta %>\n <title><%= title %></title>\n\n ".concat(partials.top.join("\n"), "\n\n ").concat(partials.head.join("\n"), '\n\n</head>\n\n<body>\n <div id="<%= mountId %>"><!--<?- html ?>--></div>\n ').concat(partials.body.join("\n"), "\n <!--<?- chunksMap.js ?>-->\n <!--<?- SSRDataScript ?>-->\n <!--<?- bottomTemplate ?>-->\n</body>\n\n</html>\n");
24
24
  };
25
25
  export var routesForServer = function(param) {
26
26
  var routes = param.routes;
package/dist/esm-node/analyze/nestedRoutes.js CHANGED
@@ -43,7 +43,8 @@ export const optimizeRoute = (routeTree) => {
43
43
  ];
44
44
  }
45
45
  const { children } = routeTree;
46
- if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config) {
46
+ const hasPage = children.some((child) => child.index);
47
+ if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config && !hasPage) {
47
48
  const newRoutes = children.map((child) => {
48
49
  const routePath = `${routeTree.path ? routeTree.path : ""}${child.path ? `/${child.path}` : ""}`;
49
50
  const newRoute = {
package/dist/esm-node/analyze/templates.js CHANGED
@@ -62,9 +62,6 @@ export const html = (partials) => `
62
62
  </head>
63
63
 
64
64
  <body>
65
- <noscript>
66
- We're sorry but react app doesn't work properly without JavaScript enabled. Please enable it to continue.
67
- </noscript>
68
65
  <div id="<%= mountId %>"><!--<?- html ?>--></div>
69
66
  ${partials.body.join("\n")}
70
67
  <!--<?- chunksMap.js ?>-->
package/dist/js/modern/analyze/constants.js ADDED
@@ -0,0 +1,54 @@
1
+ const JS_EXTENSIONS = [".js", ".ts", ".jsx", ".tsx"];
2
+ const INDEX_FILE_NAME = "index";
3
+ const APP_FILE_NAME = "App";
4
+ const PAGES_DIR_NAME = "pages";
5
+ const NESTED_ROUTES_DIR = "routes";
6
+ const FILE_SYSTEM_ROUTES_FILE_NAME = "routes.js";
7
+ const LOADER_EXPORT_NAME = "loader";
8
+ const TEMP_LOADERS_DIR = "__loaders__";
9
+ const ENTRY_POINT_FILE_NAME = "index.js";
10
+ const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.js";
11
+ const FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP = /^\[(\S+)\]([*+?]?)$/;
12
+ const FILE_SYSTEM_ROUTES_LAYOUT = "_layout";
13
+ const FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT = "_app";
14
+ const FILE_SYSTEM_ROUTES_INDEX = "index";
15
+ const FILE_SYSTEM_ROUTES_IGNORED_REGEX = /\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/;
16
+ const HTML_PARTIALS_FOLDER = "html";
17
+ const HTML_PARTIALS_EXTENSIONS = [".htm", ".html", ".ejs"];
18
+ const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
19
+ const NESTED_ROUTE = {
20
+ LAYOUT_FILE: "layout",
21
+ LAYOUT_LOADER_FILE: "layout.loader",
22
+ PAGE_FILE: "page",
23
+ PAGE_LOADER_FILE: "page.loader",
24
+ LOADING_FILE: "loading",
25
+ ERROR_FILE: "error",
26
+ LOADER_FILE: "loader"
27
+ };
28
+ const APP_CONFIG_NAME = "config";
29
+ const APP_INIT_EXPORTED = "init";
30
+ const APP_INIT_IMPORTED = "appInit";
31
+ export {
32
+ APP_CONFIG_NAME,
33
+ APP_FILE_NAME,
34
+ APP_INIT_EXPORTED,
35
+ APP_INIT_IMPORTED,
36
+ ENTRY_BOOTSTRAP_FILE_NAME,
37
+ ENTRY_POINT_FILE_NAME,
38
+ FILE_SYSTEM_ROUTES_COMPONENTS_DIR,
39
+ FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP,
40
+ FILE_SYSTEM_ROUTES_FILE_NAME,
41
+ FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT,
42
+ FILE_SYSTEM_ROUTES_IGNORED_REGEX,
43
+ FILE_SYSTEM_ROUTES_INDEX,
44
+ FILE_SYSTEM_ROUTES_LAYOUT,
45
+ HTML_PARTIALS_EXTENSIONS,
46
+ HTML_PARTIALS_FOLDER,
47
+ INDEX_FILE_NAME,
48
+ JS_EXTENSIONS,
49
+ LOADER_EXPORT_NAME,
50
+ NESTED_ROUTE,
51
+ NESTED_ROUTES_DIR,
52
+ PAGES_DIR_NAME,
53
+ TEMP_LOADERS_DIR
54
+ };
package/dist/js/modern/analyze/generateCode.js ADDED
@@ -0,0 +1,247 @@
1
+ var __async = (__this, __arguments, generator) => {
2
+ return new Promise((resolve, reject) => {
3
+ var fulfilled = (value) => {
4
+ try {
5
+ step(generator.next(value));
6
+ } catch (e) {
7
+ reject(e);
8
+ }
9
+ };
10
+ var rejected = (value) => {
11
+ try {
12
+ step(generator.throw(value));
13
+ } catch (e) {
14
+ reject(e);
15
+ }
16
+ };
17
+ var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
18
+ step((generator = generator.apply(__this, __arguments)).next());
19
+ });
20
+ };
21
+ import path from "path";
22
+ import { fs, getEntryOptions, logger } from "@modern-js/utils";
23
+ import {
24
+ useResolvedConfigContext
25
+ } from "@modern-js/core";
26
+ import * as templates from "./templates";
27
+ import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
28
+ import {
29
+ FILE_SYSTEM_ROUTES_FILE_NAME,
30
+ ENTRY_POINT_FILE_NAME,
31
+ ENTRY_BOOTSTRAP_FILE_NAME
32
+ } from "./constants";
33
+ import { getDefaultImports, getServerLoadersFile } from "./utils";
34
+ import { walk } from "./nestedRoutes";
35
+ const createImportSpecifier = (specifiers) => {
36
+ let defaults = "";
37
+ const named = [];
38
+ for (const { local, imported } of specifiers) {
39
+ if (local && imported) {
40
+ named.push(`${imported} as ${local}`);
41
+ } else if (local) {
42
+ defaults = local;
43
+ } else {
44
+ named.push(imported);
45
+ }
46
+ }
47
+ if (defaults && named.length) {
48
+ return `${defaults}, { ${named.join(", ")} }`;
49
+ } else if (defaults) {
50
+ return defaults;
51
+ } else {
52
+ return `{ ${named.join(", ")} }`;
53
+ }
54
+ };
55
+ const createImportStatements = (statements) => {
56
+ var _a, _b;
57
+ const deDuplicated = [];
58
+ const seen = /* @__PURE__ */ new Map();
59
+ for (const { value, specifiers, initialize } of statements) {
60
+ if (!seen.has(value)) {
61
+ deDuplicated.push({
62
+ value,
63
+ specifiers,
64
+ initialize
65
+ });
66
+ seen.set(value, specifiers);
67
+ } else {
68
+ seen.get(value).push(...specifiers);
69
+ const modifyIndex = deDuplicated.findIndex((v) => v.value === value);
70
+ const originInitialize = (_b = (_a = deDuplicated[modifyIndex]) == null ? void 0 : _a.initialize) != null ? _b : "";
71
+ deDuplicated[modifyIndex].initialize = originInitialize.concat(
72
+ `
73
+ ${initialize || ""}`
74
+ );
75
+ }
76
+ }
77
+ return deDuplicated.map(
78
+ ({ value, specifiers, initialize }) => `import ${createImportSpecifier(specifiers)} from '${value}';
79
+ ${initialize || ""}`
80
+ ).join("\n");
81
+ };
82
+ const generateCode = (appContext, config, entrypoints, api) => __async(void 0, null, function* () {
83
+ var _a, _b, _c;
84
+ const {
85
+ internalDirectory,
86
+ srcDirectory,
87
+ internalDirAlias,
88
+ internalSrcAlias,
89
+ packageName
90
+ } = appContext;
91
+ const hookRunners = api.useHookRunners();
92
+ const isV5 = typeof ((_a = config.runtime) == null ? void 0 : _a.router) !== "boolean" && ((_c = (_b = config == null ? void 0 : config.runtime) == null ? void 0 : _b.router) == null ? void 0 : _c.mode) === "react-router-5";
93
+ const { mountId } = config.html;
94
+ const getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
95
+ yield Promise.all(entrypoints.map(generateEntryCode));
96
+ function generateEntryCode(entrypoint) {
97
+ return __async(this, null, function* () {
98
+ const { entryName, isAutoMount, customBootstrap, fileSystemRoutes } = entrypoint;
99
+ if (isAutoMount) {
100
+ if (fileSystemRoutes) {
101
+ let initialRoutes = [];
102
+ let nestedRoute = null;
103
+ if (entrypoint.entry) {
104
+ initialRoutes = getRoutes({
105
+ entrypoint,
106
+ srcDirectory,
107
+ srcAlias: internalSrcAlias,
108
+ internalDirectory,
109
+ internalDirAlias
110
+ });
111
+ }
112
+ if (entrypoint.nestedRoutesEntry) {
113
+ if (!isV5) {
114
+ nestedRoute = yield walk(
115
+ entrypoint.nestedRoutesEntry,
116
+ entrypoint.nestedRoutesEntry,
117
+ {
118
+ name: internalSrcAlias,
119
+ basename: srcDirectory
120
+ },
121
+ entrypoint.entryName
122
+ );
123
+ if (nestedRoute) {
124
+ initialRoutes.unshift(nestedRoute);
125
+ }
126
+ } else {
127
+ logger.error("Nested routes is not supported in legacy mode.");
128
+ process.exit(1);
129
+ }
130
+ }
131
+ const { routes } = yield hookRunners.modifyFileSystemRoutes({
132
+ entrypoint,
133
+ routes: initialRoutes
134
+ });
135
+ const config2 = useResolvedConfigContext();
136
+ const ssr = getEntryOptions(
137
+ entryName,
138
+ config2.server.ssr,
139
+ config2.server.ssrByEntries,
140
+ packageName
141
+ );
142
+ let mode;
143
+ if (ssr) {
144
+ mode = typeof ssr === "object" ? ssr.mode || "string" : "string";
145
+ } else {
146
+ mode = false;
147
+ }
148
+ if (mode === "stream") {
149
+ const hasPageRoute = routes.some(
150
+ (route) => "type" in route && route.type === "page"
151
+ );
152
+ if (hasPageRoute) {
153
+ logger.error(
154
+ "Streaming ssr is not supported when pages dir exists"
155
+ );
156
+ process.exit(1);
157
+ }
158
+ }
159
+ const { code: code2 } = yield hookRunners.beforeGenerateRoutes({
160
+ entrypoint,
161
+ code: yield templates.fileSystemRoutes({
162
+ routes,
163
+ ssrMode: mode,
164
+ nestedRoutesEntry: entrypoint.nestedRoutesEntry,
165
+ entryName: entrypoint.entryName,
166
+ internalDirectory
167
+ })
168
+ });
169
+ if (entrypoint.nestedRoutesEntry && mode) {
170
+ const routesServerFile = getServerLoadersFile(
171
+ internalDirectory,
172
+ entryName
173
+ );
174
+ const code3 = templates.routesForServer({
175
+ routes
176
+ });
177
+ yield fs.ensureFile(routesServerFile);
178
+ yield fs.writeFile(routesServerFile, code3);
179
+ }
180
+ fs.outputFileSync(
181
+ path.resolve(
182
+ internalDirectory,
183
+ `./${entryName}/${FILE_SYSTEM_ROUTES_FILE_NAME}`
184
+ ),
185
+ code2,
186
+ "utf8"
187
+ );
188
+ }
189
+ const { imports: importStatements } = yield hookRunners.modifyEntryImports({
190
+ entrypoint,
191
+ imports: getDefaultImports({
192
+ entrypoint,
193
+ srcDirectory,
194
+ internalSrcAlias,
195
+ internalDirAlias,
196
+ internalDirectory
197
+ })
198
+ });
199
+ const { plugins } = yield hookRunners.modifyEntryRuntimePlugins({
200
+ entrypoint,
201
+ plugins: []
202
+ });
203
+ const { code: renderFunction } = yield hookRunners.modifyEntryRenderFunction({
204
+ entrypoint,
205
+ code: templates.renderFunction({
206
+ plugins,
207
+ customBootstrap,
208
+ fileSystemRoutes
209
+ })
210
+ });
211
+ const { exportStatement } = yield hookRunners.modifyEntryExport({
212
+ entrypoint,
213
+ exportStatement: "export default AppWrapper;"
214
+ });
215
+ const code = templates.index({
216
+ mountId,
217
+ imports: createImportStatements(importStatements),
218
+ renderFunction,
219
+ exportStatement
220
+ });
221
+ const entryFile = path.resolve(
222
+ internalDirectory,
223
+ `./${entryName}/${ENTRY_POINT_FILE_NAME}`
224
+ );
225
+ entrypoint.entry = entryFile;
226
+ if (config.source.enableAsyncEntry) {
227
+ const { code: asyncEntryCode } = yield hookRunners.modifyAsyncEntry({
228
+ entrypoint,
229
+ code: `import('./${ENTRY_BOOTSTRAP_FILE_NAME}');`
230
+ });
231
+ fs.outputFileSync(entryFile, asyncEntryCode, "utf8");
232
+ const bootstrapFile = path.resolve(
233
+ internalDirectory,
234
+ `./${entryName}/${ENTRY_BOOTSTRAP_FILE_NAME}`
235
+ );
236
+ fs.outputFileSync(bootstrapFile, code, "utf8");
237
+ } else {
238
+ fs.outputFileSync(entryFile, code, "utf8");
239
+ }
240
+ }
241
+ });
242
+ }
243
+ });
244
+ export {
245
+ createImportStatements,
246
+ generateCode
247
+ };
package/dist/js/modern/analyze/getBundleEntry.js ADDED
@@ -0,0 +1,71 @@
1
+ import path from "path";
2
+ import {
3
+ ensureAbsolutePath,
4
+ fs,
5
+ findExists,
6
+ MAIN_ENTRY_NAME
7
+ } from "@modern-js/utils";
8
+ import { getFileSystemEntry } from "./getFileSystemEntry";
9
+ import { JS_EXTENSIONS } from "./constants";
10
+ const ensureExtensions = (file) => {
11
+ if (!path.extname(file)) {
12
+ return findExists(JS_EXTENSIONS.map((ext) => `${file}${ext}`)) || file;
13
+ }
14
+ return file;
15
+ };
16
+ const ifAlreadyExists = (entrypoints, checked) => entrypoints.some((entrypoint) => {
17
+ if (ensureExtensions(entrypoint.entry) === ensureExtensions(checked.entry)) {
18
+ checked.entryName = entrypoint.entryName;
19
+ return true;
20
+ }
21
+ if (entrypoint.entry.startsWith(checked.entry) || checked.entry.startsWith(entrypoint.entry)) {
22
+ throw new Error(
23
+ `Entry configuration conflicts
24
+ Your configuration: ${checked.entry}.
25
+ Default entrypoint: ${entrypoint.entry}
26
+ Please reset source.entries or set source.disableDefaultEntries to disable the default entry rules.`
27
+ );
28
+ }
29
+ return false;
30
+ });
31
+ const getBundleEntry = (appContext, config) => {
32
+ const { appDirectory, packageName } = appContext;
33
+ const {
34
+ source: { disableDefaultEntries, entries, entriesDir }
35
+ } = config;
36
+ const defaults = disableDefaultEntries ? [] : getFileSystemEntry(appContext, config);
37
+ if (entries) {
38
+ Object.keys(entries).forEach((name) => {
39
+ const value = entries[name];
40
+ const entrypoint = typeof value === "string" ? {
41
+ entryName: name,
42
+ entry: ensureAbsolutePath(appDirectory, value),
43
+ isAutoMount: true,
44
+ fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value)).isDirectory() ? {} : void 0
45
+ } : {
46
+ entryName: name,
47
+ entry: ensureAbsolutePath(appDirectory, value.entry),
48
+ isAutoMount: !value.disableMount,
49
+ customBootstrap: value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
50
+ fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value.entry)).isDirectory() ? {} : void 0
51
+ };
52
+ if (entrypoint.fileSystemRoutes) {
53
+ entrypoint.nestedRoutesEntry = entrypoint.entry;
54
+ }
55
+ if (!ifAlreadyExists(defaults, entrypoint)) {
56
+ defaults.push(entrypoint);
57
+ }
58
+ });
59
+ }
60
+ if (!disableDefaultEntries) {
61
+ const entriesDirAbs = ensureAbsolutePath(appDirectory, entriesDir || "");
62
+ const found = defaults.find(
63
+ ({ entryName, entry, nestedRoutesEntry = "" }) => entryName === packageName || path.dirname(entry) === entriesDirAbs || path.dirname(nestedRoutesEntry) === entriesDirAbs
64
+ );
65
+ found && (found.entryName = MAIN_ENTRY_NAME);
66
+ }
67
+ return defaults;
68
+ };
69
+ export {
70
+ getBundleEntry
71
+ };