Skip to content

Commit 388afec

Browse files
committed
Merge remote-tracking branch 'upstream/master' into update-core
2 parents e87e9e9 + 03c00ed commit 388afec

23 files changed

+48
-31
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# dependencies
2-
SQLITE_VERSION = 3.47.2
3-
MC_SQLITE_VERSION = 1.9.2
2+
SQLITE_VERSION = 3.50.1
3+
MC_SQLITE_VERSION = 2.1.3
44
SQLITE_TARBALL_URL = https://www.sqlite.org/src/tarball/sqlite.tar.gz?r=version-${SQLITE_VERSION}
55
MC_SQLITE_URL = https://github.com/utelle/SQLite3MultipleCiphers/releases/download/v${MC_SQLITE_VERSION}/sqlite3mc-${MC_SQLITE_VERSION}-sqlite-${SQLITE_VERSION}-amalgamation.zip
66
EXTENSION_FUNCTIONS = extension-functions.c
77
EXTENSION_FUNCTIONS_URL = https://www.sqlite.org/contrib/download/extension-functions.c?get=25
8-
EXTENSION_FUNCTIONS_SHA3 = ee39ddf5eaa21e1d0ebcbceeab42822dd0c4f82d8039ce173fd4814807faabfa
8+
EXTENSION_FUNCTIONS_SHA3 = 3f5872317c2f8d729aafc1e54c40768fe1214ad1bbbb601d2d432aaa13ebf64a
99

1010
# WA-SQLite source files
1111
CFILES = \

demo/hello/hello.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
// to use. Note that an asynchronous VFS requires an asynchronous build
55
// (Asyncify or JSPI). As of 2024-05-26, JSPI is only available behind
66
// a flag on Chromium browsers.
7-
// import SQLiteESMFactory from '../dist/wa-sqlite.mjs';
7+
// import SQLiteESMFactory from '../../dist/wa-sqlite.mjs';
88
import SQLiteESMFactory from '../../dist/wa-sqlite-async.mjs';
9-
// import SQLiteESMFactory from '../dist/wa-sqlite-jspi.mjs';
9+
// import SQLiteESMFactory from '../../dist/wa-sqlite-jspi.mjs';
1010

1111
// Uncomment one of the following imports to choose a VFS. Note that an
1212
// asynchronous VFS requires an asynchronous build, and an VFS using
@@ -19,11 +19,11 @@ import SQLiteESMFactory from '../../dist/wa-sqlite-async.mjs';
1919
// clear the appropriate storage for things to work.
2020
import { IDBBatchAtomicVFS as MyVFS } from '../../src/examples/IDBBatchAtomicVFS.js';
2121
// import { IDBMirrorVFS as MyVFS } from '../../src/examples/IDBMirrorVFS.js';
22-
// import { AccessHandlePoolVFS as MyVFS } from '../src/examples/AccessHandlePoolVFS.js';
23-
// import { OPFSAdaptiveVFS as MyVFS } from '../src/examples/OPFSAdaptiveVFS.js';
22+
// import { AccessHandlePoolVFS as MyVFS } from '../../src/examples/AccessHandlePoolVFS.js';
23+
// import { OPFSAdaptiveVFS as MyVFS } from '../../src/examples/OPFSAdaptiveVFS.js';
2424
// import { OPFSAnyContextVFS as MyVFS } from '../../src/examples/OPFSAnyContextVFS.js';
25-
// import { OPFSCoopSyncVFS as MyVFS } from '../src/examples/OPFSCoopSyncVFS.js';
26-
// import { OPFSPermutedVFS as MyVFS } from '../src/examples/OPFSPermutedVFS.js';
25+
// import { OPFSCoopSyncVFS as MyVFS } from '../../src/examples/OPFSCoopSyncVFS.js';
26+
// import { OPFSPermutedVFS as MyVFS } from '../../src/examples/OPFSPermutedVFS.js';
2727

2828
import * as SQLite from '../../src/sqlite-api.js';
2929

dist/mc-wa-sqlite-async.mjs

Lines changed: 1 addition & 2 deletions
Large diffs are not rendered by default.

dist/mc-wa-sqlite-async.wasm

329 KB
Binary file not shown.

dist/mc-wa-sqlite-jspi.mjs

Lines changed: 1 addition & 2 deletions
Large diffs are not rendered by default.

dist/mc-wa-sqlite-jspi.wasm

190 KB
Binary file not shown.

dist/mc-wa-sqlite.mjs

Lines changed: 1 addition & 2 deletions
Large diffs are not rendered by default.

dist/mc-wa-sqlite.wasm

190 KB
Binary file not shown.

dist/wa-sqlite-async-dynamic-main.mjs

Lines changed: 1 addition & 2 deletions
Large diffs are not rendered by default.
7.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)