@nrwl/angular 15.3.0-beta.9 → 15.3.0-rc.0

package/CHANGELOG.md

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [15.3.0-beta.9](https://github.com/nrwl/nx/compare/15.2.0...15.3.0-beta.9) (2022-11-30)
+# [15.3.0-rc.0](https://github.com/nrwl/nx/compare/15.2.0...15.3.0-rc.0) (2022-12-05)
 
 **Note:** Version bump only for package @nrwl/angular

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/angular",
-  "version": "15.3.0-beta.9",
+  "version": "15.3.0-rc.0",
   "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, Cypress, Karma, and Protractor. \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": {
@@ -68,13 +68,12 @@
   "dependencies": {
     "@angular-devkit/schematics": "~15.0.1",
     "@nguniversal/builders": "~15.0.0",
-    "@nrwl/cypress": "15.3.0-beta.9",
-    "@nrwl/devkit": "15.3.0-beta.9",
-    "@nrwl/jest": "15.3.0-beta.9",
-    "@nrwl/linter": "15.3.0-beta.9",
-    "@nrwl/storybook": "15.3.0-beta.9",
-    "@nrwl/webpack": "15.3.0-beta.9",
-    "@nrwl/workspace": "15.3.0-beta.9",
+    "@nrwl/cypress": "15.3.0-rc.0",
+    "@nrwl/devkit": "15.3.0-rc.0",
+    "@nrwl/jest": "15.3.0-rc.0",
+    "@nrwl/linter": "15.3.0-rc.0",
+    "@nrwl/webpack": "15.3.0-rc.0",
+    "@nrwl/workspace": "15.3.0-rc.0",
     "@phenomnomnominal/tsquery": "4.1.1",
     "@schematics/angular": "~15.0.1",
     "chalk": "4.1.0",
@@ -100,5 +99,5 @@
   "fesm2015": "fesm2015/nrwl-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "ad201d598940482e9bbfddb776bdccae19daf296"
+  "gitHead": "5d910c0f1a9ec3ba6d7ebd78072af5cc5caf86c5"
 }

package/plugins/component-testing.js

@@ -38,9 +38,9 @@ This is likely due to not running via nx. i.e. 'nx component-test my-project'.
 Please open an issue if this error persists.
 ${e.stack ? e.stack : e}`);
     }
-    const ctProjectConfig = (0, cypress_preset_1.getProjectConfigByPath)(graph, pathToConfig);
+    const ctProjectConfig = (0, ct_helpers_1.getProjectConfigByPath)(graph, pathToConfig);
     const ctConfigurationName = process.env.NX_CYPRESS_TARGET_CONFIGURATION;
-    const ctContext = (0, cypress_preset_1.createExecutorContext)(graph, ctProjectConfig.targets, ctProjectConfig.name, (options === null || options === void 0 ? void 0 : options.ctTargetName) || 'component-test', ctConfigurationName);
+    const ctContext = (0, ct_helpers_1.createExecutorContext)(graph, ctProjectConfig.targets, ctProjectConfig.name, (options === null || options === void 0 ? void 0 : options.ctTargetName) || 'component-test', ctConfigurationName);
     const buildTarget = getBuildableTarget(ctContext);
     if (!buildTarget.project && !((_b = (_a = graph.nodes) === null || _a === void 0 ? void 0 : _a[buildTarget.project]) === null || _b === void 0 ? void 0 : _b.data)) {
         throw new Error((0, devkit_1.stripIndents) `Unable to find project configuration for build target. 
@@ -52,11 +52,11 @@ ${e.stack ? e.stack : e}`);
         ? (0, path_1.dirname)(fromWorkspaceRoot)
         : fromWorkspaceRoot;
     const offset = (0, devkit_1.offsetFromRoot)(normalizedFromWorkspaceRootPath);
-    const buildContext = (0, cypress_preset_1.createExecutorContext)(graph, graph.nodes[buildTarget.project].data.targets, buildTarget.project, buildTarget.target, buildTarget.configuration);
+    const buildContext = (0, ct_helpers_1.createExecutorContext)(graph, graph.nodes[buildTarget.project].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)), { 
         // NOTE: cannot use a glob pattern since it will break cypress generated tsconfig.
-        specPattern: ['**/*.cy.ts', '**/*.cy.js'], devServer: Object.assign(Object.assign({}, {
+        specPattern: ['src/**/*.cy.ts', 'src/**/*.cy.js'], devServer: Object.assign(Object.assign({}, {
             framework: 'angular',
             bundler: 'webpack',
         }), { options: {

package/plugins/component-testing.js.map

@@ -1 +1 @@
-{"version":3,"file":"component-testing.js","sourceRoot":"","sources":["../../../../packages/angular/plugins/component-testing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"component-testing.js","sourceRoot":"","sources":["../../../../packages/angular/plugins/component-testing.ts"],"names":[],"mappings":"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"}

package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.js

@@ -55,7 +55,7 @@ function executeModuleFederationDevSSRBuilder(schema, context) {
                     ? `:${context.target.configuration}`
                     : ''}`, { stdio: 'inherit' });
                 const child = (0, child_process_1.fork)(remoteServerOutput, {
-                    env: remoteProject.targets['serve-ssr'].options.port,
+                    env: { PORT: remoteProject.targets['serve-ssr'].options.port },
                 });
                 child.on('message', (msg) => {
                     if (msg === 'nx.server.ready') {

package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"module-federation-dev-ssr.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"module-federation-dev-ssr.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.ts"],"names":[],"mappings":"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"}

package/src/generators/add-linting/add-linting.d.ts

@@ -1,4 +1,4 @@
-import type { GeneratorCallback, Tree } from '@nrwl/devkit';
+import { GeneratorCallback, Tree } from '@nrwl/devkit';
 import type { AddLintingGeneratorSchema } from './schema';
 export declare function addLintingGenerator(tree: Tree, options: AddLintingGeneratorSchema): Promise<GeneratorCallback>;
 export default addLintingGenerator;

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

@@ -4,25 +4,44 @@ exports.addLintingGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const linter_1 = require("@nrwl/linter");
+const lint_project_1 = require("@nrwl/linter/src/generators/lint-project/lint-project");
+const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
 const add_angular_eslint_dependencies_1 = require("./lib/add-angular-eslint-dependencies");
-const add_project_lint_target_1 = require("./lib/add-project-lint-target");
 const create_eslint_configuration_1 = require("./lib/create-eslint-configuration");
+const get_generator_directory_for_ng_version_1 = require("../../utils/get-generator-directory-for-ng-version");
+const path_1 = require("path");
 function addLintingGenerator(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const installTask = (0, linter_1.lintInitGenerator)(tree, {
+        const generatorDirectory = (0, get_generator_directory_for_ng_version_1.getGeneratorDirectoryForInstalledAngularVersion)(tree);
+        if (generatorDirectory) {
+            let previousGenerator = yield Promise.resolve().then(() => require((0, path_1.join)(__dirname, generatorDirectory, 'add-linting')));
+            yield previousGenerator.default(tree, options);
+            return;
+        }
+        const tasks = [];
+        const rootProject = options.projectRoot === '.' || options.projectRoot === '';
+        const lintTask = yield (0, linter_1.lintProjectGenerator)(tree, {
             linter: linter_1.Linter.EsLint,
+            project: options.projectName,
+            tsConfigPaths: [
+                (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.app.json'),
+            ],
             unitTestRunner: options.unitTestRunner,
-            skipPackageJson: options.skipPackageJson,
+            eslintFilePatterns: [
+                (0, lint_project_1.mapLintPattern)(options.projectRoot, 'ts', rootProject),
+                (0, lint_project_1.mapLintPattern)(options.projectRoot, 'html', rootProject),
+            ],
+            setParserOptionsProject: options.setParserOptionsProject,
+            skipFormat: true,
+            rootProject: rootProject,
         });
+        tasks.push(lintTask);
+        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, '.eslintrc.json'), (json) => (0, create_eslint_configuration_1.extendAngularEslintJson)(json, options));
         if (!options.skipPackageJson) {
-            (0, add_angular_eslint_dependencies_1.addAngularEsLintDependencies)(tree);
-        }
-        (0, create_eslint_configuration_1.createEsLintConfiguration)(tree, options);
-        (0, add_project_lint_target_1.addProjectLintTarget)(tree, options);
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
+            const installTask = yield (0, add_angular_eslint_dependencies_1.addAngularEsLintDependencies)(tree);
+            tasks.push(installTask);
         }
-        return installTask;
+        return (0, run_tasks_in_serial_1.runTasksInSerial)(...tasks);
     });
 }
 exports.addLintingGenerator = addLintingGenerator;

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

@@ -1 +1 @@
-{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/add-linting/add-linting.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,yCAAyD;AACzD,2FAAqF;AACrF,2EAAqE;AACrE,mFAA8E;AAG9E,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAAkC;;QAElC,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,IAAI,EAAE;YAC1C,MAAM,EAAE,eAAM,CAAC,MAAM;YACrB,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,eAAe,EAAE,OAAO,CAAC,eAAe;SACzC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,IAAA,8DAA4B,EAAC,IAAI,CAAC,CAAC;SACpC;QAED,IAAA,uDAAyB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzC,IAAA,8CAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEpC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AAtBD,kDAsBC;AAED,kBAAe,mBAAmB,CAAC"}
+{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/add-linting/add-linting.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,yCAA4D;AAC5D,wFAAuF;AACvF,2FAAqF;AACrF,2FAAqF;AACrF,mFAA4E;AAE5E,+GAAqH;AACrH,+BAA4B;AAE5B,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAAkC;;QAElC,MAAM,kBAAkB,GACtB,IAAA,wFAA+C,EAAC,IAAI,CAAC,CAAC;QACxD,IAAI,kBAAkB,EAAE;YACtB,IAAI,iBAAiB,GAAG,2CACtB,IAAA,WAAI,EAAC,SAAS,EAAE,kBAAkB,EAAE,aAAa,CAAC,EACnD,CAAC;YACF,MAAM,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/C,OAAO;SACR;QAED,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,KAAK,GAAG,IAAI,OAAO,CAAC,WAAW,KAAK,EAAE,CAAC;QAC9E,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;YAChD,MAAM,EAAE,eAAM,CAAC,MAAM;YACrB,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,aAAa,EAAE;gBACb,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC;aAC5D;YACD,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,kBAAkB,EAAE;gBAClB,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,CAAC;gBACtD,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC;aACzD;YACD,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;YACxD,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,WAAW;SACzB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErB,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,EACxD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,qDAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,CACjD,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,MAAM,WAAW,GAAG,MAAM,IAAA,8DAA4B,EAAC,IAAI,CAAC,CAAC;YAC7D,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AA7CD,kDA6CC;AAED,kBAAe,mBAAmB,CAAC"}

package/src/generators/add-linting/angular-v14/add-linting.d.ts

@@ -0,0 +1,4 @@
+import { GeneratorCallback, Tree } from '@nrwl/devkit';
+import type { AddLintingGeneratorSchema } from './schema';
+export declare function addLintingGenerator(tree: Tree, options: AddLintingGeneratorSchema): Promise<GeneratorCallback>;
+export default addLintingGenerator;

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

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addLintingGenerator = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const linter_1 = require("@nrwl/linter");
+const lint_project_1 = require("@nrwl/linter/src/generators/lint-project/lint-project");
+const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
+const add_angular_eslint_dependencies_1 = require("./lib/add-angular-eslint-dependencies");
+const create_eslint_configuration_1 = require("./lib/create-eslint-configuration");
+function addLintingGenerator(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const tasks = [];
+        const rootProject = options.projectRoot === '.' || options.projectRoot === '';
+        const lintTask = yield (0, linter_1.lintProjectGenerator)(tree, {
+            linter: linter_1.Linter.EsLint,
+            project: options.projectName,
+            tsConfigPaths: [
+                (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.app.json'),
+            ],
+            unitTestRunner: options.unitTestRunner,
+            eslintFilePatterns: [
+                (0, lint_project_1.mapLintPattern)(options.projectRoot, 'ts', rootProject),
+                (0, lint_project_1.mapLintPattern)(options.projectRoot, 'html', rootProject),
+            ],
+            setParserOptionsProject: options.setParserOptionsProject,
+            skipFormat: true,
+            rootProject: rootProject,
+        });
+        tasks.push(lintTask);
+        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, '.eslintrc.json'), (json) => (0, create_eslint_configuration_1.extendAngularEslintJson)(json, options));
+        if (!options.skipPackageJson) {
+            const installTask = yield (0, add_angular_eslint_dependencies_1.addAngularEsLintDependencies)(tree);
+            tasks.push(installTask);
+        }
+        return (0, run_tasks_in_serial_1.runTasksInSerial)(...tasks);
+    });
+}
+exports.addLintingGenerator = addLintingGenerator;
+exports.default = addLintingGenerator;
+//# sourceMappingURL=add-linting.js.map

package/src/generators/add-linting/angular-v14/add-linting.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/angular-v14/add-linting.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,yCAA4D;AAC5D,wFAAuF;AACvF,2FAAqF;AACrF,2FAAqF;AACrF,mFAA4E;AAG5E,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAAkC;;QAElC,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,KAAK,GAAG,IAAI,OAAO,CAAC,WAAW,KAAK,EAAE,CAAC;QAC9E,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;YAChD,MAAM,EAAE,eAAM,CAAC,MAAM;YACrB,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,aAAa,EAAE;gBACb,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC;aAC5D;YACD,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,kBAAkB,EAAE;gBAClB,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,CAAC;gBACtD,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC;aACzD;YACD,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;YACxD,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,WAAW;SACzB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErB,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,EACxD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,qDAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,CACjD,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,MAAM,WAAW,GAAG,MAAM,IAAA,8DAA4B,EAAC,IAAI,CAAC,CAAC;YAC7D,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAnCD,kDAmCC;AAED,kBAAe,mBAAmB,CAAC"}

package/src/generators/add-linting/angular-v14/lib/add-angular-eslint-dependencies.d.ts

@@ -0,0 +1,2 @@
+import type { GeneratorCallback, Tree } from '@nrwl/devkit';
+export declare function addAngularEsLintDependencies(tree: Tree): GeneratorCallback;

package/src/generators/add-linting/angular-v14/lib/add-angular-eslint-dependencies.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addAngularEsLintDependencies = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const versions_1 = require("../../../../utils/versions");
+function addAngularEsLintDependencies(tree) {
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+        '@angular-eslint/eslint-plugin': versions_1.versions.angularV14.angularEslintVersion,
+        '@angular-eslint/eslint-plugin-template': versions_1.versions.angularV14.angularEslintVersion,
+        '@angular-eslint/template-parser': versions_1.versions.angularV14.angularEslintVersion,
+    });
+}
+exports.addAngularEsLintDependencies = addAngularEsLintDependencies;
+//# sourceMappingURL=add-angular-eslint-dependencies.js.map

package/src/generators/add-linting/angular-v14/lib/add-angular-eslint-dependencies.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-angular-eslint-dependencies.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/add-linting/angular-v14/lib/add-angular-eslint-dependencies.ts"],"names":[],"mappings":";;;AACA,yCAA4D;AAC5D,yDAAsD;AAEtD,SAAgB,4BAA4B,CAAC,IAAU;IACrD,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,+BAA+B,EAAE,mBAAQ,CAAC,UAAU,CAAC,oBAAoB;QACzE,wCAAwC,EACtC,mBAAQ,CAAC,UAAU,CAAC,oBAAoB;QAC1C,iCAAiC,EAC/B,mBAAQ,CAAC,UAAU,CAAC,oBAAoB;KAC3C,CACF,CAAC;AACJ,CAAC;AAZD,oEAYC"}

package/src/generators/add-linting/angular-v14/lib/add-project-lint-target.d.ts

@@ -0,0 +1,3 @@
+import type { Tree } from '@nrwl/devkit';
+import type { AddLintingGeneratorSchema } from '../schema';
+export declare function addProjectLintTarget(tree: Tree, options: AddLintingGeneratorSchema): void;

package/src/generators/add-linting/angular-v14/lib/add-project-lint-target.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addProjectLintTarget = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const lint_project_1 = require("@nrwl/linter/src/generators/lint-project/lint-project");
+function addProjectLintTarget(tree, options) {
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
+    const rootProject = options.projectRoot === '.' || options.projectRoot === '';
+    project.targets.lint = {
+        executor: '@nrwl/linter:eslint',
+        options: {
+            lintFilePatterns: [
+                (0, lint_project_1.mapLintPattern)(options.projectRoot, 'ts', rootProject),
+                (0, lint_project_1.mapLintPattern)(options.projectRoot, 'html', rootProject),
+            ],
+        },
+    };
+    (0, devkit_1.updateProjectConfiguration)(tree, options.projectName, project);
+}
+exports.addProjectLintTarget = addProjectLintTarget;
+//# sourceMappingURL=add-project-lint-target.js.map

package/src/generators/add-linting/angular-v14/lib/add-project-lint-target.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-project-lint-target.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/add-linting/angular-v14/lib/add-project-lint-target.ts"],"names":[],"mappings":";;;AACA,yCAGsB;AACtB,wFAAuF;AAGvF,SAAgB,oBAAoB,CAClC,IAAU,EACV,OAAkC;IAElC,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACpE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,KAAK,GAAG,IAAI,OAAO,CAAC,WAAW,KAAK,EAAE,CAAC;IAC9E,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG;QACrB,QAAQ,EAAE,qBAAqB;QAC/B,OAAO,EAAE;YACP,gBAAgB,EAAE;gBAChB,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,CAAC;gBACtD,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC;aACzD;SACF;KACF,CAAC;IACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AACjE,CAAC;AAhBD,oDAgBC"}

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

@@ -0,0 +1,78 @@
+import type { Tree } from '@nrwl/devkit';
+import type { Linter } from 'eslint';
+import type { AddLintingGeneratorSchema } from '../schema';
+declare type EslintExtensionSchema = {
+    prefix: string;
+};
+export declare const extendAngularEslintJson: (json: Linter.Config, options: EslintExtensionSchema) => {
+    overrides: ({
+        files: string[];
+        extends: string[];
+        rules: {
+            '@angular-eslint/directive-selector': (string | {
+                type: string;
+                prefix: string;
+                style: string;
+            })[];
+            '@angular-eslint/component-selector': (string | {
+                type: string;
+                prefix: string;
+                style: string;
+            })[];
+        };
+        excludedFiles?: string | string[];
+        $schema?: string;
+        env?: {
+            [name: string]: boolean;
+        };
+        globals?: {
+            [name: string]: boolean | "readonly" | "readable" | "writable" | "writeable";
+        };
+        noInlineConfig?: boolean;
+        overrides?: Linter.ConfigOverride<Linter.RulesRecord>[];
+        parser?: string;
+        parserOptions?: Linter.ParserOptions;
+        plugins?: string[];
+        processor?: string;
+        reportUnusedDisableDirectives?: boolean;
+        settings?: {
+            [name: string]: any;
+        };
+    } | {
+        files: string[];
+        extends: string[];
+        /**
+         * Having an empty rules object present makes it more obvious to the user where they would
+         * extend things from if they needed to
+         */
+        rules: {
+            '@angular-eslint/directive-selector'?: undefined;
+            '@angular-eslint/component-selector'?: undefined;
+        };
+    })[];
+    ignorePatterns?: string | string[];
+    root?: boolean;
+    $schema?: string;
+    env?: {
+        [name: string]: boolean;
+    };
+    extends?: string | string[];
+    globals?: {
+        [name: string]: boolean | "readonly" | "readable" | "writable" | "writeable";
+    };
+    noInlineConfig?: boolean;
+    parser?: string;
+    parserOptions?: Linter.ParserOptions;
+    plugins?: string[];
+    processor?: string;
+    reportUnusedDisableDirectives?: boolean;
+    settings?: {
+        [name: string]: any;
+    };
+    rules?: Partial<Linter.RulesRecord>;
+};
+/**
+ * @deprecated Use {@link extendAngularEslintJson} instead
+ */
+export declare function createEsLintConfiguration(tree: Tree, options: AddLintingGeneratorSchema): void;
+export {};

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

@@ -0,0 +1,111 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createEsLintConfiguration = exports.extendAngularEslintJson = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const strings_1 = require("@nrwl/workspace/src/utils/strings");
+const extendAngularEslintJson = (json, options) => {
+    const overrides = [
+        Object.assign(Object.assign({}, json.overrides[0]), { files: ['*.ts'], extends: [
+                ...(json.overrides[0].extends || []),
+                'plugin:@nrwl/nx/angular',
+                'plugin:@angular-eslint/template/process-inline-templates',
+            ], rules: {
+                '@angular-eslint/directive-selector': [
+                    'error',
+                    {
+                        type: 'attribute',
+                        prefix: (0, strings_1.camelize)(options.prefix),
+                        style: 'camelCase',
+                    },
+                ],
+                '@angular-eslint/component-selector': [
+                    'error',
+                    {
+                        type: 'element',
+                        prefix: (0, strings_1.dasherize)(options.prefix),
+                        style: 'kebab-case',
+                    },
+                ],
+            } }),
+        {
+            files: ['*.html'],
+            extends: ['plugin:@nrwl/nx/angular-template'],
+            /**
+             * Having an empty rules object present makes it more obvious to the user where they would
+             * extend things from if they needed to
+             */
+            rules: {},
+        },
+    ];
+    return Object.assign(Object.assign({}, json), { overrides });
+};
+exports.extendAngularEslintJson = extendAngularEslintJson;
+/**
+ * @deprecated Use {@link extendAngularEslintJson} instead
+ */
+function createEsLintConfiguration(tree, options) {
+    const rootConfig = `${(0, devkit_1.offsetFromRoot)(options.projectRoot)}.eslintrc.json`;
+    // Include all project files to be linted (since they are turned off in the root eslintrc file).
+    const ignorePatterns = ['!**/*'];
+    const configJson = {
+        extends: [rootConfig],
+        ignorePatterns,
+        overrides: [
+            {
+                files: ['*.ts'],
+                extends: [
+                    'plugin:@nrwl/nx/angular',
+                    'plugin:@angular-eslint/template/process-inline-templates',
+                ],
+                /**
+                 * NOTE: We no longer set parserOptions.project by default when creating new projects.
+                 *
+                 * We have observed that users rarely add rules requiring type-checking to their Nx workspaces, and therefore
+                 * do not actually need the capabilites which parserOptions.project provides. When specifying parserOptions.project,
+                 * typescript-eslint needs to create full TypeScript Programs for you. When omitting it, it can perform a simple
+                 * parse (and AST tranformation) of the source files it encounters during a lint run, which is much faster and much
+                 * less memory intensive.
+                 *
+                 * In the rare case that users attempt to add rules requiring type-checking to their setup later on (and haven't set
+                 * parserOptions.project), the executor will attempt to look for the particular error typescript-eslint gives you
+                 * and provide feedback to the user.
+                 */
+                parserOptions: !options.setParserOptionsProject
+                    ? undefined
+                    : {
+                        project: [`${options.projectRoot}/tsconfig.*?.json`],
+                    },
+                rules: {
+                    '@angular-eslint/directive-selector': [
+                        'error',
+                        {
+                            type: 'attribute',
+                            prefix: (0, strings_1.camelize)(options.prefix),
+                            style: 'camelCase',
+                        },
+                    ],
+                    '@angular-eslint/component-selector': [
+                        'error',
+                        {
+                            type: 'element',
+                            prefix: (0, strings_1.dasherize)(options.prefix),
+                            style: 'kebab-case',
+                        },
+                    ],
+                },
+            },
+            {
+                files: ['*.html'],
+                extends: ['plugin:@nrwl/nx/angular-template'],
+                /**
+                 * Having an empty rules object present makes it more obvious to the user where they would
+                 * extend things from if they needed to
+                 */
+                rules: {},
+            },
+        ],
+    };
+    (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, '.eslintrc.json'), configJson);
+}
+exports.createEsLintConfiguration = createEsLintConfiguration;
+//# sourceMappingURL=create-eslint-configuration.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"create-eslint-configuration.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/add-linting/angular-v14/lib/create-eslint-configuration.ts"],"names":[],"mappings":";;;AACA,yCAA4E;AAC5E,+DAAwE;AAQjE,MAAM,uBAAuB,GAAG,CACrC,IAAmB,EACnB,OAA8B,EAC9B,EAAE;IACF,MAAM,SAAS,GAAG;wCAEX,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KACpB,KAAK,EAAE,CAAC,MAAM,CAAC,EACf,OAAO,EAAE;gBACP,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC;gBACpC,yBAAyB;gBACzB,0DAA0D;aAC3D,EACD,KAAK,EAAE;gBACL,oCAAoC,EAAE;oBACpC,OAAO;oBACP;wBACE,IAAI,EAAE,WAAW;wBACjB,MAAM,EAAE,IAAA,kBAAQ,EAAC,OAAO,CAAC,MAAM,CAAC;wBAChC,KAAK,EAAE,WAAW;qBACnB;iBACF;gBACD,oCAAoC,EAAE;oBACpC,OAAO;oBACP;wBACE,IAAI,EAAE,SAAS;wBACf,MAAM,EAAE,IAAA,mBAAS,EAAC,OAAO,CAAC,MAAM,CAAC;wBACjC,KAAK,EAAE,YAAY;qBACpB;iBACF;aACF;QAEH;YACE,KAAK,EAAE,CAAC,QAAQ,CAAC;YACjB,OAAO,EAAE,CAAC,kCAAkC,CAAC;YAC7C;;;eAGG;YACH,KAAK,EAAE,EAAE;SACV;KACF,CAAC;IAEF,uCACK,IAAI,KACP,SAAS,IACT;AACJ,CAAC,CAAC;AA/CW,QAAA,uBAAuB,2BA+ClC;AAEF;;GAEG;AACH,SAAgB,yBAAyB,CACvC,IAAU,EACV,OAAkC;IAElC,MAAM,UAAU,GAAG,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC;IAC1E,gGAAgG;IAChG,MAAM,cAAc,GAAG,CAAC,OAAO,CAAC,CAAC;IAEjC,MAAM,UAAU,GAAG;QACjB,OAAO,EAAE,CAAC,UAAU,CAAC;QACrB,cAAc;QACd,SAAS,EAAE;YACT;gBACE,KAAK,EAAE,CAAC,MAAM,CAAC;gBACf,OAAO,EAAE;oBACP,yBAAyB;oBACzB,0DAA0D;iBAC3D;gBACD;;;;;;;;;;;;mBAYG;gBACH,aAAa,EAAE,CAAC,OAAO,CAAC,uBAAuB;oBAC7C,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC;wBACE,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,mBAAmB,CAAC;qBACrD;gBACL,KAAK,EAAE;oBACL,oCAAoC,EAAE;wBACpC,OAAO;wBACP;4BACE,IAAI,EAAE,WAAW;4BACjB,MAAM,EAAE,IAAA,kBAAQ,EAAC,OAAO,CAAC,MAAM,CAAC;4BAChC,KAAK,EAAE,WAAW;yBACnB;qBACF;oBACD,oCAAoC,EAAE;wBACpC,OAAO;wBACP;4BACE,IAAI,EAAE,SAAS;4BACf,MAAM,EAAE,IAAA,mBAAS,EAAC,OAAO,CAAC,MAAM,CAAC;4BACjC,KAAK,EAAE,YAAY;yBACpB;qBACF;iBACF;aACF;YACD;gBACE,KAAK,EAAE,CAAC,QAAQ,CAAC;gBACjB,OAAO,EAAE,CAAC,kCAAkC,CAAC;gBAC7C;;;mBAGG;gBACH,KAAK,EAAE,EAAE;aACV;SACF;KACF,CAAC;IAEF,IAAA,kBAAS,EACP,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,EACxD,UAAU,CACX,CAAC;AACJ,CAAC;AAxED,8DAwEC"}

package/src/generators/add-linting/angular-v14/schema.d.ts

@@ -0,0 +1,9 @@
+export interface AddLintingGeneratorSchema {
+  projectName: string;
+  projectRoot: string;
+  prefix: string;
+  setParserOptionsProject?: boolean;
+  skipFormat?: boolean;
+  skipPackageJson?: boolean;
+  unitTestRunner?: string;
+}

package/src/generators/add-linting/lib/add-angular-eslint-dependencies.d.ts

@@ -1,2 +1,2 @@
-import type { Tree } from '@nrwl/devkit';
-export declare function addAngularEsLintDependencies(tree: Tree): void;
+import type { GeneratorCallback, Tree } from '@nrwl/devkit';
+export declare function addAngularEsLintDependencies(tree: Tree): GeneratorCallback;

package/src/generators/add-linting/lib/add-angular-eslint-dependencies.js

@@ -4,7 +4,7 @@ exports.addAngularEsLintDependencies = void 0;
 const devkit_1 = require("@nrwl/devkit");
 const versions_1 = require("../../../utils/versions");
 function addAngularEsLintDependencies(tree) {
-    (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
         '@angular-eslint/eslint-plugin': versions_1.angularEslintVersion,
         '@angular-eslint/eslint-plugin-template': versions_1.angularEslintVersion,
         '@angular-eslint/template-parser': versions_1.angularEslintVersion,

package/src/generators/add-linting/lib/add-angular-eslint-dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-angular-eslint-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/add-angular-eslint-dependencies.ts"],"names":[],"mappings":";;;AACA,yCAA4D;AAC5D,sDAA+D;AAE/D,SAAgB,4BAA4B,CAAC,IAAU;IACrD,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;QACE,+BAA+B,EAAE,+BAAoB;QACrD,wCAAwC,EAAE,+BAAoB;QAC9D,iCAAiC,EAAE,+BAAoB;KACxD,CACF,CAAC;AACJ,CAAC;AAVD,oEAUC"}
+{"version":3,"file":"add-angular-eslint-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/add-angular-eslint-dependencies.ts"],"names":[],"mappings":";;;AACA,yCAA4D;AAC5D,sDAA+D;AAE/D,SAAgB,4BAA4B,CAAC,IAAU;IACrD,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,+BAA+B,EAAE,+BAAoB;QACrD,wCAAwC,EAAE,+BAAoB;QAC9D,iCAAiC,EAAE,+BAAoB;KACxD,CACF,CAAC;AACJ,CAAC;AAVD,oEAUC"}

package/src/generators/add-linting/lib/add-project-lint-target.js

@@ -2,14 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProjectLintTarget = void 0;
 const devkit_1 = require("@nrwl/devkit");
+const lint_project_1 = require("@nrwl/linter/src/generators/lint-project/lint-project");
 function addProjectLintTarget(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
+    const rootProject = options.projectRoot === '.' || options.projectRoot === '';
     project.targets.lint = {
         executor: '@nrwl/linter:eslint',
         options: {
             lintFilePatterns: [
-                `${options.projectRoot}/**/*.ts`,
-                `${options.projectRoot}/**/*.html`,
+                (0, lint_project_1.mapLintPattern)(options.projectRoot, 'ts', rootProject),
+                (0, lint_project_1.mapLintPattern)(options.projectRoot, 'html', rootProject),
             ],
         },
     };

package/src/generators/add-linting/lib/add-project-lint-target.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-project-lint-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/add-project-lint-target.ts"],"names":[],"mappings":";;;AACA,yCAGsB;AAGtB,SAAgB,oBAAoB,CAClC,IAAU,EACV,OAAkC;IAElC,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACpE,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG;QACrB,QAAQ,EAAE,qBAAqB;QAC/B,OAAO,EAAE;YACP,gBAAgB,EAAE;gBAChB,GAAG,OAAO,CAAC,WAAW,UAAU;gBAChC,GAAG,OAAO,CAAC,WAAW,YAAY;aACnC;SACF;KACF,CAAC;IACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AACjE,CAAC;AAfD,oDAeC"}
+{"version":3,"file":"add-project-lint-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/add-project-lint-target.ts"],"names":[],"mappings":";;;AACA,yCAGsB;AACtB,wFAAuF;AAGvF,SAAgB,oBAAoB,CAClC,IAAU,EACV,OAAkC;IAElC,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACpE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,KAAK,GAAG,IAAI,OAAO,CAAC,WAAW,KAAK,EAAE,CAAC;IAC9E,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG;QACrB,QAAQ,EAAE,qBAAqB;QAC/B,OAAO,EAAE;YACP,gBAAgB,EAAE;gBAChB,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,CAAC;gBACtD,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC;aACzD;SACF;KACF,CAAC;IACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AACjE,CAAC;AAhBD,oDAgBC"}