Merge branch 'canary' into add/otel-client-loading

packages/next/src/server/lib/patch-fetch.ts

@@ -488,13 +488,12 @@ export function patchFetch({
             }
             input = new Request(reqInput.url, reqOptions)
           } else if (init) {
-            const initialInit = init
+            const { _ogBody, body, signal, ...otherInput } =
+              init as RequestInit & { _ogBody?: any }
             init = {
-              body: (init as any)._ogBody || init.body,
-            }
-            for (const field of requestInputFields) {
-              // @ts-expect-error custom fields
-              init[field] = initialInit[field]
+              ...otherInput,
+              body: _ogBody || body,
+              signal: isStale ? undefined : signal,
             }
           }
 

test/integration/scss/test/basic-global-support.test.js

@@ -4,7 +4,7 @@ import { readdir, readFile, remove } from 'fs-extra'
 import { nextBuild } from 'next-test-utils'
 import { join } from 'path'
 
-const fixturesDir = join(__dirname, '../..', 'scss-fixtures')
+const fixturesDir = join(__dirname, '..', 'scss-fixtures')
 
 describe('Basic Global Support scss', () => {
   ;(process.env.TURBOPACK ? describe.skip : describe)('production mode', () => {

test/integration/scss/test/basic-scss.test.js

@@ -16,7 +16,7 @@ import webdriver from 'next-webdriver'
 import { join } from 'path'
 import { quote as shellQuote } from 'shell-quote'
 
-const fixturesDir = join(__dirname, '../..', 'scss-fixtures')
+const fixturesDir = join(__dirname, '..', 'scss-fixtures')
 
 describe('SCSS Support', () => {
   ;(process.env.TURBOPACK ? describe.skip : describe)('production mode', () => {

test/integration/scss/test/css-and-styled-jsx.test.js

@@ -11,7 +11,7 @@ import {
 import webdriver from 'next-webdriver'
 import { join } from 'path'
 
-const fixturesDir = join(__dirname, '../..', 'scss-fixtures')
+const fixturesDir = join(__dirname, '..', 'scss-fixtures')
 
 describe('Ordering with styled-jsx (dev)', () => {
   const appDir = join(fixturesDir, 'with-styled-jsx')

test/integration/scss/test/dev-css-handling.test.js

@@ -5,7 +5,7 @@ import { File, findPort, killApp, launchApp, waitFor } from 'next-test-utils'
 import webdriver from 'next-webdriver'
 import { join } from 'path'
 
-const fixturesDir = join(__dirname, '../..', 'scss-fixtures')
+const fixturesDir = join(__dirname, '..', 'scss-fixtures')
 
 describe('Has CSS in computed styles in Development', () => {
   const appDir = join(fixturesDir, 'multi-page')

test/integration/scss/test/scss-loader-handling.test.js

@@ -4,7 +4,7 @@ import { readdir, readFile, remove } from 'fs-extra'
 import { nextBuild } from 'next-test-utils'
 import { join } from 'path'
 
-const fixturesDir = join(__dirname, '../..', 'scss-fixtures')
+const fixturesDir = join(__dirname, '..', 'scss-fixtures')
 
 describe('SCSS Support loader handling', () => {
   ;(process.env.TURBOPACK ? describe.skip : describe)('production mode', () => {

test/integration/scss-modules/test/basic-scss.test.js → test/integration/scss/test/scss-modules-basic.test.js

@@ -15,7 +15,7 @@ import {
 import webdriver from 'next-webdriver'
 import { join } from 'path'
 
-const fixturesDir = join(__dirname, '../../scss-fixtures')
+const fixturesDir = join(__dirname, '..', 'scss-fixtures')
 
 describe('Basic SCSS Module Support', () => {
   ;(process.env.TURBOPACK ? describe.skip : describe)('production mode', () => {

test/integration/scss-modules/test/dynamic-route.test.js → test/integration/scss/test/scss-modules-dynamic-route.test.js

@@ -5,7 +5,7 @@ import { findPort, killApp, nextBuild, nextStart } from 'next-test-utils'
 import webdriver from 'next-webdriver'
 import { join } from 'path'
 
-const fixturesDir = join(__dirname, '../../scss-fixtures')
+const fixturesDir = join(__dirname, '..', 'scss-fixtures')
 
 describe('Dynamic Route CSS Module Usage', () => {
   ;(process.env.TURBOPACK ? describe.skip : describe)('production mode', () => {

test/integration/scss-modules/test/valid-invalid.test.js → test/integration/scss/test/scss-modules-valid-invalid.test.js

@@ -11,7 +11,7 @@ import {
 } from 'next-test-utils'
 import { join } from 'path'
 
-const fixturesDir = join(__dirname, '../../scss-fixtures')
+const fixturesDir = join(__dirname, '..', 'scss-fixtures')
 
 describe.skip('Invalid CSS Module Usage in node_modules', () => {
   ;(process.env.TURBOPACK ? describe.skip : describe)('production mode', () => {

test/integration/scss/test/valid-invalid-scss.test.js

@@ -4,7 +4,7 @@ import { remove } from 'fs-extra'
 import { nextBuild } from 'next-test-utils'
 import { join } from 'path'
 
-const fixturesDir = join(__dirname, '../..', 'scss-fixtures')
+const fixturesDir = join(__dirname, '..', 'scss-fixtures')
 
 describe('Invalid SCSS in _document', () => {
   ;(process.env.TURBOPACK ? describe.skip : describe)('production mode', () => {