Skip to content

Commit 61083aa

Browse files
Fix peer dependencies issues
1 parent 59efb72 commit 61083aa

File tree

17 files changed

+594
-728
lines changed

17 files changed

+594
-728
lines changed

package.json

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@
7474
"octokit-plugin-create-pull-request": "^3.12.2",
7575
"pathe": "1.1.1",
7676
"pin-github-action": "^3.3.1",
77-
"rimraf": "^3.0.2",
77+
"rimraf": "^6.1.3",
7878
"tmp": "^0.2.5",
7979
"ts-node": "^10.9.1",
8080
"typescript": "5.8.3",
8181
"vitest": "^3.1.4",
82-
"zod": "^3.24.1"
82+
"zod": "~3.24.4"
8383
},
8484
"workspaces": {
8585
"packages": [
@@ -96,6 +96,22 @@
9696
"printWidth": 120
9797
},
9898
"version": "0.0.0",
99+
"pnpm": {
100+
"peerDependencyRules": {
101+
"allowedVersions": {
102+
"@shopify/cli-hydrogen>@graphql-codegen/cli": "6.0.1"
103+
}
104+
},
105+
"onlyBuiltDependencies": [
106+
"@parcel/watcher",
107+
"esbuild",
108+
"msw",
109+
"nx",
110+
"protobufjs",
111+
"unrs-resolver",
112+
"yarn"
113+
]
114+
},
99115
"resolutions": {
100116
"@types/react": "18.3.12",
101117
"vite": "6.4.1",
@@ -286,7 +302,8 @@
286302
],
287303
"project": "**/*.{ts,tsx}!",
288304
"ignoreDependencies": [
289-
"@shopify/react-testing"
305+
"@shopify/react-testing",
306+
"react-dom"
290307
]
291308
},
292309
"packages/ui-extensions-test-utils": {

packages/app/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"http-proxy-node16": "1.0.6",
7070
"ignore": "6.0.2",
7171
"json-schema-to-typescript": "15.0.4",
72-
"prettier": "2.8.8",
72+
"prettier": "3.8.1",
7373
"proper-lockfile": "4.1.2",
7474
"react": "^18.2.0",
7575
"react-dom": "18.3.1",
@@ -80,7 +80,6 @@
8080
"@types/body-parser": "^1.19.2",
8181
"@types/diff": "^5.0.3",
8282
"@types/express": "^4.17.17",
83-
"@types/prettier": "^2.7.3",
8483
"@types/proper-lockfile": "4.1.4",
8584
"@types/react": "^18.2.0",
8685
"@types/react-dom": "^18.2.0",

packages/cli-kit/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
"terminal-link": "3.0.0",
163163
"ts-error": "1.0.6",
164164
"which": "4.0.0",
165-
"zod": "3.24.1"
165+
"zod": "3.24.4"
166166
},
167167
"devDependencies": {
168168
"@types/brotli": "^1.3.4",

packages/eslint-plugin-cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"debug": "4.4.0"
3636
},
3737
"devDependencies": {
38-
"prettier": "2.8.8"
38+
"prettier": "3.8.1"
3939
},
4040
"peerDependencies": {
4141
"eslint": "^9.0.0"

packages/features/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
"@cucumber/messages": "30.1.0",
3232
"@cucumber/pretty-formatter": "2.4.1",
3333
"@types/fs-extra": "^9.0.13",
34-
"@types/rimraf": "^3.0.2",
3534
"fs-extra": "^9.1.0",
3635
"tempy": "^1.0.1"
3736
},

packages/features/steps/environment.steps.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {writeFile} from '../lib/fs.js'
22
import {Given, After, setDefaultTimeout} from '@cucumber/cucumber'
33
import tempy from 'tempy'
4-
import rimraf from 'rimraf'
4+
import {rimrafSync} from 'rimraf'
55
import * as path from 'pathe'
66

77
// In the case of debug we want to disable
@@ -35,6 +35,6 @@ Given('I have a working directory', async function () {
3535

3636
After(function () {
3737
if (this.temporaryDirectory) {
38-
rimraf.sync(this.temporaryDirectory)
38+
rimrafSync(this.temporaryDirectory)
3939
}
4040
})

packages/ui-extensions-dev-console/package.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,22 @@
1313
},
1414
"dependencies": {
1515
"@shopify/polaris-icons": "^8.0.0",
16-
"@shopify/react-i18n": "^6.1.0",
16+
"@shopify/react-i18n": "^7.5.0",
1717
"@shopify/ui-extensions-server-kit": "5.4.0",
1818
"copy-to-clipboard": "^3.3.3",
19-
"qrcode.react": "^1.0.1",
20-
"react": "^17.0.2",
21-
"react-dom": "^17.0.2",
19+
"qrcode.react": "^4.2.0",
20+
"react": "^18.2.0",
21+
"react-dom": "^18.2.0",
2222
"react-router-dom": "^6.14.2",
2323
"react-toastify": "^9.1.3",
2424
"react-transition-group": "^4.4.5"
2525
},
2626
"devDependencies": {
27-
"@shopify/react-testing": "^3.0.0",
27+
"@shopify/react-testing": "^5.3.0",
2828
"@shopify/ui-extensions-test-utils": "3.26.0",
29-
"@types/qrcode.react": "^1.0.2",
30-
"@types/react": "16.14.0",
31-
"@types/react-dom": "^16.9.11",
32-
"@vitejs/plugin-react-refresh": "^1.3.6",
29+
"@types/react": "^18.2.0",
30+
"@types/react-dom": "^18.2.0",
31+
"@vitejs/plugin-react": "^5.1.4",
3332
"jsdom": "^20.0.3",
3433
"sass": "^1.83.1",
3534
"vite": "6.4.1"
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import App from './App'
22
import React from 'react'
3-
import ReactDOM from 'react-dom'
3+
import {createRoot} from 'react-dom/client'
44

5-
ReactDOM.render(
5+
createRoot(document.getElementById('root')!).render(
66
<React.StrictMode>
77
<App />
88
</React.StrictMode>,
9-
document.getElementById('root'),
109
)

packages/ui-extensions-dev-console/src/sections/Extensions/components/QRCodeModal/QRCodeModal.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {mockI18n} from 'tests/mock-i18n'
44
import {DefaultProviders} from 'tests/DefaultProviders'
55
import {Modal} from '@/components/Modal'
66
import React from 'react'
7-
import QRCode from 'qrcode.react'
7+
import {QRCodeCanvas as QRCode} from 'qrcode.react'
88
import {mockApp, mockExtension} from '@shopify/ui-extensions-server-kit/testing'
99
import {render, withProviders} from '@shopify/ui-extensions-test-utils'
1010

packages/ui-extensions-dev-console/src/sections/Extensions/components/QRCodeModal/QRCodeModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {IconButton} from '@/components/IconButton'
66
import React, {useCallback, useMemo} from 'react'
77
import {useI18n} from '@shopify/react-i18n'
88
import copyToClipboard from 'copy-to-clipboard'
9-
import QRCode from 'qrcode.react'
9+
import {QRCodeCanvas as QRCode} from 'qrcode.react'
1010
import {toast} from 'react-toastify'
1111
import {Surface} from '@shopify/ui-extensions-server-kit'
1212
import {ClipboardIcon} from '@shopify/polaris-icons'

0 commit comments

Comments
 (0)