From 3ceb31d344ca301c49ec0f2fbf20ed7bcfbb5adf Mon Sep 17 00:00:00 2001 From: NexPB <1289189+NexPB@users.noreply.github.com> Date: Fri, 13 Mar 2026 15:34:45 +0900 Subject: [PATCH 1/7] refactor: switch `use-resize-observer` for `usehooks-ts` --- packages/hydrogen/package.json | 12 +-- packages/hydrogen/src/vite/plugin.ts | 2 +- .../components/FlameChartWrapper.tsx | 6 +- .../components/RequestDetails.tsx | 6 +- pnpm-lock.yaml | 81 +++++-------------- 5 files changed, 29 insertions(+), 78 deletions(-) diff --git a/packages/hydrogen/package.json b/packages/hydrogen/package.json index 692f6c180a..f154d012c6 100644 --- a/packages/hydrogen/package.json +++ b/packages/hydrogen/package.json @@ -83,39 +83,39 @@ "dist" ], "dependencies": { + "@shopify/graphql-client": "1.4.1", "@shopify/hydrogen-react": "workspace:*", "content-security-policy-builder": "^2.2.0", "flame-chart-js": "2.3.1", "isbot": "^5.1.21", "source-map-support": "^0.5.21", "type-fest": "^4.33.0", - "use-resize-observer": "^9.1.0", - "worktop": "^0.7.3", - "@shopify/graphql-client": "1.4.1" + "usehooks-ts": "^3.1.1", + "worktop": "^0.7.3" }, "devDependencies": { - "react-router": "7.12.0", "@react-router/dev": "7.12.0", "@shopify/generate-docs": "0.16.4", "@shopify/hydrogen-codegen": "workspace:*", "@testing-library/jest-dom": "^6.6.3", + "@testing-library/react": "^14.0.0", "@types/node": "catalog:", "@types/react": "catalog:", "@types/react-dom": "catalog:", - "@testing-library/react": "^14.0.0", "@types/source-map-support": "^0.5.10", "formdata-polyfill": "^4.0.10", "graphql": "^16.12.0", "happy-dom": "^20.0.0", "react": "catalog:", "react-dom": "catalog:", + "react-router": "7.12.0", "schema-dts": "^1.1.2", "vitest": "^3.2.4" }, "peerDependencies": { - "react-router": "7.12.0", "@react-router/dev": "7.12.0", "react": "^18.3.1 || ~19.0.3 || ~19.1.4 || ^19.2.3", + "react-router": "7.12.0", "vite": "^5.1.0 || ^6.2.1" }, "peerDependenciesMeta": { diff --git a/packages/hydrogen/src/vite/plugin.ts b/packages/hydrogen/src/vite/plugin.ts index 73f255d4c6..7d92975941 100644 --- a/packages/hydrogen/src/vite/plugin.ts +++ b/packages/hydrogen/src/vite/plugin.ts @@ -90,7 +90,7 @@ export function hydrogen(pluginOptions: HydrogenPluginOptions = {}): Plugin[] { 'content-security-policy-builder', 'worktop/cookie', '@shopify/hydrogen > @shopify/graphql-client', - 'use-resize-observer', + 'usehooks-ts', ] : [ // In production projects, optimize Hydrogen and critical deps diff --git a/packages/hydrogen/src/vite/virtual-routes/components/FlameChartWrapper.tsx b/packages/hydrogen/src/vite/virtual-routes/components/FlameChartWrapper.tsx index b074fabc98..df8191c5d8 100644 --- a/packages/hydrogen/src/vite/virtual-routes/components/FlameChartWrapper.tsx +++ b/packages/hydrogen/src/vite/virtual-routes/components/FlameChartWrapper.tsx @@ -11,11 +11,7 @@ import type { Timeseries, FlameChart, } from 'flame-chart-js'; - -// Type is broken in use-resize-observer -import _useResizeObserver from 'use-resize-observer'; -const useResizeObserver = - _useResizeObserver as unknown as typeof import('use-resize-observer').default; +import {useResizeObserver} from 'usehooks-ts'; declare global { // Downloaded via CDN diff --git a/packages/hydrogen/src/vite/virtual-routes/components/RequestDetails.tsx b/packages/hydrogen/src/vite/virtual-routes/components/RequestDetails.tsx index bb3913dd63..f28a40fff2 100644 --- a/packages/hydrogen/src/vite/virtual-routes/components/RequestDetails.tsx +++ b/packages/hydrogen/src/vite/virtual-routes/components/RequestDetails.tsx @@ -2,11 +2,7 @@ import {useState, useRef, useEffect} from 'react'; import {type ServerEvents} from '../lib/useDebugNetworkServer.js'; import {Link} from 'react-router'; import {IconClose} from './IconClose.jsx'; - -// Type is broken in use-resize-observer -import _useResizeObserver from 'use-resize-observer'; -const useResizeObserver = - _useResizeObserver as unknown as typeof import('use-resize-observer').default; +import {useResizeObserver} from 'usehooks-ts'; const TABS: Record = { 1: 'General', diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f4cb3cb383..f58d6f5603 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -368,7 +368,7 @@ importers: devDependencies: '@react-router/dev': specifier: 7.12.0 - version: 7.12.0(@react-router/serve@7.13.0(react-router@7.13.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.9.2))(@types/node@22.19.11)(jiti@2.6.1)(lightningcss@1.30.2)(react-router@7.13.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.9.2)(vite@6.4.1(@types/node@22.19.11)(jiti@2.6.1)(lightningcss@1.30.2)(yaml@2.8.2))(yaml@2.8.2) + version: 7.12.0(@react-router/serve@7.13.0(react-router@7.12.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.9.2))(@types/node@22.19.11)(jiti@2.6.1)(lightningcss@1.30.2)(react-router@7.12.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.9.2)(vite@6.4.1(@types/node@22.19.11)(jiti@2.6.1)(lightningcss@1.30.2)(yaml@2.8.2))(yaml@2.8.2) '@types/diff': specifier: ^5.0.2 version: 5.2.3 @@ -451,9 +451,9 @@ importers: type-fest: specifier: ^4.33.0 version: 4.41.0 - use-resize-observer: - specifier: ^9.1.0 - version: 9.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + usehooks-ts: + specifier: ^3.1.1 + version: 3.1.1(react@18.3.1) vite: specifier: ^6.2.1 version: 6.4.1(@types/node@22.19.11)(jiti@2.6.1)(lightningcss@1.30.2)(yaml@2.8.2) @@ -6108,6 +6108,9 @@ packages: resolution: {integrity: sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + lodash.debounce@4.0.8: + resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==} + lodash.defaults@4.2.0: resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==} @@ -8298,6 +8301,12 @@ packages: peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 + usehooks-ts@3.1.1: + resolution: {integrity: sha512-I4diPp9Cq6ieSUH2wu+fDAVQO43xwtulo+fKEidHUwZPnYImbtkTjzIJYcDcJqxgmX31GVqNFURodvcgHcW0pA==} + engines: {node: '>=16.15.0'} + peerDependencies: + react: ^16.8.0 || ^17 || ^18 || ^19 || ^19.0.0-rc + util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} @@ -10641,56 +10650,6 @@ snapshots: - tsx - yaml - '@react-router/dev@7.12.0(@react-router/serve@7.13.0(react-router@7.13.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.9.2))(@types/node@22.19.11)(jiti@2.6.1)(lightningcss@1.30.2)(react-router@7.13.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.9.2)(vite@6.4.1(@types/node@22.19.11)(jiti@2.6.1)(lightningcss@1.30.2)(yaml@2.8.2))(yaml@2.8.2)': - dependencies: - '@babel/core': 7.29.0 - '@babel/generator': 7.29.1 - '@babel/parser': 7.29.0 - '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.29.0) - '@babel/preset-typescript': 7.28.5(@babel/core@7.29.0) - '@babel/traverse': 7.29.0 - '@babel/types': 7.29.0 - '@react-router/node': 7.12.0(react-router@7.13.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.9.2) - '@remix-run/node-fetch-server': 0.9.0 - arg: 5.0.2 - babel-dead-code-elimination: 1.0.12 - chokidar: 4.0.3 - dedent: 1.7.1 - es-module-lexer: 1.7.0 - exit-hook: 2.2.1 - isbot: 5.1.35 - jsesc: 3.0.2 - lodash: 4.17.23 - p-map: 7.0.4 - pathe: 1.1.2 - picocolors: 1.1.1 - pkg-types: 2.3.0 - prettier: 3.8.1 - react-refresh: 0.14.2 - react-router: 7.13.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - semver: 7.7.4 - tinyglobby: 0.2.15 - valibot: 1.2.0(typescript@5.9.2) - vite: 6.4.1(@types/node@22.19.11)(jiti@2.6.1)(lightningcss@1.30.2)(yaml@2.8.2) - vite-node: 3.2.4(@types/node@22.19.11)(jiti@2.6.1)(lightningcss@1.30.2)(yaml@2.8.2) - optionalDependencies: - '@react-router/serve': 7.13.0(react-router@7.13.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.9.2) - typescript: 5.9.2 - transitivePeerDependencies: - - '@types/node' - - babel-plugin-macros - - jiti - - less - - lightningcss - - sass - - sass-embedded - - stylus - - sugarss - - supports-color - - terser - - tsx - - yaml - '@react-router/dev@7.13.0(@react-router/serve@7.13.0(react-router@7.13.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.9.2))(@types/node@22.19.11)(jiti@2.6.1)(lightningcss@1.30.2)(react-router@7.13.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.9.2)(vite@6.4.1(@types/node@22.19.11)(jiti@2.6.1)(lightningcss@1.30.2)(yaml@2.8.2))(yaml@2.8.2)': dependencies: '@babel/core': 7.29.0 @@ -10779,13 +10738,6 @@ snapshots: optionalDependencies: typescript: 5.9.2 - '@react-router/node@7.12.0(react-router@7.13.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.9.2)': - dependencies: - '@mjackson/node-fetch-server': 0.2.0 - react-router: 7.13.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - optionalDependencies: - typescript: 5.9.2 - '@react-router/node@7.13.0(react-router@7.12.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.9.2)': dependencies: '@mjackson/node-fetch-server': 0.2.0 @@ -14885,6 +14837,8 @@ snapshots: dependencies: p-locate: 6.0.0 + lodash.debounce@4.0.8: {} + lodash.defaults@4.2.0: {} lodash.difference@4.5.0: {} @@ -17455,6 +17409,11 @@ snapshots: dependencies: react: 18.3.1 + usehooks-ts@3.1.1(react@18.3.1): + dependencies: + lodash.debounce: 4.0.8 + react: 18.3.1 + util-deprecate@1.0.2: {} utils-merge@1.0.1: {} From a392fe4f8dc2e8e4a49b9f3ca974d127343b49eb Mon Sep 17 00:00:00 2001 From: NexPB <1289189+NexPB@users.noreply.github.com> Date: Tue, 17 Mar 2026 08:32:20 +0900 Subject: [PATCH 2/7] refactor: do not rely on any deps --- packages/hydrogen/package.json | 1 - packages/hydrogen/src/vite/plugin.ts | 1 - .../components/FlameChartWrapper.tsx | 2 +- .../components/RequestDetails.tsx | 2 +- .../components/useResizeObserver.ts | 50 +++++++++++++++++++ pnpm-lock.yaml | 19 ------- 6 files changed, 52 insertions(+), 23 deletions(-) create mode 100644 packages/hydrogen/src/vite/virtual-routes/components/useResizeObserver.ts diff --git a/packages/hydrogen/package.json b/packages/hydrogen/package.json index f154d012c6..16e789d949 100644 --- a/packages/hydrogen/package.json +++ b/packages/hydrogen/package.json @@ -90,7 +90,6 @@ "isbot": "^5.1.21", "source-map-support": "^0.5.21", "type-fest": "^4.33.0", - "usehooks-ts": "^3.1.1", "worktop": "^0.7.3" }, "devDependencies": { diff --git a/packages/hydrogen/src/vite/plugin.ts b/packages/hydrogen/src/vite/plugin.ts index 7d92975941..ff024afe91 100644 --- a/packages/hydrogen/src/vite/plugin.ts +++ b/packages/hydrogen/src/vite/plugin.ts @@ -90,7 +90,6 @@ export function hydrogen(pluginOptions: HydrogenPluginOptions = {}): Plugin[] { 'content-security-policy-builder', 'worktop/cookie', '@shopify/hydrogen > @shopify/graphql-client', - 'usehooks-ts', ] : [ // In production projects, optimize Hydrogen and critical deps diff --git a/packages/hydrogen/src/vite/virtual-routes/components/FlameChartWrapper.tsx b/packages/hydrogen/src/vite/virtual-routes/components/FlameChartWrapper.tsx index df8191c5d8..8e6fe541a2 100644 --- a/packages/hydrogen/src/vite/virtual-routes/components/FlameChartWrapper.tsx +++ b/packages/hydrogen/src/vite/virtual-routes/components/FlameChartWrapper.tsx @@ -11,7 +11,7 @@ import type { Timeseries, FlameChart, } from 'flame-chart-js'; -import {useResizeObserver} from 'usehooks-ts'; +import {useResizeObserver} from './useResizeObserver.js'; declare global { // Downloaded via CDN diff --git a/packages/hydrogen/src/vite/virtual-routes/components/RequestDetails.tsx b/packages/hydrogen/src/vite/virtual-routes/components/RequestDetails.tsx index f28a40fff2..bed54040d1 100644 --- a/packages/hydrogen/src/vite/virtual-routes/components/RequestDetails.tsx +++ b/packages/hydrogen/src/vite/virtual-routes/components/RequestDetails.tsx @@ -2,7 +2,7 @@ import {useState, useRef, useEffect} from 'react'; import {type ServerEvents} from '../lib/useDebugNetworkServer.js'; import {Link} from 'react-router'; import {IconClose} from './IconClose.jsx'; -import {useResizeObserver} from 'usehooks-ts'; +import {useResizeObserver} from './useResizeObserver.js'; const TABS: Record = { 1: 'General', diff --git a/packages/hydrogen/src/vite/virtual-routes/components/useResizeObserver.ts b/packages/hydrogen/src/vite/virtual-routes/components/useResizeObserver.ts new file mode 100644 index 0000000000..90b5e81eb9 --- /dev/null +++ b/packages/hydrogen/src/vite/virtual-routes/components/useResizeObserver.ts @@ -0,0 +1,50 @@ +import {useEffect, useRef, type RefObject} from 'react'; + +type ResizeObserverSize = { + width?: number; + height?: number; +}; + +type UseResizeObserverOptions = { + ref: RefObject; + onResize: (size: ResizeObserverSize) => void; +}; + +/** + * A hook that observes the resize of an element and calls a callback with the new size. + * @param ref - The ref to the element to observe + * @param onResize - The callback to call when the element is resized + */ +export function useResizeObserver({ + ref, + onResize, +}: UseResizeObserverOptions) { + const frameID = useRef(0); + const onResizeRef = useRef(onResize); + onResizeRef.current = onResize; + + useEffect(() => { + const element = ref.current; + if (!element) return; + + const observer = new ResizeObserver(([entry]) => { + if (!entry) return; + + cancelAnimationFrame(frameID.current); + + frameID.current = requestAnimationFrame(() => { + const {width, height} = entry.contentRect; + onResizeRef.current?.({width, height}); + }); + }); + + observer.observe(element); + return () => { + observer.disconnect(); + + if (frameID.current) { + cancelAnimationFrame(frameID.current); + } + }; + }, [ref]); +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f58d6f5603..6ba9007fcb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -451,9 +451,6 @@ importers: type-fest: specifier: ^4.33.0 version: 4.41.0 - usehooks-ts: - specifier: ^3.1.1 - version: 3.1.1(react@18.3.1) vite: specifier: ^6.2.1 version: 6.4.1(@types/node@22.19.11)(jiti@2.6.1)(lightningcss@1.30.2)(yaml@2.8.2) @@ -6108,9 +6105,6 @@ packages: resolution: {integrity: sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - lodash.debounce@4.0.8: - resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==} - lodash.defaults@4.2.0: resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==} @@ -8301,12 +8295,6 @@ packages: peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 - usehooks-ts@3.1.1: - resolution: {integrity: sha512-I4diPp9Cq6ieSUH2wu+fDAVQO43xwtulo+fKEidHUwZPnYImbtkTjzIJYcDcJqxgmX31GVqNFURodvcgHcW0pA==} - engines: {node: '>=16.15.0'} - peerDependencies: - react: ^16.8.0 || ^17 || ^18 || ^19 || ^19.0.0-rc - util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} @@ -14837,8 +14825,6 @@ snapshots: dependencies: p-locate: 6.0.0 - lodash.debounce@4.0.8: {} - lodash.defaults@4.2.0: {} lodash.difference@4.5.0: {} @@ -17409,11 +17395,6 @@ snapshots: dependencies: react: 18.3.1 - usehooks-ts@3.1.1(react@18.3.1): - dependencies: - lodash.debounce: 4.0.8 - react: 18.3.1 - util-deprecate@1.0.2: {} utils-merge@1.0.1: {} From a9fb4d223b4b37ec035726b6545d0fd60b964b7d Mon Sep 17 00:00:00 2001 From: NexPB <1289189+NexPB@users.noreply.github.com> Date: Tue, 17 Mar 2026 08:38:28 +0900 Subject: [PATCH 3/7] chore: changeset log --- .changeset/seven-berries-check.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/seven-berries-check.md diff --git a/.changeset/seven-berries-check.md b/.changeset/seven-berries-check.md new file mode 100644 index 0000000000..fe08e8fd88 --- /dev/null +++ b/.changeset/seven-berries-check.md @@ -0,0 +1,5 @@ +--- +'@shopify/hydrogen': patch +--- + +Removed `use-resize-observer` third-party dependency and replaced it with a custom useResizeObserver hook using native browser APIs. From ad7f78a60d7a911a280a75e778d6d40142928947 Mon Sep 17 00:00:00 2001 From: freddie Date: Tue, 17 Mar 2026 12:51:02 +0000 Subject: [PATCH 4/7] fix: support .ts files in virtual-routes build pipeline MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The virtual-routes build pipeline assumed all source files were .tsx. The new useResizeObserver.ts hook (correctly .ts — no JSX) was excluded from tsup entry globs and the build-check extension mapping couldn't resolve it. - Widen tsup entry globs from `**/*.tsx` to `**/*.{ts,tsx}` in both CLI and Hydrogen configs - Fix build-check.mjs to map both .ts and .tsx to .jsx using a regex, and remove the dead .replace('src', 'dist') call (cherry picked from commit 30002f293b3df1cf985a4f9d824bf852e61e84ea) --- packages/cli/scripts/build-check.mjs | 2 +- packages/cli/tsup.config.ts | 2 +- packages/hydrogen/tsup.config.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/cli/scripts/build-check.mjs b/packages/cli/scripts/build-check.mjs index f73a01b8db..0121904424 100644 --- a/packages/cli/scripts/build-check.mjs +++ b/packages/cli/scripts/build-check.mjs @@ -15,7 +15,7 @@ for (const srcEntry of srcEntries) { // skip .DS_Store files if (srcEntry.endsWith('.DS_Store')) continue; - const distEntry = srcEntry.replace('src', 'dist').replace('.tsx', '.jsx'); + const distEntry = srcEntry.replace(/\.tsx?$/, '.jsx'); if (!distEntries.includes(distEntry)) { throw new Error('CLI build check failed! Missing: ' + distEntry); } diff --git a/packages/cli/tsup.config.ts b/packages/cli/tsup.config.ts index 509622309c..92b582e068 100644 --- a/packages/cli/tsup.config.ts +++ b/packages/cli/tsup.config.ts @@ -72,7 +72,7 @@ export default defineConfig([ { ...commonConfig, // TODO remove virtual routes copy when deprecating classic compiler - entry: ['../hydrogen/src/vite/virtual-routes/**/*.tsx'], + entry: ['../hydrogen/src/vite/virtual-routes/**/*.{ts,tsx}'], outDir: `${outDir}/${ASSETS_DIR_PREFIX}/virtual-routes`, outExtension: () => ({js: '.jsx'}), dts: false, diff --git a/packages/hydrogen/tsup.config.ts b/packages/hydrogen/tsup.config.ts index 5fd09e326e..09d92b14d7 100644 --- a/packages/hydrogen/tsup.config.ts +++ b/packages/hydrogen/tsup.config.ts @@ -110,7 +110,7 @@ export default defineConfig([ dts: true, }, { - entry: ['src/vite/virtual-routes/**/*.tsx'], + entry: ['src/vite/virtual-routes/**/*.{ts,tsx}'], outDir: `${outDir}/vite/virtual-routes`, outExtension: () => ({js: '.jsx'}), format: 'esm', From 3f5d27f5a45a62c3db0bce2fc8f7726d96284e65 Mon Sep 17 00:00:00 2001 From: NexPB <1289189+NexPB@users.noreply.github.com> Date: Wed, 8 Apr 2026 21:47:30 +0900 Subject: [PATCH 5/7] Update packages/hydrogen/src/vite/virtual-routes/components/FlameChartWrapper.tsx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: ✦ freddie <45042736+fredericoo@users.noreply.github.com> --- .../src/vite/virtual-routes/components/FlameChartWrapper.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/hydrogen/src/vite/virtual-routes/components/FlameChartWrapper.tsx b/packages/hydrogen/src/vite/virtual-routes/components/FlameChartWrapper.tsx index 8e6fe541a2..7d140966fb 100644 --- a/packages/hydrogen/src/vite/virtual-routes/components/FlameChartWrapper.tsx +++ b/packages/hydrogen/src/vite/virtual-routes/components/FlameChartWrapper.tsx @@ -11,7 +11,7 @@ import type { Timeseries, FlameChart, } from 'flame-chart-js'; -import {useResizeObserver} from './useResizeObserver.js'; +import {useResizeObserver} from './useResizeObserver.jsx'; declare global { // Downloaded via CDN From d1f30177312bdb1f0cb9dff18d4827dae89b2494 Mon Sep 17 00:00:00 2001 From: NexPB <1289189+NexPB@users.noreply.github.com> Date: Wed, 8 Apr 2026 21:47:39 +0900 Subject: [PATCH 6/7] Update packages/hydrogen/src/vite/virtual-routes/components/RequestDetails.tsx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: ✦ freddie <45042736+fredericoo@users.noreply.github.com> --- .../src/vite/virtual-routes/components/RequestDetails.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/hydrogen/src/vite/virtual-routes/components/RequestDetails.tsx b/packages/hydrogen/src/vite/virtual-routes/components/RequestDetails.tsx index bed54040d1..aaefe306f9 100644 --- a/packages/hydrogen/src/vite/virtual-routes/components/RequestDetails.tsx +++ b/packages/hydrogen/src/vite/virtual-routes/components/RequestDetails.tsx @@ -2,7 +2,7 @@ import {useState, useRef, useEffect} from 'react'; import {type ServerEvents} from '../lib/useDebugNetworkServer.js'; import {Link} from 'react-router'; import {IconClose} from './IconClose.jsx'; -import {useResizeObserver} from './useResizeObserver.js'; +import {useResizeObserver} from './useResizeObserver.jsx'; const TABS: Record = { 1: 'General', From 16df62457f67cd618348931ae5c1014b8946e2c9 Mon Sep 17 00:00:00 2001 From: NexPB Date: Wed, 8 Apr 2026 22:07:37 +0900 Subject: [PATCH 7/7] fixup! remove from package.json --- packages/cli/package.json | 3 +-- pnpm-lock.yaml | 20 -------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index dd26df42a0..33edefdf9e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -58,8 +58,7 @@ "source-map-support": "^0.5.21", "tar-fs": "^2.1.1", "tempy": "3.0.0", - "ts-morph": "20.0.0", - "use-resize-observer": "^9.1.0" + "ts-morph": "20.0.0" }, "peerDependencies": { "@graphql-codegen/cli": "^5.0.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a004ed1108..d0b9d9e58b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -365,9 +365,6 @@ importers: ts-morph: specifier: 20.0.0 version: 20.0.0 - use-resize-observer: - specifier: ^9.1.0 - version: 9.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) devDependencies: '@react-router/dev': specifier: 7.12.0 @@ -2315,9 +2312,6 @@ packages: '@jsdevtools/ono@7.1.3': resolution: {integrity: sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==} - '@juggle/resize-observer@3.4.0': - resolution: {integrity: sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==} - '@kwsites/file-exists@1.1.1': resolution: {integrity: sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==} @@ -8267,12 +8261,6 @@ packages: urlpattern-polyfill@8.0.2: resolution: {integrity: sha512-Qp95D4TPJl1kC9SKigDcqgyM2VDVO4RiJc2d4qe5GrYm+zbIQCWWKAFaJNQ4BhdFeDGwBmAxqJBwWSJDb9T3BQ==} - use-resize-observer@9.1.0: - resolution: {integrity: sha512-R25VqO9Wb3asSD4eqtcxk8sJalvIOYBqS8MNZlpDSQ4l4xMQxC/J7Id9HoTqPq8FwULIn0PVW+OAqF2dyYbjow==} - peerDependencies: - react: 16.8.0 - 18 - react-dom: 16.8.0 - 18 - util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} @@ -10230,8 +10218,6 @@ snapshots: '@jsdevtools/ono@7.1.3': {} - '@juggle/resize-observer@3.4.0': {} - '@kwsites/file-exists@1.1.1': dependencies: debug: 4.4.3(supports-color@8.1.1) @@ -17422,12 +17408,6 @@ snapshots: urlpattern-polyfill@8.0.2: {} - use-resize-observer@9.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): - dependencies: - '@juggle/resize-observer': 3.4.0 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - util-deprecate@1.0.2: {} utils-merge@1.0.1: {}