Skip to content

Commit 0171fd4

Browse files
committed
Merge branch 'develop'
2 parents 532a132 + b2448e1 commit 0171fd4

29 files changed

+2467
-9745
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ jobs:
327327
retention-days: 1
328328
overwrite: true
329329

330-
Jest:
330+
Vitest:
331331
needs: [WASM]
332332
timeout-minutes: 10
333333
runs-on: ubuntu-24.04
@@ -350,4 +350,4 @@ jobs:
350350
run: npm ci
351351

352352
- name: Run jest tests
353-
run: npm test -- --ci --reporters=default --reporters=jest-junit --noStackTrace
353+
run: npm test

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
RM=rm -f
22
CFLAGS=-I./dist/include -I./dist/include/libxml2
3-
LDFLAGS=-O2 -fwasm-exceptions -s USE_ZLIB=1 -s USE_FREETYPE=1 -s USE_LIBPNG=1 -s USE_LIBJPEG=1 -s ENVIRONMENT='worker' -s MODULARIZE=1 -s ALLOW_MEMORY_GROWTH=1 -s 'EXPORTED_RUNTIME_METHODS=["cwrap", "FS"]' -s ERROR_ON_UNDEFINED_SYMBOLS=0
3+
LDFLAGS=-O2 -fwasm-exceptions -s USE_ZLIB=1 -s USE_FREETYPE=1 -s USE_LIBPNG=1 -s USE_LIBJPEG=1 -s ENVIRONMENT='worker' -s EXPORT_ES6=1 -s ALLOW_MEMORY_GROWTH=1 -s 'EXPORTED_RUNTIME_METHODS=["cwrap", "FS"]' -s ERROR_ON_UNDEFINED_SYMBOLS=0
44
LDLIBS=-lmapserver -lxml2 -lproj -lgdal -lsqlite3 -lgeos -lgeos_c -L./dist/lib
55

66
SRCS=src/bindings.c

demo/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@
1616

1717
<body>
1818
<div id="map"/>
19+
<script type="module" src="src/index.js"></script>
1920
</body>
2021
</html>

0 commit comments

Comments
 (0)