@angular-eslint/schematics 14.3.1-alpha.0 → 15.0.0-alpha.1

package/dist/add-eslint-to-project/index.js

@@ -4,6 +4,7 @@ const schematics_1 = require("@angular-devkit/schematics");
 const utils_1 = require("../utils");
 function addESLintToProject(schema) {
     return (tree) => {
+        var _a;
         const projectName = (0, utils_1.determineTargetProjectName)(tree, schema.project);
         if (!projectName) {
             throw new Error('\n' +
@@ -17,7 +18,7 @@ E.g. npx ng g @angular-eslint/schematics:add-eslint-to-project {{YOUR_PROJECT_NA
             // Set the lint builder and config in angular.json
             (0, utils_1.addESLintTargetToProject)(projectName, 'lint'),
             // Create the ESLint config file for the project
-            (0, utils_1.createESLintConfigForProject)(projectName),
+            (0, utils_1.createESLintConfigForProject)(projectName, (_a = schema.setParserOptionsProject) !== null && _a !== void 0 ? _a : false),
         ]);
     };
 }

package/dist/add-eslint-to-project/schema.json

@@ -11,6 +11,11 @@
         "$source": "argv",
         "index": 0
       }
+    },
+    "setParserOptionsProject": {
+      "type": "boolean",
+      "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
+      "default": false
     }
   },
   "required": []

package/dist/application/index.js

@@ -1,21 +1,36 @@
 "use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const schematics_1 = require("@angular-devkit/schematics");
 const utils_1 = require("../utils");
 function eslintRelatedChanges(options) {
+    var _a;
     return (0, schematics_1.chain)([
         // Update the lint builder and config in angular.json
         (0, utils_1.addESLintTargetToProject)(options.name, 'lint'),
         // Create the ESLint config file for the project
-        (0, utils_1.createESLintConfigForProject)(options.name),
+        (0, utils_1.createESLintConfigForProject)(options.name, (_a = options.setParserOptionsProject) !== null && _a !== void 0 ? _a : false),
         // Delete the TSLint config file for the project
         (0, utils_1.removeTSLintJSONForProject)(options.name),
     ]);
 }
 function default_1(options) {
     return (host, context) => {
+        // Remove angular-eslint specific options before passing to the Angular schematic
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { setParserOptionsProject } = options, angularOptions = __rest(options, ["setParserOptionsProject"]);
         return (0, schematics_1.chain)([
-            (0, schematics_1.externalSchematic)('@schematics/angular', 'application', options),
+            (0, schematics_1.externalSchematic)('@schematics/angular', 'application', angularOptions),
             eslintRelatedChanges(options),
         ])(host, context);
     };

package/dist/application/schema.json

@@ -7,12 +7,11 @@
   "additionalProperties": false,
   "properties": {
     "projectRoot": {
-      "description": "The root directory of the new app.",
-      "type": "string",
-      "visible": false
+      "description": "The root directory of the new application.",
+      "type": "string"
     },
     "name": {
-      "description": "The name of the new app.",
+      "description": "The name of the new application.",
       "type": "string",
       "pattern": "^(?:@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*/)?[a-zA-Z0-9-~][a-zA-Z0-9-._~]*$",
       "$default": {
@@ -25,26 +24,25 @@
       "description": "Include styles inline in the root component.ts file. Only CSS styles can be included inline. Default is false, meaning that an external styles file is created and referenced in the root component.ts file.",
       "type": "boolean",
       "alias": "s",
-      "x-user-analytics": 9
+      "x-user-analytics": "ep.ng_inline_style"
     },
     "inlineTemplate": {
       "description": "Include template inline in the root component.ts file. Default is false, meaning that an external template file is created and referenced in the root component.ts file. ",
       "type": "boolean",
       "alias": "t",
-      "x-user-analytics": 10
+      "x-user-analytics": "ep.ng_inline_template"
     },
     "viewEncapsulation": {
       "description": "The view encapsulation strategy to use in the new application.",
       "enum": ["Emulated", "None", "ShadowDom"],
-      "type": "string",
-      "x-user-analytics": 11
+      "type": "string"
     },
     "routing": {
       "type": "boolean",
       "description": "Create a routing NgModule.",
       "default": false,
       "x-prompt": "Would you like to add Angular routing?",
-      "x-user-analytics": 17
+      "x-user-analytics": "ep.ng_routing"
     },
     "prefix": {
       "type": "string",
@@ -62,7 +60,10 @@
         "message": "Which stylesheet format would you like to use?",
         "type": "list",
         "items": [
-          { "value": "css", "label": "CSS" },
+          {
+            "value": "css",
+            "label": "CSS"
+          },
           {
             "value": "scss",
             "label": "SCSS   [ https://sass-lang.com/documentation/syntax#scss                ]"
@@ -77,14 +78,13 @@
           }
         ]
       },
-      "x-user-analytics": 5
+      "x-user-analytics": "ep.ng_style"
     },
     "skipTests": {
       "description": "Do not create \"spec.ts\" test files for the application.",
       "type": "boolean",
       "default": false,
-      "alias": "S",
-      "x-user-analytics": 12
+      "alias": "S"
     },
     "skipPackageJson": {
       "type": "boolean",
@@ -94,8 +94,7 @@
     "minimal": {
       "description": "Create a bare-bones project without any testing frameworks. (Use for learning purposes only.)",
       "type": "boolean",
-      "default": false,
-      "x-user-analytics": 14
+      "default": false
     },
     "skipInstall": {
       "description": "Skip installing dependency packages.",
@@ -105,8 +104,12 @@
     "strict": {
       "description": "Creates an application with stricter bundle budgets settings.",
       "type": "boolean",
-      "default": true,
-      "x-user-analytics": 7
+      "default": true
+    },
+    "setParserOptionsProject": {
+      "type": "boolean",
+      "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
+      "default": false
     }
   },
   "required": ["name"]

package/dist/convert-tslint-to-eslint/index.js

@@ -47,7 +47,7 @@ E.g. npx ng g @angular-eslint/schematics:convert-tslint-to-eslint {{YOUR_PROJECT
                 : schema.ignoreExistingTslintConfig
                     ? (0, schematics_1.chain)([
                         // Create the latest recommended ESLint config file for the project
-                        (0, utils_1.createESLintConfigForProject)(projectName),
+                        (0, utils_1.createESLintConfigForProject)(projectName, true),
                         // Delete the TSLint config file for the project
                         (0, utils_1.removeTSLintJSONForProject)(projectName),
                     ])

package/dist/library/index.js

@@ -1,26 +1,36 @@
 "use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const schematics_1 = require("@angular-devkit/schematics");
 const utils_1 = require("../utils");
 function eslintRelatedChanges(options) {
-    /**
-     * The types coming from the @schematics/angular schema seem to be wrong, if name isn't
-     * provided the interactive CLI prompt will throw
-     */
-    const projectName = options.name;
+    var _a;
     return (0, schematics_1.chain)([
         // Update the lint builder and config in angular.json
-        (0, utils_1.addESLintTargetToProject)(projectName, 'lint'),
+        (0, utils_1.addESLintTargetToProject)(options.name, 'lint'),
         // Create the ESLint config file for the project
-        (0, utils_1.createESLintConfigForProject)(projectName),
+        (0, utils_1.createESLintConfigForProject)(options.name, (_a = options.setParserOptionsProject) !== null && _a !== void 0 ? _a : false),
         // Delete the TSLint config file for the project
-        (0, utils_1.removeTSLintJSONForProject)(projectName),
+        (0, utils_1.removeTSLintJSONForProject)(options.name),
     ]);
 }
 function default_1(options) {
     return (host, context) => {
+        // Remove angular-eslint specific options before passing to the Angular schematic
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { setParserOptionsProject } = options, angularOptions = __rest(options, ["setParserOptionsProject"]);
         return (0, schematics_1.chain)([
-            (0, schematics_1.externalSchematic)('@schematics/angular', 'library', options),
+            (0, schematics_1.externalSchematic)('@schematics/angular', 'library', angularOptions),
             eslintRelatedChanges(options),
         ])(host, context);
     };

package/dist/library/schema.json

@@ -43,6 +43,15 @@
       "type": "boolean",
       "default": false,
       "description": "Do not update \"tsconfig.json\" to add a path mapping for the new library. The path mapping is needed to use the library in an app, but can be disabled here to simplify development."
+    },
+    "projectRoot": {
+      "type": "string",
+      "description": "The root directory of the new library."
+    },
+    "setParserOptionsProject": {
+      "type": "boolean",
+      "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
+      "default": false
     }
   },
   "required": ["name"]

package/dist/ng-add/index.js

@@ -73,7 +73,7 @@ function applyESLintConfigIfSingleProjectWithNoExistingTSLint() {
         const projectNames = Object.keys(angularJson.projects);
         if (projectNames.length === 0) {
             return (0, schematics_1.chain)([
-                (0, utils_1.updateJsonInTree)('.eslintrc.json', () => (0, utils_1.createRootESLintConfig)(null, false)),
+                (0, utils_1.updateJsonInTree)('.eslintrc.json', () => (0, utils_1.createRootESLintConfig)(null)),
                 (0, utils_1.updateJsonInTree)('angular.json', (json) => (0, utils_1.updateSchematicCollections)(json)),
             ]);
         }

package/dist/utils.js

@@ -184,26 +184,20 @@ exports.visitNotIgnoredFiles = visitNotIgnoredFiles;
 function setESLintProjectBasedOnProjectType(projectRoot, projectType, hasE2e) {
     let project;
     if (projectType === 'application') {
-        project = [
-            `${projectRoot}/tsconfig.app.json`,
-            `${projectRoot}/tsconfig.spec.json`,
-        ];
+        project = [`${projectRoot}/tsconfig.(app|spec).json`];
         if (hasE2e) {
             project.push(`${projectRoot}/e2e/tsconfig.json`);
         }
     }
     // Libraries don't have an e2e directory
     if (projectType === 'library') {
-        project = [
-            `${projectRoot}/tsconfig.lib.json`,
-            `${projectRoot}/tsconfig.spec.json`,
-        ];
+        project = [`${projectRoot}/tsconfig.(lib|spec).json`];
     }
     return project;
 }
 exports.setESLintProjectBasedOnProjectType = setESLintProjectBasedOnProjectType;
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-function createRootESLintConfig(prefix, hasE2e) {
+function createRootESLintConfig(prefix) {
     let codeRules;
     if (prefix) {
         codeRules = {
@@ -226,13 +220,9 @@ function createRootESLintConfig(prefix, hasE2e) {
         overrides: [
             {
                 files: ['*.ts'],
-                parserOptions: {
-                    project: hasE2e
-                        ? ['tsconfig.json', 'e2e/tsconfig.json']
-                        : ['tsconfig.json'],
-                    createDefaultProgram: true,
-                },
                 extends: [
+                    'eslint:recommended',
+                    'plugin:@typescript-eslint/recommended',
                     'plugin:@angular-eslint/recommended',
                     'plugin:@angular-eslint/template/process-inline-templates',
                 ],
@@ -247,18 +237,18 @@ function createRootESLintConfig(prefix, hasE2e) {
     };
 }
 exports.createRootESLintConfig = createRootESLintConfig;
-function createProjectESLintConfig(rootPath, projectRoot, projectType, prefix, hasE2e) {
+function createProjectESLintConfig(rootPath, projectRoot, projectType, prefix, setParserOptionsProject, hasE2e) {
     return {
         extends: `${offsetFromRoot(rootPath)}.eslintrc.json`,
         ignorePatterns: ['!**/*'],
         overrides: [
-            {
-                files: ['*.ts'],
-                parserOptions: {
-                    project: setESLintProjectBasedOnProjectType(projectRoot, projectType, hasE2e),
-                    createDefaultProgram: true,
-                },
-                rules: {
+            Object.assign(Object.assign({ files: ['*.ts'] }, (setParserOptionsProject
+                ? {
+                    parserOptions: {
+                        project: setESLintProjectBasedOnProjectType(projectRoot, projectType, hasE2e),
+                    },
+                }
+                : null)), { rules: {
                     '@angular-eslint/directive-selector': [
                         'error',
                         { type: 'attribute', prefix, style: 'camelCase' },
@@ -267,8 +257,7 @@ function createProjectESLintConfig(rootPath, projectRoot, projectType, prefix, h
                         'error',
                         { type: 'element', prefix, style: 'kebab-case' },
                     ],
-                },
-            },
+                } }),
             {
                 files: ['*.html'],
                 rules: {},
@@ -276,7 +265,7 @@ function createProjectESLintConfig(rootPath, projectRoot, projectType, prefix, h
         ],
     };
 }
-function createESLintConfigForProject(projectName) {
+function createESLintConfigForProject(projectName, setParserOptionsProject) {
     return (tree) => {
         const angularJSON = readJsonInTree(tree, 'angular.json');
         const { root: projectRoot, projectType, prefix, } = angularJSON.projects[projectName];
@@ -293,7 +282,7 @@ function createESLintConfigForProject(projectName) {
             tree.exists('.eslintrc.json')
                 ? () => undefined
                 : createRootESLintConfigFile(projectName),
-            updateJsonInTree((0, core_1.join)((0, core_1.normalize)(projectRoot), '.eslintrc.json'), () => createProjectESLintConfig(tree.root.path, projectRoot, projectType, prefix, hasE2e)),
+            updateJsonInTree((0, core_1.join)((0, core_1.normalize)(projectRoot), '.eslintrc.json'), () => createProjectESLintConfig(tree.root.path, projectRoot, projectType, prefix, setParserOptionsProject, hasE2e)),
         ]);
     };
 }
@@ -314,12 +303,11 @@ function createRootESLintConfigFile(projectName) {
         var _a;
         const angularJSON = readJsonInTree(tree, getWorkspacePath(tree));
         let lintPrefix = null;
-        const hasE2e = determineTargetProjectHasE2E(angularJSON, projectName);
         if ((_a = angularJSON.projects) === null || _a === void 0 ? void 0 : _a[projectName]) {
             const { prefix } = angularJSON.projects[projectName];
             lintPrefix = prefix;
         }
-        return updateJsonInTree('.eslintrc.json', () => createRootESLintConfig(lintPrefix, hasE2e));
+        return updateJsonInTree('.eslintrc.json', () => createRootESLintConfig(lintPrefix));
     };
 }
 function sortObjectByKeys(obj) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/schematics",
-  "version": "14.3.1-alpha.0+f71f236",
+  "version": "15.0.0-alpha.1",
   "description": "Angular Schematics for angular-eslint",
   "license": "MIT",
   "main": "dist/index.js",
@@ -33,8 +33,8 @@
     "save": "devDependencies"
   },
   "dependencies": {
-    "@angular-eslint/eslint-plugin": "14.3.1-alpha.0+f71f236",
-    "@angular-eslint/eslint-plugin-template": "14.3.1-alpha.0+f71f236",
+    "@angular-eslint/eslint-plugin": "15.0.0-alpha.1",
+    "@angular-eslint/eslint-plugin-template": "15.0.0-alpha.1",
     "ignore": "5.2.0",
     "strip-json-comments": "3.1.1",
     "tmp": "0.2.1"
@@ -46,7 +46,7 @@
     "tslint-to-eslint-config": "2.4.0"
   },
   "peerDependencies": {
-    "@angular/cli": ">= 14.0.0 < 15.0.0"
+    "@angular/cli": ">= 15.0.0 < 16.0.0"
   },
-  "gitHead": "f71f23652a74ebd2f650baeb3a91051db554c5d9"
+  "gitHead": "58e6105c2375550f2b786406f25e304b0d59095b"
 }