Merge pull request #959 from emberjs/update-linting

Author: rwjblue

.eslintrc.js

@@ -27,9 +27,7 @@ module.exports = {
         es6: true,
       },
       plugins: ['node'],
-      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
-        // add your custom rules and overrides for node files here
-      }),
+      extends: ['plugin:node/recommended'],
     },
     {
       files: ['tests/**/*.[jt]s'],
@@ -39,11 +37,10 @@ module.exports = {
     },
     {
       files: ['**/*.ts'],
+      extends: ['plugin:@typescript-eslint/eslint-recommended'],
       rules: {
-        // the TypeScript compiler already takes care of this and
-        // leaving it enabled results in false positives for interface imports
-        'no-unused-vars': 0,
-        'no-undef': 0,
+        'no-unused-vars': 'off',
+        'prefer-const': 'off',
       },
     },
     {

addon-test-support/@ember/test-helpers/-internal/build-registry.ts

@@ -32,8 +32,8 @@ function exposeRegistryMethodsWithoutDeprecations(container: any) {
     let method = methods[i];
 
     if (method in container) {
-      container[method] = function () {
-        return container._registry[method].apply(container._registry, arguments);
+      container[method] = function (...args: unknown[]) {
+        return container._registry[method](...args);
       };
     }
   }

addon-test-support/@ember/test-helpers/application.ts

@@ -2,7 +2,7 @@ import Application from '@ember/application';
 
 import { getResolver, setResolver } from './resolver';
 
-var __application__: Application | undefined;
+let __application__: Application | undefined;
 
 /**
   Stores the provided application instance so that tests being ran will be aware of the application under test.

addon-test-support/@ember/test-helpers/build-owner.ts

@@ -40,9 +40,9 @@ export default function buildOwner(
   resolver: Resolver | undefined | null
 ): Promise<Owner> {
   if (application) {
-    return (application.boot().then(app => app.buildInstance().boot()) as unknown) as Promise<
-      Owner
-    >;
+    return (application
+      .boot()
+      .then(app => app.buildInstance().boot()) as unknown) as Promise<Owner>;
   }
 
   if (!resolver) {

addon-test-support/@ember/test-helpers/has-ember-version.ts

@@ -10,8 +10,8 @@ import Ember from 'ember';
   @returns {boolean} true if the Ember version is >= MAJOR.MINOR specified, false otherwise
 */
 export default function hasEmberVersion(major: number, minor: number): boolean {
-  var numbers = Ember.VERSION.split('-')[0].split('.');
-  var actualMajor = parseInt(numbers[0], 10);
-  var actualMinor = parseInt(numbers[1], 10);
+  let numbers = Ember.VERSION.split('-')[0].split('.');
+  let actualMajor = parseInt(numbers[0], 10);
+  let actualMinor = parseInt(numbers[1], 10);
   return actualMajor > major || (actualMajor === major && actualMinor >= minor);
 }

addon-test-support/@ember/test-helpers/resolver.ts

@@ -1,6 +1,6 @@
 import Resolver from '@ember/application/resolver';
 
-var __resolver__: Resolver | undefined;
+let __resolver__: Resolver | undefined;
 
 /**
   Stores the provided resolver instance so that tests being ran can resolve

addon-test-support/@ember/test-helpers/setup-application-context.ts

@@ -97,7 +97,7 @@ export function setupRouterSettlednessTracking() {
   router.willDestroy = function () {
     routerTransitionsPending = null;
 
-    return ORIGINAL_WILL_DESTROY.apply(this, arguments);
+    return ORIGINAL_WILL_DESTROY.call(this);
   };
 }
 

package.json

@@ -25,7 +25,9 @@
   "scripts": {
     "build": "ember build",
     "docs": "scripts/precompile.sh && documentation build --document-exported \"addon-test-support/@ember/test-helpers/index.js\" --config documentation.yml --markdown-toc-max-depth 3 -f md -o API.md && ember ts:clean",
-    "lint": "eslint --ext=js,ts --cache . && tsc -p tsconfig.json --noEmit",
+    "lint": "npm-run-all lint:*",
+    "lint:eslint": "eslint --cache .",
+    "lint:types": "tsc -p tsconfig.json --noEmit",
     "prepublishOnly": "scripts/precompile.sh",
     "postpublish": "ember ts:clean",
     "release": "release-it",
@@ -47,8 +49,8 @@
     "@types/ember-data": "^3.16.6",
     "@types/ember-testing-helpers": "^0.0.4",
     "@types/rsvp": "^4.0.3",
-    "@typescript-eslint/eslint-plugin": "^2.34.0",
-    "@typescript-eslint/parser": "^2.34.0",
+    "@typescript-eslint/eslint-plugin": "^4.9.0",
+    "@typescript-eslint/parser": "^4.9.0",
     "broccoli-merge-trees": "^4.2.0",
     "documentation": "^13.0.2",
     "ember-cli": "~3.20.0",
@@ -67,14 +69,15 @@
     "ember-source": "~3.20.4",
     "ember-source-channel-url": "^2.0.1",
     "ember-try": "^1.4.0",
-    "eslint": "^6.8.0",
+    "eslint": "^7.14.0",
     "eslint-config-prettier": "^6.15.0",
     "eslint-plugin-disable-features": "^0.1.3",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.1.4",
+    "eslint-plugin-prettier": "^3.2.0",
     "fs-extra": "^9.0.1",
     "loader.js": "^4.7.0",
-    "prettier": "^2.1.2",
+    "npm-run-all": "^4.1.5",
+    "prettier": "^2.2.1",
     "qunit": "^2.13.0",
     "release-it": "^14.2.1",
     "release-it-lerna-changelog": "^3.1.0",