@modern-js/app-tools 1.22.2 → 2.0.0-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 (325) hide show
  1. package/CHANGELOG.md +1383 -104
  2. package/bin/modern.js +13 -1
  3. package/dist/js/modern/analyze/Builder.js +39 -0
  4. package/dist/js/modern/analyze/constants.js +48 -15
  5. package/dist/js/modern/analyze/generateCode.js +286 -133
  6. package/dist/js/modern/analyze/getBundleEntry.js +39 -41
  7. package/dist/js/modern/analyze/getClientRoutes/getRoutes.js +220 -0
  8. package/dist/js/modern/analyze/getClientRoutes/getRoutesLegacy.js +216 -0
  9. package/dist/js/modern/analyze/getClientRoutes/index.js +6 -0
  10. package/dist/js/modern/analyze/getClientRoutes/utils.js +31 -0
  11. package/dist/js/modern/analyze/getFileSystemEntry.js +74 -39
  12. package/dist/js/modern/analyze/getHtmlTemplate.js +90 -57
  13. package/dist/js/modern/analyze/getServerRoutes.js +123 -140
  14. package/dist/js/modern/analyze/index.js +220 -133
  15. package/dist/js/modern/analyze/isDefaultExportFunction.js +30 -20
  16. package/dist/js/modern/analyze/makeLegalIdentifier.js +10 -13
  17. package/dist/js/modern/analyze/nestedRoutes.js +166 -0
  18. package/dist/js/modern/analyze/templates.js +289 -29
  19. package/dist/js/modern/analyze/utils.js +128 -58
  20. package/dist/js/modern/builder/builderPlugins/compatModern.js +233 -0
  21. package/dist/js/modern/builder/index.js +154 -0
  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 +46 -0
  25. package/dist/js/modern/builder/webpackPlugins/htmlAsyncChunkPlugin.js +30 -0
  26. package/dist/js/modern/builder/webpackPlugins/htmlBottomTemplate.js +37 -0
  27. package/dist/js/modern/builder/webpackPlugins/routerPlugin.js +113 -0
  28. package/dist/js/modern/commands/build.js +75 -138
  29. package/dist/js/modern/commands/deploy.js +27 -4
  30. package/dist/js/modern/commands/dev.js +102 -66
  31. package/dist/js/modern/commands/index.js +1 -1
  32. package/dist/js/modern/commands/inspect.js +33 -64
  33. package/dist/js/modern/commands/serve.js +54 -0
  34. package/dist/js/modern/config/default.js +173 -0
  35. package/dist/js/modern/config/index.js +8 -0
  36. package/dist/js/modern/config/initial/createHtmlConfig.js +35 -0
  37. package/dist/js/modern/config/initial/createOutputConfig.js +68 -0
  38. package/dist/js/modern/config/initial/createSourceConfig.js +39 -0
  39. package/dist/js/modern/config/initial/createToolsConfig.js +42 -0
  40. package/dist/js/modern/config/initial/index.js +16 -0
  41. package/dist/js/modern/config/initial/inits.js +153 -0
  42. package/dist/js/modern/config/initial/transformNormalizedConfig.js +47 -0
  43. package/dist/js/modern/defineConfig.js +27 -0
  44. package/dist/js/modern/exports/server.js +4 -1
  45. package/dist/js/modern/hooks.js +37 -21
  46. package/dist/js/modern/index.js +185 -94
  47. package/dist/js/modern/initialize/index.js +120 -0
  48. package/dist/js/modern/locale/en.js +20 -22
  49. package/dist/js/modern/locale/index.js +6 -6
  50. package/dist/js/modern/locale/zh.js +21 -23
  51. package/dist/js/modern/schema/Schema.js +40 -0
  52. package/dist/js/modern/schema/index.js +88 -0
  53. package/dist/js/modern/schema/legacy.js +148 -0
  54. package/dist/js/modern/types/config/deploy.js +0 -0
  55. package/dist/js/modern/types/config/dev.js +0 -0
  56. package/dist/js/modern/types/config/experiments.js +0 -0
  57. package/dist/js/modern/types/config/html.js +0 -0
  58. package/dist/js/modern/types/config/index.js +1 -0
  59. package/dist/js/modern/types/config/output.js +0 -0
  60. package/dist/js/modern/types/config/performance.js +0 -0
  61. package/dist/js/modern/types/config/security.js +0 -0
  62. package/dist/js/modern/types/config/source.js +0 -0
  63. package/dist/js/modern/types/config/tools.js +0 -0
  64. package/dist/js/modern/types/hooks.js +0 -0
  65. package/dist/js/modern/types/index.js +3 -0
  66. package/dist/js/modern/types/legacyConfig/deploy.js +0 -0
  67. package/dist/js/modern/types/legacyConfig/dev.js +0 -0
  68. package/dist/js/modern/types/legacyConfig/index.js +0 -0
  69. package/dist/js/modern/types/legacyConfig/output.js +0 -0
  70. package/dist/js/modern/types/legacyConfig/source.js +0 -0
  71. package/dist/js/modern/types/legacyConfig/tools.js +0 -0
  72. package/dist/js/modern/utils/commands.js +13 -0
  73. package/dist/js/modern/utils/config.js +102 -52
  74. package/dist/js/modern/utils/createFileWatcher.js +115 -0
  75. package/dist/js/modern/utils/createServer.js +67 -10
  76. package/dist/js/modern/utils/getServerInternalPlugins.js +58 -0
  77. package/dist/js/modern/utils/getSpecifiedEntries.js +46 -25
  78. package/dist/js/modern/utils/language.js +6 -3
  79. package/dist/js/modern/utils/printInstructions.js +29 -9
  80. package/dist/js/modern/utils/restart.js +44 -0
  81. package/dist/js/modern/utils/routes.js +29 -14
  82. package/dist/js/node/analyze/Builder.js +64 -0
  83. package/dist/js/node/analyze/constants.js +86 -33
  84. package/dist/js/node/analyze/generateCode.js +305 -163
  85. package/dist/js/node/analyze/getBundleEntry.js +66 -58
  86. package/dist/js/node/analyze/getClientRoutes/getRoutes.js +242 -0
  87. package/dist/js/node/analyze/getClientRoutes/getRoutesLegacy.js +238 -0
  88. package/dist/js/node/analyze/getClientRoutes/index.js +30 -0
  89. package/dist/js/node/analyze/getClientRoutes/utils.js +58 -0
  90. package/dist/js/node/analyze/getFileSystemEntry.js +99 -58
  91. package/dist/js/node/analyze/getHtmlTemplate.js +121 -83
  92. package/dist/js/node/analyze/getServerRoutes.js +146 -160
  93. package/dist/js/node/analyze/index.js +243 -161
  94. package/dist/js/node/analyze/isDefaultExportFunction.js +59 -38
  95. package/dist/js/node/analyze/makeLegalIdentifier.js +31 -19
  96. package/dist/js/node/analyze/nestedRoutes.js +193 -0
  97. package/dist/js/node/analyze/templates.js +316 -43
  98. package/dist/js/node/analyze/utils.js +158 -78
  99. package/dist/js/node/builder/builderPlugins/compatModern.js +258 -0
  100. package/dist/js/node/builder/index.js +177 -0
  101. package/dist/js/node/builder/loaders/routerLoader.js +38 -0
  102. package/dist/js/node/builder/loaders/serverModuleLoader.js +28 -0
  103. package/dist/js/node/builder/share.js +75 -0
  104. package/dist/js/node/builder/webpackPlugins/htmlAsyncChunkPlugin.js +53 -0
  105. package/dist/js/node/builder/webpackPlugins/htmlBottomTemplate.js +60 -0
  106. package/dist/js/node/builder/webpackPlugins/routerPlugin.js +135 -0
  107. package/dist/js/node/commands/build.js +97 -159
  108. package/dist/js/node/commands/deploy.js +49 -12
  109. package/dist/js/node/commands/dev.js +121 -93
  110. package/dist/js/node/commands/index.js +19 -44
  111. package/dist/js/node/commands/inspect.js +56 -93
  112. package/dist/js/node/commands/serve.js +83 -0
  113. package/dist/js/node/config/default.js +195 -0
  114. package/dist/js/node/config/index.js +34 -0
  115. package/dist/js/node/config/initial/createHtmlConfig.js +58 -0
  116. package/dist/js/node/config/initial/createOutputConfig.js +91 -0
  117. package/dist/js/node/config/initial/createSourceConfig.js +62 -0
  118. package/dist/js/node/config/initial/createToolsConfig.js +65 -0
  119. package/dist/js/node/config/initial/index.js +41 -0
  120. package/dist/js/node/config/initial/inits.js +176 -0
  121. package/dist/js/node/config/initial/transformNormalizedConfig.js +70 -0
  122. package/dist/js/node/defineConfig.js +49 -0
  123. package/dist/js/node/exports/server.js +25 -11
  124. package/dist/js/node/hooks.js +53 -36
  125. package/dist/js/node/index.js +216 -128
  126. package/dist/js/node/initialize/index.js +135 -0
  127. package/dist/js/node/locale/en.js +40 -26
  128. package/dist/js/node/locale/index.js +31 -18
  129. package/dist/js/node/locale/zh.js +41 -27
  130. package/dist/js/node/schema/Schema.js +63 -0
  131. package/dist/js/node/schema/index.js +118 -0
  132. package/dist/js/node/schema/legacy.js +169 -0
  133. package/dist/js/node/types/config/deploy.js +15 -0
  134. package/dist/js/node/types/config/dev.js +15 -0
  135. package/dist/js/node/types/config/experiments.js +15 -0
  136. package/dist/js/node/types/config/html.js +15 -0
  137. package/dist/js/node/types/config/index.js +17 -0
  138. package/dist/js/node/types/config/output.js +15 -0
  139. package/dist/js/node/types/config/performance.js +15 -0
  140. package/dist/js/node/types/config/security.js +15 -0
  141. package/dist/js/node/types/config/source.js +15 -0
  142. package/dist/js/node/types/config/tools.js +15 -0
  143. package/dist/js/node/types/hooks.js +15 -0
  144. package/dist/js/node/types/index.js +19 -0
  145. package/dist/js/node/types/legacyConfig/deploy.js +15 -0
  146. package/dist/js/node/types/legacyConfig/dev.js +15 -0
  147. package/dist/js/node/types/legacyConfig/index.js +15 -0
  148. package/dist/js/node/types/legacyConfig/output.js +15 -0
  149. package/dist/js/node/types/legacyConfig/source.js +15 -0
  150. package/dist/js/node/types/legacyConfig/tools.js +15 -0
  151. package/dist/js/node/utils/commands.js +37 -0
  152. package/dist/js/node/utils/config.js +125 -75
  153. package/dist/js/node/utils/createFileWatcher.js +139 -0
  154. package/dist/js/node/utils/createServer.js +96 -25
  155. package/dist/js/node/utils/getServerInternalPlugins.js +79 -0
  156. package/dist/js/node/utils/getSpecifiedEntries.js +68 -34
  157. package/dist/js/node/utils/language.js +28 -10
  158. package/dist/js/node/utils/printInstructions.js +51 -19
  159. package/dist/js/node/utils/restart.js +67 -0
  160. package/dist/js/node/utils/routes.js +58 -24
  161. package/dist/js/node/utils/types.js +15 -0
  162. package/dist/js/treeshaking/analyze/Builder.js +199 -0
  163. package/dist/js/treeshaking/analyze/constants.js +37 -0
  164. package/dist/js/treeshaking/analyze/generateCode.js +615 -0
  165. package/dist/js/treeshaking/analyze/getBundleEntry.js +64 -0
  166. package/dist/js/treeshaking/analyze/getClientRoutes/getRoutes.js +233 -0
  167. package/dist/js/treeshaking/analyze/getClientRoutes/getRoutesLegacy.js +231 -0
  168. package/dist/js/treeshaking/analyze/getClientRoutes/index.js +3 -0
  169. package/dist/js/treeshaking/analyze/getClientRoutes/utils.js +23 -0
  170. package/dist/js/treeshaking/analyze/getFileSystemEntry.js +107 -0
  171. package/dist/js/treeshaking/analyze/getHtmlTemplate.js +302 -0
  172. package/dist/js/treeshaking/analyze/getServerRoutes.js +222 -0
  173. package/dist/js/treeshaking/analyze/index.js +589 -0
  174. package/dist/js/treeshaking/analyze/isDefaultExportFunction.js +47 -0
  175. package/dist/js/treeshaking/analyze/makeLegalIdentifier.js +13 -0
  176. package/dist/js/treeshaking/analyze/nestedRoutes.js +426 -0
  177. package/dist/js/treeshaking/analyze/templates.js +446 -0
  178. package/dist/js/treeshaking/analyze/utils.js +390 -0
  179. package/dist/js/treeshaking/builder/builderPlugins/compatModern.js +304 -0
  180. package/dist/js/treeshaking/builder/index.js +374 -0
  181. package/dist/js/treeshaking/builder/loaders/routerLoader.js +13 -0
  182. package/dist/js/treeshaking/builder/loaders/serverModuleLoader.js +5 -0
  183. package/dist/js/treeshaking/builder/share.js +40 -0
  184. package/dist/js/treeshaking/builder/webpackPlugins/htmlAsyncChunkPlugin.js +110 -0
  185. package/dist/js/treeshaking/builder/webpackPlugins/htmlBottomTemplate.js +72 -0
  186. package/dist/js/treeshaking/builder/webpackPlugins/routerPlugin.js +343 -0
  187. package/dist/js/treeshaking/commands/build.js +291 -0
  188. package/dist/js/treeshaking/commands/deploy.js +154 -0
  189. package/dist/js/treeshaking/commands/dev.js +319 -0
  190. package/dist/js/treeshaking/commands/index.js +3 -0
  191. package/dist/js/treeshaking/commands/inspect.js +149 -0
  192. package/dist/js/treeshaking/commands/serve.js +199 -0
  193. package/dist/js/treeshaking/config/default.js +208 -0
  194. package/dist/js/treeshaking/config/index.js +3 -0
  195. package/dist/js/treeshaking/config/initial/createHtmlConfig.js +19 -0
  196. package/dist/js/treeshaking/config/initial/createOutputConfig.js +41 -0
  197. package/dist/js/treeshaking/config/initial/createSourceConfig.js +42 -0
  198. package/dist/js/treeshaking/config/initial/createToolsConfig.js +23 -0
  199. package/dist/js/treeshaking/config/initial/index.js +12 -0
  200. package/dist/js/treeshaking/config/initial/inits.js +213 -0
  201. package/dist/js/treeshaking/config/initial/transformNormalizedConfig.js +35 -0
  202. package/dist/js/treeshaking/defineConfig.js +61 -0
  203. package/dist/js/treeshaking/exports/server.js +2 -0
  204. package/dist/js/treeshaking/hooks.js +31 -0
  205. package/dist/js/treeshaking/index.js +694 -0
  206. package/dist/js/treeshaking/initialize/index.js +300 -0
  207. package/dist/js/treeshaking/locale/en.js +35 -0
  208. package/dist/js/treeshaking/locale/index.js +9 -0
  209. package/dist/js/treeshaking/locale/zh.js +35 -0
  210. package/dist/js/treeshaking/schema/Schema.js +273 -0
  211. package/dist/js/treeshaking/schema/index.js +181 -0
  212. package/dist/js/treeshaking/schema/legacy.js +337 -0
  213. package/dist/js/treeshaking/types/config/deploy.js +1 -0
  214. package/dist/js/treeshaking/types/config/dev.js +1 -0
  215. package/dist/js/treeshaking/types/config/experiments.js +1 -0
  216. package/dist/js/treeshaking/types/config/html.js +1 -0
  217. package/dist/js/treeshaking/types/config/index.js +1 -0
  218. package/dist/js/treeshaking/types/config/output.js +1 -0
  219. package/dist/js/treeshaking/types/config/performance.js +1 -0
  220. package/dist/js/treeshaking/types/config/security.js +1 -0
  221. package/dist/js/treeshaking/types/config/source.js +1 -0
  222. package/dist/js/treeshaking/types/config/tools.js +1 -0
  223. package/dist/js/treeshaking/types/hooks.js +1 -0
  224. package/dist/js/treeshaking/types/index.js +3 -0
  225. package/dist/js/treeshaking/types/legacyConfig/deploy.js +1 -0
  226. package/dist/js/treeshaking/types/legacyConfig/dev.js +1 -0
  227. package/dist/js/treeshaking/types/legacyConfig/index.js +1 -0
  228. package/dist/js/treeshaking/types/legacyConfig/output.js +1 -0
  229. package/dist/js/treeshaking/types/legacyConfig/source.js +1 -0
  230. package/dist/js/treeshaking/types/legacyConfig/tools.js +1 -0
  231. package/dist/js/treeshaking/utils/commands.js +10 -0
  232. package/dist/js/treeshaking/utils/config.js +302 -0
  233. package/dist/js/treeshaking/utils/createFileWatcher.js +283 -0
  234. package/dist/js/treeshaking/utils/createServer.js +258 -0
  235. package/dist/js/treeshaking/utils/getServerInternalPlugins.js +210 -0
  236. package/dist/js/treeshaking/utils/getSpecifiedEntries.js +185 -0
  237. package/dist/js/treeshaking/utils/language.js +6 -0
  238. package/dist/js/treeshaking/utils/printInstructions.js +152 -0
  239. package/dist/js/treeshaking/utils/restart.js +187 -0
  240. package/dist/js/treeshaking/utils/routes.js +153 -0
  241. package/dist/js/treeshaking/utils/types.js +1 -0
  242. package/dist/types/analyze/Builder.d.ts +8 -0
  243. package/dist/types/analyze/constants.d.ts +13 -1
  244. package/dist/types/analyze/generateCode.d.ts +3 -2
  245. package/dist/types/analyze/getBundleEntry.d.ts +2 -2
  246. package/dist/types/analyze/{getClientRoutes.d.ts → getClientRoutes/getRoutes.d.ts} +2 -7
  247. package/dist/types/analyze/getClientRoutes/getRoutesLegacy.d.ts +15 -0
  248. package/dist/types/analyze/getClientRoutes/index.d.ts +2 -0
  249. package/dist/types/analyze/getClientRoutes/utils.d.ts +5 -0
  250. package/dist/types/analyze/getFileSystemEntry.d.ts +2 -2
  251. package/dist/types/analyze/getHtmlTemplate.d.ts +3 -3
  252. package/dist/types/analyze/getServerRoutes.d.ts +3 -2
  253. package/dist/types/analyze/index.d.ts +3 -40
  254. package/dist/types/analyze/nestedRoutes.d.ts +5 -0
  255. package/dist/types/analyze/templates.d.ts +24 -5
  256. package/dist/types/analyze/utils.d.ts +12 -2
  257. package/dist/types/builder/builderPlugins/compatModern.d.ts +14 -0
  258. package/dist/types/builder/index.d.ts +18 -0
  259. package/dist/types/builder/loaders/routerLoader.d.ts +3 -0
  260. package/dist/types/builder/loaders/serverModuleLoader.d.ts +3 -0
  261. package/dist/types/builder/share.d.ts +26 -0
  262. package/dist/types/builder/webpackPlugins/htmlAsyncChunkPlugin.d.ts +8 -0
  263. package/dist/types/builder/webpackPlugins/htmlBottomTemplate.d.ts +10 -0
  264. package/dist/types/builder/webpackPlugins/routerPlugin.d.ts +4 -0
  265. package/dist/types/commands/build.d.ts +2 -1
  266. package/dist/types/commands/deploy.d.ts +2 -1
  267. package/dist/types/commands/dev.d.ts +2 -1
  268. package/dist/types/commands/index.d.ts +1 -1
  269. package/dist/types/commands/inspect.d.ts +10 -6
  270. package/dist/types/commands/serve.d.ts +3 -0
  271. package/dist/types/config/default.d.ts +3 -0
  272. package/dist/types/config/index.d.ts +2 -0
  273. package/dist/types/config/initial/createHtmlConfig.d.ts +2 -0
  274. package/dist/types/config/initial/createOutputConfig.d.ts +2 -0
  275. package/dist/types/config/initial/createSourceConfig.d.ts +2 -0
  276. package/dist/types/config/initial/createToolsConfig.d.ts +2 -0
  277. package/dist/types/config/initial/index.d.ts +4 -0
  278. package/dist/types/config/initial/inits.d.ts +4 -0
  279. package/dist/types/config/initial/transformNormalizedConfig.d.ts +2 -0
  280. package/dist/types/defineConfig.d.ts +8 -0
  281. package/dist/types/hooks.d.ts +2 -37
  282. package/dist/types/index.d.ts +9 -3
  283. package/dist/types/initialize/index.d.ts +5 -0
  284. package/dist/types/locale/en.d.ts +1 -2
  285. package/dist/types/locale/index.d.ts +2 -4
  286. package/dist/types/locale/zh.d.ts +1 -2
  287. package/dist/types/schema/Schema.d.ts +14 -0
  288. package/dist/types/schema/index.d.ts +4 -0
  289. package/dist/types/schema/legacy.d.ts +3 -0
  290. package/dist/types/types/config/deploy.d.ts +9 -0
  291. package/dist/types/types/config/dev.d.ts +13 -0
  292. package/dist/types/types/config/experiments.d.ts +4 -0
  293. package/dist/types/types/config/html.d.ts +4 -0
  294. package/dist/types/types/config/index.d.ts +66 -0
  295. package/dist/types/types/config/output.d.ts +22 -0
  296. package/dist/types/types/config/performance.d.ts +4 -0
  297. package/dist/types/types/config/security.d.ts +4 -0
  298. package/dist/types/types/config/source.d.ts +24 -0
  299. package/dist/types/types/config/tools.d.ts +24 -0
  300. package/dist/types/types/hooks.d.ts +89 -0
  301. package/dist/types/types/index.d.ts +23 -0
  302. package/dist/types/types/legacyConfig/deploy.d.ts +8 -0
  303. package/dist/types/types/legacyConfig/dev.d.ts +13 -0
  304. package/dist/types/types/legacyConfig/index.d.ts +33 -0
  305. package/dist/types/types/legacyConfig/output.d.ts +51 -0
  306. package/dist/types/types/legacyConfig/source.d.ts +25 -0
  307. package/dist/types/types/legacyConfig/tools.d.ts +17 -0
  308. package/dist/types/utils/commands.d.ts +2 -0
  309. package/dist/types/utils/config.d.ts +2 -2
  310. package/dist/types/utils/createFileWatcher.d.ts +4 -0
  311. package/dist/types/utils/createServer.d.ts +9 -1
  312. package/dist/types/utils/getServerInternalPlugins.d.ts +2 -0
  313. package/dist/types/utils/printInstructions.d.ts +3 -2
  314. package/dist/types/utils/restart.d.ts +3 -0
  315. package/dist/types/utils/types.d.ts +2 -3
  316. package/lib/types.d.ts +1 -1
  317. package/package.json +37 -46
  318. package/dist/js/modern/analyze/getClientRoutes.js +0 -219
  319. package/dist/js/modern/commands/start.js +0 -31
  320. package/dist/js/modern/utils/createCompiler.js +0 -61
  321. package/dist/js/node/analyze/getClientRoutes.js +0 -241
  322. package/dist/js/node/commands/start.js +0 -47
  323. package/dist/js/node/utils/createCompiler.js +0 -81
  324. package/dist/types/commands/start.d.ts +0 -2
  325. package/dist/types/utils/createCompiler.d.ts +0 -13
@@ -1,74 +1,109 @@
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
- import { JS_EXTENSIONS, INDEX_FILE_NAME, APP_FILE_NAME, PAGES_DIR_NAME, FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT } from "./constants";
6
-
7
- const hasIndex = dir => findExists(JS_EXTENSIONS.map(ext => path.resolve(dir, `${INDEX_FILE_NAME}${ext}`)));
8
-
9
- const hasApp = dir => findExists(JS_EXTENSIONS.map(ext => path.resolve(dir, `${APP_FILE_NAME}${ext}`)));
10
-
11
- const hasPages = dir => fs.existsSync(path.join(dir, PAGES_DIR_NAME));
12
-
13
- const isBundleEntry = dir => hasApp(dir) || hasPages(dir) || hasIndex(dir);
14
-
15
- const scanDir = dirs => dirs.map(dir => {
5
+ import {
6
+ JS_EXTENSIONS,
7
+ INDEX_FILE_NAME,
8
+ APP_FILE_NAME,
9
+ PAGES_DIR_NAME,
10
+ FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT,
11
+ NESTED_ROUTES_DIR
12
+ } from "./constants";
13
+ const hasIndex = (dir) => findExists(
14
+ JS_EXTENSIONS.map((ext) => path.resolve(dir, `${INDEX_FILE_NAME}${ext}`))
15
+ );
16
+ const hasApp = (dir) => findExists(
17
+ JS_EXTENSIONS.map((ext) => path.resolve(dir, `${APP_FILE_NAME}${ext}`))
18
+ );
19
+ const hasPages = (dir) => fs.existsSync(path.join(dir, PAGES_DIR_NAME));
20
+ const hasNestedRoutes = (dir) => fs.existsSync(path.join(dir, NESTED_ROUTES_DIR));
21
+ const isBundleEntry = (dir) => hasApp(dir) || hasPages(dir) || hasIndex(dir) || hasNestedRoutes(dir);
22
+ const scanDir = (dirs) => dirs.map((dir) => {
16
23
  const indexFile = hasIndex(dir);
17
24
  const customBootstrap = isDefaultExportFunction(indexFile) ? indexFile : false;
18
25
  const entryName = path.basename(dir);
19
-
20
26
  if (indexFile && !customBootstrap) {
21
27
  return {
22
28
  entryName,
23
29
  entry: indexFile,
30
+ absoluteEntryDir: path.resolve(dir),
24
31
  isAutoMount: false
25
32
  };
26
33
  }
27
-
28
- if (hasApp(dir)) {
34
+ const isHasApp = hasApp(dir);
35
+ if (isHasApp) {
29
36
  return {
30
37
  entryName,
31
38
  entry: path.join(dir, APP_FILE_NAME),
32
39
  isAutoMount: true,
40
+ absoluteEntryDir: path.resolve(dir),
33
41
  customBootstrap
34
42
  };
35
- } else if (hasPages(dir)) {
36
- return {
43
+ }
44
+ const isHasNestedRoutes = hasNestedRoutes(dir);
45
+ const isHasPages = hasPages(dir);
46
+ if (isHasNestedRoutes || isHasPages) {
47
+ const entrypoint = {
37
48
  entryName,
38
- entry: path.join(dir, PAGES_DIR_NAME),
49
+ entry: "",
39
50
  fileSystemRoutes: {
40
- globalApp: findExists(JS_EXTENSIONS.map(ext => path.resolve(dir, `./${PAGES_DIR_NAME}/${FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT}${ext}`)))
51
+ globalApp: findExists(
52
+ JS_EXTENSIONS.map(
53
+ (ext) => path.resolve(
54
+ dir,
55
+ `./${PAGES_DIR_NAME}/${FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT}${ext}`
56
+ )
57
+ )
58
+ )
41
59
  },
42
60
  isAutoMount: true,
61
+ absoluteEntryDir: path.resolve(dir),
43
62
  customBootstrap
44
63
  };
45
- } else {
46
- return {
47
- entryName,
48
- entry: indexFile,
49
- isAutoMount: false
50
- };
64
+ if (isHasPages) {
65
+ entrypoint.entry = path.join(dir, PAGES_DIR_NAME);
66
+ entrypoint.pageRoutesEntry = entrypoint.entry;
67
+ }
68
+ if (isHasNestedRoutes) {
69
+ entrypoint.entry = path.join(dir, NESTED_ROUTES_DIR);
70
+ entrypoint.nestedRoutesEntry = entrypoint.entry;
71
+ }
72
+ return entrypoint;
51
73
  }
74
+ return {
75
+ entryName,
76
+ entry: indexFile,
77
+ absoluteEntryDir: path.resolve(dir),
78
+ isAutoMount: false
79
+ };
52
80
  });
53
-
54
- export const getFileSystemEntry = (appContext, config) => {
81
+ const getFileSystemEntry = (appContext, config) => {
82
+ const { appDirectory } = appContext;
55
83
  const {
56
- appDirectory
57
- } = appContext;
58
- const {
59
- source: {
60
- entriesDir
61
- }
84
+ source: { entriesDir, disableEntryDirs }
62
85
  } = config;
63
- const src = ensureAbsolutePath(appDirectory, entriesDir);
64
-
86
+ let disabledDirs = [];
87
+ if (disableEntryDirs && Array.isArray(disableEntryDirs)) {
88
+ disabledDirs = disableEntryDirs == null ? void 0 : disableEntryDirs.map(
89
+ (dir) => ensureAbsolutePath(appDirectory, dir)
90
+ );
91
+ }
92
+ const src = ensureAbsolutePath(appDirectory, entriesDir || "");
65
93
  if (fs.existsSync(src)) {
66
94
  if (fs.statSync(src).isDirectory()) {
67
- return scanDir(isBundleEntry(src) ? [src] : fs.readdirSync(src).map(file => path.join(src, file)).filter(file => fs.statSync(file).isDirectory() && isBundleEntry(file)));
95
+ return scanDir(
96
+ isBundleEntry(src) ? [src] : fs.readdirSync(src).map((file) => path.join(src, file)).filter(
97
+ (file) => fs.statSync(file).isDirectory() && isBundleEntry(file) && !disabledDirs.includes(file)
98
+ )
99
+ );
68
100
  } else {
69
101
  throw Error(`source.entriesDir accept a directory.`);
70
102
  }
71
103
  } else {
72
104
  throw Error(`src dir ${entriesDir} not found.`);
73
105
  }
74
- };
106
+ };
107
+ export {
108
+ getFileSystemEntry
109
+ };
@@ -1,82 +1,115 @@
1
- import path from 'path';
2
- import { fs, findExists, MAIN_ENTRY_NAME } from '@modern-js/utils';
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, findExists, MAIN_ENTRY_NAME } from "@modern-js/utils";
3
23
  import { HTML_PARTIALS_EXTENSIONS, HTML_PARTIALS_FOLDER } from "./constants";
4
24
  import * as templates from "./templates";
5
- var PartialPosition;
6
-
7
- (function (PartialPosition) {
8
- PartialPosition["TOP"] = "top";
9
- PartialPosition["HEAD"] = "head";
10
- PartialPosition["BODY"] = "body";
11
- PartialPosition["BOTTOM"] = "bottom";
12
- PartialPosition["INDEX"] = "index";
13
- })(PartialPosition || (PartialPosition = {}));
14
-
25
+ var PartialPosition = /* @__PURE__ */ ((PartialPosition2) => {
26
+ PartialPosition2["TOP"] = "top";
27
+ PartialPosition2["HEAD"] = "head";
28
+ PartialPosition2["BODY"] = "body";
29
+ PartialPosition2["BOTTOM"] = "bottom";
30
+ PartialPosition2["INDEX"] = "index";
31
+ return PartialPosition2;
32
+ })(PartialPosition || {});
15
33
  const findPartials = (dir, entryName, position) => {
16
34
  if (fs.existsSync(dir)) {
17
- const base = findExists(HTML_PARTIALS_EXTENSIONS.map(ext => path.resolve(dir, `${position}${ext}`)));
18
- const file = entryName ? findExists(HTML_PARTIALS_EXTENSIONS.map(ext => path.resolve(dir, entryName, `${position}${ext}`))) || base : base;
19
- return file ? {
20
- file,
21
- content: fs.readFileSync(file, 'utf8')
22
- } : null;
35
+ const base = findExists(
36
+ HTML_PARTIALS_EXTENSIONS.map(
37
+ (ext) => path.resolve(dir, `${position}${ext}`)
38
+ )
39
+ );
40
+ const file = entryName ? findExists(
41
+ HTML_PARTIALS_EXTENSIONS.map(
42
+ (ext) => path.resolve(dir, entryName, `${position}${ext}`)
43
+ )
44
+ ) || base : base;
45
+ return file ? { file, content: fs.readFileSync(file, "utf8") } : null;
23
46
  }
24
-
25
47
  return null;
26
- }; // generate html template for
27
-
28
-
29
- export const getHtmlTemplate = async (entrypoints, api, {
48
+ };
49
+ const getHtmlTemplate = (_0, _1, _2) => __async(void 0, [_0, _1, _2], function* (entrypoints, api, {
30
50
  appContext,
31
51
  config
32
- }) => {
33
- const {
34
- appDirectory,
35
- internalDirectory
36
- } = appContext;
52
+ }) {
53
+ const { appDirectory, internalDirectory } = appContext;
37
54
  const {
38
- source: {
39
- configDir
40
- }
55
+ source: { configDir }
41
56
  } = config;
42
- const htmlDir = path.resolve(appDirectory, configDir, HTML_PARTIALS_FOLDER);
57
+ const htmlDir = path.resolve(
58
+ appDirectory,
59
+ configDir || "",
60
+ HTML_PARTIALS_FOLDER
61
+ );
43
62
  const htmlTemplates = {};
44
-
45
63
  for (const entrypoint of entrypoints) {
46
- const {
47
- entryName
48
- } = entrypoint;
49
- const name = entrypoints.length === 1 && entryName === MAIN_ENTRY_NAME ? '' : entryName;
50
- const customIndexTemplate = findPartials(htmlDir, name, PartialPosition.INDEX);
51
-
64
+ const { entryName } = entrypoint;
65
+ const name = entrypoints.length === 1 && entryName === MAIN_ENTRY_NAME ? "" : entryName;
66
+ const customIndexTemplate = findPartials(
67
+ htmlDir,
68
+ name,
69
+ "index" /* INDEX */
70
+ );
52
71
  if (customIndexTemplate) {
53
72
  htmlTemplates[entryName] = customIndexTemplate.file;
54
73
  } else {
55
74
  const hookRunners = api.useHookRunners();
56
- const {
57
- partials
58
- } = await hookRunners.htmlPartials({
75
+ const { partials } = yield hookRunners.htmlPartials({
59
76
  entrypoint,
60
- partials: [PartialPosition.TOP, PartialPosition.HEAD, PartialPosition.BODY].reduce((previous, position) => {
61
- const found = findPartials(htmlDir, name, position);
62
- previous[position] = found ? [found.content] : [];
63
- return previous;
64
- }, {
65
- top: [],
66
- head: [],
67
- body: []
68
- })
77
+ partials: [
78
+ "top" /* TOP */,
79
+ "head" /* HEAD */,
80
+ "body" /* BODY */
81
+ ].reduce(
82
+ (previous, position) => {
83
+ const found = findPartials(htmlDir, name, position);
84
+ previous[position] = found ? [found.content] : [];
85
+ return previous;
86
+ },
87
+ {
88
+ top: [],
89
+ head: [],
90
+ body: []
91
+ }
92
+ )
69
93
  });
70
- const templatePath = path.resolve(internalDirectory, entryName, 'index.html');
71
- fs.outputFileSync(templatePath, templates.html(partials), 'utf8');
94
+ const templatePath = path.resolve(
95
+ internalDirectory,
96
+ entryName,
97
+ "index.html"
98
+ );
99
+ fs.outputFileSync(templatePath, templates.html(partials), "utf8");
72
100
  htmlTemplates[entryName] = templatePath;
73
- const bottomTemplate = findPartials(htmlDir, name, PartialPosition.BOTTOM);
74
-
101
+ const bottomTemplate = findPartials(
102
+ htmlDir,
103
+ name,
104
+ "bottom" /* BOTTOM */
105
+ );
75
106
  if (bottomTemplate) {
76
107
  htmlTemplates[`__${entryName}-bottom__`] = bottomTemplate.content;
77
108
  }
78
109
  }
79
110
  }
80
-
81
111
  return htmlTemplates;
82
- };
112
+ });
113
+ export {
114
+ getHtmlTemplate
115
+ };
@@ -1,192 +1,175 @@
1
- const _excluded = ["path"],
2
- _excluded2 = ["path"];
3
-
4
- function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
5
-
6
- function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
7
-
8
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
9
-
10
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
11
-
12
- function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
13
-
14
- import path from 'path';
15
- import fs from 'fs';
16
- import { urlJoin, isPlainObject, removeLeadingSlash, getEntryOptions, SERVER_BUNDLE_DIRECTORY, MAIN_ENTRY_NAME, removeTailSlash } from '@modern-js/utils';
1
+ var __defProp = Object.defineProperty;
2
+ var __defProps = Object.defineProperties;
3
+ var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
4
+ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __propIsEnum = Object.prototype.propertyIsEnumerable;
7
+ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
8
+ var __spreadValues = (a, b) => {
9
+ for (var prop in b || (b = {}))
10
+ if (__hasOwnProp.call(b, prop))
11
+ __defNormalProp(a, prop, b[prop]);
12
+ if (__getOwnPropSymbols)
13
+ for (var prop of __getOwnPropSymbols(b)) {
14
+ if (__propIsEnum.call(b, prop))
15
+ __defNormalProp(a, prop, b[prop]);
16
+ }
17
+ return a;
18
+ };
19
+ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
20
+ var __objRest = (source, exclude) => {
21
+ var target = {};
22
+ for (var prop in source)
23
+ if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
24
+ target[prop] = source[prop];
25
+ if (source != null && __getOwnPropSymbols)
26
+ for (var prop of __getOwnPropSymbols(source)) {
27
+ if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
28
+ target[prop] = source[prop];
29
+ }
30
+ return target;
31
+ };
32
+ import path from "path";
33
+ import fs from "fs";
34
+ import {
35
+ urlJoin,
36
+ isPlainObject,
37
+ removeLeadingSlash,
38
+ getEntryOptions,
39
+ SERVER_BUNDLE_DIRECTORY,
40
+ MAIN_ENTRY_NAME,
41
+ removeTailSlash
42
+ } from "@modern-js/utils";
17
43
  import { walkDirectory } from "./utils";
18
- /**
19
- * Add base url for each server route.
20
- * @param baseUrl - Base url from server.baseUrl
21
- * @param routes - Server routes.
22
- * @returns Server routes with baseUrl prefixed.
23
- */
24
-
25
44
  const applyBaseUrl = (baseUrl, routes) => {
26
45
  if (baseUrl) {
27
46
  if (Array.isArray(baseUrl)) {
28
- return baseUrl.reduce((previous, current) => [...previous, ...applyBaseUrl(current, routes)], []);
47
+ return baseUrl.reduce(
48
+ (previous, current) => [...previous, ...applyBaseUrl(current, routes)],
49
+ []
50
+ );
29
51
  } else {
30
- return routes.map(route => {
52
+ return routes.map((route) => {
31
53
  const urlPath = urlJoin(baseUrl, route.urlPath);
32
- return _objectSpread(_objectSpread({}, route), {}, {
33
- urlPath: urlPath === '/' ? urlPath : removeTailSlash(urlPath)
54
+ return __spreadProps(__spreadValues({}, route), {
55
+ urlPath: urlPath === "/" ? urlPath : removeTailSlash(urlPath)
34
56
  });
35
57
  });
36
58
  }
37
59
  }
38
-
39
60
  return routes;
40
61
  };
41
- /**
42
- *
43
- * @param original - Original entrypoint route info.
44
- * @param routeOptions - Custom entrypoint route config from server.routes.
45
- * @returns
46
- */
47
-
48
-
49
62
  const applyRouteOptions = (original, routeOptions) => {
50
- const {
51
- route,
52
- disableSpa
53
- } = routeOptions;
54
- original.isSPA = !disableSpa; // set entryPath as dir
55
-
63
+ const { route, disableSpa } = routeOptions;
64
+ original.isSPA = !disableSpa;
56
65
  !original.isSPA && (original.entryPath = path.dirname(original.entryPath));
57
66
  let routes;
58
-
59
67
  if (route) {
60
68
  if (Array.isArray(route)) {
61
- routes = route.map(url => {
69
+ routes = route.map((url) => {
62
70
  if (isPlainObject(url)) {
63
- const _ref = url,
64
- {
65
- path: urlPath
66
- } = _ref,
67
- other = _objectWithoutProperties(_ref, _excluded);
68
-
69
- return _objectSpread(_objectSpread(_objectSpread({}, original), other), {}, {
71
+ const _a2 = url, { path: urlPath } = _a2, other = __objRest(_a2, ["path"]);
72
+ return __spreadProps(__spreadValues(__spreadValues({}, original), other), {
70
73
  urlPath
71
74
  });
72
75
  } else {
73
- return _objectSpread(_objectSpread({}, original), {}, {
76
+ return __spreadProps(__spreadValues({}, original), {
74
77
  urlPath: url
75
78
  });
76
79
  }
77
80
  });
78
81
  } else if (isPlainObject(route)) {
79
- const _ref2 = route,
80
- {
81
- path: urlPath
82
- } = _ref2,
83
- other = _objectWithoutProperties(_ref2, _excluded2);
84
-
85
- routes = [_objectSpread(_objectSpread(_objectSpread({}, original), other), {}, {
86
- urlPath
87
- })];
82
+ const _a = route, { path: urlPath } = _a, other = __objRest(_a, ["path"]);
83
+ routes = [
84
+ __spreadProps(__spreadValues(__spreadValues({}, original), other), {
85
+ urlPath
86
+ })
87
+ ];
88
88
  } else {
89
- routes = [_objectSpread(_objectSpread({}, original), {}, {
90
- urlPath: route
91
- })];
89
+ routes = [
90
+ __spreadProps(__spreadValues({}, original), {
91
+ urlPath: route
92
+ })
93
+ ];
92
94
  }
93
95
  } else {
94
96
  routes = [original];
95
97
  }
96
-
97
98
  return routes;
98
99
  };
99
- /**
100
- * Collect routes from entrypoints.
101
- * @param entrypoints - Bundle entrypoints.
102
- * @param config - Normalized user config.
103
- * @returns entrypoint Routes
104
- */
105
-
106
-
107
100
  const collectHtmlRoutes = (entrypoints, appContext, config) => {
108
101
  const {
109
- output: {
110
- htmlPath,
111
- disableHtmlFolder,
112
- enableModernMode
113
- },
114
- server: {
115
- baseUrl,
116
- routes,
117
- ssr,
118
- ssrByEntries
119
- }
102
+ html: { disableHtmlFolder },
103
+ output: { distPath: { html: htmlPath } = {} },
104
+ server: { baseUrl, routes, ssr, ssrByEntries }
120
105
  } = config;
121
- const {
122
- packageName
123
- } = appContext;
124
- let htmlRoutes = entrypoints.reduce((previous, {
125
- entryName
126
- }) => {
127
- const entryOptions = getEntryOptions(entryName, ssr, ssrByEntries, packageName);
128
- const isSSR = Boolean(entryOptions);
129
- const {
130
- resHeaders
131
- } = (routes === null || routes === void 0 ? void 0 : routes[entryName]) || {};
132
- let route = {
133
- urlPath: `/${entryName === MAIN_ENTRY_NAME ? '' : entryName}`,
134
- entryName,
135
- entryPath: removeLeadingSlash(path.posix.normalize(`${htmlPath}/${entryName}${disableHtmlFolder ? '.html' : '/index.html'}`)),
136
- isSPA: true,
137
- isSSR,
138
- responseHeaders: resHeaders,
139
- enableModernMode: Boolean(enableModernMode),
140
- bundle: isSSR ? `${SERVER_BUNDLE_DIRECTORY}/${entryName}.js` : undefined
141
- };
142
-
143
- if (routes !== null && routes !== void 0 && routes.hasOwnProperty(entryName)) {
144
- const routeOptions = isPlainObject(routes[entryName]) ? routes[entryName] : {
145
- route: routes[entryName]
106
+ const { packageName } = appContext;
107
+ let htmlRoutes = entrypoints.reduce(
108
+ (previous, { entryName }) => {
109
+ const entryOptions = getEntryOptions(
110
+ entryName,
111
+ ssr,
112
+ ssrByEntries,
113
+ packageName
114
+ );
115
+ const isSSR = Boolean(entryOptions);
116
+ const { resHeaders } = (routes == null ? void 0 : routes[entryName]) || {};
117
+ let route = {
118
+ urlPath: `/${entryName === MAIN_ENTRY_NAME ? "" : entryName}`,
119
+ entryName,
120
+ entryPath: removeLeadingSlash(
121
+ path.posix.normalize(
122
+ `${htmlPath}/${entryName}${disableHtmlFolder ? ".html" : "/index.html"}`
123
+ )
124
+ ),
125
+ isSPA: true,
126
+ isSSR,
127
+ responseHeaders: resHeaders,
128
+ bundle: isSSR ? `${SERVER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0
146
129
  };
147
- route = applyRouteOptions(route, routeOptions);
148
- }
149
-
150
- return Array.isArray(route) ? [...previous, ...route] : [...previous, route];
151
- }, []);
130
+ if (routes == null ? void 0 : routes.hasOwnProperty(entryName)) {
131
+ const routeOptions = isPlainObject(routes[entryName]) ? routes[entryName] : { route: routes[entryName] };
132
+ route = applyRouteOptions(route, routeOptions);
133
+ }
134
+ return Array.isArray(route) ? [...previous, ...route] : [...previous, route];
135
+ },
136
+ []
137
+ );
152
138
  htmlRoutes = applyBaseUrl(baseUrl, htmlRoutes);
153
139
  return htmlRoutes;
154
140
  };
155
- /**
156
- * Collect static public file routes from config/public folder.
157
- * @param appContext - App context info.
158
- * @param config - normalized user config.
159
- * @returns Static public file routes.
160
- */
161
-
162
-
163
141
  const collectStaticRoutes = (appContext, config) => {
142
+ const { appDirectory } = appContext;
164
143
  const {
165
- appDirectory
166
- } = appContext;
167
- const {
168
- source: {
169
- configDir
170
- },
171
- server: {
172
- publicRoutes = {}
173
- }
144
+ source: { configDir },
145
+ server: { publicRoutes = {} }
174
146
  } = config;
175
- const publicFolder = path.resolve(appDirectory, configDir, 'public');
176
- return fs.existsSync(publicFolder) ? walkDirectory(publicFolder).map(filePath => {
177
- const urlPath = `${urlJoin(toPosix(filePath).slice(toPosix(publicFolder).length))}`;
147
+ const publicFolder = path.resolve(appDirectory, configDir || "", "public");
148
+ return fs.existsSync(publicFolder) ? walkDirectory(publicFolder).map((filePath) => {
149
+ const urlPath = `${urlJoin(
150
+ toPosix(filePath).slice(toPosix(publicFolder).length)
151
+ )}`;
178
152
  return {
179
153
  urlPath: publicRoutes[removeLeadingSlash(urlPath)] || urlPath,
180
154
  isSPA: true,
181
155
  isSSR: false,
182
- entryPath: toPosix(path.relative(path.resolve(appDirectory, configDir), filePath))
156
+ entryPath: toPosix(
157
+ path.relative(
158
+ path.resolve(appDirectory, configDir || ""),
159
+ filePath
160
+ )
161
+ )
183
162
  };
184
163
  }) : [];
185
164
  };
186
-
187
- export const getServerRoutes = (entrypoints, {
165
+ const getServerRoutes = (entrypoints, {
188
166
  appContext,
189
167
  config
190
- }) => [...collectHtmlRoutes(entrypoints, appContext, config), ...collectStaticRoutes(appContext, config)];
191
-
192
- const toPosix = pathStr => pathStr.split(path.sep).join(path.posix.sep);
168
+ }) => [
169
+ ...collectHtmlRoutes(entrypoints, appContext, config),
170
+ ...collectStaticRoutes(appContext, config)
171
+ ];
172
+ const toPosix = (pathStr) => pathStr.split(path.sep).join(path.posix.sep);
173
+ export {
174
+ getServerRoutes
175
+ };