@nx/angular 16.4.0-beta.1 → 16.4.0-beta.13

package/migrations.json

@@ -245,6 +245,24 @@
       },
       "description": "Switch the data persistence operator imports to '@ngrx/router-store/data-persistence'.",
       "factory": "./src/migrations/update-16-2-0/switch-data-persistence-operators-imports-to-ngrx-router-store"
+    },
+    "rename-angular-eslint-accesibility-rules": {
+      "cli": "nx",
+      "version": "16.4.0-beta.6",
+      "requires": {
+        "@angular-eslint/eslint-plugin-template": ">=16.0.0"
+      },
+      "description": "Remove the 'accessibility-' prefix from '@angular-eslint/eslint-plugin-template' rules.",
+      "factory": "./src/migrations/update-16-4-0/rename-angular-eslint-accesibility-rules"
+    },
+    "update-angular-cli-version-16-1-0": {
+      "cli": "nx",
+      "version": "16.4.0-beta.11",
+      "requires": {
+        "@angular/core": ">=16.1.0"
+      },
+      "description": "Update the @angular/cli package version to ~16.1.0.",
+      "factory": "./src/migrations/update-16-4-0/update-angular-cli"
     }
   },
   "packageJsonUpdates": {
@@ -464,7 +482,8 @@
     "14.4.0": {
       "version": "14.4.0-beta.1",
       "requires": {
-        "eslint": "^7.0.0 || ^8.0.0"
+        "eslint": "^7.0.0 || ^8.0.0",
+        "@angular/core": ">=14.0.0 <15.0.0"
       },
       "packages": {
         "@angular-eslint/eslint-plugin": {
@@ -674,6 +693,10 @@
     },
     "14.8.0-angular-eslint": {
       "version": "14.8.0-beta.0",
+      "requires": {
+        "eslint": "^7.0.0 || ^8.0.0",
+        "@angular/core": ">=14.0.0 <15.0.0"
+      },
       "packages": {
         "@angular-eslint/eslint-plugin": {
           "version": "~14.0.4",
@@ -769,7 +792,8 @@
     "15.2.2-angular-eslint": {
       "version": "15.2.2-beta.0",
       "requires": {
-        "eslint": "^7.20.0 || ^8.0.0"
+        "eslint": "^7.20.0 || ^8.0.0",
+        "@angular/core": ">=15.0.0 <16.0.0"
       },
       "packages": {
         "@angular-eslint/eslint-plugin": {
@@ -1099,7 +1123,8 @@
     "16.1.0-angular-eslint": {
       "version": "16.1.0-beta.1",
       "requires": {
-        "eslint": "^7.20.0 || ^8.0.0"
+        "eslint": "^7.20.0 || ^8.0.0",
+        "@angular/core": ">=16.0.0 <17.0.0"
       },
       "packages": {
         "@angular-eslint/eslint-plugin": {
@@ -1143,6 +1168,67 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "16.4.0": {
+      "version": "16.4.0-beta.11",
+      "x-prompt": "Do you want to update the Angular version to v16.1?",
+      "requires": {
+        "@angular/core": ">=16.0.0 <16.1.0"
+      },
+      "packages": {
+        "@angular-devkit/architect": {
+          "version": "~0.1601.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/build-angular": {
+          "version": "~16.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/build-webpack": {
+          "version": "~0.1601.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/core": {
+          "version": "~16.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/schematics": {
+          "version": "~16.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/core": {
+          "version": "~16.1.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@angular/material": {
+          "version": "~16.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/cdk": {
+          "version": "~16.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@nguniversal/builders": {
+          "version": "~16.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@nguniversal/common": {
+          "version": "~16.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@nguniversal/express-engine": {
+          "version": "~16.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@schematics/angular": {
+          "version": "~16.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "ng-packagr": {
+          "version": "~16.1.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "16.4.0-beta.1",
+  "version": "16.4.0-beta.13",
   "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": {
@@ -31,16 +31,15 @@
     "./src/executors/*/schema.json": "./src/executors/*/schema.json",
     "./src/executors/*.impl": "./src/executors/*.impl.js",
     "./src/executors/*/compat": "./src/executors/*/compat.js",
+    "./package.json": {
+      "default": "./package.json"
+    },
     ".": {
-      "require": "./index.cjs",
       "types": "./index.d.ts",
       "esm2022": "./esm2022/nx-angular.mjs",
       "esm": "./esm2022/nx-angular.mjs",
       "default": "./fesm2022/nx-angular.mjs"
     },
-    "./package.json": {
-      "default": "./package.json"
-    },
     "./mf": {
       "types": "./mf/index.d.ts",
       "esm2022": "./esm2022/mf/nx-angular-mf.mjs",
@@ -67,14 +66,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/angular": "16.4.0-beta.1",
-    "@nx/cypress": "16.4.0-beta.1",
-    "@nx/devkit": "16.4.0-beta.1",
-    "@nx/jest": "16.4.0-beta.1",
-    "@nx/js": "16.4.0-beta.1",
-    "@nx/linter": "16.4.0-beta.1",
-    "@nx/webpack": "16.4.0-beta.1",
-    "@nx/workspace": "16.4.0-beta.1",
+    "@nrwl/angular": "16.4.0-beta.13",
+    "@nx/cypress": "16.4.0-beta.13",
+    "@nx/devkit": "16.4.0-beta.13",
+    "@nx/jest": "16.4.0-beta.13",
+    "@nx/js": "16.4.0-beta.13",
+    "@nx/linter": "16.4.0-beta.13",
+    "@nx/webpack": "16.4.0-beta.13",
+    "@nx/workspace": "16.4.0-beta.13",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^5.36.1",
     "chalk": "^4.1.0",
@@ -110,5 +109,5 @@
   "module": "fesm2022/nx-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "1c4fb934b607f0d93bb23bff2cf0f39b31a8fa43"
+  "gitHead": "d81afedfcc8d07db8cdb9b0e9286de0321ee184e"
 }

package/plugins/component-testing.js

@@ -57,7 +57,7 @@ ${e.stack ? e.stack : e}`);
         : undefined;
     const buildContext = (0, ct_helpers_1.createExecutorContext)(graph, (_e = graph.nodes[buildTarget.project]) === null || _e === void 0 ? void 0 : _e.data.targets, buildTarget.project, buildTarget.target, buildTarget.configuration);
     const buildableProjectConfig = normalizeBuildTargetOptions(buildContext, ctContext, offset);
-    return Object.assign(Object.assign({}, (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig)), { 
+    return Object.assign(Object.assign({}, (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig, { testingType: 'component' })), { 
         // NOTE: cannot use a glob pattern since it will break cypress generated tsconfig.
         specPattern: ['src/**/*.cy.ts', 'src/**/*.cy.js'], 
         // cypress defaults to a relative path from the workspaceRoot instead of projectRoot

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.js

@@ -27,14 +27,14 @@ var CssUrl;
 (function (CssUrl) {
     CssUrl["inline"] = "inline";
     CssUrl["none"] = "none";
-})(CssUrl = exports.CssUrl || (exports.CssUrl = {}));
+})(CssUrl || (exports.CssUrl = CssUrl = {}));
 var InlineStyleLanguage;
 (function (InlineStyleLanguage) {
     InlineStyleLanguage["sass"] = "sass";
     InlineStyleLanguage["scss"] = "scss";
     InlineStyleLanguage["css"] = "css";
     InlineStyleLanguage["less"] = "less";
-})(InlineStyleLanguage = exports.InlineStyleLanguage || (exports.InlineStyleLanguage = {}));
+})(InlineStyleLanguage || (exports.InlineStyleLanguage = InlineStyleLanguage = {}));
 class StylesheetProcessor {
     constructor(basePath, cssUrl, includePaths, cacheDirectory, watch, tailwindConfig) {
         // By default, browserslist defaults are too inclusive

package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js

@@ -27,7 +27,7 @@ var CssUrl;
 (function (CssUrl) {
     CssUrl["inline"] = "inline";
     CssUrl["none"] = "none";
-})(CssUrl = exports.CssUrl || (exports.CssUrl = {}));
+})(CssUrl || (exports.CssUrl = CssUrl = {}));
 class StylesheetProcessor {
     constructor(basePath, cssUrl, includePaths, cacheDirectory, watch, tailwindConfig) {
         // By default, browserslist defaults are too inclusive

package/src/generators/component/lib/module.js

@@ -28,6 +28,7 @@ function findModuleFromOptions(tree, options, projectRoot) {
         for (const c of candidatesDirs) {
             const candidateFiles = [
                 '',
+                moduleBaseName,
                 `${moduleBaseName}.ts`,
                 `${moduleBaseName}${moduleExt}`,
             ].map((x) => (0, devkit_1.joinPathFragments)(c, x));

package/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -66,16 +66,19 @@ function addFiles(tree, projectConfig, options) {
 }
 function updateProjectConfig(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const found = yield (0, find_target_options_1.findBuildConfig)(tree, {
-            project: options.project,
-            buildTarget: options.buildTarget,
-            validExecutorNames: new Set([
-                '@nx/angular:webpack-browser',
-                '@nrwl/angular:webpack-browser',
-                '@angular-devkit/build-angular:browser',
-            ]),
-        });
-        assertValidConfig(found === null || found === void 0 ? void 0 : found.config);
+        let found = { target: options.buildTarget, config: undefined };
+        if (!options.buildTarget) {
+            found = yield (0, find_target_options_1.findBuildConfig)(tree, {
+                project: options.project,
+                buildTarget: options.buildTarget,
+                validExecutorNames: new Set([
+                    '@nx/angular:webpack-browser',
+                    '@nrwl/angular:webpack-browser',
+                    '@angular-devkit/build-angular:browser',
+                ]),
+            });
+            assertValidConfig(found === null || found === void 0 ? void 0 : found.config);
+        }
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
         projectConfig.targets['component-test'].options = Object.assign(Object.assign({}, projectConfig.targets['component-test'].options), { skipServe: true, devServerTarget: found.target });
         (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);

package/src/migrations/update-16-4-0/rename-angular-eslint-accesibility-rules.d.ts

@@ -0,0 +1,2 @@
+import type { Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-16-4-0/rename-angular-eslint-accesibility-rules.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+// https://github.com/angular-eslint/angular-eslint/blob/24a4de54a8991c93924abf1dfb78b132a6269aef/packages/schematics/src/migrations/update-16-0-0/update-16-0-0.ts
+function default_1(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        (0, devkit_1.visitNotIgnoredFiles)(tree, '.', (filePath) => {
+            if (!filePath.endsWith('.eslintrc.json')) {
+                return;
+            }
+            (0, devkit_1.updateJson)(tree, filePath, (json) => {
+                if (json.overrides) {
+                    for (const override of json.overrides) {
+                        modifyRules(override);
+                    }
+                }
+                modifyRules(json);
+                return json;
+            });
+        });
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.default = default_1;
+function modifyRules(parent) {
+    if (!parent.rules) {
+        return;
+    }
+    for (const rule of Object.keys(parent.rules)) {
+        if (rule.startsWith('@angular-eslint/template/accessibility-')) {
+            const ruleConfig = parent.rules[rule];
+            parent.rules[rule.replace('@angular-eslint/template/accessibility-', '@angular-eslint/template/')] = ruleConfig;
+            delete parent.rules[rule];
+        }
+    }
+}

package/src/migrations/update-16-4-0/update-angular-cli.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export declare const angularCliVersion = "~16.1.0";
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-16-4-0/update-angular-cli.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.angularCliVersion = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+exports.angularCliVersion = '~16.1.0';
+function default_1(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        let shouldFormat = false;
+        (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+            var _a, _b;
+            if ((_a = json.devDependencies) === null || _a === void 0 ? void 0 : _a['@angular/cli']) {
+                json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+                shouldFormat = true;
+            }
+            else if ((_b = json.dependencies) === null || _b === void 0 ? void 0 : _b['@angular/cli']) {
+                json.dependencies['@angular/cli'] = exports.angularCliVersion;
+                shouldFormat = true;
+            }
+            return json;
+        });
+        if (shouldFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
+    });
+}
+exports.default = default_1;

package/src/utils/test-runners.js

@@ -5,9 +5,9 @@ var UnitTestRunner;
 (function (UnitTestRunner) {
     UnitTestRunner["Jest"] = "jest";
     UnitTestRunner["None"] = "none";
-})(UnitTestRunner = exports.UnitTestRunner || (exports.UnitTestRunner = {}));
+})(UnitTestRunner || (exports.UnitTestRunner = UnitTestRunner = {}));
 var E2eTestRunner;
 (function (E2eTestRunner) {
     E2eTestRunner["Cypress"] = "cypress";
     E2eTestRunner["None"] = "none";
-})(E2eTestRunner = exports.E2eTestRunner || (exports.E2eTestRunner = {}));
+})(E2eTestRunner || (exports.E2eTestRunner = E2eTestRunner = {}));

package/src/utils/versions.d.ts

@@ -1,13 +1,13 @@
 export declare const nxVersion: any;
-export declare const angularVersion = "~16.0.0";
-export declare const angularDevkitVersion = "~16.0.0";
-export declare const ngPackagrVersion = "~16.0.0";
+export declare const angularVersion = "~16.1.0";
+export declare const angularDevkitVersion = "~16.1.0";
+export declare const ngPackagrVersion = "~16.1.0";
 export declare const ngrxVersion = "~16.0.0";
 export declare const rxjsVersion = "~7.8.0";
 export declare const zoneJsVersion = "~0.13.0";
 export declare const angularJsVersion = "1.7.9";
 export declare const tsLibVersion = "^2.3.0";
-export declare const ngUniversalVersion = "~16.0.0";
+export declare const ngUniversalVersion = "~16.1.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

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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.nxVersion = require('../../package.json').version;
-exports.angularVersion = '~16.0.0';
-exports.angularDevkitVersion = '~16.0.0';
-exports.ngPackagrVersion = '~16.0.0';
+exports.angularVersion = '~16.1.0';
+exports.angularDevkitVersion = '~16.1.0';
+exports.ngPackagrVersion = '~16.1.0';
 exports.ngrxVersion = '~16.0.0';
 exports.rxjsVersion = '~7.8.0';
 exports.zoneJsVersion = '~0.13.0';
 exports.angularJsVersion = '1.7.9';
 exports.tsLibVersion = '^2.3.0';
-exports.ngUniversalVersion = '~16.0.0';
+exports.ngUniversalVersion = '~16.1.0';
 exports.corsVersion = '~2.8.5';
 exports.typesCorsVersion = '~2.8.5';
 exports.expressVersion = '~4.18.2';

package/index.cjs

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-module.exports = {
-    name: '@nx/angular',
-};

package/index.d.cts

@@ -1 +0,0 @@
-export {};