diff --git a/Dockerfile b/Dockerfile index 5c049a408..42db28156 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,7 @@ RUN \ --no-modify-path \ --profile minimal \ --target wasm32-unknown-emscripten \ - --default-toolchain nightly-2024-02-10 \ + --default-toolchain nightly-2024-02-16 \ --component rust-src # Cache settings diff --git a/build.sh b/build.sh index 97bcba659..7fdb43985 100755 --- a/build.sh +++ b/build.sh @@ -162,8 +162,8 @@ export RUSTFLAGS+=" --remap-path-prefix=$DEPS/=" # Dependency version numbers VERSION_ZLIB_NG=2.1.6 # https://github.com/zlib-ng/zlib-ng -VERSION_FFI=3.4.4 # https://github.com/libffi/libffi -VERSION_GLIB=2.79.1 # https://gitlab.gnome.org/GNOME/glib +VERSION_FFI=3.4.5 # https://github.com/libffi/libffi +VERSION_GLIB=2.79.2 # https://gitlab.gnome.org/GNOME/glib VERSION_EXPAT=2.6.0 # https://github.com/libexpat/libexpat VERSION_EXIF=0.6.24 # https://github.com/libexif/libexif VERSION_LCMS2=2.16 # https://github.com/mm2/Little-CMS @@ -255,9 +255,8 @@ node --version mkdir $DEPS/ffi curl -Ls https://github.com/libffi/libffi/releases/download/v$VERSION_FFI/libffi-$VERSION_FFI.tar.gz | tar xzC $DEPS/ffi --strip-components=1 cd $DEPS/ffi - # TODO(kleisauke): Wait for upstream release with PR https://github.com/libffi/libffi/pull/763 included - curl -Ls https://github.com/libffi/libffi/compare/v$VERSION_FFI...kleisauke:wasm-vips${ENABLE_WASM_BIGINT:+-bigint}.patch | patch -p1 - autoreconf -fiv + # TODO(kleisauke): Discuss this patch upstream + curl -Ls https://github.com/libffi/libffi/compare/v$VERSION_FFI...kleisauke:cleanup${ENABLE_WASM_BIGINT:+-bigint}.patch | patch -p1 # Compile without -fexceptions sed -i 's/ -fexceptions//g' configure emconfigure ./configure --host=$CHOST --prefix=$TARGET --enable-static --disable-shared --disable-dependency-tracking \ diff --git a/playground/package.json b/playground/package.json index bbbbe2eb7..5eb5bd172 100644 --- a/playground/package.json +++ b/playground/package.json @@ -29,8 +29,8 @@ "monaco-editor": "^0.46.0", "monaco-editor-webpack-plugin": "^7.1.0", "terser-webpack-plugin": "^5.3.10", - "webpack": "^5.90.1", + "webpack": "^5.90.2", "webpack-cli": "^5.1.4", - "webpack-dev-server": "^4.15.1" + "webpack-dev-server": "^5.0.2" } } diff --git a/test/unit/index.html b/test/unit/index.html index 5f1f20861..5bebd6dca 100644 --- a/test/unit/index.html +++ b/test/unit/index.html @@ -96,7 +96,7 @@ import * as Helpers from './helpers.js'; // FIXME(kleisauke): https://github.com/cdnjs/packages/issues/1748 - import { expect } from 'https://cdnjs.cloudflare.com/ajax/libs/chai/5.0.3/chai.js'; + import { expect } from 'https://cdnjs.cloudflare.com/ajax/libs/chai/5.1.0/chai.js'; // Global variables used throughout the unit tests globalThis.expect = expect; diff --git a/test/unit/package.json b/test/unit/package.json index 618cb93c6..f21cac037 100644 --- a/test/unit/package.json +++ b/test/unit/package.json @@ -19,7 +19,7 @@ "test": "mocha -s 5000 -t 120000 *.js -r node-helper.js" }, "devDependencies": { - "chai": "^5.0.3", + "chai": "^5.1.0", "mocha": "^10.3.0" }, "engines": {