Skip to content

Commit

Permalink
Merge branch 'canary' into shu/1n1x
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] committed Oct 24, 2022
2 parents 0a9699d + 20f5db0 commit b5edab8
Show file tree
Hide file tree
Showing 85 changed files with 2,277 additions and 53,953 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,11 @@
"random-seed": "0.3.0",
"react": "18.2.0",
"react-17": "npm:react@17.0.2",
"react-builtin": "npm:react@0.0.0-experimental-1d3fc9c9c-20221023",
"react-builtin": "npm:react@18.3.0-next-e7c5af45c-20221023",
"react-dom": "18.2.0",
"react-dom-17": "npm:react-dom@17.0.2",
"react-dom-builtin": "npm:react-dom@0.0.0-experimental-1d3fc9c9c-20221023",
"react-server-dom-webpack": "0.0.0-experimental-1d3fc9c9c-20221023",
"react-dom-builtin": "npm:react-dom@18.3.0-next-e7c5af45c-20221023",
"react-server-dom-webpack": "18.3.0-next-e7c5af45c-20221023",
"react-ssr-prepass": "1.0.8",
"react-virtualized": "9.22.3",
"relay-compiler": "13.0.2",
Expand Down
3 changes: 1 addition & 2 deletions packages/next/client/app-index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
import '../build/polyfills/polyfill-module'
// @ts-ignore react-dom/client exists when using React 18
import ReactDOMClient from 'react-dom/client'
// TODO-APP: change to React.use once it becomes stable
import React, { experimental_use as use } from 'react'
import React, { use } from 'react'
import { createFromReadableStream } from 'next/dist/compiled/react-server-dom-webpack/client'

import measureWebVitals from './performance-relayer'
Expand Down
8 changes: 1 addition & 7 deletions packages/next/client/components/layout-router.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
'use client'

import React, {
useContext,
useEffect,
useRef,
// TODO-APP: change to React.use once it becomes stable
experimental_use as use,
} from 'react'
import React, { useContext, useEffect, useRef, use } from 'react'
import type {
ChildProp,
//Segment
Expand Down
1 change: 0 additions & 1 deletion packages/next/client/components/reducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import type {
FlightSegmentPath,
Segment,
} from '../../server/app-render'
// TODO-APP: change to React.use once it becomes stable
import { matchSegment } from './match-segments'
import { fetchServerResponse } from './app-router'

Expand Down
Loading

0 comments on commit b5edab8

Please sign in to comment.