@nrwl/angular 13.10.0-beta.5 → 13.10.0-beta.8

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 (152) hide show
  1. package/esm2020/mfe/index.mjs +2 -2
  2. package/executors.json +4 -4
  3. package/fesm2015/nrwl-angular-mfe.mjs +1 -1
  4. package/fesm2015/nrwl-angular-mfe.mjs.map +1 -1
  5. package/fesm2015/nrwl-angular-testing.mjs.map +1 -1
  6. package/fesm2015/nrwl-angular.mjs.map +1 -1
  7. package/fesm2020/nrwl-angular-mfe.mjs +1 -1
  8. package/fesm2020/nrwl-angular-mfe.mjs.map +1 -1
  9. package/fesm2020/nrwl-angular-testing.mjs.map +1 -1
  10. package/fesm2020/nrwl-angular.mjs.map +1 -1
  11. package/generators.json +8 -8
  12. package/mfe/index.d.ts +1 -1
  13. package/mfe/index.js +2 -1
  14. package/mfe/index.js.map +1 -1
  15. package/migrations.json +2 -407
  16. package/package.json +7 -7
  17. package/src/builders/webpack-browser/schema.json +18 -1
  18. package/src/builders/webpack-server/schema.json +6 -0
  19. package/src/executors/ng-packagr-lite/schema.json +14 -0
  20. package/src/executors/package/schema.json +14 -0
  21. package/src/generators/application/lib/add-mfe.js +1 -0
  22. package/src/generators/application/lib/add-mfe.js.map +1 -1
  23. package/src/generators/application/schema.d.ts +1 -0
  24. package/src/generators/application/schema.json +9 -3
  25. package/src/generators/component/schema.json +4 -4
  26. package/src/generators/convert-to-with-mf/convert-to-with-mf.js +2 -1
  27. package/src/generators/convert-to-with-mf/convert-to-with-mf.js.map +1 -1
  28. package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.d.ts +1 -1
  29. package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.js +17 -14
  30. package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.js.map +1 -1
  31. package/src/generators/convert-tslint-to-eslint/schema.json +4 -4
  32. package/src/generators/downgrade-module/schema.json +1 -0
  33. package/src/generators/init/schema.json +1 -1
  34. package/src/generators/karma/karma.d.ts +1 -1
  35. package/src/generators/karma/karma.js +17 -15
  36. package/src/generators/karma/karma.js.map +1 -1
  37. package/src/generators/karma/schema.json +1 -0
  38. package/src/generators/karma-project/karma-project.js +2 -0
  39. package/src/generators/karma-project/karma-project.js.map +1 -1
  40. package/src/generators/karma-project/schema.d.ts +1 -0
  41. package/src/generators/karma-project/schema.json +6 -0
  42. package/src/generators/library/schema.json +2 -1
  43. package/src/generators/library-secondary-entry-point/schema.json +1 -0
  44. package/src/generators/mfe-host/mfe-host.js +1 -0
  45. package/src/generators/mfe-host/mfe-host.js.map +1 -1
  46. package/src/generators/mfe-host/schema.d.ts +1 -0
  47. package/src/generators/mfe-host/schema.json +6 -1
  48. package/src/generators/mfe-remote/schema.json +2 -2
  49. package/src/generators/move/schema.json +3 -3
  50. package/src/generators/ng-add/compat.d.ts +1 -1
  51. package/src/generators/ng-add/files/{root → root-karma}/karma.conf.js__tmpl__ +0 -0
  52. package/src/generators/ng-add/migrate-from-angular-cli.d.ts +2 -2
  53. package/src/generators/ng-add/migrate-from-angular-cli.js +38 -607
  54. package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
  55. package/src/generators/ng-add/ng-add.d.ts +3 -3
  56. package/src/generators/ng-add/ng-add.js +2 -2
  57. package/src/generators/ng-add/ng-add.js.map +1 -1
  58. package/src/generators/ng-add/schema.d.ts +1 -1
  59. package/src/generators/ng-add/utilities/app.migrator.d.ts +18 -0
  60. package/src/generators/ng-add/utilities/app.migrator.js +182 -0
  61. package/src/generators/ng-add/utilities/app.migrator.js.map +1 -0
  62. package/src/generators/ng-add/utilities/e2e-project.migrator.d.ts +19 -0
  63. package/src/generators/ng-add/utilities/e2e-project.migrator.js +186 -0
  64. package/src/generators/ng-add/utilities/e2e-project.migrator.js.map +1 -0
  65. package/src/generators/ng-add/utilities/e2e-utils.d.ts +7 -0
  66. package/src/generators/ng-add/utilities/e2e-utils.js +46 -0
  67. package/src/generators/ng-add/utilities/e2e-utils.js.map +1 -0
  68. package/src/generators/ng-add/utilities/get-all-projects.d.ts +3 -0
  69. package/src/generators/ng-add/utilities/get-all-projects.js +26 -0
  70. package/src/generators/ng-add/utilities/get-all-projects.js.map +1 -0
  71. package/src/generators/ng-add/utilities/normalize-options.d.ts +3 -0
  72. package/src/generators/ng-add/utilities/normalize-options.js +24 -0
  73. package/src/generators/ng-add/utilities/normalize-options.js.map +1 -0
  74. package/src/generators/ng-add/utilities/project.migrator.d.ts +21 -0
  75. package/src/generators/ng-add/utilities/project.migrator.js +53 -0
  76. package/src/generators/ng-add/utilities/project.migrator.js.map +1 -0
  77. package/src/generators/ng-add/utilities/types.d.ts +10 -0
  78. package/src/generators/ng-add/utilities/types.js +3 -0
  79. package/src/generators/ng-add/utilities/types.js.map +1 -0
  80. package/src/generators/ng-add/utilities/workspace.d.ts +12 -0
  81. package/src/generators/ng-add/utilities/workspace.js +258 -0
  82. package/src/generators/ng-add/utilities/workspace.js.map +1 -0
  83. package/src/generators/ngrx/schema.json +1 -0
  84. package/src/generators/scam/schema.json +6 -6
  85. package/src/generators/scam-directive/schema.json +3 -3
  86. package/src/generators/scam-pipe/schema.json +1 -1
  87. package/src/generators/setup-mfe/files/webpack/mfe.config.js__tmpl__ +7 -0
  88. package/src/generators/setup-mfe/files/webpack/webpack.config.js__tmpl__ +2 -7
  89. package/src/generators/setup-mfe/lib/add-remote-to-host.d.ts +2 -2
  90. package/src/generators/setup-mfe/lib/add-remote-to-host.js +49 -24
  91. package/src/generators/setup-mfe/lib/add-remote-to-host.js.map +1 -1
  92. package/src/generators/setup-mfe/lib/fix-bootstrap.d.ts +2 -1
  93. package/src/generators/setup-mfe/lib/fix-bootstrap.js +13 -4
  94. package/src/generators/setup-mfe/lib/fix-bootstrap.js.map +1 -1
  95. package/src/generators/setup-mfe/lib/generate-config.js +2 -1
  96. package/src/generators/setup-mfe/lib/generate-config.js.map +1 -1
  97. package/src/generators/setup-mfe/lib/index.d.ts +1 -0
  98. package/src/generators/setup-mfe/lib/index.js +1 -0
  99. package/src/generators/setup-mfe/lib/index.js.map +1 -1
  100. package/src/generators/setup-mfe/lib/setup-host-if-dynamic.d.ts +3 -0
  101. package/src/generators/setup-mfe/lib/setup-host-if-dynamic.js +15 -0
  102. package/src/generators/setup-mfe/lib/setup-host-if-dynamic.js.map +1 -0
  103. package/src/generators/setup-mfe/schema.d.ts +1 -0
  104. package/src/generators/setup-mfe/schema.json +7 -1
  105. package/src/generators/setup-mfe/setup-mfe.d.ts +1 -1
  106. package/src/generators/setup-mfe/setup-mfe.js +16 -13
  107. package/src/generators/setup-mfe/setup-mfe.js.map +1 -1
  108. package/src/generators/stories/schema.json +2 -0
  109. package/src/generators/storybook-configuration/schema.json +2 -0
  110. package/src/generators/storybook-migrate-defaults-5-to-6/schema.json +2 -0
  111. package/src/generators/storybook-migrate-stories-to-6-2/schema.json +2 -0
  112. package/src/generators/upgrade-module/schema.json +1 -0
  113. package/src/migrations/update-12-3-0/update-storybook.js +1 -1
  114. package/src/utils/mfe/with-module-federation.js +4 -1
  115. package/src/utils/mfe/with-module-federation.js.map +1 -1
  116. package/src/utils/versions.js +1 -1
  117. package/src/generators/ng-add/files/decorate-angular-cli/decorate-angular-cli.js__tmpl__ +0 -69
  118. package/src/generators/ng-add/files/root/nx.json__tmpl__ +0 -29
  119. package/src/migrations/update-10-0-0/update-10-0-0.d.ts +0 -1
  120. package/src/migrations/update-10-0-0/update-10-0-0.js +0 -15
  121. package/src/migrations/update-10-0-0/update-10-0-0.js.map +0 -1
  122. package/src/migrations/update-10-2-0/update-10-2-0.d.ts +0 -1
  123. package/src/migrations/update-10-2-0/update-10-2-0.js +0 -14
  124. package/src/migrations/update-10-2-0/update-10-2-0.js.map +0 -1
  125. package/src/migrations/update-10-3-0/files/tsconfig.editor.json +0 -11
  126. package/src/migrations/update-10-3-0/update-10-3-0.d.ts +0 -2
  127. package/src/migrations/update-10-3-0/update-10-3-0.js +0 -79
  128. package/src/migrations/update-10-3-0/update-10-3-0.js.map +0 -1
  129. package/src/migrations/update-10-4-0/update-10-4-0.d.ts +0 -2
  130. package/src/migrations/update-10-4-0/update-10-4-0.js +0 -36
  131. package/src/migrations/update-10-4-0/update-10-4-0.js.map +0 -1
  132. package/src/migrations/update-10-5-0/add-template-support-and-presets-to-eslint.d.ts +0 -2
  133. package/src/migrations/update-10-5-0/add-template-support-and-presets-to-eslint.js +0 -118
  134. package/src/migrations/update-10-5-0/add-template-support-and-presets-to-eslint.js.map +0 -1
  135. package/src/migrations/update-11-0-0/update-builders-config.d.ts +0 -2
  136. package/src/migrations/update-11-0-0/update-builders-config.js +0 -55
  137. package/src/migrations/update-11-0-0/update-builders-config.js.map +0 -1
  138. package/src/migrations/update-8-12-0/change-angular-lib-builder.d.ts +0 -2
  139. package/src/migrations/update-8-12-0/change-angular-lib-builder.js +0 -25
  140. package/src/migrations/update-8-12-0/change-angular-lib-builder.js.map +0 -1
  141. package/src/migrations/update-8-3-0/upgrade-ngrx-8-0.d.ts +0 -1
  142. package/src/migrations/update-8-3-0/upgrade-ngrx-8-0.js +0 -49
  143. package/src/migrations/update-8-3-0/upgrade-ngrx-8-0.js.map +0 -1
  144. package/src/migrations/update-8-5-0/upgrade-cli-8-3.d.ts +0 -1
  145. package/src/migrations/update-8-5-0/upgrade-cli-8-3.js +0 -55
  146. package/src/migrations/update-8-5-0/upgrade-cli-8-3.js.map +0 -1
  147. package/src/migrations/update-9-0-0/add-postinstall.d.ts +0 -1
  148. package/src/migrations/update-9-0-0/add-postinstall.js +0 -22
  149. package/src/migrations/update-9-0-0/add-postinstall.js.map +0 -1
  150. package/src/migrations/update-9-0-0/update-9-0-0.d.ts +0 -2
  151. package/src/migrations/update-9-0-0/update-9-0-0.js +0 -18
  152. package/src/migrations/update-9-0-0/update-9-0-0.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,mDAAiD;AAEjD,2DAAuD;AACvD,mEAA8D;AAC9D,qEAAiE;AAEjE,qDAU+B;AAE/B,SAAsB,qBAAqB,CACzC,IAAU,EACV,UAA4B;;QAE5B,MAAM,QAAQ,GAAG,IAAA,iCAAc,EAAC,IAAI,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAEvD,IAAI,OAAO,CAAC,wBAAwB,EAAE;YACpC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,EAAE,EAAE,oBAAS;gBACb,iBAAiB,EAAE,oBAAS;aAC7B,CACF,CAAC;YACF,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;YAClC,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;SAC1B;aAAM;YACL,IAAA,6BAAiB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAElC,MAAM,SAAS,GAAsB;gBACnC,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,0BAAW,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;gBAClE,8DAA8D;aAC/D,CAAC;YAEF,uEAAuE;YACvE,kCAAkC;YAElC,kDAAkD;YAClD,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC5B,IAAA,yCAA6B,EAAC,IAAI,CAAC,CAAC;YACpC,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;YACzB,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;YACxB,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;YACzB,yCAAyC;YACzC,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;YACnB,MAAM,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;YAEjC,uBAAuB;YACvB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;aAC1B;YAED,uEAAuE;YACvE,yEAAyE;YACzE,0EAA0E;YAC1E,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;YAE5B,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;YACxB,OAAO,GAAG,EAAE;gBACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;YAC5B,CAAC,CAAC;SACH;IACH,CAAC;CAAA;AAzDD,sDAyDC"}
@@ -1,4 +1,4 @@
1
- import { Tree } from '@nrwl/devkit';
2
- import { Schema } from './schema';
3
- export declare function ngAddGenerator(tree: Tree, options: Schema): Promise<import("@nrwl/devkit").GeneratorCallback>;
1
+ import type { Tree } from '@nrwl/devkit';
2
+ import type { GeneratorOptions } from './schema';
3
+ export declare function ngAddGenerator(tree: Tree, options: GeneratorOptions): Promise<import("@nrwl/devkit").GeneratorCallback>;
4
4
  export default ngAddGenerator;
@@ -2,8 +2,8 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ngAddGenerator = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const migrate_from_angular_cli_1 = require("./migrate-from-angular-cli");
6
5
  const init_1 = require("../init/init");
6
+ const migrate_from_angular_cli_1 = require("./migrate-from-angular-cli");
7
7
  function getWorkspaceType(tree) {
8
8
  return tree.exists('nx.json') ? 'nx' : 'angular';
9
9
  }
@@ -12,7 +12,7 @@ function ngAddGenerator(tree, options) {
12
12
  if (getWorkspaceType(tree) === 'angular') {
13
13
  return yield (0, migrate_from_angular_cli_1.migrateFromAngularCli)(tree, options);
14
14
  }
15
- return (0, init_1.angularInitGenerator)(tree, options);
15
+ return yield (0, init_1.angularInitGenerator)(tree, options);
16
16
  });
17
17
  }
18
18
  exports.ngAddGenerator = ngAddGenerator;
@@ -1 +1 @@
1
- {"version":3,"file":"ng-add.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/ng-add.ts"],"names":[],"mappings":";;;;AACA,yEAAmE;AACnE,uCAAoD;AAGpD,SAAS,gBAAgB,CAAC,IAAU;IAClC,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;AACnD,CAAC;AAED,SAAsB,cAAc,CAAC,IAAU,EAAE,OAAe;;QAC9D,IAAI,gBAAgB,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE;YACxC,OAAO,MAAM,IAAA,gDAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACnD;QAED,OAAO,IAAA,2BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;CAAA;AAND,wCAMC;AAED,kBAAe,cAAc,CAAC"}
1
+ {"version":3,"file":"ng-add.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/ng-add.ts"],"names":[],"mappings":";;;;AACA,uCAAoD;AACpD,yEAAmE;AAGnE,SAAS,gBAAgB,CAAC,IAAU;IAClC,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;AACnD,CAAC;AAED,SAAsB,cAAc,CAAC,IAAU,EAAE,OAAyB;;QACxE,IAAI,gBAAgB,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE;YACxC,OAAO,MAAM,IAAA,gDAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACnD;QAED,OAAO,MAAM,IAAA,2BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;CAAA;AAND,wCAMC;AAED,kBAAe,cAAc,CAAC"}
@@ -2,7 +2,7 @@ import { Linter } from '@nrwl/linter';
2
2
  import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
3
3
  import type { Styles } from '../utils/types';
4
4
 
5
- export interface Schema {
5
+ export interface GeneratorOptions {
6
6
  name?: string;
7
7
  skipInstall?: boolean;
8
8
  npmScope?: string;
@@ -0,0 +1,18 @@
1
+ import { Tree } from '@nrwl/devkit';
2
+ import { GeneratorOptions } from '../schema';
3
+ import { ProjectMigrator } from './project.migrator';
4
+ import { MigrationProjectConfiguration, ValidationResult } from './types';
5
+ export declare class AppMigrator extends ProjectMigrator {
6
+ private e2eMigrator;
7
+ constructor(tree: Tree, options: GeneratorOptions, project: MigrationProjectConfiguration);
8
+ migrate(): Promise<void>;
9
+ validate(): ValidationResult;
10
+ private moveProjectFiles;
11
+ private updateProjectConfiguration;
12
+ private updateTsConfigs;
13
+ private updateProjectTsLint;
14
+ private convertBuildOptions;
15
+ private convertServerOptions;
16
+ private convertAsset;
17
+ private convertPath;
18
+ }
@@ -0,0 +1,182 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.AppMigrator = void 0;
4
+ const tslib_1 = require("tslib");
5
+ const devkit_1 = require("@nrwl/devkit");
6
+ const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
7
+ const e2e_project_migrator_1 = require("./e2e-project.migrator");
8
+ const project_migrator_1 = require("./project.migrator");
9
+ class AppMigrator extends project_migrator_1.ProjectMigrator {
10
+ constructor(tree, options, project) {
11
+ super(tree, options, project, 'apps');
12
+ this.e2eMigrator = new e2e_project_migrator_1.E2eProjectMigrator(tree, options, project);
13
+ }
14
+ migrate() {
15
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
16
+ this.e2eMigrator.migrate();
17
+ this.moveProjectFiles();
18
+ this.updateProjectConfiguration();
19
+ this.updateTsConfigs();
20
+ // TODO: check later if it's still needed
21
+ this.updateProjectTsLint();
22
+ });
23
+ }
24
+ validate() {
25
+ // TODO: implement validation when multiple apps are supported
26
+ return null;
27
+ }
28
+ moveProjectFiles() {
29
+ // it is not required to have a browserslist
30
+ this.moveProjectRootFile((0, devkit_1.joinPathFragments)(this.project.oldRoot, 'browserslist'), false);
31
+ this.moveProjectRootFile((0, devkit_1.joinPathFragments)(this.project.oldRoot, '.browserslistrc'), false);
32
+ this.moveProjectRootFile(this.projectConfig.targets.build.options.tsConfig);
33
+ if (this.projectConfig.targets.test) {
34
+ this.moveProjectRootFile(this.projectConfig.targets.test.options.karmaConfig);
35
+ this.moveProjectRootFile(this.projectConfig.targets.test.options.tsConfig);
36
+ }
37
+ else {
38
+ // there could still be a karma.conf.js file in the root
39
+ // so move to new location
40
+ if (this.tree.exists('karma.conf.js')) {
41
+ console.info('No test configuration, but root Karma config file found');
42
+ this.moveProjectRootFile('karma.conf.js');
43
+ }
44
+ }
45
+ if (this.projectConfig.targets.server) {
46
+ this.moveProjectRootFile(this.projectConfig.targets.server.options.tsConfig);
47
+ }
48
+ this.moveDir(this.project.oldSourceRoot, this.project.newSourceRoot);
49
+ }
50
+ updateProjectConfiguration() {
51
+ this.projectConfig.root = this.project.newRoot;
52
+ this.projectConfig.sourceRoot = this.project.newSourceRoot;
53
+ this.convertBuildOptions(this.projectConfig.targets.build.options);
54
+ Object.values(this.projectConfig.targets.build.configurations).forEach((config) => this.convertBuildOptions(config));
55
+ if (this.projectConfig.targets.test) {
56
+ const testOptions = this.projectConfig.targets.test.options;
57
+ testOptions.main =
58
+ testOptions.main && this.convertAsset(testOptions.main);
59
+ testOptions.polyfills =
60
+ testOptions.polyfills && this.convertAsset(testOptions.polyfills);
61
+ testOptions.tsConfig = (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.spec.json');
62
+ testOptions.karmaConfig = (0, devkit_1.joinPathFragments)(this.project.newRoot, 'karma.conf.js');
63
+ testOptions.assets =
64
+ testOptions.assets &&
65
+ testOptions.assets.map((asset) => this.convertAsset(asset));
66
+ testOptions.styles =
67
+ testOptions.styles &&
68
+ testOptions.styles.map((style) => this.convertAsset(style));
69
+ testOptions.scripts =
70
+ testOptions.scripts &&
71
+ testOptions.scripts.map((script) => this.convertAsset(script));
72
+ }
73
+ if (this.projectConfig.targets.lint) {
74
+ this.projectConfig.targets.lint.options.tsConfig = [
75
+ (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.app.json'),
76
+ (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.spec.json'),
77
+ ];
78
+ }
79
+ if (this.projectConfig.targets.server) {
80
+ const serverOptions = this.projectConfig.targets.server.options;
81
+ this.convertServerOptions(serverOptions);
82
+ Object.values(this.projectConfig.targets.server.configurations).forEach((config) => this.convertServerOptions(config));
83
+ }
84
+ (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
85
+ }
86
+ updateTsConfigs() {
87
+ const tsConfigPath = (0, typescript_1.getRootTsConfigPathInTree)(this.tree);
88
+ const projectOffsetFromRoot = (0, devkit_1.offsetFromRoot)(this.projectConfig.root);
89
+ (0, devkit_1.updateJson)(this.tree, this.projectConfig.targets.build.options.tsConfig, (json) => {
90
+ json.extends = `${projectOffsetFromRoot}${tsConfigPath}`;
91
+ json.compilerOptions = json.compilerOptions || {};
92
+ json.compilerOptions.outDir = `${projectOffsetFromRoot}dist/out-tsc`;
93
+ return json;
94
+ });
95
+ if (this.projectConfig.targets.test) {
96
+ (0, devkit_1.updateJson)(this.tree, this.projectConfig.targets.test.options.tsConfig, (json) => {
97
+ var _a;
98
+ json.extends = `${projectOffsetFromRoot}${tsConfigPath}`;
99
+ json.compilerOptions = (_a = json.compilerOptions) !== null && _a !== void 0 ? _a : {};
100
+ json.compilerOptions.outDir = `${projectOffsetFromRoot}dist/out-tsc`;
101
+ return json;
102
+ });
103
+ }
104
+ if (this.projectConfig.targets.server) {
105
+ (0, devkit_1.updateJson)(this.tree, this.projectConfig.targets.server.options.tsConfig, (json) => {
106
+ var _a;
107
+ json.extends = `${projectOffsetFromRoot}${tsConfigPath}`;
108
+ json.compilerOptions = (_a = json.compilerOptions) !== null && _a !== void 0 ? _a : {};
109
+ json.compilerOptions.outDir = `${projectOffsetFromRoot}dist/out-tsc`;
110
+ return json;
111
+ });
112
+ }
113
+ }
114
+ updateProjectTsLint() {
115
+ if (this.tree.exists(`${this.project.newRoot}/tslint.json`)) {
116
+ (0, devkit_1.updateJson)(this.tree, `${this.project.newRoot}/tslint.json`, (json) => {
117
+ json.extends = '../../tslint.json';
118
+ return json;
119
+ });
120
+ }
121
+ }
122
+ convertBuildOptions(buildOptions) {
123
+ buildOptions.outputPath =
124
+ buildOptions.outputPath &&
125
+ (0, devkit_1.joinPathFragments)('dist', this.project.newRoot);
126
+ buildOptions.index =
127
+ buildOptions.index && this.convertAsset(buildOptions.index);
128
+ buildOptions.main =
129
+ buildOptions.main && this.convertAsset(buildOptions.main);
130
+ buildOptions.polyfills =
131
+ buildOptions.polyfills && this.convertAsset(buildOptions.polyfills);
132
+ buildOptions.tsConfig =
133
+ buildOptions.tsConfig &&
134
+ (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.app.json');
135
+ buildOptions.assets =
136
+ buildOptions.assets &&
137
+ buildOptions.assets.map((asset) => this.convertAsset(asset));
138
+ buildOptions.styles =
139
+ buildOptions.styles &&
140
+ buildOptions.styles.map((style) => this.convertAsset(style));
141
+ buildOptions.scripts =
142
+ buildOptions.scripts &&
143
+ buildOptions.scripts.map((script) => this.convertAsset(script));
144
+ buildOptions.fileReplacements =
145
+ buildOptions.fileReplacements &&
146
+ buildOptions.fileReplacements.map((replacement) => ({
147
+ replace: this.convertAsset(replacement.replace),
148
+ with: this.convertAsset(replacement.with),
149
+ }));
150
+ }
151
+ convertServerOptions(serverOptions) {
152
+ serverOptions.outputPath =
153
+ serverOptions.outputPath &&
154
+ (0, devkit_1.joinPathFragments)('dist', 'apps', `${this.project.name}-server`);
155
+ serverOptions.main =
156
+ serverOptions.main && this.convertAsset(serverOptions.main);
157
+ serverOptions.tsConfig =
158
+ serverOptions.tsConfig &&
159
+ (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.server.json');
160
+ serverOptions.fileReplacements =
161
+ serverOptions.fileReplacements &&
162
+ serverOptions.fileReplacements.map((replacement) => ({
163
+ replace: this.convertAsset(replacement.replace),
164
+ with: this.convertAsset(replacement.with),
165
+ }));
166
+ }
167
+ convertAsset(asset) {
168
+ if (typeof asset === 'string') {
169
+ return this.convertPath(asset);
170
+ }
171
+ else {
172
+ return Object.assign(Object.assign({}, asset), { input: this.convertPath(asset.input) });
173
+ }
174
+ }
175
+ convertPath(originalPath) {
176
+ return (originalPath === null || originalPath === void 0 ? void 0 : originalPath.startsWith(this.project.oldSourceRoot))
177
+ ? (0, devkit_1.joinPathFragments)(this.project.newSourceRoot, originalPath.replace(this.project.oldSourceRoot, ''))
178
+ : originalPath;
179
+ }
180
+ }
181
+ exports.AppMigrator = AppMigrator;
182
+ //# sourceMappingURL=app.migrator.js.map
@@ -0,0 +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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"}
@@ -0,0 +1,19 @@
1
+ import { Tree } from '@nrwl/devkit';
2
+ import { GeneratorOptions } from '../schema';
3
+ import { ProjectMigrator } from './project.migrator';
4
+ import { MigrationProjectConfiguration, ValidationResult } from './types';
5
+ export declare class E2eProjectMigrator extends ProjectMigrator {
6
+ private appConfig;
7
+ private appName;
8
+ constructor(tree: Tree, options: GeneratorOptions, project: MigrationProjectConfiguration);
9
+ migrate(): Promise<void>;
10
+ validate(): ValidationResult;
11
+ private initializeProject;
12
+ private migrateProtractorE2eProject;
13
+ private migrateCypressE2eProject;
14
+ private updateOrCreateCypressConfigFile;
15
+ private updateCypressProjectConfiguration;
16
+ private updateE2eCypressTarget;
17
+ private updateCypressConfigFilePaths;
18
+ private replaceCypressGlobConfig;
19
+ }
@@ -0,0 +1,186 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.E2eProjectMigrator = void 0;
4
+ const tslib_1 = require("tslib");
5
+ const devkit_1 = require("@nrwl/devkit");
6
+ const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
7
+ const path_1 = require("path");
8
+ const e2e_utils_1 = require("./e2e-utils");
9
+ const project_migrator_1 = require("./project.migrator");
10
+ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
11
+ constructor(tree, options, project) {
12
+ super(tree, options, project, 'apps');
13
+ this.appConfig = project.config;
14
+ this.appName = this.project.name;
15
+ this.initializeProject();
16
+ }
17
+ migrate() {
18
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
19
+ if (!this.project) {
20
+ console.warn('No e2e project was migrated because there was none declared in angular.json.');
21
+ return;
22
+ }
23
+ if ((0, e2e_utils_1.isProtractorE2eProject)(this.projectConfig)) {
24
+ this.migrateProtractorE2eProject();
25
+ }
26
+ else if ((0, e2e_utils_1.isCypressE2eProject)(this.projectConfig)) {
27
+ this.migrateCypressE2eProject();
28
+ }
29
+ const tsConfig = (0, devkit_1.joinPathFragments)(this.projectConfig.root, 'tsconfig.json');
30
+ const rootOffset = (0, devkit_1.offsetFromRoot)(this.project.newRoot);
31
+ (0, devkit_1.updateJson)(this.tree, tsConfig, (json) => {
32
+ json.extends = `${rootOffset}${(0, typescript_1.getRootTsConfigPathInTree)(this.tree)}`;
33
+ json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { outDir: `${rootOffset}dist/out-tsc` });
34
+ return json;
35
+ });
36
+ });
37
+ }
38
+ validate() {
39
+ // TODO: implement validation when multiple apps are supported
40
+ return null;
41
+ }
42
+ initializeProject() {
43
+ var _a;
44
+ if (!((_a = this.projectConfig.targets) === null || _a === void 0 ? void 0 : _a.e2e)) {
45
+ this.project = null;
46
+ return;
47
+ }
48
+ const name = this.project.name.endsWith('-e2e')
49
+ ? this.project.name
50
+ : `${this.project.name}-e2e`;
51
+ const newRoot = (0, devkit_1.joinPathFragments)('apps', name);
52
+ if ((0, e2e_utils_1.isProtractorE2eProject)(this.projectConfig)) {
53
+ this.project = Object.assign(Object.assign({}, this.project), { name, oldRoot: (0, devkit_1.joinPathFragments)(this.project.oldRoot, 'e2e'), newRoot });
54
+ }
55
+ else if ((0, e2e_utils_1.isCypressE2eProject)(this.projectConfig)) {
56
+ this.project = Object.assign(Object.assign({}, this.project), { name, oldRoot: 'cypress', newRoot });
57
+ }
58
+ }
59
+ migrateProtractorE2eProject() {
60
+ this.moveDir(this.project.oldRoot, this.project.newRoot);
61
+ this.projectConfig = {
62
+ root: this.project.newRoot,
63
+ projectType: 'application',
64
+ targets: {
65
+ 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') }) }),
66
+ lint: {
67
+ executor: '@angular-devkit/build-angular:tslint',
68
+ options: Object.assign(Object.assign({}, this.projectConfig.targets.lint), { tsConfig: (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.json') }),
69
+ },
70
+ },
71
+ implicitDependencies: [this.appName],
72
+ tags: [],
73
+ };
74
+ (0, devkit_1.addProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
75
+ // remove e2e target from the app config
76
+ delete this.appConfig.targets.e2e;
77
+ (0, devkit_1.updateProjectConfiguration)(this.tree, this.appName, Object.assign({}, this.appConfig));
78
+ }
79
+ migrateCypressE2eProject() {
80
+ const oldCypressConfigFilePath = (0, e2e_utils_1.getCypressConfigFile)(this.projectConfig);
81
+ const cypressConfigFilePath = this.updateOrCreateCypressConfigFile(oldCypressConfigFilePath);
82
+ this.moveFile((0, devkit_1.joinPathFragments)(this.project.oldRoot, 'tsconfig.json'), (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.json'));
83
+ this.moveDir(this.project.oldRoot, (0, devkit_1.joinPathFragments)(this.project.newRoot, 'src'));
84
+ this.updateCypressProjectConfiguration(cypressConfigFilePath);
85
+ }
86
+ updateOrCreateCypressConfigFile(configFile) {
87
+ let cypressConfigFilePath;
88
+ if (configFile) {
89
+ cypressConfigFilePath = (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(configFile));
90
+ this.updateCypressConfigFilePaths(configFile);
91
+ this.moveFile(configFile, cypressConfigFilePath);
92
+ }
93
+ else {
94
+ cypressConfigFilePath = (0, devkit_1.joinPathFragments)(this.project.newRoot, 'cypress.json');
95
+ this.tree.write(cypressConfigFilePath, JSON.stringify({
96
+ fileServerFolder: '.',
97
+ fixturesFolder: './src/fixtures',
98
+ integrationFolder: './src/integration',
99
+ modifyObstructiveCode: false,
100
+ supportFile: './src/support/index.ts',
101
+ pluginsFile: './src/plugins/index.ts',
102
+ video: true,
103
+ videosFolder: `../../dist/cypress/${this.project.newRoot}/videos`,
104
+ screenshotsFolder: `../../dist/cypress/${this.project.newRoot}/screenshots`,
105
+ chromeWebSecurity: false,
106
+ }));
107
+ }
108
+ return cypressConfigFilePath;
109
+ }
110
+ updateCypressProjectConfiguration(cypressConfigPath) {
111
+ this.projectConfig = {
112
+ root: this.project.newRoot,
113
+ sourceRoot: (0, devkit_1.joinPathFragments)(this.project.newRoot, 'src'),
114
+ projectType: 'application',
115
+ targets: {
116
+ e2e: this.updateE2eCypressTarget(this.projectConfig.targets.e2e, cypressConfigPath),
117
+ },
118
+ implicitDependencies: [this.appName],
119
+ tags: [],
120
+ };
121
+ if (this.appConfig.targets['cypress-run']) {
122
+ this.projectConfig.targets['cypress-run'] = this.updateE2eCypressTarget(this.appConfig.targets['cypress-run'], cypressConfigPath);
123
+ }
124
+ if (this.appConfig.targets['cypress-open']) {
125
+ this.projectConfig.targets['cypress-open'] = this.updateE2eCypressTarget(this.appConfig.targets['cypress-open'], cypressConfigPath);
126
+ }
127
+ (0, devkit_1.addProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
128
+ delete this.appConfig.targets['cypress-run'];
129
+ delete this.appConfig.targets['cypress-open'];
130
+ delete this.appConfig.targets.e2e;
131
+ (0, devkit_1.updateProjectConfiguration)(this.tree, this.appName, Object.assign({}, this.appConfig));
132
+ }
133
+ updateE2eCypressTarget(target, cypressConfig) {
134
+ const updatedTarget = Object.assign(Object.assign({}, target), { executor: '@nrwl/cypress:cypress', options: Object.assign(Object.assign({}, target.options), { cypressConfig }) });
135
+ delete updatedTarget.options.configFile;
136
+ delete updatedTarget.options.tsConfig;
137
+ if (updatedTarget.options.headless && updatedTarget.options.watch) {
138
+ updatedTarget.options.headed = false;
139
+ }
140
+ else if (updatedTarget.options.headless === false &&
141
+ !updatedTarget.options.watch) {
142
+ updatedTarget.options.headed = true;
143
+ }
144
+ delete updatedTarget.options.headless;
145
+ return updatedTarget;
146
+ }
147
+ updateCypressConfigFilePaths(configFilePath) {
148
+ const srcFoldersAndFiles = [
149
+ 'integrationFolder',
150
+ 'supportFile',
151
+ 'pluginsFile',
152
+ 'fixturesFolder',
153
+ ];
154
+ const distFolders = ['videosFolder', 'screenshotsFolder'];
155
+ const stringOrArrayGlobs = ['ignoreTestFiles', 'testFiles'];
156
+ const cypressConfig = (0, devkit_1.readJson)(this.tree, configFilePath);
157
+ cypressConfig.fileServerFolder = '.';
158
+ srcFoldersAndFiles.forEach((folderOrFile) => {
159
+ if (cypressConfig[folderOrFile]) {
160
+ cypressConfig[folderOrFile] = `./src/${(0, path_1.relative)(this.project.oldRoot, cypressConfig[folderOrFile])}`;
161
+ }
162
+ });
163
+ distFolders.forEach((folder) => {
164
+ if (cypressConfig[folder]) {
165
+ cypressConfig[folder] = `../../dist/cypress/${this.project.newRoot}/${(0, path_1.relative)(this.project.oldRoot, cypressConfig[folder])}`;
166
+ }
167
+ });
168
+ stringOrArrayGlobs.forEach((stringOrArrayGlob) => {
169
+ if (!cypressConfig[stringOrArrayGlob]) {
170
+ return;
171
+ }
172
+ if (Array.isArray(cypressConfig[stringOrArrayGlob])) {
173
+ cypressConfig[stringOrArrayGlob] = cypressConfig[stringOrArrayGlob].map((glob) => this.replaceCypressGlobConfig(glob));
174
+ }
175
+ else {
176
+ cypressConfig[stringOrArrayGlob] = this.replaceCypressGlobConfig(cypressConfig[stringOrArrayGlob]);
177
+ }
178
+ });
179
+ (0, devkit_1.writeJson)(this.tree, configFilePath, cypressConfig);
180
+ }
181
+ replaceCypressGlobConfig(globPattern) {
182
+ return globPattern.replace(new RegExp(`^(\\.\\/|\\/)?${this.project.oldRoot}\\/`), './src/');
183
+ }
184
+ }
185
+ exports.E2eProjectMigrator = E2eProjectMigrator;
186
+ //# sourceMappingURL=e2e-project.migrator.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"e2e-project.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/e2e-project.migrator.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,7 @@
1
+ import { ProjectConfiguration } from '@nrwl/devkit';
2
+ import { MigrationProjectConfiguration, WorkspaceProjects } from './types';
3
+ export declare function getE2eKey(projects: WorkspaceProjects): string | null;
4
+ export declare function getE2eProject(projects: WorkspaceProjects): MigrationProjectConfiguration | null;
5
+ export declare function getCypressConfigFile(e2eProject: ProjectConfiguration): string | undefined;
6
+ export declare function isCypressE2eProject(e2eProject: ProjectConfiguration): boolean;
7
+ export declare function isProtractorE2eProject(e2eProject: ProjectConfiguration): boolean;
@@ -0,0 +1,46 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.isProtractorE2eProject = exports.isCypressE2eProject = exports.getCypressConfigFile = exports.getE2eProject = exports.getE2eKey = void 0;
4
+ const path_1 = require("path");
5
+ function getE2eKey(projects) {
6
+ var _a;
7
+ for (const project of projects.apps) {
8
+ if ((_a = project.config.targets) === null || _a === void 0 ? void 0 : _a.e2e) {
9
+ return project.name;
10
+ }
11
+ }
12
+ return null;
13
+ }
14
+ exports.getE2eKey = getE2eKey;
15
+ function getE2eProject(projects) {
16
+ var _a;
17
+ for (const project of projects.apps) {
18
+ if ((_a = project.config.targets) === null || _a === void 0 ? void 0 : _a.e2e) {
19
+ return project;
20
+ }
21
+ }
22
+ return null;
23
+ }
24
+ exports.getE2eProject = getE2eProject;
25
+ function getCypressConfigFile(e2eProject) {
26
+ let cypressConfig = 'cypress.json';
27
+ const configFileOption = e2eProject.targets.e2e.options.configFile;
28
+ if (configFileOption === false) {
29
+ cypressConfig = undefined;
30
+ }
31
+ else if (typeof configFileOption === 'string') {
32
+ cypressConfig = (0, path_1.basename)(configFileOption);
33
+ }
34
+ return cypressConfig;
35
+ }
36
+ exports.getCypressConfigFile = getCypressConfigFile;
37
+ function isCypressE2eProject(e2eProject) {
38
+ return e2eProject.targets.e2e.executor === '@cypress/schematic:cypress';
39
+ }
40
+ exports.isCypressE2eProject = isCypressE2eProject;
41
+ function isProtractorE2eProject(e2eProject) {
42
+ return (e2eProject.targets.e2e.executor ===
43
+ '@angular-devkit/build-angular:protractor');
44
+ }
45
+ exports.isProtractorE2eProject = isProtractorE2eProject;
46
+ //# sourceMappingURL=e2e-utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"e2e-utils.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/e2e-utils.ts"],"names":[],"mappings":";;;AACA,+BAAgC;AAGhC,SAAgB,SAAS,CAAC,QAA2B;;IACnD,KAAK,MAAM,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE;QACnC,IAAI,MAAA,OAAO,CAAC,MAAM,CAAC,OAAO,0CAAE,GAAG,EAAE;YAC/B,OAAO,OAAO,CAAC,IAAI,CAAC;SACrB;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AARD,8BAQC;AAED,SAAgB,aAAa,CAC3B,QAA2B;;IAE3B,KAAK,MAAM,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE;QACnC,IAAI,MAAA,OAAO,CAAC,MAAM,CAAC,OAAO,0CAAE,GAAG,EAAE;YAC/B,OAAO,OAAO,CAAC;SAChB;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAVD,sCAUC;AAED,SAAgB,oBAAoB,CAClC,UAAgC;IAEhC,IAAI,aAAa,GAAG,cAAc,CAAC;IACnC,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC;IACnE,IAAI,gBAAgB,KAAK,KAAK,EAAE;QAC9B,aAAa,GAAG,SAAS,CAAC;KAC3B;SAAM,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE;QAC/C,aAAa,GAAG,IAAA,eAAQ,EAAC,gBAAgB,CAAC,CAAC;KAC5C;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAZD,oDAYC;AAED,SAAgB,mBAAmB,CAAC,UAAgC;IAClE,OAAO,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,4BAA4B,CAAC;AAC1E,CAAC;AAFD,kDAEC;AAED,SAAgB,sBAAsB,CACpC,UAAgC;IAEhC,OAAO,CACL,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ;QAC/B,0CAA0C,CAC3C,CAAC;AACJ,CAAC;AAPD,wDAOC"}
@@ -0,0 +1,3 @@
1
+ import { Tree } from '@nrwl/devkit';
2
+ import { WorkspaceProjects } from './types';
3
+ export declare function getAllProjects(tree: Tree): WorkspaceProjects;
@@ -0,0 +1,26 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getAllProjects = void 0;
4
+ const devkit_1 = require("@nrwl/devkit");
5
+ function getAllProjects(tree) {
6
+ const projects = (0, devkit_1.getProjects)(tree);
7
+ const result = {
8
+ apps: [],
9
+ libs: [],
10
+ };
11
+ for (const [name, project] of projects) {
12
+ const migrationProject = {
13
+ config: project,
14
+ name,
15
+ };
16
+ if (project.projectType === 'library') {
17
+ result.libs.push(migrationProject);
18
+ }
19
+ else {
20
+ result.apps.push(migrationProject);
21
+ }
22
+ }
23
+ return result;
24
+ }
25
+ exports.getAllProjects = getAllProjects;
26
+ //# sourceMappingURL=get-all-projects.js.map