From 9123acdbfade78abf54598d8585765842f0a62d4 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Fri, 20 Mar 2020 22:31:02 +0200 Subject: [PATCH 1/5] Fix sha.js import --- src/util/StringUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/StringUtils.ts b/src/util/StringUtils.ts index 808554c60e..54f1a1a395 100644 --- a/src/util/StringUtils.ts +++ b/src/util/StringUtils.ts @@ -1,4 +1,4 @@ -import * as shajs from "sha.js"; +import shajs from "sha.js"; /** * Converts string into camelCase. From a370fcb9fceac8b98d03f326271717ada77d777a Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Fri, 20 Mar 2020 22:53:50 +0200 Subject: [PATCH 2/5] synthetic default exports --- tsconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/tsconfig.json b/tsconfig.json index fb041b42c3..ab88a50c45 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "lib": ["es5", "es6"], "outDir": "build/compiled", + "allowSyntheticDefaultImports": true, "target": "es5", "module": "commonjs", "moduleResolution": "node", From 00cfd262f067fe9dd64698b7e548aac5db4793ee Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Fri, 20 Mar 2020 23:02:18 +0200 Subject: [PATCH 3/5] add module interop --- tsconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/tsconfig.json b/tsconfig.json index ab88a50c45..e5fa3032af 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,6 +4,7 @@ "lib": ["es5", "es6"], "outDir": "build/compiled", "allowSyntheticDefaultImports": true, + "esModuleInterop": true, "target": "es5", "module": "commonjs", "moduleResolution": "node", From ea6796fbf2eb799130db234133737b68f7ef461d Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Fri, 20 Mar 2020 23:18:57 +0200 Subject: [PATCH 4/5] fixup import --- test/github-issues/799/issue-799.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/github-issues/799/issue-799.ts b/test/github-issues/799/issue-799.ts index 13f15f3396..28152caff3 100644 --- a/test/github-issues/799/issue-799.ts +++ b/test/github-issues/799/issue-799.ts @@ -1,7 +1,7 @@ import "reflect-metadata"; import * as assert from "assert"; import {createConnection} from "../../../src/index"; -import * as rimraf from "rimraf"; +import rimraf from "rimraf"; import {dirname} from "path"; import {Connection} from "../../../src/connection/Connection"; From f6f240760dca5e017e65924da05ed2ee15a9ce69 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Fri, 20 Mar 2020 23:33:04 +0200 Subject: [PATCH 5/5] fixup indentation --- tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index e5fa3032af..4dafdb0c76 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,7 +4,7 @@ "lib": ["es5", "es6"], "outDir": "build/compiled", "allowSyntheticDefaultImports": true, - "esModuleInterop": true, + "esModuleInterop": true, "target": "es5", "module": "commonjs", "moduleResolution": "node",