New Wazero version that makes all commands work

jerbob92 · Apr 18, 2023 · e4a27c4 · e4a27c4
1 parent f3dc441
commit e4a27c4
Show file tree

Hide file tree

Showing 14 changed files with 448 additions and 128 deletions.
diff --git a/build/emscripten.patch b/build/emscripten.patch
diff --git a/go.mod b/go.mod
@@ -2,4 +2,4 @@ module github.com/jerbob92/xpdf-wasm
 
 go 1.20
 
-require github.com/tetratelabs/wazero v1.0.1 // indirect
+require github.com/tetratelabs/wazero v1.0.2
diff --git a/go.sum b/go.sum
@@ -1,4 +1,2 @@
-github.com/tetratelabs/wazero v1.0.0 h1:sCE9+mjFex95Ki6hdqwvhyF25x5WslADjDKIFU5BXzI=
-github.com/tetratelabs/wazero v1.0.0/go.mod h1:wYx2gNRg8/WihJfSDxA1TIL8H+GkfLYm+bIfbblu9VQ=
-github.com/tetratelabs/wazero v1.0.1 h1:xyWBoGyMjYekG3mEQ/W7xm9E05S89kJ/at696d/9yuc=
-github.com/tetratelabs/wazero v1.0.1/go.mod h1:wYx2gNRg8/WihJfSDxA1TIL8H+GkfLYm+bIfbblu9VQ=
+github.com/tetratelabs/wazero v1.0.2 h1:lpwL5zczFHk2mxKur98035Gig+Z3vd9JURk6lUdZxXY=
+github.com/tetratelabs/wazero v1.0.2/go.mod h1:wYx2gNRg8/WihJfSDxA1TIL8H+GkfLYm+bIfbblu9VQ=
diff --git a/imports/imports.go b/imports/imports.go
diff --git a/main.go b/main.go
@@ -12,10 +12,9 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/jerbob92/xpdf-wasm/imports"
-
 	"github.com/tetratelabs/wazero"
 	"github.com/tetratelabs/wazero/experimental"
+	"github.com/tetratelabs/wazero/experimental/emscripten"
 	"github.com/tetratelabs/wazero/experimental/logging"
 	"github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1"
 )
@@ -40,10 +39,6 @@ func main() {
 		log.Fatal(err)
 	}
 
-	if _, err := imports.Instantiate(ctx, wazeroRuntime); err != nil {
-		log.Fatal(err)
-	}
-
 	availableWASMFiles, err := wasmBinaries.ReadDir("wasm")
 	if err != nil {
 		log.Fatal(err)
@@ -83,6 +78,10 @@ func main() {
 		log.Fatal(err)
 	}
 
+	if _, err := emscripten.InstantiateForModule(ctx, wazeroRuntime, compiledModule); err != nil {
+		log.Fatal(err)
+	}
+
 	fsConfig := wazero.NewFSConfig()
 
 	// On Windows we mount the volume of the current working directory as

diff --git a/wasm/pdfdetach.wasm b/wasm/pdfdetach.wasm
diff --git a/wasm/pdffonts.wasm b/wasm/pdffonts.wasm
diff --git a/wasm/pdfimages.wasm b/wasm/pdfimages.wasm
diff --git a/wasm/pdfinfo.wasm b/wasm/pdfinfo.wasm
diff --git a/wasm/pdftohtml.wasm b/wasm/pdftohtml.wasm
diff --git a/wasm/pdftopng.wasm b/wasm/pdftopng.wasm
diff --git a/wasm/pdftoppm.wasm b/wasm/pdftoppm.wasm
diff --git a/wasm/pdftops.wasm b/wasm/pdftops.wasm
diff --git a/wasm/pdftotext.wasm b/wasm/pdftotext.wasm
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ module github.com/jerbob92/xpdf-wasm

		go 1.20

		require github.com/tetratelabs/wazero v1.0.1 // indirect
		require github.com/tetratelabs/wazero v1.0.2