From 8487278c528555fa7e75914c008b6611e1f5764f Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Thu, 24 Aug 2023 11:36:38 -0700 Subject: [PATCH 1/2] Fix failing TS test from new release (#54523) Fixes: ![CleanShot 2023-08-24 at 11 20 41@2x](https://github.com/vercel/next.js/assets/22380829/00d7e646-f41f-43ed-a18a-4532d0b7f5dc) x-ref: https://github.com/vercel/next.js/actions/runs/5967378932/job/16188975903?pr=54515#step:28:256 --- .../supports-module-resolution-nodenext/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/production/supports-module-resolution-nodenext/tsconfig.json b/test/production/supports-module-resolution-nodenext/tsconfig.json index a55f25c3ecf47..d9284ab47b94a 100644 --- a/test/production/supports-module-resolution-nodenext/tsconfig.json +++ b/test/production/supports-module-resolution-nodenext/tsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { "esModuleInterop": true, - "module": "esnext", + "module": "NodeNext", "jsx": "preserve", "target": "es5", "lib": ["dom", "dom.iterable", "esnext"], From e471a46a2844ab4f13bfda7eceaf000ec2c59c24 Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Thu, 24 Aug 2023 12:49:17 -0700 Subject: [PATCH 2/2] Enable verbose logging for turbo in CI (#54525) Gives us more insight into turbo runs when building swc --- .github/workflows/build_and_deploy.yml | 12 ++++++------ .github/workflows/build_reusable.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml index 0a78f365b29f4..3be91d8f6f664 100644 --- a/.github/workflows/build_and_deploy.yml +++ b/.github/workflows/build_and_deploy.yml @@ -87,7 +87,7 @@ jobs: target: 'x86_64-apple-darwin' build: | npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" "turbo@${TURBO_VERSION}" && corepack enable - turbo run build-native-release --remote-cache-timeout 90 --summarize -- --target x86_64-apple-darwin --release + turbo run build-native-release -vvv --remote-cache-timeout 90 --summarize -- --target x86_64-apple-darwin --release strip -x packages/next-swc/native/next-swc.*.node - host: @@ -102,7 +102,7 @@ jobs: SYSROOT=$(xcrun --sdk macosx --show-sdk-path); export CFLAGS="-isysroot $SYSROOT -isystem $SYSROOT"; npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" "turbo@${TURBO_VERSION}" && corepack enable - turbo run build-native-release --remote-cache-timeout 90 --summarize -- --target aarch64-apple-darwin + turbo run build-native-release -vvv --remote-cache-timeout 90 --summarize -- --target aarch64-apple-darwin strip -x packages/next-swc/native/next-swc.*.node - host: @@ -113,7 +113,7 @@ jobs: build: | corepack enable npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" "turbo@${TURBO_VERSION}" - turbo run build-native-release --remote-cache-timeout 90 --summarize -- --target x86_64-pc-windows-msvc + turbo run build-native-release -vvv --remote-cache-timeout 90 --summarize -- --target x86_64-pc-windows-msvc target: 'x86_64-pc-windows-msvc' - host: @@ -124,7 +124,7 @@ jobs: build: | corepack enable npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" "turbo@${TURBO_VERSION}" - turbo run build-native-no-plugin --remote-cache-timeout 90 --summarize -- --release --target i686-pc-windows-msvc + turbo run build-native-no-plugin -vvv --remote-cache-timeout 90 --summarize -- --release --target i686-pc-windows-msvc target: 'i686-pc-windows-msvc' - host: @@ -136,7 +136,7 @@ jobs: build: | corepack enable npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" "turbo@${TURBO_VERSION}" - turbo run build-native-no-plugin-woa-release --remote-cache-timeout 90 --summarize -- --target aarch64-pc-windows-msvc + turbo run build-native-no-plugin-woa-release -vvv --remote-cache-timeout 90 --summarize -- --target aarch64-pc-windows-msvc - host: - 'self-hosted' @@ -367,7 +367,7 @@ jobs: run: node scripts/normalize-version-bump.js - name: Build - run: turbo run build-wasm --remote-cache-timeout 90 --summarize -- --target ${{ matrix.target }} --features tracing/release_max_level_info + run: turbo run build-wasm -vvv --remote-cache-timeout 90 --summarize -- --target ${{ matrix.target }} --features tracing/release_max_level_info - name: Add target to folder name run: '[[ -d "packages/next-swc/crates/wasm/pkg" ]] && mv packages/next-swc/crates/wasm/pkg packages/next-swc/crates/wasm/pkg-${{ matrix.target }} || ls packages/next-swc/crates/wasm' diff --git a/.github/workflows/build_reusable.yml b/.github/workflows/build_reusable.yml index d47913f0207c5..9bf8e93fae08f 100644 --- a/.github/workflows/build_reusable.yml +++ b/.github/workflows/build_reusable.yml @@ -137,7 +137,7 @@ jobs: - run: node scripts/normalize-version-bump.js name: normalize versions - - run: turbo run build-native-release --remote-cache-timeout 90 --summarize -- --target x86_64-unknown-linux-gnu + - run: turbo run build-native-release -vvv --remote-cache-timeout 90 --summarize -- --target x86_64-unknown-linux-gnu if: ${{ inputs.skipNativeBuild != 'yes' && steps.docs-change.outputs.DOCS_CHANGE == 'nope' }} - name: Upload next-swc artifact