From 1b8388c8bdd60963add0c329d09da89dfbfb366f Mon Sep 17 00:00:00 2001 From: Martin Fredriksson Date: Fri, 16 Oct 2020 06:39:21 +0200 Subject: [PATCH 1/6] Fix for illegal Imports.env with a type conflict to the indexer in index.d.ts of the loader. --- lib/loader/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/loader/index.d.ts b/lib/loader/index.d.ts index bc6854277a..9ca407fd8c 100644 --- a/lib/loader/index.d.ts +++ b/lib/loader/index.d.ts @@ -8,7 +8,7 @@ export interface ResultObject { /** WebAssembly imports with an optional env object and two levels of nesting. */ export type Imports = { - [key: string]: Record; + [key: string]: Record | any; /** env?: {} not allowed without the '| any' */ env?: { memory?: WebAssembly.Memory; table?: WebAssembly.Table; From b260be70d9782f289ed9cee3d696981de442419c Mon Sep 17 00:00:00 2001 From: Martin Fredriksson Date: Fri, 16 Oct 2020 12:54:57 +0200 Subject: [PATCH 2/6] Changed to Imports[key: string]: Record|undefined --- lib/loader/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/loader/index.d.ts b/lib/loader/index.d.ts index 9ca407fd8c..0dec81992a 100644 --- a/lib/loader/index.d.ts +++ b/lib/loader/index.d.ts @@ -8,7 +8,7 @@ export interface ResultObject { /** WebAssembly imports with an optional env object and two levels of nesting. */ export type Imports = { - [key: string]: Record | any; /** env?: {} not allowed without the '| any' */ + [key: string]: Record | undefined; /** env?: {} not allowed without the '| undefined' anymore */ env?: { memory?: WebAssembly.Memory; table?: WebAssembly.Table; From d46f7e66329a8e6cc49c50500e4235c940affe7f Mon Sep 17 00:00:00 2001 From: Martin Fredriksson Date: Fri, 16 Oct 2020 13:07:44 +0200 Subject: [PATCH 3/6] Removed unnecessary comment. --- lib/loader/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/loader/index.d.ts b/lib/loader/index.d.ts index 0dec81992a..21a8fdb4be 100644 --- a/lib/loader/index.d.ts +++ b/lib/loader/index.d.ts @@ -8,7 +8,7 @@ export interface ResultObject { /** WebAssembly imports with an optional env object and two levels of nesting. */ export type Imports = { - [key: string]: Record | undefined; /** env?: {} not allowed without the '| undefined' anymore */ + [key: string]: Record | undefined; env?: { memory?: WebAssembly.Memory; table?: WebAssembly.Table; From d20481e3e65c121826b1b4e2c647881489b78475 Mon Sep 17 00:00:00 2001 From: Martin Fredriksson Date: Fri, 16 Oct 2020 13:16:07 +0200 Subject: [PATCH 4/6] Added myself to the NOTICE file. --- NOTICE | 1 + 1 file changed, 1 insertion(+) diff --git a/NOTICE b/NOTICE index 4f822817e5..52cb6f690e 100644 --- a/NOTICE +++ b/NOTICE @@ -28,6 +28,7 @@ under the licensing terms detailed in LICENSE: * Maël Nison * Valeria Viana Gusmao * Gabor Greif +* Martin Fredriksson Portions of this software are derived from third-party works licensed under the following terms: From f4d800ddc9d88d2826b3c77a2a11287a05d1403c Mon Sep 17 00:00:00 2001 From: Martin Fredriksson Date: Fri, 16 Oct 2020 13:16:46 +0200 Subject: [PATCH 5/6] Added myself to the NOTICE file. --- NOTICE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index 52cb6f690e..2a6c9f2cca 100644 --- a/NOTICE +++ b/NOTICE @@ -28,7 +28,7 @@ under the licensing terms detailed in LICENSE: * Maël Nison * Valeria Viana Gusmao * Gabor Greif -* Martin Fredriksson +* Martin Fredriksson Portions of this software are derived from third-party works licensed under the following terms: From 4a1e63d27dc5282c5ae36f4ac11f18e2c2a63cf9 Mon Sep 17 00:00:00 2001 From: Martin Fredriksson Date: Fri, 16 Oct 2020 13:22:34 +0200 Subject: [PATCH 6/6] Changed me to another email address. --- NOTICE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index 2a6c9f2cca..e43810f24e 100644 --- a/NOTICE +++ b/NOTICE @@ -28,7 +28,7 @@ under the licensing terms detailed in LICENSE: * Maël Nison * Valeria Viana Gusmao * Gabor Greif -* Martin Fredriksson +* Martin Fredriksson Portions of this software are derived from third-party works licensed under the following terms: