feat: update typescript version (#109)

forcedotcom · Jan 28, 2021 · 399a0b0 · 399a0b0
1 parent d08423b
commit 399a0b0
Show file tree

Hide file tree

Showing 29 changed files with 216 additions and 87 deletions.
diff --git a/packages/dev-config/tsconfig.json b/packages/dev-config/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2017",
-    "lib": ["es2017"],
+    "target": "es2019",
+    "lib": ["es2019"],
     "sourceMap": true,
     "declaration": true,
     "moduleResolution": "node",

diff --git a/packages/dev-scripts/package.json b/packages/dev-scripts/package.json
@@ -70,7 +70,7 @@
     "ts-node": "^8.10.2",
     "typedoc": "~0.18.0",
     "typedoc-plugin-external-module-name": "~4.0.0",
-    "typescript": "^3.9.3",
+    "typescript": "^4.1.3",
     "xunit-file": "^1.0.0"
   },
   "publishConfig": {

diff --git a/packages/eslint-config-salesforce-typescript/package.json b/packages/eslint-config-salesforce-typescript/package.json
@@ -22,8 +22,8 @@
     "url": "https://github.com/forcedotcom/sfdx-dev-packages/issues"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^2.30.0",
-    "@typescript-eslint/parser": "^2.30.0",
+    "@typescript-eslint/eslint-plugin": "^4.2.0",
+    "@typescript-eslint/parser": "^4.2.0",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-config-salesforce-license": "^0.1.0",

diff --git a/packages/kit/.eslintrc.js b/packages/kit/.eslintrc.js
@@ -10,4 +10,7 @@
 
 module.exports = {
   extends: ['eslint-config-salesforce-typescript', 'eslint-config-salesforce-license'],
+  rules: {
+    '@typescript-eslint/ban-types': 'off'
+  }
 };
diff --git a/packages/kit/.sfdevrc.json b/packages/kit/.sfdevrc.json
@@ -1,4 +1,3 @@
 {
-  "$schema": "../dev-scripts/sfdevrc.schema.json",
-  "strict": true
+  "$schema": "../dev-scripts/sfdevrc.schema.json"
 }
diff --git a/packages/kit/package.json b/packages/kit/package.json
@@ -34,8 +34,8 @@
     "@salesforce/dev-config": "^2.0.0",
     "@salesforce/dev-scripts": "^0.6.3",
     "@salesforce/prettier-config": "^0.0.1",
-    "@typescript-eslint/eslint-plugin": "^2.30.0",
-    "@typescript-eslint/parser": "^2.30.0",
+    "@typescript-eslint/eslint-plugin": "^4.2.0",
+    "@typescript-eslint/parser": "^4.2.0",
     "chai": "^4.2.0",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.11.0",
@@ -54,6 +54,6 @@
     "pretty-quick": "^2.0.1",
     "sinon": "^9.0.2",
     "ts-node": "^8.10.2",
-    "typescript": "^3.9.3"
+    "typescript": "^4.1.3"
   }
 }
diff --git a/packages/kit/src/creatable.ts b/packages/kit/src/creatable.ts
@@ -25,7 +25,7 @@ export abstract class AsyncCreatable<O = object> {
    *
    * @param options An options object providing initialization params to the async constructor.
    */
-  public static async create<P, T extends AsyncCreatable<P>>(this: new (options: P) => T, options: P): Promise<T> {
+  public static async create<P, T extends AsyncCreatable<P>>(this: new (opts: P) => T, options: P): Promise<T> {
     const instance = new this(options);
     await instance.init();
     return instance;
@@ -58,7 +58,7 @@ export abstract class AsyncOptionalCreatable<O = object> {
    * @param options An options object providing initialization params to the async constructor.
    */
   public static async create<P, T extends AsyncOptionalCreatable<P>>(
-    this: new (options?: P) => T,
+    this: new (opts?: P) => T,
     options?: P
   ): Promise<T> {
     const instance = new this(options);

diff --git a/packages/kit/src/duration.ts b/packages/kit/src/duration.ts
@@ -280,6 +280,7 @@ export namespace Duration {
   /**
    * Units of duration.
    */
+  // eslint-disable-next-line no-shadow
   export enum Unit {
     MINUTES,
     MILLISECONDS,

diff --git a/packages/kit/src/nodash/.eslintrc b/packages/kit/src/nodash/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "../../.eslintrc",
   "rules": {
-    "@typescript-eslint/ban-types": "off"
+    "@typescript-eslint/no-unsafe-call": "off",
+    "@typescript-eslint/no-unsafe-member-access": "off",
+    "@typescript-eslint/no-unsafe-return": "off"
   }
 }
diff --git a/packages/kit/src/nodash/external.ts b/packages/kit/src/nodash/external.ts
@@ -18,7 +18,7 @@
 //   published in the lodash documentation for that fn.
 
 import { AnyFunction, Dictionary, Many, Nullable, Optional } from '@salesforce/ts-types';
-// eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore ignore the demand for typings for the locally built lodash
 import * as _ from '../../vendor/lodash';
 import { ListIteratee, NumericDictionary, ObjectIteratee, Omit, ValueIteratee, ValueIterateeCustom } from './support';

diff --git a/packages/kit/test/.eslintrc.js b/packages/kit/test/.eslintrc.js
@@ -24,5 +24,6 @@ module.exports = {
     '@typescript-eslint/no-empty-function': 'off',
     // Easily return a promise in a mocked method.
     '@typescript-eslint/require-await': 'off',
+    'no-shadow': 'off'
   },
 };
diff --git a/packages/kit/test/duration.test.ts b/packages/kit/test/duration.test.ts
@@ -214,33 +214,33 @@ describe('duration', () => {
 
   describe('as strings', () => {
     it('should print 0 regardless of unit', () => {
-      expect(new Duration(0, Duration.Unit.MILLISECONDS) + '').to.equal('0 milliseconds');
-      expect(new Duration(0, Duration.Unit.SECONDS) + '').to.equal('0 seconds');
-      expect(new Duration(0, Duration.Unit.MINUTES) + '').to.equal('0 minutes');
+      expect(new Duration(0, Duration.Unit.MILLISECONDS).toString()).to.equal('0 milliseconds');
+      expect(new Duration(0, Duration.Unit.SECONDS).toString()).to.equal('0 seconds');
+      expect(new Duration(0, Duration.Unit.MINUTES).toString()).to.equal('0 minutes');
     });
     it('should print minute', () => {
       const duration = new Duration(1);
-      expect(duration + '').to.equal('1 minute');
+      expect(duration.toString()).to.equal('1 minute');
     });
     it('should print minutes', () => {
       const duration = new Duration(2);
-      expect(duration + '').to.equal('2 minutes');
+      expect(duration.toString()).to.equal('2 minutes');
     });
     it('should print second', () => {
       const duration = new Duration(1, Duration.Unit.SECONDS);
-      expect(duration + '').to.equal('1 second');
+      expect(duration.toString()).to.equal('1 second');
     });
     it('should print seconds', () => {
       const duration = new Duration(2, Duration.Unit.SECONDS);
-      expect(duration + '').to.equal('2 seconds');
+      expect(duration.toString()).to.equal('2 seconds');
     });
     it('should print millisecond', () => {
       const duration = new Duration(1, Duration.Unit.MILLISECONDS);
-      expect(duration + '').to.equal('1 millisecond');
+      expect(duration.toString()).to.equal('1 millisecond');
     });
     it('should print millisecond', () => {
       const duration = new Duration(2, Duration.Unit.MILLISECONDS);
-      expect(duration + '').to.equal('2 milliseconds');
+      expect(duration.toString()).to.equal('2 milliseconds');
     });
   });
 

diff --git a/packages/kit/test/nodash/external.test.ts b/packages/kit/test/nodash/external.test.ts
@@ -65,7 +65,7 @@ describe('nodash', () => {
   describe('mapKeys', () => {
     it('should map the keys of an object', () => {
       const obj = { a: 1, b: 2 };
-      const result = _.mapKeys(obj, (value, key) => key + value);
+      const result = _.mapKeys(obj, (value, key) => `${key}${value}`);
       expect(result).to.deep.equal({ a1: 1, b2: 2 });
     });
   });

diff --git a/packages/lazy-require/.eslintrc.js b/packages/lazy-require/.eslintrc.js
@@ -10,4 +10,11 @@
 
 module.exports = {
   extends: ['eslint-config-salesforce-typescript', 'eslint-config-salesforce-license'],
+  rules: {
+    '@typescript-eslint/ban-types': 'off',
+    '@typescript-eslint/no-unsafe-return': 'off',
+    '@typescript-eslint/no-unsafe-assignment': 'off',
+    '@typescript-eslint/no-unsafe-member-access': 'off',
+    '@typescript-eslint/no-unsafe-call': 'off',
+  }
 };
diff --git a/packages/lazy-require/.sfdevrc.json b/packages/lazy-require/.sfdevrc.json
@@ -1,4 +1,3 @@
 {
-  "$schema": "../dev-scripts/sfdevrc.schema.json",
-  "strict": true
+  "$schema": "../dev-scripts/sfdevrc.schema.json"
 }
diff --git a/packages/lazy-require/package.json b/packages/lazy-require/package.json
@@ -21,8 +21,8 @@
     "@salesforce/prettier-config": "^0.0.1",
     "@salesforce/ts-sinon": "^1.2.4",
     "@types/debug": "^0.0.31",
-    "@typescript-eslint/eslint-plugin": "^2.30.0",
-    "@typescript-eslint/parser": "^2.30.0",
+    "@typescript-eslint/eslint-plugin": "^4.2.0",
+    "@typescript-eslint/parser": "^4.2.0",
     "chai": "^4.2.0",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.11.0",
@@ -40,7 +40,7 @@
     "pretty-quick": "^2.0.1",
     "sinon": "^9.0.2",
     "ts-node": "^8.10.2",
-    "typescript": "^3.9.3"
+    "typescript": "^4.1.3"
   },
   "scripts": {
     "build": "sf-build",

diff --git a/packages/lazy-require/src/LazyLoader.ts b/packages/lazy-require/src/LazyLoader.ts
@@ -7,7 +7,7 @@
 
 // This file does a lot of trickery with low level javascript and proxies. So turn off some eslint features.
 /* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/ban-ts-ignore */
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 /* eslint-disable no-underscore-dangle */
 
 /**

diff --git a/packages/require-analytics/.eslintrc.js b/packages/require-analytics/.eslintrc.js
@@ -10,4 +10,15 @@
 
 module.exports = {
   extends: ['eslint-config-salesforce-typescript', 'eslint-config-salesforce-license'],
+  rules: {
+    'no-underscore-dangle': 'off',
+    '@typescript-eslint/no-var-requires': 'off',
+    '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/explicit-module-boundary-types': 'off',
+    '@typescript-eslint/no-unsafe-assignment': 'off',
+    '@typescript-eslint/no-unsafe-member-access': 'off',
+    '@typescript-eslint/no-unsafe-call': 'off',
+    '@typescript-eslint/no-unsafe-return': 'off',
+    '@typescript-eslint/ban-types': 'off'
+  }
 };
diff --git a/packages/require-analytics/.sfdevrc.json b/packages/require-analytics/.sfdevrc.json
@@ -1,3 +1 @@
-{
-  "strict": true
-}
+{}
diff --git a/packages/require-analytics/package.json b/packages/require-analytics/package.json
@@ -27,8 +27,8 @@
     "@salesforce/dev-config": "^2.0.0",
     "@salesforce/dev-scripts": "^0.6.3",
     "@salesforce/prettier-config": "^0.0.1",
-    "@typescript-eslint/eslint-plugin": "^2.30.0",
-    "@typescript-eslint/parser": "^2.30.0",
+    "@typescript-eslint/eslint-plugin": "^4.2.0",
+    "@typescript-eslint/parser": "^4.2.0",
     "chai": "^4.2.0",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.11.0",
@@ -46,7 +46,7 @@
     "pretty-quick": "^2.0.1",
     "sinon": "^9.0.2",
     "ts-node": "^8.10.2",
-    "typescript": "^3.9.3"
+    "typescript": "^4.1.3"
   },
   "dependencies": {
     "tslib": "^1.10.0"

diff --git a/packages/require-analytics/src/index.ts b/packages/require-analytics/src/index.ts
@@ -7,10 +7,6 @@
 
 // A simple utility for gathering module loading statistics for diagnostic purposes.
 
-/* eslint-disable no-underscore-dangle */
-/* eslint-disable @typescript-eslint/no-var-requires */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
 // -------------------------------------------------------------------------------
 // No requires or imports so we can instrument as much module loading as possible.
 // -------------------------------------------------------------------------------

diff --git a/packages/ts-sinon/.eslintrc.js b/packages/ts-sinon/.eslintrc.js
@@ -10,4 +10,11 @@
 
 module.exports = {
   extends: ['eslint-config-salesforce-typescript', 'eslint-config-salesforce-license'],
+  rules: {
+    '@typescript-eslint/no-unsafe-assignment': 'off',
+    '@typescript-eslint/no-unsafe-member-access': 'off',
+    '@typescript-eslint/no-unsafe-call': 'off',
+    '@typescript-eslint/no-unsafe-return': 'off',
+    '@typescript-eslint/ban-types': 'off'
+  }
 };
diff --git a/packages/ts-sinon/.sfdevrc.json b/packages/ts-sinon/.sfdevrc.json
@@ -1,4 +1,3 @@
 {
-  "$schema": "../dev-scripts/sfdevrc.schema.json",
-  "strict": true
+  "$schema": "../dev-scripts/sfdevrc.schema.json"
 }
diff --git a/packages/ts-sinon/package.json b/packages/ts-sinon/package.json
@@ -20,8 +20,8 @@
     "@salesforce/dev-config": "^2.0.0",
     "@salesforce/dev-scripts": "^0.6.3",
     "@salesforce/prettier-config": "^0.0.1",
-    "@typescript-eslint/eslint-plugin": "^2.30.0",
-    "@typescript-eslint/parser": "^2.30.0",
+    "@typescript-eslint/eslint-plugin": "^4.2.0",
+    "@typescript-eslint/parser": "^4.2.0",
     "chai": "^4.2.0",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.11.0",
@@ -39,7 +39,7 @@
     "pretty-quick": "^2.0.1",
     "sinon": "^9.0.2",
     "ts-node": "^8.10.2",
-    "typescript": "^3.9.3"
+    "typescript": "^4.1.3"
   },
   "scripts": {
     "build": "sf-build",

diff --git a/packages/ts-types/.eslintrc.js b/packages/ts-types/.eslintrc.js
@@ -3,5 +3,6 @@ module.exports = {
   rules: {
     // Define convenient alias types
     '@typescript-eslint/no-empty-interface': 'off',
+    '@typescript-eslint/ban-types': 'off'
   },
 };
diff --git a/packages/ts-types/package.json b/packages/ts-types/package.json
@@ -30,8 +30,8 @@
     "@salesforce/dev-config": "^2.0.0",
     "@salesforce/dev-scripts": "^0.6.3",
     "@salesforce/prettier-config": "^0.0.1",
-    "@typescript-eslint/eslint-plugin": "^2.30.0",
-    "@typescript-eslint/parser": "^2.30.0",
+    "@typescript-eslint/eslint-plugin": "^4.2.0",
+    "@typescript-eslint/parser": "^4.2.0",
     "chai": "^4.2.0",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.11.0",
@@ -49,6 +49,6 @@
     "pretty-quick": "^2.0.1",
     "sinon": "^9.0.2",
     "ts-node": "^8.10.2",
-    "typescript": "^3.9.3"
+    "typescript": "^4.1.3"
   }
 }
diff --git a/packages/ts-types/src/experimental/index.ts b/packages/ts-types/src/experimental/index.ts
@@ -104,7 +104,7 @@ export function view<T, K extends string>(value: Nullable<T>, keys: Many<K>): Op
 function viewOptional<T, K extends string, R extends T>(
   value: Nullable<T>,
   key: K,
-  hasType: (value: Nullable<T>, key: K) => value is R
+  hasType: (v: Nullable<T>, k: K) => v is R
 ): Optional<T & ViewOptional<K, R>> {
   return hasType(value, key) ? value : hasNull(value, key) ? value : undefined;
 }

diff --git a/packages/ts-types/src/narrowing/to.ts b/packages/ts-types/src/narrowing/to.ts
@@ -39,7 +39,7 @@ export function toAnyJson<T>(value: Nullable<T>, defaultValue: AnyJson): AnyJson
 // underlying function
 export function toAnyJson<T>(value: Nullable<T>, defaultValue?: AnyJson): Optional<AnyJson> {
   try {
-    return value !== undefined ? JSON.parse(JSON.stringify(value)) : defaultValue;
+    return (value !== undefined ? JSON.parse(JSON.stringify(value)) : defaultValue) as Optional<AnyJson>;
   } catch (err) {
     throw new JsonCloneError(err);
   }