@nx/angular 17.1.0-beta.3 → 17.1.0-beta.4

package/migrations.json

@@ -297,15 +297,6 @@
       "description": "Rename 'browserTarget' to 'buildTarget'.",
       "factory": "./src/migrations/update-17-1-0/browser-target-to-build-target"
     },
-    "stub-performance-mark-in-jest-test-setup": {
-      "cli": "nx",
-      "version": "17.1.0-beta.3",
-      "requires": {
-        "@angular/core": ">=17.0.0-rc.3"
-      },
-      "description": "Stubs out 'performance.mark' in the Jest test setup file.",
-      "factory": "./src/migrations/update-17-1-0/stub-performance-mark-in-jest-test-setup"
-    },
     "replace-nguniversal-builders": {
       "cli": "nx",
       "version": "17.1.0-beta.3",
@@ -323,6 +314,15 @@
       },
       "description": "Replace usages of '@nguniversal/' packages with '@angular/ssr'.",
       "factory": "./src/migrations/update-17-1-0/replace-nguniversal-engines"
+    },
+    "update-zone-js-deep-import": {
+      "cli": "nx",
+      "version": "17.1.0-beta.4",
+      "requires": {
+        "@angular/core": ">=17.0.0-rc.3"
+      },
+      "description": "Replace the deep imports from 'zone.js/dist/zone' and 'zone.js/dist/zone-testing' with 'zone.js' and 'zone.js/testing'.",
+      "factory": "./src/migrations/update-17-1-0/update-zone-js-deep-import"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "17.1.0-beta.3",
+  "version": "17.1.0-beta.4",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -78,15 +78,15 @@
     "tslib": "^2.3.0",
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "17.1.0-beta.3",
-    "@nx/cypress": "17.1.0-beta.3",
-    "@nx/jest": "17.1.0-beta.3",
-    "@nx/js": "17.1.0-beta.3",
-    "@nx/eslint": "17.1.0-beta.3",
-    "@nx/webpack": "17.1.0-beta.3",
-    "@nx/web": "17.1.0-beta.3",
-    "@nx/workspace": "17.1.0-beta.3",
-    "@nrwl/angular": "17.1.0-beta.3"
+    "@nx/devkit": "17.1.0-beta.4",
+    "@nx/cypress": "17.1.0-beta.4",
+    "@nx/jest": "17.1.0-beta.4",
+    "@nx/js": "17.1.0-beta.4",
+    "@nx/eslint": "17.1.0-beta.4",
+    "@nx/webpack": "17.1.0-beta.4",
+    "@nx/web": "17.1.0-beta.4",
+    "@nx/workspace": "17.1.0-beta.4",
+    "@nrwl/angular": "17.1.0-beta.4"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": "^17.0.0-rc.4",

package/src/executors/utilities/typescript.js

@@ -9,9 +9,9 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseRemappedTsConfigAndMergeDefaults = void 0;
-const ng_compiler_cli_1 = require("ng-packagr/lib/utils/ng-compiler-cli");
 const path_1 = require("path");
 const ts = require("typescript");
+const ng_compiler_cli_1 = require("./ng-compiler-cli");
 async function readDefaultTsConfig(fileName) {
     // these options are mandatory
     const extraOptions = {

package/src/generators/application/lib/add-unit-test-runner.js

@@ -4,7 +4,6 @@ exports.addUnitTestRunner = void 0;
 const devkit_1 = require("@nx/devkit");
 const jest_1 = require("@nx/jest");
 const test_runners_1 = require("../../../utils/test-runners");
-const version_utils_1 = require("../../utils/version-utils");
 async function addUnitTestRunner(host, options) {
     if (options.unitTestRunner === test_runners_1.UnitTestRunner.Jest) {
         await (0, jest_1.configurationGenerator)(host, {
@@ -16,7 +15,6 @@ async function addUnitTestRunner(host, options) {
             skipFormat: true,
         });
         const setupFile = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src', 'test-setup.ts');
-        const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(host);
         if (options.strict && host.exists(setupFile)) {
             const contents = host.read(setupFile, 'utf-8');
             host.write(setupFile, `// @ts-expect-error https://thymikee.github.io/jest-preset-angular/docs/getting-started/test-environment
@@ -26,15 +24,7 @@ globalThis.ngJest = {
     errorOnUnknownProperties: true,
   },
 };
-${contents}${angularMajorVersion >= 17
-                ? `
-/**
- * Angular uses performance.mark() which is not supported by jsdom. Stub it out
- * to avoid errors.
- */
-global.performance.mark = jest.fn();
-`
-                : ''}`);
+${contents}`);
         }
     }
 }

package/src/generators/library/library.js

@@ -94,7 +94,6 @@ async function addUnitTestRunner(host, options) {
             skipPackageJson: options.skipPackageJson,
         });
         const setupFile = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', 'test-setup.ts');
-        const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(host);
         if (options.strict && host.exists(setupFile)) {
             const contents = host.read(setupFile, 'utf-8');
             host.write(setupFile, `// @ts-expect-error https://thymikee.github.io/jest-preset-angular/docs/getting-started/test-environment
@@ -104,15 +103,7 @@ globalThis.ngJest = {
     errorOnUnknownProperties: true,
   },
 };
-${contents}${angularMajorVersion >= 17
-                ? `
-/**
-* Angular uses performance.mark() which is not supported by jsdom. Stub it out
-* to avoid errors.
-*/
-global.performance.mark = jest.fn();
-`
-                : ''}`);
+${contents}`);
         }
     }
 }

package/src/generators/utils/version-utils.d.ts

@@ -1,5 +1,5 @@
 import type { GeneratorCallback, Tree } from '@nx/devkit';
-import * as latestVersions from '../../utils/versions';
+import { type PackageCompatVersions, type PackageLatestVersions } from '../../utils/backward-compatible-versions';
 export declare function getInstalledAngularVersion(tree: Tree): string;
 export declare function getInstalledAngularMajorVersion(tree: Tree): number;
 export declare function getInstalledAngularVersionInfo(tree: Tree): {
@@ -12,4 +12,4 @@ export declare function getInstalledPackageVersionInfo(tree: Tree, pkgName: stri
     version: string;
 };
 export declare function addDependenciesToPackageJsonIfDontExist(tree: Tree, dependencies: Record<string, string>, devDependencies: Record<string, string>, packageJsonPath?: string): GeneratorCallback;
-export declare function versions(tree: Tree): typeof latestVersions | import("../../utils/backward-compatible-versions").PackageVersions;
+export declare function versions(tree: Tree): PackageLatestVersions | PackageCompatVersions;

package/src/generators/utils/version-utils.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.versions = exports.addDependenciesToPackageJsonIfDontExist = exports.getInstalledPackageVersionInfo = exports.getInstalledPackageVersion = exports.getInstalledAngularVersionInfo = exports.getInstalledAngularMajorVersion = exports.getInstalledAngularVersion = void 0;
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
+const backward_compatible_versions_1 = require("../../utils/backward-compatible-versions");
 const latestVersions = require("../../utils/versions");
 const versions_1 = require("../../utils/versions");
-const backward_compatible_versions_1 = require("../../utils/backward-compatible-versions");
 function getInstalledAngularVersion(tree) {
     const pkgJson = (0, devkit_1.readJson)(tree, 'package.json');
     const installedAngularVersion = pkgJson.dependencies && pkgJson.dependencies['@angular/core'];

package/src/migrations/update-17-1-0/update-zone-js-deep-import.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+const projects_1 = require("../utils/projects");
+async function default_1(tree) {
+    const angularProjects = await (0, projects_1.getProjectsFilteredByDependencies)(tree, [
+        'npm:@angular/core',
+    ]);
+    if (!angularProjects.length) {
+        return;
+    }
+    const zoneJsImportRegex = /(['"`])zone\.js\/dist\/zone(['"`])/g;
+    const zoneJsTestingImportRegex = /(['"`])zone\.js\/dist\/zone-testing(['"`])/g;
+    for (const { project } of angularProjects) {
+        (0, devkit_1.visitNotIgnoredFiles)(tree, project.root, (file) => {
+            // we are only interested in .ts files
+            if (!file.endsWith('.ts')) {
+                return;
+            }
+            let content = tree.read(file, 'utf-8');
+            let wasUpdated = false;
+            if (zoneJsImportRegex.test(content)) {
+                content = content.replace(zoneJsImportRegex, '$1zone.js$2');
+                wasUpdated = true;
+            }
+            if (zoneJsTestingImportRegex.test(content)) {
+                content = content.replace(zoneJsTestingImportRegex, '$1zone.js/testing$2');
+                wasUpdated = true;
+            }
+            if (wasUpdated) {
+                tree.write(file, content);
+            }
+        });
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+exports.default = default_1;

package/src/utils/backward-compatible-versions.d.ts

@@ -1,6 +1,8 @@
 import * as latestVersions from './versions';
 type SupportedVersions = 'angularV15' | 'angularV16';
-export type PackageVersionNames = Exclude<keyof typeof latestVersions, 'nxVersion'>;
-export type PackageVersions = Record<PackageVersionNames, string>;
-export declare const backwardCompatibleVersions: Record<SupportedVersions, PackageVersions>;
+export type LatestPackageVersionNames = Exclude<keyof typeof latestVersions, 'nxVersion'>;
+export type CompatPackageVersionNames = LatestPackageVersionNames | 'ngUniversalVersion';
+export type PackageLatestVersions = Record<LatestPackageVersionNames, string>;
+export type PackageCompatVersions = Record<CompatPackageVersionNames, string>;
+export declare const backwardCompatibleVersions: Record<SupportedVersions, PackageCompatVersions>;
 export {};

package/src/utils/version-utils.d.ts

@@ -1,3 +1,3 @@
-import type { PackageVersionNames, PackageVersions } from './backward-compatible-versions';
-export declare function getPkgVersionForAngularMajorVersion(pkgVersionName: PackageVersionNames, angularMajorVersion: number): string;
-export declare function getPkgVersionsForAngularMajorVersion(angularMajorVersion: number): PackageVersions;
+import type { CompatPackageVersionNames, LatestPackageVersionNames, PackageCompatVersions, PackageLatestVersions } from './backward-compatible-versions';
+export declare function getPkgVersionForAngularMajorVersion(pkgVersionName: LatestPackageVersionNames | CompatPackageVersionNames, angularMajorVersion: number): string;
+export declare function getPkgVersionsForAngularMajorVersion(angularMajorVersion: number): PackageLatestVersions | PackageCompatVersions;

package/src/utils/versions.d.ts

@@ -7,7 +7,6 @@ export declare const rxjsVersion = "~7.8.0";
 export declare const zoneJsVersion = "~0.14.0";
 export declare const angularJsVersion = "1.7.9";
 export declare const tsLibVersion = "^2.3.0";
-export declare const ngUniversalVersion = "~16.2.0";
 export declare const corsVersion = "~2.8.5";
 export declare const typesCorsVersion = "~2.8.5";
 export declare const expressVersion = "~4.18.2";

package/src/utils/versions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jsoncEslintParserVersion = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssPresetEnvVersion = exports.postcssImportVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.moduleFederationNodeVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.ngUniversalVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
+exports.jsoncEslintParserVersion = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssPresetEnvVersion = exports.postcssImportVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.moduleFederationNodeVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.angularVersion = '~17.0.0-rc.3';
 exports.angularDevkitVersion = '~17.0.0-rc.4';
@@ -10,7 +10,6 @@ exports.rxjsVersion = '~7.8.0';
 exports.zoneJsVersion = '~0.14.0';
 exports.angularJsVersion = '1.7.9';
 exports.tsLibVersion = '^2.3.0';
-exports.ngUniversalVersion = '~16.2.0';
 exports.corsVersion = '~2.8.5';
 exports.typesCorsVersion = '~2.8.5';
 exports.expressVersion = '~4.18.2';

package/src/migrations/update-17-1-0/stub-performance-mark-in-jest-test-setup.js

@@ -1,63 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-const tsquery_1 = require("@phenomnomnominal/tsquery");
-const path_1 = require("path");
-const ts = require("typescript");
-const projects_1 = require("../utils/projects");
-async function default_1(tree) {
-    const angularProjects = await (0, projects_1.getProjectsFilteredByDependencies)(tree, [
-        'npm:@angular/core',
-    ]);
-    const jestConfigFiles = new Set();
-    const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
-    (0, executor_options_utils_1.forEachExecutorOptionsInGraph)(projectGraph, '@nx/jest:jest', (options, projectName) => {
-        const projectConfig = angularProjects.find(({ project }) => projectName === project.name);
-        if (!projectConfig) {
-            return;
-        }
-        if (options.jestConfig && tree.exists(options.jestConfig)) {
-            jestConfigFiles.add(options.jestConfig);
-        }
-    });
-    const setupFilePaths = [];
-    for (const jestConfigFile of jestConfigFiles) {
-        const projectSetupFilePaths = getSetupFilePaths(tree, jestConfigFile);
-        setupFilePaths.push(...projectSetupFilePaths);
-    }
-    for (const setupFilePath of setupFilePaths) {
-        if (!tree.exists(setupFilePath)) {
-            continue;
-        }
-        updateSetupFileWithPerformanceMarkStub(tree, setupFilePath);
-    }
-    await (0, devkit_1.formatFiles)(tree);
-}
-exports.default = default_1;
-function getSetupFilePaths(tree, jestConfigFile) {
-    const config = tree.read(jestConfigFile, 'utf-8');
-    const TS_QUERY_JEST_CONFIG_PREFIX = ':matches(ExportAssignment, BinaryExpression:has(Identifier[name="module"]):has(Identifier[name="exports"]))';
-    const setupFilePathNodes = tsquery_1.tsquery.query(config, `${TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression PropertyAssignment:has(Identifier[name="setupFilesAfterEnv"]) > ArrayLiteralExpression StringLiteral`);
-    const rootDir = (0, path_1.dirname)(jestConfigFile);
-    const setupFilePaths = setupFilePathNodes.map((node) => node.text.replace('<rootDir>', rootDir));
-    return setupFilePaths;
-}
-function updateSetupFileWithPerformanceMarkStub(tree, setupFilePath) {
-    const setupFile = tree.read(setupFilePath, 'utf-8');
-    const setupFileSource = ts.createSourceFile(setupFilePath, setupFile, ts.ScriptTarget.Latest);
-    const TS_QUERY_PERFORMANCE_MARK_ACCESS = 'PropertyAccessExpression:has(Identifier[name=performance]):has(Identifier[name=mark])';
-    const TS_QUERY_PERFORMANCE_MARK_ASSIGNMENT = 'PropertyAccessExpression:has(Identifier[name=performance]) + EqualsToken + ObjectLiteralExpression:has(PropertyAssignment Identifier[name=mark])';
-    const performanceMarkNodes = tsquery_1.tsquery.query(setupFileSource, `:matches(${TS_QUERY_PERFORMANCE_MARK_ACCESS}, ${TS_QUERY_PERFORMANCE_MARK_ASSIGNMENT})`);
-    // there is already some access to performance.mark, so we assume it was handled already
-    if (performanceMarkNodes.length) {
-        return;
-    }
-    tree.write(setupFilePath, `${setupFile}
-/**
- * Angular uses performance.mark() which is not supported by jsdom. Stub it out
- * to avoid errors.
- */
-global.performance.mark = jest.fn();
-`);
-}