Skip to content

Commit a71f6aa

Browse files
experiment(CI): rollback changes (fail alternate job)
1 parent f67bb6b commit a71f6aa

6 files changed

Lines changed: 49 additions & 465 deletions

File tree

package.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
},
2525
"scripts": {
2626
"changeset:add": "changeset add",
27-
"postinstall": "preconstruct dev && yarn patch-react-reconciler",
28-
"patch-react-reconciler": "vite build",
27+
"postinstall": "preconstruct dev",
2928
"build": "preconstruct build",
3029
"examples": "yarn workspace example dev",
3130
"dev": "preconstruct dev",
@@ -54,8 +53,8 @@
5453
"@preconstruct/cli": "^2.1.5",
5554
"@testing-library/react": "^15.0.2",
5655
"@types/jest": "^29.2.5",
57-
"@types/react": "^19.2.7",
58-
"@types/react-dom": "^19.2.3",
56+
"@types/react": "^19.0.1",
57+
"@types/react-dom": "^19.0.1",
5958
"@types/react-native": "0.69.5",
6059
"@types/scheduler": "0.23.0",
6160
"@types/three": "^0.172.0",
@@ -78,15 +77,14 @@
7877
"lint-staged": "^12.3.7",
7978
"prettier": "^2.6.1",
8079
"pretty-quick": "^3.1.3",
81-
"react": "^19.2.0",
82-
"react-dom": "^19.2.0",
80+
"react": "^19.0.0",
81+
"react-dom": "^19.0.0",
8382
"react-native": "0.69.3",
8483
"react-nil": "^2.0.0",
8584
"three": "^0.172.0",
8685
"three-stdlib": "^2.35.16",
8786
"ts-jest": "^29.1.2",
88-
"typescript": "^4.6.3",
89-
"vite": "^6.4.1"
87+
"typescript": "^4.6.3"
9088
},
9189
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
9290
}

packages/fiber/package.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,16 @@
4242
"scripts": {
4343
"prebuild": "cp ../../readme.md readme.md"
4444
},
45-
"devDependencies": {
46-
"@types/react-reconciler": "^0.32.3",
47-
"react-reconciler": "^0.33.0"
48-
},
4945
"dependencies": {
5046
"@babel/runtime": "^7.17.8",
47+
"@types/react-reconciler": "^0.32.0",
5148
"@types/webxr": "*",
5249
"base64-js": "^1.5.1",
5350
"buffer": "^6.0.3",
5451
"its-fine": "^2.0.0",
52+
"react-reconciler": "^0.31.0",
5553
"react-use-measure": "^2.1.7",
56-
"scheduler": "^0.27.0",
54+
"scheduler": "^0.25.0",
5755
"suspend-react": "^0.1.3",
5856
"use-sync-external-store": "^1.4.0",
5957
"zustand": "^5.0.3"

packages/fiber/src/core/reconciler.tsx

Lines changed: 3 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
import packageData from '../../package.json'
22
import * as THREE from 'three'
33
import * as React from 'react'
4-
import Reconciler from '../../react-reconciler/index.js'
5-
import {
6-
ContinuousEventPriority,
7-
DiscreteEventPriority,
8-
DefaultEventPriority,
9-
} from '../../react-reconciler/constants.js'
4+
import Reconciler from 'react-reconciler'
5+
import { ContinuousEventPriority, DiscreteEventPriority, DefaultEventPriority } from 'react-reconciler/constants'
106
import { unstable_IdlePriority as idlePriority, unstable_scheduleCallback as scheduleCallback } from 'scheduler'
117
import {
128
diffProps,
@@ -565,6 +561,7 @@ export const reconciler = /* @__PURE__ */ createReconciler<
565561
requestPostPaintCallback() {},
566562
maySuspendCommit: () => false,
567563
preloadInstance: () => true, // true indicates already loaded
564+
startSuspendingCommit() {},
568565
suspendInstance() {},
569566
waitForCommitToBeReady: () => null,
570567
NotPendingTransition: null,
@@ -605,69 +602,4 @@ export const reconciler = /* @__PURE__ */ createReconciler<
605602
// @ts-ignore DefinitelyTyped is not up to date
606603
rendererPackageName: '@react-three/fiber',
607604
rendererVersion: packageData.version,
608-
609-
// https://github.com/facebook/react/pull/31975
610-
// https://github.com/facebook/react/pull/31999
611-
applyViewTransitionName(_instance: any, _name: any, _className: any) {},
612-
restoreViewTransitionName(_instance: any, _props: any) {},
613-
cancelViewTransitionName(_instance: any, _name: any, _props: any) {},
614-
cancelRootViewTransitionName(_rootContainer: any) {},
615-
restoreRootViewTransitionName(_rootContainer: any) {},
616-
InstanceMeasurement: null,
617-
measureInstance: (_instance: any) => null,
618-
wasInstanceInViewport: (_measurement: any): boolean => true,
619-
hasInstanceChanged: (_oldMeasurement: any, _newMeasurement: any): boolean => false,
620-
hasInstanceAffectedParent: (_oldMeasurement: any, _newMeasurement: any): boolean => false,
621-
622-
// https://github.com/facebook/react/pull/32002
623-
// https://github.com/facebook/react/pull/34486
624-
suspendOnActiveViewTransition(_state: any, _container: any) {},
625-
626-
// https://github.com/facebook/react/pull/32451
627-
// https://github.com/facebook/react/pull/32760
628-
startGestureTransition: () => null,
629-
startViewTransition: () => null,
630-
stopViewTransition(_transition: null) {},
631-
632-
// https://github.com/facebook/react/pull/32038
633-
createViewTransitionInstance: (_name: string): null => null,
634-
635-
// https://github.com/facebook/react/pull/32379
636-
// https://github.com/facebook/react/pull/32786
637-
getCurrentGestureOffset(_provider: null): number {
638-
throw new Error('startGestureTransition is not yet supported in react-three-fiber.')
639-
},
640-
641-
// https://github.com/facebook/react/pull/32500
642-
cloneMutableInstance(instance: any, _keepChildren: any) {
643-
return instance
644-
},
645-
cloneMutableTextInstance(textInstance: any) {
646-
return textInstance
647-
},
648-
cloneRootViewTransitionContainer(_rootContainer: any) {
649-
throw new Error('Not implemented.')
650-
},
651-
removeRootViewTransitionClone(_rootContainer: any, _clone: any) {
652-
throw new Error('Not implemented.')
653-
},
654-
655-
// https://github.com/facebook/react/pull/32465
656-
createFragmentInstance: (_fiber: any): null => null,
657-
updateFragmentInstanceFiber(_fiber: any, _instance: any): void {},
658-
commitNewChildToFragmentInstance(_child: any, _fragmentInstance: any): void {},
659-
deleteChildFromFragmentInstance(_child: any, _fragmentInstance: any): void {},
660-
661-
// https://github.com/facebook/react/pull/32653
662-
measureClonedInstance: (_instance: any) => null,
663-
664-
// https://github.com/facebook/react/pull/32819
665-
maySuspendCommitOnUpdate: (_type: any, _oldProps: any, _newProps: any) => false,
666-
maySuspendCommitInSyncRender: (_type: any, _props: any) => false,
667-
668-
// https://github.com/facebook/react/pull/34486
669-
startSuspendingCommit: () => null,
670-
671-
// https://github.com/facebook/react/pull/34522
672-
getSuspendedCommitReason: (_state: any, _rootContainer: any) => null,
673605
})

packages/fiber/src/core/renderer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react'
2-
import { ConcurrentRoot } from '../../react-reconciler/constants.js'
2+
import { ConcurrentRoot } from 'react-reconciler/constants'
33
import * as THREE from 'three'
44
import { createWithEqualityFn } from 'zustand/traditional'
55

packages/fiber/src/core/utils.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import * as THREE from 'three'
22
import * as React from 'react'
33
import { useFiber, traverseFiber, useContextBridge } from 'its-fine'
44
import { Instance } from './reconciler'
5+
import type { Fiber } from 'react-reconciler'
56
import type { EventHandlers } from './events'
67
import type { Dpr, Renderer, RootStore, Size } from './store'
78

@@ -218,11 +219,11 @@ export function dispose<T extends Disposable>(obj: T): void {
218219
export const REACT_INTERNAL_PROPS = ['children', 'key', 'ref']
219220

220221
// Gets only instance props from reconciler fibers
221-
export function getInstanceProps<T = any>(pendingProps: Record<string, unknown>): Instance<T>['props'] {
222+
export function getInstanceProps<T = any>(queue: Fiber['pendingProps']): Instance<T>['props'] {
222223
const props: Instance<T>['props'] = {}
223224

224-
for (const key in pendingProps) {
225-
if (!REACT_INTERNAL_PROPS.includes(key)) props[key] = pendingProps[key]
225+
for (const key in queue) {
226+
if (!REACT_INTERNAL_PROPS.includes(key)) props[key] = queue[key]
226227
}
227228

228229
return props

0 commit comments

Comments
 (0)