@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
@@ -3,13 +3,14 @@ import rimraf from 'rimraf';
3
3
  import type { ConfigManager } from '../config/configManager';
4
4
  import { npmRequire } from './npmRequire';
5
5
  import type { Context } from '../models/context';
6
+ import type { CliConfigEntry } from '../typings/configEntry/cli';
6
7
 
7
- export default (configManager: ConfigManager, config, context: Context) => {
8
- rimraf.sync(`${configManager.getBuildPath()}/*.*`, {});
8
+ export default (configManager: ConfigManager<CliConfigEntry>, config, context: Context) => {
9
+ rimraf.sync(`${configManager.buildPath}/*.*`, {});
9
10
 
10
11
  // eslint-disable-next-line no-async-promise-executor
11
12
  return new Promise<void>(async (resolve, reject) => {
12
- if (configManager.build?.configurations?.imageOptimization?.enabled) {
13
+ if (configManager.imageOptimization?.enabled) {
13
14
  await npmRequire({
14
15
  cliRootDir: context.cliRootDir,
15
16
  packageManager: context.cliPackageManager,
@@ -1,37 +0,0 @@
1
- import type webpack from 'webpack';
2
- import type { Compiler, Module } from 'webpack';
3
- declare module 'webpack' {
4
- interface Module {
5
- resource: string;
6
- }
7
- }
8
- export interface NMFResult {
9
- resourceResolveData?: {
10
- descriptionFileData?: {
11
- name?: string;
12
- version?: string;
13
- };
14
- relativePath?: string;
15
- };
16
- }
17
- export type DeduplicateStrategy = 'equality' | 'semver';
18
- export declare class DedupePlugin {
19
- private readonly strategy;
20
- private readonly ignorePackages?;
21
- private cache;
22
- private versions;
23
- private logs;
24
- constructor(strategy: DeduplicateStrategy, ignorePackages?: RegExp[]);
25
- isIgnoredModule(result: NMFResult): boolean;
26
- addToCache(key: string, module: Module): void;
27
- setVersion(module: Module, version: string): void;
28
- compareModuleVersions(module1: Module, module2: Module): 0 | 1 | -1;
29
- pickBetterModule(module1: Module, module2: Module): webpack.Module;
30
- deduplicateCache(compilation: webpack.Compilation): WeakMap<webpack.Module, webpack.Module>;
31
- optimizeModules(compilation: webpack.Compilation): void;
32
- apply(compiler: Compiler): void;
33
- logDeduplicationInfo(cacheKey: string, fromModule: Module, toModule: Module): void;
34
- flushLogs(): void;
35
- }
36
- export declare function createDedupePlugin(strategy: DeduplicateStrategy, ignorePackages?: RegExp[]): DedupePlugin;
37
- export declare function createCacheKeyFromNMFResult(nmfResult: NMFResult, useSemver?: boolean): string | null;
@@ -1,241 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.createCacheKeyFromNMFResult = exports.createDedupePlugin = exports.DedupePlugin = void 0;
4
- const tslib_1 = require("tslib");
5
- const path_1 = require("path");
6
- const semver_1 = require("semver");
7
- const chalk_1 = tslib_1.__importDefault(require("chalk"));
8
- const cwd = process.cwd();
9
- const PLUGIN_NAME = 'DedupePlugin';
10
- class DedupePlugin {
11
- constructor(strategy, ignorePackages) {
12
- this.cache = new Map();
13
- this.versions = new Map();
14
- this.logs = new Map();
15
- this.strategy = strategy;
16
- this.ignorePackages = ignorePackages;
17
- }
18
- // функция проверяет находится ли данный модуль в списке исключений
19
- isIgnoredModule(result) {
20
- if (!this.ignorePackages) {
21
- return false;
22
- }
23
- const name = getResourceName(result);
24
- if (!name) {
25
- return false;
26
- }
27
- for (const regexp of this.ignorePackages) {
28
- if (regexp.test(name)) {
29
- return true;
30
- }
31
- }
32
- return false;
33
- }
34
- // собираем в один сет модули под одним ключом
35
- addToCache(key, module) {
36
- const id = module.identifier();
37
- if (this.cache.has(key)) {
38
- this.cache.get(key).add(id);
39
- }
40
- else {
41
- this.cache.set(key, new Set([id]));
42
- }
43
- }
44
- // нам нужно запомнить версию библиотеки, т.к. в самих модулях эта информация не хранится
45
- setVersion(module, version) {
46
- this.versions.set(module.identifier(), version);
47
- }
48
- compareModuleVersions(module1, module2) {
49
- const version1 = this.versions.get(module1.identifier());
50
- const version2 = this.versions.get(module2.identifier());
51
- return (0, semver_1.parse)(version1).compare(version2);
52
- }
53
- // из двух модулей выбирает один по следующии принципам
54
- // 1. модуль у которого версия выше по семверу
55
- // 2. модуль у которого путь к файлу самый короткий
56
- // 3. если все выше равно, просто сравниваем через сравнение строк лексикографически
57
- pickBetterModule(module1, module2) {
58
- const versionCompare = this.compareModuleVersions(module1, module2);
59
- if (versionCompare > 0) {
60
- return module1;
61
- }
62
- if (versionCompare < 0) {
63
- return module2;
64
- }
65
- const pathLengthDiff = module1.resource.length - module2.resource.length ||
66
- module1.resource.localeCompare(module2.resource);
67
- if (pathLengthDiff > 0) {
68
- return module2;
69
- }
70
- return module1;
71
- }
72
- // создать маппинг модуль -> модуль в который должен дедуплицироваться данный модуль
73
- deduplicateCache(compilation) {
74
- const dedupLinks = new WeakMap();
75
- for (const [k, v] of this.cache) {
76
- if (v.size <= 1) {
77
- // игнорируем список где один модуль, т.к. это не дедуплицируется =)
78
- continue;
79
- }
80
- let bestModule;
81
- for (const moduleId of v) {
82
- const module = compilation.findModule(moduleId);
83
- bestModule = bestModule !== null && bestModule !== void 0 ? bestModule : module;
84
- bestModule = this.pickBetterModule(bestModule, module);
85
- }
86
- for (const moduleId of v) {
87
- const module = compilation.findModule(moduleId);
88
- // для всех модулей в множестве выставляем ссылку на модуль в который все они должны дедуплицироваться
89
- if (module !== bestModule) {
90
- dedupLinks.set(module, bestModule);
91
- // запоминаем выбор лучшего модуля на будущее для логирования
92
- this.logDeduplicationInfo(k, module, bestModule);
93
- }
94
- }
95
- }
96
- return dedupLinks;
97
- }
98
- // получить оптимизированный список модулей
99
- optimizeModules(compilation) {
100
- const { modules, moduleGraph } = compilation;
101
- const dedupLinks = this.deduplicateCache(compilation);
102
- for (const module of modules) {
103
- if (dedupLinks.has(module)) {
104
- const deduped = dedupLinks.get(module);
105
- // удаляем текущий модуль из компиляции - его место займет deduped
106
- modules.delete(module);
107
- moduleGraph.moveModuleConnections(module, deduped, (connection) => {
108
- // переносим только связи которые идут в дедуплицированный модуль
109
- // т.о. все связи будут направлены в один лучший модуль, а отброшенные не будут ни с чем связаны
110
- return connection.originModule !== module;
111
- });
112
- }
113
- }
114
- }
115
- apply(compiler) {
116
- let called = false;
117
- // этот хук будет вызываться при каждом создании компилятора, но это создает дубли модулей,
118
- // с которыми пока непонятно что делать, поэтому просто игнорируем childCompiler
119
- compiler.hooks.normalModuleFactory.tap(PLUGIN_NAME, (nmf) => {
120
- if (called) {
121
- return;
122
- }
123
- called = true;
124
- nmf.hooks.module.tap(PLUGIN_NAME, (module, result) => {
125
- // игнорируем все что вне node_modules, т.к. вряд-ли это нужно дедуплицировать или если модуль игнорируем
126
- if (!module.resource.includes('node_modules') || this.isIgnoredModule(result)) {
127
- return;
128
- }
129
- const cacheKey = createCacheKeyFromNMFResult(result, this.strategy === 'semver');
130
- // что же, на удивление, некоторые пакеты в node_modules не имеют имени или версии в описании
131
- // привет, https://github.com/babel/babel/blob/main/packages/babel-runtime/helpers/esm/package.json
132
- if (cacheKey) {
133
- this.addToCache(cacheKey, module);
134
- this.setVersion(module, getResourceVersion(result));
135
- }
136
- return module;
137
- });
138
- });
139
- // thisCompilation вызывается только один раз, в рутовом компиляторе
140
- // а compilation вызывается для каждого компилятора, пока фокусируемся только на рутовом
141
- // привет, https://github.com/faceyspacey/extract-css-chunks-webpack-plugin/blob/master/src/loader.js#L82
142
- compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
143
- compilation.hooks.optimizeDependencies.tap(PLUGIN_NAME, () => {
144
- this.optimizeModules(compilation);
145
- });
146
- });
147
- // done также вызывается только в рутовом компиляторе
148
- compiler.hooks.done.tap(PLUGIN_NAME, () => {
149
- this.flushLogs();
150
- });
151
- }
152
- logDeduplicationInfo(cacheKey, fromModule, toModule) {
153
- var _a;
154
- const splitted = cacheKey.split('@');
155
- const fromVersion = this.versions.get(fromModule.identifier());
156
- const toVersion = this.versions.get(toModule.identifier());
157
- const fromPath = getRelativePathFromCwd(fromModule.resource);
158
- const toPath = getRelativePathFromCwd(toModule.resource);
159
- // учитываем scoped пакеты
160
- const name = splitted[0] || `@${splitted[1]}`;
161
- const key = `${name}@${toVersion}:${toPath}`;
162
- let { deduped } = (_a = this.logs.get(key)) !== null && _a !== void 0 ? _a : {};
163
- if (!deduped) {
164
- deduped = [];
165
- this.logs.set(key, {
166
- name,
167
- toVersion,
168
- toPath,
169
- deduped,
170
- });
171
- }
172
- deduped.push({
173
- fromVersion,
174
- fromPath,
175
- });
176
- }
177
- flushLogs() {
178
- const keys = [...this.logs.keys()].sort();
179
- let log = `\n${chalk_1.default.blue('Deduplicated modules:')}\n`;
180
- for (const key of keys) {
181
- const { name, toVersion, toPath, deduped } = this.logs.get(key);
182
- log += `\tDeduped to ${chalk_1.default.cyanBright(name)}@${chalk_1.default.green(toVersion)}:${chalk_1.default.bgGray(toPath)}\n`;
183
- for (const { fromPath, fromVersion } of deduped) {
184
- log += `\t\tfrom ${chalk_1.default.red(fromVersion)}:${chalk_1.default.bgGray(fromPath)}\n`;
185
- }
186
- log += '\n';
187
- }
188
- if (keys.length === 0) {
189
- log += ' no duplicates found';
190
- }
191
- console.warn(log);
192
- }
193
- }
194
- exports.DedupePlugin = DedupePlugin;
195
- function createDedupePlugin(strategy, ignorePackages) {
196
- return new DedupePlugin(strategy, ignorePackages);
197
- }
198
- exports.createDedupePlugin = createDedupePlugin;
199
- function createCacheKeyFromNMFResult(nmfResult, useSemver = false) {
200
- const name = getResourceName(nmfResult);
201
- const version = getResourceVersion(nmfResult);
202
- if (!name || !version) {
203
- return null;
204
- }
205
- // если semver то используем только мажорную версию пакета
206
- // если нет, то оставляем полную версию
207
- const versionForCache = useSemver ? buildCacheVersionFromNMFResult(nmfResult) : version;
208
- // ключ = имя + версия + путь к исходному файлу относительно корня либы
209
- return `${name}@${versionForCache}:${nmfResult.resourceResolveData.relativePath}`;
210
- }
211
- exports.createCacheKeyFromNMFResult = createCacheKeyFromNMFResult;
212
- /**
213
- * Получаем основную версию для зависимости по правилу semver `^version`
214
- *
215
- * Когда major версия равна 0, считаем что minor версия является мажорной.
216
- * Если и minor версия равна 0, считаем что patch версия является мажорной.
217
- */
218
- function buildCacheVersionFromNMFResult(nmfResult) {
219
- const version = getResourceVersion(nmfResult);
220
- const semver = (0, semver_1.parse)(version);
221
- const majorVersion = String(semver.major);
222
- const minorVersion = `0.${semver.minor}`;
223
- const patchVersion = `0.0.${semver.patch}`;
224
- const minor = semver.minor ? minorVersion : patchVersion;
225
- return semver.major ? majorVersion : minor;
226
- }
227
- // получаем поле `name` из package.json
228
- function getResourceName(nmfResult) {
229
- var _a, _b;
230
- return (_b = (_a = nmfResult === null || nmfResult === void 0 ? void 0 : nmfResult.resourceResolveData) === null || _a === void 0 ? void 0 : _a.descriptionFileData) === null || _b === void 0 ? void 0 : _b.name;
231
- }
232
- // получаем поле `version` из package.json
233
- function getResourceVersion(nmfResult) {
234
- var _a, _b;
235
- return (_b = (_a = nmfResult === null || nmfResult === void 0 ? void 0 : nmfResult.resourceResolveData) === null || _a === void 0 ? void 0 : _a.descriptionFileData) === null || _b === void 0 ? void 0 : _b.version;
236
- }
237
- // получаем относительный путь от корня вместо абсолютного
238
- function getRelativePathFromCwd(path) {
239
- return (0, path_1.relative)(cwd, path);
240
- }
241
- //# sourceMappingURL=DedupePlugin.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"DedupePlugin.js","sourceRoot":"","sources":["../../../../../src/library/webpack/plugins/DedupePlugin/DedupePlugin.ts"],"names":[],"mappings":";;;;AAAA,+BAAgC;AAIhC,mCAA+B;AAC/B,0DAA0B;AAE1B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;AA0B1B,MAAM,WAAW,GAAG,cAAc,CAAC;AAEnC,MAAa,YAAY;IAevB,YAAY,QAA6B,EAAE,cAAyB;QAZ5D,UAAK,GAA6B,IAAI,GAAG,EAAE,CAAC;QAC5C,aAAQ,GAAwB,IAAI,GAAG,EAAE,CAAC;QAC1C,SAAI,GAQR,IAAI,GAAG,EAAE,CAAC;QAGZ,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAED,mEAAmE;IACnE,eAAe,CAAC,MAAiB;QAC/B,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACxB,OAAO,KAAK,CAAC;SACd;QAED,MAAM,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QAErC,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,KAAK,CAAC;SACd;QAED,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,cAAc,EAAE;YACxC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACrB,OAAO,IAAI,CAAC;aACb;SACF;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED,8CAA8C;IAC9C,UAAU,CAAC,GAAW,EAAE,MAAc;QACpC,MAAM,EAAE,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QAE/B,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACvB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;SAC7B;aAAM;YACL,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SACpC;IACH,CAAC;IAED,yFAAyF;IACzF,UAAU,CAAC,MAAc,EAAE,OAAe;QACxC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,qBAAqB,CAAC,OAAe,EAAE,OAAe;QACpD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;QACzD,OAAO,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED,uDAAuD;IACvD,8CAA8C;IAC9C,mDAAmD;IACnD,oFAAoF;IACpF,gBAAgB,CAAC,OAAe,EAAE,OAAe;QAC/C,MAAM,cAAc,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACpE,IAAI,cAAc,GAAG,CAAC,EAAE;YACtB,OAAO,OAAO,CAAC;SAChB;QACD,IAAI,cAAc,GAAG,CAAC,EAAE;YACtB,OAAO,OAAO,CAAC;SAChB;QACD,MAAM,cAAc,GAClB,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM;YACjD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,cAAc,GAAG,CAAC,EAAE;YACtB,OAAO,OAAO,CAAC;SAChB;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,oFAAoF;IACpF,gBAAgB,CAAC,WAAgC;QAC/C,MAAM,UAAU,GAAG,IAAI,OAAO,EAAkB,CAAC;QAEjD,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE;YAC/B,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,EAAE;gBACf,oEAAoE;gBACpE,SAAS;aACV;YACD,IAAI,UAAkB,CAAC;YACvB,KAAK,MAAM,QAAQ,IAAI,CAAC,EAAE;gBACxB,MAAM,MAAM,GAAG,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;gBAEhD,UAAU,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,MAAM,CAAC;gBAClC,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;aACxD;YACD,KAAK,MAAM,QAAQ,IAAI,CAAC,EAAE;gBACxB,MAAM,MAAM,GAAG,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;gBAEhD,sGAAsG;gBACtG,IAAI,MAAM,KAAK,UAAU,EAAE;oBACzB,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;oBACnC,6DAA6D;oBAC7D,IAAI,CAAC,oBAAoB,CAAC,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;iBAClD;aACF;SACF;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,2CAA2C;IAC3C,eAAe,CAAC,WAAgC;QAC9C,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,WAAW,CAAC;QAC7C,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAEtD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBAC1B,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,MAAgB,CAAC,CAAC;gBAEjD,kEAAkE;gBAClE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBACvB,WAAW,CAAC,qBAAqB,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,UAAU,EAAE,EAAE;oBAChE,iEAAiE;oBACjE,gGAAgG;oBAChG,OAAO,UAAU,CAAC,YAAY,KAAK,MAAM,CAAC;gBAC5C,CAAC,CAAC,CAAC;aACJ;SACF;IACH,CAAC;IAED,KAAK,CAAC,QAAkB;QACtB,IAAI,MAAM,GAAG,KAAK,CAAC;QAEnB,2FAA2F;QAC3F,gFAAgF;QAChF,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,GAAG,EAAE,EAAE;YAC1D,IAAI,MAAM,EAAE;gBACV,OAAO;aACR;YAED,MAAM,GAAG,IAAI,CAAC;YAEd,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,MAAc,EAAE,MAAiB,EAAE,EAAE;gBACtE,yGAAyG;gBACzG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE;oBAC7E,OAAO;iBACR;gBAED,MAAM,QAAQ,GAAG,2BAA2B,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;gBACjF,6FAA6F;gBAC7F,mGAAmG;gBACnG,IAAI,QAAQ,EAAE;oBACZ,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;oBAClC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;iBACrD;gBAED,OAAO,MAAM,CAAC;YAChB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,oEAAoE;QACpE,wFAAwF;QACxF,yGAAyG;QACzG,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,EAAE;YAC9D,WAAW,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,WAAW,EAAE,GAAG,EAAE;gBAC3D,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,qDAAqD;QACrD,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,GAAG,EAAE;YACxC,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,oBAAoB,CAAC,QAAgB,EAAE,UAAkB,EAAE,QAAgB;;QACzE,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACrC,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC;QAC/D,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,sBAAsB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,sBAAsB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACzD,0BAA0B;QAC1B,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9C,MAAM,GAAG,GAAG,GAAG,IAAI,IAAI,SAAS,IAAI,MAAM,EAAE,CAAC;QAC7C,IAAI,EAAE,OAAO,EAAE,GAAG,MAAA,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,mCAAI,EAAE,CAAC;QAC3C,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE;gBACjB,IAAI;gBACJ,SAAS;gBACT,MAAM;gBACN,OAAO;aACR,CAAC,CAAC;SACJ;QACD,OAAO,CAAC,IAAI,CAAC;YACX,WAAW;YACX,QAAQ;SACT,CAAC,CAAC;IACL,CAAC;IAED,SAAS;QACP,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC1C,IAAI,GAAG,GAAG,KAAK,eAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC;QACvD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAChE,GAAG,IAAI,gBAAgB,eAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,eAAK,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,eAAK,CAAC,MAAM,CACrF,MAAM,CACP,IAAI,CAAC;YACN,KAAK,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,OAAO,EAAE;gBAC/C,GAAG,IAAI,YAAY,eAAK,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,eAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;aACzE;YACD,GAAG,IAAI,IAAI,CAAC;SACb;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,GAAG,IAAI,wBAAwB,CAAC;SACjC;QACD,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC;CACF;AA5ND,oCA4NC;AAED,SAAgB,kBAAkB,CAAC,QAA6B,EAAE,cAAyB;IACzF,OAAO,IAAI,YAAY,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;AACpD,CAAC;AAFD,gDAEC;AAED,SAAgB,2BAA2B,CACzC,SAAoB,EACpB,SAAS,GAAG,KAAK;IAEjB,MAAM,IAAI,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE;QACrB,OAAO,IAAI,CAAC;KACb;IACD,0DAA0D;IAC1D,uCAAuC;IACvC,MAAM,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC,8BAA8B,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IACxF,uEAAuE;IACvE,OAAO,GAAG,IAAI,IAAI,eAAe,IAAI,SAAS,CAAC,mBAAmB,CAAC,YAAY,EAAE,CAAC;AACpF,CAAC;AAdD,kEAcC;AAED;;;;;GAKG;AACH,SAAS,8BAA8B,CAAC,SAAoB;IAC1D,MAAM,OAAO,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,CAAC;IAC9B,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG,KAAK,MAAM,CAAC,KAAK,EAAE,CAAC;IACzC,MAAM,YAAY,GAAG,OAAO,MAAM,CAAC,KAAK,EAAE,CAAC;IAC3C,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC;IACzD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC;AAC7C,CAAC;AAED,uCAAuC;AACvC,SAAS,eAAe,CAAC,SAAoB;;IAC3C,OAAO,MAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,mBAAmB,0CAAE,mBAAmB,0CAAE,IAAI,CAAC;AACnE,CAAC;AAED,0CAA0C;AAC1C,SAAS,kBAAkB,CAAC,SAAoB;;IAC9C,OAAO,MAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,mBAAmB,0CAAE,mBAAmB,0CAAE,OAAO,CAAC;AACtE,CAAC;AAED,0DAA0D;AAC1D,SAAS,sBAAsB,CAAC,IAAY;IAC1C,OAAO,IAAA,eAAQ,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AAC7B,CAAC"}
@@ -1 +0,0 @@
1
- export { createDedupePlugin, DeduplicateStrategy } from './DedupePlugin';
@@ -1,6 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.createDedupePlugin = void 0;
4
- var DedupePlugin_1 = require("./DedupePlugin");
5
- Object.defineProperty(exports, "createDedupePlugin", { enumerable: true, get: function () { return DedupePlugin_1.createDedupePlugin; } });
6
- //# sourceMappingURL=index.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/library/webpack/plugins/DedupePlugin/index.ts"],"names":[],"mappings":";;;AAAA,+CAAyE;AAAhE,kHAAA,kBAAkB,OAAA"}
@@ -1,13 +0,0 @@
1
- import type { ForkTsCheckerWebpackPluginOptions } from 'fork-ts-checker-webpack-plugin/lib/ForkTsCheckerWebpackPluginOptions';
2
- export interface CheckAsyncTsConfig {
3
- /**
4
- * при включении этого флага в build-сборку добавляется проверка типов
5
- * при невалидных типах сборка падает
6
- */
7
- failOnBuild?: boolean;
8
- /**
9
- * дополнительные опции
10
- * @link https://github.com/TypeStrong/fork-ts-checker-webpack-plugin
11
- */
12
- pluginOptions?: Partial<ForkTsCheckerWebpackPluginOptions>;
13
- }
@@ -1 +0,0 @@
1
- {"version":3,"file":"CheckAsyncTsConfig.js","sourceRoot":"","sources":["../../../src/typings/configEntry/CheckAsyncTsConfig.ts"],"names":[],"mappings":""}
@@ -1,95 +0,0 @@
1
- import type { NMFResult } from './DedupePlugin';
2
- import { createCacheKeyFromNMFResult } from './DedupePlugin';
3
-
4
- const resourceWithoutData: NMFResult = {};
5
-
6
- const resourceWithoutVersion: NMFResult = {
7
- resourceResolveData: {
8
- descriptionFileData: {
9
- name: 'app',
10
- },
11
- },
12
- };
13
-
14
- const resourceMajorLongRequest: NMFResult = {
15
- resourceResolveData: {
16
- descriptionFileData: {
17
- name: '@tinkoff/utils',
18
- version: '1.0.0',
19
- },
20
- relativePath: './is/array.js',
21
- },
22
- };
23
-
24
- const resourceMinorLongRequest: NMFResult = {
25
- resourceResolveData: {
26
- descriptionFileData: {
27
- name: '@tinkoff/utils',
28
- version: '0.1.0',
29
- },
30
- relativePath: './is/array.js',
31
- },
32
- };
33
-
34
- const resourcePatchLongRequest: NMFResult = {
35
- resourceResolveData: {
36
- descriptionFileData: {
37
- name: '@tinkoff/utils',
38
- version: '0.0.1',
39
- },
40
- relativePath: './is/array.js',
41
- },
42
- };
43
-
44
- describe('DedupePlugin', () => {
45
- describe('createCacheKeyFromNMFResult', () => {
46
- it('Возвращает null для ресурса без версии и названия', () => {
47
- expect(createCacheKeyFromNMFResult(resourceWithoutData)).toBe(null);
48
- });
49
-
50
- it('Возвращает null для ресурса без версии', () => {
51
- expect(createCacheKeyFromNMFResult(resourceWithoutVersion)).toBe(null);
52
- });
53
-
54
- it('Генерирует корректный ключ для ресурса с major версией', () => {
55
- expect(createCacheKeyFromNMFResult(resourceMajorLongRequest)).toBe(
56
- '@tinkoff/utils@1.0.0:./is/array.js'
57
- );
58
- expect(createCacheKeyFromNMFResult(resourceMajorLongRequest, true)).toBe(
59
- '@tinkoff/utils@1:./is/array.js'
60
- );
61
- });
62
-
63
- it('Генерирует корректный ключ для ресурса с minor версией', () => {
64
- expect(createCacheKeyFromNMFResult(resourceMinorLongRequest)).toBe(
65
- '@tinkoff/utils@0.1.0:./is/array.js'
66
- );
67
- expect(createCacheKeyFromNMFResult(resourceMinorLongRequest, true)).toBe(
68
- '@tinkoff/utils@0.1:./is/array.js'
69
- );
70
- });
71
-
72
- it('Генерирует корректный ключ для ресурса с patch версией', () => {
73
- expect(createCacheKeyFromNMFResult(resourcePatchLongRequest)).toBe(
74
- '@tinkoff/utils@0.0.1:./is/array.js'
75
- );
76
- expect(createCacheKeyFromNMFResult(resourcePatchLongRequest, true)).toBe(
77
- '@tinkoff/utils@0.0.1:./is/array.js'
78
- );
79
- });
80
-
81
- it('[bugfix] генерирует корректный ключ для ресурса с вложенной библиотекой, при пересечении названий', () => {
82
- expect(
83
- createCacheKeyFromNMFResult({
84
- resourceResolveData: {
85
- descriptionFileData: {
86
- name: 'bar',
87
- version: '1.0.0',
88
- },
89
- relativePath: './bar/index.js',
90
- },
91
- })
92
- ).toBe('bar@1.0.0:./bar/index.js');
93
- });
94
- });
95
- });