@angular-eslint/schematics 13.1.1-alpha.8 → 13.2.1-alpha.2

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [13.2.0](https://github.com/angular-eslint/angular-eslint/compare/v13.1.0...v13.2.0) (2022-04-03)
+
+### Bug Fixes
+
+- **schematics:** support more permutations of ng-add ([#970](https://github.com/angular-eslint/angular-eslint/issues/970)) ([0bf549b](https://github.com/angular-eslint/angular-eslint/commit/0bf549b758a6921ff602136d9872e10bb924baf3))
+
 # [13.1.0](https://github.com/angular-eslint/angular-eslint/compare/v13.0.1...v13.1.0) (2022-02-13)
 
 ### Bug Fixes

package/dist/application/schema.json

@@ -3,7 +3,7 @@
   "$id": "SchematicsAngularApp",
   "title": "Angular Application Options Schema",
   "type": "object",
-  "description": "Generates a new basic app definition in the \"projects\" subfolder of the workspace.",
+  "description": "Generates a new basic application definition in the \"projects\" subfolder of the workspace.",
   "additionalProperties": false,
   "properties": {
     "projectRoot": {

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/ng-add/index.js

@@ -62,8 +62,30 @@ function applyESLintConfigIfSingleProjectWithNoExistingTSLint() {
         if (!angularJson || !angularJson.projects) {
             return;
         }
-        // Anything other than a single project, finish here as there is nothing more we can do automatically
+        /**
+         * If the workspace was created by passing `--create-application=false` to `ng new`
+         * then there will be an angular.json file with a projects object, but no projects
+         * within it.
+         *
+         * In this case we should still configure the root eslint config and set the default
+         * collection to use in angular.json.
+         */
         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)('angular.json', (json) => {
+                    json.cli = json.cli || {};
+                    json.cli.defaultCollection = '@angular-eslint/schematics';
+                    return json;
+                }),
+            ]);
+        }
+        /**
+         * The only other use-case we can reliably support for automatic configuration
+         * is the default case of having a single project in the workspace, so for anything
+         * else we bail at this point.
+         */
         if (projectNames.length !== 1) {
             return;
         }
@@ -81,7 +103,7 @@ function applyESLintConfigIfSingleProjectWithNoExistingTSLint() {
 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.
-`);
+`.trimStart());
         return (0, schematics_1.chain)([
             (0, schematics_1.schematic)('add-eslint-to-project', {}),
             (0, utils_1.updateJsonInTree)('angular.json', (json) => {

package/dist/utils.js

@@ -288,7 +288,13 @@ function createESLintConfigForProject(projectName) {
         if (projectRoot === '') {
             return createRootESLintConfigFile(projectName);
         }
-        return updateJsonInTree((0, core_1.join)((0, core_1.normalize)(projectRoot), '.eslintrc.json'), () => createProjectESLintConfig(tree.root.path, projectRoot, projectType, prefix, hasE2e));
+        return (0, schematics_1.chain)([
+            // If, for whatever reason, the root .eslintrc.json doesn't exist yet, create it
+            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)),
+        ]);
     };
 }
 exports.createESLintConfigForProject = createESLintConfigForProject;

package/dist/workspace/schema.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/schematics",
-  "version": "13.1.1-alpha.8+58e710e",
+  "version": "13.2.1-alpha.2+870f466",
   "description": "Angular Schematics for angular-eslint",
   "license": "MIT",
   "main": "dist/index.js",
@@ -33,8 +33,8 @@
     "save": "devDependencies"
   },
   "dependencies": {
-    "@angular-eslint/eslint-plugin": "13.1.1-alpha.8+58e710e",
-    "@angular-eslint/eslint-plugin-template": "13.1.1-alpha.8+58e710e",
+    "@angular-eslint/eslint-plugin": "13.2.1-alpha.2+870f466",
+    "@angular-eslint/eslint-plugin-template": "13.2.1-alpha.2+870f466",
     "ignore": "5.2.0",
     "strip-json-comments": "3.1.1",
     "tmp": "0.2.1"
@@ -42,11 +42,11 @@
   "devDependencies": {
     "@types/tmp": "0.2.3",
     "@typescript-eslint/experimental-utils": "5.17.0",
-    "eslint": "8.2.0",
+    "eslint": "8.12.0",
     "tslint-to-eslint-config": "2.4.0"
   },
   "peerDependencies": {
     "@angular/cli": ">= 13.0.0 < 14.0.0"
   },
-  "gitHead": "58e710e4a264c6744e7a2bb207aa211307854863"
+  "gitHead": "870f4662f78a45e29e014ac4382b6701d00abb96"
 }