@tramvai/cli 2.64.0 → 2.65.9

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 (416) hide show
  1. package/README.md +46 -38
  2. package/lib/api/analyze/providers/shared.js +1 -1
  3. package/lib/api/analyze/providers/shared.js.map +1 -1
  4. package/lib/api/benchmark/index.d.ts +1 -1
  5. package/lib/api/build/child-app.js +3 -2
  6. package/lib/api/build/child-app.js.map +1 -1
  7. package/lib/api/build/module.js +1 -2
  8. package/lib/api/build/module.js.map +1 -1
  9. package/lib/api/build/providers/shared.js +1 -1
  10. package/lib/api/build/providers/shared.js.map +1 -1
  11. package/lib/api/index.d.ts +6 -2
  12. package/lib/api/index.js +3 -3
  13. package/lib/api/index.js.map +1 -1
  14. package/lib/api/shared/types/withConfig.d.ts +3 -2
  15. package/lib/api/start/providers/application/shared.js +1 -1
  16. package/lib/api/start/providers/application/shared.js.map +1 -1
  17. package/lib/api/start/providers/child-app/shared.js +8 -7
  18. package/lib/api/start/providers/child-app/shared.js.map +1 -1
  19. package/lib/api/start/providers/module/shared.js +14 -13
  20. package/lib/api/start/providers/module/shared.js.map +1 -1
  21. package/lib/api/start/utils/banner.js +3 -2
  22. package/lib/api/start/utils/banner.js.map +1 -1
  23. package/lib/api/start/utils/tips/tips.js +10 -8
  24. package/lib/api/start/utils/tips/tips.js.map +1 -1
  25. package/lib/api/start-prod/providers/application.js +5 -5
  26. package/lib/api/start-prod/providers/application.js.map +1 -1
  27. package/lib/api/start-prod/providers/child-app.js +2 -2
  28. package/lib/api/start-prod/providers/child-app.js.map +1 -1
  29. package/lib/api/start-prod/providers/shared.js +3 -3
  30. package/lib/api/start-prod/providers/shared.js.map +1 -1
  31. package/lib/builder/webpack/devServer/client.js +18 -15
  32. package/lib/builder/webpack/devServer/client.js.map +1 -1
  33. package/lib/builder/webpack/devServer/notifier.d.ts +2 -2
  34. package/lib/builder/webpack/devServer/notifier.js +3 -3
  35. package/lib/builder/webpack/devServer/notifier.js.map +1 -1
  36. package/lib/builder/webpack/devServer/pool/process/pool.js +3 -2
  37. package/lib/builder/webpack/devServer/pool/process/pool.js.map +1 -1
  38. package/lib/builder/webpack/devServer/pool/thread/pool.js +7 -0
  39. package/lib/builder/webpack/devServer/pool/thread/pool.js.map +1 -1
  40. package/lib/builder/webpack/devServer/server.js +7 -2
  41. package/lib/builder/webpack/devServer/server.js.map +1 -1
  42. package/lib/builder/webpack/providers/analyze/shared.js +3 -3
  43. package/lib/builder/webpack/providers/analyze/shared.js.map +1 -1
  44. package/lib/builder/webpack/providers/build/application/server.js.map +1 -1
  45. package/lib/builder/webpack/providers/build/client.js +3 -3
  46. package/lib/builder/webpack/providers/build/client.js.map +1 -1
  47. package/lib/builder/webpack/providers/build/server.js +1 -1
  48. package/lib/builder/webpack/providers/build/server.js.map +1 -1
  49. package/lib/builder/webpack/tokens.d.ts +313 -3
  50. package/lib/builder/webpack/tokens.js.map +1 -1
  51. package/lib/builder/webpack/utils/copyBuildFile.d.ts +2 -1
  52. package/lib/builder/webpack/utils/copyBuildFile.js +2 -3
  53. package/lib/builder/webpack/utils/copyBuildFile.js.map +1 -1
  54. package/lib/builder/webpack/utils/copyStatsJsonFile.d.ts +2 -1
  55. package/lib/builder/webpack/utils/copyStatsJsonFile.js +1 -1
  56. package/lib/builder/webpack/utils/copyStatsJsonFile.js.map +1 -1
  57. package/lib/cli/CLI.d.ts +2 -2
  58. package/lib/cli/CLI.js +2 -2
  59. package/lib/cli/CLI.js.map +1 -1
  60. package/lib/cli/index.js.map +1 -1
  61. package/lib/commands/analyze/command.d.ts +1 -1
  62. package/lib/commands/analyze/command.js.map +1 -1
  63. package/lib/commands/benchmark/command.d.ts +1 -1
  64. package/lib/commands/benchmark/command.js.map +1 -1
  65. package/lib/commands/build/command.d.ts +1 -1
  66. package/lib/commands/build/command.js.map +1 -1
  67. package/lib/commands/new/new.js +0 -1
  68. package/lib/commands/new/new.js.map +1 -1
  69. package/lib/commands/new/questions/packageManager.d.ts +1 -1
  70. package/lib/commands/new/questions/packageManager.js.map +1 -1
  71. package/lib/commands/new/questions/template.d.ts +1 -1
  72. package/lib/commands/new/questions/template.js.map +1 -1
  73. package/lib/commands/new/questions/testingFramework.d.ts +1 -1
  74. package/lib/commands/new/questions/testingFramework.js.map +1 -1
  75. package/lib/commands/new/questions/type.d.ts +1 -1
  76. package/lib/commands/new/questions/type.js.map +1 -1
  77. package/lib/commands/new/steps/initializationGit.d.ts +1 -1
  78. package/lib/commands/new/steps/initializationGit.js.map +1 -1
  79. package/lib/commands/start/command.d.ts +1 -1
  80. package/lib/commands/start/command.js.map +1 -1
  81. package/lib/commands/start-prod/command.d.ts +1 -1
  82. package/lib/commands/start-prod/command.js.map +1 -1
  83. package/lib/commands/static/application.js +4 -4
  84. package/lib/commands/static/application.js.map +1 -1
  85. package/lib/commands/static/command.d.ts +1 -1
  86. package/lib/commands/static/command.js.map +1 -1
  87. package/lib/commands/static/generate.js +2 -2
  88. package/lib/commands/static/generate.js.map +1 -1
  89. package/lib/commands/static/server.d.ts +2 -1
  90. package/lib/commands/static/server.js +1 -1
  91. package/lib/commands/static/server.js.map +1 -1
  92. package/lib/commands/static/staticServer.d.ts +2 -1
  93. package/lib/commands/static/staticServer.js +1 -1
  94. package/lib/commands/static/staticServer.js.map +1 -1
  95. package/lib/commands/update/updatePackageJson.js +3 -0
  96. package/lib/commands/update/updatePackageJson.js.map +1 -1
  97. package/lib/config/configManager.d.ts +12 -73
  98. package/lib/config/configManager.js +61 -92
  99. package/lib/config/configManager.js.map +1 -1
  100. package/lib/config/showConfig.d.ts +1 -1
  101. package/lib/config/showConfig.js +1 -1
  102. package/lib/config/showConfig.js.map +1 -1
  103. package/lib/config/validate.d.ts +5 -4
  104. package/lib/config/validate.js +2 -9
  105. package/lib/config/validate.js.map +1 -1
  106. package/lib/di/tokens/config.d.ts +106 -1
  107. package/lib/di/tokens/config.js.map +1 -1
  108. package/lib/external/config.d.ts +2 -2
  109. package/lib/library/babel/index.js +1 -0
  110. package/lib/library/babel/index.js.map +1 -1
  111. package/lib/library/swc/index.js +1 -1
  112. package/lib/library/swc/index.js.map +1 -1
  113. package/lib/library/webpack/application/client/common.js +6 -4
  114. package/lib/library/webpack/application/client/common.js.map +1 -1
  115. package/lib/library/webpack/application/client/dev.js +9 -8
  116. package/lib/library/webpack/application/client/dev.js.map +1 -1
  117. package/lib/library/webpack/application/client/prod/optimization/splitChunks.js +40 -39
  118. package/lib/library/webpack/application/client/prod/optimization/splitChunks.js.map +1 -1
  119. package/lib/library/webpack/application/client/prod.js +3 -4
  120. package/lib/library/webpack/application/client/prod.js.map +1 -1
  121. package/lib/library/webpack/application/server/common.js +5 -5
  122. package/lib/library/webpack/application/server/common.js.map +1 -1
  123. package/lib/library/webpack/application/server/dev.js +3 -6
  124. package/lib/library/webpack/application/server/dev.js.map +1 -1
  125. package/lib/library/webpack/application/server/prod.js +3 -4
  126. package/lib/library/webpack/application/server/prod.js.map +1 -1
  127. package/lib/library/webpack/blocks/apiResolve.js +1 -1
  128. package/lib/library/webpack/blocks/apiResolve.js.map +1 -1
  129. package/lib/library/webpack/blocks/configResolve.js +2 -2
  130. package/lib/library/webpack/blocks/configResolve.js.map +1 -1
  131. package/lib/library/webpack/blocks/configToEnv.js +5 -2
  132. package/lib/library/webpack/blocks/configToEnv.js.map +1 -1
  133. package/lib/library/webpack/blocks/css.d.ts +3 -1
  134. package/lib/library/webpack/blocks/css.js +17 -6
  135. package/lib/library/webpack/blocks/css.js.map +1 -1
  136. package/lib/library/webpack/blocks/extractCssPlugin.d.ts +4 -3
  137. package/lib/library/webpack/blocks/extractCssPlugin.js +4 -6
  138. package/lib/library/webpack/blocks/extractCssPlugin.js.map +1 -1
  139. package/lib/library/webpack/blocks/filesClient.d.ts +3 -2
  140. package/lib/library/webpack/blocks/filesClient.js +7 -7
  141. package/lib/library/webpack/blocks/filesClient.js.map +1 -1
  142. package/lib/library/webpack/blocks/filesServer.d.ts +2 -1
  143. package/lib/library/webpack/blocks/filesServer.js +3 -3
  144. package/lib/library/webpack/blocks/filesServer.js.map +1 -1
  145. package/lib/library/webpack/blocks/js.d.ts +2 -1
  146. package/lib/library/webpack/blocks/js.js +1 -1
  147. package/lib/library/webpack/blocks/js.js.map +1 -1
  148. package/lib/library/webpack/blocks/nodeClient.d.ts +2 -1
  149. package/lib/library/webpack/blocks/nodeClient.js +2 -2
  150. package/lib/library/webpack/blocks/nodeClient.js.map +1 -1
  151. package/lib/library/webpack/blocks/optimize.d.ts +2 -1
  152. package/lib/library/webpack/blocks/optimize.js +3 -3
  153. package/lib/library/webpack/blocks/optimize.js.map +1 -1
  154. package/lib/library/webpack/blocks/pagesResolve.js +1 -1
  155. package/lib/library/webpack/blocks/pagesResolve.js.map +1 -1
  156. package/lib/library/webpack/blocks/postcssAssets.d.ts +2 -1
  157. package/lib/library/webpack/blocks/postcssAssets.js +2 -2
  158. package/lib/library/webpack/blocks/postcssAssets.js.map +1 -1
  159. package/lib/library/webpack/blocks/serverInline.d.ts +2 -1
  160. package/lib/library/webpack/blocks/serverInline.js.map +1 -1
  161. package/lib/library/webpack/blocks/ts.d.ts +2 -1
  162. package/lib/library/webpack/blocks/ts.js.map +1 -1
  163. package/lib/library/webpack/child-app/client/common.d.ts +2 -2
  164. package/lib/library/webpack/child-app/client/common.js +1 -1
  165. package/lib/library/webpack/child-app/client/common.js.map +1 -1
  166. package/lib/library/webpack/child-app/client/dev.d.ts +2 -2
  167. package/lib/library/webpack/child-app/client/dev.js +6 -5
  168. package/lib/library/webpack/child-app/client/dev.js.map +1 -1
  169. package/lib/library/webpack/child-app/client/prod.d.ts +2 -2
  170. package/lib/library/webpack/child-app/client/prod.js.map +1 -1
  171. package/lib/library/webpack/child-app/common.d.ts +2 -2
  172. package/lib/library/webpack/child-app/common.js.map +1 -1
  173. package/lib/library/webpack/child-app/server/common.d.ts +2 -2
  174. package/lib/library/webpack/child-app/server/common.js +1 -1
  175. package/lib/library/webpack/child-app/server/common.js.map +1 -1
  176. package/lib/library/webpack/child-app/server/dev.d.ts +2 -2
  177. package/lib/library/webpack/child-app/server/dev.js.map +1 -1
  178. package/lib/library/webpack/child-app/server/prod.d.ts +2 -2
  179. package/lib/library/webpack/child-app/server/prod.js.map +1 -1
  180. package/lib/library/webpack/common/client/prod.d.ts +2 -1
  181. package/lib/library/webpack/common/client/prod.js +4 -5
  182. package/lib/library/webpack/common/client/prod.js.map +1 -1
  183. package/lib/library/webpack/common/main.d.ts +2 -1
  184. package/lib/library/webpack/common/main.js +3 -3
  185. package/lib/library/webpack/common/main.js.map +1 -1
  186. package/lib/library/webpack/common/server/prod.d.ts +2 -1
  187. package/lib/library/webpack/common/server/prod.js +4 -5
  188. package/lib/library/webpack/common/server/prod.js.map +1 -1
  189. package/lib/library/webpack/index.js +1 -2
  190. package/lib/library/webpack/index.js.map +1 -1
  191. package/lib/library/webpack/loaders/image-loader/index.d.ts +2 -1
  192. package/lib/library/webpack/loaders/image-loader/index.js.map +1 -1
  193. package/lib/library/webpack/loaders/pagesResolve.d.ts +10 -1
  194. package/lib/library/webpack/loaders/pagesResolve.js +4 -3
  195. package/lib/library/webpack/loaders/pagesResolve.js.map +1 -1
  196. package/lib/library/webpack/loaders/replaceContent.d.ts +6 -1
  197. package/lib/library/webpack/loaders/replaceContent.js +4 -3
  198. package/lib/library/webpack/loaders/replaceContent.js.map +1 -1
  199. package/lib/library/webpack/module/client/common.js +1 -1
  200. package/lib/library/webpack/module/client/common.js.map +1 -1
  201. package/lib/library/webpack/module/externals.d.ts +1 -1
  202. package/lib/library/webpack/module/externals.js.map +1 -1
  203. package/lib/library/webpack/module/resolveExternal.d.ts +1 -1
  204. package/lib/library/webpack/module/resolveExternal.js.map +1 -1
  205. package/lib/library/webpack/module/server/common.js +1 -1
  206. package/lib/library/webpack/module/server/common.js.map +1 -1
  207. package/lib/library/webpack/plugins/LazyModuleInitialization.d.ts +2 -2
  208. package/lib/library/webpack/plugins/LazyModuleInitialization.js +1 -0
  209. package/lib/library/webpack/plugins/LazyModuleInitialization.js.map +1 -1
  210. package/lib/library/webpack/plugins/WebpackBar/utils/index.d.ts +7 -7
  211. package/lib/library/webpack/plugins/WebpackBar/utils/index.js.map +1 -1
  212. package/lib/library/webpack/plugins/WebpackBar/utils/webpack.d.ts +2 -2
  213. package/lib/library/webpack/plugins/WebpackBar/utils/webpack.js.map +1 -1
  214. package/lib/library/webpack/types/webpack.d.ts +2 -2
  215. package/lib/library/webpack/utils/files.d.ts +4 -3
  216. package/lib/library/webpack/utils/files.js +2 -2
  217. package/lib/library/webpack/utils/files.js.map +1 -1
  218. package/lib/library/webpack/utils/transpiler.d.ts +3 -2
  219. package/lib/library/webpack/utils/transpiler.js +2 -2
  220. package/lib/library/webpack/utils/transpiler.js.map +1 -1
  221. package/lib/library/webpack/utils/workersPool.d.ts +3 -6
  222. package/lib/library/webpack/utils/workersPool.js +1 -1
  223. package/lib/library/webpack/utils/workersPool.js.map +1 -1
  224. package/lib/models/config.d.ts +2 -3
  225. package/lib/models/config.js +32 -3
  226. package/lib/models/config.js.map +1 -1
  227. package/lib/schema/ConfigSchema.d.ts +13 -4
  228. package/lib/schema/autogeneratedSchema.json +1808 -2074
  229. package/lib/typings/configEntry/application.d.ts +81 -86
  230. package/lib/typings/configEntry/child-app.d.ts +10 -29
  231. package/lib/typings/configEntry/cli.d.ts +254 -0
  232. package/lib/typings/configEntry/{CheckAsyncTsConfig.js → cli.js} +1 -1
  233. package/lib/typings/configEntry/cli.js.map +1 -0
  234. package/lib/typings/configEntry/common.d.ts +16 -276
  235. package/lib/typings/configEntry/common.js +15 -0
  236. package/lib/typings/configEntry/common.js.map +1 -1
  237. package/lib/typings/configEntry/module.d.ts +10 -29
  238. package/lib/typings/configEntry/package.d.ts +2 -1
  239. package/lib/ui/commander.js +1 -1
  240. package/lib/ui/commander.js.map +1 -1
  241. package/lib/utils/applyTemplate.js.map +1 -1
  242. package/lib/utils/safeRequire.js +5 -1
  243. package/lib/utils/safeRequire.js.map +1 -1
  244. package/lib/utils/webpackBuild.d.ts +2 -1
  245. package/lib/utils/webpackBuild.js +3 -3
  246. package/lib/utils/webpackBuild.js.map +1 -1
  247. package/package.json +13 -9
  248. package/schema.json +1802 -2068
  249. package/src/api/analyze/providers/shared.ts +3 -2
  250. package/src/api/benchmark/__integration__/__fixtures__/tramvai.json +1 -8
  251. package/src/api/benchmark/index.ts +1 -1
  252. package/src/api/build/__integration__/__fixtures__/app/App.tsx +0 -1
  253. package/src/api/build/__integration__/__fixtures__/app/index.tsx +14 -8
  254. package/src/api/build/__integration__/__fixtures__/app/server.tsx +0 -1
  255. package/src/api/build/__integration__/__fixtures__/tramvai.json +1 -10
  256. package/src/api/build/__integration__/build.test.ts +4 -13
  257. package/src/api/build/child-app.ts +4 -4
  258. package/src/api/build/module.ts +2 -4
  259. package/src/api/build/providers/shared.ts +2 -2
  260. package/src/api/index.ts +6 -2
  261. package/src/api/shared/types/withConfig.ts +5 -6
  262. package/src/api/start/__integration__/__fixtures__/app/index.tsx +11 -7
  263. package/src/api/start/__integration__/__fixtures__/tramvai.json +6 -17
  264. package/src/api/start/__integration__/start.test.ts +1 -12
  265. package/src/api/start/providers/application/shared.ts +2 -2
  266. package/src/api/start/providers/child-app/shared.ts +9 -14
  267. package/src/api/start/providers/module/shared.ts +19 -30
  268. package/src/api/start/utils/banner.ts +3 -2
  269. package/src/api/start/utils/tips/tips.ts +11 -8
  270. package/src/api/start-prod/providers/application.ts +10 -14
  271. package/src/api/start-prod/providers/child-app.ts +4 -5
  272. package/src/api/start-prod/providers/shared.ts +4 -8
  273. package/src/builder/webpack/devServer/client.ts +22 -15
  274. package/src/builder/webpack/devServer/notifier.ts +6 -6
  275. package/src/builder/webpack/devServer/pool/process/pool.ts +3 -3
  276. package/src/builder/webpack/devServer/pool/thread/pool.ts +7 -0
  277. package/src/builder/webpack/devServer/server.ts +13 -6
  278. package/src/builder/webpack/providers/analyze/shared.ts +3 -2
  279. package/src/builder/webpack/providers/build/application/server.ts +5 -1
  280. package/src/builder/webpack/providers/build/client.ts +3 -2
  281. package/src/builder/webpack/providers/build/server.ts +1 -1
  282. package/src/builder/webpack/tokens.ts +4 -3
  283. package/src/builder/webpack/utils/copyBuildFile.ts +4 -5
  284. package/src/builder/webpack/utils/copyStatsJsonFile.ts +5 -2
  285. package/src/cli/CLI.ts +6 -6
  286. package/src/cli/index.ts +1 -1
  287. package/src/commands/analyze/command.ts +1 -1
  288. package/src/commands/benchmark/command.ts +1 -1
  289. package/src/commands/build/command.ts +2 -2
  290. package/src/commands/new/new.ts +0 -1
  291. package/src/commands/new/questions/packageManager.ts +1 -1
  292. package/src/commands/new/questions/template.ts +1 -1
  293. package/src/commands/new/questions/testingFramework.ts +1 -1
  294. package/src/commands/new/questions/type.ts +1 -1
  295. package/src/commands/new/steps/initializationGit.ts +1 -1
  296. package/src/commands/new/templates/app/monorepo/tramvai.json.hbs +6 -32
  297. package/src/commands/new/templates/app/multirepo/tramvai.json.hbs +6 -23
  298. package/src/commands/new/templates/child-app/monorepo/tramvai.json.hbs +3 -18
  299. package/src/commands/new/templates/child-app/multirepo/tramvai.json.hbs +3 -9
  300. package/src/commands/start/command.ts +2 -2
  301. package/src/commands/start-prod/command.ts +2 -2
  302. package/src/commands/static/application.ts +5 -14
  303. package/src/commands/static/command.ts +1 -1
  304. package/src/commands/static/generate.ts +2 -2
  305. package/src/commands/static/server.ts +5 -2
  306. package/src/commands/static/staticServer.ts +6 -3
  307. package/src/commands/update/updatePackageJson.ts +6 -2
  308. package/src/config/configManager.spec.ts +49 -0
  309. package/src/config/configManager.ts +123 -197
  310. package/src/config/showConfig.ts +2 -2
  311. package/src/config/validate.ts +14 -25
  312. package/src/di/tokens/config.ts +2 -1
  313. package/src/library/babel/index.ts +1 -0
  314. package/src/library/swc/__integration__/swc.build.test.ts +3 -21
  315. package/src/library/swc/__integration__/swc.start.test.ts +3 -21
  316. package/src/library/swc/index.ts +1 -1
  317. package/src/library/webpack/application/client/common.ts +7 -7
  318. package/src/library/webpack/application/client/dev.ts +9 -9
  319. package/src/library/webpack/application/client/prod/optimization/splitChunks.ts +43 -44
  320. package/src/library/webpack/application/client/prod.ts +3 -5
  321. package/src/library/webpack/application/server/common.ts +5 -8
  322. package/src/library/webpack/application/server/dev.ts +5 -6
  323. package/src/library/webpack/application/server/prod.ts +3 -9
  324. package/src/library/webpack/blocks/apiResolve.ts +1 -1
  325. package/src/library/webpack/blocks/configResolve.ts +2 -2
  326. package/src/library/webpack/blocks/configToEnv.ts +5 -2
  327. package/src/library/webpack/blocks/css.ts +26 -17
  328. package/src/library/webpack/blocks/extractCssPlugin.ts +11 -10
  329. package/src/library/webpack/blocks/filesClient.ts +52 -50
  330. package/src/library/webpack/blocks/filesServer.ts +4 -3
  331. package/src/library/webpack/blocks/js.ts +3 -2
  332. package/src/library/webpack/blocks/nodeClient.ts +4 -3
  333. package/src/library/webpack/blocks/optimize.ts +5 -6
  334. package/src/library/webpack/blocks/pagesResolve.ts +1 -1
  335. package/src/library/webpack/blocks/postcssAssets.ts +6 -7
  336. package/src/library/webpack/blocks/serverInline.ts +2 -1
  337. package/src/library/webpack/blocks/ts.ts +2 -1
  338. package/src/library/webpack/child-app/client/common.ts +3 -3
  339. package/src/library/webpack/child-app/client/dev.ts +8 -8
  340. package/src/library/webpack/child-app/client/prod.ts +2 -2
  341. package/src/library/webpack/child-app/common.ts +2 -2
  342. package/src/library/webpack/child-app/server/common.ts +3 -3
  343. package/src/library/webpack/child-app/server/dev.ts +2 -2
  344. package/src/library/webpack/child-app/server/prod.ts +2 -2
  345. package/src/library/webpack/common/client/prod.ts +10 -6
  346. package/src/library/webpack/common/main.ts +9 -4
  347. package/src/library/webpack/common/server/prod.ts +10 -6
  348. package/src/library/webpack/index.ts +2 -3
  349. package/src/library/webpack/loaders/image-loader/index.ts +2 -1
  350. package/src/library/webpack/loaders/pagesResolve.ts +17 -5
  351. package/src/library/webpack/loaders/replaceContent.ts +11 -2
  352. package/src/library/webpack/module/client/common.ts +1 -1
  353. package/src/library/webpack/module/externals.ts +1 -1
  354. package/src/library/webpack/module/resolveExternal.ts +1 -1
  355. package/src/library/webpack/module/server/common.ts +1 -1
  356. package/src/library/webpack/plugins/LazyModuleInitialization.ts +6 -1
  357. package/src/library/webpack/plugins/WebpackBar/utils/index.ts +8 -8
  358. package/src/library/webpack/plugins/WebpackBar/utils/webpack.ts +1 -1
  359. package/src/library/webpack/types/webpack.ts +2 -2
  360. package/src/library/webpack/utils/files.ts +4 -3
  361. package/src/library/webpack/utils/transpiler.ts +6 -11
  362. package/src/library/webpack/utils/workersPool.ts +6 -9
  363. package/src/models/config.spec.ts +352 -0
  364. package/src/models/config.ts +41 -9
  365. package/src/schema/ConfigSchema.ts +15 -4
  366. package/src/schema/autogeneratedSchema.json +1808 -2074
  367. package/src/schema/tramvai.spec.ts +89 -184
  368. package/src/typings/configEntry/application.ts +85 -87
  369. package/src/typings/configEntry/child-app.ts +10 -30
  370. package/src/typings/configEntry/cli.ts +271 -0
  371. package/src/typings/configEntry/common.ts +26 -278
  372. package/src/typings/configEntry/module.ts +11 -30
  373. package/src/typings/configEntry/package.ts +3 -1
  374. package/src/ui/commander.ts +1 -1
  375. package/src/utils/applyTemplate.ts +2 -2
  376. package/src/utils/safeRequire.ts +6 -1
  377. package/src/utils/webpackBuild.ts +4 -3
  378. package/lib/library/webpack/plugins/DedupePlugin/DedupePlugin.d.ts +0 -37
  379. package/lib/library/webpack/plugins/DedupePlugin/DedupePlugin.js +0 -241
  380. package/lib/library/webpack/plugins/DedupePlugin/DedupePlugin.js.map +0 -1
  381. package/lib/library/webpack/plugins/DedupePlugin/index.d.ts +0 -1
  382. package/lib/library/webpack/plugins/DedupePlugin/index.js +0 -6
  383. package/lib/library/webpack/plugins/DedupePlugin/index.js.map +0 -1
  384. package/lib/typings/configEntry/CheckAsyncTsConfig.d.ts +0 -13
  385. package/lib/typings/configEntry/CheckAsyncTsConfig.js.map +0 -1
  386. package/src/library/webpack/plugins/DedupePlugin/DedupePlugin.spec.ts +0 -95
  387. package/src/library/webpack/plugins/DedupePlugin/DedupePlugin.ts +0 -307
  388. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-1/index.js +0 -3
  389. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-1/node_modules/package-dep/index.js +0 -1
  390. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-1/node_modules/package-dep/package.json +0 -7
  391. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-1/package.json +0 -7
  392. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-2/index.js +0 -3
  393. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-2/node_modules/package-dep/index.js +0 -1
  394. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-2/node_modules/package-dep/package.json +0 -7
  395. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-2/package.json +0 -7
  396. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-3/index.js +0 -3
  397. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-3/node_modules/package-dep/index.js +0 -1
  398. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-3/node_modules/package-dep/package.json +0 -7
  399. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-3/package.json +0 -7
  400. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-dep/index.js +0 -1
  401. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-dep/package.json +0 -7
  402. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-esm-1/index.js +0 -3
  403. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-esm-1/node_modules/package-esm-dep/index.js +0 -1
  404. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-esm-1/node_modules/package-esm-dep/package.json +0 -8
  405. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-esm-1/package.json +0 -8
  406. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-esm-2/index.js +0 -3
  407. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-esm-2/node_modules/package-esm-dep/index.js +0 -1
  408. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-esm-2/node_modules/package-esm-dep/package.json +0 -8
  409. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/node_modules/package-esm-2/package.json +0 -8
  410. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/package-lock.json +0 -0
  411. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/package.json +0 -14
  412. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/src/index.js +0 -9
  413. package/src/library/webpack/plugins/DedupePlugin/__fixtures__/dedupe/tramvai.json +0 -67
  414. package/src/library/webpack/plugins/DedupePlugin/__integration__/DedupePlugin.test.ts +0 -90
  415. package/src/library/webpack/plugins/DedupePlugin/index.ts +0 -1
  416. package/src/typings/configEntry/CheckAsyncTsConfig.ts +0 -15
package/README.md CHANGED
@@ -44,21 +44,19 @@ After any command you can pass `--help` string, e.g. `tramvai --help` or `tramva
44
44
 
45
45
  ### Notifications settings
46
46
 
47
- Inside `tramvai.json` the settings for the notification can be specified at path `commands.serve.notifications`. Parameters are passed to [webpack-build-notifier](https://github.com/RoccoC/webpack-build-notifier#config-options). You can specify global configuration or a specific configuration either for client or server build.
47
+ Inside `tramvai.json` the settings for the notification can be specified at path `notifications`. Parameters are passed to [webpack-build-notifier](https://github.com/RoccoC/webpack-build-notifier#config-options). You can specify global configuration or a specific configuration either for client or server build.
48
48
 
49
49
  ```json
50
- "commands": {
51
- "serve": {
52
- "notifications": {
53
- "suppressSuccess": "always",
54
- "server": {
55
- "suppressWarning": true
56
- },
57
- "client": {
58
- "activateTerminalOnError": true
59
- }
60
- }
50
+ {
51
+ "notifications": {
52
+ "suppressSuccess": "always",
53
+ "server": {
54
+ "suppressWarning": true
55
+ },
56
+ "client": {
57
+ "activateTerminalOnError": true
61
58
  }
59
+ }
62
60
  }
63
61
  ```
64
62
 
@@ -67,17 +65,39 @@ Inside `tramvai.json` the settings for the notification can be specified at path
67
65
  Name generation is configured via the options `cssLocalIdentNameDev` and `cssLocalIdentNameProd` (common option `cssLocalIdentName` might be used to specify settings for both prod and dev).
68
66
 
69
67
  ```json
70
- "commands": {
71
- "build": {
72
- "configurations": {
73
- "postcss": {
74
- "cssLocalIdentName": "[hash:base64:5]", // default value (deprecated)
75
- "cssLocalIdentNameDev": "[name]__[local]_[minicss]", // available values see in the docs to [css-loader](https://github.com/webpack-contrib/css-loader)
76
- "cssLocalIdentNameProd": "[minicss]", // additionally new tag `minicss` can be used for the generating minimal css names. Based on [article](https://dev.to/denisx/reduce-bundle-size-via-one-letter-css-classname-hash-strategy-10g6)
77
- };
78
- };
79
- };
80
- };
68
+ {
69
+ "postcss": {
70
+ "cssLocalIdentName": "[hash:base64:5]", // default value (deprecated)
71
+ }
72
+ }
73
+ ```
74
+
75
+ or
76
+
77
+ ```json
78
+ {
79
+ "postcss": {
80
+ "cssLocalIdentName": {
81
+ "development": "[name]__[local]_[minicss]", // available values see in the docs to [css-loader](https://github.com/webpack-contrib/css-loader)
82
+ "production": "[minicss]", // additionally new tag `minicss` can be used for the generating minimal css names. Based on [article](https://dev.to/denisx/reduce-bundle-size-via-one-letter-css-classname-hash-strategy-10g6)
83
+ }
84
+ }
85
+ }
86
+ ```
87
+
88
+ ### CSS modules processing
89
+
90
+ By default, all `*.css` imports will be processed as CSS Modules.
91
+
92
+ IF you want to disable Modules for some files, for example with global styles, you can do it by adding `cssModulePattern` regexp to the config:
93
+
94
+ ```json
95
+ {
96
+ "postcss": {
97
+ // CSS Modules processing will be skipped for *.global.css files
98
+ "cssModulePattern": "/^(?!.global.css$).$/"
99
+ }
100
+ }
81
101
  ```
82
102
 
83
103
  ### Polyfills for the standard NodeJS modules
@@ -109,11 +129,10 @@ If you want to override path to tsconfig through **pluginOptions.tsconfig** the
109
129
 
110
130
  ### Deduplication of modules
111
131
 
112
- Option `commands.build.configurations.dedupe` controls the settings of plugin for the deduplication process. Available options are:
132
+ Option `dedupe` controls the settings of plugin for the deduplication process. Available options are:
113
133
 
114
134
  - `"equality"` - uses strict version comparison. Dedupes modules in `node_modules` with equal package version that are imported from different sources. E.g. imports for `node_modules/package/index.js` and `node_modules/nested-package/node_modules/package/index.js` are deduped into a single `node_modules/package/index.js` import whilst without dedupe it will bundle two files as separate modules.
115
135
  - `"semver"` - compares version of packages based on semver. It can dedupe all of the imports with the same major version and any of the minor and patch versions. E.g. next versions will be deduped: from `1.14.0` and `1.16.2` to `1.16.2`, from `0.14.1` and `0.16.5` to `0.16.5`, whilst versions `0.0.2` and `0.0.5` will be left without deduplication.
116
- - `false` - disable deduplication, by default
117
136
 
118
137
  ### Debug an app
119
138
 
@@ -142,7 +161,7 @@ By default, for browser is used the fastest sourcemaps, while for server no sour
142
161
 
143
162
  Flag `--debug` enables sourcemap generation for the server bundle.
144
163
 
145
- Option `commands.serve.configurations.sourceMap` enables sourcemap generation both for browser and server code.
164
+ Option `sourceMap` enables sourcemap generation both for browser and server code.
146
165
 
147
166
  ##### Production
148
167
 
@@ -150,23 +169,12 @@ By default, sourcemaps are disabled both for the client and server code.
150
169
 
151
170
  Flag `--debug` enables sourcemaps generation for the client and server bundles.
152
171
 
153
- Option `commands.build.configurations.sourceMap` enables sourcemap generation for the client bundle.
154
-
155
- Option `commands.build.configurations.sourceMapServer` enables sourcemap generation for the server bundle.
172
+ Option `sourceMap` enables sourcemap generation for bundle.
156
173
 
157
174
  ## Configuration
158
175
 
159
176
  Configuration is provided through json-file with the name `tramvai.json` in the root of the single-application/monorepo
160
177
 
161
- ### build or serve config?
162
-
163
- When you are deciding where to put specific settings in `tramvai.json` consider next statements:
164
-
165
- - `serve` config is only for development builds (using `tramvai start`)
166
- - `build` config mostly focused on production builds (`tramvai build`, `tramvai analyze`, `tramvai start-prod`) but may affect development builds as well (is this case this configs are merged)
167
-
168
- In conclusion: put most of the settings in the `build` config and put settings in the `serve` config only if they are specific to development builds or you need to override `build` settings to the development process.
169
-
170
178
  ## How to
171
179
 
172
180
  ### Code generation
@@ -8,7 +8,7 @@ exports.sharedProviders = [
8
8
  (0, dippy_1.provide)({
9
9
  provide: tokens_1.CONFIG_MANAGER_TOKEN,
10
10
  useFactory: ({ configEntry, parameters }) => {
11
- return new configManager_1.ConfigManager(configEntry, Object.assign(Object.assign({}, parameters), { env: 'production', buildType: 'client' }));
11
+ return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { env: 'production', buildType: 'client' }));
12
12
  },
13
13
  deps: {
14
14
  configEntry: tokens_1.CONFIG_ENTRY_TOKEN,
@@ -1 +1 @@
1
- {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/api/analyze/providers/shared.ts"],"names":[],"mappings":";;;AACA,0CAAyC;AACzC,+CAI4B;AAC5B,iEAA8D;AAEjD,QAAA,eAAe,GAAwB;IAClD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;YAC1C,OAAO,IAAI,6BAAa,CAAC,WAAW,kCAC/B,UAAU,KACb,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,QAAQ,IACnB,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;CACH,CAAC"}
1
+ {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/api/analyze/providers/shared.ts"],"names":[],"mappings":";;;AACA,0CAAyC;AACzC,+CAI4B;AAC5B,iEAAoE;AAGvD,QAAA,eAAe,GAAwB;IAClD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;YAC1C,OAAO,IAAA,mCAAmB,EAAC,WAA6B,kCACnD,UAAU,KACb,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,QAAQ,IACnB,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;CACH,CAAC"}
@@ -8,7 +8,7 @@ export interface Params {
8
8
  times?: number;
9
9
  }
10
10
  export interface Result {
11
- [key: string]: RunStats;
11
+ [key: string]: RunStats | undefined;
12
12
  }
13
13
  export type BenchmarkCommand = (params: StartParams | BuildParams, providers?: Provider[]) => Promise<StartResult | BuildResult>;
14
14
  declare const _default: import("../../typings/commands").Command;
@@ -7,7 +7,6 @@ const di_1 = require("../../utils/di");
7
7
  const tokens_1 = require("../../di/tokens");
8
8
  const buildChildApp = (di) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
9
9
  (0, di_1.registerProviders)(di, shared_1.sharedProviders);
10
- const configManager = di.get(tokens_1.CONFIG_MANAGER_TOKEN);
11
10
  const builderFactory = di.get(tokens_1.ABSTRACT_BUILDER_FACTORY_TOKEN);
12
11
  const builder = yield builderFactory.createBuilder('webpack', {
13
12
  options: {
@@ -16,7 +15,9 @@ const buildChildApp = (di) => tslib_1.__awaiter(void 0, void 0, void 0, function
16
15
  },
17
16
  });
18
17
  const builderBuild = yield builder.build({
19
- modern: configManager.modern,
18
+ // child-app either should be built for legacy code always
19
+ // or should be smart loaded depending on browser capabilities
20
+ modern: false,
20
21
  });
21
22
  return Object.assign({ builder }, builderBuild);
22
23
  });
@@ -1 +1 @@
1
- {"version":3,"file":"child-app.js","sourceRoot":"","sources":["../../../src/api/build/child-app.ts"],"names":[],"mappings":";;;;AAEA,+CAAqD;AACrD,uCAAmD;AACnD,4CAAuF;AAEhF,MAAM,aAAa,GAAG,CAAO,EAAa,EAAU,EAAE;IAC3D,IAAA,sBAAiB,EAAC,EAAE,EAAE,wBAAe,CAAC,CAAC;IAEvC,MAAM,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,6BAAoB,CAAC,CAAC;IAEnD,MAAM,cAAc,GAAG,EAAE,CAAC,GAAG,CAAC,uCAA8B,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,aAAa,CAAC,SAAS,EAAE;QAC5D,OAAO,EAAE;YACP,iBAAiB,EAAE,IAAI;YACvB,iBAAiB,EAAE,IAAI;SACxB;KACF,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC;QACvC,MAAM,EAAE,aAAa,CAAC,MAAM;KAC7B,CAAC,CAAC;IAEH,uBACE,OAAO,IACJ,YAAY,EACf;AACJ,CAAC,CAAA,CAAC;AArBW,QAAA,aAAa,iBAqBxB"}
1
+ {"version":3,"file":"child-app.js","sourceRoot":"","sources":["../../../src/api/build/child-app.ts"],"names":[],"mappings":";;;;AAEA,+CAAqD;AACrD,uCAAmD;AACnD,4CAAiE;AAE1D,MAAM,aAAa,GAAG,CAAO,EAAa,EAAU,EAAE;IAC3D,IAAA,sBAAiB,EAAC,EAAE,EAAE,wBAAe,CAAC,CAAC;IAEvC,MAAM,cAAc,GAAG,EAAE,CAAC,GAAG,CAAC,uCAA8B,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,aAAa,CAAC,SAAS,EAAE;QAC5D,OAAO,EAAE;YACP,iBAAiB,EAAE,IAAI;YACvB,iBAAiB,EAAE,IAAI;SACxB;KACF,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC;QACvC,0DAA0D;QAC1D,8DAA8D;QAC9D,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;IAEH,uBACE,OAAO,IACJ,YAAY,EACf;AACJ,CAAC,CAAA,CAAC;AArBW,QAAA,aAAa,iBAqBxB"}
@@ -7,7 +7,6 @@ const di_1 = require("../../utils/di");
7
7
  const tokens_1 = require("../../di/tokens");
8
8
  const buildModule = (di) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
9
9
  (0, di_1.registerProviders)(di, [...shared_1.sharedProviders]);
10
- const configManager = di.get(tokens_1.CONFIG_MANAGER_TOKEN);
11
10
  const builderFactory = di.get(tokens_1.ABSTRACT_BUILDER_FACTORY_TOKEN);
12
11
  const builder = yield builderFactory.createBuilder('webpack', {
13
12
  options: {
@@ -16,7 +15,7 @@ const buildModule = (di) => tslib_1.__awaiter(void 0, void 0, void 0, function*
16
15
  },
17
16
  });
18
17
  const builderBuild = yield builder.build({
19
- modern: configManager.modern,
18
+ modern: false,
20
19
  });
21
20
  return Object.assign({ builder }, builderBuild);
22
21
  });
@@ -1 +1 @@
1
- {"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/api/build/module.ts"],"names":[],"mappings":";;;;AAEA,+CAAqD;AACrD,uCAAmD;AACnD,4CAAuF;AAEhF,MAAM,WAAW,GAAG,CAAO,EAAa,EAAU,EAAE;IACzD,IAAA,sBAAiB,EAAC,EAAE,EAAE,CAAC,GAAG,wBAAe,CAAC,CAAC,CAAC;IAE5C,MAAM,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,6BAAoB,CAAC,CAAC;IAEnD,MAAM,cAAc,GAAG,EAAE,CAAC,GAAG,CAAC,uCAA8B,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,aAAa,CAAC,SAAS,EAAE;QAC5D,OAAO,EAAE;YACP,iBAAiB,EAAE,IAAI;YACvB,iBAAiB,EAAE,IAAI;SACxB;KACF,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC;QACvC,MAAM,EAAE,aAAa,CAAC,MAAM;KAC7B,CAAC,CAAC;IAEH,uBACE,OAAO,IACJ,YAAY,EACf;AACJ,CAAC,CAAA,CAAC;AArBW,QAAA,WAAW,eAqBtB"}
1
+ {"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/api/build/module.ts"],"names":[],"mappings":";;;;AAEA,+CAAqD;AACrD,uCAAmD;AACnD,4CAAiE;AAE1D,MAAM,WAAW,GAAG,CAAO,EAAa,EAAU,EAAE;IACzD,IAAA,sBAAiB,EAAC,EAAE,EAAE,CAAC,GAAG,wBAAe,CAAC,CAAC,CAAC;IAE5C,MAAM,cAAc,GAAG,EAAE,CAAC,GAAG,CAAC,uCAA8B,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,aAAa,CAAC,SAAS,EAAE;QAC5D,OAAO,EAAE;YACP,iBAAiB,EAAE,IAAI;YACvB,iBAAiB,EAAE,IAAI;SACxB;KACF,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC;QACvC,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;IAEH,uBACE,OAAO,IACJ,YAAY,EACf;AACJ,CAAC,CAAA,CAAC;AAnBW,QAAA,WAAW,eAmBtB"}
@@ -7,7 +7,7 @@ exports.sharedProviders = [
7
7
  {
8
8
  provide: tokens_1.CONFIG_MANAGER_TOKEN,
9
9
  useFactory: ({ configEntry, parameters, }) => {
10
- return new configManager_1.ConfigManager(configEntry, Object.assign(Object.assign({}, parameters), { env: 'production', buildType: 'client' }));
10
+ return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { env: 'production', buildType: 'client' }));
11
11
  },
12
12
  deps: {
13
13
  configEntry: tokens_1.CONFIG_ENTRY_TOKEN,
@@ -1 +1 @@
1
- {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/api/build/providers/shared.ts"],"names":[],"mappings":";;;AACA,+CAI4B;AAC5B,iEAA8D;AAIjD,QAAA,eAAe,GAAwB;IAClD;QACE,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EACX,WAAW,EACX,UAAU,GAIX,EAAE,EAAE;YACH,OAAO,IAAI,6BAAa,CAAC,WAAW,kCAC/B,UAAU,KACb,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,QAAQ,IACnB,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF;CACF,CAAC"}
1
+ {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/api/build/providers/shared.ts"],"names":[],"mappings":";;;AACA,+CAI4B;AAC5B,iEAAoE;AAIvD,QAAA,eAAe,GAAwB;IAClD;QACE,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EACX,WAAW,EACX,UAAU,GAIX,EAAE,EAAE;YACH,OAAO,IAAA,mCAAmB,EAAC,WAAW,kCACjC,UAAU,KACb,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,QAAQ,IACnB,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF;CACF,CAAC"}
@@ -4,12 +4,16 @@ import type { BenchmarkCommand } from './benchmark';
4
4
  import type { AnalyzeCommand } from './analyze';
5
5
  import type { StartProdCommand } from './start-prod';
6
6
  export * from '../di/tokens';
7
- export { ConfigManager } from '../config/configManager';
7
+ export { ConfigManager, createConfigManager } from '../config/configManager';
8
+ export { CliConfigEntry } from '../typings/configEntry/cli';
9
+ export { ApplicationConfigEntry } from '../typings/configEntry/application';
10
+ export { ChildAppConfigEntry } from '../typings/configEntry/child-app';
11
+ export { ConvertToSchema } from '../schema/ConfigSchema';
8
12
  export { ConfigManager as ConfigManagerValidator } from '../models/config';
9
13
  export { getTramvaiConfig } from '../utils/getTramvaiConfig';
10
14
  export { syncJsonFile } from '../utils/syncJsonFile';
11
15
  export { babelConfigFactory } from '../library/babel';
12
- export { filesClientWebackRulesFactory } from '../library/webpack/blocks/filesClient';
16
+ export { filesClientWebpackRulesFactory } from '../library/webpack/blocks/filesClient';
13
17
  export { cssWebpackRulesFactory } from '../library/webpack/blocks/css';
14
18
  export { lessWebpackRulesFactory } from '../library/webpack/blocks/less';
15
19
  export { postcssAssetsWebpackRulesFactory } from '../library/webpack/blocks/postcssAssets';
package/lib/api/index.js CHANGED
@@ -1,13 +1,13 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.startProd = exports.analyze = exports.benchmark = exports.build = exports.start = exports.configToEnv = exports.extractCssPluginFactory = exports.postcssAssetsWebpackRulesFactory = exports.lessWebpackRulesFactory = exports.cssWebpackRulesFactory = exports.filesClientWebackRulesFactory = exports.babelConfigFactory = exports.syncJsonFile = exports.getTramvaiConfig = exports.ConfigManagerValidator = exports.ConfigManager = void 0;
3
+ exports.startProd = exports.analyze = exports.benchmark = exports.build = exports.start = exports.configToEnv = exports.extractCssPluginFactory = exports.postcssAssetsWebpackRulesFactory = exports.lessWebpackRulesFactory = exports.cssWebpackRulesFactory = exports.filesClientWebpackRulesFactory = exports.babelConfigFactory = exports.syncJsonFile = exports.getTramvaiConfig = exports.ConfigManagerValidator = exports.createConfigManager = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const noop_stream_1 = require("noop-stream");
6
6
  const tokens_1 = require("../di/tokens");
7
7
  const createApp_1 = require("../commands/createApp");
8
8
  tslib_1.__exportStar(require("../di/tokens"), exports);
9
9
  var configManager_1 = require("../config/configManager");
10
- Object.defineProperty(exports, "ConfigManager", { enumerable: true, get: function () { return configManager_1.ConfigManager; } });
10
+ Object.defineProperty(exports, "createConfigManager", { enumerable: true, get: function () { return configManager_1.createConfigManager; } });
11
11
  var config_1 = require("../models/config");
12
12
  Object.defineProperty(exports, "ConfigManagerValidator", { enumerable: true, get: function () { return config_1.ConfigManager; } });
13
13
  var getTramvaiConfig_1 = require("../utils/getTramvaiConfig");
@@ -17,7 +17,7 @@ Object.defineProperty(exports, "syncJsonFile", { enumerable: true, get: function
17
17
  var babel_1 = require("../library/babel");
18
18
  Object.defineProperty(exports, "babelConfigFactory", { enumerable: true, get: function () { return babel_1.babelConfigFactory; } });
19
19
  var filesClient_1 = require("../library/webpack/blocks/filesClient");
20
- Object.defineProperty(exports, "filesClientWebackRulesFactory", { enumerable: true, get: function () { return filesClient_1.filesClientWebackRulesFactory; } });
20
+ Object.defineProperty(exports, "filesClientWebpackRulesFactory", { enumerable: true, get: function () { return filesClient_1.filesClientWebpackRulesFactory; } });
21
21
  var css_1 = require("../library/webpack/blocks/css");
22
22
  Object.defineProperty(exports, "cssWebpackRulesFactory", { enumerable: true, get: function () { return css_1.cssWebpackRulesFactory; } });
23
23
  var less_1 = require("../library/webpack/blocks/less");
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,11 @@
1
+ import type { WithRootDir } from './withRootDir';
1
2
  import type { ApplicationConfigEntry } from '../../../typings/configEntry/application';
2
3
  import type { ModuleConfigEntry } from '../../../typings/configEntry/module';
3
- import type { WithRootDir } from './withRootDir';
4
4
  import type { PackageConfigEntry } from '../../../typings/configEntry/package';
5
5
  import type { ChildAppConfigEntry } from '../../../typings/configEntry/child-app';
6
+ import type { ConvertToSchema } from '../../../schema/ConfigSchema';
6
7
  export type WithConfig<T> = WithRootDir<T> & ({
7
8
  target: string;
8
9
  } | {
9
- config: ApplicationConfigEntry | ModuleConfigEntry | PackageConfigEntry | ChildAppConfigEntry;
10
+ config: ConvertToSchema<ApplicationConfigEntry | ModuleConfigEntry | PackageConfigEntry | ChildAppConfigEntry>;
10
11
  });
@@ -13,7 +13,7 @@ exports.sharedProviders = [
13
13
  {
14
14
  provide: tokens_2.CONFIG_MANAGER_TOKEN,
15
15
  useFactory: ({ configEntry, parameters, server, staticServer, }) => {
16
- return new configManager_1.ConfigManager(configEntry, Object.assign(Object.assign({}, parameters), { env: 'development', buildType: 'client', port: server ? (0, getListeningPort_1.getListeningPort)(server) : parameters.port, staticPort: (0, getListeningPort_1.getListeningPort)(staticServer) }));
16
+ return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { env: 'development', buildType: 'client', port: server ? (0, getListeningPort_1.getListeningPort)(server) : parameters.port, staticPort: (0, getListeningPort_1.getListeningPort)(staticServer) }));
17
17
  },
18
18
  deps: {
19
19
  configEntry: tokens_2.CONFIG_ENTRY_TOKEN,
@@ -1 +1 @@
1
- {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/application/shared.ts"],"names":[],"mappings":";;;;AACA,yCAAuE;AACvE,kDAM+B;AAC/B,uDAAoD;AAGpD,oEAAiE;AACjE,2DAAwD;AACxD,2DAAwD;AACxD,mEAAgE;AAEnD,QAAA,eAAe,GAAwB;IAClD;QACE,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EACX,WAAW,EACX,UAAU,EACV,MAAM,EACN,YAAY,GAMb,EAAE,EAAE;YACH,OAAO,IAAI,6BAAa,CAAC,WAAW,kCAC/B,UAAU,KACb,GAAG,EAAE,aAAa,EAClB,SAAS,EAAE,QAAQ,EACnB,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAA,mCAAgB,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,EACzD,UAAU,EAAE,IAAA,mCAAgB,EAAC,YAAY,CAAC,IAC1C,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;YACpC,YAAY,EAAE,4BAAmB;YACjC,MAAM,EAAE,EAAE,KAAK,EAAE,qBAAY,EAAE,QAAQ,EAAE,IAAI,EAAE;SAChD;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB;IACD;QACE,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EACX,YAAY,EACZ,UAAU,GAIX,EAAE,EAAE;YACH,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,UAAU,GAAG,WAAW,EAAE,UAAU,GAAG,IAAI,EAAE,GAAG,UAAU,CAAC;oBAEnE,IAAI;wBACF,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,UAAU,CAAC,CAAC;qBAC1F;oBAAC,OAAO,KAAK,EAAE;wBACd,IAAK,KAAa,CAAC,IAAI,KAAK,YAAY,EAAE;4BACxC,MAAM,IAAI,KAAK,CACb,YAAY,UAAU,IAAI,UAAU,6EAA6E,CAClH,CAAC;yBACH;wBAED,MAAM,KAAK,CAAC;qBACb;gBACH,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,UAAU,EAAE,iCAAwB;SACrC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAgD,EAAE,EAAE;YAC7E,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF;CACO,CAAC"}
1
+ {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/application/shared.ts"],"names":[],"mappings":";;;;AACA,yCAAuE;AACvE,kDAM+B;AAC/B,uDAAoD;AAGpD,oEAAuE;AACvE,2DAAwD;AACxD,2DAAwD;AACxD,mEAAgE;AAEnD,QAAA,eAAe,GAAwB;IAClD;QACE,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EACX,WAAW,EACX,UAAU,EACV,MAAM,EACN,YAAY,GAMb,EAAE,EAAE;YACH,OAAO,IAAA,mCAAmB,EAAC,WAAW,kCACjC,UAAU,KACb,GAAG,EAAE,aAAa,EAClB,SAAS,EAAE,QAAQ,EACnB,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAA,mCAAgB,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,EACzD,UAAU,EAAE,IAAA,mCAAgB,EAAC,YAAY,CAAC,IAC1C,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;YACpC,YAAY,EAAE,4BAAmB;YACjC,MAAM,EAAE,EAAE,KAAK,EAAE,qBAAY,EAAE,QAAQ,EAAE,IAAI,EAAE;SAChD;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB;IACD;QACE,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EACX,YAAY,EACZ,UAAU,GAIX,EAAE,EAAE;YACH,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,UAAU,GAAG,WAAW,EAAE,UAAU,GAAG,IAAI,EAAE,GAAG,UAAU,CAAC;oBAEnE,IAAI;wBACF,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,UAAU,CAAC,CAAC;qBAC1F;oBAAC,OAAO,KAAK,EAAE;wBACd,IAAK,KAAa,CAAC,IAAI,KAAK,YAAY,EAAE;4BACxC,MAAM,IAAI,KAAK,CACb,YAAY,UAAU,IAAI,UAAU,6EAA6E,CAClH,CAAC;yBACH;wBAED,MAAM,KAAK,CAAC;qBACb;gBACH,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,UAAU,EAAE,iCAAwB;SACrC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAgD,EAAE,EAAE;YAC7E,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF;CACO,CAAC"}
@@ -2,25 +2,26 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.sharedProviders = void 0;
4
4
  const tslib_1 = require("tslib");
5
+ const dippy_1 = require("@tinkoff/dippy");
5
6
  const tokens_1 = require("../../tokens");
6
7
  const tokens_2 = require("../../../../di/tokens");
7
- const configManager_1 = require("../../../../config/configManager");
8
8
  const workersPool_1 = require("../../../../library/webpack/utils/workersPool");
9
9
  const stopServer_1 = require("../../utils/stopServer");
10
10
  const createServer_1 = require("../../utils/createServer");
11
11
  const listenServer_1 = require("../../utils/listenServer");
12
+ const configManager_1 = require("../../../../config/configManager");
12
13
  exports.sharedProviders = [
13
- {
14
+ (0, dippy_1.provide)({
14
15
  provide: tokens_2.CONFIG_MANAGER_TOKEN,
15
- useFactory: ({ configEntry, parameters, }) => {
16
+ useFactory: ({ configEntry, parameters }) => {
16
17
  var _a;
17
- return new configManager_1.ConfigManager(configEntry, Object.assign(Object.assign({}, parameters), { env: 'development', port: (_a = parameters.port) !== null && _a !== void 0 ? _a : 4040, buildType: 'client' }));
18
+ return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { env: 'development', port: (_a = parameters.port) !== null && _a !== void 0 ? _a : 4040, buildType: 'client' }));
18
19
  },
19
20
  deps: {
20
21
  configEntry: tokens_2.CONFIG_ENTRY_TOKEN,
21
22
  parameters: tokens_2.COMMAND_PARAMETERS_TOKEN,
22
23
  },
23
- },
24
+ }),
24
25
  {
25
26
  provide: tokens_2.STATIC_SERVER_TOKEN,
26
27
  useFactory: createServer_1.createServer,
@@ -61,7 +62,7 @@ exports.sharedProviders = [
61
62
  staticServer: tokens_2.STATIC_SERVER_TOKEN,
62
63
  },
63
64
  },
64
- {
65
+ (0, dippy_1.provide)({
65
66
  provide: tokens_1.CLOSE_HANDLER_TOKEN,
66
67
  multi: true,
67
68
  useFactory: ({ configManager }) => {
@@ -72,6 +73,6 @@ exports.sharedProviders = [
72
73
  deps: {
73
74
  configManager: tokens_2.CONFIG_MANAGER_TOKEN,
74
75
  },
75
- },
76
+ }),
76
77
  ];
77
78
  //# sourceMappingURL=shared.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/child-app/shared.ts"],"names":[],"mappings":";;;;AACA,yCAAuE;AACvE,kDAK+B;AAG/B,oEAAiE;AACjE,+EAA0F;AAC1F,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AAE3C,QAAA,eAAe,GAAwB;IAClD;QACE,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EACX,WAAW,EACX,UAAU,GAIX,EAAE,EAAE;;YACH,OAAO,IAAI,6BAAa,CAAC,WAAW,kCAC/B,UAAU,KACb,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,MAAA,UAAU,CAAC,IAAI,mCAAI,IAAI,EAC7B,SAAS,EAAE,QAAQ,IACnB,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB;IACD;QACE,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EACX,YAAY,EACZ,UAAU,GAIX,EAAE,EAAE;YACH,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,IAAI,GAAG,WAAW,EAAE,IAAI,GAAG,IAAI,EAAE,GAAG,UAAU,CAAC;oBAEvD,IAAI;wBACF,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;qBAC9C;oBAAC,OAAO,KAAK,EAAE;wBACd,IAAK,KAAa,CAAC,IAAI,KAAK,YAAY,EAAE;4BACxC,MAAM,IAAI,KAAK,CACb,YAAY,IAAI,IAAI,IAAI,iEAAiE,CAC1F,CAAC;yBACH;wBAED,MAAM,KAAK,CAAC;qBACb;gBACH,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,UAAU,EAAE,iCAAwB;SACrC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAgD,EAAE,EAAE;YAC7E,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAkD,EAAE,EAAE;YAChF,OAAO,GAAS,EAAE;gBAChB,MAAM,IAAA,uCAAyB,EAAC,aAAa,CAAC,CAAC;YACjD,CAAC,CAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF;CACO,CAAC"}
1
+ {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/child-app/shared.ts"],"names":[],"mappings":";;;;AACA,0CAAyC;AACzC,yCAAuE;AACvE,kDAK+B;AAG/B,+EAA0F;AAC1F,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AACxD,oEAAuE;AAE1D,QAAA,eAAe,GAAwB;IAClD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;;YAC1C,OAAO,IAAA,mCAAmB,EAAC,WAAkC,kCACxD,UAAU,KACb,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,MAAA,UAAU,CAAC,IAAI,mCAAI,IAAI,EAC7B,SAAS,EAAE,QAAQ,IACnB,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;IACF;QACE,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB;IACD;QACE,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EACX,YAAY,EACZ,UAAU,GAIX,EAAE,EAAE;YACH,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,IAAI,GAAG,WAAW,EAAE,IAAI,GAAG,IAAI,EAAE,GAAG,UAAU,CAAC;oBAEvD,IAAI;wBACF,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;qBAC9C;oBAAC,OAAO,KAAK,EAAE;wBACd,IAAK,KAAa,CAAC,IAAI,KAAK,YAAY,EAAE;4BACxC,MAAM,IAAI,KAAK,CACb,YAAY,IAAI,IAAI,IAAI,iEAAiE,CAC1F,CAAC;yBACH;wBAED,MAAM,KAAK,CAAC;qBACb;gBACH,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,UAAU,EAAE,iCAAwB;SACrC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAgD,EAAE,EAAE;YAC7E,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF;IACD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE;YAChC,OAAO,GAAS,EAAE;gBAChB,MAAM,IAAA,uCAAyB,EAAC,aAAa,CAAC,CAAC;YACjD,CAAC,CAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;CACM,CAAC"}
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.sharedProviders = void 0;
4
4
  const tslib_1 = require("tslib");
5
+ const dippy_1 = require("@tinkoff/dippy");
5
6
  const tokens_1 = require("../../tokens");
6
7
  const tokens_2 = require("../../../../di/tokens");
7
8
  const configManager_1 = require("../../../../config/configManager");
@@ -10,25 +11,25 @@ const stopServer_1 = require("../../utils/stopServer");
10
11
  const createServer_1 = require("../../utils/createServer");
11
12
  const listenServer_1 = require("../../utils/listenServer");
12
13
  exports.sharedProviders = [
13
- {
14
+ (0, dippy_1.provide)({
14
15
  provide: tokens_2.CONFIG_MANAGER_TOKEN,
15
- useFactory: ({ configEntry, parameters, }) => {
16
+ useFactory: ({ configEntry, parameters }) => {
16
17
  var _a;
17
- return new configManager_1.ConfigManager(configEntry, Object.assign(Object.assign({}, parameters), { env: 'development', port: (_a = parameters.port) !== null && _a !== void 0 ? _a : 4040, buildType: 'client' }));
18
+ return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { env: 'development', port: (_a = parameters.port) !== null && _a !== void 0 ? _a : 4040, buildType: 'client' }));
18
19
  },
19
20
  deps: {
20
21
  configEntry: tokens_2.CONFIG_ENTRY_TOKEN,
21
22
  parameters: tokens_2.COMMAND_PARAMETERS_TOKEN,
22
23
  },
23
- },
24
- {
24
+ }),
25
+ (0, dippy_1.provide)({
25
26
  provide: tokens_2.STATIC_SERVER_TOKEN,
26
27
  useFactory: createServer_1.createServer,
27
- },
28
- {
28
+ }),
29
+ (0, dippy_1.provide)({
29
30
  provide: tokens_1.INIT_HANDLER_TOKEN,
30
31
  multi: true,
31
- useFactory: ({ staticServer, parameters, }) => {
32
+ useFactory: ({ staticServer, parameters }) => {
32
33
  return function staticServerListen() {
33
34
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
34
35
  const { host = 'localhost', port = 4040 } = parameters;
@@ -48,8 +49,8 @@ exports.sharedProviders = [
48
49
  staticServer: tokens_2.STATIC_SERVER_TOKEN,
49
50
  parameters: tokens_2.COMMAND_PARAMETERS_TOKEN,
50
51
  },
51
- },
52
- {
52
+ }),
53
+ (0, dippy_1.provide)({
53
54
  provide: tokens_1.CLOSE_HANDLER_TOKEN,
54
55
  multi: true,
55
56
  useFactory: ({ staticServer }) => {
@@ -60,8 +61,8 @@ exports.sharedProviders = [
60
61
  deps: {
61
62
  staticServer: tokens_2.STATIC_SERVER_TOKEN,
62
63
  },
63
- },
64
- {
64
+ }),
65
+ (0, dippy_1.provide)({
65
66
  provide: tokens_1.CLOSE_HANDLER_TOKEN,
66
67
  multi: true,
67
68
  useFactory: ({ configManager }) => {
@@ -72,6 +73,6 @@ exports.sharedProviders = [
72
73
  deps: {
73
74
  configManager: tokens_2.CONFIG_MANAGER_TOKEN,
74
75
  },
75
- },
76
+ }),
76
77
  ];
77
78
  //# sourceMappingURL=shared.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/module/shared.ts"],"names":[],"mappings":";;;;AACA,yCAAuE;AACvE,kDAK+B;AAG/B,oEAAiE;AACjE,+EAA0F;AAC1F,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AAE3C,QAAA,eAAe,GAAwB;IAClD;QACE,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EACX,WAAW,EACX,UAAU,GAIX,EAAE,EAAE;;YACH,OAAO,IAAI,6BAAa,CAAC,WAAW,kCAC/B,UAAU,KACb,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,MAAA,UAAU,CAAC,IAAI,mCAAI,IAAI,EAC7B,SAAS,EAAE,QAAQ,IACnB,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB;IACD;QACE,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EACX,YAAY,EACZ,UAAU,GAIX,EAAE,EAAE;YACH,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,IAAI,GAAG,WAAW,EAAE,IAAI,GAAG,IAAI,EAAE,GAAG,UAAU,CAAC;oBAEvD,IAAI;wBACF,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;qBAC9C;oBAAC,OAAO,KAAK,EAAE;wBACd,IAAK,KAAa,CAAC,IAAI,KAAK,YAAY,EAAE;4BACxC,MAAM,IAAI,KAAK,CACb,YAAY,IAAI,IAAI,IAAI,iEAAiE,CAC1F,CAAC;yBACH;wBAED,MAAM,KAAK,CAAC;qBACb;gBACH,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,UAAU,EAAE,iCAAwB;SACrC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAgD,EAAE,EAAE;YAC7E,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAkD,EAAE,EAAE;YAChF,OAAO,GAAS,EAAE;gBAChB,IAAA,uCAAyB,EAAC,aAAa,CAAC,CAAC;YAC3C,CAAC,CAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF;CACO,CAAC"}
1
+ {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/module/shared.ts"],"names":[],"mappings":";;;;AACA,0CAAyC;AACzC,yCAAuE;AACvE,kDAK+B;AAE/B,oEAAuE;AACvE,+EAA0F;AAC1F,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AAG3C,QAAA,eAAe,GAAwB;IAClD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;;YAC1C,OAAO,IAAA,mCAAmB,EAAC,WAAgC,kCACtD,UAAU,KACb,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,MAAA,UAAU,CAAC,IAAI,mCAAI,IAAI,EAC7B,SAAS,EAAE,QAAQ,IACnB,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,EAAE;YAC3C,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,IAAI,GAAG,WAAW,EAAE,IAAI,GAAG,IAAI,EAAE,GAAG,UAAU,CAAC;oBAEvD,IAAI;wBACF,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;qBAC9C;oBAAC,OAAO,KAAK,EAAE;wBACd,IAAK,KAAa,CAAC,IAAI,KAAK,YAAY,EAAE;4BACxC,MAAM,IAAI,KAAK,CACb,YAAY,IAAI,IAAI,IAAI,iEAAiE,CAC1F,CAAC;yBACH;wBAED,MAAM,KAAK,CAAC;qBACb;gBACH,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;YAC/B,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE;YAChC,OAAO,GAAS,EAAE;gBAChB,IAAA,uCAAyB,EAAC,aAAa,CAAC,CAAC;YAC3C,CAAC,CAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;CACM,CAAC"}
@@ -6,6 +6,7 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
6
6
  const formatting_1 = require("../../../utils/formatting");
7
7
  const tokens_1 = require("../../../di/tokens");
8
8
  const tips_1 = require("./tips");
9
+ const validate_1 = require("../../../config/validate");
9
10
  const label = (name) => chalk_1.default.bold.cyan(`▸ ${name}:`);
10
11
  const link = (url) => chalk_1.default.underline.blue(url);
11
12
  function showBanner(di) {
@@ -21,8 +22,8 @@ function showBanner(di) {
21
22
  titleLines.push(`${label('Type')} ${config.type}`);
22
23
  }
23
24
  titleLines.push(`${label('Modern')} ${config.modern}`);
24
- titleLines.push(`${label('ReactRefresh')} ${config.hotRefresh}`);
25
- if (config.build.configurations.fileSystemPages.enable) {
25
+ titleLines.push(`${label('ReactRefresh')} ${config.hotRefresh.enabled}`);
26
+ if ((0, validate_1.isApplication)(config) && config.fileSystemPages.enabled) {
26
27
  titleLines.push(`${label('FileSystemPages')} true`);
27
28
  }
28
29
  const server = `http://${config.host.replace('0.0.0.0', 'localhost')}:${config.port}`;
@@ -1 +1 @@
1
- {"version":3,"file":"banner.js","sourceRoot":"","sources":["../../../../src/api/start/utils/banner.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"banner.js","sourceRoot":"","sources":["../../../../src/api/start/utils/banner.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,7 @@ const path_1 = tslib_1.__importDefault(require("path"));
6
6
  const fs_extra_1 = require("fs-extra");
7
7
  const resolve_1 = require("resolve");
8
8
  const tokens_1 = require("../../../../di/tokens");
9
+ const validate_1 = require("../../../../config/validate");
9
10
  const DEFAULT_ROOT_DIR = process.cwd();
10
11
  const safeRequireResolve = (id, rootDir = DEFAULT_ROOT_DIR) => {
11
12
  try {
@@ -21,10 +22,9 @@ exports.tips = [
21
22
  Consider to test out swc support.`,
22
23
  docLink: 'references/cli/experiments#swc',
23
24
  isApplicable(di) {
24
- var _a, _b, _c, _d, _e, _f;
25
+ var _a, _b;
25
26
  const configManager = di.get(tokens_1.CONFIG_MANAGER_TOKEN);
26
- return (((_c = (_b = (_a = configManager.serve.configurations) === null || _a === void 0 ? void 0 : _a.experiments) === null || _b === void 0 ? void 0 : _b.transpilation) === null || _c === void 0 ? void 0 : _c.loader) !== 'swc' &&
27
- ((_f = (_e = (_d = configManager.build.configurations) === null || _d === void 0 ? void 0 : _d.experiments) === null || _e === void 0 ? void 0 : _e.transpilation) === null || _f === void 0 ? void 0 : _f.loader) !== 'swc');
27
+ return ((_b = (_a = configManager.experiments) === null || _a === void 0 ? void 0 : _a.transpilation) === null || _b === void 0 ? void 0 : _b.loader) !== 'swc';
28
28
  },
29
29
  },
30
30
  {
@@ -40,7 +40,7 @@ Consider to test out swc support.`,
40
40
  docLink: 'references/cli/start/#react-hot-refresh',
41
41
  isApplicable(di) {
42
42
  const configManager = di.get(tokens_1.CONFIG_MANAGER_TOKEN);
43
- return configManager.hotRefresh !== true;
43
+ return configManager.hotRefresh.enabled !== true;
44
44
  },
45
45
  },
46
46
  {
@@ -50,8 +50,11 @@ It may reduce the boilerplate code required with bundles`,
50
50
  isApplicable(di) {
51
51
  const configManager = di.get(tokens_1.CONFIG_MANAGER_TOKEN);
52
52
  const { rootDir, root } = configManager;
53
- const { fileSystemPages } = configManager.build.configurations;
54
- if (!fileSystemPages.enable) {
53
+ if (!(0, validate_1.isApplication)(configManager)) {
54
+ return false;
55
+ }
56
+ const { fileSystemPages } = configManager;
57
+ if (!fileSystemPages.enabled) {
55
58
  return true;
56
59
  }
57
60
  const routesDir = path_1.default.resolve(rootDir, root, fileSystemPages.routesDir || '');
@@ -96,9 +99,8 @@ Check out our guide how to use typescript with tramvai`,
96
99
  So you can remove alias config from tramvai.json`,
97
100
  docLink: 'references/cli/base#how-to-enable-paths-mapping',
98
101
  isApplicable(di) {
99
- var _a;
100
102
  const configManager = di.get(tokens_1.CONFIG_MANAGER_TOKEN);
101
- return !!((_a = configManager.build.configurations) === null || _a === void 0 ? void 0 : _a.alias);
103
+ return !!configManager.alias;
102
104
  },
103
105
  },
104
106
  {
@@ -1 +1 @@
1
- {"version":3,"file":"tips.js","sourceRoot":"","sources":["../../../../../src/api/start/utils/tips/tips.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tips.js","sourceRoot":"","sources":["../../../../../src/api/start/utils/tips/tips.ts"],"names":[],"mappings":"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"}
@@ -6,16 +6,16 @@ const path_1 = tslib_1.__importDefault(require("path"));
6
6
  const dippy_1 = require("@tinkoff/dippy");
7
7
  const child_process_1 = require("child_process");
8
8
  const tokens_1 = require("../../../di/tokens");
9
- const index_1 = require("../../index");
10
9
  const tokens_2 = require("../tokens");
11
10
  const constants_1 = require("../../../config/constants");
12
11
  const safeRequire_1 = require("../../../utils/safeRequire");
12
+ const configManager_1 = require("../../../config/configManager");
13
13
  exports.applicationsProviders = [
14
14
  (0, dippy_1.provide)({
15
15
  provide: tokens_1.CONFIG_MANAGER_TOKEN,
16
16
  useFactory: ({ configEntry, parameters }) => {
17
17
  var _a, _b;
18
- return new index_1.ConfigManager(configEntry, Object.assign(Object.assign({}, parameters), { env: 'production', port: (_a = parameters.port) !== null && _a !== void 0 ? _a : 3000, staticPort: (_b = parameters.staticPort) !== null && _b !== void 0 ? _b : 4000, buildType: 'client' }));
18
+ return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { env: 'production', port: (_a = parameters.port) !== null && _a !== void 0 ? _a : 3000, staticPort: (_b = parameters.staticPort) !== null && _b !== void 0 ? _b : 4000, buildType: 'client' }));
19
19
  },
20
20
  deps: {
21
21
  configEntry: tokens_1.CONFIG_ENTRY_TOKEN,
@@ -30,12 +30,12 @@ exports.applicationsProviders = [
30
30
  const serverConfigManager = configManager.withSettings({
31
31
  buildType: 'server',
32
32
  });
33
- const { debug, port, staticPort, staticHost, build: { options: { outputClient }, }, } = serverConfigManager;
34
- const root = serverConfigManager.getBuildPath();
33
+ const { debug, port, staticPort, staticHost, output } = serverConfigManager;
34
+ const root = serverConfigManager.buildPath;
35
35
  return (0, child_process_1.fork)(path_1.default.resolve(root, 'server.js'), [], {
36
36
  execArgv: debug ? constants_1.DEBUG_ARGV : [],
37
37
  cwd: root,
38
- env: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (0, safeRequire_1.safeRequire)(path_1.default.resolve(process.cwd(), 'env.development'), true)), (0, safeRequire_1.safeRequire)(path_1.default.resolve(process.cwd(), 'env'), true)), env), process.env), { NODE_ENV: 'production', PORT: `${port}`, PORT_SERVER: `${port}`, ASSETS_PREFIX: (_a = process.env.ASSETS_PREFIX) !== null && _a !== void 0 ? _a : `http://${staticHost}:${staticPort}/${outputClient.replace(/\/$/, '')}/` }),
38
+ env: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (0, safeRequire_1.safeRequire)(path_1.default.resolve(process.cwd(), 'env.development'), true)), (0, safeRequire_1.safeRequire)(path_1.default.resolve(process.cwd(), 'env'), true)), env), process.env), { NODE_ENV: 'production', PORT: `${port}`, PORT_SERVER: `${port}`, ASSETS_PREFIX: (_a = process.env.ASSETS_PREFIX) !== null && _a !== void 0 ? _a : `http://${staticHost}:${staticPort}/${output.client.replace(/\/$/, '')}/` }),
39
39
  });
40
40
  },
41
41
  deps: {