@nrwl/angular 15.8.6 → 15.9.0-beta.1

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 (376) hide show
  1. package/generators.d.ts +2 -4
  2. package/generators.js +2 -4
  3. package/generators.js.map +1 -1
  4. package/generators.json +11 -39
  5. package/migrations.json +104 -1124
  6. package/package.json +10 -10
  7. package/plugins/component-testing.d.ts +1 -1
  8. package/src/builders/utilities/buildable-libs.d.ts +1 -1
  9. package/src/builders/utilities/buildable-libs.js +1 -1
  10. package/src/builders/utilities/buildable-libs.js.map +1 -1
  11. package/src/builders/webpack-browser/schema.d.ts +9 -0
  12. package/src/builders/webpack-browser/schema.json +1 -1
  13. package/src/builders/webpack-browser/validate-options.d.ts +2 -0
  14. package/src/builders/webpack-browser/validate-options.js +41 -0
  15. package/src/builders/webpack-browser/validate-options.js.map +1 -0
  16. package/src/builders/webpack-browser/webpack-browser.impl.d.ts +1 -7
  17. package/src/builders/webpack-browser/webpack-browser.impl.js +2 -9
  18. package/src/builders/webpack-browser/webpack-browser.impl.js.map +1 -1
  19. package/src/builders/webpack-dev-server/webpack-dev-server.impl.js +12 -15
  20. package/src/builders/webpack-dev-server/webpack-dev-server.impl.js.map +1 -1
  21. package/src/builders/webpack-server/schema.json +5 -0
  22. package/src/builders/webpack-server/validate-options.d.ts +2 -0
  23. package/src/builders/webpack-server/validate-options.js +34 -0
  24. package/src/builders/webpack-server/validate-options.js.map +1 -0
  25. package/src/builders/webpack-server/webpack-server.impl.js +5 -14
  26. package/src/builders/webpack-server/webpack-server.impl.js.map +1 -1
  27. package/src/executors/delegate-build/delegate-build.impl.js +1 -1
  28. package/src/executors/delegate-build/delegate-build.impl.js.map +1 -1
  29. package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js +1 -1
  30. package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js.map +1 -1
  31. package/src/executors/ng-packagr-lite/schema.json +1 -1
  32. package/src/executors/package/package.impl.d.ts +1 -1
  33. package/src/executors/package/package.impl.js +1 -1
  34. package/src/executors/package/package.impl.js.map +1 -1
  35. package/src/executors/package/schema.json +1 -1
  36. package/src/executors/utilities/angular-version-utils.d.ts +1 -2
  37. package/src/generators/add-linting/add-linting.js +1 -2
  38. package/src/generators/add-linting/add-linting.js.map +1 -1
  39. package/src/generators/add-linting/angular-v14/add-linting.js +1 -2
  40. package/src/generators/add-linting/angular-v14/add-linting.js.map +1 -1
  41. package/src/generators/add-linting/angular-v14/lib/create-eslint-configuration.js +5 -5
  42. package/src/generators/add-linting/angular-v14/lib/create-eslint-configuration.js.map +1 -1
  43. package/src/generators/add-linting/lib/create-eslint-configuration.js +5 -5
  44. package/src/generators/add-linting/lib/create-eslint-configuration.js.map +1 -1
  45. package/src/generators/application/angular-v14/lib/add-unit-test-runner.js +0 -7
  46. package/src/generators/application/angular-v14/lib/add-unit-test-runner.js.map +1 -1
  47. package/src/generators/application/angular-v14/lib/nrwl-home-tpl.js +26 -5
  48. package/src/generators/application/angular-v14/lib/nrwl-home-tpl.js.map +1 -1
  49. package/src/generators/application/angular-v14/lib/root-router-config.js +5 -5
  50. package/src/generators/application/angular-v14/lib/root-router-config.js.map +1 -1
  51. package/src/generators/application/angular-v14/lib/update-app-component-template.js +4 -4
  52. package/src/generators/application/angular-v14/lib/update-app-component-template.js.map +1 -1
  53. package/src/generators/application/angular-v14/lib/update-component-spec.js +6 -6
  54. package/src/generators/application/angular-v14/lib/update-component-spec.js.map +1 -1
  55. package/src/generators/application/angular-v14/lib/update-config-files.js +1 -1
  56. package/src/generators/application/angular-v14/lib/update-config-files.js.map +1 -1
  57. package/src/generators/application/angular-v14/lib/update-nx-component-template.js +5 -5
  58. package/src/generators/application/angular-v14/lib/update-nx-component-template.js.map +1 -1
  59. package/src/generators/application/lib/add-unit-test-runner.js +0 -7
  60. package/src/generators/application/lib/add-unit-test-runner.js.map +1 -1
  61. package/src/generators/application/lib/nrwl-home-tpl.js +26 -5
  62. package/src/generators/application/lib/nrwl-home-tpl.js.map +1 -1
  63. package/src/generators/application/lib/root-router-config.js +5 -5
  64. package/src/generators/application/lib/root-router-config.js.map +1 -1
  65. package/src/generators/application/lib/update-app-component-template.js +4 -4
  66. package/src/generators/application/lib/update-app-component-template.js.map +1 -1
  67. package/src/generators/application/lib/update-component-spec.js +6 -6
  68. package/src/generators/application/lib/update-component-spec.js.map +1 -1
  69. package/src/generators/application/lib/update-config-files.js +1 -1
  70. package/src/generators/application/lib/update-config-files.js.map +1 -1
  71. package/src/generators/application/lib/update-nx-component-template.js +5 -5
  72. package/src/generators/application/lib/update-nx-component-template.js.map +1 -1
  73. package/src/generators/application/schema.json +1 -1
  74. package/src/generators/component/component.js +3 -19
  75. package/src/generators/component/component.js.map +1 -1
  76. package/src/generators/component/lib/normalize-options.js +3 -24
  77. package/src/generators/component/lib/normalize-options.js.map +1 -1
  78. package/src/generators/component/schema.d.ts +1 -2
  79. package/src/generators/component/schema.json +3 -0
  80. package/src/generators/component-cypress-spec/schema.json +3 -0
  81. package/src/generators/component-test/schema.json +3 -0
  82. package/src/generators/cypress-component-configuration/schema.json +3 -0
  83. package/src/generators/directive/directive.d.ts +4 -0
  84. package/src/generators/directive/directive.js +51 -0
  85. package/src/generators/directive/directive.js.map +1 -0
  86. package/src/generators/directive/files/__directiveFileName__/__directiveFileName__.directive.spec.ts__tpl__ +8 -0
  87. package/src/generators/directive/files/__directiveFileName__/__directiveFileName__.directive.ts__tpl__ +11 -0
  88. package/src/generators/directive/schema.d.ts +14 -0
  89. package/src/generators/directive/schema.json +92 -0
  90. package/src/generators/host/host.js +1 -2
  91. package/src/generators/host/host.js.map +1 -1
  92. package/src/generators/host/schema.json +1 -1
  93. package/src/generators/init/angular-v14/init.js +1 -7
  94. package/src/generators/init/angular-v14/init.js.map +1 -1
  95. package/src/generators/init/init.js +1 -7
  96. package/src/generators/init/init.js.map +1 -1
  97. package/src/generators/init/schema.json +1 -1
  98. package/src/generators/library/lib/add-children.js +4 -4
  99. package/src/generators/library/lib/add-children.js.map +1 -1
  100. package/src/generators/library/lib/add-lazy-loaded-router-configuration.js +5 -5
  101. package/src/generators/library/lib/add-lazy-loaded-router-configuration.js.map +1 -1
  102. package/src/generators/library/lib/add-router-configuration.js +5 -5
  103. package/src/generators/library/lib/add-router-configuration.js.map +1 -1
  104. package/src/generators/library/lib/update-project.js +1 -1
  105. package/src/generators/library/lib/update-project.js.map +1 -1
  106. package/src/generators/library/library.js +0 -7
  107. package/src/generators/library/library.js.map +1 -1
  108. package/src/generators/library/schema.json +1 -2
  109. package/src/generators/move/lib/update-module-name.js +2 -2
  110. package/src/generators/move/lib/update-module-name.js.map +1 -1
  111. package/src/generators/move/lib/update-ng-package.js +2 -2
  112. package/src/generators/move/lib/update-ng-package.js.map +1 -1
  113. package/src/generators/ng-add/migrate-from-angular-cli.js +36 -53
  114. package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
  115. package/src/generators/ng-add/migrators/projects/e2e.migrator.js +3 -4
  116. package/src/generators/ng-add/migrators/projects/e2e.migrator.js.map +1 -1
  117. package/src/generators/ng-add/schema.d.ts +0 -1
  118. package/src/generators/ng-add/schema.json +0 -6
  119. package/src/generators/ng-add/utilities/index.d.ts +0 -1
  120. package/src/generators/ng-add/utilities/index.js +0 -1
  121. package/src/generators/ng-add/utilities/index.js.map +1 -1
  122. package/src/generators/ng-add/utilities/projects.d.ts +0 -1
  123. package/src/generators/ng-add/utilities/projects.js +1 -12
  124. package/src/generators/ng-add/utilities/projects.js.map +1 -1
  125. package/src/generators/ng-add/utilities/workspace.d.ts +0 -1
  126. package/src/generators/ng-add/utilities/workspace.js +4 -18
  127. package/src/generators/ng-add/utilities/workspace.js.map +1 -1
  128. package/src/generators/ngrx/lib/add-exports-barrel.js +7 -7
  129. package/src/generators/ngrx/lib/add-exports-barrel.js.map +1 -1
  130. package/src/generators/ngrx/lib/add-imports-to-module.js +14 -14
  131. package/src/generators/ngrx/lib/add-imports-to-module.js.map +1 -1
  132. package/src/generators/ngrx/lib/add-ngrx-to-package-json.js +9 -9
  133. package/src/generators/ngrx/lib/add-ngrx-to-package-json.js.map +1 -1
  134. package/src/generators/pipe/files/__pipeFileName__/__pipeFileName__.pipe.spec.ts__tpl__ +8 -0
  135. package/src/generators/pipe/files/__pipeFileName__/__pipeFileName__.pipe.ts__tpl__ +13 -0
  136. package/src/generators/pipe/pipe.d.ts +4 -0
  137. package/src/generators/pipe/pipe.js +45 -0
  138. package/src/generators/pipe/pipe.js.map +1 -0
  139. package/src/generators/pipe/schema.d.ts +12 -0
  140. package/src/generators/pipe/schema.json +73 -0
  141. package/src/generators/remote/remote.js +1 -2
  142. package/src/generators/remote/remote.js.map +1 -1
  143. package/src/generators/remote/schema.json +1 -1
  144. package/src/generators/scam/lib/convert-component-to-scam.js +3 -3
  145. package/src/generators/scam/lib/convert-component-to-scam.js.map +1 -1
  146. package/src/generators/scam/lib/normalize-options.js +4 -6
  147. package/src/generators/scam/lib/normalize-options.js.map +1 -1
  148. package/src/generators/scam/scam.js +1 -3
  149. package/src/generators/scam/scam.js.map +1 -1
  150. package/src/generators/scam/schema.d.ts +1 -2
  151. package/src/generators/scam/schema.json +3 -0
  152. package/src/generators/scam-directive/lib/convert-directive-to-scam.js +3 -3
  153. package/src/generators/scam-directive/lib/convert-directive-to-scam.js.map +1 -1
  154. package/src/generators/scam-directive/lib/normalize-options.js +4 -6
  155. package/src/generators/scam-directive/lib/normalize-options.js.map +1 -1
  156. package/src/generators/scam-directive/scam-directive.js +1 -3
  157. package/src/generators/scam-directive/scam-directive.js.map +1 -1
  158. package/src/generators/scam-directive/schema.d.ts +1 -2
  159. package/src/generators/scam-directive/schema.json +3 -0
  160. package/src/generators/scam-pipe/lib/convert-pipe-to-scam.js +3 -3
  161. package/src/generators/scam-pipe/lib/convert-pipe-to-scam.js.map +1 -1
  162. package/src/generators/scam-pipe/lib/normalize-options.js +4 -6
  163. package/src/generators/scam-pipe/lib/normalize-options.js.map +1 -1
  164. package/src/generators/scam-pipe/scam-pipe.js +1 -3
  165. package/src/generators/scam-pipe/scam-pipe.js.map +1 -1
  166. package/src/generators/scam-pipe/schema.d.ts +1 -2
  167. package/src/generators/scam-pipe/schema.json +3 -0
  168. package/src/generators/setup-mf/files/webpack/webpack.prod.config.js__tmpl__ +1 -1
  169. package/src/generators/setup-mf/lib/add-remote-to-host.js +2 -2
  170. package/src/generators/setup-mf/lib/add-remote-to-host.js.map +1 -1
  171. package/src/generators/setup-tailwind/lib/detect-tailwind-installed-version.js +5 -5
  172. package/src/generators/setup-tailwind/lib/detect-tailwind-installed-version.js.map +1 -1
  173. package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js +1 -1
  174. package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js.map +1 -1
  175. package/src/generators/storybook-configuration/schema.d.ts +1 -1
  176. package/src/generators/storybook-configuration/schema.json +4 -3
  177. package/src/generators/utils/file-info.d.ts +1 -1
  178. package/src/generators/utils/file-info.js +3 -4
  179. package/src/generators/utils/file-info.js.map +1 -1
  180. package/src/generators/utils/find-module.d.ts +4 -0
  181. package/src/generators/utils/find-module.js +59 -0
  182. package/src/generators/utils/find-module.js.map +1 -0
  183. package/src/generators/utils/get-new-project-name.d.ts +6 -0
  184. package/src/generators/utils/get-new-project-name.js +13 -0
  185. package/src/generators/utils/get-new-project-name.js.map +1 -0
  186. package/src/generators/utils/index.d.ts +1 -0
  187. package/src/generators/utils/index.js +1 -0
  188. package/src/generators/utils/index.js.map +1 -1
  189. package/src/generators/utils/insert-ngmodule-import.d.ts +1 -2
  190. package/src/generators/utils/insert-ngmodule-import.js +42 -21
  191. package/src/generators/utils/insert-ngmodule-import.js.map +1 -1
  192. package/src/generators/utils/path.d.ts +2 -0
  193. package/src/generators/utils/path.js +16 -1
  194. package/src/generators/utils/path.js.map +1 -1
  195. package/src/generators/utils/storybook-ast/storybook-inputs.js +2 -2
  196. package/src/generators/utils/storybook-ast/storybook-inputs.js.map +1 -1
  197. package/src/generators/utils/testing.d.ts +8 -0
  198. package/src/generators/utils/testing.js +44 -2
  199. package/src/generators/utils/testing.js.map +1 -1
  200. package/src/generators/web-worker/schema.json +3 -0
  201. package/src/migrations/update-14-2-0/remove-show-circular-dependencies-option.js +1 -1
  202. package/src/migrations/update-14-2-0/remove-show-circular-dependencies-option.js.map +1 -1
  203. package/src/migrations/update-15-0-0/add-karma-inputs.js +1 -1
  204. package/src/migrations/update-15-0-0/add-karma-inputs.js.map +1 -1
  205. package/src/migrations/update-15-2-0/remove-platform-server-exports.d.ts +2 -9
  206. package/src/migrations/update-15-2-0/remove-platform-server-exports.js +53 -74
  207. package/src/migrations/update-15-2-0/remove-platform-server-exports.js.map +1 -1
  208. package/src/migrations/update-15-2-0/update-karma-main-file.d.ts +2 -9
  209. package/src/migrations/update-15-2-0/update-karma-main-file.js +23 -43
  210. package/src/migrations/update-15-2-0/update-karma-main-file.js.map +1 -1
  211. package/src/migrations/update-15-7-0/install-required-packages.js +14 -1
  212. package/src/migrations/update-15-7-0/install-required-packages.js.map +1 -1
  213. package/src/utils/backward-compatible-versions.js +0 -5
  214. package/src/utils/backward-compatible-versions.js.map +1 -1
  215. package/src/utils/cli-config-utils.d.ts +1 -0
  216. package/src/utils/cli-config-utils.js +46 -0
  217. package/src/utils/cli-config-utils.js.map +1 -0
  218. package/src/{generators/ng-add/utilities → utils}/file-change-recorder.d.ts +1 -1
  219. package/src/{generators/ng-add/utilities → utils}/file-change-recorder.js +2 -2
  220. package/src/utils/file-change-recorder.js.map +1 -0
  221. package/src/utils/get-mf-projects.js +1 -1
  222. package/src/utils/get-mf-projects.js.map +1 -1
  223. package/src/utils/mf/utils.js +8 -0
  224. package/src/utils/mf/utils.js.map +1 -1
  225. package/src/utils/nx-devkit/ast-utils.js +12 -12
  226. package/src/utils/nx-devkit/ast-utils.js.map +1 -1
  227. package/src/utils/nx-devkit/route-utils.js +4 -4
  228. package/src/utils/nx-devkit/route-utils.js.map +1 -1
  229. package/src/utils/test-runners.d.ts +0 -1
  230. package/src/utils/test-runners.js +0 -1
  231. package/src/utils/test-runners.js.map +1 -1
  232. package/src/utils/versions.d.ts +0 -5
  233. package/src/utils/versions.js +1 -6
  234. package/src/utils/versions.js.map +1 -1
  235. package/tailwind.js +1 -1
  236. package/tailwind.js.map +1 -1
  237. package/src/generators/downgrade-module/compat.d.ts +0 -2
  238. package/src/generators/downgrade-module/compat.js +0 -6
  239. package/src/generators/downgrade-module/compat.js.map +0 -1
  240. package/src/generators/downgrade-module/downgrade-module.d.ts +0 -4
  241. package/src/generators/downgrade-module/downgrade-module.js +0 -26
  242. package/src/generators/downgrade-module/downgrade-module.js.map +0 -1
  243. package/src/generators/downgrade-module/files/main.ts__tmpl__ +0 -26
  244. package/src/generators/downgrade-module/lib/add-entry-components-to-module.d.ts +0 -3
  245. package/src/generators/downgrade-module/lib/add-entry-components-to-module.js +0 -10
  246. package/src/generators/downgrade-module/lib/add-entry-components-to-module.js.map +0 -1
  247. package/src/generators/downgrade-module/lib/index.d.ts +0 -4
  248. package/src/generators/downgrade-module/lib/index.js +0 -8
  249. package/src/generators/downgrade-module/lib/index.js.map +0 -1
  250. package/src/generators/downgrade-module/lib/normalize-options.d.ts +0 -2
  251. package/src/generators/downgrade-module/lib/normalize-options.js +0 -9
  252. package/src/generators/downgrade-module/lib/normalize-options.js.map +0 -1
  253. package/src/generators/downgrade-module/lib/update-main.d.ts +0 -3
  254. package/src/generators/downgrade-module/lib/update-main.js +0 -20
  255. package/src/generators/downgrade-module/lib/update-main.js.map +0 -1
  256. package/src/generators/downgrade-module/lib/update-module-bootstrap.d.ts +0 -3
  257. package/src/generators/downgrade-module/lib/update-module-bootstrap.js +0 -15
  258. package/src/generators/downgrade-module/lib/update-module-bootstrap.js.map +0 -1
  259. package/src/generators/downgrade-module/schema.d.ts +0 -7
  260. package/src/generators/downgrade-module/schema.json +0 -43
  261. package/src/generators/karma/angular-v14/files/karma.conf.js__tmpl__ +0 -44
  262. package/src/generators/karma/angular-v14/karma.d.ts +0 -4
  263. package/src/generators/karma/angular-v14/karma.js +0 -58
  264. package/src/generators/karma/angular-v14/karma.js.map +0 -1
  265. package/src/generators/karma/angular-v14/schema.d.ts +0 -3
  266. package/src/generators/karma/compat.d.ts +0 -2
  267. package/src/generators/karma/compat.js +0 -6
  268. package/src/generators/karma/compat.js.map +0 -1
  269. package/src/generators/karma/files/karma.conf.js__tmpl__ +0 -44
  270. package/src/generators/karma/karma.d.ts +0 -4
  271. package/src/generators/karma/karma.js +0 -69
  272. package/src/generators/karma/karma.js.map +0 -1
  273. package/src/generators/karma/schema.d.ts +0 -3
  274. package/src/generators/karma/schema.json +0 -24
  275. package/src/generators/karma-project/compat.d.ts +0 -2
  276. package/src/generators/karma-project/compat.js +0 -6
  277. package/src/generators/karma-project/compat.js.map +0 -1
  278. package/src/generators/karma-project/files/common/karma.conf.js__tmpl__ +0 -16
  279. package/src/generators/karma-project/files/common/tsconfig.spec.json +0 -8
  280. package/src/generators/karma-project/files/root-project/karma.conf.js__tmpl__ +0 -44
  281. package/src/generators/karma-project/files/workspace-with-root-project/karma.conf.js__tmpl__ +0 -28
  282. package/src/generators/karma-project/karma-project.d.ts +0 -4
  283. package/src/generators/karma-project/karma-project.js +0 -26
  284. package/src/generators/karma-project/karma-project.js.map +0 -1
  285. package/src/generators/karma-project/lib/check-test-target.d.ts +0 -2
  286. package/src/generators/karma-project/lib/check-test-target.js +0 -12
  287. package/src/generators/karma-project/lib/check-test-target.js.map +0 -1
  288. package/src/generators/karma-project/lib/generate-karma-project-files.d.ts +0 -2
  289. package/src/generators/karma-project/lib/generate-karma-project-files.js +0 -55
  290. package/src/generators/karma-project/lib/generate-karma-project-files.js.map +0 -1
  291. package/src/generators/karma-project/lib/update-tsconfig.d.ts +0 -2
  292. package/src/generators/karma-project/lib/update-tsconfig.js +0 -37
  293. package/src/generators/karma-project/lib/update-tsconfig.js.map +0 -1
  294. package/src/generators/karma-project/lib/update-workspace-config.d.ts +0 -2
  295. package/src/generators/karma-project/lib/update-workspace-config.js +0 -32
  296. package/src/generators/karma-project/lib/update-workspace-config.js.map +0 -1
  297. package/src/generators/karma-project/lib/v14-test-file.d.ts +0 -3
  298. package/src/generators/karma-project/lib/v14-test-file.js +0 -29
  299. package/src/generators/karma-project/lib/v14-test-file.js.map +0 -1
  300. package/src/generators/karma-project/schema.d.ts +0 -5
  301. package/src/generators/karma-project/schema.json +0 -31
  302. package/src/generators/ng-add/files/prettier/__dot__prettierignore +0 -4
  303. package/src/generators/ng-add/utilities/file-change-recorder.js.map +0 -1
  304. package/src/generators/upgrade-module/compat.d.ts +0 -2
  305. package/src/generators/upgrade-module/compat.js +0 -6
  306. package/src/generators/upgrade-module/compat.js.map +0 -1
  307. package/src/generators/upgrade-module/files/__name__-setup.ts__tmpl__ +0 -39
  308. package/src/generators/upgrade-module/files/hybrid.spec.ts__tmpl__ +0 -32
  309. package/src/generators/upgrade-module/lib/add-imports-to-module.d.ts +0 -3
  310. package/src/generators/upgrade-module/lib/add-imports-to-module.js +0 -17
  311. package/src/generators/upgrade-module/lib/add-imports-to-module.js.map +0 -1
  312. package/src/generators/upgrade-module/lib/create-files.d.ts +0 -3
  313. package/src/generators/upgrade-module/lib/create-files.js +0 -13
  314. package/src/generators/upgrade-module/lib/create-files.js.map +0 -1
  315. package/src/generators/upgrade-module/lib/index.d.ts +0 -4
  316. package/src/generators/upgrade-module/lib/index.js +0 -8
  317. package/src/generators/upgrade-module/lib/index.js.map +0 -1
  318. package/src/generators/upgrade-module/lib/normalize-options.d.ts +0 -2
  319. package/src/generators/upgrade-module/lib/normalize-options.js +0 -9
  320. package/src/generators/upgrade-module/lib/normalize-options.js.map +0 -1
  321. package/src/generators/upgrade-module/lib/update-module-bootstrap.d.ts +0 -3
  322. package/src/generators/upgrade-module/lib/update-module-bootstrap.js +0 -24
  323. package/src/generators/upgrade-module/lib/update-module-bootstrap.js.map +0 -1
  324. package/src/generators/upgrade-module/schema.d.ts +0 -9
  325. package/src/generators/upgrade-module/schema.json +0 -53
  326. package/src/generators/upgrade-module/upgrade-module.d.ts +0 -4
  327. package/src/generators/upgrade-module/upgrade-module.js +0 -26
  328. package/src/generators/upgrade-module/upgrade-module.js.map +0 -1
  329. package/src/generators/utils/upgrade.d.ts +0 -2
  330. package/src/generators/utils/upgrade.js +0 -25
  331. package/src/generators/utils/upgrade.js.map +0 -1
  332. package/src/migrations/update-13-0-0/add-postcss-packages.d.ts +0 -2
  333. package/src/migrations/update-13-0-0/add-postcss-packages.js +0 -23
  334. package/src/migrations/update-13-0-0/add-postcss-packages.js.map +0 -1
  335. package/src/migrations/update-13-2-0/opt-out-testbed-teardown.d.ts +0 -2
  336. package/src/migrations/update-13-2-0/opt-out-testbed-teardown.js +0 -231
  337. package/src/migrations/update-13-2-0/opt-out-testbed-teardown.js.map +0 -1
  338. package/src/migrations/update-13-2-0/update-angular-config.d.ts +0 -2
  339. package/src/migrations/update-13-2-0/update-angular-config.js +0 -37
  340. package/src/migrations/update-13-2-0/update-angular-config.js.map +0 -1
  341. package/src/migrations/update-13-2-0/update-angular-jest-config.d.ts +0 -3
  342. package/src/migrations/update-13-2-0/update-angular-jest-config.js +0 -79
  343. package/src/migrations/update-13-2-0/update-angular-jest-config.js.map +0 -1
  344. package/src/migrations/update-13-2-0/update-libraries.d.ts +0 -2
  345. package/src/migrations/update-13-2-0/update-libraries.js +0 -59
  346. package/src/migrations/update-13-2-0/update-libraries.js.map +0 -1
  347. package/src/migrations/update-13-2-0/update-testing-imports.d.ts +0 -2
  348. package/src/migrations/update-13-2-0/update-testing-imports.js +0 -108
  349. package/src/migrations/update-13-2-0/update-testing-imports.js.map +0 -1
  350. package/src/migrations/update-13-3-0/update-mfe-webpack-config.d.ts +0 -6
  351. package/src/migrations/update-13-3-0/update-mfe-webpack-config.js +0 -120
  352. package/src/migrations/update-13-3-0/update-mfe-webpack-config.js.map +0 -1
  353. package/src/migrations/update-13-5-0/remove-library-generator-style-default.d.ts +0 -2
  354. package/src/migrations/update-13-5-0/remove-library-generator-style-default.js +0 -24
  355. package/src/migrations/update-13-5-0/remove-library-generator-style-default.js.map +0 -1
  356. package/src/migrations/update-13-5-0/update-mfe-config.test-data.d.ts +0 -20
  357. package/src/migrations/update-13-5-0/update-mfe-config.test-data.js +0 -718
  358. package/src/migrations/update-13-5-0/update-mfe-config.test-data.js.map +0 -1
  359. package/src/migrations/update-13-5-0/update-mfe-configs.d.ts +0 -5
  360. package/src/migrations/update-13-5-0/update-mfe-configs.js +0 -157
  361. package/src/migrations/update-13-5-0/update-mfe-configs.js.map +0 -1
  362. package/src/migrations/update-13-8-1/add-cypress-mf-workaround.d.ts +0 -2
  363. package/src/migrations/update-13-8-1/add-cypress-mf-workaround.js +0 -38
  364. package/src/migrations/update-13-8-1/add-cypress-mf-workaround.js.map +0 -1
  365. package/src/migrations/update-13-8-4/migrate-karma-conf.d.ts +0 -2
  366. package/src/migrations/update-13-8-4/migrate-karma-conf.js +0 -39
  367. package/src/migrations/update-13-8-4/migrate-karma-conf.js.map +0 -1
  368. package/src/migrations/update-13-9-0/set-build-libs-from-source.d.ts +0 -2
  369. package/src/migrations/update-13-9-0/set-build-libs-from-source.js +0 -27
  370. package/src/migrations/update-13-9-0/set-build-libs-from-source.js.map +0 -1
  371. package/src/migrations/update-14-0-0/rename-mf-config.d.ts +0 -2
  372. package/src/migrations/update-14-0-0/rename-mf-config.js +0 -27
  373. package/src/migrations/update-14-0-0/rename-mf-config.js.map +0 -1
  374. package/src/migrations/update-14-5-7/update-rxjs.d.ts +0 -2
  375. package/src/migrations/update-14-5-7/update-rxjs.js +0 -30
  376. package/src/migrations/update-14-5-7/update-rxjs.js.map +0 -1
@@ -23,12 +23,10 @@ function scamGenerator(tree, rawOptions) {
23
23
  }
24
24
  exports.scamGenerator = scamGenerator;
25
25
  function checkPathUnderProjectRoot(tree, options) {
26
- var _a;
27
26
  if (!options.path) {
28
27
  return;
29
28
  }
30
- const project = (_a = options.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readNxJson)(tree).defaultProject;
31
- const { root } = (0, devkit_1.readProjectConfiguration)(tree, project);
29
+ const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
32
30
  let pathToComponent = (0, devkit_1.normalizePath)(options.path);
33
31
  pathToComponent = pathToComponent.startsWith('/')
34
32
  ? pathToComponent.slice(1)
@@ -1 +1 @@
1
- {"version":3,"file":"scam.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam/scam.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AACtB,sDAAkD;AAClD,kDAA0D;AAC1D,wCAA+C;AAC/C,+BAAiE;AAGjE,SAAsB,aAAa,CAAC,IAAU,EAAE,UAAkB;;QAChE,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACnD,MAAM,EAAE,UAAU,EAAE,iBAAiB,KAA0B,OAAO,EAA5B,gBAAgB,kBAAK,OAAO,EAAhE,mCAAsD,CAAU,CAAC;QAEvE,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,MAAM,EAAE,0BAA0B,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;QAC7E,MAAM,yBAAyB,GAAG,0BAA0B,CAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,kCAC/B,gBAAgB,KACnB,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,KAAK,EACb,UAAU,EAAE,KAAK,IACjB,CAAC;QAEH,MAAM,iBAAiB,GAAG,IAAA,gCAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9D,IAAA,4BAAsB,EAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC;QACzD,IAAA,wBAAU,EAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAE7C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAvBD,sCAuBC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,OAAwB;;IACrE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QACjB,OAAO;KACR;IAED,MAAM,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IACnE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEzD,IAAI,eAAe,GAAG,IAAA,sBAAa,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,eAAe,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC;QAC/C,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,eAAe,CAAC;IAEpB,IAAI,CAAC,IAAA,qBAAc,EAAC,eAAe,EAAE,IAAI,CAAC,EAAE;QAC1C,MAAM,IAAI,KAAK,CACb,mCAAmC,OAAO,CAAC,IAAI,4CAA4C,IAAI,IAAI,CACpG,CAAC;KACH;AACH,CAAC;AAED,kBAAe,aAAa,CAAC"}
1
+ {"version":3,"file":"scam.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam/scam.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AACtB,sDAAkD;AAClD,kDAA0D;AAC1D,wCAA+C;AAC/C,+BAAiE;AAGjE,SAAsB,aAAa,CAAC,IAAU,EAAE,UAAkB;;QAChE,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACnD,MAAM,EAAE,UAAU,EAAE,iBAAiB,KAA0B,OAAO,EAA5B,gBAAgB,kBAAK,OAAO,EAAhE,mCAAsD,CAAU,CAAC;QAEvE,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,MAAM,EAAE,0BAA0B,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;QAC7E,MAAM,yBAAyB,GAAG,0BAA0B,CAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,kCAC/B,gBAAgB,KACnB,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,KAAK,EACb,UAAU,EAAE,KAAK,IACjB,CAAC;QAEH,MAAM,iBAAiB,GAAG,IAAA,gCAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9D,IAAA,4BAAsB,EAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC;QACzD,IAAA,wBAAU,EAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAE7C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAvBD,sCAuBC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,OAAwB;IACrE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QACjB,OAAO;KACR;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAEjE,IAAI,eAAe,GAAG,IAAA,sBAAa,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,eAAe,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC;QAC/C,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,eAAe,CAAC;IAEpB,IAAI,CAAC,IAAA,qBAAc,EAAC,eAAe,EAAE,IAAI,CAAC,EAAE;QAC1C,MAAM,IAAI,KAAK,CACb,mCAAmC,OAAO,CAAC,IAAI,4CAA4C,IAAI,IAAI,CACpG,CAAC;KACH;AACH,CAAC;AAED,kBAAe,aAAa,CAAC"}
@@ -1,7 +1,7 @@
1
1
  export interface Schema {
2
2
  name: string;
3
+ project: string;
3
4
  path?: string;
4
- project?: string;
5
5
  displayBlock?: boolean;
6
6
  inlineStyle?: boolean;
7
7
  inlineTemplate?: boolean;
@@ -22,6 +22,5 @@ export interface NormalizedSchema extends Schema {
22
22
  export: boolean;
23
23
  inlineScam: boolean;
24
24
  path: string;
25
- project: string;
26
25
  projectSourceRoot: string;
27
26
  }
@@ -22,6 +22,9 @@
22
22
  "project": {
23
23
  "type": "string",
24
24
  "description": "The name of the project.",
25
+ "$default": {
26
+ "$source": "projectName"
27
+ },
25
28
  "x-dropdown": "projects"
26
29
  },
27
30
  "name": {
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.convertDirectiveToScam = void 0;
4
4
  const devkit_1 = require("@nrwl/devkit");
5
5
  const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
6
- const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
6
+ const js_1 = require("@nrwl/js");
7
7
  let tsModule;
8
8
  function convertDirectiveToScam(tree, directiveFileInfo, options) {
9
9
  if (!tree.exists(directiveFileInfo.filePath)) {
@@ -18,8 +18,8 @@ function convertDirectiveToScam(tree, directiveFileInfo, options) {
18
18
  if (options.inlineScam) {
19
19
  const currentDirectiveContents = tree.read(directiveFileInfo.filePath, 'utf-8');
20
20
  let source = tsModule.createSourceFile(directiveFileInfo.filePath, currentDirectiveContents, tsModule.ScriptTarget.Latest, true);
21
- source = (0, ast_utils_1.insertImport)(tree, source, directiveFileInfo.filePath, 'NgModule', '@angular/core');
22
- source = (0, ast_utils_1.insertImport)(tree, source, directiveFileInfo.filePath, 'CommonModule', '@angular/common');
21
+ source = (0, js_1.insertImport)(tree, source, directiveFileInfo.filePath, 'NgModule', '@angular/core');
22
+ source = (0, js_1.insertImport)(tree, source, directiveFileInfo.filePath, 'CommonModule', '@angular/common');
23
23
  let updatedDirectiveSource = source.getText();
24
24
  updatedDirectiveSource = `${updatedDirectiveSource}${getNgModuleDeclaration(directiveClassName)}`;
25
25
  tree.write(directiveFileInfo.filePath, updatedDirectiveSource);
@@ -1 +1 @@
1
- {"version":3,"file":"convert-directive-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-directive/lib/convert-directive-to-scam.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uFAAmF;AACnF,uEAAuE;AAIvE,IAAI,QAAqC,CAAC;AAE1C,SAAgB,sBAAsB,CACpC,IAAU,EACV,iBAA2B,EAC3B,OAAyB;IAEzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE;QAC5C,MAAM,IAAI,KAAK,CACb,mCAAmC,iBAAiB,CAAC,QAAQ,qBAAqB,CACnF,CAAC;KACH;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,cAAc,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,WAAW,CAAC,CAAC;IACrC,MAAM,kBAAkB,GAAG,GAAG,cAAc,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;IAE/E,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,MAAM,wBAAwB,GAAG,IAAI,CAAC,IAAI,CACxC,iBAAiB,CAAC,QAAQ,EAC1B,OAAO,CACR,CAAC;QACF,IAAI,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACpC,iBAAiB,CAAC,QAAQ,EAC1B,wBAAwB,EACxB,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;QAEF,MAAM,GAAG,IAAA,wBAAY,EACnB,IAAI,EACJ,MAAM,EACN,iBAAiB,CAAC,QAAQ,EAC1B,UAAU,EACV,eAAe,CAChB,CAAC;QACF,MAAM,GAAG,IAAA,wBAAY,EACnB,IAAI,EACJ,MAAM,EACN,iBAAiB,CAAC,QAAQ,EAC1B,cAAc,EACd,iBAAiB,CAClB,CAAC;QAEF,IAAI,sBAAsB,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAC9C,sBAAsB,GAAG,GAAG,sBAAsB,GAAG,sBAAsB,CACzE,kBAAkB,CACnB,EAAE,CAAC;QAEJ,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAC;QAC/D,OAAO;KACR;IAED,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,iBAAiB,CAAC,SAAS,EAC3B,GAAG,cAAc,CAAC,QAAQ,YAAY,CACvC,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,YAAY,EACZ,oBAAoB,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CACrE,CAAC;AACJ,CAAC;AA/DD,wDA+DC;AAED,SAAS,oBAAoB,CAC3B,kBAA0B,EAC1B,iBAAyB;IAEzB,OAAO;;WAEE,kBAAkB,cAAc,iBAAiB;EAC1D,sBAAsB,CAAC,kBAAkB,CAAC,EAAE,CAAC;AAC/C,CAAC;AAED,SAAS,sBAAsB,CAAC,kBAA0B;IACxD,OAAO;;;mBAGU,kBAAkB;cACvB,kBAAkB;;eAEjB,kBAAkB,WAAW,CAAC;AAC7C,CAAC"}
1
+ {"version":3,"file":"convert-directive-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-directive/lib/convert-directive-to-scam.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uFAAmF;AACnF,iCAAwC;AAIxC,IAAI,QAAqC,CAAC;AAE1C,SAAgB,sBAAsB,CACpC,IAAU,EACV,iBAA2B,EAC3B,OAAyB;IAEzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE;QAC5C,MAAM,IAAI,KAAK,CACb,mCAAmC,iBAAiB,CAAC,QAAQ,qBAAqB,CACnF,CAAC;KACH;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,cAAc,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,WAAW,CAAC,CAAC;IACrC,MAAM,kBAAkB,GAAG,GAAG,cAAc,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;IAE/E,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,MAAM,wBAAwB,GAAG,IAAI,CAAC,IAAI,CACxC,iBAAiB,CAAC,QAAQ,EAC1B,OAAO,CACR,CAAC;QACF,IAAI,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACpC,iBAAiB,CAAC,QAAQ,EAC1B,wBAAwB,EACxB,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;QAEF,MAAM,GAAG,IAAA,iBAAY,EACnB,IAAI,EACJ,MAAM,EACN,iBAAiB,CAAC,QAAQ,EAC1B,UAAU,EACV,eAAe,CAChB,CAAC;QACF,MAAM,GAAG,IAAA,iBAAY,EACnB,IAAI,EACJ,MAAM,EACN,iBAAiB,CAAC,QAAQ,EAC1B,cAAc,EACd,iBAAiB,CAClB,CAAC;QAEF,IAAI,sBAAsB,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAC9C,sBAAsB,GAAG,GAAG,sBAAsB,GAAG,sBAAsB,CACzE,kBAAkB,CACnB,EAAE,CAAC;QAEJ,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAC;QAC/D,OAAO;KACR;IAED,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,iBAAiB,CAAC,SAAS,EAC3B,GAAG,cAAc,CAAC,QAAQ,YAAY,CACvC,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,YAAY,EACZ,oBAAoB,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CACrE,CAAC;AACJ,CAAC;AA/DD,wDA+DC;AAED,SAAS,oBAAoB,CAC3B,kBAA0B,EAC1B,iBAAyB;IAEzB,OAAO;;WAEE,kBAAkB,cAAc,iBAAiB;EAC1D,sBAAsB,CAAC,kBAAkB,CAAC,EAAE,CAAC;AAC/C,CAAC;AAED,SAAS,sBAAsB,CAAC,kBAA0B;IACxD,OAAO;;;mBAGU,kBAAkB;cACvB,kBAAkB;;eAEjB,kBAAkB,WAAW,CAAC;AAC7C,CAAC"}
@@ -3,13 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.normalizeOptions = void 0;
4
4
  const devkit_1 = require("@nrwl/devkit");
5
5
  function normalizeOptions(tree, options) {
6
- var _a, _b, _c, _d, _e;
7
- const project = (_a = options.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readNxJson)(tree).defaultProject;
8
- const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
6
+ var _a, _b, _c, _d;
7
+ const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
9
8
  const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
10
- const path = (_b = options.path) !== null && _b !== void 0 ? _b : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
11
- return Object.assign(Object.assign({}, options), { export: (_c = options.export) !== null && _c !== void 0 ? _c : true, flat: (_d = options.flat) !== null && _d !== void 0 ? _d : true, inlineScam: (_e = options.inlineScam) !== null && _e !== void 0 ? _e : true, path,
12
- project,
9
+ const path = (_a = options.path) !== null && _a !== void 0 ? _a : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
10
+ return Object.assign(Object.assign({}, options), { export: (_b = options.export) !== null && _b !== void 0 ? _b : true, flat: (_c = options.flat) !== null && _c !== void 0 ? _c : true, inlineScam: (_d = options.inlineScam) !== null && _d !== void 0 ? _d : true, path,
13
11
  projectSourceRoot });
14
12
  }
15
13
  exports.normalizeOptions = normalizeOptions;
@@ -1 +1 @@
1
- {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-directive/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAGtB,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IACnE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CACR,CAAC;IACF,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvE,MAAM,IAAI,GACR,MAAA,OAAO,CAAC,IAAI,mCACZ,IAAA,0BAAiB,EACf,iBAAiB,EACjB,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAC9C,CAAC;IAEJ,uCACK,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,IAAI,EAC9B,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,EAC1B,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,IAAI,EACtC,IAAI;QACJ,OAAO;QACP,iBAAiB,IACjB;AACJ,CAAC;AA1BD,4CA0BC"}
1
+ {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-directive/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,yCAA2E;AAG3E,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CAAC,OAAO,CAChB,CAAC;IACF,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvE,MAAM,IAAI,GACR,MAAA,OAAO,CAAC,IAAI,mCACZ,IAAA,0BAAiB,EACf,iBAAiB,EACjB,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAC9C,CAAC;IAEJ,uCACK,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,IAAI,EAC9B,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,EAC1B,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,IAAI,EACtC,IAAI;QACJ,iBAAiB,IACjB;AACJ,CAAC;AAxBD,4CAwBC"}
@@ -23,12 +23,10 @@ function scamDirectiveGenerator(tree, rawOptions) {
23
23
  }
24
24
  exports.scamDirectiveGenerator = scamDirectiveGenerator;
25
25
  function checkPathUnderProjectRoot(tree, options) {
26
- var _a;
27
26
  if (!options.path) {
28
27
  return;
29
28
  }
30
- const project = (_a = options.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readNxJson)(tree).defaultProject;
31
- const { root } = (0, devkit_1.readProjectConfiguration)(tree, project);
29
+ const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
32
30
  let pathToDirective = (0, devkit_1.normalizePath)(options.path);
33
31
  pathToDirective = pathToDirective.startsWith('/')
34
32
  ? pathToDirective.slice(1)
@@ -1 +1 @@
1
- {"version":3,"file":"scam-directive.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam-directive/scam-directive.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AACtB,sDAAkD;AAClD,kDAA0D;AAC1D,wCAA+C;AAC/C,+BAAiE;AAGjE,SAAsB,sBAAsB,CAAC,IAAU,EAAE,UAAkB;;QACzE,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACnD,MAAM,EAAE,UAAU,EAAE,iBAAiB,KAA0B,OAAO,EAA5B,gBAAgB,kBAAK,OAAO,EAAhE,mCAAsD,CAAU,CAAC;QAEvE,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,MAAM,EAAE,0BAA0B,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;QAC7E,MAAM,yBAAyB,GAAG,0BAA0B,CAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,kCAC/B,gBAAgB,KACnB,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,KAAK,EACb,UAAU,EAAE,KAAK,IACjB,CAAC;QAEH,MAAM,YAAY,GAAG,IAAA,gCAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzD,IAAA,4BAAsB,EAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QACpD,IAAA,wBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QAExC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAvBD,wDAuBC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,OAAwB;;IACrE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QACjB,OAAO;KACR;IAED,MAAM,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IACnE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEzD,IAAI,eAAe,GAAG,IAAA,sBAAa,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,eAAe,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC;QAC/C,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,eAAe,CAAC;IAEpB,IAAI,CAAC,IAAA,qBAAc,EAAC,eAAe,EAAE,IAAI,CAAC,EAAE;QAC1C,MAAM,IAAI,KAAK,CACb,mCAAmC,OAAO,CAAC,IAAI,4CAA4C,IAAI,IAAI,CACpG,CAAC;KACH;AACH,CAAC;AAED,kBAAe,sBAAsB,CAAC"}
1
+ {"version":3,"file":"scam-directive.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam-directive/scam-directive.ts"],"names":[],"mappings":";;;;AACA,yCAIsB;AACtB,sDAAkD;AAClD,kDAA0D;AAC1D,wCAA+C;AAC/C,+BAAiE;AAGjE,SAAsB,sBAAsB,CAAC,IAAU,EAAE,UAAkB;;QACzE,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACnD,MAAM,EAAE,UAAU,EAAE,iBAAiB,KAA0B,OAAO,EAA5B,gBAAgB,kBAAK,OAAO,EAAhE,mCAAsD,CAAU,CAAC;QAEvE,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,MAAM,EAAE,0BAA0B,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;QAC7E,MAAM,yBAAyB,GAAG,0BAA0B,CAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,kCAC/B,gBAAgB,KACnB,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,KAAK,EACb,UAAU,EAAE,KAAK,IACjB,CAAC;QAEH,MAAM,YAAY,GAAG,IAAA,gCAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzD,IAAA,4BAAsB,EAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QACpD,IAAA,wBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QAExC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAvBD,wDAuBC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,OAAwB;IACrE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QACjB,OAAO;KACR;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAEjE,IAAI,eAAe,GAAG,IAAA,sBAAa,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,eAAe,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC;QAC/C,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,eAAe,CAAC;IAEpB,IAAI,CAAC,IAAA,qBAAc,EAAC,eAAe,EAAE,IAAI,CAAC,EAAE;QAC1C,MAAM,IAAI,KAAK,CACb,mCAAmC,OAAO,CAAC,IAAI,4CAA4C,IAAI,IAAI,CACpG,CAAC;KACH;AACH,CAAC;AAED,kBAAe,sBAAsB,CAAC"}
@@ -1,7 +1,7 @@
1
1
  export interface Schema {
2
2
  name: string;
3
+ project: string;
3
4
  path?: string;
4
- project?: string;
5
5
  skipTests?: boolean;
6
6
  inlineScam?: boolean;
7
7
  flat?: boolean;
@@ -15,6 +15,5 @@ export interface NormalizedSchema extends Schema {
15
15
  flat: boolean;
16
16
  inlineScam: boolean;
17
17
  path: string;
18
- project: string;
19
18
  projectSourceRoot: string;
20
19
  }
@@ -22,6 +22,9 @@
22
22
  "project": {
23
23
  "type": "string",
24
24
  "description": "The name of the project.",
25
+ "$default": {
26
+ "$source": "projectName"
27
+ },
25
28
  "x-dropdown": "projects"
26
29
  },
27
30
  "name": {
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.convertPipeToScam = void 0;
4
4
  const devkit_1 = require("@nrwl/devkit");
5
5
  const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
6
- const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
6
+ const js_1 = require("@nrwl/js");
7
7
  let tsModule;
8
8
  function convertPipeToScam(tree, pipeFileInfo, options) {
9
9
  if (!tree.exists(pipeFileInfo.filePath)) {
@@ -18,8 +18,8 @@ function convertPipeToScam(tree, pipeFileInfo, options) {
18
18
  if (options.inlineScam) {
19
19
  const currentPipeContents = tree.read(pipeFileInfo.filePath, 'utf-8');
20
20
  let source = tsModule.createSourceFile(pipeFileInfo.filePath, currentPipeContents, tsModule.ScriptTarget.Latest, true);
21
- source = (0, ast_utils_1.insertImport)(tree, source, pipeFileInfo.filePath, 'NgModule', '@angular/core');
22
- source = (0, ast_utils_1.insertImport)(tree, source, pipeFileInfo.filePath, 'CommonModule', '@angular/common');
21
+ source = (0, js_1.insertImport)(tree, source, pipeFileInfo.filePath, 'NgModule', '@angular/core');
22
+ source = (0, js_1.insertImport)(tree, source, pipeFileInfo.filePath, 'CommonModule', '@angular/common');
23
23
  let updatedPipeSource = source.getText();
24
24
  updatedPipeSource = `${updatedPipeSource}${getNgModuleDeclaration(pipeClassName)}`;
25
25
  tree.write(pipeFileInfo.filePath, updatedPipeSource);
@@ -1 +1 @@
1
- {"version":3,"file":"convert-pipe-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-pipe/lib/convert-pipe-to-scam.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uFAAmF;AACnF,uEAAuE;AAIvE,IAAI,QAAqC,CAAC;AAE1C,SAAgB,iBAAiB,CAC/B,IAAU,EACV,YAAsB,EACtB,OAAyB;IAEzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE;QACvC,MAAM,IAAI,KAAK,CACb,8BAA8B,YAAY,CAAC,QAAQ,qBAAqB,CACzE,CAAC;KACH;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,MAAM,CAAC,CAAC;IAChC,MAAM,aAAa,GAAG,GAAG,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;IAErE,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACtE,IAAI,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACpC,YAAY,CAAC,QAAQ,EACrB,mBAAmB,EACnB,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;QAEF,MAAM,GAAG,IAAA,wBAAY,EACnB,IAAI,EACJ,MAAM,EACN,YAAY,CAAC,QAAQ,EACrB,UAAU,EACV,eAAe,CAChB,CAAC;QACF,MAAM,GAAG,IAAA,wBAAY,EACnB,IAAI,EACJ,MAAM,EACN,YAAY,CAAC,QAAQ,EACrB,cAAc,EACd,iBAAiB,CAClB,CAAC;QAEF,IAAI,iBAAiB,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QACzC,iBAAiB,GAAG,GAAG,iBAAiB,GAAG,sBAAsB,CAC/D,aAAa,CACd,EAAE,CAAC;QAEJ,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;QACrD,OAAO;KACR;IAED,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,YAAY,CAAC,SAAS,EACtB,GAAG,SAAS,CAAC,QAAQ,YAAY,CAClC,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,YAAY,EACZ,oBAAoB,CAAC,aAAa,EAAE,YAAY,CAAC,QAAQ,CAAC,CAC3D,CAAC;AACJ,CAAC;AA5DD,8CA4DC;AAED,SAAS,oBAAoB,CAC3B,aAAqB,EACrB,YAAoB;IAEpB,OAAO;;WAEE,aAAa,cAAc,YAAY;EAChD,sBAAsB,CAAC,aAAa,CAAC,EAAE,CAAC;AAC1C,CAAC;AAED,SAAS,sBAAsB,CAAC,aAAqB;IACnD,OAAO;;;mBAGU,aAAa;cAClB,aAAa;;eAEZ,aAAa,WAAW,CAAC;AACxC,CAAC"}
1
+ {"version":3,"file":"convert-pipe-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-pipe/lib/convert-pipe-to-scam.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uFAAmF;AACnF,iCAAwC;AAIxC,IAAI,QAAqC,CAAC;AAE1C,SAAgB,iBAAiB,CAC/B,IAAU,EACV,YAAsB,EACtB,OAAyB;IAEzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE;QACvC,MAAM,IAAI,KAAK,CACb,8BAA8B,YAAY,CAAC,QAAQ,qBAAqB,CACzE,CAAC;KACH;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,MAAM,CAAC,CAAC;IAChC,MAAM,aAAa,GAAG,GAAG,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;IAErE,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACtE,IAAI,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACpC,YAAY,CAAC,QAAQ,EACrB,mBAAmB,EACnB,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;QAEF,MAAM,GAAG,IAAA,iBAAY,EACnB,IAAI,EACJ,MAAM,EACN,YAAY,CAAC,QAAQ,EACrB,UAAU,EACV,eAAe,CAChB,CAAC;QACF,MAAM,GAAG,IAAA,iBAAY,EACnB,IAAI,EACJ,MAAM,EACN,YAAY,CAAC,QAAQ,EACrB,cAAc,EACd,iBAAiB,CAClB,CAAC;QAEF,IAAI,iBAAiB,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QACzC,iBAAiB,GAAG,GAAG,iBAAiB,GAAG,sBAAsB,CAC/D,aAAa,CACd,EAAE,CAAC;QAEJ,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;QACrD,OAAO;KACR;IAED,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,YAAY,CAAC,SAAS,EACtB,GAAG,SAAS,CAAC,QAAQ,YAAY,CAClC,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,YAAY,EACZ,oBAAoB,CAAC,aAAa,EAAE,YAAY,CAAC,QAAQ,CAAC,CAC3D,CAAC;AACJ,CAAC;AA5DD,8CA4DC;AAED,SAAS,oBAAoB,CAC3B,aAAqB,EACrB,YAAoB;IAEpB,OAAO;;WAEE,aAAa,cAAc,YAAY;EAChD,sBAAsB,CAAC,aAAa,CAAC,EAAE,CAAC;AAC1C,CAAC;AAED,SAAS,sBAAsB,CAAC,aAAqB;IACnD,OAAO;;;mBAGU,aAAa;cAClB,aAAa;;eAEZ,aAAa,WAAW,CAAC;AACxC,CAAC"}
@@ -3,13 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.normalizeOptions = void 0;
4
4
  const devkit_1 = require("@nrwl/devkit");
5
5
  function normalizeOptions(tree, options) {
6
- var _a, _b, _c, _d, _e;
7
- const project = (_a = options.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readNxJson)(tree).defaultProject;
8
- const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
6
+ var _a, _b, _c, _d;
7
+ const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
9
8
  const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
10
- const path = (_b = options.path) !== null && _b !== void 0 ? _b : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
11
- return Object.assign(Object.assign({}, options), { export: (_c = options.export) !== null && _c !== void 0 ? _c : true, flat: (_d = options.flat) !== null && _d !== void 0 ? _d : true, inlineScam: (_e = options.inlineScam) !== null && _e !== void 0 ? _e : true, path,
12
- project,
9
+ const path = (_a = options.path) !== null && _a !== void 0 ? _a : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
10
+ return Object.assign(Object.assign({}, options), { export: (_b = options.export) !== null && _b !== void 0 ? _b : true, flat: (_c = options.flat) !== null && _c !== void 0 ? _c : true, inlineScam: (_d = options.inlineScam) !== null && _d !== void 0 ? _d : true, path,
13
11
  projectSourceRoot });
14
12
  }
15
13
  exports.normalizeOptions = normalizeOptions;
@@ -1 +1 @@
1
- {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-pipe/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAGtB,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IACnE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CACR,CAAC;IACF,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvE,MAAM,IAAI,GACR,MAAA,OAAO,CAAC,IAAI,mCACZ,IAAA,0BAAiB,EACf,iBAAiB,EACjB,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAC9C,CAAC;IAEJ,uCACK,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,IAAI,EAC9B,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,EAC1B,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,IAAI,EACtC,IAAI;QACJ,OAAO;QACP,iBAAiB,IACjB;AACJ,CAAC;AA1BD,4CA0BC"}
1
+ {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-pipe/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,yCAA2E;AAG3E,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CAAC,OAAO,CAChB,CAAC;IACF,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvE,MAAM,IAAI,GACR,MAAA,OAAO,CAAC,IAAI,mCACZ,IAAA,0BAAiB,EACf,iBAAiB,EACjB,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAC9C,CAAC;IAEJ,uCACK,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,IAAI,EAC9B,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,EAC1B,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,IAAI,EACtC,IAAI;QACJ,iBAAiB,IACjB;AACJ,CAAC;AAxBD,4CAwBC"}
@@ -23,12 +23,10 @@ function scamPipeGenerator(tree, rawOptions) {
23
23
  }
24
24
  exports.scamPipeGenerator = scamPipeGenerator;
25
25
  function checkPathUnderProjectRoot(tree, options) {
26
- var _a;
27
26
  if (!options.path) {
28
27
  return;
29
28
  }
30
- const project = (_a = options.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readNxJson)(tree).defaultProject;
31
- const { root } = (0, devkit_1.readProjectConfiguration)(tree, project);
29
+ const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
32
30
  let pathToPipe = (0, devkit_1.normalizePath)(options.path);
33
31
  pathToPipe = pathToPipe.startsWith('/') ? pathToPipe.slice(1) : pathToPipe;
34
32
  if (!(0, path_1.pathStartsWith)(pathToPipe, root)) {
@@ -1 +1 @@
1
- {"version":3,"file":"scam-pipe.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam-pipe/scam-pipe.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AACtB,sDAAkD;AAClD,kDAAqD;AACrD,wCAA+C;AAC/C,+BAA4D;AAG5D,SAAsB,iBAAiB,CAAC,IAAU,EAAE,UAAkB;;QACpE,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACnD,MAAM,EAAE,UAAU,EAAE,iBAAiB,KAA0B,OAAO,EAA5B,gBAAgB,kBAAK,OAAO,EAAhE,mCAAsD,CAAU,CAAC;QAEvE,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,MAAM,EAAE,0BAA0B,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;QAC7E,MAAM,oBAAoB,GAAG,0BAA0B,CACrD,qBAAqB,EACrB,MAAM,CACP,CAAC;QACF,MAAM,oBAAoB,CAAC,IAAI,kCAC1B,gBAAgB,KACnB,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,KAAK,EACb,UAAU,EAAE,KAAK,IACjB,CAAC;QAEH,MAAM,YAAY,GAAG,IAAA,2BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpD,IAAA,uBAAiB,EAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAA,wBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QAExC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAvBD,8CAuBC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,OAAwB;;IACrE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QACjB,OAAO;KACR;IAED,MAAM,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IACnE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEzD,IAAI,UAAU,GAAG,IAAA,sBAAa,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;IAE3E,IAAI,CAAC,IAAA,qBAAc,EAAC,UAAU,EAAE,IAAI,CAAC,EAAE;QACrC,MAAM,IAAI,KAAK,CACb,mCAAmC,OAAO,CAAC,IAAI,4CAA4C,IAAI,IAAI,CACpG,CAAC;KACH;AACH,CAAC;AAED,kBAAe,iBAAiB,CAAC"}
1
+ {"version":3,"file":"scam-pipe.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam-pipe/scam-pipe.ts"],"names":[],"mappings":";;;;AACA,yCAIsB;AACtB,sDAAkD;AAClD,kDAAqD;AACrD,wCAA+C;AAC/C,+BAA4D;AAG5D,SAAsB,iBAAiB,CAAC,IAAU,EAAE,UAAkB;;QACpE,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACnD,MAAM,EAAE,UAAU,EAAE,iBAAiB,KAA0B,OAAO,EAA5B,gBAAgB,kBAAK,OAAO,EAAhE,mCAAsD,CAAU,CAAC;QAEvE,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,MAAM,EAAE,0BAA0B,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;QAC7E,MAAM,oBAAoB,GAAG,0BAA0B,CACrD,qBAAqB,EACrB,MAAM,CACP,CAAC;QACF,MAAM,oBAAoB,CAAC,IAAI,kCAC1B,gBAAgB,KACnB,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,KAAK,EACb,UAAU,EAAE,KAAK,IACjB,CAAC;QAEH,MAAM,YAAY,GAAG,IAAA,2BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpD,IAAA,uBAAiB,EAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAA,wBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QAExC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAvBD,8CAuBC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,OAAwB;IACrE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QACjB,OAAO;KACR;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAEjE,IAAI,UAAU,GAAG,IAAA,sBAAa,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;IAE3E,IAAI,CAAC,IAAA,qBAAc,EAAC,UAAU,EAAE,IAAI,CAAC,EAAE;QACrC,MAAM,IAAI,KAAK,CACb,mCAAmC,OAAO,CAAC,IAAI,4CAA4C,IAAI,IAAI,CACpG,CAAC;KACH;AACH,CAAC;AAED,kBAAe,iBAAiB,CAAC"}
@@ -1,7 +1,7 @@
1
1
  export interface Schema {
2
2
  name: string;
3
+ project: string;
3
4
  path?: string;
4
- project?: string;
5
5
  skipTests?: boolean;
6
6
  inlineScam?: boolean;
7
7
  flat?: boolean;
@@ -13,6 +13,5 @@ export interface NormalizedSchema extends Schema {
13
13
  flat: boolean;
14
14
  inlineScam: boolean;
15
15
  path: string;
16
- project: string;
17
16
  projectSourceRoot: string;
18
17
  }
@@ -22,6 +22,9 @@
22
22
  "project": {
23
23
  "type": "string",
24
24
  "description": "The name of the project.",
25
+ "$default": {
26
+ "$source": "projectName"
27
+ },
25
28
  "x-dropdown": "projects"
26
29
  },
27
30
  "name": {
@@ -4,7 +4,7 @@ module.exports = withModuleFederation({
4
4
  ...config,
5
5
  /*
6
6
  * Remote overrides for production.
7
- * Each entry is a pair of an unique name and the URL where it is deployed.
7
+ * Each entry is a pair of a unique name and the URL where it is deployed.
8
8
  *
9
9
  * e.g.
10
10
  * remotes: [
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.addRemoteToHost = exports.checkIsCommaNeeded = void 0;
4
4
  const devkit_1 = require("@nrwl/devkit");
5
- const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
5
+ const js_1 = require("@nrwl/js");
6
6
  const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
7
7
  const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
8
8
  let tsModule;
@@ -71,7 +71,7 @@ function addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType) {
71
71
  const hostRootRoutingFile = tree.read(pathToHostRootRouting, 'utf-8');
72
72
  let sourceFile = tsModule.createSourceFile(pathToHostRootRouting, hostRootRoutingFile, tsModule.ScriptTarget.Latest, true);
73
73
  if (hostFederationType === 'dynamic') {
74
- sourceFile = (0, ast_utils_1.insertImport)(tree, sourceFile, pathToHostRootRouting, 'loadRemoteModule', '@nrwl/angular/mf');
74
+ sourceFile = (0, js_1.insertImport)(tree, sourceFile, pathToHostRootRouting, 'loadRemoteModule', '@nrwl/angular/mf');
75
75
  }
76
76
  const routePathName = options.standalone ? 'Routes' : 'Module';
77
77
  const exportedRemote = options.standalone
@@ -1 +1 @@
1
- {"version":3,"file":"add-remote-to-host.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-to-host.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"add-remote-to-host.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-to-host.ts"],"names":[],"mappings":"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"}
@@ -2,8 +2,8 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.detectTailwindInstalledVersion = void 0;
4
4
  const devkit_1 = require("@nrwl/devkit");
5
- const version_utils_1 = require("@nrwl/workspace/src/utilities/version-utils");
6
- const semver_1 = require("semver");
5
+ const semver_1 = require("@nrwl/devkit/src/utils/semver");
6
+ const semver_2 = require("semver");
7
7
  function detectTailwindInstalledVersion(tree) {
8
8
  var _a;
9
9
  const { dependencies, devDependencies } = (0, devkit_1.readJson)(tree, 'package.json');
@@ -11,11 +11,11 @@ function detectTailwindInstalledVersion(tree) {
11
11
  if (!tailwindVersion) {
12
12
  return undefined;
13
13
  }
14
- const version = (0, version_utils_1.checkAndCleanWithSemver)('tailwindcss', tailwindVersion);
15
- if ((0, semver_1.lt)(version, '2.0.0')) {
14
+ const version = (0, semver_1.checkAndCleanWithSemver)('tailwindcss', tailwindVersion);
15
+ if ((0, semver_2.lt)(version, '2.0.0')) {
16
16
  throw new Error(`The Tailwind CSS version "${tailwindVersion}" is not supported. Please upgrade to v2.0.0 or higher.`);
17
17
  }
18
- return (0, semver_1.lt)(version, '3.0.0') ? '2' : '3';
18
+ return (0, semver_2.lt)(version, '3.0.0') ? '2' : '3';
19
19
  }
20
20
  exports.detectTailwindInstalledVersion = detectTailwindInstalledVersion;
21
21
  //# sourceMappingURL=detect-tailwind-installed-version.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"detect-tailwind-installed-version.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-tailwind/lib/detect-tailwind-installed-version.ts"],"names":[],"mappings":";;;AAAA,yCAA8C;AAC9C,+EAAsF;AACtF,mCAA4B;AAE5B,SAAgB,8BAA8B,CAC5C,IAAU;;IAEV,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACzE,MAAM,eAAe,GACnB,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,WAAW,mCAAI,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,CAAC;IAE5D,IAAI,CAAC,eAAe,EAAE;QACpB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,OAAO,GAAG,IAAA,uCAAuB,EAAC,aAAa,EAAE,eAAe,CAAC,CAAC;IACxE,IAAI,IAAA,WAAE,EAAC,OAAO,EAAE,OAAO,CAAC,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,6BAA6B,eAAe,yDAAyD,CACtG,CAAC;KACH;IAED,OAAO,IAAA,WAAE,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AAC1C,CAAC;AAnBD,wEAmBC"}
1
+ {"version":3,"file":"detect-tailwind-installed-version.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-tailwind/lib/detect-tailwind-installed-version.ts"],"names":[],"mappings":";;;AAAA,yCAA8C;AAC9C,0DAAwE;AACxE,mCAA4B;AAE5B,SAAgB,8BAA8B,CAC5C,IAAU;;IAEV,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACzE,MAAM,eAAe,GACnB,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,WAAW,mCAAI,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,CAAC;IAE5D,IAAI,CAAC,eAAe,EAAE;QACpB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,OAAO,GAAG,IAAA,gCAAuB,EAAC,aAAa,EAAE,eAAe,CAAC,CAAC;IACxE,IAAI,IAAA,WAAE,EAAC,OAAO,EAAE,OAAO,CAAC,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,6BAA6B,eAAe,yDAAyD,CACtG,CAAC;KACH;IAED,OAAO,IAAA,WAAE,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AAC1C,CAAC;AAnBD,wEAmBC"}
@@ -15,7 +15,7 @@ function generateStorybookConfiguration(tree, options) {
15
15
  cypressDirectory: options.cypressDirectory,
16
16
  tsConfiguration: options.tsConfiguration,
17
17
  configureTestRunner: options.configureTestRunner,
18
- storybook7betaConfiguration: options.storybook7betaConfiguration,
18
+ storybook7Configuration: options.storybook7Configuration,
19
19
  });
20
20
  });
21
21
  }
@@ -1 +1 @@
1
- {"version":3,"file":"generate-storybook-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/storybook-configuration/lib/generate-storybook-configuration.ts"],"names":[],"mappings":";;;;AAAA,yCAAsE;AAEtE,sDAAoD;AAEpD,SAAsB,8BAA8B,CAClD,IAAU,EACV,OAAsC;;QAEtC,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAA,sBAAa,EAC9C,iBAAiB,EACjB,oBAAS,CACV,CAAC;QACF,OAAO,MAAM,sBAAsB,CAAC,IAAI,EAAE;YACxC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,oBAAoB;YACjC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;YAChD,2BAA2B,EAAE,OAAO,CAAC,2BAA2B;SACjE,CAAC,CAAC;IACL,CAAC;CAAA;AAlBD,wEAkBC"}
1
+ {"version":3,"file":"generate-storybook-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/storybook-configuration/lib/generate-storybook-configuration.ts"],"names":[],"mappings":";;;;AAAA,yCAAsE;AAEtE,sDAAoD;AAEpD,SAAsB,8BAA8B,CAClD,IAAU,EACV,OAAsC;;QAEtC,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAA,sBAAa,EAC9C,iBAAiB,EACjB,oBAAS,CACV,CAAC;QACF,OAAO,MAAM,sBAAsB,CAAC,IAAI,EAAE;YACxC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,oBAAoB;YACjC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;YAChD,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;SACzD,CAAC,CAAC;IACL,CAAC;CAAA;AAlBD,wEAkBC"}
@@ -11,5 +11,5 @@ export interface StorybookConfigurationOptions {
11
11
  skipFormat?: boolean;
12
12
  ignorePaths?: string[];
13
13
  configureTestRunner?: boolean;
14
- storybook7betaConfiguration?: boolean;
14
+ storybook7Configuration?: boolean;
15
15
  }
@@ -80,11 +80,12 @@
80
80
  "type": "boolean",
81
81
  "description": "Add a Storybook Test-Runner target."
82
82
  },
83
- "storybook7betaConfiguration": {
84
- "description": "Configure your workspace to use Storybook 7, even though Storybook v7 is still in beta.",
83
+ "storybook7Configuration": {
84
+ "description": "Configure your workspace using Storybook version 7.",
85
85
  "type": "boolean",
86
86
  "default": false,
87
- "hidden": true
87
+ "hidden": true,
88
+ "aliases": ["storybook7betaConfiguration"]
88
89
  }
89
90
  },
90
91
  "additionalProperties": false,
@@ -1,9 +1,9 @@
1
1
  import { Tree } from '@nrwl/devkit';
2
2
  export type GenerationOptions = {
3
3
  name: string;
4
+ project: string;
4
5
  flat?: boolean;
5
6
  path?: string;
6
- project?: string;
7
7
  type?: string;
8
8
  };
9
9
  export type FileInfo = {
@@ -15,13 +15,12 @@ function getPipeFileInfo(tree, options) {
15
15
  }
16
16
  exports.getPipeFileInfo = getPipeFileInfo;
17
17
  function getFileInfo(tree, options, defaultType) {
18
- var _a, _b;
19
- const project = (_a = options.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readNxJson)(tree).defaultProject;
20
- const { root, sourceRoot, projectType } = (0, devkit_1.readProjectConfiguration)(tree, project);
18
+ var _a;
19
+ const { root, sourceRoot, projectType } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
21
20
  const { fileName: normalizedName } = (0, devkit_1.names)(options.name);
22
21
  const fileName = `${normalizedName}.${options.type ? (0, devkit_1.names)(options.type).fileName : defaultType}`;
23
22
  const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
24
- const path = (_b = options.path) !== null && _b !== void 0 ? _b : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
23
+ const path = (_a = options.path) !== null && _a !== void 0 ? _a : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
25
24
  const directory = options.flat
26
25
  ? (0, devkit_1.normalizePath)(path)
27
26
  : (0, devkit_1.joinPathFragments)(path, normalizedName);
@@ -1 +1 @@
1
- {"version":3,"file":"file-info.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/file-info.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AAetB,SAAgB,oBAAoB,CAClC,IAAU,EACV,OAA0B;IAE1B,OAAO,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;AACjD,CAAC;AALD,oDAKC;AAED,SAAgB,oBAAoB,CAClC,IAAU,EACV,OAA0B;IAE1B,OAAO,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;AACjD,CAAC;AALD,oDAKC;AAED,SAAgB,eAAe,CAC7B,IAAU,EACV,OAA0B;IAE1B,OAAO,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAC5C,CAAC;AALD,0CAKC;AAED,SAAS,WAAW,CAClB,IAAU,EACV,OAA0B,EAC1B,WAAmB;;IAEnB,MAAM,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IACnE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CACR,CAAC;IACF,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzD,MAAM,QAAQ,GAAG,GAAG,cAAc,IAChC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAChD,EAAE,CAAC;IAEH,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvE,MAAM,IAAI,GACR,MAAA,OAAO,CAAC,IAAI,mCACZ,IAAA,0BAAiB,EACf,iBAAiB,EACjB,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAC9C,CAAC;IACJ,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI;QAC5B,CAAC,CAAC,IAAA,sBAAa,EAAC,IAAI,CAAC;QACrB,CAAC,CAAC,IAAA,0BAAiB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAE5C,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,GAAG,QAAQ,KAAK,CAAC,CAAC;IAEhE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;AAC3C,CAAC"}
1
+ {"version":3,"file":"file-info.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/file-info.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAetB,SAAgB,oBAAoB,CAClC,IAAU,EACV,OAA0B;IAE1B,OAAO,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;AACjD,CAAC;AALD,oDAKC;AAED,SAAgB,oBAAoB,CAClC,IAAU,EACV,OAA0B;IAE1B,OAAO,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;AACjD,CAAC;AALD,oDAKC;AAED,SAAgB,eAAe,CAC7B,IAAU,EACV,OAA0B;IAE1B,OAAO,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAC5C,CAAC;AALD,0CAKC;AAED,SAAS,WAAW,CAClB,IAAU,EACV,OAA0B,EAC1B,WAAmB;;IAEnB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CAAC,OAAO,CAChB,CAAC;IACF,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzD,MAAM,QAAQ,GAAG,GAAG,cAAc,IAChC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAChD,EAAE,CAAC;IAEH,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvE,MAAM,IAAI,GACR,MAAA,OAAO,CAAC,IAAI,mCACZ,IAAA,0BAAiB,EACf,iBAAiB,EACjB,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAC9C,CAAC;IACJ,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI;QAC5B,CAAC,CAAC,IAAA,sBAAa,EAAC,IAAI,CAAC;QACrB,CAAC,CAAC,IAAA,0BAAiB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAE5C,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,GAAG,QAAQ,KAAK,CAAC,CAAC;IAEhE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;AAC3C,CAAC"}
@@ -0,0 +1,4 @@
1
+ import type { Tree } from '@nrwl/devkit';
2
+ import { ngModuleDecoratorProperty } from './insert-ngmodule-import';
3
+ export declare function findModule(tree: Tree, path: string, module?: string): string;
4
+ export declare function addToNgModule(tree: Tree, path: string, modulePath: string, name: string, className: string, fileName: string, ngModuleProperty: ngModuleDecoratorProperty, isFlat?: boolean, isExported?: boolean): void;
@@ -0,0 +1,59 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.addToNgModule = exports.findModule = void 0;
4
+ const devkit_1 = require("@nrwl/devkit");
5
+ const path_1 = require("path");
6
+ const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
7
+ const js_1 = require("@nrwl/js");
8
+ const insert_ngmodule_import_1 = require("./insert-ngmodule-import");
9
+ let tsModule;
10
+ function findModule(tree, path, module) {
11
+ let modulePath = '';
12
+ let pathToSearch = path;
13
+ while (pathToSearch !== '/') {
14
+ if (module) {
15
+ const pathToModule = (0, devkit_1.joinPathFragments)(pathToSearch, module);
16
+ if (tree.exists(pathToModule)) {
17
+ modulePath = pathToModule;
18
+ break;
19
+ }
20
+ }
21
+ else {
22
+ const potentialOptions = tree
23
+ .children(pathToSearch)
24
+ .filter((f) => f.endsWith('.module.ts'));
25
+ if (potentialOptions.length > 1) {
26
+ throw new Error(`More than one NgModule was found. Please provide the NgModule you wish to use.`);
27
+ }
28
+ else if (potentialOptions.length === 1) {
29
+ modulePath = (0, devkit_1.joinPathFragments)(pathToSearch, potentialOptions[0]);
30
+ break;
31
+ }
32
+ }
33
+ pathToSearch = (0, path_1.dirname)(pathToSearch);
34
+ }
35
+ const moduleContents = tree.read(modulePath, 'utf-8');
36
+ if (!moduleContents.includes('@NgModule')) {
37
+ throw new Error(`Declaring module file (${modulePath}) does not contain an @NgModule Declaration.`);
38
+ }
39
+ return modulePath;
40
+ }
41
+ exports.findModule = findModule;
42
+ function addToNgModule(tree, path, modulePath, name, className, fileName, ngModuleProperty, isFlat = true, isExported = false) {
43
+ if (!tsModule) {
44
+ tsModule = (0, ensure_typescript_1.ensureTypescript)();
45
+ }
46
+ let relativePath = `${(0, devkit_1.joinPathFragments)(path.replace((0, path_1.dirname)(modulePath), ''), !isFlat ? name : '', `${fileName}`)}`;
47
+ relativePath = relativePath.startsWith('/')
48
+ ? `.${relativePath}`
49
+ : `./${relativePath}`;
50
+ const moduleContents = tree.read(modulePath, 'utf-8');
51
+ const source = tsModule.createSourceFile(modulePath, moduleContents, tsModule.ScriptTarget.Latest, true);
52
+ (0, js_1.insertImport)(tree, source, modulePath, className, relativePath);
53
+ (0, insert_ngmodule_import_1.insertNgModuleProperty)(tree, modulePath, className, ngModuleProperty);
54
+ if (isExported) {
55
+ (0, insert_ngmodule_import_1.insertNgModuleProperty)(tree, modulePath, className, 'exports');
56
+ }
57
+ }
58
+ exports.addToNgModule = addToNgModule;
59
+ //# sourceMappingURL=find-module.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"find-module.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/find-module.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,6 @@
1
+ /**
2
+ * Replaces slashes with dashes
3
+ *
4
+ * @param path
5
+ */
6
+ export declare function getNewProjectName(path: string): string;
@@ -0,0 +1,13 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getNewProjectName = void 0;
4
+ /**
5
+ * Replaces slashes with dashes
6
+ *
7
+ * @param path
8
+ */
9
+ function getNewProjectName(path) {
10
+ return path.replace(/\//g, '-');
11
+ }
12
+ exports.getNewProjectName = getNewProjectName;
13
+ //# sourceMappingURL=get-new-project-name.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"get-new-project-name.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/get-new-project-name.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,IAAY;IAC5C,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAClC,CAAC;AAFD,8CAEC"}
@@ -1 +1,2 @@
1
1
  export * from './insert-ngmodule-import';
2
+ export * from './find-module';
@@ -2,4 +2,5 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const tslib_1 = require("tslib");
4
4
  tslib_1.__exportStar(require("./insert-ngmodule-import"), exports);
5
+ tslib_1.__exportStar(require("./find-module"), exports);
5
6
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/index.ts"],"names":[],"mappings":";;;AAAA,mEAAyC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/index.ts"],"names":[],"mappings":";;;AAAA,mEAAyC;AACzC,wDAA8B"}
@@ -1,5 +1,4 @@
1
1
  import { Tree } from '@nrwl/devkit';
2
- type ngModuleDecoratorProperty = 'imports' | 'providers' | 'declarations' | 'exports';
2
+ export type ngModuleDecoratorProperty = 'imports' | 'providers' | 'declarations' | 'exports';
3
3
  export declare function insertNgModuleProperty(tree: Tree, modulePath: string, name: string, property: ngModuleDecoratorProperty): void;
4
4
  export declare function insertNgModuleImport(tree: Tree, modulePath: string, importName: string): void;
5
- export {};