Merge branch 'canary' into canary

.github/CODEOWNERS

@@ -12,13 +12,8 @@
 
 # Image Component (@styfle)
 
-/examples/image-component/                                   @timneutkens @ijjk @shuding @styfle
-/packages/next/build/webpack/loaders/next-image-loader.js    @timneutkens @ijjk @shuding @styfle
-/packages/next/client/image.tsx                              @timneutkens @ijjk @shuding @styfle
-/packages/next/image-types/                                  @timneutkens @ijjk @shuding @styfle
-/packages/next/server/image-config.ts                        @timneutkens @ijjk @shuding @styfle
-/packages/next/server/image-optimizer.ts                     @timneutkens @ijjk @shuding @styfle
+/**/*image*/**                                               @timneutkens @ijjk @shuding @styfle
+/packages/next/client/use-intersection.tsx                   @timneutkens @ijjk @shuding @styfle
+/packages/next/server/lib/squoosh/                           @timneutkens @ijjk @shuding @styfle
 /packages/next/server/serve-static.ts                        @timneutkens @ijjk @shuding @styfle
 /packages/next/server/config.ts                              @timneutkens @ijjk @shuding @styfle
-/test/integration/image-optimizer/                           @timneutkens @ijjk @shuding @styfle
-/test/integration/image-component/                           @timneutkens @ijjk @shuding @styfle

docs/testing.md

@@ -232,7 +232,7 @@ Run `npm run build` and `npm run start`, then run `npm run test:e2e` in another
 
 ### Running Playwright on Continuous Integration (CI)
 
-Playwright will by default run your tests in the [headed mode](https://playwright.dev/docs/ci). To install all the Playwright dependencies, run `npx playwright install-deps`.
+Playwright will by default run your tests in the [headless mode]https://playwright.dev/docs/ci#running-headed). To install all the Playwright dependencies, run `npx playwright install-deps`.
 
 You can learn more about Playwright and Continuous Integration from these resources:
 

packages/next/client/image.tsx

@@ -5,7 +5,7 @@ import {
   imageConfigDefault,
   LoaderValue,
   VALID_LOADERS,
-} from '../server/image-config'
+} from '../shared/lib/image-config'
 import { useIntersection } from './use-intersection'
 import { ImageConfigContext } from '../shared/lib/image-config-context'
 

packages/next/client/index.tsx

@@ -39,7 +39,7 @@ import {
 } from './streaming/vitals'
 import { RefreshContext } from './streaming/refresh'
 import { ImageConfigContext } from '../shared/lib/image-config-context'
-import { ImageConfigComplete } from '../server/image-config'
+import { ImageConfigComplete } from '../shared/lib/image-config'
 
 /// <reference types="react-dom/experimental" />
 

packages/next/server/base-server.ts

@@ -62,7 +62,7 @@ import { MIDDLEWARE_ROUTE } from '../lib/constants'
 import { addRequestMeta, getRequestMeta } from './request-meta'
 import { createHeaderRoute, createRedirectRoute } from './server-route-utils'
 import { PrerenderManifest } from '../build'
-import { ImageConfigComplete } from './image-config'
+import { ImageConfigComplete } from '../shared/lib/image-config'
 
 export type FindComponentsResult = {
   components: LoadComponentsReturnType

packages/next/server/config-shared.ts

@@ -5,7 +5,7 @@ import {
   ImageConfig,
   ImageConfigComplete,
   imageConfigDefault,
-} from './image-config'
+} from '../shared/lib/image-config'
 
 export type NextConfigComplete = Required<NextConfig> & {
   images: Required<ImageConfigComplete>

packages/next/server/config.ts

@@ -14,7 +14,11 @@ import {
   normalizeConfig,
 } from './config-shared'
 import { loadWebpackHook } from './config-utils'
-import { ImageConfig, imageConfigDefault, VALID_LOADERS } from './image-config'
+import {
+  ImageConfig,
+  imageConfigDefault,
+  VALID_LOADERS,
+} from '../shared/lib/image-config'
 import { loadEnvConfig } from '@next/env'
 import { hasNextSupport } from '../telemetry/ci-info'
 

packages/next/server/render.tsx

@@ -11,7 +11,7 @@ import type {
   RenderPage,
   RenderPageResult,
 } from '../shared/lib/utils'
-import type { ImageConfigComplete } from './image-config'
+import type { ImageConfigComplete } from '../shared/lib/image-config'
 import type { Redirect } from '../lib/load-custom-routes'
 import type { NextApiRequestCookies, __ApiPreviewProps } from './api-utils'
 import type { FontManifest } from './font-utils'

packages/next/shared/lib/image-config-context.ts

@@ -1,8 +1,5 @@
 import React from 'react'
-import {
-  ImageConfigComplete,
-  imageConfigDefault,
-} from '../../server/image-config'
+import { ImageConfigComplete, imageConfigDefault } from './image-config'
 
 export const ImageConfigContext =
   React.createContext<ImageConfigComplete>(imageConfigDefault)