From c65c08c198de546b566c0273896ef90fdd3a4f02 Mon Sep 17 00:00:00 2001 From: Roy Hashimoto Date: Mon, 23 Sep 2024 09:55:30 -0700 Subject: [PATCH 1/2] Change minimum Emscripten version to 3.1.61. --- .github/workflows/ci.yml | 2 +- Makefile | 6 +++--- README.md | 2 +- src/{asyncify_exports.json => jspi_exports.json} | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename src/{asyncify_exports.json => jspi_exports.json} (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b12aa20..9374cb3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: branches: [ "master" ] env: - EM_VERSION: 3.1.47 + EM_VERSION: 3.1.61 EM_CACHE_FOLDER: 'emsdk-cache' jobs: diff --git a/Makefile b/Makefile index b2cb756..a0376d1 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ vpath %.c deps/$(SQLITE_VERSION) EXPORTED_FUNCTIONS = src/exported_functions.json EXPORTED_RUNTIME_METHODS = src/extra_exported_runtime_methods.json ASYNCIFY_IMPORTS = src/asyncify_imports.json -ASYNCIFY_EXPORTS = src/asyncify_exports.json +JSPI_EXPORTS = src/jspi_exports.json # intermediate files OBJ_FILES_DEBUG = $(patsubst %.c,tmp/obj/debug/%.o,$(CFILES)) @@ -91,9 +91,9 @@ EMFLAGS_ASYNCIFY_DIST = \ -s ASYNCIFY_STACK_SIZE=16384 EMFLAGS_JSPI = \ - -s ASYNCIFY=2 \ + -s JSPI \ -s ASYNCIFY_IMPORTS=@src/asyncify_imports.json \ - -s ASYNCIFY_EXPORTS=@src/asyncify_exports.json + -s JSPI_EXPORTS=@src/jspi_exports.json # https://www.sqlite.org/compile.html WASQLITE_DEFINES = \ diff --git a/README.md b/README.md index d62bf29..15296c5 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you do want to build yourself, here are the prerequisites: * Building on Debian Linux is known to work, compatibility with other platforms is unknown. * `yarn` - If you use a different package manager (e.g. `npm`) then file paths in the demo will need adjustment. -* [Emscripten SDK](https://emscripten.org/docs/getting_started/downloads.html) 3.1.47+. +* [Emscripten SDK](https://emscripten.org/docs/getting_started/downloads.html) 3.1.61+. * `curl`, `make`, `openssl`, `sed`, `tclsh`, `unzip` Here are the build steps: diff --git a/src/asyncify_exports.json b/src/jspi_exports.json similarity index 100% rename from src/asyncify_exports.json rename to src/jspi_exports.json From c1a458cce52c4e11ac1fdeb3d18ca5187aab8235 Mon Sep 17 00:00:00 2001 From: Roy Hashimoto Date: Mon, 23 Sep 2024 10:05:34 -0700 Subject: [PATCH 2/2] Bump package version. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 17a004f..8cb2a27 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wa-sqlite", - "version": "1.0.2", + "version": "1.0.3", "type": "module", "main": "src/sqlite-api.js", "types": "src/types/index.d.ts",