From 1cd739b444732e61b51acfab6fe557fddd4e0d63 Mon Sep 17 00:00:00 2001 From: OJ Kwon <1210596+kwonoj@users.noreply.github.com> Date: Fri, 15 Sep 2023 14:42:50 -0700 Subject: [PATCH 1/2] test(utils): update error overlay lookup --- test/lib/next-test-utils.ts | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/test/lib/next-test-utils.ts b/test/lib/next-test-utils.ts index b55e97a125ea2..8e11e6e417e60 100644 --- a/test/lib/next-test-utils.ts +++ b/test/lib/next-test-utils.ts @@ -781,28 +781,15 @@ export async function hasRedbox(browser: BrowserInterface, expected = true) { export async function getRedboxHeader(browser: BrowserInterface) { return retry( () => { - if (shouldRunTurboDevTest()) { - return evaluate(browser, () => { - const portal = [].slice - .call(document.querySelectorAll('nextjs-portal')) - .find((p) => - p.shadowRoot.querySelector('[data-nextjs-turbo-dialog-body]') - ) - const root = portal?.shadowRoot - return root?.querySelector('[data-nextjs-turbo-dialog-body]') - ?.innerText - }) - } else { - return evaluate(browser, () => { - const portal = [].slice - .call(document.querySelectorAll('nextjs-portal')) - .find((p) => - p.shadowRoot.querySelector('[data-nextjs-dialog-header]') - ) - const root = portal?.shadowRoot - return root?.querySelector('[data-nextjs-dialog-header]')?.innerText - }) - } + return evaluate(browser, () => { + const portal = [].slice + .call(document.querySelectorAll('nextjs-portal')) + .find((p) => + p.shadowRoot.querySelector('[data-nextjs-dialog-header]') + ) + const root = portal?.shadowRoot + return root?.querySelector('[data-nextjs-dialog-header]')?.innerText + }) }, 10000, 500, From 27283b4559631a145941b37e411be96d37175dd7 Mon Sep 17 00:00:00 2001 From: OJ Kwon <1210596+kwonoj@users.noreply.github.com> Date: Mon, 18 Sep 2023 09:56:08 -0700 Subject: [PATCH 2/2] fix(next-core): enable supported img extensions --- .github/workflows/build_and_deploy.yml | 8 ++++---- packages/next-swc/crates/napi/Cargo.toml | 7 +++++++ packages/next-swc/crates/next-core/Cargo.toml | 1 + .../crates/next-core/src/next_shared/transforms/mod.rs | 9 +++++++-- packages/next-swc/package.json | 4 ++-- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml index 7e19ef97fb0dc..9a8ca5dd185a5 100644 --- 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 index 91501c781c8b3..8bf6bac4f4f00 100644 --- 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/Cargo.toml b/packages/next-swc/crates/next-core/Cargo.toml index 1347b942a12fc..70783de4edcf2 100644 --- a/packages/next-swc/crates/next-core/Cargo.toml +++ b/packages/next-swc/crates/next-core/Cargo.toml @@ -73,6 +73,7 @@ native-tls = ["turbopack-binding/__turbo_tasks_fetch_native-tls"] rustls-tls = ["turbopack-binding/__turbo_tasks_fetch_rustls-tls"] plugin = ["turbopack-binding/__swc_core_binding_napi_plugin"] image-webp = ["turbopack-binding/__turbopack_image_webp"] +image-avif = ["turbopack-binding/__turbopack_image_avif"] # enable "HMR" for embedded assets dynamic_embed_contents = [ 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 index 2dd5d06db9533..68cc185939b9d 100644 --- 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 @@ -28,11 +28,16 @@ pub fn get_next_image_rule() -> ModuleRule { ModuleRuleCondition::ResourcePathEndsWith(".jpg".to_string()), ModuleRuleCondition::ResourcePathEndsWith(".jpeg".to_string()), ModuleRuleCondition::ResourcePathEndsWith(".png".to_string()), - ModuleRuleCondition::ResourcePathEndsWith(".webp".to_string()), - ModuleRuleCondition::ResourcePathEndsWith(".avif".to_string()), ModuleRuleCondition::ResourcePathEndsWith(".apng".to_string()), ModuleRuleCondition::ResourcePathEndsWith(".gif".to_string()), ModuleRuleCondition::ResourcePathEndsWith(".svg".to_string()), + ModuleRuleCondition::ResourcePathEndsWith(".bmp".to_string()), + ModuleRuleCondition::ResourcePathEndsWith(".ico".to_string()), + // These images may not be encoded by turbopack depends on the feature availability + // As turbopack-image returns raw bytes if compile time codec support is not enabled: + // ref:https://github.com/vercel/turbo/pull/5967 + ModuleRuleCondition::ResourcePathEndsWith(".webp".to_string()), + ModuleRuleCondition::ResourcePathEndsWith(".avif".to_string()), ]), vec![ModuleRuleEffect::ModuleType(ModuleType::Custom( Vc::upcast(StructuredImageModuleType::new(Value::new( diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json index 1a65c9a00fe32..406314be8a9ae 100644 --- 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",