@nx/angular 17.0.0-beta.6 → 17.0.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "17.0.0-beta.6",
+  "version": "17.0.0-beta.8",
   "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": {
@@ -79,14 +79,14 @@
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
     "enquirer": "^2.3.6",
-    "@nx/devkit": "17.0.0-beta.6",
-    "@nx/cypress": "17.0.0-beta.6",
-    "@nx/jest": "17.0.0-beta.6",
-    "@nx/js": "17.0.0-beta.6",
-    "@nx/linter": "17.0.0-beta.6",
-    "@nx/webpack": "17.0.0-beta.6",
-    "@nx/workspace": "17.0.0-beta.6",
-    "@nrwl/angular": "17.0.0-beta.6"
+    "@nx/devkit": "17.0.0-beta.8",
+    "@nx/cypress": "17.0.0-beta.8",
+    "@nx/jest": "17.0.0-beta.8",
+    "@nx/js": "17.0.0-beta.8",
+    "@nx/eslint": "17.0.0-beta.8",
+    "@nx/webpack": "17.0.0-beta.8",
+    "@nx/workspace": "17.0.0-beta.8",
+    "@nrwl/angular": "17.0.0-beta.8"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 14.0.0 < 17.0.0",

package/src/generators/add-linting/add-linting.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLintingGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const linter_1 = require("@nx/linter");
-const lint_project_1 = require("@nx/linter/src/generators/lint-project/lint-project");
+const eslint_1 = require("@nx/eslint");
+const lint_project_1 = require("@nx/eslint/src/generators/lint-project/lint-project");
 const add_angular_eslint_dependencies_1 = require("./lib/add-angular-eslint-dependencies");
-const eslint_file_1 = require("@nx/linter/src/generators/utils/eslint-file");
+const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
 const string_utils_1 = require("@nx/devkit/src/utils/string-utils");
 async function addLintingGenerator(tree, options) {
     const tasks = [];
     const rootProject = options.projectRoot === '.' || options.projectRoot === '';
-    const lintTask = await (0, linter_1.lintProjectGenerator)(tree, {
-        linter: linter_1.Linter.EsLint,
+    const lintTask = await (0, eslint_1.lintProjectGenerator)(tree, {
+        linter: eslint_1.Linter.EsLint,
         project: options.projectName,
         tsConfigPaths: [
             (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.app.json'),

package/src/generators/add-linting/lib/create-eslint-configuration.d.ts

@@ -5,7 +5,7 @@ type EslintExtensionSchema = {
     prefix: string;
 };
 /**
- * @deprecated Use tools from `@nx/linter/src/generators/utils/eslint-file` instead
+ * @deprecated Use tools from `@nx/eslint/src/generators/utils/eslint-file` instead
  */
 export declare const extendAngularEslintJson: (json: Linter.Config, options: EslintExtensionSchema) => {
     overrides: ({

package/src/generators/add-linting/lib/create-eslint-configuration.js

@@ -4,7 +4,7 @@ exports.createEsLintConfiguration = exports.extendAngularEslintJson = void 0;
 const devkit_1 = require("@nx/devkit");
 const string_utils_1 = require("@nx/devkit/src/utils/string-utils");
 /**
- * @deprecated Use tools from `@nx/linter/src/generators/utils/eslint-file` instead
+ * @deprecated Use tools from `@nx/eslint/src/generators/utils/eslint-file` instead
  */
 const extendAngularEslintJson = (json, options) => {
     const overrides = [

package/src/generators/application/lib/add-linting.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLinting = void 0;
-const linter_1 = require("@nx/linter");
+const eslint_1 = require("@nx/eslint");
 const add_linting_1 = require("../../add-linting/add-linting");
 async function addLinting(host, options) {
-    if (options.linter === linter_1.Linter.None) {
+    if (options.linter === eslint_1.Linter.None) {
         return;
     }
     await (0, add_linting_1.default)(host, {

package/src/generators/application/lib/normalize-options.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
-const linter_1 = require("@nx/linter");
+const eslint_1 = require("@nx/eslint");
 const test_runners_1 = require("../../../utils/test-runners");
 const project_1 = require("../../utils/project");
 async function normalizeOptions(host, options) {
@@ -33,7 +33,7 @@ async function normalizeOptions(host, options) {
         skipFormat: false,
         unitTestRunner: test_runners_1.UnitTestRunner.Jest,
         e2eTestRunner: test_runners_1.E2eTestRunner.Cypress,
-        linter: linter_1.Linter.EsLint,
+        linter: eslint_1.Linter.EsLint,
         strict: true,
         bundler: options.bundler ?? 'webpack',
         ...options,

package/src/generators/application/lib/normalized-schema.d.ts

@@ -1,6 +1,6 @@
 import { E2eTestRunner, UnitTestRunner } from '../../../utils/test-runners';
 import type { Schema } from '../schema';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
 export interface NormalizedSchema extends Schema {
     linter: Linter;
     unitTestRunner: UnitTestRunner;

package/src/generators/application/schema.d.ts

@@ -1,5 +1,5 @@
 import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-import type { Linter } from '@nx/linter';
+import type { Linter } from '@nx/eslint';
 import type { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 

package/src/generators/component-test/files/__componentFileName__.cy.ts__tpl__

@@ -5,11 +5,11 @@ describe(<%= componentName %>.name, () => {
 
   beforeEach(() => {
     TestBed.overrideComponent(<%= componentName %>, {
-      add: { 
+      add: {
         imports: [],
         providers: []
       }
-    }) 
+    })
   })
 
   it('renders', () => {

package/src/generators/host/schema.d.ts

@@ -1,5 +1,5 @@
 import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-import type { Linter } from '@nx/linter';
+import type { Linter } from '@nx/eslint';
 import type { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 

package/src/generators/init/init.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const jest_1 = require("@nx/jest");
-const linter_1 = require("@nx/linter");
+const eslint_1 = require("@nx/eslint");
 const js_1 = require("@nx/js");
 const test_runners_1 = require("../../utils/test-runners");
 const version_utils_1 = require("../utils/version-utils");
@@ -56,7 +56,7 @@ exports.angularInitGenerator = angularInitGenerator;
 function normalizeOptions(options) {
     return {
         e2eTestRunner: options.e2eTestRunner ?? test_runners_1.E2eTestRunner.Cypress,
-        linter: options.linter ?? linter_1.Linter.EsLint,
+        linter: options.linter ?? eslint_1.Linter.EsLint,
         skipFormat: options.skipFormat ?? false,
         skipInstall: options.skipInstall ?? false,
         skipPackageJson: options.skipPackageJson ?? false,

package/src/generators/init/schema.d.ts

@@ -1,4 +1,4 @@
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
 import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 

package/src/generators/library/lib/normalize-options.js

@@ -4,14 +4,14 @@ exports.normalizeOptions = void 0;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
-const linter_1 = require("@nx/linter");
+const eslint_1 = require("@nx/eslint");
 const test_runners_1 = require("../../../utils/test-runners");
 const project_1 = require("../../utils/project");
 async function normalizeOptions(host, schema) {
     // Create a schema with populated default values
     const options = {
         buildable: false,
-        linter: linter_1.Linter.EsLint,
+        linter: eslint_1.Linter.EsLint,
         publishable: false,
         simpleName: false,
         skipFormat: false,
@@ -44,7 +44,7 @@ async function normalizeOptions(host, schema) {
     const ngCliSchematicLibRoot = projectName;
     const allNormalizedOptions = {
         ...options,
-        linter: options.linter ?? linter_1.Linter.EsLint,
+        linter: options.linter ?? eslint_1.Linter.EsLint,
         unitTestRunner: options.unitTestRunner ?? test_runners_1.UnitTestRunner.Jest,
         prefix,
         name: projectName,

package/src/generators/library/lib/normalized-schema.d.ts

@@ -1,5 +1,5 @@
 import { UnitTestRunner } from '../../../utils/test-runners';
-import type { Linter } from '@nx/linter';
+import type { Linter } from '@nx/eslint';
 export interface NormalizedSchema {
     libraryOptions: {
         name: string;

package/src/generators/library/library.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGeneratorInternal = exports.libraryGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const jest_1 = require("@nx/jest");
-const linter_1 = require("@nx/linter");
+const eslint_1 = require("@nx/eslint");
 const js_1 = require("@nx/js");
 const semver_1 = require("semver");
 const init_1 = require("../../generators/init/init");
@@ -126,7 +126,7 @@ function setStrictMode(host, options) {
     }
 }
 async function addLinting(host, options) {
-    if (options.linter === linter_1.Linter.None) {
+    if (options.linter === eslint_1.Linter.None) {
         return;
     }
     await (0, add_linting_1.default)(host, {

package/src/generators/library/schema.d.ts

@@ -1,5 +1,5 @@
 import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-import type { Linter } from '@nx/linter';
+import type { Linter } from '@nx/eslint';
 import type { UnitTestRunner } from '../../utils/test-runners';
 
 export interface Schema {

package/src/generators/ng-add/migrators/builders/angular-eslint-lint.migrator.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AngularEslintLintMigrator = void 0;
 const devkit_1 = require("@nx/devkit");
-const linter_1 = require("@nx/linter");
+const eslint_1 = require("@nx/eslint");
 const path_1 = require("path");
 const builder_migrator_1 = require("./builder.migrator");
 class AngularEslintLintMigrator extends builder_migrator_1.BuilderMigrator {
@@ -34,7 +34,7 @@ class AngularEslintLintMigrator extends builder_migrator_1.BuilderMigrator {
         }
     }
     async updateTargetConfiguration(targetName, target) {
-        target.executor = '@nx/linter:eslint';
+        target.executor = '@nx/eslint:lint';
         if (!target.options) {
             this.logger.warn(`The target "${targetName}" is not specifying any options. Skipping updating the target configuration.`);
             return;
@@ -63,7 +63,7 @@ class AngularEslintLintMigrator extends builder_migrator_1.BuilderMigrator {
                 });
         if (existEsLintConfigPath) {
             const eslintConfig = (0, devkit_1.readJson)(this.tree, this.newEsLintConfigPath);
-            if ((0, linter_1.hasRulesRequiringTypeChecking)(eslintConfig)) {
+            if ((0, eslint_1.hasRulesRequiringTypeChecking)(eslintConfig)) {
                 target.options.hasTypeAwareRules = true;
             }
         }

package/src/generators/ng-add/migrators/projects/e2e.migrator.js

@@ -5,7 +5,7 @@ const cypress_1 = require("@nx/cypress");
 const cypress_preset_1 = require("@nx/cypress/plugins/cypress-preset");
 const cypress_version_1 = require("@nx/cypress/src/utils/cypress-version");
 const devkit_1 = require("@nx/devkit");
-const linter_1 = require("@nx/linter");
+const eslint_1 = require("@nx/eslint");
 const js_1 = require("@nx/js");
 const path_1 = require("path");
 const typescript_1 = require("typescript");
@@ -214,9 +214,9 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             ...this.projectConfig,
         }, true);
         if (this.isProjectUsingEsLint) {
-            await (0, linter_1.lintProjectGenerator)(this.tree, {
+            await (0, eslint_1.lintProjectGenerator)(this.tree, {
                 project: this.project.name,
-                linter: linter_1.Linter.EsLint,
+                linter: eslint_1.Linter.EsLint,
                 eslintFilePatterns: [`${this.project.newRoot}/**/*.{js,ts}`],
                 unitTestRunner: this.options.unitTestRunner,
                 tsConfigPaths: [
@@ -231,7 +231,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         await (0, cypress_1.cypressProjectGenerator)(this.tree, {
             name: this.project.name,
             project: this.appName,
-            linter: this.isProjectUsingEsLint ? linter_1.Linter.EsLint : linter_1.Linter.None,
+            linter: this.isProjectUsingEsLint ? eslint_1.Linter.EsLint : eslint_1.Linter.None,
             standaloneConfig: true,
             skipFormat: true,
         });

package/src/generators/ng-add/schema.d.ts

@@ -1,4 +1,4 @@
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
 import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 

package/src/generators/ng-add/utilities/workspace.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteGitKeepFilesIfNotNeeded = exports.deleteAngularJson = exports.updateVsCodeRecommendedExtensions = exports.getWorkspaceRootFileTypesInfo = exports.createRootKarmaConfig = exports.createWorkspaceFiles = exports.cleanupEsLintPackages = exports.updateRootEsLintConfig = exports.updatePackageJson = exports.updateRootTsConfig = exports.updateWorkspaceConfigDefaults = exports.createNxJson = exports.validateWorkspace = void 0;
 const devkit_1 = require("@nx/devkit");
-const linter_1 = require("@nx/linter");
+const eslint_1 = require("@nx/eslint");
 const js_1 = require("@nx/js");
 const default_base_1 = require("nx/src/utils/default-base");
 const versions_1 = require("@nx/js/src/utils/versions");
@@ -158,7 +158,7 @@ function updateRootEsLintConfig(tree, existingEsLintConfig, unitTestRunner) {
          */
         tree.delete('.eslintrc.json');
     }
-    (0, linter_1.lintInitGenerator)(tree, { linter: linter_1.Linter.EsLint, unitTestRunner });
+    (0, eslint_1.lintInitGenerator)(tree, { linter: eslint_1.Linter.EsLint, unitTestRunner });
     if (!existingEsLintConfig) {
         // There was no eslint config in the root, so we keep the generated one as-is.
         return;

package/src/generators/remote/schema.d.ts

@@ -1,5 +1,5 @@
 import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-import type { Linter } from '@nx/linter';
+import type { Linter } from '@nx/eslint';
 import type { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 

package/src/generators/storybook-configuration/schema.d.ts

@@ -1,4 +1,4 @@
-import type { Linter } from '@nx/linter';
+import type { Linter } from '@nx/eslint';
 
 export interface StorybookConfigurationOptions {
   configureStaticServe?: boolean;

package/src/generators/storybook-configuration/schema.json

@@ -28,7 +28,8 @@
     },
     "configureCypress": {
       "type": "boolean",
-      "description": "Specifies whether to configure Cypress or not."
+      "description": "Specifies whether to configure Cypress or not.",
+      "x-deprecated": "Use interactionTests instead. This option will be removed in v18."
     },
     "generateStories": {
       "type": "boolean",
@@ -39,7 +40,8 @@
     },
     "generateCypressSpecs": {
       "type": "boolean",
-      "description": "Specifies whether to automatically generate test files in the generated Cypress e2e app."
+      "description": "Specifies whether to automatically generate test files in the generated Cypress e2e app.",
+      "x-deprecated": "Use interactionTests instead. This option will be removed in v18."
     },
     "configureStaticServe": {
       "type": "boolean",
@@ -50,7 +52,8 @@
     },
     "cypressDirectory": {
       "type": "string",
-      "description": "A directory where the Cypress project will be placed. Placed at the root by default."
+      "description": "A directory where the Cypress project will be placed. Placed at the root by default.",
+      "x-deprecated": "Use interactionTests instead. This option will be removed in v18."
     },
     "linter": {
       "description": "The tool to use for running lint checks.",

package/src/generators/utils/testing.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStorybookTestWorkspaceForLib = exports.generateTestLibrary = exports.generateTestRemoteApplication = exports.generateTestHostApplication = exports.generateTestApplication = void 0;
 const devkit_1 = require("@nx/devkit");
 const testing_1 = require("@nx/devkit/testing");
-const linter_1 = require("@nx/linter");
+const eslint_1 = require("@nx/eslint");
 const test_runners_1 = require("../../utils/test-runners");
 const versions_1 = require("../../utils/versions");
 const application_1 = require("../application/application");
@@ -48,7 +48,7 @@ async function createStorybookTestWorkspaceForLib(libName) {
     await (0, library_1.libraryGenerator)(tree, {
         name: libName,
         buildable: false,
-        linter: linter_1.Linter.EsLint,
+        linter: eslint_1.Linter.EsLint,
         publishable: false,
         simpleName: false,
         skipFormat: false,
@@ -161,9 +161,9 @@ import { VariableSpreadDeclareButtonComponent } from './variable-spread-declare-
 import { VariableSpreadDeclareViewComponent } from './variable-spread-declare-view/variable-spread-declare-view.component';
 import { VariableSpreadDeclareAnotherviewComponent } from './variable-spread-declare-anotherview/variable-spread-declare-anotherview.component';
 
-const COMPONENTS = [ 
-  VariableSpreadDeclareButtonComponent, 
-  VariableSpreadDeclareViewComponent 
+const COMPONENTS = [
+  VariableSpreadDeclareButtonComponent,
+  VariableSpreadDeclareViewComponent
 ]
 
 @NgModule({
@@ -242,7 +242,7 @@ function generateModule(tree, options) {
     const moduleFilePath = `${options.path}/${moduleNames.fileName}/${moduleNames.fileName}.module.ts`;
     tree.write(moduleFilePath, `import { NgModule } from '@angular/core';
   import { CommonModule } from '@angular/common';
-  
+
   @NgModule({
     declarations: [],
     imports: [CommonModule],