Update dependencies

kleisauke · Dec 14, 2024 · 42c869f · 42c869f
1 parent 2699f7d
commit 42c869f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -33,7 +33,7 @@ RUN \
     --no-modify-path \
     --profile minimal \
     --target wasm32-unknown-emscripten \
-    --default-toolchain nightly-2024-11-29 \
+    --default-toolchain nightly-2024-12-14 \
     --component rust-src
 
 # Cache settings

diff --git a/build.sh b/build.sh
@@ -179,7 +179,7 @@ export RUSTFLAGS+=" --remap-path-prefix=$DEPS/="
 # Dependency version numbers
 VERSION_ZLIB_NG=2.2.2       # https://github.com/zlib-ng/zlib-ng
 VERSION_FFI=3.4.6           # https://github.com/libffi/libffi
-VERSION_GLIB=2.83.0         # https://gitlab.gnome.org/GNOME/glib
+VERSION_GLIB=2.83.2         # https://gitlab.gnome.org/GNOME/glib
 VERSION_EXPAT=2.6.4         # 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
@@ -304,6 +304,10 @@ node --version
   mkdir $DEPS/exif
   curl -Ls https://github.com/libexif/libexif/releases/download/v$VERSION_EXIF/libexif-$VERSION_EXIF.tar.bz2 | tar xjC $DEPS/exif --strip-components=1
   cd $DEPS/exif
+  # https://github.com/libexif/libexif/pull/147
+  curl -Ls https://github.com/libexif/libexif/commit/00ee559ac8293c6ab9b0b4d26d3650ec89d2b1fc.patch | patch -p1
+  # https://github.com/libexif/libexif/pull/183
+  curl -Ls https://github.com/lovell/libexif/commit/ef0887f2635180d1e7197c92756d1dc0243f9a35.patch | patch -p1
   emconfigure ./configure --host=$CHOST --prefix=$TARGET --enable-static --disable-shared --disable-dependency-tracking \
     --disable-docs --disable-nls --without-libiconv-prefix --without-libintl-prefix CPPFLAGS="-DNO_VERBOSE_TAG_DATA"
   make install doc_DATA=
@@ -447,13 +451,8 @@ node --version
   # Vendor dir doesn't work with -Zbuild-std due to https://github.com/rust-lang/wg-cargo-std-aware/issues/23
   # Just delete the config so that all deps are downloaded from the internet
   rm .cargo/config
+  # Update and regenerate the lockfile for zune-jpeg
   # https://github.com/etemesi254/zune-image/pull/242
-  # https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html#the-patch-section
-  cat >> Cargo.toml <<EOL
-[patch.crates-io]
-zune-jpeg = { git = "https://github.com/etemesi254/zune-image.git", rev = "80e1957" }
-EOL
-  # Regenerate the lockfile for zune-jpeg
   cargo update zune-jpeg
   # We don't want to build the shared library
   sed -i '/^crate-type =/s/"cdylib", //' crates/c-api/Cargo.toml

diff --git a/playground/package.json b/playground/package.json
@@ -26,11 +26,11 @@
     "fflate": "^0.8.2",
     "html-webpack-plugin": "^5.6.3",
     "mini-css-extract-plugin": "^2.9.2",
-    "monaco-editor": "^0.52.0",
+    "monaco-editor": "^0.52.2",
     "monaco-editor-webpack-plugin": "^7.1.0",
-    "terser-webpack-plugin": "^5.3.10",
-    "webpack": "^5.96.1",
+    "terser-webpack-plugin": "^5.3.11",
+    "webpack": "^5.97.1",
     "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^5.1.0"
+    "webpack-dev-server": "^5.2.0"
   }
 }
diff --git a/test/unit/index.html b/test/unit/index.html
@@ -5,7 +5,7 @@
   <title>wasm-vips testsuite</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <!-- FIXME(kleisauke): https://github.com/cdnjs/tools/issues/285 -->
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mocha/10.8.2/mocha.css" crossorigin="anonymous">
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mocha/11.0.2/mocha.css" crossorigin="anonymous">
   <style>
     html,
     body {
@@ -14,6 +14,10 @@
       margin: 0;
     }
 
+    :root {
+      --mocha-test-pass-color: forestgreen;
+    }
+
     #mocha-stats {
       font-size: initial;
     }
@@ -44,13 +48,11 @@
     #mocha .test.pass::before {
       content: '\2714';
       font-size: initial;
-      color: forestgreen;
     }
 
     #mocha .test.pending::before {
       content: '\25CF';
       font-size: initial;
-      color: var(--mocha-test-pending-color);
     }
 
     #mocha .test.pending:hover h2::after {
@@ -64,7 +66,7 @@
 </head>
 <body>
 <div id="mocha"></div>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/10.7.3/mocha.min.js" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/11.0.2/mocha.min.js" crossorigin="anonymous"></script>
 <script class="mocha-init">
   mocha.setup({
     ui: 'bdd',

diff --git a/test/unit/package.json b/test/unit/package.json
@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "chai": "^5.1.2",
-    "mocha": "^10.8.2"
+    "mocha": "^11.0.1"
   },
   "engines": {
     "node": ">=16.4.0"