build(cargo): adjust features

vercel · Sep 15, 2023 · c1a01b3 · c1a01b3
1 parent 7f6e2d3
commit c1a01b3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -156,7 +156,7 @@ jobs:
             build: >-
               set -e &&
               apt update &&
-              apt install -y pkg-config xz-utils &&
+              apt install -y pkg-config xz-utils dav1d libdav1d-dev &&
               rustup toolchain install "${RUST_TOOLCHAIN}" &&
               rustup default "${RUST_TOOLCHAIN}" &&
               rustup target add x86_64-unknown-linux-gnu &&
@@ -177,7 +177,7 @@ jobs:
             build: >-
               set -e &&
               apk update &&
-              apk add --no-cache libc6-compat pkgconfig &&
+              apk add --no-cache libc6-compat pkgconfig dav1d libdav1d dav1d-dev &&
               rustup toolchain install "${RUST_TOOLCHAIN}" &&
               rustup default "${RUST_TOOLCHAIN}" &&
               rustup target add x86_64-unknown-linux-musl &&
@@ -196,7 +196,7 @@ jobs:
             build: >-
               set -e &&
               apt update &&
-              apt install -y pkg-config xz-utils &&
+              apt install -y pkg-config xz-utils dav1d libdav1d-dev &&
               export JEMALLOC_SYS_WITH_LG_PAGE=16 &&
               rustup toolchain install "${RUST_TOOLCHAIN}" &&
               rustup default "${RUST_TOOLCHAIN}" &&
@@ -218,7 +218,7 @@ jobs:
             build: >-
               set -e &&
               apk update &&
-              apk add --no-cache libc6-compat pkgconfig &&
+              apk add --no-cache libc6-compat pkgconfig dav1d libdav1d dav1d-dev &&
               export JEMALLOC_SYS_WITH_LG_PAGE=16 &&
               npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" &&
               rustup toolchain install "${RUST_TOOLCHAIN}" &&

diff --git a/packages/next-swc/crates/napi/Cargo.toml b/packages/next-swc/crates/napi/Cargo.toml
@@ -21,6 +21,13 @@ native-tls = ["next-dev/native-tls"]
 rustls-tls = ["next-dev/rustls-tls"]
 serializable = ["next-dev/serializable"]
 image-webp = ["next-core/image-webp"]
+image-avif = ["next-core/image-avif"]
+# Enable all the available image codec support.
+# Currently this is identical to `image-webp`, as we are not able to build
+# other codecs easily yet.
+image-extended = [
+  "image-webp",
+]
 
 # Enable dhat profiling allocator for heap profiling.
 __internal_dhat-heap = ["dhat"]

diff --git a/packages/next-swc/crates/next-core/src/next_shared/transforms/mod.rs b/packages/next-swc/crates/next-core/src/next_shared/transforms/mod.rs
@@ -36,10 +36,14 @@ pub fn get_next_image_rule() -> ModuleRule {
     ];
 
     #[cfg(feature = "image-webp")]
-    resources.push(ModuleRuleCondition::ResourcePathEndsWith(".webp".to_string()));
+    resources.push(ModuleRuleCondition::ResourcePathEndsWith(
+        ".webp".to_string(),
+    ));
 
     #[cfg(feature = "image-avif")]
-    resources.push(ModuleRuleCondition::ResourcePathEndsWith(".avif".to_string()));
+    resources.push(ModuleRuleCondition::ResourcePathEndsWith(
+        ".avif".to_string(),
+    ));
 
     ModuleRule::new(
         ModuleRuleCondition::any(resources),

diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
@@ -4,8 +4,8 @@
   "private": true,
   "scripts": {
     "clean": "node ../../scripts/rm.mjs native",
-    "build-native": "napi build --platform -p next-swc-napi --cargo-cwd ../../ --cargo-name next_swc_napi --features plugin,rustls-tls,image-webp --js false native",
-    "build-native-release": "napi build --platform -p next-swc-napi --cargo-cwd ../../ --cargo-name next_swc_napi --release --features plugin,rustls-tls,image-webp,tracing/release_max_level_info --js false native",
+    "build-native": "napi build --platform -p next-swc-napi --cargo-cwd ../../ --cargo-name next_swc_napi --features plugin,rustls-tls,image-extended --js false native",
+    "build-native-release": "napi build --platform -p next-swc-napi --cargo-cwd ../../ --cargo-name next_swc_napi --release --features plugin,rustls-tls,image-extended,tracing/release_max_level_info --js false native",
     "build-native-no-plugin": "napi build --platform -p next-swc-napi --cargo-cwd ../../ --cargo-name next_swc_napi --features image-webp --js false native",
     "build-native-no-plugin-woa": "napi build --platform -p next-swc-napi --cargo-cwd ../../ --cargo-name next_swc_napi --cargo-flags=--no-default-features --features native-tls,image-webp --js false native",
     "build-native-no-plugin-woa-release": "napi build --platform -p next-swc-napi --cargo-cwd ../../ --cargo-name next_swc_napi --release --cargo-flags=--no-default-features --features native-tls,image-webp,tracing/release_max_level_info --js false native",