@schematics/angular 9.1.0-next.2 → 9.1.0

package/migrations/migration-collection.json

@@ -54,6 +54,11 @@
       "version": "9.0.2",
       "factory": "./update-9/schematic-options",
       "description": "Replace deprecated 'styleext' and 'spec' Angular schematic options."
+    },
+    "tslint-version-6": {
+      "version": "10.0.0-beta.0",
+      "factory": "./update-10/update-tslint",
+      "description": "Update tslint to version 6."
     }
   }
 }

package/migrations/update-10/update-tslint.d.ts

@@ -0,0 +1,3 @@
+import { Rule } from '@angular-devkit/schematics';
+export declare const TSLINT_VERSION = "~6.1.0";
+export default function (): Rule;

package/migrations/update-10/update-tslint.js

@@ -0,0 +1,131 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const dependencies_1 = require("../../utility/dependencies");
+const json_utils_1 = require("../../utility/json-utils");
+const utils_1 = require("../update-9/utils");
+exports.TSLINT_VERSION = '~6.1.0';
+const TSLINT_CONFIG_PATH = '/tslint.json';
+const RULES_TO_DELETE = [
+    'no-use-before-declare',
+    'no-unused-variable',
+];
+const RULES_TO_ADD = {
+    align: {
+        options: ['parameters', 'statements'],
+    },
+    'arrow-return-shorthand': true,
+    curly: true,
+    eofline: true,
+    'import-spacing': true,
+    indent: {
+        options: ['spaces'],
+    },
+    'variable-name': {
+        options: ['ban-keywords', 'check-format', 'allow-pascal-case'],
+    },
+    semicolon: { options: ['always'] },
+    'space-before-function-paren': {
+        options: {
+            anonymous: 'never',
+            asyncArrow: 'always',
+            constructor: 'never',
+            method: 'never',
+            named: 'never',
+        },
+    },
+    'typedef-whitespace': {
+        options: [
+            {
+                'call-signature': 'nospace',
+                'index-signature': 'nospace',
+                parameter: 'nospace',
+                'property-declaration': 'nospace',
+                'variable-declaration': 'nospace',
+            },
+            {
+                'call-signature': 'onespace',
+                'index-signature': 'onespace',
+                parameter: 'onespace',
+                'property-declaration': 'onespace',
+                'variable-declaration': 'onespace',
+            },
+        ],
+    },
+    whitespace: {
+        options: [
+            'check-branch',
+            'check-decl',
+            'check-operator',
+            'check-separator',
+            'check-type',
+            'check-typecast',
+        ],
+    },
+};
+function default_1() {
+    return (tree, context) => {
+        const logger = context.logger;
+        // Update tslint dependency
+        const current = dependencies_1.getPackageJsonDependency(tree, 'tslint');
+        if (!current) {
+            logger.info('"tslint" in not a dependency of this workspace.');
+            return;
+        }
+        if (current.version !== exports.TSLINT_VERSION) {
+            dependencies_1.addPackageJsonDependency(tree, {
+                type: current.type,
+                name: 'tslint',
+                version: exports.TSLINT_VERSION,
+                overwrite: true,
+            });
+        }
+        // Update tslint config.
+        const tslintJsonAst = utils_1.readJsonFileAsAstObject(tree, TSLINT_CONFIG_PATH);
+        if (!tslintJsonAst) {
+            const config = ['tslint.js', 'tslint.yaml'].find(c => tree.exists(c));
+            if (config) {
+                logger.warn(`Expected a JSON configuration file but found "${config}".`);
+            }
+            else {
+                logger.warn('Cannot find "tslint.json" configuration file.');
+            }
+            return;
+        }
+        // Remove old/deprecated rules.
+        for (const rule of RULES_TO_DELETE) {
+            const tslintJsonAst = utils_1.readJsonFileAsAstObject(tree, TSLINT_CONFIG_PATH);
+            const rulesAst = json_utils_1.findPropertyInAstObject(tslintJsonAst, 'rules');
+            if ((rulesAst === null || rulesAst === void 0 ? void 0 : rulesAst.kind) !== 'object') {
+                break;
+            }
+            const recorder = tree.beginUpdate(TSLINT_CONFIG_PATH);
+            json_utils_1.removePropertyInAstObject(recorder, rulesAst, rule);
+            tree.commitUpdate(recorder);
+        }
+        // Add new rules only iif the configuration extends 'tslint:recommended'.
+        // This is because some rules conflict with prettier or other tools.
+        const extendsAst = json_utils_1.findPropertyInAstObject(tslintJsonAst, 'extends');
+        if (!extendsAst ||
+            (extendsAst.kind === 'string' && extendsAst.value !== 'tslint:recommended') ||
+            (extendsAst.kind === 'array' && extendsAst.elements.some(e => e.value !== 'tslint:recommended'))) {
+            logger.warn(`tslint configuration does not extend "tslint:recommended".`
+                + '\nMigration will terminate as some rules might conflict.');
+            return;
+        }
+        for (const [name, value] of Object.entries(RULES_TO_ADD)) {
+            const tslintJsonAst = utils_1.readJsonFileAsAstObject(tree, TSLINT_CONFIG_PATH);
+            const rulesAst = json_utils_1.findPropertyInAstObject(tslintJsonAst, 'rules');
+            if ((rulesAst === null || rulesAst === void 0 ? void 0 : rulesAst.kind) !== 'object') {
+                break;
+            }
+            if (json_utils_1.findPropertyInAstObject(rulesAst, name)) {
+                // Skip as rule already exists.
+                continue;
+            }
+            const recorder = tree.beginUpdate(TSLINT_CONFIG_PATH);
+            json_utils_1.insertPropertyInAstObjectInOrder(recorder, rulesAst, name, value, 4);
+            tree.commitUpdate(recorder);
+        }
+    };
+}
+exports.default = default_1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "9.1.0-next.2",
+  "version": "9.1.0",
   "description": "Schematics specific to Angular",
   "keywords": [
     "angular",
@@ -14,8 +14,8 @@
   ],
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "9.1.0-next.2",
-    "@angular-devkit/schematics": "9.1.0-next.2"
+    "@angular-devkit/core": "9.1.0",
+    "@angular-devkit/schematics": "9.1.0"
   },
   "repository": {
     "type": "git",

package/utility/latest-versions.js

@@ -9,17 +9,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.latestVersions = {
     // These versions should be kept up to date with latest Angular peer dependencies.
-    Angular: '~9.1.0-next.3',
+    Angular: '~9.1.0',
     RxJs: '~6.5.4',
     ZoneJs: '~0.10.2',
-    TypeScript: '~3.7.5',
+    TypeScript: '~3.8.3',
     TsLib: '^1.10.0',
     // The versions below must be manually updated when making a new devkit release.
     // For our e2e tests, these versions must match the latest tag present on the branch.
     // During RC periods they will not match the latest RC until there's a new git tag, and
     // should not be updated.
-    DevkitBuildAngular: '~0.901.0-next.2',
-    DevkitBuildNgPackagr: '~0.901.0-next.2',
-    DevkitBuildWebpack: '~0.901.0-next.2',
+    DevkitBuildAngular: '~0.901.0',
+    DevkitBuildNgPackagr: '~0.901.0',
+    DevkitBuildWebpack: '~0.901.0',
     ngPackagr: '^9.0.0',
 };

package/workspace/files/angular.json.template

@@ -1,6 +1,6 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "version": 1, <% if (packageManager) { %>
+  "version": 1,<% if (packageManager) { %>
   "cli": {
     "packageManager": "<%= packageManager %>"
   },<% } %>

package/workspace/files/package.json.template

@@ -40,7 +40,7 @@
     "karma-jasmine-html-reporter": "^1.4.2",
     "protractor": "~5.4.3",<% } %>
     "ts-node": "~8.3.0",
-    "tslint": "~5.18.0",
+    "tslint": "~6.1.0",
     "typescript": "<%= latestVersions.TypeScript %>"
   }
 }

package/workspace/files/tslint.json.template

@@ -4,22 +4,34 @@
     "codelyzer"
   ],
   "rules": {
+    "align": {
+      "options": [
+        "parameters",
+        "statements"
+      ]
+    },
     "array-type": false,
-    "arrow-parens": false,
+    "arrow-return-shorthand": true,
+    "curly": true,
     "deprecation": {
       "severity": "warning"
     },
+    "eofline": true,
     "import-blacklist": [
       true,
       "rxjs/Rx"
     ],
-    "interface-name": false,
+    "import-spacing": true,
+    "indent": {
+      "options": [
+        "spaces"
+      ]
+    },
     "max-classes-per-file": false,
     "max-line-length": [
       true,
       140
     ],
-    "member-access": false,
     "member-ordering": [
       true,
       {
@@ -31,7 +43,6 @@
         ]
       }
     ],
-    "no-consecutive-blank-lines": false,
     "no-console": [
       true,
       "debug",
@@ -53,13 +64,59 @@
       true,
       "as-needed"
     ],
-    "object-literal-sort-keys": false,
-    "ordered-imports": false,
     "quotemark": [
       true,
       "single"
     ],
-    "trailing-comma": false,
+    "semicolon": {
+      "options": [
+        "always"
+      ]
+    },
+    "space-before-function-paren": {
+      "options": {
+        "anonymous": "never",
+        "asyncArrow": "always",
+        "constructor": "never",
+        "method": "never",
+        "named": "never"
+      }
+    },
+    "typedef-whitespace": {
+      "options": [
+        {
+          "call-signature": "nospace",
+          "index-signature": "nospace",
+          "parameter": "nospace",
+          "property-declaration": "nospace",
+          "variable-declaration": "nospace"
+        },
+        {
+          "call-signature": "onespace",
+          "index-signature": "onespace",
+          "parameter": "onespace",
+          "property-declaration": "onespace",
+          "variable-declaration": "onespace"
+        }
+      ]
+    },
+    "variable-name": {
+      "options": [
+        "ban-keywords",
+        "check-format",
+        "allow-pascal-case"
+      ]
+    },
+    "whitespace": {
+      "options": [
+        "check-branch",
+        "check-decl",
+        "check-operator",
+        "check-separator",
+        "check-type",
+        "check-typecast"
+      ]
+    },
     "component-class-suffix": true,
     "contextual-lifecycle": true,
     "directive-class-suffix": true,