Revert "Force resolution to use vendored React"

This reverts commit 98f02ec42df4fd0ea84b05c529d5b1d3fb70fd7c.

Try to find out why it's not aliased in the first place

packages/next/src/build/babel/preset.ts

@@ -138,7 +138,7 @@ export default (
         require('./plugins/jsx-pragma'),
         {
           // This produces the following injected import for modules containing JSX:
-          //   import React from 'next/dist/compiled/react';
+          //   import React from 'react';
           //   var __jsx = React.createElement;
           module: 'react',
           importAs: 'React',

packages/next/src/build/webpack-config.ts

@@ -1,4 +1,4 @@
-import React from 'next/dist/compiled/react'
+import React from 'react'
 import ReactRefreshWebpackPlugin from 'next/dist/compiled/@next/react-refresh-utils/dist/ReactRefreshWebpackPlugin'
 import { yellow, bold } from '../lib/picocolors'
 import crypto from 'crypto'

packages/next/src/build/webpack/loaders/next-flight-loader/module-proxy.ts

@@ -1,5 +1,5 @@
 /* eslint-disable import/no-extraneous-dependencies */
-import { createClientModuleProxy } from 'next/dist/compiled/react-server-dom-webpack/server.edge'
+import { createClientModuleProxy } from 'react-server-dom-webpack/server.edge'
 
 // Re-assign to make it typed.
 export const createProxy: (moduleId: string) => any = createClientModuleProxy

packages/next/src/build/webpack/loaders/next-flight-loader/server-reference.ts

@@ -1,5 +1,5 @@
 /* eslint-disable import/no-extraneous-dependencies */
-import { registerServerReference as flightRegisterServerReference } from 'next/dist/compiled/react-server-dom-webpack/server.edge'
+import { registerServerReference as flightRegisterServerReference } from 'react-server-dom-webpack/server.edge'
 
 export function registerServerReference(id: string, action: any) {
   return flightRegisterServerReference(action, id, null)

packages/next/src/build/webpack/plugins/next-types-plugin/index.ts

@@ -450,7 +450,7 @@ declare module 'next' {
 
 declare module 'next/link' {
   import type { LinkProps as OriginalLinkProps } from 'next/dist/client/link.js'
-  import type { AnchorHTMLAttributes, DetailedHTMLProps } from 'next/dist/compiled/react'
+  import type { AnchorHTMLAttributes, DetailedHTMLProps } from 'react'
   import type { UrlObject } from 'url'
 
   type LinkRestProps = Omit<

packages/next/src/client/app-index.tsx

@@ -1,10 +1,10 @@
 import '../build/polyfills/polyfill-module'
 // @ts-ignore react-dom/client exists when using React 18
-import ReactDOMClient from 'next/dist/compiled/react-dom/client'
-import React, { use } from 'next/dist/compiled/react'
+import ReactDOMClient from 'react-dom/client'
+import React, { use } from 'react'
 // @ts-ignore
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { createFromReadableStream } from 'next/dist/compiled/react-server-dom-webpack/client'
+import { createFromReadableStream } from 'react-server-dom-webpack/client'
 
 import { HeadManagerContext } from '../shared/lib/head-manager-context.shared-runtime'
 import onRecoverableError from './on-recoverable-error'

packages/next/src/client/compat/router.ts

@@ -1,4 +1,4 @@
-import { useContext } from 'next/dist/compiled/react'
+import { useContext } from 'react'
 import { RouterContext } from '../../shared/lib/router-context.shared-runtime'
 import type { NextRouter } from '../router'
 

packages/next/src/client/components/app-router-announcer.tsx

@@ -1,5 +1,5 @@
-import { useEffect, useRef, useState } from 'next/dist/compiled/react'
-import { createPortal } from 'next/dist/compiled/react-dom'
+import { useEffect, useRef, useState } from 'react'
+import { createPortal } from 'react-dom'
 import type { FlightRouterState } from '../../server/app-render/types'
 
 const ANNOUNCER_TYPE = 'next-route-announcer'

packages/next/src/client/components/app-router.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import type { ReactNode } from 'next/dist/compiled/react'
+import type { ReactNode } from 'react'
 import React, {
   use,
   useEffect,
@@ -9,7 +9,7 @@ import React, {
   startTransition,
   useInsertionEffect,
   useDeferredValue,
-} from 'next/dist/compiled/react'
+} from 'react'
 import {
   AppRouterContext,
   LayoutRouterContext,

packages/next/src/client/components/default-layout.tsx

@@ -1,4 +1,4 @@
-import React from 'next/dist/compiled/react'
+import React from 'react'
 
 export default function DefaultLayout({
   children,

packages/next/src/client/components/dev-root-not-found-boundary.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import React from 'next/dist/compiled/react'
+import React from 'react'
 import { NotFoundBoundary } from './not-found-boundary'
 
 export function bailOnNotFound() {

packages/next/src/client/components/error-boundary.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import React from 'next/dist/compiled/react'
+import React from 'react'
 import { usePathname } from './navigation'
 import { isNextRouterError } from './is-next-router-error'
 import { staticGenerationAsyncStorage } from './static-generation-async-storage.external'

packages/next/src/client/components/layout-router.tsx

@@ -18,8 +18,8 @@ import React, {
   startTransition,
   Suspense,
   useDeferredValue,
-} from 'next/dist/compiled/react'
-import ReactDOM from 'next/dist/compiled/react-dom'
+} from 'react'
+import ReactDOM from 'react-dom'
 import {
   LayoutRouterContext,
   GlobalLayoutRouterContext,

packages/next/src/client/components/navigation.ts

@@ -1,4 +1,4 @@
-import { useContext, useMemo } from 'next/dist/compiled/react'
+import { useContext, useMemo } from 'react'
 import type { FlightRouterState } from '../../server/app-render/types'
 import {
   AppRouterContext,

packages/next/src/client/components/not-found-boundary.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import React, { useContext } from 'next/dist/compiled/react'
+import React, { useContext } from 'react'
 import { usePathname } from './navigation'
 import { isNotFoundError } from './not-found'
 import { warnOnce } from '../../shared/lib/utils/warn-once'

packages/next/src/client/components/not-found-error.tsx

@@ -1,4 +1,4 @@
-import React from 'next/dist/compiled/react'
+import React from 'react'
 
 const styles: Record<string, React.CSSProperties> = {
   error: {

packages/next/src/client/components/react-dev-overlay/app/ReactDevOverlay.tsx

@@ -1,4 +1,4 @@
-import * as React from 'next/dist/compiled/react'
+import * as React from 'react'
 import { ACTION_UNHANDLED_ERROR, type OverlayState } from '../shared'
 
 import { ShadowPortal } from '../internal/components/ShadowPortal'

packages/next/src/client/components/react-dev-overlay/app/hot-reloader-client.tsx

@@ -1,5 +1,5 @@
-import type { ReactNode } from 'next/dist/compiled/react'
-import { useCallback, useEffect, startTransition, useMemo } from 'next/dist/compiled/react'
+import type { ReactNode } from 'react'
+import { useCallback, useEffect, startTransition, useMemo } from 'react'
 import stripAnsi from 'next/dist/compiled/strip-ansi'
 import formatWebpackMessages from '../internal/helpers/format-webpack-messages'
 import { useRouter } from '../../navigation'

packages/next/src/client/components/react-dev-overlay/internal/components/CodeFrame/CodeFrame.tsx

@@ -1,5 +1,5 @@
 import Anser from 'next/dist/compiled/anser'
-import * as React from 'next/dist/compiled/react'
+import * as React from 'react'
 import type { StackFrame } from 'next/dist/compiled/stacktrace-parser'
 import stripAnsi from 'next/dist/compiled/strip-ansi'
 import { getFrameSource } from '../../helpers/stack-frame'

packages/next/src/client/components/react-dev-overlay/internal/components/Dialog/Dialog.tsx

@@ -1,4 +1,4 @@
-import * as React from 'next/dist/compiled/react'
+import * as React from 'react'
 import { useOnClickOutside } from '../../hooks/use-on-click-outside'
 
 export type DialogProps = {

packages/next/src/client/components/react-dev-overlay/internal/components/Dialog/DialogBody.tsx

@@ -1,4 +1,4 @@
-import * as React from 'next/dist/compiled/react'
+import * as React from 'react'
 
 export type DialogBodyProps = {
   children?: React.ReactNode

packages/next/src/client/components/react-dev-overlay/internal/components/Dialog/DialogContent.tsx

@@ -1,4 +1,4 @@
-import * as React from 'next/dist/compiled/react'
+import * as React from 'react'
 
 export type DialogContentProps = {
   children?: React.ReactNode

packages/next/src/client/components/react-dev-overlay/internal/components/Dialog/DialogHeader.tsx

@@ -1,4 +1,4 @@
-import * as React from 'next/dist/compiled/react'
+import * as React from 'react'
 
 export type DialogHeaderProps = {
   children?: React.ReactNode

packages/next/src/client/components/react-dev-overlay/internal/components/LeftRightDialogHeader/LeftRightDialogHeader.tsx

@@ -1,4 +1,4 @@
-import * as React from 'next/dist/compiled/react'
+import * as React from 'react'
 import { CloseIcon } from '../../icons/CloseIcon'
 
 export type LeftRightDialogHeaderProps = {

packages/next/src/client/components/react-dev-overlay/internal/components/Overlay/Overlay.tsx

@@ -1,5 +1,5 @@
 import allyTrap from './maintain--tab-focus'
-import * as React from 'next/dist/compiled/react'
+import * as React from 'react'
 import { lock, unlock } from './body-locker'
 
 export type OverlayProps = {

packages/next/src/client/components/react-dev-overlay/internal/components/ShadowPortal.tsx

@@ -1,5 +1,5 @@
-import * as React from 'next/dist/compiled/react'
-import { createPortal } from 'next/dist/compiled/react-dom'
+import * as React from 'react'
+import { createPortal } from 'react-dom'
 
 export function ShadowPortal({ children }: { children: React.ReactNode }) {
   let portalNode = React.useRef<HTMLElement | null>(null)

packages/next/src/client/components/react-dev-overlay/internal/components/Terminal/EditorLink.tsx

@@ -1,4 +1,4 @@
-import React from 'next/dist/compiled/react'
+import React from 'react'
 import { useOpenInEditor } from '../../helpers/use-open-in-editor'
 
 type EditorLinkProps = {

packages/next/src/client/components/react-dev-overlay/internal/components/Terminal/Terminal.tsx

@@ -1,5 +1,5 @@
 import Anser from 'next/dist/compiled/anser'
-import * as React from 'next/dist/compiled/react'
+import * as React from 'react'
 import { HotlinkedText } from '../hot-linked-text'
 import { EditorLink } from './EditorLink'
 

packages/next/src/client/components/react-dev-overlay/internal/components/Toast/Toast.tsx

@@ -1,4 +1,4 @@
-import * as React from 'next/dist/compiled/react'
+import * as React from 'react'
 
 export type ToastProps = {
   children?: React.ReactNode

packages/next/src/client/components/react-dev-overlay/internal/components/VersionStalenessInfo/VersionStalenessInfo.tsx

@@ -1,4 +1,4 @@
-import React from 'next/dist/compiled/react'
+import React from 'react'
 import type { VersionInfo } from '../../../../../../server/dev/parse-version-info'
 
 export function VersionStalenessInfo(props: VersionInfo) {

packages/next/src/client/components/react-dev-overlay/internal/components/hot-linked-text/index.tsx

@@ -1,4 +1,4 @@
-import React from 'next/dist/compiled/react'
+import React from 'react'
 import {
   decodeMagicIdentifier,
   MAGIC_IDENTIFIER_REGEX,

packages/next/src/client/components/react-dev-overlay/internal/container/BuildError.tsx

@@ -1,4 +1,4 @@
-import * as React from 'next/dist/compiled/react'
+import * as React from 'react'
 import type { VersionInfo } from '../../../../../server/dev/parse-version-info'
 import {
   Dialog,

packages/next/src/client/components/react-dev-overlay/internal/container/Errors.tsx

@@ -1,4 +1,4 @@
-import { useState, useEffect, useMemo, useCallback } from 'next/dist/compiled/react'
+import { useState, useEffect, useMemo, useCallback } from 'react'
 import {
   ACTION_UNHANDLED_ERROR,
   ACTION_UNHANDLED_REJECTION,

packages/next/src/client/components/react-dev-overlay/internal/container/RuntimeError/ComponentStackFrameRow.tsx

@@ -1,4 +1,4 @@
-import React from 'next/dist/compiled/react'
+import React from 'react'
 import type { ComponentStackFrame } from '../../helpers/parse-component-stack'
 import { useOpenInEditor } from '../../helpers/use-open-in-editor'
 import { HotlinkedText } from '../../components/hot-linked-text'

packages/next/src/client/components/react-dev-overlay/internal/container/RuntimeError/component-stack-pseudo-html.tsx

@@ -1,4 +1,4 @@
-import { useMemo, Fragment, useState } from 'next/dist/compiled/react'
+import { useMemo, Fragment, useState } from 'react'
 import type { ComponentStackFrame } from '../../helpers/parse-component-stack'
 import { CollapseIcon } from '../../icons/CollapseIcon'
 

packages/next/src/client/components/react-dev-overlay/internal/container/RuntimeError/index.tsx

@@ -1,4 +1,4 @@
-import * as React from 'next/dist/compiled/react'
+import * as React from 'react'
 import { CodeFrame } from '../../components/CodeFrame'
 import type { ReadyRuntimeError } from '../../helpers/getErrorByType'
 import { noop as css } from '../../helpers/noop-template'

packages/next/src/client/components/react-dev-overlay/internal/container/root-layout-missing-tags-error.tsx

@@ -1,4 +1,4 @@
-import * as React from 'next/dist/compiled/react'
+import * as React from 'react'
 import type { VersionInfo } from '../../../../../server/dev/parse-version-info'
 import { Dialog, DialogContent, DialogHeader } from '../components/Dialog'
 import { Overlay } from '../components/Overlay'

packages/next/src/client/components/react-dev-overlay/internal/helpers/use-error-handler.ts

@@ -1,4 +1,4 @@
-import { useEffect } from 'next/dist/compiled/react'
+import { useEffect } from 'react'
 import { hydrationErrorState } from './hydration-error-info'
 import { isNextRouterError } from '../../../is-next-router-error'
 import { isHydrationError } from '../../../is-hydration-error'

packages/next/src/client/components/react-dev-overlay/internal/helpers/use-open-in-editor.ts

@@ -1,4 +1,4 @@
-import { useCallback } from 'next/dist/compiled/react'
+import { useCallback } from 'react'
 
 export function useOpenInEditor({
   file,

packages/next/src/client/components/react-dev-overlay/internal/helpers/use-websocket.ts

@@ -1,4 +1,4 @@
-import { useCallback, useContext, useEffect, useRef } from 'next/dist/compiled/react'
+import { useCallback, useContext, useEffect, useRef } from 'react'
 import { GlobalLayoutRouterContext } from '../../../../../shared/lib/app-router-context.shared-runtime'
 import { getSocketUrl } from './get-socket-url'
 import type { TurbopackMsgToBrowser } from '../../../../../server/dev/hot-reloader-types'

packages/next/src/client/components/react-dev-overlay/internal/hooks/use-on-click-outside.ts

@@ -1,4 +1,4 @@
-import * as React from 'next/dist/compiled/react'
+import * as React from 'react'
 
 export function useOnClickOutside(
   el: Node | null,

packages/next/src/client/components/react-dev-overlay/internal/icons/CloseIcon.tsx

@@ -1,4 +1,4 @@
-import * as React from 'next/dist/compiled/react'
+import * as React from 'react'
 
 const CloseIcon = () => {
   return (

packages/next/src/client/components/react-dev-overlay/internal/styles/Base.tsx

@@ -1,4 +1,4 @@
-import * as React from 'next/dist/compiled/react'
+import * as React from 'react'
 import { noop as css } from '../helpers/noop-template'
 
 export function Base() {

packages/next/src/client/components/react-dev-overlay/internal/styles/CssReset.tsx

@@ -1,4 +1,4 @@
-import * as React from 'next/dist/compiled/react'
+import * as React from 'react'
 import { noop as css } from '../helpers/noop-template'
 
 export function CssReset() {

packages/next/src/client/components/react-dev-overlay/pages/ErrorBoundary.tsx

@@ -1,4 +1,4 @@
-import * as React from 'next/dist/compiled/react'
+import * as React from 'react'
 
 type ErrorBoundaryProps = {
   children?: React.ReactNode

packages/next/src/client/components/react-dev-overlay/pages/ReactDevOverlay.tsx

@@ -1,4 +1,4 @@
-import * as React from 'next/dist/compiled/react'
+import * as React from 'react'
 
 import * as Bus from './bus'
 import { ShadowPortal } from '../internal/components/ShadowPortal'

packages/next/src/client/components/react-dev-overlay/shared.ts

@@ -1,4 +1,4 @@
-import { useReducer } from 'next/dist/compiled/react'
+import { useReducer } from 'react'
 
 import type { StackFrame } from 'next/dist/compiled/stacktrace-parser'
 import type { VersionInfo } from '../../../server/dev/parse-version-info'

packages/next/src/client/components/redirect-boundary.tsx

@@ -1,5 +1,5 @@
 'use client'
-import React, { useEffect } from 'next/dist/compiled/react'
+import React, { useEffect } from 'react'
 import type { AppRouterInstance } from '../../shared/lib/app-router-context.shared-runtime'
 import { useRouter } from './navigation'
 import {

packages/next/src/client/components/render-from-template-context.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import React, { useContext } from 'next/dist/compiled/react'
+import React, { useContext } from 'react'
 import { TemplateContext } from '../../shared/lib/app-router-context.shared-runtime'
 
 export default function RenderFromTemplateContext(): JSX.Element {

packages/next/src/client/components/router-reducer/apply-router-state-patch-to-tree.test.tsx

@@ -1,4 +1,4 @@
-import React from 'next/dist/compiled/react'
+import React from 'react'
 import type {
   FlightData,
   FlightRouterState,

packages/next/src/client/components/router-reducer/clear-cache-node-data-for-segment-path.test.tsx

@@ -1,4 +1,4 @@
-import React from 'next/dist/compiled/react'
+import React from 'react'
 import { clearCacheNodeDataForSegmentPath } from './clear-cache-node-data-for-segment-path'
 import type { CacheNode } from '../../../shared/lib/app-router-context.shared-runtime'
 

packages/next/src/client/components/router-reducer/create-initial-router-state.test.tsx

@@ -1,4 +1,4 @@
-import React from 'next/dist/compiled/react'
+import React from 'react'
 import type { FlightRouterState } from '../../../server/app-render/types'
 import type { CacheNode } from '../../../shared/lib/app-router-context.shared-runtime'
 import { createInitialRouterState } from './create-initial-router-state'

packages/next/src/client/components/router-reducer/create-initial-router-state.ts

@@ -1,4 +1,4 @@
-import type { ReactNode } from 'next/dist/compiled/react'
+import type { ReactNode } from 'react'
 import type { CacheNode } from '../../../shared/lib/app-router-context.shared-runtime'
 import type {
   FlightRouterState,

packages/next/src/client/components/router-reducer/fetch-server-response.ts

@@ -2,7 +2,7 @@
 
 // @ts-ignore
 // eslint-disable-next-line import/no-extraneous-dependencies
-// import { createFromFetch } from 'next/dist/compiled/react-server-dom-webpack/client'
+// import { createFromFetch } from 'react-server-dom-webpack/client'
 const { createFromFetch } = (
   !!process.env.NEXT_RUNTIME
     ? // eslint-disable-next-line import/no-extraneous-dependencies

packages/next/src/client/components/router-reducer/fill-cache-with-new-subtree-data.test.tsx

@@ -1,4 +1,4 @@
-import React from 'next/dist/compiled/react'
+import React from 'react'
 import { fillCacheWithNewSubTreeData } from './fill-cache-with-new-subtree-data'
 import type { CacheNode } from '../../../shared/lib/app-router-context.shared-runtime'
 import type { FlightData } from '../../../server/app-render/types'

packages/next/src/client/components/router-reducer/fill-lazy-items-till-leaf-with-head.test.tsx

@@ -1,4 +1,4 @@
-import React from 'next/dist/compiled/react'
+import React from 'react'
 import { fillLazyItemsTillLeafWithHead } from './fill-lazy-items-till-leaf-with-head'
 import type { CacheNode } from '../../../shared/lib/app-router-context.shared-runtime'
 import type { FlightData } from '../../../server/app-render/types'

packages/next/src/client/components/router-reducer/invalidate-cache-below-flight-segmentpath.test.tsx

@@ -1,4 +1,4 @@
-import React from 'next/dist/compiled/react'
+import React from 'react'
 import type { FlightData } from '../../../server/app-render/types'
 import { invalidateCacheBelowFlightSegmentPath } from './invalidate-cache-below-flight-segmentpath'
 import type { CacheNode } from '../../../shared/lib/app-router-context.shared-runtime'