@nrwl/angular 14.0.0-beta.0 → 14.0.0-beta.3

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 (117) hide show
  1. package/.eslintrc.json +26 -0
  2. package/executors.json +20 -0
  3. package/generators.d.ts +2 -2
  4. package/generators.js +2 -2
  5. package/generators.js.map +1 -1
  6. package/generators.json +16 -20
  7. package/migrations.json +6 -0
  8. package/ng-package.json +2 -0
  9. package/package.json +9 -6
  10. package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.d.ts +6 -0
  11. package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js +44 -0
  12. package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -0
  13. package/src/builders/module-federation-dev-server/schema.d.ts +21 -0
  14. package/src/builders/module-federation-dev-server/schema.json +115 -0
  15. package/src/executors/file-server/compat.d.ts +2 -0
  16. package/src/executors/file-server/compat.js +6 -0
  17. package/src/executors/file-server/compat.js.map +1 -0
  18. package/src/executors/file-server/file-server.impl.d.ts +8 -0
  19. package/src/executors/file-server/file-server.impl.js +161 -0
  20. package/src/executors/file-server/file-server.impl.js.map +1 -0
  21. package/src/executors/file-server/schema.d.ts +14 -0
  22. package/src/executors/file-server/schema.json +67 -0
  23. package/src/generators/application/files/tsconfig.editor.json__tpl__ +1 -7
  24. package/src/generators/application/lib/update-editor-tsconfig.d.ts +1 -1
  25. package/src/generators/application/lib/update-editor-tsconfig.js +14 -2
  26. package/src/generators/application/lib/update-editor-tsconfig.js.map +1 -1
  27. package/src/generators/application/schema.json +5 -5
  28. package/src/generators/convert-to-with-mf/convert-to-with-mf.js +4 -4
  29. package/src/generators/convert-to-with-mf/convert-to-with-mf.js.map +1 -1
  30. package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.js +1 -1
  31. package/src/generators/{mfe-host/mfe-host.compat.d.ts → host/host.compat.d.ts} +0 -0
  32. package/src/generators/host/host.compat.js +6 -0
  33. package/src/generators/host/host.compat.js.map +1 -0
  34. package/src/generators/host/host.d.ts +3 -0
  35. package/src/generators/host/host.js +34 -0
  36. package/src/generators/host/host.js.map +1 -0
  37. package/src/generators/{mfe-host → host}/schema.d.ts +0 -0
  38. package/src/generators/{mfe-host → host}/schema.json +5 -5
  39. package/src/generators/karma/karma.js +1 -0
  40. package/src/generators/karma/karma.js.map +1 -1
  41. package/src/generators/library/library.js +2 -7
  42. package/src/generators/library/library.js.map +1 -1
  43. package/src/generators/ng-add/migrate-from-angular-cli.js +9 -6
  44. package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
  45. package/src/generators/ng-add/schema.d.ts +0 -1
  46. package/src/generators/ng-add/schema.json +0 -7
  47. package/src/generators/ng-add/utilities/app.migrator.d.ts +1 -3
  48. package/src/generators/ng-add/utilities/app.migrator.js +27 -58
  49. package/src/generators/ng-add/utilities/app.migrator.js.map +1 -1
  50. package/src/generators/ng-add/utilities/{e2e-project.migrator.d.ts → e2e.migrator.d.ts} +0 -0
  51. package/src/generators/ng-add/utilities/{e2e-project.migrator.js → e2e.migrator.js} +32 -11
  52. package/src/generators/ng-add/utilities/e2e.migrator.js.map +1 -0
  53. package/src/generators/ng-add/utilities/lib.migrator.d.ts +26 -0
  54. package/src/generators/ng-add/utilities/lib.migrator.js +351 -0
  55. package/src/generators/ng-add/utilities/lib.migrator.js.map +1 -0
  56. package/src/generators/ng-add/utilities/normalize-options.js +5 -2
  57. package/src/generators/ng-add/utilities/normalize-options.js.map +1 -1
  58. package/src/generators/ng-add/utilities/project.migrator.d.ts +11 -2
  59. package/src/generators/ng-add/utilities/project.migrator.js +82 -4
  60. package/src/generators/ng-add/utilities/project.migrator.js.map +1 -1
  61. package/src/generators/ng-add/utilities/types.d.ts +9 -1
  62. package/src/generators/ng-add/utilities/validate-projects.d.ts +2 -0
  63. package/src/generators/ng-add/utilities/validate-projects.js +46 -0
  64. package/src/generators/ng-add/utilities/validate-projects.js.map +1 -0
  65. package/src/generators/ng-add/utilities/validation-logging.d.ts +2 -0
  66. package/src/generators/ng-add/utilities/validation-logging.js +20 -0
  67. package/src/generators/ng-add/utilities/validation-logging.js.map +1 -0
  68. package/src/generators/ng-add/utilities/workspace.d.ts +1 -1
  69. package/src/generators/ng-add/utilities/workspace.js +13 -17
  70. package/src/generators/ng-add/utilities/workspace.js.map +1 -1
  71. package/src/generators/{mfe-remote/mfe-remote.compat.d.ts → remote/remote.compat.d.ts} +0 -0
  72. package/src/generators/remote/remote.compat.js +6 -0
  73. package/src/generators/remote/remote.compat.js.map +1 -0
  74. package/src/generators/remote/remote.d.ts +3 -0
  75. package/src/generators/remote/remote.js +76 -0
  76. package/src/generators/remote/remote.js.map +1 -0
  77. package/src/generators/{mfe-remote → remote}/schema.d.ts +0 -0
  78. package/src/generators/{mfe-remote → remote}/schema.json +5 -5
  79. package/src/generators/setup-mfe/files/webpack/{mfe.config.js__tmpl__ → module-federation.config.js__tmpl__} +0 -0
  80. package/src/generators/setup-mfe/files/webpack/webpack.config.js__tmpl__ +1 -1
  81. package/src/generators/setup-mfe/files/webpack/webpack.prod.config.js__tmpl__ +1 -1
  82. package/src/generators/setup-mfe/lib/add-remote-to-host.js +10 -10
  83. package/src/generators/setup-mfe/lib/add-remote-to-host.js.map +1 -1
  84. package/src/generators/setup-mfe/lib/fix-bootstrap.js +3 -3
  85. package/src/generators/setup-mfe/lib/fix-bootstrap.js.map +1 -1
  86. package/src/generators/setup-mfe/lib/generate-config.js +1 -1
  87. package/src/generators/setup-mfe/lib/generate-config.js.map +1 -1
  88. package/src/generators/setup-mfe/lib/setup-host-if-dynamic.js +3 -3
  89. package/src/generators/setup-mfe/lib/setup-host-if-dynamic.js.map +1 -1
  90. package/src/generators/setup-mfe/lib/setup-serve-target.js +18 -19
  91. package/src/generators/setup-mfe/lib/setup-serve-target.js.map +1 -1
  92. package/src/generators/utils/dependencies.d.ts +2 -0
  93. package/src/generators/utils/dependencies.js +15 -0
  94. package/src/generators/utils/dependencies.js.map +1 -0
  95. package/src/migrations/update-13-8-1/add-cypress-mfe-workaround.js +2 -2
  96. package/src/migrations/update-13-8-1/add-cypress-mfe-workaround.js.map +1 -1
  97. package/src/migrations/update-14-0-0/rename-mf-config.d.ts +2 -0
  98. package/src/migrations/update-14-0-0/rename-mf-config.js +27 -0
  99. package/src/migrations/update-14-0-0/rename-mf-config.js.map +1 -0
  100. package/src/utils/{get-mfe-projects.d.ts → get-mf-projects.d.ts} +1 -1
  101. package/src/utils/{get-mfe-projects.js → get-mf-projects.js} +4 -4
  102. package/src/utils/get-mf-projects.js.map +1 -0
  103. package/src/utils/mfe/mfe-webpack.js +45 -8
  104. package/src/utils/mfe/mfe-webpack.js.map +1 -1
  105. package/src/utils/versions.js +1 -1
  106. package/src/generators/mfe-host/mfe-host.compat.js +0 -6
  107. package/src/generators/mfe-host/mfe-host.compat.js.map +0 -1
  108. package/src/generators/mfe-host/mfe-host.d.ts +0 -3
  109. package/src/generators/mfe-host/mfe-host.js +0 -22
  110. package/src/generators/mfe-host/mfe-host.js.map +0 -1
  111. package/src/generators/mfe-remote/mfe-remote.compat.js +0 -6
  112. package/src/generators/mfe-remote/mfe-remote.compat.js.map +0 -1
  113. package/src/generators/mfe-remote/mfe-remote.d.ts +0 -3
  114. package/src/generators/mfe-remote/mfe-remote.js +0 -31
  115. package/src/generators/mfe-remote/mfe-remote.js.map +0 -1
  116. package/src/generators/ng-add/utilities/e2e-project.migrator.js.map +0 -1
  117. package/src/utils/get-mfe-projects.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"app.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/app.migrator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"app.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/app.migrator.ts"],"names":[],"mappings":"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"}
@@ -42,24 +42,45 @@ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
42
42
  }
43
43
  if (this.isProtractorE2eProject()) {
44
44
  if (this.tree.exists(this.projectConfig.targets.e2e.options.protractorConfig)) {
45
- return;
45
+ return null;
46
46
  }
47
- return (`An e2e project with Protractor was found but "${this.projectConfig.targets.e2e.options.protractorConfig}" could not be found.\n` +
48
- `Make sure the "${this.appName}.architect.e2e.options.protractorConfig" is valid or the "${this.appName}" project is removed from "angular.json".`);
47
+ return [
48
+ {
49
+ message: `The "e2e" target is using a Protractor builder but the Protractor config file ` +
50
+ `"${this.projectConfig.targets.e2e.options.protractorConfig}" could not be found.`,
51
+ hint: `Make sure the "${this.appName}.architect.e2e.options.protractorConfig" is set to a valid path ` +
52
+ `or remove the "${this.appName}.architect.e2e" target if it is not valid.`,
53
+ },
54
+ ];
49
55
  }
50
56
  else if (this.isCypressE2eProject()) {
51
57
  const configFile = this.getCypressConfigFile();
52
58
  if (configFile && !this.tree.exists(configFile)) {
53
- return `An e2e project with Cypress was found but "${configFile}" could not be found.`;
59
+ return [
60
+ {
61
+ message: `The "e2e" target is using a Cypress builder but the Cypress config file "${configFile}" could not be found.`,
62
+ hint: `Make sure the "${this.appName}.architect.e2e.options.configFile" option is set to a valid path, ` +
63
+ `or that a "cypress.json" file exists in the workspace root, ` +
64
+ `or remove the "${this.appName}.architect.e2e" target if it its not valid.`,
65
+ },
66
+ ];
54
67
  }
55
68
  if (!this.tree.exists('cypress')) {
56
- return `An e2e project with Cypress was found but the "cypress" directory could not be found.`;
69
+ return [
70
+ {
71
+ message: `The "e2e" target is using a Cypress builder but the "cypress" directory could not be found.`,
72
+ hint: 'Make sure the "cypress" directory exists in the workspace root or remove the "e2e" target if it is not valid.',
73
+ },
74
+ ];
57
75
  }
76
+ return null;
58
77
  }
59
- else {
60
- return `An e2e project was found but it's using an unsupported executor "${this.projectConfig.targets.e2e.executor}".`;
61
- }
62
- return null;
78
+ return [
79
+ {
80
+ message: `The "e2e" target is using an unsupported builder "${this.projectConfig.targets.e2e.executor}".`,
81
+ hint: `The supported builders are "@cypress/schematic:cypress" and "@angular-devkit/build-angular:protractor".`,
82
+ },
83
+ ];
63
84
  }
64
85
  initialize() {
65
86
  var _a;
@@ -91,7 +112,7 @@ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
91
112
  root: this.project.newRoot,
92
113
  projectType: 'application',
93
114
  targets: {
94
- e2e: Object.assign(Object.assign({}, this.projectConfig.targets.e2e), { options: Object.assign(Object.assign({}, this.projectConfig.targets.e2e.options), { protractorConfig: (0, devkit_1.joinPathFragments)(this.project.newRoot, 'protractor.conf.js') }) }),
115
+ e2e: Object.assign(Object.assign({}, this.projectConfig.targets.e2e), { options: Object.assign(Object.assign({}, this.projectConfig.targets.e2e.options), { protractorConfig: (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(this.projectConfig.targets.e2e.options.protractorConfig)) }) }),
95
116
  },
96
117
  implicitDependencies: [this.appName],
97
118
  tags: [],
@@ -274,4 +295,4 @@ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
274
295
  }
275
296
  }
276
297
  exports.E2eProjectMigrator = E2eProjectMigrator;
277
- //# sourceMappingURL=e2e-project.migrator.js.map
298
+ //# sourceMappingURL=e2e.migrator.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"e2e.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/e2e.migrator.ts"],"names":[],"mappings":";;;;AAAA,2CAAwD;AACxD,yCAesB;AACtB,yCAA4D;AAC5D,yEAAqF;AACrF,+BAA0C;AAE1C,yDAAqD;AAGrD,MAAa,kBAAmB,SAAQ,kCAAe;IAKrD,YACE,IAAU,EACV,OAAyB,EACzB,OAAsC;QAEtC,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAEtC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;QAEjC,IAAI,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;IAEK,OAAO;;YACX,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACjB,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,8EAA8E,CAC/E,CAAC;gBACF,OAAO;aACR;YAED,IAAI,IAAI,CAAC,sBAAsB,EAAE,EAAE;gBACjC,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAC;aAC1C;iBAAM,IAAI,IAAI,CAAC,mBAAmB,EAAE,EAAE;gBACrC,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;aACvC;YAED,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAChC,IAAI,CAAC,aAAa,CAAC,IAAI,EACvB,eAAe,CAChB,CAAC;YACF,MAAM,UAAU,GAAG,IAAA,uBAAc,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACxD,IAAA,mBAAU,EAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE;gBACvC,IAAI,CAAC,OAAO,GAAG,GAAG,UAAU,GAAG,IAAA,sCAAyB,EAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACtE,IAAI,CAAC,eAAe,mCACf,IAAI,CAAC,eAAe,KACvB,MAAM,EAAE,GAAG,UAAU,cAAc,GACpC,CAAC;gBACF,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;IAED,QAAQ;QACN,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,OAAO,IAAI,CAAC;SACb;QAED,IAAI,IAAI,CAAC,sBAAsB,EAAE,EAAE;YACjC,IACE,IAAI,CAAC,IAAI,CAAC,MAAM,CACd,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,CACxD,EACD;gBACA,OAAO,IAAI,CAAC;aACb;YAED,OAAO;gBACL;oBACE,OAAO,EACL,gFAAgF;wBAChF,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,uBAAuB;oBACpF,IAAI,EACF,kBAAkB,IAAI,CAAC,OAAO,kEAAkE;wBAChG,kBAAkB,IAAI,CAAC,OAAO,4CAA4C;iBAC7E;aACF,CAAC;SACH;aAAM,IAAI,IAAI,CAAC,mBAAmB,EAAE,EAAE;YACrC,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC/C,IAAI,UAAU,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;gBAC/C,OAAO;oBACL;wBACE,OAAO,EAAE,4EAA4E,UAAU,uBAAuB;wBACtH,IAAI,EACF,kBAAkB,IAAI,CAAC,OAAO,oEAAoE;4BAClG,8DAA8D;4BAC9D,kBAAkB,IAAI,CAAC,OAAO,6CAA6C;qBAC9E;iBACF,CAAC;aACH;YAED,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;gBAChC,OAAO;oBACL;wBACE,OAAO,EAAE,6FAA6F;wBACtG,IAAI,EAAE,+GAA+G;qBACtH;iBACF,CAAC;aACH;YAED,OAAO,IAAI,CAAC;SACb;QAED,OAAO;YACL;gBACE,OAAO,EAAE,qDAAqD,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI;gBACzG,IAAI,EAAE,yGAAyG;aAChH;SACF,CAAC;IACJ,CAAC;IAEO,UAAU;;QAChB,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,aAAa,CAAC,OAAO,0CAAE,GAAG,CAAA,EAAE;YACpC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,OAAO;SACR;QAED,IAAI,CAAC,oBAAoB;YACvB,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;gBACpC,IAAI,CAAC,IAAI,CAAC,MAAM,CACd,IAAA,0BAAiB,EAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,gBAAgB,CAAC,CACzD,CAAC;QAEJ,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC7C,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI;YACnB,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC;QAC/B,MAAM,OAAO,GAAG,IAAA,0BAAiB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAChD,MAAM,aAAa,GAAG,IAAA,0BAAiB,EAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QAE7D,IAAI,IAAI,CAAC,sBAAsB,EAAE,EAAE;YACjC,IAAI,CAAC,OAAO,mCACP,IAAI,CAAC,OAAO,KACf,IAAI,EACJ,OAAO,EAAE,IAAA,0BAAiB,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,EACvD,OAAO;gBACP,aAAa,GACd,CAAC;SACH;aAAM,IAAI,IAAI,CAAC,mBAAmB,EAAE,EAAE;YACrC,IAAI,CAAC,OAAO,mCACP,IAAI,CAAC,OAAO,KACf,IAAI,EACJ,OAAO,EAAE,SAAS,EAClB,OAAO;gBACP,aAAa,GACd,CAAC;SACH;IACH,CAAC;IAEa,2BAA2B;;YACvC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAEzD,IAAI,CAAC,aAAa,GAAG;gBACnB,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO;gBAC1B,WAAW,EAAE,aAAa;gBAC1B,OAAO,EAAE;oBACP,GAAG,kCACE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,KACjC,OAAO,kCACF,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,KACzC,gBAAgB,EAAE,IAAA,0BAAiB,EACjC,IAAI,CAAC,OAAO,CAAC,OAAO,EACpB,IAAA,eAAQ,EAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAClE,MAEJ;iBACF;gBACD,oBAAoB,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;gBACpC,IAAI,EAAE,EAAE;aACT,CAAC;YACF,IAAA,gCAAuB,EACrB,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,OAAO,CAAC,IAAI,oBAEZ,IAAI,CAAC,aAAa,GAEvB,IAAI,CACL,CAAC;YAEF,IAAI,IAAI,CAAC,oBAAoB,EAAE;gBAC7B,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,IAAI,EAAE;oBACpC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;oBAC1B,MAAM,EAAE,eAAM,CAAC,MAAM;oBACrB,kBAAkB,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,eAAe,CAAC;oBAC5D,aAAa,EAAE;wBACb,IAAA,0BAAiB,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC;qBACzD;oBACD,UAAU,EAAE,IAAI;iBACjB,CAAC,CAAC;aACJ;YAED,wCAAwC;YACxC,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC;YAClC,IAAA,mCAA0B,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,oBAC7C,IAAI,CAAC,SAAS,EACjB,CAAC;QACL,CAAC;KAAA;IAEa,wBAAwB;;YACpC,MAAM,wBAAwB,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAE7D,MAAM,IAAA,iCAAuB,EAAC,IAAI,CAAC,IAAI,EAAE;gBACvC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;gBACvB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,eAAM,CAAC,MAAM,CAAC,CAAC,CAAC,eAAM,CAAC,IAAI;gBAC/D,gBAAgB,EAAE,IAAI;gBACtB,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;YAEH,MAAM,qBAAqB,GAAG,IAAI,CAAC,+BAA+B,CAChE,wBAAwB,CACzB,CAAC;YACF,IAAI,CAAC,iCAAiC,CAAC,qBAAqB,CAAC,CAAC;YAE9D,2DAA2D;YAC3D,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,IAAI,CAAC,OAAO,CAAC,OAAO,EACpB,eAAe,CAChB,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YAClC,IAAI,CAAC,QAAQ,CACX,IAAA,0BAAiB,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,EACxD,eAAe,CAChB,CAAC;YAEF,uDAAuD;YACvD,IAAA,6BAAoB,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACvE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC7B,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,CACV,IAAI,CAAC,OAAO,CAAC,OAAO,EACpB,IAAA,0BAAiB,EAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAC9C,CAAC;QACJ,CAAC;KAAA;IAEO,+BAA+B,CAAC,UAAkB;QACxD,IAAI,qBAA6B,CAAC;QAElC,IAAI,UAAU,EAAE;YACd,qBAAqB,GAAG,IAAA,0BAAiB,EACvC,IAAI,CAAC,OAAO,CAAC,OAAO,EACpB,IAAA,eAAQ,EAAC,UAAU,CAAC,CACrB,CAAC;YACF,IAAI,CAAC,4BAA4B,CAAC,UAAU,CAAC,CAAC;YAC9C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;YACxC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC;SAClD;aAAM;YACL,qBAAqB,GAAG,IAAA,0BAAiB,EACvC,IAAI,CAAC,OAAO,CAAC,OAAO,EACpB,cAAc,CACf,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,KAAK,CACb,qBAAqB,EACrB,IAAI,CAAC,SAAS,CAAC;gBACb,gBAAgB,EAAE,GAAG;gBACrB,cAAc,EAAE,gBAAgB;gBAChC,iBAAiB,EAAE,mBAAmB;gBACtC,qBAAqB,EAAE,KAAK;gBAC5B,WAAW,EAAE,wBAAwB;gBACrC,WAAW,EAAE,wBAAwB;gBACrC,KAAK,EAAE,IAAI;gBACX,YAAY,EAAE,sBAAsB,IAAI,CAAC,OAAO,CAAC,OAAO,SAAS;gBACjE,iBAAiB,EAAE,sBAAsB,IAAI,CAAC,OAAO,CAAC,OAAO,cAAc;gBAC3E,iBAAiB,EAAE,KAAK;aACzB,CAAC,CACH,CAAC;SACH;QAED,OAAO,qBAAqB,CAAC;IAC/B,CAAC;IAEO,iCAAiC,CAAC,iBAAyB;QACjE;;;;;WAKG;QACH,MAAM,oBAAoB,GAAG,IAAA,cAAK,EAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QAC/D,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,oBAAoB,EAAE;YAC9C,mEAAmE;YACnE,IAAI,CAAC,aAAa,GAAG,IAAA,iCAAwB,EAC3C,IAAI,CAAC,IAAI,EACT,oBAAoB,CACrB,CAAC;YAEF,IAAI,CAAC,aAAa,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;YAC/C,IAAI,CAAC,aAAa,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;YAC3D,IAAA,mCAA0B,EAAC,IAAI,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;YAC5D,IAAA,gCAAuB,EACrB,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,OAAO,CAAC,IAAI,oBACZ,IAAI,CAAC,aAAa,GACvB,IAAI,CACL,CAAC;SACH;aAAM;YACL,IAAI,CAAC,aAAa,GAAG,IAAA,iCAAwB,EAC3C,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,OAAO,CAAC,IAAI,CAClB,CAAC;SACH;QAED,IAAI,IAAI,CAAC,oBAAoB,EAAE;YAC7B,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB;gBACtD,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAC1D,CAAC,OAAO,EAAE,EAAE,CACV,OAAO,CAAC,OAAO,CACb,QAAQ,oBAAoB,EAAE,EAC9B,IAAI,CAAC,OAAO,CAAC,OAAO,CACrB,CACJ,CAAC;SACL;QAED,CAAC,KAAK,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACxD,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBAClC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,sBAAsB,CAC9D,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,EAC9B,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,EAClC,iBAAiB,CAClB,CAAC;aACH;QACH,CAAC,CAAC,CAAC;QAEH,IAAA,mCAA0B,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,oBAClD,IAAI,CAAC,aAAa,EACrB,CAAC;QAEH,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC7C,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAC9C,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC;QAClC,IAAA,mCAA0B,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,oBAC7C,IAAI,CAAC,SAAS,EACjB,CAAC;IACL,CAAC;IAEO,sBAAsB,CAC5B,cAAmC,EACnC,eAAoC,EACpC,aAAqB;QAErB,MAAM,aAAa,mCACd,cAAc,KACjB,QAAQ,EAAE,uBAAuB,EACjC,OAAO,kCACF,cAAc,CAAC,OAAO,KACzB,aAAa,MAEhB,CAAC;QACF,OAAO,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC;QACxC,IACE,eAAe;YACf,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ;YACjC,aAAa,CAAC,OAAO,CAAC,QAAQ,EAC9B;YACA,gEAAgE;YAChE,OAAO,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC;SACvC;aAAM,IAAI,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE;YACzC,aAAa,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAA,0BAAiB,EAChD,IAAI,CAAC,OAAO,CAAC,OAAO,EACpB,eAAe,CAChB,CAAC;SACH;QAED,IAAI,aAAa,CAAC,OAAO,CAAC,QAAQ,IAAI,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE;YACjE,aAAa,CAAC,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC;SACtC;aAAM,IACL,aAAa,CAAC,OAAO,CAAC,QAAQ,KAAK,KAAK;YACxC,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,EAC5B;YACA,aAAa,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;SACrC;QACD,OAAO,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC;QAEtC,OAAO,aAAa,CAAC;IACvB,CAAC;IAEO,4BAA4B,CAAC,cAAsB;QACzD,MAAM,kBAAkB,GAAG;YACzB,mBAAmB;YACnB,aAAa;YACb,aAAa;YACb,gBAAgB;SACjB,CAAC;QACF,MAAM,WAAW,GAAG,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC;QAC1D,MAAM,kBAAkB,GAAG,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;QAE5D,MAAM,aAAa,GAAG,IAAA,iBAAQ,EAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAE1D,aAAa,CAAC,gBAAgB,GAAG,GAAG,CAAC;QACrC,kBAAkB,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YAC1C,IAAI,aAAa,CAAC,YAAY,CAAC,EAAE;gBAC/B,aAAa,CAAC,YAAY,CAAC,GAAG,SAAS,IAAA,eAAQ,EAC7C,IAAI,CAAC,OAAO,CAAC,OAAO,EACpB,aAAa,CAAC,YAAY,CAAC,CAC5B,EAAE,CAAC;aACL;QACH,CAAC,CAAC,CAAC;QAEH,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC7B,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE;gBACzB,aAAa,CAAC,MAAM,CAAC,GAAG,sBACtB,IAAI,CAAC,OAAO,CAAC,OACf,IAAI,IAAA,eAAQ,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;aAC7D;QACH,CAAC,CAAC,CAAC;QAEH,kBAAkB,CAAC,OAAO,CAAC,CAAC,iBAAiB,EAAE,EAAE;YAC/C,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,EAAE;gBACrC,OAAO;aACR;YAED,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,EAAE;gBACnD,aAAa,CAAC,iBAAiB,CAAC,GAAG,aAAa,CAAC,iBAAiB,CAAC,CAAC,GAAG,CACrE,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CACtD,CAAC;aACH;iBAAM;gBACL,aAAa,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,wBAAwB,CAC9D,aAAa,CAAC,iBAAiB,CAAC,CACjC,CAAC;aACH;QACH,CAAC,CAAC,CAAC;QAEH,IAAA,kBAAS,EAAC,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;IACtD,CAAC;IAEO,wBAAwB,CAAC,WAAmB;QAClD,OAAO,WAAW,CAAC,OAAO,CACxB,IAAI,MAAM,CAAC,iBAAiB,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,CAAC,EACtD,QAAQ,CACT,CAAC;IACJ,CAAC;IAEO,oBAAoB;QAC1B,IAAI,aAAa,GAAG,cAAc,CAAC;QACnC,MAAM,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC;QAC3E,IAAI,gBAAgB,KAAK,KAAK,EAAE;YAC9B,aAAa,GAAG,SAAS,CAAC;SAC3B;aAAM,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE;YAC/C,aAAa,GAAG,IAAA,eAAQ,EAAC,gBAAgB,CAAC,CAAC;SAC5C;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;IAEO,mBAAmB;QACzB,OAAO,CACL,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,4BAA4B,CACzE,CAAC;IACJ,CAAC;IAEO,sBAAsB;QAC5B,OAAO,CACL,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ;YACvC,0CAA0C,CAC3C,CAAC;IACJ,CAAC;CACF;AAjcD,gDAicC"}
@@ -0,0 +1,26 @@
1
+ import { Tree } from '@nrwl/devkit';
2
+ import { GeneratorOptions } from '../schema';
3
+ import { Logger } from './logger';
4
+ import { ProjectMigrator } from './project.migrator';
5
+ import { MigrationProjectConfiguration, ValidationResult } from './types';
6
+ export declare class LibMigrator extends ProjectMigrator {
7
+ private readonly supportedBuilders;
8
+ private readonly targetNames;
9
+ private oldEsLintConfigPath;
10
+ private newEsLintConfigPath;
11
+ constructor(tree: Tree, options: GeneratorOptions, project: MigrationProjectConfiguration, logger?: Logger);
12
+ migrate(): Promise<void>;
13
+ validate(): ValidationResult;
14
+ private collectTargetNames;
15
+ private moveProjectFiles;
16
+ private updateProjectConfiguration;
17
+ private updateNgPackageJson;
18
+ private updateTsConfigs;
19
+ private updateEsLintConfig;
20
+ private updateCacheableOperations;
21
+ private updateBuildTargetConfiguration;
22
+ private updateLintTargetConfiguration;
23
+ private updateTestTargetConfiguration;
24
+ private updateTsConfigFileUsedByBuildTarget;
25
+ private updateTsConfigFileUsedByTestTarget;
26
+ }
@@ -0,0 +1,351 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.LibMigrator = void 0;
4
+ const tslib_1 = require("tslib");
5
+ const devkit_1 = require("@nrwl/devkit");
6
+ const linter_1 = require("@nrwl/linter");
7
+ const generators_1 = require("@nrwl/workspace/generators");
8
+ const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
9
+ const path_1 = require("path");
10
+ const dependencies_1 = require("../../utils/dependencies");
11
+ const project_migrator_1 = require("./project.migrator");
12
+ const validation_logging_1 = require("./validation-logging");
13
+ class LibMigrator extends project_migrator_1.ProjectMigrator {
14
+ constructor(tree, options, project, logger) {
15
+ var _a, _b;
16
+ super(tree, options, project, 'libs', logger);
17
+ this.supportedBuilders = {
18
+ build: '@angular-devkit/build-angular:ng-packagr',
19
+ test: '@angular-devkit/build-angular:karma',
20
+ lint: '@angular-eslint/builder:lint',
21
+ };
22
+ this.targetNames = {};
23
+ this.collectTargetNames();
24
+ if (this.targetNames.lint) {
25
+ this.oldEsLintConfigPath =
26
+ (_b = (_a = this.projectConfig.targets[this.targetNames.lint].options) === null || _a === void 0 ? void 0 : _a.eslintConfig) !== null && _b !== void 0 ? _b : (0, devkit_1.joinPathFragments)(this.project.oldRoot, '.eslintrc.json');
27
+ this.newEsLintConfigPath = this.convertRootPath(this.oldEsLintConfigPath);
28
+ }
29
+ }
30
+ migrate() {
31
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
32
+ this.moveProjectFiles();
33
+ yield this.updateProjectConfiguration();
34
+ this.updateNgPackageJson();
35
+ this.updateTsConfigs();
36
+ this.updateEsLintConfig();
37
+ this.updateCacheableOperations();
38
+ (0, dependencies_1.addBuildableLibrariesPostCssDependencies)(this.tree);
39
+ });
40
+ }
41
+ validate() {
42
+ var _a, _b;
43
+ const result = [];
44
+ // check project root
45
+ if (!this.tree.exists(this.projectConfig.root)) {
46
+ result.push({
47
+ message: `The project root "${this.project.oldRoot}" could not be found.`,
48
+ hint: `Make sure the value for "projects.${this.project.name}.root" is correct ` +
49
+ `or remove the project if it is not valid.`,
50
+ });
51
+ }
52
+ // check project source root
53
+ if (this.projectConfig.sourceRoot &&
54
+ !this.tree.exists(this.projectConfig.sourceRoot)) {
55
+ result.push({
56
+ message: `The project source root "${this.project.oldSourceRoot}" could not be found.`,
57
+ hint: `Make sure the value for "projects.${this.project.name}.sourceRoot" is correct ` +
58
+ `or remove the project if it is not valid.`,
59
+ });
60
+ }
61
+ // check for usage of unsupported builders
62
+ const allSupportedBuilders = [
63
+ this.supportedBuilders.build,
64
+ this.supportedBuilders.test,
65
+ this.supportedBuilders.lint,
66
+ ];
67
+ const unsupportedBuilders = [];
68
+ Object.entries((_a = this.projectConfig.targets) !== null && _a !== void 0 ? _a : {}).forEach(([targetName, target]) => {
69
+ if (!allSupportedBuilders.includes(target.executor)) {
70
+ unsupportedBuilders.push([targetName, target.executor]);
71
+ }
72
+ });
73
+ if (unsupportedBuilders.length) {
74
+ result.push({
75
+ messageGroup: {
76
+ title: 'Unsupported builders',
77
+ messages: unsupportedBuilders.map(([target, builder]) => `The "${target}" target is using an unsupported builder "${builder}".`),
78
+ },
79
+ hint: `The supported builders for libraries are: ${(0, validation_logging_1.arrayToString)(allSupportedBuilders)}.`,
80
+ });
81
+ }
82
+ // check for multiple targets for the same type of target
83
+ const targetsByType = Object.entries((_b = this.projectConfig.targets) !== null && _b !== void 0 ? _b : {}).reduce((acc, [target, { executor }]) => {
84
+ if (this.supportedBuilders.build === executor) {
85
+ acc.build.push(target);
86
+ }
87
+ else if (this.supportedBuilders.test === executor) {
88
+ acc.test.push(target);
89
+ }
90
+ else if (this.supportedBuilders.lint === executor) {
91
+ acc.lint.push(target);
92
+ }
93
+ return acc;
94
+ }, { build: [], lint: [], test: [] });
95
+ ['build', 'lint', 'test'].forEach((targetType) => {
96
+ if (targetsByType[targetType].length <= 1) {
97
+ return;
98
+ }
99
+ result.push({
100
+ message: `There is more than one target using a builder that is used to ${targetType} the project (${(0, validation_logging_1.arrayToString)(targetsByType[targetType])}).`,
101
+ hint: `Make sure the project only has one target with a builder that is used to ${targetType} the project.`,
102
+ });
103
+ });
104
+ return result.length ? result : null;
105
+ }
106
+ collectTargetNames() {
107
+ var _a;
108
+ Object.entries((_a = this.projectConfig.targets) !== null && _a !== void 0 ? _a : {}).forEach(([targetName, target]) => {
109
+ if (!this.targetNames.build &&
110
+ this.supportedBuilders.build === target.executor) {
111
+ this.targetNames.build = targetName;
112
+ }
113
+ else if (!this.targetNames.test &&
114
+ this.supportedBuilders.test === target.executor) {
115
+ this.targetNames.test = targetName;
116
+ }
117
+ else if (!this.targetNames.lint &&
118
+ this.supportedBuilders.lint === target.executor) {
119
+ this.targetNames.lint = targetName;
120
+ }
121
+ });
122
+ }
123
+ moveProjectFiles() {
124
+ this.moveDir(this.project.oldRoot, this.project.newRoot);
125
+ }
126
+ updateProjectConfiguration() {
127
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
128
+ this.projectConfig.root = this.project.newRoot;
129
+ this.projectConfig.sourceRoot = this.project.newSourceRoot;
130
+ if (!this.projectConfig.targets ||
131
+ !Object.keys(this.projectConfig.targets).length) {
132
+ this.logger.warn('The project does not have any targets configured. This might not be an issue. Skipping updating targets.');
133
+ }
134
+ else {
135
+ this.updateBuildTargetConfiguration();
136
+ this.updateLintTargetConfiguration();
137
+ this.updateTestTargetConfiguration();
138
+ }
139
+ (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
140
+ yield (0, generators_1.convertToNxProjectGenerator)(this.tree, {
141
+ project: this.project.name,
142
+ skipFormat: true,
143
+ });
144
+ });
145
+ }
146
+ updateNgPackageJson() {
147
+ var _a, _b;
148
+ const buildTarget = (_a = this.projectConfig.targets) === null || _a === void 0 ? void 0 : _a[this.targetNames.build];
149
+ if (!((_b = buildTarget === null || buildTarget === void 0 ? void 0 : buildTarget.options) === null || _b === void 0 ? void 0 : _b.project) ||
150
+ !this.tree.exists(buildTarget.options.project)) {
151
+ // we already logged a warning for these cases, so just return
152
+ return;
153
+ }
154
+ const ngPackageJson = (0, devkit_1.readJson)(this.tree, buildTarget.options.project);
155
+ const offset = (0, devkit_1.offsetFromRoot)(this.project.newRoot);
156
+ ngPackageJson.$schema =
157
+ ngPackageJson.$schema &&
158
+ `${offset}node_modules/ng-packagr/ng-package.schema.json`;
159
+ ngPackageJson.dest = `${offset}dist/${this.project.name}`;
160
+ (0, devkit_1.writeJson)(this.tree, buildTarget.options.project, ngPackageJson);
161
+ }
162
+ updateTsConfigs() {
163
+ const rootTsConfigFile = (0, typescript_1.getRootTsConfigPathInTree)(this.tree);
164
+ const projectOffsetFromRoot = (0, devkit_1.offsetFromRoot)(this.projectConfig.root);
165
+ this.updateTsConfigFileUsedByBuildTarget(rootTsConfigFile, projectOffsetFromRoot);
166
+ this.updateTsConfigFileUsedByTestTarget(rootTsConfigFile, projectOffsetFromRoot);
167
+ }
168
+ updateEsLintConfig() {
169
+ if (!this.targetNames.lint || !this.tree.exists(this.newEsLintConfigPath)) {
170
+ return;
171
+ }
172
+ (0, devkit_1.updateJson)(this.tree, this.newEsLintConfigPath, (json) => {
173
+ var _a;
174
+ delete json.root;
175
+ json.ignorePatterns = ['!**/*'];
176
+ const rootEsLintConfigRelativePath = (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(this.projectConfig.root), '.eslintrc.json');
177
+ if (Array.isArray(json.extends)) {
178
+ json.extends = json.extends.map((extend) => this.convertEsLintConfigExtendToNewPath(this.oldEsLintConfigPath, extend));
179
+ // it might have not been extending from the root config, make sure it does
180
+ if (!json.extends.includes(rootEsLintConfigRelativePath)) {
181
+ json.extends.unshift(rootEsLintConfigRelativePath);
182
+ }
183
+ }
184
+ else {
185
+ json.extends = rootEsLintConfigRelativePath;
186
+ }
187
+ (_a = json.overrides) === null || _a === void 0 ? void 0 : _a.forEach((override) => {
188
+ var _a;
189
+ if (!((_a = override.parserOptions) === null || _a === void 0 ? void 0 : _a.project)) {
190
+ return;
191
+ }
192
+ override.parserOptions.project = [
193
+ `${this.projectConfig.root}/tsconfig.*?.json`,
194
+ ];
195
+ });
196
+ return json;
197
+ });
198
+ }
199
+ updateCacheableOperations() {
200
+ var _a;
201
+ const workspaceConfig = (0, devkit_1.readWorkspaceConfiguration)(this.tree);
202
+ Object.keys((_a = workspaceConfig.tasksRunnerOptions) !== null && _a !== void 0 ? _a : {}).forEach((taskRunnerName) => {
203
+ var _a;
204
+ const taskRunner = workspaceConfig.tasksRunnerOptions[taskRunnerName];
205
+ taskRunner.options.cacheableOperations = Array.from(new Set([
206
+ ...((_a = taskRunner.options.cacheableOperations) !== null && _a !== void 0 ? _a : []),
207
+ ...[
208
+ this.targetNames.build,
209
+ this.targetNames.lint,
210
+ this.targetNames.test,
211
+ ].filter(Boolean),
212
+ ]));
213
+ });
214
+ (0, devkit_1.updateWorkspaceConfiguration)(this.tree, workspaceConfig);
215
+ }
216
+ updateBuildTargetConfiguration() {
217
+ var _a, _b, _c, _d, _e;
218
+ if (!this.targetNames.build) {
219
+ this.logger.warn('There is no build target in the project configuration. This might not be an issue. Skipping updating the build configuration.');
220
+ return;
221
+ }
222
+ const buildTarget = this.projectConfig.targets[this.targetNames.build];
223
+ buildTarget.executor = '@nrwl/angular:package';
224
+ if (!buildTarget.options &&
225
+ (!buildTarget.configurations ||
226
+ !Object.keys(buildTarget.configurations).length)) {
227
+ this.logger.warn(`The target "${this.targetNames.build}" is not specifying any options or configurations. Skipping updating the target configuration.`);
228
+ return;
229
+ }
230
+ const buildDevTsConfig = (_b = (_a = buildTarget.options) === null || _a === void 0 ? void 0 : _a.tsConfig) !== null && _b !== void 0 ? _b : (_d = (_c = buildTarget.configurations) === null || _c === void 0 ? void 0 : _c.development) === null || _d === void 0 ? void 0 : _d.tsConfig;
231
+ if (!buildDevTsConfig) {
232
+ this.logger.warn(`The "${this.targetNames.build}" target does not have the "tsConfig" option configured. Skipping updating the tsConfig file.`);
233
+ }
234
+ else if (!this.tree.exists(buildDevTsConfig)) {
235
+ this.logger.warn(`The tsConfig file "${buildDevTsConfig}" specified in the "${this.targetNames.build}" target could not be found. Skipping updating the tsConfig file.`);
236
+ }
237
+ if (!((_e = buildTarget.options) === null || _e === void 0 ? void 0 : _e.project)) {
238
+ this.logger.warn(`The "${this.targetNames.build}" target does not have the "project" option configured. Skipping updating the ng-packagr project file ("ng-package.json").`);
239
+ }
240
+ else if (!this.tree.exists(buildTarget.options.project)) {
241
+ this.logger.warn(`The ng-packagr project file "${buildTarget.options.project}" specified in the "${this.targetNames.build}" target could not be found. Skipping updating the ng-packagr project file.`);
242
+ }
243
+ ['project', 'tsConfig'].forEach((option) => {
244
+ var _a, _b;
245
+ if ((_a = buildTarget.options) === null || _a === void 0 ? void 0 : _a[option]) {
246
+ buildTarget.options[option] = (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(buildTarget.options[option]));
247
+ }
248
+ for (const configuration of Object.values((_b = buildTarget.configurations) !== null && _b !== void 0 ? _b : {})) {
249
+ configuration[option] =
250
+ configuration[option] &&
251
+ (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(configuration[option]));
252
+ }
253
+ });
254
+ }
255
+ updateLintTargetConfiguration() {
256
+ if (!this.targetNames.lint) {
257
+ return;
258
+ }
259
+ this.projectConfig.targets[this.targetNames.lint].executor =
260
+ '@nrwl/linter:eslint';
261
+ const lintOptions = this.projectConfig.targets[this.targetNames.lint].options;
262
+ if (!lintOptions) {
263
+ this.logger.warn(`The target "${this.targetNames.lint}" is not specifying any options. Skipping updating the target configuration.`);
264
+ return;
265
+ }
266
+ const existEsLintConfigPath = this.tree.exists(this.newEsLintConfigPath);
267
+ if (!existEsLintConfigPath) {
268
+ this.logger.warn(`The ESLint config file "${this.oldEsLintConfigPath}" could not be found. Skipping updating the file.`);
269
+ }
270
+ lintOptions.eslintConfig =
271
+ lintOptions.eslintConfig &&
272
+ (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(lintOptions.eslintConfig));
273
+ lintOptions.lintFilePatterns =
274
+ lintOptions.lintFilePatterns &&
275
+ lintOptions.lintFilePatterns.map((pattern) => this.convertPath(pattern));
276
+ if (!existEsLintConfigPath) {
277
+ return;
278
+ }
279
+ const eslintConfig = (0, devkit_1.readJson)(this.tree, this.newEsLintConfigPath);
280
+ if ((0, linter_1.hasRulesRequiringTypeChecking)(eslintConfig)) {
281
+ lintOptions.hasTypeAwareRules = true;
282
+ }
283
+ }
284
+ updateTestTargetConfiguration() {
285
+ if (!this.targetNames.test) {
286
+ return;
287
+ }
288
+ const testOptions = this.projectConfig.targets[this.targetNames.test].options;
289
+ if (!testOptions) {
290
+ this.logger.warn(`The target "${this.targetNames.test}" is not specifying any options. Skipping updating the target configuration.`);
291
+ return;
292
+ }
293
+ if (!testOptions.tsConfig) {
294
+ this.logger.warn(`The "${this.targetNames.test}" target does not have the "tsConfig" option configured. Skipping updating the tsConfig file.`);
295
+ }
296
+ else if (!this.tree.exists(testOptions.tsConfig)) {
297
+ this.logger.warn(`The tsConfig file "${testOptions.tsConfig}" specified in the "${this.targetNames.test}" target could not be found. Skipping updating the tsConfig file.`);
298
+ }
299
+ testOptions.main = testOptions.main && this.convertAsset(testOptions.main);
300
+ testOptions.polyfills =
301
+ testOptions.polyfills && this.convertAsset(testOptions.polyfills);
302
+ testOptions.tsConfig =
303
+ testOptions.tsConfig &&
304
+ (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(testOptions.tsConfig));
305
+ testOptions.karmaConfig =
306
+ testOptions.karmaConfig &&
307
+ (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(testOptions.karmaConfig));
308
+ testOptions.assets =
309
+ testOptions.assets &&
310
+ testOptions.assets.map((asset) => this.convertAsset(asset));
311
+ testOptions.styles =
312
+ testOptions.styles &&
313
+ testOptions.styles.map((style) => this.convertAsset(style));
314
+ testOptions.scripts =
315
+ testOptions.scripts &&
316
+ testOptions.scripts.map((script) => this.convertAsset(script));
317
+ }
318
+ updateTsConfigFileUsedByBuildTarget(rootTsConfigFile, projectOffsetFromRoot) {
319
+ var _a, _b, _c, _d;
320
+ if (!this.targetNames.build) {
321
+ return;
322
+ }
323
+ const tsConfigPath = (_b = (_a = this.projectConfig.targets[this.targetNames.build].options) === null || _a === void 0 ? void 0 : _a.tsConfig) !== null && _b !== void 0 ? _b : (_d = (_c = this.projectConfig.targets[this.targetNames.build].configurations) === null || _c === void 0 ? void 0 : _c.development) === null || _d === void 0 ? void 0 : _d.tsConfig;
324
+ if (!tsConfigPath || !this.tree.exists(tsConfigPath)) {
325
+ // we already logged a warning for these cases, so just return
326
+ return;
327
+ }
328
+ this.updateTsConfigFile(tsConfigPath, rootTsConfigFile, projectOffsetFromRoot);
329
+ (0, devkit_1.updateJson)(this.tree, tsConfigPath, (json) => {
330
+ var _a, _b;
331
+ if (!((_a = json.include) === null || _a === void 0 ? void 0 : _a.length) && !((_b = json.files) === null || _b === void 0 ? void 0 : _b.length)) {
332
+ json.include = ['**/*.ts'];
333
+ }
334
+ return json;
335
+ });
336
+ }
337
+ updateTsConfigFileUsedByTestTarget(rootTsConfigFile, projectOffsetFromRoot) {
338
+ var _a;
339
+ if (!this.targetNames.test) {
340
+ return;
341
+ }
342
+ const tsConfig = (_a = this.projectConfig.targets[this.targetNames.test].options) === null || _a === void 0 ? void 0 : _a.tsConfig;
343
+ if (!tsConfig || !this.tree.exists(tsConfig)) {
344
+ // we already logged a warning for these cases, so just return
345
+ return;
346
+ }
347
+ this.updateTsConfigFile(this.projectConfig.targets[this.targetNames.test].options.tsConfig, rootTsConfigFile, projectOffsetFromRoot);
348
+ }
349
+ }
350
+ exports.LibMigrator = LibMigrator;
351
+ //# sourceMappingURL=lib.migrator.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"lib.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/lib.migrator.ts"],"names":[],"mappings":"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"}
@@ -3,14 +3,17 @@ 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, projects) {
6
- var _a;
7
- let npmScope = (_a = options.npmScope) !== null && _a !== void 0 ? _a : options.name;
6
+ let npmScope = options.npmScope;
8
7
  if (npmScope) {
9
8
  npmScope = (0, devkit_1.names)(npmScope).fileName;
10
9
  }
11
10
  else if (projects.libs.length > 0) {
12
11
  // try get the scope from any library that have one
13
12
  for (const lib of projects.libs) {
13
+ const packageJsonPath = (0, devkit_1.joinPathFragments)(lib.config.root, 'package.json');
14
+ if (!tree.exists(packageJsonPath)) {
15
+ continue;
16
+ }
14
17
  const { name } = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(lib.config.root, 'package.json'));
15
18
  if (name.startsWith('@')) {
16
19
  npmScope = name.split('/')[0].substring(1);
@@ -1 +1 @@
1
- {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAwE;AAIxE,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAyB,EACzB,QAA2B;;IAE3B,IAAI,QAAQ,GAAG,MAAA,OAAO,CAAC,QAAQ,mCAAI,OAAO,CAAC,IAAI,CAAC;IAChD,IAAI,QAAQ,EAAE;QACZ,QAAQ,GAAG,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC;KACrC;SAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACnC,mDAAmD;QACnD,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE;YAC/B,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iBAAQ,EACvB,IAAI,EACJ,IAAA,0BAAiB,EAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CACnD,CAAC;YACF,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBACxB,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBAC3C,MAAM;aACP;SACF;KACF;IAED,IAAI,CAAC,QAAQ,EAAE;QACb,0DAA0D;QAC1D,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAChD,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;KAC1E;IAED,uCAAY,OAAO,KAAE,QAAQ,IAAG;AAClC,CAAC;AA7BD,4CA6BC"}
1
+ {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAwE;AAIxE,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAyB,EACzB,QAA2B;IAE3B,IAAI,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAChC,IAAI,QAAQ,EAAE;QACZ,QAAQ,GAAG,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC;KACrC;SAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACnC,mDAAmD;QACnD,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE;YAC/B,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,GAAG,CAAC,MAAM,CAAC,IAAI,EACf,cAAc,CACf,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;gBACjC,SAAS;aACV;YAED,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iBAAQ,EACvB,IAAI,EACJ,IAAA,0BAAiB,EAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CACnD,CAAC;YACF,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBACxB,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBAC3C,MAAM;aACP;SACF;KACF;IAED,IAAI,CAAC,QAAQ,EAAE;QACb,0DAA0D;QAC1D,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAChD,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;KAC1E;IAED,uCAAY,OAAO,KAAE,QAAQ,IAAG;AAClC,CAAC;AArCD,4CAqCC"}
@@ -1,10 +1,11 @@
1
- import { ProjectConfiguration, Tree } from '@nrwl/devkit';
1
+ import { ProjectConfiguration, TargetConfiguration, Tree } from '@nrwl/devkit';
2
2
  import { GeneratorOptions } from '../schema';
3
3
  import { Logger } from './logger';
4
4
  import { MigrationProjectConfiguration, ValidationResult } from './types';
5
5
  export declare abstract class ProjectMigrator {
6
6
  protected readonly tree: Tree;
7
7
  protected readonly options: GeneratorOptions;
8
+ get projectName(): string;
8
9
  protected projectConfig: ProjectConfiguration;
9
10
  protected project: {
10
11
  name: string;
@@ -14,10 +15,18 @@ export declare abstract class ProjectMigrator {
14
15
  newSourceRoot: string;
15
16
  };
16
17
  protected logger: Logger;
17
- constructor(tree: Tree, options: GeneratorOptions, project: MigrationProjectConfiguration, rootDir: string);
18
+ constructor(tree: Tree, options: GeneratorOptions, project: MigrationProjectConfiguration, rootDir: string, logger?: Logger);
18
19
  abstract migrate(): Promise<void>;
19
20
  abstract validate(): ValidationResult;
21
+ protected convertAsset(asset: string | any): string | any;
22
+ protected convertEsLintConfigExtendToNewPath(eslintConfigPath: string, extendPath: string): string;
23
+ protected convertSourceRootPath(originalPath: string): string;
24
+ protected convertRootPath(originalPath: string): string;
25
+ protected convertPath(originalPath: string): string;
26
+ protected getTargetValuesForOption(target: TargetConfiguration, optionPath: string): any[];
27
+ protected getValueForOption(options: Record<string, any>, optionPath: string): any;
20
28
  protected moveProjectRootFile(filePath: string, isRequired?: boolean): void;
21
29
  protected moveDir(from: string, to: string): void;
22
30
  protected moveFile(from: string, to: string, required?: boolean): void;
31
+ protected updateTsConfigFile(tsConfigPath: string, rootTsConfigFile: string, projectOffsetFromRoot: string): void;
23
32
  }