Merge remote-tracking branch 'upstream/master' into powersync_builds

Author: stevensJourney

.github/workflows/ci.yml

@@ -5,13 +5,13 @@ name: wa-sqlite CI
 
 on:
   push:
-    branches: ["master"]
+    branches: ['master']
   pull_request:
-    branches: ["master"]
+    branches: ['master']
 
 env:
   EM_VERSION: 3.1.64
-  EM_CACHE_FOLDER: "emsdk-cache"
+  EM_CACHE_FOLDER: 'emsdk-cache'
 
 jobs:
   build:
@@ -24,21 +24,21 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          submodules: "recursive"
+          submodules: 'recursive'
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
-          cache: "npm"
+          cache: 'npm'
 
       - uses: browser-actions/setup-chrome@v1
         id: setup-chrome
         with:
-          chrome-version: 121
+          chrome-version: 129
       - run: |
-            ${{ steps.setup-chrome.outputs.chrome-path }} --version
+          ${{ steps.setup-chrome.outputs.chrome-path }} --version
 
-      # Install yarn dependencies.
+        # Install yarn dependencies.
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
@@ -50,7 +50,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-
       - run: yarn install
-
       - name: Test with checked-in WASM files
         run: yarn test
 
@@ -61,7 +60,7 @@ jobs:
         with:
           path: ${{env.EM_CACHE_FOLDER}}
           key: ${{env.EM_VERSION}}-${{ runner.os }}
-      - uses: mymindstorm/setup-emsdk@v12
+      - uses: mymindstorm/setup-emsdk@v14
         with:
           version: ${{env.EM_VERSION}}
           actions-cache-folder: ${{env.EM_CACHE_FOLDER}}

Makefile

@@ -1,5 +1,5 @@
 # dependencies
-SQLITE_VERSION = version-3.46.0
+SQLITE_VERSION = version-3.47.0
 SQLITE_TARBALL_URL = https://www.sqlite.org/src/tarball/sqlite.tar.gz?r=${SQLITE_VERSION}
 
 EXTENSION_FUNCTIONS = extension-functions.c
@@ -13,6 +13,7 @@ CFILES = \
 	main.c \
 	libauthorizer.c \
 	libfunction.c \
+	libhook.c \
 	libprogress.c \
 	libvfs.c \
 	$(CFILES_EXTRA)
@@ -23,6 +24,7 @@ POWERSYNC_CFILES = \
 JSFILES = \
 	src/libauthorizer.js \
 	src/libfunction.js \
+	src/libhook.js \
 	src/libprogress.js \
 	src/libvfs.js
 
@@ -39,7 +41,7 @@ COMBINED_EXPORTED_FUNCTIONS = tmp/combined_exports.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))
@@ -102,6 +104,7 @@ EMFLAGS_LIBRARIES = \
 	--js-library src/libtableupdates.js \
 	--post-js src/libauthorizer.js \
 	--post-js src/libfunction.js \
+	--post-js src/libhook.js \
 	--post-js src/libprogress.js \
 	--post-js src/libvfs.js
 
@@ -118,9 +121,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 = \

README.md

@@ -21,7 +21,7 @@ If you do want to build - e.g. you want to change build flags, use a specific EM
 
 * 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: