@nrwl/angular 13.3.0-beta.3 → 13.3.0-beta.4

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 (68) hide show
  1. package/fesm2015/nrwl-angular-testing.mjs +1 -0
  2. package/fesm2015/nrwl-angular.mjs +1 -0
  3. package/fesm2020/nrwl-angular-testing.mjs +1 -0
  4. package/fesm2020/nrwl-angular.mjs +1 -0
  5. package/migrations.json +6 -0
  6. package/ng-package.json +3 -1
  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.js +6 -5
  12. package/src/builders/webpack-browser/webpack-browser.impl.js.map +1 -1
  13. package/src/builders/webpack-server/webpack-server.impl.js +3 -2
  14. package/src/builders/webpack-server/webpack-server.impl.js.map +1 -1
  15. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.di.d.ts +9 -0
  16. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.di.js +13 -4
  17. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.di.js.map +1 -1
  18. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.d.ts +5 -4
  19. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js +4 -3
  20. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js.map +1 -1
  21. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.di.d.ts +1 -0
  22. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.di.js +3 -2
  23. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.di.js.map +1 -1
  24. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/options.di.d.ts +14 -0
  25. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/options.di.js +32 -0
  26. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/options.di.js.map +1 -0
  27. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/package.di.d.ts +2 -0
  28. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/package.di.js +5 -3
  29. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/package.di.js.map +1 -1
  30. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.d.ts +46 -0
  31. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.di.d.ts +10 -0
  32. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.di.js +18 -0
  33. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.di.js.map +1 -0
  34. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.js +268 -0
  35. package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.js.map +1 -0
  36. package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js +5 -0
  37. package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js.map +1 -1
  38. package/src/executors/ng-packagr-lite/schema.json +4 -0
  39. package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.di.js +2 -2
  40. package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.di.js.map +1 -1
  41. package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.d.ts +1 -1
  42. package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js +1 -1
  43. package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js.map +1 -1
  44. package/src/executors/package/ng-packagr-adjustments/ng-package/options.di.d.ts +14 -0
  45. package/src/executors/package/ng-packagr-adjustments/ng-package/options.di.js +32 -0
  46. package/src/executors/package/ng-packagr-adjustments/ng-package/options.di.js.map +1 -0
  47. package/src/executors/package/ng-packagr-adjustments/ng-package/package.di.d.ts +2 -0
  48. package/src/executors/package/ng-packagr-adjustments/ng-package/package.di.js +5 -3
  49. package/src/executors/package/ng-packagr-adjustments/ng-package/package.di.js.map +1 -1
  50. package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.d.ts +2 -1
  51. package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js +4 -3
  52. package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js.map +1 -1
  53. package/src/executors/package/package.impl.js +8 -4
  54. package/src/executors/package/package.impl.js.map +1 -1
  55. package/src/executors/package/schema.d.ts +2 -1
  56. package/src/executors/package/schema.json +4 -0
  57. package/src/executors/{package/ng-packagr-adjustments/utilities → utilities}/tailwindcss.d.ts +1 -1
  58. package/src/executors/{package/ng-packagr-adjustments/utilities → utilities}/tailwindcss.js +11 -9
  59. package/src/executors/utilities/tailwindcss.js.map +1 -0
  60. package/src/generators/application/application.js +9 -5
  61. package/src/generators/application/application.js.map +1 -1
  62. package/src/generators/application/lib/update-config-files.js +1 -7
  63. package/src/generators/application/lib/update-config-files.js.map +1 -1
  64. package/src/migrations/update-13-2-0/opt-out-testbed-teardown.d.ts +2 -0
  65. package/src/migrations/update-13-2-0/opt-out-testbed-teardown.js +231 -0
  66. package/src/migrations/update-13-2-0/opt-out-testbed-teardown.js.map +1 -0
  67. package/src/utils/versions.js +1 -1
  68. package/src/executors/package/ng-packagr-adjustments/utilities/tailwindcss.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"package.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"package.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,8 @@
1
1
  export interface BuildAngularLibraryExecutorOptions {
2
2
  project: string;
3
- tsConfig?: string;
4
3
  buildableProjectDepsInPackageJsonType?: 'dependencies' | 'peerDependencies';
4
+ tailwindConfig?: string;
5
+ tsConfig?: string;
5
6
  updateBuildableProjectDepsInPackageJson?: boolean;
6
7
  watch?: boolean;
7
8
  }
@@ -28,6 +28,10 @@
28
28
  "description": "When `updateBuildableProjectDepsInPackageJson` is `true`, this adds dependencies to either `peerDependencies` or `dependencies`.",
29
29
  "enum": ["dependencies", "peerDependencies"],
30
30
  "default": "peerDependencies"
31
+ },
32
+ "tailwindConfig": {
33
+ "type": "string",
34
+ "description": "The full path for the Tailwind configuration file, relative to the workspace root. If not provided and a `tailwind.config.js` file exists in the project or workspace root, it will be used. Otherwise, Tailwind will not be configured."
31
35
  }
32
36
  },
33
37
  "additionalProperties": false,
@@ -3,5 +3,5 @@ export interface TailwindSetup {
3
3
  tailwindPackagePath: string;
4
4
  }
5
5
  export declare const tailwindDirectives: string[];
6
- export declare function getTailwindSetup(basePath: string): TailwindSetup | undefined;
6
+ export declare function getTailwindSetup(basePath: string, tailwindConfig?: string): TailwindSetup | undefined;
7
7
  export declare function getTailwindPostCssPlugins({ tailwindConfigPath, tailwindPackagePath }: TailwindSetup, includePaths?: string[], watch?: boolean): any[];
@@ -14,15 +14,17 @@ exports.tailwindDirectives = [
14
14
  '@responsive',
15
15
  '@screen',
16
16
  ];
17
- function getTailwindSetup(basePath) {
18
- // Try to find TailwindCSS configuration file in the project or workspace root.
19
- const tailwindConfigFile = 'tailwind.config.js';
20
- let tailwindConfigPath;
21
- for (const path of [basePath, app_root_1.appRootPath]) {
22
- const fullPath = (0, path_1.join)(path, tailwindConfigFile);
23
- if ((0, fs_1.existsSync)(fullPath)) {
24
- tailwindConfigPath = fullPath;
25
- break;
17
+ function getTailwindSetup(basePath, tailwindConfig) {
18
+ let tailwindConfigPath = tailwindConfig;
19
+ if (!tailwindConfigPath) {
20
+ // Try to find TailwindCSS configuration file in the project or workspace root.
21
+ const tailwindConfigFile = 'tailwind.config.js';
22
+ for (const path of [basePath, app_root_1.appRootPath]) {
23
+ const fullPath = (0, path_1.join)(path, tailwindConfigFile);
24
+ if ((0, fs_1.existsSync)(fullPath)) {
25
+ tailwindConfigPath = fullPath;
26
+ break;
27
+ }
26
28
  }
27
29
  }
28
30
  // Only load Tailwind CSS plugin if configuration file was found.
@@ -0,0 +1 @@
1
+ {"version":3,"file":"tailwindcss.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/tailwindcss.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AACtC,2DAA2D;AAC3D,2BAAgC;AAChC,+BAAsC;AACtC,gDAAgD;AAOnC,QAAA,kBAAkB,GAAG;IAChC,WAAW;IACX,QAAQ;IACR,QAAQ;IACR,WAAW;IACX,aAAa;IACb,SAAS;CACV,CAAC;AAEF,SAAgB,gBAAgB,CAC9B,QAAgB,EAChB,cAAuB;IAEvB,IAAI,kBAAkB,GAAG,cAAc,CAAC;IAExC,IAAI,CAAC,kBAAkB,EAAE;QACvB,+EAA+E;QAC/E,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;QAChD,KAAK,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,sBAAW,CAAC,EAAE;YAC1C,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;YAChD,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,EAAE;gBACxB,kBAAkB,GAAG,QAAQ,CAAC;gBAC9B,MAAM;aACP;SACF;KACF;IAED,iEAAiE;IACjE,IAAI,CAAC,kBAAkB,EAAE;QACvB,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,mBAAuC,CAAC;IAC5C,IAAI;QACF,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;KACtD;IAAC,WAAM;QACN,MAAM,0BAA0B,GAAG,IAAA,eAAQ,EACzC,sBAAW,EACX,kBAAkB,CACnB,CAAC;QACF,eAAM,CAAC,IAAI,CACT,0CAA0C,0BAA0B,GAAG;YACrE,kDAAkD;YAClD,oEAAoE,CACvE,CAAC;QAEF,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,CAAC,mBAAmB,EAAE;QACxB,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,CAAC;AACrD,CAAC;AA7CD,4CA6CC;AAED,SAAgB,yBAAyB,CACvC,EAAE,kBAAkB,EAAE,mBAAmB,EAAiB,EAC1D,YAAuB,EACvB,KAAe;IAEf,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,SAAS,EAAE;QAC9C,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;KAC1D;IAED,OAAO;QACL,aAAa,CAAC;YACZ,qBAAqB,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE;YACzC,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;SACzE,CAAC;QACF,OAAO,CAAC,mBAAmB,CAAC,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;KAC7D,CAAC;AACJ,CAAC;AAhBD,8DAgBC"}
@@ -13,12 +13,16 @@ function applicationGenerator(host, schema) {
13
13
  const options = (0, lib_1.normalizeOptions)(host, schema);
14
14
  // Determine the roots where @schematics/angular will place the projects
15
15
  // This is not where the projects actually end up
16
- const workspaceJson = (0, devkit_1.readJson)(host, (0, devkit_1.getWorkspacePath)(host));
17
- const appProjectRoot = workspaceJson.newProjectRoot
18
- ? `${workspaceJson.newProjectRoot}/${options.name}`
16
+ const workspaceJsonPath = (0, devkit_1.getWorkspacePath)(host);
17
+ let newProjectRoot = null;
18
+ if (workspaceJsonPath) {
19
+ ({ newProjectRoot } = (0, devkit_1.readJson)(host, workspaceJsonPath));
20
+ }
21
+ const appProjectRoot = newProjectRoot
22
+ ? `${newProjectRoot}/${options.name}`
19
23
  : options.name;
20
- const e2eProjectRoot = workspaceJson.newProjectRoot
21
- ? `${workspaceJson.newProjectRoot}/${options.e2eProjectName}`
24
+ const e2eProjectRoot = newProjectRoot
25
+ ? `${newProjectRoot}/${options.e2eProjectName}`
22
26
  : `${options.name}/e2e`;
23
27
  yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { skipFormat: true }));
24
28
  const angularAppSchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'application');
@@ -1 +1 @@
1
- {"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":"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"}
@@ -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"}
@@ -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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"}
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.angularArchitectsModuleFederationPluginVersion = exports.storybookVersion = exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
4
- exports.nxVersion = '13.3.0-beta.3';
4
+ exports.nxVersion = '13.3.0-beta.4';
5
5
  exports.angularVersion = '^13.0.0';
6
6
  exports.angularDevkitVersion = '~13.0.0';
7
7
  exports.angularJsVersion = '1.7.9';
@@ -1 +0,0 @@
1
- {"version":3,"file":"tailwindcss.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/utilities/tailwindcss.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AACtC,2DAA2D;AAC3D,2BAAgC;AAChC,+BAAsC;AACtC,gDAAgD;AAOnC,QAAA,kBAAkB,GAAG;IAChC,WAAW;IACX,QAAQ;IACR,QAAQ;IACR,WAAW;IACX,aAAa;IACb,SAAS;CACV,CAAC;AAEF,SAAgB,gBAAgB,CAAC,QAAgB;IAC/C,+EAA+E;IAC/E,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;IAChD,IAAI,kBAAsC,CAAC;IAC3C,KAAK,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,sBAAW,CAAC,EAAE;QAC1C,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAChD,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,EAAE;YACxB,kBAAkB,GAAG,QAAQ,CAAC;YAC9B,MAAM;SACP;KACF;IAED,iEAAiE;IACjE,IAAI,CAAC,kBAAkB,EAAE;QACvB,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,mBAAuC,CAAC;IAC5C,IAAI;QACF,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;KACtD;IAAC,WAAM;QACN,MAAM,0BAA0B,GAAG,IAAA,eAAQ,EACzC,sBAAW,EACX,kBAAkB,CACnB,CAAC;QACF,eAAM,CAAC,IAAI,CACT,0CAA0C,0BAA0B,GAAG;YACrE,kDAAkD;YAClD,oEAAoE,CACvE,CAAC;QAEF,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,CAAC,mBAAmB,EAAE;QACxB,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,CAAC;AACrD,CAAC;AAvCD,4CAuCC;AAED,SAAgB,yBAAyB,CACvC,EAAE,kBAAkB,EAAE,mBAAmB,EAAiB,EAC1D,YAAuB,EACvB,KAAe;IAEf,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,SAAS,EAAE;QAC9C,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;KAC1D;IAED,OAAO;QACL,aAAa,CAAC;YACZ,qBAAqB,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE;YACzC,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;SACzE,CAAC;QACF,OAAO,CAAC,mBAAmB,CAAC,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;KAC7D,CAAC;AACJ,CAAC;AAhBD,8DAgBC"}