@nrwl/angular 13.3.0-beta.2 → 13.3.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 (111) hide show
  1. package/esm2020/src/runtime/nx/data-persistence.mjs +3 -3
  2. package/esm2020/src/runtime/nx/nx.module.mjs +4 -4
  3. package/fesm2015/nrwl-angular.mjs +7 -7
  4. package/fesm2020/nrwl-angular.mjs +7 -7
  5. package/migrations.json +6 -0
  6. package/ng-package.json +4 -2
  7. package/package.json +8 -6
  8. package/src/builders/utilities/webpack.d.ts +1 -0
  9. package/src/builders/utilities/webpack.js +36 -0
  10. package/src/builders/utilities/webpack.js.map +1 -0
  11. package/src/builders/webpack-browser/webpack-browser.impl.d.ts +1 -6
  12. package/src/builders/webpack-browser/webpack-browser.impl.js +6 -5
  13. package/src/builders/webpack-browser/webpack-browser.impl.js.map +1 -1
  14. package/src/builders/webpack-server/webpack-server.impl.d.ts +1 -2
  15. package/src/builders/webpack-server/webpack-server.impl.js +3 -2
  16. package/src/builders/webpack-server/webpack-server.impl.js.map +1 -1
  17. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.di.d.ts +9 -0
  18. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.di.js +13 -4
  19. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.di.js.map +1 -1
  20. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.d.ts +5 -4
  21. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js +4 -3
  22. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js.map +1 -1
  23. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.di.d.ts +1 -0
  24. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.di.js +3 -2
  25. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.di.js.map +1 -1
  26. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.js +0 -9
  27. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.js.map +1 -1
  28. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/options.di.d.ts +14 -0
  29. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/options.di.js +32 -0
  30. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/options.di.js.map +1 -0
  31. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/package.di.d.ts +2 -0
  32. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/package.di.js +5 -3
  33. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/package.di.js.map +1 -1
  34. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.d.ts +46 -0
  35. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.di.d.ts +10 -0
  36. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.di.js +18 -0
  37. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.di.js.map +1 -0
  38. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.js +268 -0
  39. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.js.map +1 -0
  40. package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js +5 -0
  41. package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js.map +1 -1
  42. package/src/executors/ng-packagr-lite/schema.json +4 -0
  43. package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.di.js +2 -2
  44. package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.di.js.map +1 -1
  45. package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.d.ts +1 -1
  46. package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js +1 -1
  47. package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js.map +1 -1
  48. package/src/executors/package/ng-packagr-adjustments/ng-package/options.di.d.ts +14 -0
  49. package/src/executors/package/ng-packagr-adjustments/ng-package/options.di.js +32 -0
  50. package/src/executors/package/ng-packagr-adjustments/ng-package/options.di.js.map +1 -0
  51. package/src/executors/package/ng-packagr-adjustments/ng-package/package.di.d.ts +2 -0
  52. package/src/executors/package/ng-packagr-adjustments/ng-package/package.di.js +5 -3
  53. package/src/executors/package/ng-packagr-adjustments/ng-package/package.di.js.map +1 -1
  54. package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.d.ts +2 -1
  55. package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js +5 -4
  56. package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js.map +1 -1
  57. package/src/executors/package/package.impl.js +8 -4
  58. package/src/executors/package/package.impl.js.map +1 -1
  59. package/src/executors/package/schema.d.ts +2 -1
  60. package/src/executors/package/schema.json +4 -0
  61. package/src/executors/{package/ng-packagr-adjustments/utilities → utilities}/tailwindcss.d.ts +1 -1
  62. package/src/executors/{package/ng-packagr-adjustments/utilities → utilities}/tailwindcss.js +11 -9
  63. package/src/executors/utilities/tailwindcss.js.map +1 -0
  64. package/src/generators/application/application.js +23 -7
  65. package/src/generators/application/application.js.map +1 -1
  66. package/src/generators/application/lib/index.d.ts +2 -2
  67. package/src/generators/application/lib/index.js +2 -2
  68. package/src/generators/application/lib/index.js.map +1 -1
  69. package/src/generators/application/lib/nrwl-home-tpl.d.ts +2 -3
  70. package/src/generators/application/lib/nrwl-home-tpl.js +790 -314
  71. package/src/generators/application/lib/nrwl-home-tpl.js.map +1 -1
  72. package/src/generators/application/lib/{update-component-styles.d.ts → update-app-component-template.d.ts} +1 -1
  73. package/src/generators/application/lib/{update-component-template.js → update-app-component-template.js} +7 -7
  74. package/src/generators/application/lib/update-app-component-template.js.map +1 -0
  75. package/src/generators/application/lib/update-component-spec.js +8 -1
  76. package/src/generators/application/lib/update-component-spec.js.map +1 -1
  77. package/src/generators/application/lib/update-config-files.js +1 -7
  78. package/src/generators/application/lib/update-config-files.js.map +1 -1
  79. package/src/generators/application/lib/update-e2e-project.js +1 -1
  80. package/src/generators/application/lib/update-e2e-project.js.map +1 -1
  81. package/src/generators/application/lib/{update-component-template.d.ts → update-nx-component-template.d.ts} +1 -1
  82. package/src/generators/application/lib/update-nx-component-template.js +31 -0
  83. package/src/generators/application/lib/update-nx-component-template.js.map +1 -0
  84. package/src/generators/init/init.js +1 -0
  85. package/src/generators/init/init.js.map +1 -1
  86. package/src/generators/library/lib/normalize-options.js +8 -4
  87. package/src/generators/library/lib/normalize-options.js.map +1 -1
  88. package/src/generators/library/lib/update-tsconfig.js +2 -1
  89. package/src/generators/library/lib/update-tsconfig.js.map +1 -1
  90. package/src/generators/library/schema.d.ts +1 -0
  91. package/src/generators/library/schema.json +5 -0
  92. package/src/generators/setup-mfe/setup-mfe.js +4 -1
  93. package/src/generators/setup-mfe/setup-mfe.js.map +1 -1
  94. package/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.d.ts +1 -2
  95. package/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.js +1 -2
  96. package/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.js.map +1 -1
  97. package/src/migrations/update-13-2-0/opt-out-testbed-teardown.d.ts +2 -0
  98. package/src/migrations/update-13-2-0/opt-out-testbed-teardown.js +231 -0
  99. package/src/migrations/update-13-2-0/opt-out-testbed-teardown.js.map +1 -0
  100. package/src/utils/nx-devkit/ast-utils.d.ts +2 -0
  101. package/src/utils/nx-devkit/ast-utils.js +35 -1
  102. package/src/utils/nx-devkit/ast-utils.js.map +1 -1
  103. package/src/utils/versions.d.ts +1 -0
  104. package/src/utils/versions.js +3 -2
  105. package/src/utils/versions.js.map +1 -1
  106. package/testing/ng-package.json +6 -0
  107. package/testing/package.json +3 -5
  108. package/src/executors/package/ng-packagr-adjustments/utilities/tailwindcss.js.map +0 -1
  109. package/src/generators/application/lib/update-component-styles.js +0 -26
  110. package/src/generators/application/lib/update-component-styles.js.map +0 -1
  111. package/src/generators/application/lib/update-component-template.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"nrwl-home-tpl.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/nrwl-home-tpl.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG;IAC9B,IAAI,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAuFH;IACH,GAAG,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAsIF;IACH,IAAI,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgGL;CACF,CAAC"}
1
+ {"version":3,"file":"nrwl-home-tpl.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/nrwl-home-tpl.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG;IAC9B,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,MAAM,iBAAiB,MAAM,cAAc;IACxE,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBA6aD,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6WxB;CACF,CAAC"}
@@ -1,3 +1,3 @@
1
1
  import type { Tree } from '@nrwl/devkit';
2
2
  import type { NormalizedSchema } from './normalized-schema';
3
- export declare function updateComponentStyles(host: Tree, options: NormalizedSchema): void;
3
+ export declare function updateAppComponentTemplate(host: Tree, options: NormalizedSchema): void;
@@ -1,14 +1,14 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.updateComponentTemplate = void 0;
3
+ exports.updateAppComponentTemplate = void 0;
4
4
  const ts = require("typescript");
5
5
  const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
6
6
  const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
7
7
  const nrwl_home_tpl_1 = require("./nrwl-home-tpl");
8
- function updateComponentTemplate(host, options) {
8
+ function updateAppComponentTemplate(host, options) {
9
9
  const content = options.routing
10
- ? `${nrwl_home_tpl_1.nrwlHomeTemplate.html}\n<router-outlet></router-outlet>`
11
- : nrwl_home_tpl_1.nrwlHomeTemplate.html;
10
+ ? `${nrwl_home_tpl_1.nrwlHomeTemplate.getSelector(options.prefix)}\n<router-outlet></router-outlet>`
11
+ : nrwl_home_tpl_1.nrwlHomeTemplate.getSelector(options.prefix);
12
12
  if (!options.inlineTemplate) {
13
13
  host.write(`${options.appProjectRoot}/src/app/app.component.html`, content);
14
14
  return;
@@ -16,7 +16,7 @@ function updateComponentTemplate(host, options) {
16
16
  // Inline component update
17
17
  const componentPath = `${options.appProjectRoot}/src/app/app.component.ts`;
18
18
  const templateNodeValue = (0, ast_utils_2.getDecoratorPropertyValueNode)(host, componentPath, 'Component', 'template', '@angular/core');
19
- (0, ast_utils_1.replaceNodeValue)(host, ts.createSourceFile(componentPath, host.read(componentPath, 'utf-8'), ts.ScriptTarget.Latest, true), componentPath, templateNodeValue, `\`\n${nrwl_home_tpl_1.nrwlHomeTemplate.html}\n\``);
19
+ (0, ast_utils_1.replaceNodeValue)(host, ts.createSourceFile(componentPath, host.read(componentPath, 'utf-8'), ts.ScriptTarget.Latest, true), componentPath, templateNodeValue, `\`\n${nrwl_home_tpl_1.nrwlHomeTemplate.getSelector(options.prefix)}\n\``);
20
20
  }
21
- exports.updateComponentTemplate = updateComponentTemplate;
22
- //# sourceMappingURL=update-component-template.js.map
21
+ exports.updateAppComponentTemplate = updateAppComponentTemplate;
22
+ //# sourceMappingURL=update-app-component-template.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"update-app-component-template.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-app-component-template.ts"],"names":[],"mappings":";;;AAGA,iCAAiC;AACjC,uEAA2E;AAC3E,kEAAmF;AAEnF,mDAAmD;AAEnD,SAAgB,0BAA0B,CACxC,IAAU,EACV,OAAyB;IAEzB,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO;QAC7B,CAAC,CAAC,GAAG,gCAAgB,CAAC,WAAW,CAC7B,OAAO,CAAC,MAAM,CACf,mCAAmC;QACtC,CAAC,CAAC,gCAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAEjD,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC3B,IAAI,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,cAAc,6BAA6B,EAAE,OAAO,CAAC,CAAC;QAE5E,OAAO;KACR;IAED,0BAA0B;IAC1B,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,cAAc,2BAA2B,CAAC;IAC3E,MAAM,iBAAiB,GAAG,IAAA,yCAA6B,EACrD,IAAI,EACJ,aAAa,EACb,WAAW,EACX,UAAU,EACV,eAAe,CAChB,CAAC;IAEF,IAAA,4BAAgB,EACd,IAAI,EACJ,EAAE,CAAC,gBAAgB,CACjB,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACjC,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,EACD,aAAa,EACb,iBAAiB,EACjB,OAAO,gCAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAC1D,CAAC;AACJ,CAAC;AAtCD,gEAsCC"}
@@ -11,7 +11,14 @@ function updateComponentSpec(host, options) {
11
11
  let componentSpecSourceFile = ts.createSourceFile(componentSpecPath, componentSpecSource, ts.ScriptTarget.Latest, true);
12
12
  host.write(componentSpecPath, componentSpecSource
13
13
  .replace('.content span', 'h1')
14
- .replace(`${options.name} app is running!`, `Welcome to ${options.name}!`));
14
+ .replace(`${options.name} app is running!`, `Welcome ${options.name}`));
15
+ // Adding NxWelcome component to app.component.spec
16
+ componentSpecSourceFile = (0, ast_utils_1.insertImport)(host, componentSpecSourceFile, componentSpecPath, 'NxWelcomeComponent', './nx-welcome.component');
17
+ componentSpecSourceFile = (0, ast_utils_2.replaceIntoToTestBed)(host, componentSpecSourceFile, componentSpecPath, `declarations: [AppComponent, NxWelcomeComponent]`, `
18
+ declarations: [
19
+ AppComponent
20
+ ],
21
+ `);
15
22
  if (options.routing) {
16
23
  componentSpecSourceFile = (0, ast_utils_1.insertImport)(host, componentSpecSourceFile, componentSpecPath, 'RouterTestingModule', '@angular/router/testing');
17
24
  componentSpecSourceFile = (0, ast_utils_2.addImportToTestBed)(host, componentSpecSourceFile, componentSpecPath, `RouterTestingModule`);
@@ -1 +1 @@
1
- {"version":3,"file":"update-component-spec.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-component-spec.ts"],"names":[],"mappings":";;;AAGA,iCAAiC;AACjC,uEAAuE;AACvE,kEAAwE;AAExE,SAAgB,mBAAmB,CAAC,IAAU,EAAE,OAAyB;IACvE,IAAI,OAAO,CAAC,SAAS,KAAK,IAAI,EAAE;QAC9B,MAAM,iBAAiB,GAAG,GAAG,OAAO,CAAC,cAAc,gCAAgC,CAAC;QACpF,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAElE,IAAI,uBAAuB,GAAG,EAAE,CAAC,gBAAgB,CAC/C,iBAAiB,EACjB,mBAAmB,EACnB,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,KAAK,CACR,iBAAiB,EACjB,mBAAmB;aAChB,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC;aAC9B,OAAO,CACN,GAAG,OAAO,CAAC,IAAI,kBAAkB,EACjC,cAAc,OAAO,CAAC,IAAI,GAAG,CAC9B,CACJ,CAAC;QAEF,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,uBAAuB,GAAG,IAAA,wBAAY,EACpC,IAAI,EACJ,uBAAuB,EACvB,iBAAiB,EACjB,qBAAqB,EACrB,yBAAyB,CAC1B,CAAC;YAEF,uBAAuB,GAAG,IAAA,8BAAkB,EAC1C,IAAI,EACJ,uBAAuB,EACvB,iBAAiB,EACjB,qBAAqB,CACtB,CAAC;SACH;KACF;AACH,CAAC;AAvCD,kDAuCC"}
1
+ {"version":3,"file":"update-component-spec.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-component-spec.ts"],"names":[],"mappings":";;;AAGA,iCAAiC;AACjC,uEAAuE;AACvE,kEAG4C;AAE5C,SAAgB,mBAAmB,CAAC,IAAU,EAAE,OAAyB;IACvE,IAAI,OAAO,CAAC,SAAS,KAAK,IAAI,EAAE;QAC9B,MAAM,iBAAiB,GAAG,GAAG,OAAO,CAAC,cAAc,gCAAgC,CAAC;QACpF,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAElE,IAAI,uBAAuB,GAAG,EAAE,CAAC,gBAAgB,CAC/C,iBAAiB,EACjB,mBAAmB,EACnB,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,KAAK,CACR,iBAAiB,EACjB,mBAAmB;aAChB,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC;aAC9B,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,kBAAkB,EAAE,WAAW,OAAO,CAAC,IAAI,EAAE,CAAC,CACzE,CAAC;QAEF,mDAAmD;QACnD,uBAAuB,GAAG,IAAA,wBAAY,EACpC,IAAI,EACJ,uBAAuB,EACvB,iBAAiB,EACjB,oBAAoB,EACpB,wBAAwB,CACzB,CAAC;QAEF,uBAAuB,GAAG,IAAA,gCAAoB,EAC5C,IAAI,EACJ,uBAAuB,EACvB,iBAAiB,EACjB,kDAAkD,EAClD;;;;KAID,CACA,CAAC;QAEF,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,uBAAuB,GAAG,IAAA,wBAAY,EACpC,IAAI,EACJ,uBAAuB,EACvB,iBAAiB,EACjB,qBAAqB,EACrB,yBAAyB,CAC1B,CAAC;YAEF,uBAAuB,GAAG,IAAA,8BAAkB,EAC1C,IAAI,EACJ,uBAAuB,EACvB,iBAAiB,EACjB,qBAAqB,CACtB,CAAC;SACH;KACF;AACH,CAAC;AAzDD,kDAyDC"}
@@ -5,17 +5,10 @@ const tslib_1 = require("tslib");
5
5
  const devkit_1 = require("@nrwl/devkit");
6
6
  const workspace_1 = require("@nrwl/workspace");
7
7
  function updateConfigFiles(host, options) {
8
- addProjectToNx(host, options);
9
8
  updateTsConfigOptions(host, options);
10
9
  updateAppAndE2EProjectConfigurations(host, options);
11
10
  }
12
11
  exports.updateConfigFiles = updateConfigFiles;
13
- function addProjectToNx(host, options) {
14
- // tags, implicit dependencies
15
- const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.name);
16
- const resultJson = Object.assign(Object.assign({}, projectConfig), { tags: options.parsedTags });
17
- (0, devkit_1.updateProjectConfiguration)(host, options.name, resultJson);
18
- }
19
12
  function updateTsConfigOptions(host, options) {
20
13
  // tsconfig.app.json
21
14
  (0, devkit_1.updateJson)(host, `${options.appProjectRoot}/tsconfig.app.json`, (json) => (Object.assign(Object.assign({}, json), { extends: './tsconfig.json', compilerOptions: Object.assign(Object.assign({}, json.compilerOptions), { outDir: `${(0, devkit_1.offsetFromRoot)(options.appProjectRoot)}dist/out-tsc` }), exclude: [
@@ -37,6 +30,7 @@ function updateAppAndE2EProjectConfigurations(host, options) {
37
30
  if (options.port) {
38
31
  fixedProject.targets.serve = Object.assign(Object.assign({}, fixedProject.targets.serve), { options: Object.assign(Object.assign({}, fixedProject.targets.serve.options), { port: options.port }) });
39
32
  }
33
+ fixedProject.tags = options.parsedTags;
40
34
  (0, devkit_1.updateProjectConfiguration)(host, options.name, fixedProject);
41
35
  if (options.unitTestRunner === "none" /* None */) {
42
36
  host.delete(`${options.appProjectRoot}/src/app/app.component.spec.ts`);
@@ -1 +1 @@
1
- {"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":";;;;AAGA,yCAOsB;AACtB,+CAAyD;AAGzD,SAAgB,iBAAiB,CAAC,IAAU,EAAE,OAAyB;IACrE,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrC,oCAAoC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC;AAHD,8CAGC;AAED,SAAS,qBAAqB,CAAC,IAAU,EAAE,OAAyB;IAClE,oBAAoB;IACpB,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACrE,IAAI,KACP,OAAO,EAAE,iBAAiB,EAC1B,eAAe,kCACV,IAAI,CAAC,eAAe,KACvB,MAAM,EAAE,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,cAAc,KAEjE,OAAO,EAAE;YACP,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;SACtE,IACD,CAAC,CAAC;AACN,CAAC;AAED,SAAS,oCAAoC,CAC3C,IAAU,EACV,OAAyB;IAEzB,iBAAiB;IACjB,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7D,IAAI,YAAY,GAAG,IAAA,kCAAsB,EACvC,OAAO,EACP,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,cAAc,CACvB,CAAC;IAEF,OAAO,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC;IAEjC,2DAA2D;IAC3D,sBAAsB;IACtB,MAAM,KAAwB,YAAY,CAAC,OAAO,CAAC,KAAK,EAAlD,EAAE,QAAQ,OAAwC,EAAnC,IAAI,2BAAnB,YAAqB,CAA6B,CAAC;IACzD,YAAY,CAAC,OAAO,CAAC,KAAK,mBACxB,QAAQ,EACR,OAAO,EAAE,CAAC,sBAAsB,CAAC,IAC9B,IAAI,CACR,CAAC;IAEF,IAAI,YAAY,CAAC,UAAU,EAAE;QAC3B,OAAO,YAAY,CAAC,UAAU,CAAC;KAChC;IAED,IAAI,OAAO,CAAC,IAAI,EAAE;QAChB,YAAY,CAAC,OAAO,CAAC,KAAK,mCACrB,YAAY,CAAC,OAAO,CAAC,KAAK,KAC7B,OAAO,kCACF,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,KACrC,IAAI,EAAE,OAAO,CAAC,IAAI,MAErB,CAAC;KACH;IAED,YAAY,CAAC,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;IAEvC,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAE7D,IAAI,OAAO,CAAC,cAAc,sBAAwB,EAAE;QAClD,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,gCAAgC,CAAC,CAAC;QACvE,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,qBAAqB,CAAC,CAAC;KAC7D;IAED,IAAI,OAAO,CAAC,aAAa,sBAAuB,EAAE;QAChD,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,IAAI,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YACxC,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;SAC1D;KACF;IAED,mCAAmC;IACnC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,gBAAgB,CAAC,CAAC;IACvD,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,cAAc,CAAC,CAAC;AACvD,CAAC"}
@@ -5,7 +5,7 @@ const devkit_1 = require("@nrwl/devkit");
5
5
  function updateE2eProject(tree, options) {
6
6
  const spec = `${options.e2eProjectRoot}/src/app.e2e-spec.ts`;
7
7
  const content = tree.read(spec, 'utf-8');
8
- tree.write(spec, content.replace(`${options.name} app is running!`, `Welcome to ${options.name}!`));
8
+ tree.write(spec, content.replace(`${options.name} app is running!`, `Welcome ${options.name}`));
9
9
  const page = `${options.e2eProjectRoot}/src/app.po.ts`;
10
10
  const pageContent = tree.read(page, 'utf-8');
11
11
  tree.write(page, pageContent.replace(`.content span`, `header h1`));
@@ -1 +1 @@
1
- {"version":3,"file":"update-e2e-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-e2e-project.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AAGtB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IACpE,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,cAAc,sBAAsB,CAAC;IAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,KAAK,CACR,IAAI,EACJ,OAAO,CAAC,OAAO,CACb,GAAG,OAAO,CAAC,IAAI,kBAAkB,EACjC,cAAc,OAAO,CAAC,IAAI,GAAG,CAC9B,CACF,CAAC;IAEF,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,cAAc,gBAAgB,CAAC;IACvD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC;IAEpE,MAAM,IAAI,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE;YACP,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;SACtB;QACD,oBAAoB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;QACpC,IAAI,EAAE,EAAE;KACT,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,GAAG,GAAG,OAAO,CAAC,cAAc,qBAAqB,CAAC;IAC9F,uCAAuC;IACvC,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAE/D,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;IACxB,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAErD,sBAAsB;IACtB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,oBAAoB,CAAC,EAAE;QAC/D,IAAI,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,cAAc,oBAAoB,EAAE,IAAI,CAAC,CAAC;KACjE;IAED,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACvE,uCACK,IAAI,KACP,OAAO,EAAE,iBAAiB,EAC1B,eAAe,kCACV,IAAI,CAAC,eAAe,KACvB,MAAM,EAAE,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,cAAc,OAEjE;IACJ,CAAC,CAAC,CAAC;IAEH,kBAAkB;IAClB,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE;QACnE,uCACK,IAAI,KACP,OAAO,EAAE,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,oBAAoB,IACtE;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAvDD,4CAuDC"}
1
+ {"version":3,"file":"update-e2e-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-e2e-project.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AAGtB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IACpE,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,cAAc,sBAAsB,CAAC;IAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,KAAK,CACR,IAAI,EACJ,OAAO,CAAC,OAAO,CACb,GAAG,OAAO,CAAC,IAAI,kBAAkB,EACjC,WAAW,OAAO,CAAC,IAAI,EAAE,CAC1B,CACF,CAAC;IAEF,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,cAAc,gBAAgB,CAAC;IACvD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC;IAEpE,MAAM,IAAI,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE;YACP,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;SACtB;QACD,oBAAoB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;QACpC,IAAI,EAAE,EAAE;KACT,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,GAAG,GAAG,OAAO,CAAC,cAAc,qBAAqB,CAAC;IAC9F,uCAAuC;IACvC,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAE/D,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;IACxB,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAErD,sBAAsB;IACtB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,oBAAoB,CAAC,EAAE;QAC/D,IAAI,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,cAAc,oBAAoB,EAAE,IAAI,CAAC,CAAC;KACjE;IAED,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACvE,uCACK,IAAI,KACP,OAAO,EAAE,iBAAiB,EAC1B,eAAe,kCACV,IAAI,CAAC,eAAe,KACvB,MAAM,EAAE,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,cAAc,OAEjE;IACJ,CAAC,CAAC,CAAC;IAEH,kBAAkB;IAClB,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE;QACnE,uCACK,IAAI,KACP,OAAO,EAAE,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,oBAAoB,IACtE;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAvDD,4CAuDC"}
@@ -1,3 +1,3 @@
1
1
  import type { Tree } from '@nrwl/devkit';
2
2
  import type { NormalizedSchema } from './normalized-schema';
3
- export declare function updateComponentTemplate(host: Tree, options: NormalizedSchema): void;
3
+ export declare function updateNxComponentTemplate(host: Tree, options: NormalizedSchema): void;
@@ -0,0 +1,31 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.updateNxComponentTemplate = void 0;
4
+ const ts = require("typescript");
5
+ const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
6
+ const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
7
+ const nrwl_home_tpl_1 = require("./nrwl-home-tpl");
8
+ function updateNxComponentTemplate(host, options) {
9
+ const componentPath = `${options.appProjectRoot}/src/app/nx-welcome.component.ts`;
10
+ const templateNodeValue = (0, ast_utils_2.getDecoratorPropertyValueNode)(host, componentPath, 'Component', 'template', '@angular/core');
11
+ (0, ast_utils_1.replaceNodeValue)(host, ts.createSourceFile(componentPath, host.read(componentPath, 'utf-8'), ts.ScriptTarget.Latest, true), componentPath, templateNodeValue, `\`\n${nrwl_home_tpl_1.nrwlHomeTemplate.template(options.name)}\n\``);
12
+ // Fixing extra comma issue `,,`
13
+ let sourceFile = ts.createSourceFile(componentPath, host.read(componentPath, 'utf-8'), ts.ScriptTarget.Latest, true);
14
+ const componentFile = host
15
+ .read(componentPath, 'utf-8')
16
+ .toString()
17
+ .replace(/,,/gi, ',');
18
+ host.write(componentPath, componentFile);
19
+ sourceFile.update(componentFile, {
20
+ newLength: componentFile.length,
21
+ span: {
22
+ length: sourceFile.text.length,
23
+ start: 0,
24
+ },
25
+ });
26
+ // Add ESLint ignore to pass the lint step
27
+ sourceFile = ts.createSourceFile(componentPath, host.read(componentPath, 'utf-8'), ts.ScriptTarget.Latest, true);
28
+ (0, ast_utils_1.addGlobal)(host, sourceFile, componentPath, '/* eslint-disable */');
29
+ }
30
+ exports.updateNxComponentTemplate = updateNxComponentTemplate;
31
+ //# sourceMappingURL=update-nx-component-template.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"update-nx-component-template.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-nx-component-template.ts"],"names":[],"mappings":";;;AAGA,iCAAiC;AACjC,uEAGiD;AACjD,kEAAmF;AACnF,mDAAmD;AAEnD,SAAgB,yBAAyB,CACvC,IAAU,EACV,OAAyB;IAEzB,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,cAAc,kCAAkC,CAAC;IAClF,MAAM,iBAAiB,GAAG,IAAA,yCAA6B,EACrD,IAAI,EACJ,aAAa,EACb,WAAW,EACX,UAAU,EACV,eAAe,CAChB,CAAC;IAEF,IAAA,4BAAgB,EACd,IAAI,EACJ,EAAE,CAAC,gBAAgB,CACjB,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACjC,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,EACD,aAAa,EACb,iBAAiB,EACjB,OAAO,gCAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CACrD,CAAC;IAEF,gCAAgC;IAChC,IAAI,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAClC,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACjC,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IACF,MAAM,aAAa,GAAG,IAAI;SACvB,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC;SAC5B,QAAQ,EAAE;SACV,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACxB,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IACzC,UAAU,CAAC,MAAM,CAAC,aAAa,EAAE;QAC/B,SAAS,EAAE,aAAa,CAAC,MAAM;QAC/B,IAAI,EAAE;YACJ,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM;YAC9B,KAAK,EAAE,CAAC;SACT;KACF,CAAC,CAAC;IAEH,0CAA0C;IAC1C,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAC9B,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACjC,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IACF,IAAA,qBAAS,EAAC,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,sBAAsB,CAAC,CAAC;AACrE,CAAC;AAtDD,8DAsDC"}
@@ -62,6 +62,7 @@ function updateDependencies(host) {
62
62
  tslib: '^2.0.0',
63
63
  'zone.js': '~0.11.4',
64
64
  }, {
65
+ '@angular/cli': versions_1.angularDevkitVersion,
65
66
  '@angular/compiler-cli': versions_1.angularVersion,
66
67
  '@angular/language-service': versions_1.angularVersion,
67
68
  '@angular-devkit/build-angular': versions_1.angularDevkitVersion,
@@ -1 +1 @@
1
- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,yCAA+D;AAC/D,yCAMsB;AACtB,qCAA+C;AAC/C,2FAAqF;AACrF,iGAA4F;AAE5F,mDAK8B;AAC9B,0CAAgD;AAGhD,SAAsB,oBAAoB,CACxC,IAAU,EACV,OAAe;;QAEf,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,cAAc,CAAC,IAAI,CAAC,CAAC;QAErB,MAAM,QAAQ,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,YAAY,GAAG,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChD,iBAAiB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAEpC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;CAAA;AAjBD,oDAiBC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,OAAe;IAC9C,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEnD,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC;IAClD,SAAS,CAAC,UAAU,CAAC,2BAA2B,CAAC,mBAC/C,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,cAAc,EAAE,OAAO,CAAC,cAAc,EACtC,aAAa,EAAE,OAAO,CAAC,aAAa,IACjC,CAAC,SAAS,CAAC,UAAU,CAAC,2BAA2B,CAAC,IAAI,EAAE,CAAC,CAC7D,CAAC;IACF,SAAS,CAAC,UAAU,CAAC,uBAAuB,CAAC,mBAC3C,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,cAAc,EAAE,OAAO,CAAC,cAAc,IACnC,CAAC,SAAS,CAAC,UAAU,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC,CACzD,CAAC;IACF,SAAS,CAAC,UAAU,CAAC,yBAAyB,CAAC,mBAC7C,KAAK,EAAE,OAAO,CAAC,KAAK,IACjB,CAAC,SAAS,CAAC,UAAU,CAAC,yBAAyB,CAAC,IAAI,EAAE,CAAC,CAC3D,CAAC;IAEF,IAAA,qCAA4B,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAA,6CAAoB,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,cAAc,CAAC,IAAU;IAChC,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,OAAO,EAAE,EAAE;;QAC3C,OAAO,CAAC,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,8CAA8C,CAAC;QAC/D,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE;YAChC,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC;SACvC;aAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YACxD,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,OAAO,OAAO,EAAE,CAAC;SAC9E;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAU;IACpC,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,qBAAqB,EAAE,yBAAc;QACrC,iBAAiB,EAAE,yBAAc;QACjC,mBAAmB,EAAE,yBAAc;QACnC,eAAe,EAAE,yBAAc;QAC/B,gBAAgB,EAAE,yBAAc;QAChC,2BAA2B,EAAE,yBAAc;QAC3C,mCAAmC,EAAE,yBAAc;QACnD,iBAAiB,EAAE,yBAAc;QACjC,IAAI,EAAE,sBAAW;QACjB,KAAK,EAAE,QAAQ;QACf,SAAS,EAAE,SAAS;KACrB,EACD;QACE,uBAAuB,EAAE,yBAAc;QACvC,2BAA2B,EAAE,yBAAc;QAC3C,+BAA+B,EAAE,+BAAoB;KACtD,CACF,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CACxB,IAAU,EACV,OAAuC;IAEvC,QAAQ,OAAO,CAAC,cAAc,EAAE;QAC9B;YACE,OAAO,IAAA,sBAAc,EAAC,IAAI,CAAC,CAAC;QAC9B;YACE,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,qBAAqB,EAAE,mCAAwB;aAChD,CACF,CAAC;YACF,OAAO,IAAA,wBAAiB,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACrC;YACE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACnB;AACH,CAAC;AAED,SAAS,gBAAgB,CACvB,IAAU,EACV,OAAsC;IAEtC,QAAQ,OAAO,CAAC,aAAa,EAAE;QAC7B;YACE,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;gBACE,UAAU,EAAE,QAAQ;gBACpB,cAAc,EAAE,QAAQ;gBACxB,uBAAuB,EAAE,QAAQ;gBACjC,SAAS,EAAE,QAAQ;gBACnB,gBAAgB,EAAE,QAAQ;gBAC1B,mBAAmB,EAAE,QAAQ;aAC9B,CACF,CAAC;QACJ;YACE,OAAO,IAAA,8BAAoB,EAAC,IAAI,CAAC,CAAC;QACpC;YACE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACnB;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAU,EAAE,KAAa;IAClD,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QAC7B,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YACjC,OAAO;SACR;QAED,OAAO,GAAG,GAAG,OAAO,KAAK,KAAK,IAAI,CAAC;QACnC,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;KACnC;SAAM;QACL,eAAM,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;KACxD;AACH,CAAC;AAED,kBAAe,oBAAoB,CAAC"}
1
+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"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"}
@@ -5,9 +5,13 @@ const devkit_1 = require("@nrwl/devkit");
5
5
  const devkit_2 = require("@nrwl/devkit");
6
6
  const linter_1 = require("@nrwl/linter");
7
7
  function normalizeOptions(host, schema) {
8
- var _a, _b;
8
+ var _a, _b, _c;
9
9
  // Create a schema with populated default values
10
- const options = Object.assign({ buildable: false, linter: linter_1.Linter.EsLint, name: '', publishable: false, simpleModuleName: false, skipFormat: false, unitTestRunner: "jest" /* Jest */ }, schema);
10
+ const options = Object.assign({ buildable: false, linter: linter_1.Linter.EsLint, name: '', publishable: false, simpleModuleName: false, skipFormat: false, unitTestRunner: "jest" /* Jest */,
11
+ // Publishable libs cannot use `full` yet, so if its false then use the passed value or default to `full`
12
+ compilationMode: schema.publishable
13
+ ? 'partial'
14
+ : (_a = schema.compilationMode) !== null && _a !== void 0 ? _a : 'full' }, schema);
11
15
  const name = (0, devkit_2.names)(options.name).fileName;
12
16
  const projectDirectory = options.directory
13
17
  ? `${(0, devkit_2.names)(options.directory).fileName}/${name}`
@@ -22,9 +26,9 @@ function normalizeOptions(host, schema) {
22
26
  : [];
23
27
  const modulePath = `${projectRoot}/src/lib/${fileName}.module.ts`;
24
28
  const defaultPrefix = npmScope;
25
- options.standaloneConfig = (_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : standaloneAsDefault;
29
+ options.standaloneConfig = (_b = options.standaloneConfig) !== null && _b !== void 0 ? _b : standaloneAsDefault;
26
30
  const importPath = options.importPath || `@${defaultPrefix}/${projectDirectory}`;
27
- return Object.assign(Object.assign({}, options), { prefix: (_b = options.prefix) !== null && _b !== void 0 ? _b : defaultPrefix, name: projectName, projectRoot, entryFile: 'index', moduleName,
31
+ return Object.assign(Object.assign({}, options), { prefix: (_c = options.prefix) !== null && _c !== void 0 ? _c : defaultPrefix, name: projectName, projectRoot, entryFile: 'index', moduleName,
28
32
  projectDirectory,
29
33
  modulePath,
30
34
  parsedTags,
@@ -1 +1 @@
1
- {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAA2E;AAG3E,yCAAqC;AACrC,yCAAsC;AAGtC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,MAAuB;;IAEvB,gDAAgD;IAChD,MAAM,OAAO,mBACX,SAAS,EAAE,KAAK,EAChB,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,IAAI,EAAE,EAAE,EACR,WAAW,EAAE,KAAK,EAClB,gBAAgB,EAAE,KAAK,EACvB,UAAU,EAAE,KAAK,EACjB,cAAc,uBACX,MAAM,CACV,CAAC;IAEF,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS;QACxC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;QAChD,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACxE,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IAC/D,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAEjE,MAAM,UAAU,GAAG,GAAG,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAC,SAAS,QAAQ,CAAC;IACxD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,UAAU,GAAG,GAAG,WAAW,YAAY,QAAQ,YAAY,CAAC;IAClE,MAAM,aAAa,GAAG,QAAQ,CAAC;IAE/B,OAAO,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,mBAAmB,CAAC;IAE3E,MAAM,UAAU,GACd,OAAO,CAAC,UAAU,IAAI,IAAI,aAAa,IAAI,gBAAgB,EAAE,CAAC;IAEhE,uCACK,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,aAAa,EACvC,IAAI,EAAE,WAAW,EACjB,WAAW,EACX,SAAS,EAAE,OAAO,EAClB,UAAU;QACV,gBAAgB;QAChB,UAAU;QACV,UAAU;QACV,QAAQ;QACR,UAAU,IACV;AACJ,CAAC;AApDD,4CAoDC"}
1
+ {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAA2E;AAG3E,yCAAqC;AACrC,yCAAsC;AAGtC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,MAAuB;;IAEvB,gDAAgD;IAChD,MAAM,OAAO,mBACX,SAAS,EAAE,KAAK,EAChB,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,IAAI,EAAE,EAAE,EACR,WAAW,EAAE,KAAK,EAClB,gBAAgB,EAAE,KAAK,EACvB,UAAU,EAAE,KAAK,EACjB,cAAc;QACd,yGAAyG;QACzG,eAAe,EAAE,MAAM,CAAC,WAAW;YACjC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,MAAA,MAAM,CAAC,eAAe,mCAAI,MAAM,IACjC,MAAM,CACV,CAAC;IAEF,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS;QACxC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;QAChD,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACxE,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IAC/D,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAEjE,MAAM,UAAU,GAAG,GAAG,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAC,SAAS,QAAQ,CAAC;IACxD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,UAAU,GAAG,GAAG,WAAW,YAAY,QAAQ,YAAY,CAAC;IAClE,MAAM,aAAa,GAAG,QAAQ,CAAC;IAE/B,OAAO,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,mBAAmB,CAAC;IAE3E,MAAM,UAAU,GACd,OAAO,CAAC,UAAU,IAAI,IAAI,aAAa,IAAI,gBAAgB,EAAE,CAAC;IAEhE,uCACK,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,aAAa,EACvC,IAAI,EAAE,WAAW,EACjB,WAAW,EACX,SAAS,EAAE,OAAO,EAClB,UAAU;QACV,gBAAgB;QAChB,UAAU;QACV,UAAU;QACV,QAAQ;QACR,UAAU,IACV;AACJ,CAAC;AAxDD,4CAwDC"}
@@ -28,7 +28,8 @@ function updateProjectConfig(host, options) {
28
28
  function updateProjectIvyConfig(host, options) {
29
29
  if (options.buildable || options.publishable) {
30
30
  return (0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.lib.prod.json`, (json) => {
31
- json.angularCompilerOptions['compilationMode'] = 'partial';
31
+ json.angularCompilerOptions['compilationMode'] =
32
+ options.compilationMode === 'full' ? undefined : 'partial';
32
33
  return json;
33
34
  });
34
35
  }
@@ -1 +1 @@
1
- {"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAAoE;AAGpE,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IAC7D,IAAA,mBAAU,EAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QAC9C,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,qDAAqD,OAAO,CAAC,UAAU,uCAAuC,CAC/G,CAAC;SACH;QAED,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;YAC5B,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,IACjC,OAAO,CAAC,gBACV,eAAe;SAChB,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAU,EAAE,OAAyB;IAChE,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACpE,IAAI,CAAC,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;SACtE,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAU,EAAE,OAAyB;IACnE,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,WAAW,EAAE;QAC5C,OAAO,IAAA,mBAAU,EACf,IAAI,EACJ,GAAG,OAAO,CAAC,WAAW,yBAAyB,EAC/C,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC,GAAG,SAAS,CAAC;YAC3D,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAgB,cAAc,CAAC,IAAU,EAAE,OAAyB;IAClE,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAChC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACxC,CAAC;AAJD,wCAIC"}
1
+ {"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAAoE;AAGpE,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IAC7D,IAAA,mBAAU,EAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QAC9C,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,qDAAqD,OAAO,CAAC,UAAU,uCAAuC,CAC/G,CAAC;SACH;QAED,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;YAC5B,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,IACjC,OAAO,CAAC,gBACV,eAAe;SAChB,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAU,EAAE,OAAyB;IAChE,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACpE,IAAI,CAAC,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;SACtE,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAU,EAAE,OAAyB;IACnE,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,WAAW,EAAE;QAC5C,OAAO,IAAA,mBAAU,EACf,IAAI,EACJ,GAAG,OAAO,CAAC,WAAW,yBAAyB,EAC/C,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC;gBAC5C,OAAO,CAAC,eAAe,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAgB,cAAc,CAAC,IAAU,EAAE,OAAyB;IAClE,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAChC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACxC,CAAC;AAJD,wCAIC"}
@@ -26,4 +26,5 @@ export interface Schema {
26
26
 
27
27
  linter: Exclude<Linter, Linter.TsLint>;
28
28
  unitTestRunner: UnitTestRunner;
29
+ compilationMode?: 'full' | 'partial';
29
30
  }
@@ -102,6 +102,11 @@
102
102
  "standaloneConfig": {
103
103
  "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
104
104
  "type": "boolean"
105
+ },
106
+ "compilationMode": {
107
+ "description": "Specifies the compilation mode to use. If not specified, it will default to `partial` for publishable libraries and to `full` for buildable libraries. The `full` value can not be used for publishable libraries.",
108
+ "type": "string",
109
+ "enum": ["full", "partial"]
105
110
  }
106
111
  },
107
112
  "required": []
@@ -4,6 +4,7 @@ exports.setupMfe = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const devkit_1 = require("@nrwl/devkit");
6
6
  const lib_1 = require("./lib");
7
+ const versions_1 = require("../../utils/versions");
7
8
  function setupMfe(host, options) {
8
9
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
9
10
  const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.appName);
@@ -16,7 +17,9 @@ function setupMfe(host, options) {
16
17
  (0, lib_1.setupServeTarget)(host, options);
17
18
  (0, lib_1.fixBootstrap)(host, projectConfig.root);
18
19
  // add package to install
19
- const installPackages = (0, devkit_1.addDependenciesToPackageJson)(host, { '@angular-architects/module-federation': '^12.5.3' }, {});
20
+ const installPackages = (0, devkit_1.addDependenciesToPackageJson)(host, {
21
+ '@angular-architects/module-federation': versions_1.angularArchitectsModuleFederationPluginVersion,
22
+ }, {});
20
23
  // format files
21
24
  if (!options.skipFormat) {
22
25
  yield (0, devkit_1.formatFiles)(host);
@@ -1 +1 @@
1
- {"version":3,"file":"setup-mfe.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mfe/setup-mfe.ts"],"names":[],"mappings":";;;;AAGA,yCAIsB;AAEtB,+BASe;AAEf,SAAsB,QAAQ,CAAC,IAAU,EAAE,OAAe;;QACxD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtE,MAAM,gBAAgB,GAAG,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5D,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE/B,IAAA,2BAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAE3E,IAAA,oBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;QAClD,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/B,IAAA,uBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,IAAA,sBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhC,IAAA,kBAAY,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;QAEvC,yBAAyB;QACzB,MAAM,eAAe,GAAG,IAAA,qCAA4B,EAClD,IAAI,EACJ,EAAE,uCAAuC,EAAE,SAAS,EAAE,EACtD,EAAE,CACH,CAAC;QAEF,eAAe;QACf,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,eAAe,CAAC;IACzB,CAAC;CAAA;AA5BD,4BA4BC;AAED,kBAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"setup-mfe.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mfe/setup-mfe.ts"],"names":[],"mappings":";;;;AAGA,yCAIsB;AAEtB,+BASe;AACf,mDAAsF;AAEtF,SAAsB,QAAQ,CAAC,IAAU,EAAE,OAAe;;QACxD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtE,MAAM,gBAAgB,GAAG,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5D,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE/B,IAAA,2BAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAE3E,IAAA,oBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;QAClD,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/B,IAAA,uBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,IAAA,sBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhC,IAAA,kBAAY,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;QAEvC,yBAAyB;QACzB,MAAM,eAAe,GAAG,IAAA,qCAA4B,EAClD,IAAI,EACJ;YACE,uCAAuC,EACrC,yDAA8C;SACjD,EACD,EAAE,CACH,CAAC;QAEF,eAAe;QACf,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,eAAe,CAAC;IACzB,CAAC;CAAA;AA/BD,4BA+BC;AAED,kBAAe,QAAQ,CAAC"}
@@ -1,5 +1,4 @@
1
1
  import type { GeneratorCallback, Tree } from '@nrwl/devkit';
2
- import storybookConfigurationGenerator from '../storybook-configuration/storybook-configuration';
3
2
  import type { StorybookMigrateDefault5to6Schema } from './schema';
4
3
  export declare function storybookMigrateDefaults5To6Generator(tree: Tree, options: StorybookMigrateDefault5to6Schema): GeneratorCallback;
5
- export default storybookConfigurationGenerator;
4
+ export default storybookMigrateDefaults5To6Generator;
@@ -2,7 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.storybookMigrateDefaults5To6Generator = void 0;
4
4
  const storybook_1 = require("@nrwl/storybook");
5
- const storybook_configuration_1 = require("../storybook-configuration/storybook-configuration");
6
5
  function storybookMigrateDefaults5To6Generator(tree, options) {
7
6
  return (0, storybook_1.migrateDefaultsGenerator)(tree, {
8
7
  name: options.name,
@@ -11,5 +10,5 @@ function storybookMigrateDefaults5To6Generator(tree, options) {
11
10
  });
12
11
  }
13
12
  exports.storybookMigrateDefaults5To6Generator = storybookMigrateDefaults5To6Generator;
14
- exports.default = storybook_configuration_1.default;
13
+ exports.default = storybookMigrateDefaults5To6Generator;
15
14
  //# sourceMappingURL=storybook-migrate-defaults-5-to-6.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"storybook-migrate-defaults-5-to-6.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.ts"],"names":[],"mappings":";;;AACA,+CAA2D;AAC3D,gGAAiG;AAGjG,SAAgB,qCAAqC,CACnD,IAAU,EACV,OAA0C;IAE1C,OAAO,IAAA,oCAAwB,EAAC,IAAI,EAAE;QACpC,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC,CAAC;AACL,CAAC;AATD,sFASC;AAED,kBAAe,iCAA+B,CAAC"}
1
+ {"version":3,"file":"storybook-migrate-defaults-5-to-6.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.ts"],"names":[],"mappings":";;;AACA,+CAA2D;AAG3D,SAAgB,qCAAqC,CACnD,IAAU,EACV,OAA0C;IAE1C,OAAO,IAAA,oCAAwB,EAAC,IAAI,EAAE;QACpC,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC,CAAC;AACL,CAAC;AATD,sFASC;AAED,kBAAe,qCAAqC,CAAC"}
@@ -0,0 +1,2 @@
1
+ import { Tree } from '@nrwl/devkit';
2
+ export default function (tree: Tree): Promise<void>;
@@ -0,0 +1,231 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const tslib_1 = require("tslib");
4
+ const devkit_1 = require("@nrwl/devkit");
5
+ const tsquery_1 = require("@phenomnomnominal/tsquery");
6
+ const path_1 = require("path");
7
+ const ts = require("typescript");
8
+ function default_1(tree) {
9
+ var _a, _b, _c;
10
+ return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
11
+ const projects = (0, devkit_1.getProjects)(tree);
12
+ for (const [projectName, project] of projects.entries()) {
13
+ // only interested in projects with @nrwl/jest:jest executor
14
+ if (((_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.test) === null || _b === void 0 ? void 0 : _b.executor) !== '@nrwl/jest:jest') {
15
+ continue;
16
+ }
17
+ const jestConfigPath = (_c = project.targets.test.options) === null || _c === void 0 ? void 0 : _c.jestConfig;
18
+ // if there's not jestConfigPath, we don't process it
19
+ if (!jestConfigPath) {
20
+ devkit_1.logger.warn(`The "jestConfig" property is not configured for the test target of the project "${projectName}". Skipping it.`);
21
+ continue;
22
+ }
23
+ if (!tree.exists(jestConfigPath)) {
24
+ devkit_1.logger.warn(`The specified "jestConfig" path "${jestConfigPath}" for the project "${projectName}" can not be found. Skipping it.`);
25
+ continue;
26
+ }
27
+ let jestConfigContents = tree.read(jestConfigPath, 'utf-8');
28
+ // check if it's an angular project by looking for jest-preset-angular
29
+ if (!jestConfigContents.includes('jest-preset-angular')) {
30
+ continue;
31
+ }
32
+ const { shouldUpdate, testSetupFilePath } = shouldUpdateTeardownConfig(tree, projectName, jestConfigPath, jestConfigContents);
33
+ if (!shouldUpdate) {
34
+ continue;
35
+ }
36
+ const printer = ts.createPrinter();
37
+ if (shouldUpdate === 'testSetup') {
38
+ optOutTestTeardownFromTestSetupFile(tree, testSetupFilePath, printer);
39
+ }
40
+ else {
41
+ optOutTestTeardownFromTestFiles(tree, projectName, printer);
42
+ }
43
+ }
44
+ yield (0, devkit_1.formatFiles)(tree);
45
+ });
46
+ }
47
+ exports.default = default_1;
48
+ function shouldUpdateTeardownConfig(tree, projectName, jestConfigPath, jestConfigContents) {
49
+ const jestConfigAst = tsquery_1.tsquery.ast(jestConfigContents);
50
+ const setupFilesAfterEnvSelector = 'PropertyAssignment:has(Identifier[name=setupFilesAfterEnv])';
51
+ const setupFilesAfterEnvProperty = (0, tsquery_1.tsquery)(jestConfigAst, setupFilesAfterEnvSelector, {
52
+ visitAllChildren: true,
53
+ })[0];
54
+ // no property specified, we try to migrate test files
55
+ if (!setupFilesAfterEnvProperty) {
56
+ return { shouldUpdate: 'testFiles' };
57
+ }
58
+ const setupFilesValueSelector = 'ArrayLiteralExpression StringLiteral';
59
+ const setupFilesValue = (0, tsquery_1.tsquery)(setupFilesAfterEnvProperty, setupFilesValueSelector, {
60
+ visitAllChildren: true,
61
+ })[0];
62
+ // not setup file specified, we try to migrate test files
63
+ if (!setupFilesValue) {
64
+ return { shouldUpdate: 'testFiles' };
65
+ }
66
+ const testSetupFilePath = setupFilesValue
67
+ .getText()
68
+ .replace('<rootDir>', (0, path_1.dirname)(jestConfigPath))
69
+ .replace(/['"]/g, '');
70
+ // the specified file is invalid, we migrate test files
71
+ if (!tree.exists(testSetupFilePath)) {
72
+ return { shouldUpdate: 'testFiles' };
73
+ }
74
+ let testSetupFileContents = tree.read(testSetupFilePath, 'utf-8');
75
+ const testSetupFileAst = tsquery_1.tsquery.ast(testSetupFileContents);
76
+ const initTestEnvironmentSelector = 'CallExpression:has(PropertyAccessExpression:has(Identifier[name=initTestEnvironment]))';
77
+ const initTestEnvironmentCall = (0, tsquery_1.tsquery)(testSetupFileAst, initTestEnvironmentSelector, {
78
+ visitAllChildren: true,
79
+ })[0];
80
+ // no initTestEnvironment call, we migrate the test setup file
81
+ if (!initTestEnvironmentCall) {
82
+ return { shouldUpdate: 'testSetup', testSetupFilePath };
83
+ }
84
+ // no third arg, we migrate the test setup file
85
+ if (initTestEnvironmentCall.arguments.length === 2) {
86
+ return { shouldUpdate: 'testSetup', testSetupFilePath };
87
+ }
88
+ // this would be a type error, we migrate test files
89
+ if (initTestEnvironmentCall.arguments.length < 2) {
90
+ return { shouldUpdate: 'testFiles' };
91
+ }
92
+ const optionsArg = initTestEnvironmentCall.arguments[2];
93
+ // the options arg is an object that has a teardown property, no migration is needed
94
+ if (isObjectLiteralWithTeardown(optionsArg)) {
95
+ return { shouldUpdate: false };
96
+ }
97
+ // the options arg is an object that doesn't have a teardown property, we migrate the test setup file
98
+ if (isObjectLiteralWithoutTeardown(optionsArg)) {
99
+ return { shouldUpdate: 'testSetup', testSetupFilePath };
100
+ }
101
+ // the options arg is an `aotSummaries` function, we migrate the test setup file
102
+ if (isFunction(optionsArg)) {
103
+ return { shouldUpdate: 'testSetup', testSetupFilePath };
104
+ }
105
+ // we fallback to migrate the test files
106
+ return { shouldUpdate: 'testFiles' };
107
+ }
108
+ function optOutTestTeardownFromTestFiles(tree, projectName, printer) {
109
+ const { sourceRoot, root } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
110
+ (0, devkit_1.visitNotIgnoredFiles)(tree, sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : root, (path) => {
111
+ if (!['.ts', '.js'].includes((0, path_1.extname)(path))) {
112
+ return;
113
+ }
114
+ let fileContents = tree.read(path, 'utf-8');
115
+ const ast = tsquery_1.tsquery.ast(fileContents);
116
+ const configureTestingModulePropertyAccessExpressionSelector = 'CallExpression > PropertyAccessExpression:has(Identifier[name=configureTestingModule])';
117
+ const configureTestingModulePropertyAccessExpressions = (0, tsquery_1.tsquery)(ast, configureTestingModulePropertyAccessExpressionSelector, {
118
+ visitAllChildren: true,
119
+ });
120
+ // no calls to configureTestingModule, we skip it
121
+ if (!configureTestingModulePropertyAccessExpressions.length) {
122
+ return;
123
+ }
124
+ // reverse the order to not mess with positions as we update the AST
125
+ const reversedConfigureTestingModulePropertyAccessExpressions = sortInReverseSourceOrder(configureTestingModulePropertyAccessExpressions);
126
+ reversedConfigureTestingModulePropertyAccessExpressions.forEach((propertyAccessExpression) => {
127
+ const configureTestingModuleCall = propertyAccessExpression.parent;
128
+ if (configureTestingModuleCall.arguments.length === 0 ||
129
+ !isObjectLiteralWithoutTeardown(configureTestingModuleCall.arguments[0])) {
130
+ return;
131
+ }
132
+ const testModuleMetadata = configureTestingModuleCall.arguments[0];
133
+ const replacement = getTestModuleMetadataLiteralReplacement(testModuleMetadata, printer);
134
+ fileContents = `${fileContents.slice(0, testModuleMetadata.getStart())}${replacement}${fileContents.slice(testModuleMetadata.getEnd())}`;
135
+ tree.write(path, fileContents);
136
+ });
137
+ });
138
+ }
139
+ function optOutTestTeardownFromTestSetupFile(tree, testSetupFilePath, printer) {
140
+ let testSetupFileContents = tree.read(testSetupFilePath, 'utf-8');
141
+ const testSetupFileAst = tsquery_1.tsquery.ast(testSetupFileContents);
142
+ const initTestEnvironmentSelector = 'CallExpression:has(PropertyAccessExpression:has(Identifier[name=initTestEnvironment]))';
143
+ const initTestEnvironmentCall = (0, tsquery_1.tsquery)(testSetupFileAst, initTestEnvironmentSelector, {
144
+ visitAllChildren: true,
145
+ })[0];
146
+ if (!initTestEnvironmentCall) {
147
+ testSetupFileContents += `
148
+ import { getTestBed } from '@angular/core/testing';
149
+ import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
150
+
151
+ getTestBed().resetTestEnvironment();
152
+ getTestBed().initTestEnvironment(
153
+ BrowserDynamicTestingModule,
154
+ platformBrowserDynamicTesting(),
155
+ { teardown: { destroyAfterEach: false } },
156
+ );
157
+ `;
158
+ tree.write(testSetupFilePath, testSetupFileContents);
159
+ return;
160
+ }
161
+ const { span, text } = getInitTestEnvironmentLiteralReplacement(initTestEnvironmentCall, printer);
162
+ testSetupFileContents = `${testSetupFileContents.slice(0, span.start)}${text}${testSetupFileContents.slice(span.end)}`;
163
+ tree.write(testSetupFilePath, testSetupFileContents);
164
+ }
165
+ function getInitTestEnvironmentLiteralReplacement(initTestEnvironmentCall, printer) {
166
+ const literalProperties = [];
167
+ const options = initTestEnvironmentCall.arguments[initTestEnvironmentCall.arguments.length - 1];
168
+ let span;
169
+ let prefix;
170
+ // update the last argument of the initTestEnvironment call
171
+ if (initTestEnvironmentCall.arguments.length === 3) {
172
+ if (isFunction(options)) {
173
+ // If the last argument is a function, add the function as the `aotSummaries` property.
174
+ literalProperties.push(ts.factory.createPropertyAssignment('aotSummaries', options));
175
+ }
176
+ else if (ts.isObjectLiteralExpression(options)) {
177
+ // If the property is an object literal, copy over all the properties.
178
+ literalProperties.push(...options.properties);
179
+ }
180
+ prefix = '';
181
+ span = {
182
+ start: options.getStart(),
183
+ end: options.getEnd(),
184
+ };
185
+ }
186
+ else {
187
+ const start = options.getEnd();
188
+ prefix = ', ';
189
+ span = { start, end: start };
190
+ }
191
+ // finally push the teardown object so that it appears last
192
+ literalProperties.push(createTeardownAssignment());
193
+ return {
194
+ span,
195
+ text: `${prefix}${printer.printNode(ts.EmitHint.Unspecified, ts.factory.createObjectLiteralExpression(literalProperties), initTestEnvironmentCall.getSourceFile())}`,
196
+ };
197
+ }
198
+ function getTestModuleMetadataLiteralReplacement(testModuleMetadataObjectLiteral, printer) {
199
+ return printer.printNode(ts.EmitHint.Unspecified, ts.factory.createObjectLiteralExpression([
200
+ ...testModuleMetadataObjectLiteral.properties,
201
+ createTeardownAssignment(),
202
+ ], testModuleMetadataObjectLiteral.properties.length > 0), testModuleMetadataObjectLiteral.getSourceFile());
203
+ }
204
+ function isObjectLiteralWithTeardown(node) {
205
+ return (ts.isObjectLiteralExpression(node) &&
206
+ node.properties.some((prop) => {
207
+ var _a;
208
+ return ((_a = prop.name) === null || _a === void 0 ? void 0 : _a.getText()) === 'teardown';
209
+ }));
210
+ }
211
+ function isObjectLiteralWithoutTeardown(node) {
212
+ return (ts.isObjectLiteralExpression(node) &&
213
+ !node.properties.find((prop) => {
214
+ var _a;
215
+ return ((_a = prop.name) === null || _a === void 0 ? void 0 : _a.getText()) === 'teardown';
216
+ }));
217
+ }
218
+ function isFunction(node) {
219
+ return (ts.isArrowFunction(node) ||
220
+ ts.isFunctionExpression(node) ||
221
+ ts.isFunctionDeclaration(node));
222
+ }
223
+ function createTeardownAssignment() {
224
+ return ts.factory.createPropertyAssignment('teardown', ts.factory.createObjectLiteralExpression([
225
+ ts.factory.createPropertyAssignment('destroyAfterEach', ts.factory.createFalse()),
226
+ ]));
227
+ }
228
+ function sortInReverseSourceOrder(nodes) {
229
+ return nodes.sort((a, b) => b.getEnd() - a.getEnd());
230
+ }
231
+ //# sourceMappingURL=opt-out-testbed-teardown.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"opt-out-testbed-teardown.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-2-0/opt-out-testbed-teardown.ts"],"names":[],"mappings":"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"}