Skip to content

Commit 73496ff

Browse files
authored
Update SQLite and Emscripten (#560)
* update emscripten to latest version * update sqlite * fix compiler warnings * closure changes * update lockfile * fix missing exports
1 parent 010fb42 commit 73496ff

File tree

6 files changed

+3901
-313
lines changed

6 files changed

+3901
-313
lines changed

.devcontainer/Dockerfile

+11-43
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.155.1/containers/typescript-node/.devcontainer/base.Dockerfile
88
# [Choice] Node.js version: 14, 12, 10
9-
ARG VARIANT="14-buster"
9+
ARG VARIANT="16-buster"
1010
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT}
1111

1212
# [Optional] Uncomment if you want to install an additional version of node using nvm
@@ -24,7 +24,7 @@ FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT}
2424
# Install EMSDK to /emsdk just like the EMSDK Dockerfile: https://github.com/emscripten-core/emsdk/blob/master/docker/Dockerfile
2525
ENV EMSDK /emsdk
2626
# We pin the EMSDK version rather than 'latest' so that everyone is using the same compiler version
27-
ENV EMSCRIPTEN_VERSION 3.1.20
27+
ENV EMSCRIPTEN_VERSION 3.1.49
2828

2929
RUN git clone https://github.com/emscripten-core/emsdk.git $EMSDK
3030

@@ -85,47 +85,15 @@ RUN echo 'export EM_NODE_JS="$EMSDK_NODE"' >> /etc/bash.bashrc
8585
# List taken from:
8686
# https://github.com/puppeteer/puppeteer/blob/main/docs/troubleshooting.md#chrome-headless-doesnt-launch-on-unix
8787
RUN apt-get update \
88-
&& apt-get install -y \
89-
ca-certificates \
90-
fonts-liberation \
91-
libappindicator3-1 \
92-
libasound2 \
93-
libatk-bridge2.0-0 \
94-
libatk1.0-0 \
95-
libc6 \
96-
libcairo2 \
97-
libcups2 \
98-
libdbus-1-3 \
99-
libexpat1 \
100-
libfontconfig1 \
101-
libgbm1 \
102-
libgcc1 \
103-
libglib2.0-0 \
104-
libgtk-3-0 \
105-
libnspr4 \
106-
libnss3 \
107-
libpango-1.0-0 \
108-
libpangocairo-1.0-0 \
109-
libstdc++6 \
110-
libx11-6 \
111-
libx11-xcb1 \
112-
libxcb1 \
113-
libxcomposite1 \
114-
libxcursor1 \
115-
libxdamage1 \
116-
libxext6 \
117-
libxfixes3 \
118-
libxi6 \
119-
libxrandr2 \
120-
libxrender1 \
121-
libxss1 \
122-
libxtst6 \
123-
lsb-release \
124-
wget \
125-
xdg-utils
126-
127-
# Installs the command "sha3sum", which is used check the download integrity of sqlite source.
128-
RUN apt-get install -y libdigest-sha3-perl
88+
&& apt-get install -y wget gnupg \
89+
&& wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
90+
&& sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
91+
&& apt-get update \
92+
&& apt-get install -y google-chrome-stable fonts-freefont-ttf libxss1 libxshmfence1 libglu1 \
93+
--no-install-recommends \
94+
# Installs the command "sha3sum", which is used check the download integrity of sqlite source.
95+
&& apt-get install -y libdigest-sha3-perl \
96+
&& rm -rf /var/lib/apt/lists/*
12997

13098
# We set this env variable (RUN_WORKER_TEST_WITHOUT_PUPPETEER_SANDBOX=1) this to tell our sql.js test harness to run Puppeteer without the sandbox.
13199
# Otherwise, when we instantiate Puppeteer, we get this error:

.devcontainer/devcontainer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"name": "Node.js & TypeScript",
55
"build": {
66
"dockerfile": "Dockerfile",
7-
// Update 'VARIANT' to pick a Node version: 10, 12, 14
7+
// Update 'VARIANT' to pick a Node version: 12, 14, 16
88
"args": {
9-
"VARIANT": "14-buster"
9+
"VARIANT": "16-buster"
1010
},
1111
},
1212
// Set *default* container specific settings.json values on container create.

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
# I got this handy makefile syntax from : https://github.com/mandel59/sqlite-wasm (MIT License) Credited in LICENSE
88
# To use another version of Sqlite, visit https://www.sqlite.org/download.html and copy the appropriate values here:
9-
SQLITE_AMALGAMATION = sqlite-amalgamation-3390300
10-
SQLITE_AMALGAMATION_ZIP_URL = https://www.sqlite.org/2022/sqlite-amalgamation-3390300.zip
11-
SQLITE_AMALGAMATION_ZIP_SHA3 = 6a83b7da4b73d7148364a0033632ae1e4f9d647417e6f3654a5d0afe8424bbb9
9+
SQLITE_AMALGAMATION = sqlite-amalgamation-3440200
10+
SQLITE_AMALGAMATION_ZIP_URL = https://www.sqlite.org/2023/sqlite-amalgamation-3440200.zip
11+
SQLITE_AMALGAMATION_ZIP_SHA3 = 9df894eb2297c08ab2dd0d85d7bcdc3fd78b8c80f22c91789a714bdf3351961e
1212

1313
# Note that extension-functions.c hasn't been updated since 2010-02-06, so likely doesn't need to be updated
1414
EXTENSION_FUNCTIONS = extension-functions.c

0 commit comments

Comments
 (0)