Skip to content

Commit 108a88b

Browse files
committed
chore: update dependencies
1 parent 52e5649 commit 108a88b

File tree

7 files changed

+303
-68
lines changed

7 files changed

+303
-68
lines changed

.devcontainer/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
# BEGIN Standard MS Devcontainer for Typescript-Node
66

77
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.155.1/containers/typescript-node/.devcontainer/base.Dockerfile
8-
# [Choice] Node.js version: 14, 12, 10
9-
ARG VARIANT="22-bullseye"
10-
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:1-${VARIANT}
8+
# Tags: https://mcr.microsoft.com/en-us/artifact/mar/devcontainers/typescript-node/tags
9+
# [Choice] Node.js version: 18, 20, 22
10+
ARG VARIANT="22-bookworm"
11+
FROM mcr.microsoft.com/devcontainers/typescript-node:2-${VARIANT}
1112

1213
# [Optional] Uncomment if you want to install an additional version of node using nvm
1314
# ARG EXTRA_NODE_VERSION=10
@@ -24,9 +25,9 @@ FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:1-${VARIANT}
2425
# Install EMSDK to /emsdk just like the EMSDK Dockerfile: https://github.com/emscripten-core/emsdk/blob/master/docker/Dockerfile
2526
ENV EMSDK /emsdk
2627
# We pin the EMSDK version rather than 'latest' so that everyone is using the same compiler version
27-
ENV EMSCRIPTEN_VERSION 4.0.5
28+
ENV EMSCRIPTEN_VERSION 4.0.13
2829

29-
RUN git clone https://github.com/emscripten-core/emsdk.git $EMSDK
30+
RUN git clone --depth=1 https://github.com/emscripten-core/emsdk.git $EMSDK
3031

3132
RUN echo "## Install Emscripten" \
3233
&& cd ${EMSDK} \

.github/dependabot.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: devcontainers
4+
directory: /
5+
schedule:
6+
interval: weekly
7+
- package-ecosystem: docker
8+
directory: .devcontainer
9+
schedule:
10+
interval: weekly
11+
- package-ecosystem: github-actions
12+
directory: /
13+
schedule:
14+
interval: weekly
15+
- package-ecosystem: npm
16+
directory: /
17+
schedule:
18+
interval: weekly

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
build:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4
9+
- uses: actions/checkout@v5
1010
- name: make
1111
uses: ./.github/actions/build-sqljs
1212
- uses: actions/upload-artifact@v4

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Create a release
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
- name: make
1616
uses: ./.github/actions/build-sqljs
1717
- name: Create Release

Makefile

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
# Note: Last built with version 2.0.15 of Emscripten
2-
3-
# TODO: Emit a file showing which version of emcc and SQLite was used to compile the emitted output.
41
# TODO: Create a release on Github with these compiled assets rather than checking them in
52
# TODO: Consider creating different files based on browser vs module usage: https://github.com/vuejs/vue/tree/dev/dist
63

74
# I got this handy makefile syntax from : https://github.com/mandel59/sqlite-wasm (MIT License) Credited in LICENSE
85
# To use another version of Sqlite, visit https://www.sqlite.org/download.html and copy the appropriate values here:
9-
SQLITE_AMALGAMATION = sqlite-amalgamation-3490100
10-
SQLITE_AMALGAMATION_ZIP_URL = https://sqlite.org/2025/sqlite-amalgamation-3490100.zip
11-
SQLITE_AMALGAMATION_ZIP_SHA3 = e7eb4cfb2d95626e782cfa748f534c74482f2c3c93f13ee828b9187ce05b2da7
6+
SQLITE_AMALGAMATION = sqlite-amalgamation-3500400
7+
SQLITE_AMALGAMATION_ZIP_URL = https://sqlite.org/2025/sqlite-amalgamation-3500400.zip
8+
SQLITE_AMALGAMATION_ZIP_SHA3 = f131b68e6ba5fb891cc13ebb5ff9555054c77294cb92d8d1268bad5dba4fa2a1
129

1310
# Note that extension-functions.c hasn't been updated since 2010-02-06, so likely doesn't need to be updated
1411
EXTENSION_FUNCTIONS = extension-functions.c
@@ -146,6 +143,8 @@ out/sqlite3.o: sqlite-src/$(SQLITE_AMALGAMATION)
146143
mkdir -p out
147144
# Generate llvm bitcode
148145
$(EMCC) $(SQLITE_COMPILATION_FLAGS) -c sqlite-src/$(SQLITE_AMALGAMATION)/sqlite3.c -o $@
146+
$(EMCC) --version | grep '^emcc ' | awk '{gsub(/-git$/, ""); print $NF}' | echo Emscripten > out/versions.txt
147+
grep '#define SQLITE_VERSION' sqlite-src/$(SQLITE_AMALGAMATION)/sqlite3.h | awk -F'"' '{print $2}' | xargs echo SQLite >> out/versions.txt
149148

150149
# Since the extension-functions.c includes other headers in the sqlite_amalgamation, we declare that this depends on more than just extension-functions.c
151150
out/extension-functions.o: sqlite-src/$(SQLITE_AMALGAMATION)
@@ -173,7 +172,7 @@ sqlite-src: sqlite-src/$(SQLITE_AMALGAMATION) sqlite-src/$(SQLITE_AMALGAMATION)/
173172
sqlite-src/$(SQLITE_AMALGAMATION): cache/$(SQLITE_AMALGAMATION).zip sqlite-src/$(SQLITE_AMALGAMATION)/$(EXTENSION_FUNCTIONS)
174173
mkdir -p sqlite-src/$(SQLITE_AMALGAMATION)
175174
echo '$(SQLITE_AMALGAMATION_ZIP_SHA3) ./cache/$(SQLITE_AMALGAMATION).zip' > cache/check.txt
176-
sha3sum -a 256 -c cache/check.txt
175+
sha256sum -c cache/check.txt
177176
# We don't delete the sqlite_amalgamation folder. That's a job for clean
178177
# Also, the extension functions get copied here, and if we get the order of these steps wrong,
179178
# this step could remove the extension functions, and that's not what we want
@@ -187,6 +186,10 @@ sqlite-src/$(SQLITE_AMALGAMATION)/$(EXTENSION_FUNCTIONS): cache/$(EXTENSION_FUNC
187186
cp 'cache/$(EXTENSION_FUNCTIONS)' $@
188187

189188

189+
.PHONY: ci
190+
ci: all
191+
npm ci && npm test
192+
190193
.PHONY: clean
191194
clean:
192195
rm -f out/* dist/* cache/*

0 commit comments

Comments
 (0)