From 506f3ce81f98fed5b95b2c25936de5ba4b9c5ac7 Mon Sep 17 00:00:00 2001 From: Zhiyuan Hong <28915578+hzy@users.noreply.github.com> Date: Tue, 29 Jul 2025 23:15:51 +0800 Subject: [PATCH] Revert "chore: upgrade preact (#1349)" This reverts commit 9bb1dda79fb537cebe233cc6fcd5d7a729c4ac6b. --- packages/react/package.json | 2 +- .../runtime/src/debug/component-stack.ts | 4 ++-- packages/react/runtime/src/debug/profile.ts | 4 ++-- .../react/runtime/src/lynx/performance.ts | 4 ++-- .../react/runtime/src/lynx/runWithForce.ts | 4 ++-- .../react/runtime/types/internal-preact.d.ts | 2 +- pnpm-lock.yaml | 22 +++++++++---------- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/react/package.json b/packages/react/package.json index 2b08347440..934f48b368 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -174,7 +174,7 @@ "api-extractor": "api-extractor run --verbose" }, "dependencies": { - "preact": "npm:@hongzhiyuan/preact@10.24.0-3d3cc198" + "preact": "npm:@hongzhiyuan/preact@10.24.0-319c684e" }, "devDependencies": { "@lynx-js/types": "3.3.0", diff --git a/packages/react/runtime/src/debug/component-stack.ts b/packages/react/runtime/src/debug/component-stack.ts index 5727e16958..663f0cb4bf 100644 --- a/packages/react/runtime/src/debug/component-stack.ts +++ b/packages/react/runtime/src/debug/component-stack.ts @@ -147,11 +147,11 @@ export function setupComponentStack(): void { if (oldDiffed) oldDiffed(vnode); }; - options[DIFF] = (vnode, oldVNode) => { + options[DIFF] = vnode => { if (isPossibleOwner(vnode)) { renderStack.push(vnode); } - if (oldDiff) oldDiff(vnode, oldVNode); + if (oldDiff) oldDiff(vnode); }; options[ROOT] = (vnode, parent) => { diff --git a/packages/react/runtime/src/debug/profile.ts b/packages/react/runtime/src/debug/profile.ts index a609857968..8b9f9c12b1 100644 --- a/packages/react/runtime/src/debug/profile.ts +++ b/packages/react/runtime/src/debug/profile.ts @@ -9,13 +9,13 @@ import { getDisplayName } from '../utils.js'; export function initProfileHook(): void { const oldDiff = options[DIFF]; - options[DIFF] = function(vnode: VNode, oldVNode: VNode) { + options[DIFF] = function(vnode: VNode) { // This __PROFILE__ is used for DCE testing if (__PROFILE__ && typeof vnode.type === 'function') { // We only add profiling trace for Component console.profile(`diff::${getDisplayName(vnode.type as ComponentClass)}`); } - oldDiff?.(vnode, oldVNode); + oldDiff?.(vnode); }; const oldDiffed = options[DIFFED]; options[DIFFED] = function(vnode) { diff --git a/packages/react/runtime/src/lynx/performance.ts b/packages/react/runtime/src/lynx/performance.ts index 3ce63df1d8..fc0405acf9 100644 --- a/packages/react/runtime/src/lynx/performance.ts +++ b/packages/react/runtime/src/lynx/performance.ts @@ -117,7 +117,7 @@ function markTiming(timestampKey: typeof PerformanceTimingKeys[number], force?: function initTimingAPI(): void { const oldDiff = options[DIFF]; - options[DIFF] = (vnode: VNode, oldVNode: VNode) => { + options[DIFF] = (vnode: VNode) => { // check `__globalSnapshotPatch` to make sure this only runs after hydrate if (__JS__ && __globalSnapshotPatch) { if (!globalPipelineOptions) { @@ -128,7 +128,7 @@ function initTimingAPI(): void { markTimingLegacy('updateDiffVdomStart'); } } - oldDiff?.(vnode, oldVNode); + oldDiff?.(vnode); }; } diff --git a/packages/react/runtime/src/lynx/runWithForce.ts b/packages/react/runtime/src/lynx/runWithForce.ts index 1564d53cca..ec83287969 100644 --- a/packages/react/runtime/src/lynx/runWithForce.ts +++ b/packages/react/runtime/src/lynx/runWithForce.ts @@ -16,9 +16,9 @@ export function runWithForce(cb: () => void): void { const oldDiff = options[DIFF]; - options[DIFF] = (vnode: PatchedVNode, oldVNode) => { + options[DIFF] = (vnode: PatchedVNode) => { if (oldDiff) { - oldDiff(vnode, oldVNode); + oldDiff(vnode); } // when `options[DIFF]` is called, a newVnode is passed in diff --git a/packages/react/runtime/types/internal-preact.d.ts b/packages/react/runtime/types/internal-preact.d.ts index ee1463cd37..36549e66f0 100644 --- a/packages/react/runtime/types/internal-preact.d.ts +++ b/packages/react/runtime/types/internal-preact.d.ts @@ -6,7 +6,7 @@ import 'preact'; declare module 'preact' { interface Options { /** _diff */ - __b?(vnode: VNode, oldVNode: VNode): void; + __b?(vnode: VNode): void; /** _render */ __r?(vnode: VNode): void; /** _commit */ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e023260806..5050fcb04d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -199,8 +199,8 @@ importers: packages/react: dependencies: preact: - specifier: npm:@hongzhiyuan/preact@10.24.0-3d3cc198 - version: '@hongzhiyuan/preact@10.24.0-3d3cc198' + specifier: npm:@hongzhiyuan/preact@10.24.0-319c684e + version: '@hongzhiyuan/preact@10.24.0-319c684e' devDependencies: '@lynx-js/types': specifier: 3.3.0 @@ -219,7 +219,7 @@ importers: version: link:.. '@prefresh/core': specifier: ^1.5.5 - version: 1.5.5(preact@10.24.0) + version: 1.5.5(preact@10.23.2) '@prefresh/utils': specifier: ^1.2.1 version: 1.2.1 @@ -2030,8 +2030,8 @@ packages: resolution: {integrity: sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@hongzhiyuan/preact@10.24.0-3d3cc198': - resolution: {integrity: sha512-5ZZjRrMIbXgwIjActZvJKs5hnC2j0UoU6bYUqcC73bi01ZaBOueSvLR0lELsGP2+d2IJNGKQJ6bp8pE6CwtP0A==} + '@hongzhiyuan/preact@10.24.0-319c684e': + resolution: {integrity: sha512-weWzMUnmXk7gynEpOo/iIyfq95pRoFO2+18eiwD0hk/TeIQUeHbyG4W/S3lCEjB54jvft/itXwhkF+vz623BEg==} '@humanfs/core@0.19.1': resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==} @@ -6678,8 +6678,8 @@ packages: resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==} engines: {node: ^10 || ^12 || >=14} - preact@10.24.0: - resolution: {integrity: sha512-aK8Cf+jkfyuZ0ZZRG9FbYqwmEiGQ4y/PUO4SuTWoyWL244nZZh7bd5h2APd4rSNDYTBNghg1L+5iJN3Skxtbsw==} + preact@10.23.2: + resolution: {integrity: sha512-kKYfePf9rzKnxOAKDpsWhg/ysrHPqT+yQ7UW4JjdnqjFIeNUnNcEJvhuA8fDenxAGWzUqtd51DfVg7xp/8T9NA==} prelude-ls@1.2.1: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} @@ -9064,7 +9064,7 @@ snapshots: '@eslint/core': 0.14.0 levn: 0.4.1 - '@hongzhiyuan/preact@10.24.0-3d3cc198': {} + '@hongzhiyuan/preact@10.24.0-319c684e': {} '@humanfs/core@0.19.1': {} @@ -9428,9 +9428,9 @@ snapshots: '@polka/url@1.0.0-next.25': {} - '@prefresh/core@1.5.5(preact@10.24.0)': + '@prefresh/core@1.5.5(preact@10.23.2)': dependencies: - preact: 10.24.0 + preact: 10.23.2 '@prefresh/utils@1.2.1': {} @@ -14719,7 +14719,7 @@ snapshots: picocolors: 1.1.1 source-map-js: 1.2.1 - preact@10.24.0: {} + preact@10.23.2: {} prelude-ls@1.2.1: {}