chore(typescript): use TypeScript 4 (#674)

* Build TypeScript plugin with TypeScript 4 * Bump TypeScript version in package.json
rollup · Dec 2, 2020 · 8c3a3a6 · 8c3a3a6
1 parent c816a5c
commit 8c3a3a6
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 14 deletions.
diff --git a/packages/typescript/package.json b/packages/typescript/package.json
@@ -58,7 +58,8 @@
     "@rollup/plugin-commonjs": "^11.1.0",
     "@rollup/plugin-typescript": "^5.0.2",
     "buble": "^0.20.0",
-    "rollup": "^2.14.0"
+    "rollup": "^2.14.0",
+    "typescript": "^4.1.2"
   },
   "types": "types/index.d.ts",
   "ava": {

diff --git a/packages/typescript/src/tslib.ts b/packages/typescript/src/tslib.ts
@@ -2,7 +2,7 @@ import resolveId, { AsyncOpts } from 'resolve';
 
 const resolveIdAsync = (file: string, opts: AsyncOpts) =>
   new Promise<string>((fulfil, reject) =>
-    resolveId(file, opts, (err, contents) => (err ? reject(err) : fulfil(contents)))
+    resolveId(file, opts, (err, contents) => (err || typeof contents === 'undefined' ? reject(err) : fulfil(contents)))
   );
 
 /**

diff --git a/packages/typescript/src/watchProgram.ts b/packages/typescript/src/watchProgram.ts
@@ -32,7 +32,7 @@ interface CreateProgramOptions {
   transformers?: CustomTransformerFactories;
 }
 
-type DeferredResolve = ((value?: boolean) => void) | (() => void);
+type DeferredResolve = ((value: boolean | PromiseLike<boolean>) => void) | (() => void);
 
 interface Deferred {
   promise: Promise<boolean | void>;
@@ -95,7 +95,7 @@ export class WatchProgramHelper {
 
   resolveFinish() {
     if (this._finishDeferred) {
-      this._finishDeferred.resolve();
+      this._finishDeferred.resolve(false);
       this._finishDeferred = null;
     }
   }

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml