@angular-eslint/schematics 4.3.1-alpha.16 → 4.3.1

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

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "$id": "add-eslint-to-project",
+  "id": "add-eslint-to-project",
   "title": "Add ESLint to an Angular CLI project",
   "type": "object",
   "properties": {

package/dist/application/schema.json

@@ -1,10 +1,9 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema",
-  "$id": "SchematicsAngularApp",
+  "$schema": "http://json-schema.org/schema",
+  "id": "SchematicsAngularApp",
   "title": "Angular Application Options Schema",
   "type": "object",
   "description": "Generates a new basic app definition in the \"projects\" subfolder of the workspace.",
-  "additionalProperties": false,
   "properties": {
     "projectRoot": {
       "description": "The root directory of the new app.",
@@ -34,7 +33,7 @@
     },
     "viewEncapsulation": {
       "description": "The view encapsulation strategy to use in the new app.",
-      "enum": ["Emulated", "None", "ShadowDom"],
+      "enum": ["Emulated", "Native", "None", "ShadowDom"],
       "type": "string",
       "x-user-analytics": 11
     },
@@ -56,24 +55,22 @@
       "description": "The file extension or preprocessor to use for style files.",
       "type": "string",
       "default": "css",
-      "enum": ["css", "scss", "sass", "less"],
+      "enum": [
+        "css",
+        "scss",
+        "sass",
+        "less",
+        "styl"
+      ],
       "x-prompt": {
         "message": "Which stylesheet format would you like to use?",
         "type": "list",
         "items": [
-          { "value": "css", "label": "CSS" },
-          {
-            "value": "scss",
-            "label": "SCSS   [ https://sass-lang.com/documentation/syntax#scss                ]"
-          },
-          {
-            "value": "sass",
-            "label": "Sass   [ https://sass-lang.com/documentation/syntax#the-indented-syntax ]"
-          },
-          {
-            "value": "less",
-            "label": "Less   [ http://lesscss.org                                             ]"
-          }
+          { "value": "css",  "label": "CSS" },
+          { "value": "scss", "label": "SCSS   [ https://sass-lang.com/documentation/syntax#scss                ]" },
+          { "value": "sass", "label": "Sass   [ https://sass-lang.com/documentation/syntax#the-indented-syntax ]" },
+          { "value": "less", "label": "Less   [ http://lesscss.org                                             ]" },
+          { "value": "styl", "label": "Stylus [ https://stylus-lang.com                                        ]" }
         ]
       },
       "x-user-analytics": 5
@@ -110,15 +107,16 @@
     "strict": {
       "description": "Creates an application with stricter bundle budgets settings.",
       "type": "boolean",
-      "default": true,
+      "default": false,
       "x-user-analytics": 7
     },
     "legacyBrowsers": {
       "type": "boolean",
       "description": "Add support for legacy browsers like Internet Explorer using differential loading.",
-      "default": false,
-      "x-deprecated": "Legacy browsers support is deprecated since version 12. For more information, see https://angular.io/guide/browser-support"
+      "default": false
     }
   },
-  "required": ["name"]
+  "required": [
+    "name"
+  ]
 }

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

@@ -176,7 +176,7 @@ function convertRootTSLintConfig(schema, rootTSLintJsonPath, rootESLintrcJsonPat
                 plugins: [
                     '@angular-eslint/eslint-plugin',
                     '@angular-eslint/eslint-plugin-template',
-                    '@typescript-eslint/tslint', // see note on not depending on not wanting to depend on TSLint fallback
+                    '@typescript-eslint/tslint',
                 ],
             },
         ]);
@@ -286,7 +286,7 @@ function convertNonRootTSLintConfig(schema, projectRoot, projectType, projectTSL
                 plugins: [
                     '@angular-eslint/eslint-plugin',
                     '@angular-eslint/eslint-plugin-template',
-                    '@typescript-eslint/tslint', // see note on not depending on not wanting to depend on TSLint fallback
+                    '@typescript-eslint/tslint',
                 ],
             },
         ]);

package/dist/convert-tslint-to-eslint/schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "$id": "convert-tslint-to-eslint",
+  "id": "convert-tslint-to-eslint",
   "title": "Convert an Angular CLI project from TSLint to ESLint",
   "examples": [
     {

package/dist/library/schema.json

@@ -1,11 +1,10 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema",
-  "$id": "SchematicsLibrary",
+  "$schema": "http://json-schema.org/schema",
+  "id": "SchematicsLibrary",
   "title": "Library Options Schema",
   "type": "object",
-  "description": "Creates a new, generic library project in the current workspace.",
+  "description": "Creates a new generic library project in the current workspace.",
   "long-description": "./library-long.md",
-  "additionalProperties": false,
   "properties": {
     "name": {
       "type": "string",

package/dist/migrations.json

@@ -15,11 +15,6 @@
       "version": "3.9.0",
       "description": "Updates @angular-eslint to v4",
       "factory": "./migrations/update-4-0-0/update-4-0-0"
-    },
-    "update-12-0-0": {
-      "version": "4.9.0",
-      "description": "Updates @angular-eslint to v12",
-      "factory": "./migrations/update-12-0-0/update-12-0-0"
     }
   }
 }

package/dist/ng-add/index.js

@@ -53,48 +53,9 @@ Please see https://github.com/angular-eslint/angular-eslint for how to add ESLin
         return host;
     };
 }
-function applyESLintConfigIfSingleProjectWithNoExistingTSLint() {
-    return (host, context) => {
-        const angularJson = utils_1.readJsonInTree(host, 'angular.json');
-        if (!angularJson || !angularJson.projects) {
-            return;
-        }
-        // Anything other than a single project, finish here as there is nothing more we can do automatically
-        const projectNames = Object.keys(angularJson.projects);
-        if (projectNames.length !== 1) {
-            return;
-        }
-        const singleProject = angularJson.projects[projectNames[0]];
-        const targetsConfig = utils_1.getTargetsConfigFromProject(singleProject);
-        // Only possible if malformed, safer to finish here
-        if (!targetsConfig) {
-            return;
-        }
-        // The project already has a lint builder setup, finish here as there is nothing more we can do automatically
-        if (targetsConfig.lint) {
-            return;
-        }
-        context.logger.info(`
-We detected that you have a single project in your workspace and no existing linter wired up, so we are configuring ESLint for you automatically.
-
-Please see https://github.com/angular-eslint/angular-eslint for more information.
-`);
-        return schematics_1.chain([
-            schematics_1.schematic('add-eslint-to-project', {}),
-            utils_1.updateJsonInTree('angular.json', (json) => {
-                json.cli = json.cli || {};
-                json.cli.defaultCollection = '@angular-eslint/schematics';
-                return json;
-            }),
-        ]);
-    };
-}
 function default_1() {
     return (host, context) => {
-        return schematics_1.chain([
-            addAngularESLintPackages(),
-            applyESLintConfigIfSingleProjectWithNoExistingTSLint(),
-        ])(host, context);
+        return schematics_1.chain([addAngularESLintPackages()])(host, context);
     };
 }
 exports.default = default_1;

package/dist/ng-add/schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "$id": "add-angular-eslint",
+  "id": "add-angular-eslint",
   "title": "Add angular-eslint to an existing workspace",
   "type": "object",
   "properties": {},

package/dist/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.determineTargetProjectName = exports.sortObjectByKeys = exports.removeTSLintJSONForProject = exports.createESLintConfigForProject = exports.createRootESLintConfig = exports.setESLintProjectBasedOnProjectType = exports.visitNotIgnoredFiles = exports.addESLintTargetToProject = exports.updateWorkspaceInTree = exports.offsetFromRoot = exports.getProjectConfig = exports.isTSLintUsedInWorkspace = exports.getTargetsConfigFromProject = exports.getWorkspacePath = exports.updateJsonInTree = exports.readJsonInTree = void 0;
+exports.determineTargetProjectName = exports.sortObjectByKeys = exports.removeTSLintJSONForProject = exports.createESLintConfigForProject = exports.createRootESLintConfig = exports.setESLintProjectBasedOnProjectType = exports.visitNotIgnoredFiles = exports.addESLintTargetToProject = exports.updateWorkspaceInTree = exports.offsetFromRoot = exports.getProjectConfig = exports.isTSLintUsedInWorkspace = exports.getWorkspacePath = exports.updateJsonInTree = exports.readJsonInTree = void 0;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const ignore_1 = __importDefault(require("ignore"));
@@ -64,7 +64,6 @@ function getTargetsConfigFromProject(projectConfig) {
     }
     return null;
 }
-exports.getTargetsConfigFromProject = getTargetsConfigFromProject;
 function isTSLintUsedInWorkspace(tree) {
     const workspaceJson = readJsonInTree(tree, getWorkspacePath(tree));
     if (!workspaceJson) {

package/dist/workspace/schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "$id": "SchematicsAngularWorkspace",
+  "id": "SchematicsAngularWorkspace",
   "title": "Angular Workspace Options Schema",
   "type": "object",
   "properties": {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/schematics",
-  "version": "4.3.1-alpha.16+ed7d7b0",
+  "version": "4.3.1",
   "description": "Angular Schematics for angular-eslint",
   "license": "MIT",
   "main": "dist/index.js",
@@ -31,20 +31,20 @@
     "save": "devDependencies"
   },
   "dependencies": {
-    "@angular-eslint/eslint-plugin": "4.3.1-alpha.16+ed7d7b0",
-    "@angular-eslint/eslint-plugin-template": "4.3.1-alpha.16+ed7d7b0",
+    "@angular-eslint/eslint-plugin": "4.3.1",
+    "@angular-eslint/eslint-plugin-template": "4.3.1",
     "ignore": "5.1.8",
     "strip-json-comments": "3.1.1",
     "tmp": "0.2.1"
   },
   "devDependencies": {
     "@types/tmp": "0.2.0",
-    "@typescript-eslint/experimental-utils": "4.23.0",
-    "eslint": "^7.26.0",
-    "tslint-to-eslint-config": "^2.4.0"
+    "@typescript-eslint/experimental-utils": "4.16.1",
+    "eslint": "^7.6.0",
+    "tslint-to-eslint-config": "^2.3.0"
   },
   "peerDependencies": {
-    "@angular/cli": ">= 12.0.0 < 13.0.0"
+    "@angular/cli": ">= 11.2.0 < 12.0.0"
   },
-  "gitHead": "ed7d7b05fb69cef368920ce41396fd260cb3ec84"
+  "gitHead": "3c3e9e87199a229429edfe863117ba4e8f37f424"
 }

package/dist/migrations/update-12-0-0/update-12-0-0.js

@@ -1,114 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const schematics_1 = require("@angular-devkit/schematics");
-const utils_1 = require("../../utils");
-const dependencies_1 = require("../utils/dependencies");
-const updatedAngularESLintVersion = '^12.0.0';
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const packageJSON = require('../../../package.json');
-const updatedTypeScriptESLintVersion = packageJSON.devDependencies['@typescript-eslint/experimental-utils'];
-const updatedESLintVersion = packageJSON.devDependencies['eslint'];
-function migrateToAccessibilityLabelHasAssociatedControlSchema(rule) {
-    if (!Array.isArray(rule) || rule.length !== 2)
-        return;
-    const [, currentSchema] = rule;
-    rule[1] = {
-        controlComponents: currentSchema.controlComponents,
-        labelComponents: currentSchema.labelComponents.map((selector) => {
-            return { inputs: currentSchema.labelAttributes, selector };
-        }),
-    };
-}
-function migrateFromAccessibilityLabelFor({ overrides, rules }) {
-    var _a;
-    migrateToAccessibilityLabelHasAssociatedControlSchema(rules === null || rules === void 0 ? void 0 : rules['@angular-eslint/template/accessibility-label-for']);
-    migrateToAccessibilityLabelHasAssociatedControlName(rules);
-    for (const override of overrides !== null && overrides !== void 0 ? overrides : []) {
-        migrateToAccessibilityLabelHasAssociatedControlSchema((_a = override.rules) === null || _a === void 0 ? void 0 : _a['@angular-eslint/template/accessibility-label-for']);
-        migrateToAccessibilityLabelHasAssociatedControlName(override.rules);
-    }
-}
-function migrateToAccessibilityLabelHasAssociatedControlName(rules) {
-    if (!rules)
-        return;
-    const accessibilityLabelForRule = rules['@angular-eslint/template/accessibility-label-for'];
-    delete rules['@angular-eslint/template/accessibility-label-for'];
-    rules['@angular-eslint/template/accessibility-label-has-associated-control'] = accessibilityLabelForRule;
-}
-function updateAccessibilityLabelFor() {
-    return schematics_1.chain([
-        utils_1.visitNotIgnoredFiles((filePath) => {
-            if (!filePath.endsWith('.eslintrc.json')) {
-                return;
-            }
-            return utils_1.updateJsonInTree(filePath.toString(), (json) => {
-                migrateFromAccessibilityLabelFor(json);
-                return json;
-            });
-        }),
-    ]);
-}
-function addEqeqeqIfNeeded(rules) {
-    if (!rules ||
-        !rules['@angular-eslint/template/no-negated-async'] ||
-        rules['@angular-eslint/template/eqeqeq']) {
-        return;
-    }
-    rules['@angular-eslint/template/eqeqeq'] = 'error';
-}
-function addEqeqeq() {
-    return schematics_1.chain([
-        utils_1.visitNotIgnoredFiles((filePath) => {
-            if (!filePath.endsWith('.eslintrc.json')) {
-                return;
-            }
-            return utils_1.updateJsonInTree(filePath.toString(), (json) => {
-                var _a;
-                addEqeqeqIfNeeded(json.rules);
-                ((_a = json.overrides) !== null && _a !== void 0 ? _a : []).forEach((override) => addEqeqeqIfNeeded(override.rules));
-                return json;
-            });
-        }),
-    ]);
-}
-function migration() {
-    return schematics_1.chain([
-        dependencies_1.updateDependencies([
-            {
-                packageName: '@angular-eslint/builder',
-                version: updatedAngularESLintVersion,
-            },
-            {
-                packageName: '@angular-eslint/eslint-plugin',
-                version: updatedAngularESLintVersion,
-            },
-            {
-                packageName: '@angular-eslint/eslint-plugin-template',
-                version: updatedAngularESLintVersion,
-            },
-            {
-                packageName: '@angular-eslint/template-parser',
-                version: updatedAngularESLintVersion,
-            },
-            {
-                packageName: '@typescript-eslint/eslint-plugin',
-                version: updatedTypeScriptESLintVersion,
-            },
-            {
-                packageName: '@typescript-eslint/experimental-utils',
-                version: updatedTypeScriptESLintVersion,
-            },
-            {
-                packageName: '@typescript-eslint/parser',
-                version: updatedTypeScriptESLintVersion,
-            },
-            {
-                packageName: 'eslint',
-                version: updatedESLintVersion,
-            },
-        ]),
-        updateAccessibilityLabelFor,
-        addEqeqeq,
-    ]);
-}
-exports.default = migration;

package/dist/migrations/utils/dependencies.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateDependencies = void 0;
-const schematics_1 = require("@angular-devkit/schematics");
-const tasks_1 = require("@angular-devkit/schematics/tasks");
-const utils_1 = require("../../utils");
-function updateDependencies(depsToUpdate) {
-    return schematics_1.chain([
-        utils_1.updateJsonInTree('package.json', (json) => {
-            for (const { packageName, version } of depsToUpdate) {
-                updateIfExists(json, packageName, version);
-            }
-            return json;
-        }),
-        (_, context) => {
-            context.addTask(new tasks_1.NodePackageInstallTask());
-        },
-    ]);
-}
-exports.updateDependencies = updateDependencies;
-function updateIfExists(packageJson, depName, updatedVersion) {
-    if (!packageJson) {
-        return;
-    }
-    if (packageJson.dependencies && packageJson.dependencies[depName]) {
-        packageJson.dependencies[depName] = updatedVersion;
-    }
-    if (packageJson.devDependencies && packageJson.devDependencies[depName]) {
-        packageJson.devDependencies[depName] = updatedVersion;
-    }
-}