Merge pull request #20 from powersync-ja/hotfix-036

powersync-sqlite-core 0.3.6

Author: rkistner

.changeset/brave-mirrors-beam.md

@@ -0,0 +1,5 @@
+---
+"@journeyapps/wa-sqlite": patch
+---
+
+Use powersync-sqlite-core 0.3.6 to fix dangling rows

Makefile

@@ -38,10 +38,7 @@ OBJ_FILES_DIST = $(patsubst %.c,tmp/obj/dist/%.o,$(CFILES))
 
 RS_LIB = powersync
 RS_LIB_DIR = ./powersync-sqlite-core
-RS_WASM_TGT = wasm32-unknown-emscripten
-RS_WASM_TGT_DIR = ${RS_LIB_DIR}/target/$(RS_WASM_TGT)
-RS_RELEASE_BC = $(RS_WASM_TGT_DIR)/wasm/deps/$(RS_LIB).bc
-RS_DEBUG_BC = $(RS_WASM_TGT_DIR)/debug/deps/$(RS_LIB).bc
+RS_RELEASE_LIB = $(RS_LIB_DIR)/target/wasm32-wasi/wasm/libpowersync.a
 
 # build options
 EMCC ?= emcc
@@ -166,15 +163,16 @@ tmp/obj/dist/%.o: %.c
 	mkdir -p tmp/obj/dist
 	$(EMCC) $(CFLAGS_DIST) $(WASQLITE_DEFINES) $^ -c -o $@
 
-$(RS_DEBUG_BC): FORCE
+$(RS_RELEASE_LIB): FORCE
 	mkdir -p tmp/bc/dist
 	cd $(RS_LIB_DIR); \
-	RUSTFLAGS="--emit=llvm-bc -C linker=/bin/true" cargo build -p powersync_loadable --profile wasm --no-default-features --features "powersync_core/static powersync_core/omit_load_extension sqlite_nostd/static sqlite_nostd/omit_load_extension" -Z build-std=panic_abort,core,alloc --target $(RS_WASM_TGT)
-
-$(RS_RELEASE_BC): FORCE
-	mkdir -p tmp/bc/dist
-	cd $(RS_LIB_DIR); \
-	RUSTFLAGS="--emit=llvm-bc -C linker=/bin/true" cargo build -p powersync_loadable --profile wasm --no-default-features --features "powersync_core/static powersync_core/omit_load_extension sqlite_nostd/static sqlite_nostd/omit_load_extension" -Z build-std=panic_abort,core,alloc --target $(RS_WASM_TGT)
+	cargo build \
+		-p powersync_loadable \
+		--profile wasm \
+		--no-default-features \
+		--features "powersync_core/static powersync_core/omit_load_extension sqlite_nostd/omit_load_extension" \
+		-Z build-std=panic_abort,core,alloc \
+		--target wasm32-wasi
 
 
 ## debug
@@ -185,22 +183,22 @@ clean-debug:
 .PHONY: debug
 debug: debug/wa-sqlite.mjs debug/wa-sqlite-async.mjs
 
-debug/wa-sqlite.mjs: $(OBJ_FILES_DEBUG) $(RS_DEBUG_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
+debug/wa-sqlite.mjs: $(OBJ_FILES_DEBUG) $(RS_RELEASE_LIB) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
 	mkdir -p debug
 	$(EMCC) $(EMFLAGS_DEBUG) \
 	  $(EMFLAGS_INTERFACES) \
 	  $(EMFLAGS_LIBRARIES) \
-		$(RS_WASM_TGT_DIR)/debug/deps/*.bc \
-	  $(OBJ_FILES_DEBUG) *.o -o $@
+		$(RS_RELEASE_LIB) \
+	  $(OBJ_FILES_DEBUG) -o $@
 
-debug/wa-sqlite-async.mjs: $(OBJ_FILES_DEBUG) $(RS_DEBUG_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
+debug/wa-sqlite-async.mjs: $(OBJ_FILES_DEBUG) $(RS_RELEASE_LIB) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
 	mkdir -p debug
 	$(EMCC) $(EMFLAGS_DEBUG) \
 	  $(EMFLAGS_INTERFACES) \
 	  $(EMFLAGS_LIBRARIES) \
 	  $(EMFLAGS_ASYNCIFY_DEBUG) \
-		$(RS_WASM_TGT_DIR)/debug/deps/*.bc \
-	  $(OBJ_FILES_DEBUG) *.o -o $@
+		$(RS_RELEASE_LIB) \
+	  $(OBJ_FILES_DEBUG) -o $@
 
 ## Debug FTS builds
 # .PHONY: debug
@@ -231,22 +229,22 @@ clean-dist:
 .PHONY: dist
 dist: dist/wa-sqlite.mjs dist/wa-sqlite-async.mjs
 
-dist/wa-sqlite.mjs: $(OBJ_FILES_DIST) $(RS_RELEASE_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
+dist/wa-sqlite.mjs: $(OBJ_FILES_DIST) $(RS_RELEASE_LIB) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
 	mkdir -p dist
 	$(EMCC) $(EMFLAGS_DIST) \
 	  $(EMFLAGS_INTERFACES) \
 	  $(EMFLAGS_LIBRARIES) \
-		$(RS_WASM_TGT_DIR)/wasm/deps/*.bc \
+		$(RS_RELEASE_LIB) \
 	  $(OBJ_FILES_DIST)  -o $@
 
-dist/wa-sqlite-async.mjs: $(OBJ_FILES_DIST) $(RS_RELEASE_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
+dist/wa-sqlite-async.mjs: $(OBJ_FILES_DIST) $(RS_RELEASE_LIB) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
 	mkdir -p dist
 	$(EMCC) $(EMFLAGS_DIST) \
 	  $(EMFLAGS_INTERFACES) \
 	  $(EMFLAGS_LIBRARIES) \
 	  $(EMFLAGS_ASYNCIFY_DIST) \
 		$(CFLAGS_DIST) \
-		$(RS_WASM_TGT_DIR)/wasm/deps/*.bc \
+		$(RS_RELEASE_LIB) \
 	  $(OBJ_FILES_DIST)  -o $@
 
 FORCE: ;