Skip to content

Commit

Permalink
Merge branch 'master' into pr/aryaemami59/4081
Browse files Browse the repository at this point in the history
  • Loading branch information
@EskiMojo14
EskiMojo14 committed Jan 27, 2024
2 parents 5fc7871 + d1fa1b1 commit 9eb7331
Show file tree
Hide file tree
Showing 16 changed files with 58 additions and 82 deletions.
2 changes: 1 addition & 1 deletion examples/publish-ci/cra4/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@types/react": "^18.0.26",
"@types/react-dom": "^18.0.10",
"playwright": "^1.31.1",
"prettier": "^2.8.4",
"prettier": "^3.2.4",
"serve": "^14.2.0",
"typescript": "^4.9.4"
}
Expand Down
12 changes: 6 additions & 6 deletions examples/publish-ci/cra4/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12795,12 +12795,12 @@ __metadata:
languageName: node
linkType: hard

"prettier@npm:^2.8.4":
version: 2.8.4
resolution: "prettier@npm:2.8.4"
"prettier@npm:^3.2.4":
version: 3.2.4
resolution: "prettier@npm:3.2.4"
bin:
prettier: bin-prettier.js
checksum: c173064bf3df57b6d93d19aa98753b9b9dd7657212e33b41ada8e2e9f9884066bb9ca0b4005b89b3ab137efffdf8fbe0b462785aba20364798ff4303aadda57e
prettier: bin/prettier.cjs
checksum: 6ec9385a836e0b9bac549e585101c086d1521c31d7b882d5c8bb7d7646da0693da5f31f4fff6dc080710e5e2d34c85e6fb2f8766876b3645c8be2f33b9c3d1a3
languageName: node
linkType: hard

Expand Down Expand Up @@ -13960,7 +13960,7 @@ __metadata:
"@types/react-dom": ^18.0.10
msw: ^1.3.2
playwright: ^1.31.1
prettier: ^2.8.4
prettier: ^3.2.4
react: ^18.2.0
react-dom: ^18.2.0
react-redux: ^9.0.0-rc.0
Expand Down
2 changes: 1 addition & 1 deletion examples/publish-ci/cra5/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@types/react": "^18.0.26",
"@types/react-dom": "^18.0.10",
"playwright": "^1.31.1",
"prettier": "^2.8.4",
"prettier": "^3.2.4",
"serve": "^14.2.0",
"typescript": "^4.9.4"
}
Expand Down
12 changes: 6 additions & 6 deletions examples/publish-ci/cra5/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10896,12 +10896,12 @@ __metadata:
languageName: node
linkType: hard

"prettier@npm:^2.8.4":
version: 2.8.4
resolution: "prettier@npm:2.8.4"
"prettier@npm:^3.2.4":
version: 3.2.4
resolution: "prettier@npm:3.2.4"
bin:
prettier: bin-prettier.js
checksum: c173064bf3df57b6d93d19aa98753b9b9dd7657212e33b41ada8e2e9f9884066bb9ca0b4005b89b3ab137efffdf8fbe0b462785aba20364798ff4303aadda57e
prettier: bin/prettier.cjs
checksum: 6ec9385a836e0b9bac549e585101c086d1521c31d7b882d5c8bb7d7646da0693da5f31f4fff6dc080710e5e2d34c85e6fb2f8766876b3645c8be2f33b9c3d1a3
languageName: node
linkType: hard

Expand Down Expand Up @@ -11749,7 +11749,7 @@ __metadata:
"@types/react-dom": ^18.0.10
msw: ^1.3.2
playwright: ^1.31.1
prettier: ^2.8.4
prettier: ^3.2.4
react: ^18.2.0
react-dom: ^18.2.0
react-redux: ^9.0.0-rc.0
Expand Down
2 changes: 1 addition & 1 deletion examples/publish-ci/expo/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"eslint-plugin-prettier": "^5.0.1",
"jest": "^29.7.0",
"jest-expo": "^49.0.0",
"prettier": "^3.1.1",
"prettier": "^3.2.4",
"ts-node": "^10.9.2",
"typescript": "^5.1.3"
},
Expand Down
10 changes: 5 additions & 5 deletions examples/publish-ci/expo/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6050,7 +6050,7 @@ __metadata:
expo-status-bar: ~1.6.0
jest: ^29.7.0
jest-expo: ^49.0.0
prettier: ^3.1.1
prettier: ^3.2.4
react: 18.2.0
react-native: 0.72.6
react-redux: ^9.0.4
Expand Down Expand Up @@ -10172,12 +10172,12 @@ __metadata:
languageName: node
linkType: hard

"prettier@npm:^3.1.1":
version: 3.1.1
resolution: "prettier@npm:3.1.1"
"prettier@npm:^3.2.4":
version: 3.2.4
resolution: "prettier@npm:3.2.4"
bin:
prettier: bin/prettier.cjs
checksum: e386855e3a1af86a748e16953f168be555ce66d6233f4ba54eb6449b88eb0c6b2ca79441b11eae6d28a7f9a5c96440ce50864b9d5f6356d331d39d6bb66c648e
checksum: 6ec9385a836e0b9bac549e585101c086d1521c31d7b882d5c8bb7d7646da0693da5f31f4fff6dc080710e5e2d34c85e6fb2f8766876b3645c8be2f33b9c3d1a3
languageName: node
linkType: hard

Expand Down
2 changes: 1 addition & 1 deletion examples/publish-ci/next/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@types/react": "^18.0.26",
"@types/react-dom": "^18.0.10",
"playwright": "^1.31.1",
"prettier": "^2.8.4",
"prettier": "^3.2.4",
"serve": "^14.2.0",
"typescript": "^4.9.4"
},
Expand Down
12 changes: 6 additions & 6 deletions examples/publish-ci/next/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2863,12 +2863,12 @@ __metadata:
languageName: node
linkType: hard

"prettier@npm:^2.8.4":
version: 2.8.4
resolution: "prettier@npm:2.8.4"
"prettier@npm:^3.2.4":
version: 3.2.4
resolution: "prettier@npm:3.2.4"
bin:
prettier: bin-prettier.js
checksum: c173064bf3df57b6d93d19aa98753b9b9dd7657212e33b41ada8e2e9f9884066bb9ca0b4005b89b3ab137efffdf8fbe0b462785aba20364798ff4303aadda57e
prettier: bin/prettier.cjs
checksum: 6ec9385a836e0b9bac549e585101c086d1521c31d7b882d5c8bb7d7646da0693da5f31f4fff6dc080710e5e2d34c85e6fb2f8766876b3645c8be2f33b9c3d1a3
languageName: node
linkType: hard

Expand Down Expand Up @@ -3157,7 +3157,7 @@ __metadata:
msw: ^1.3.2
next: ^13.2
playwright: ^1.31.1
prettier: ^2.8.4
prettier: ^3.2.4
react: ^18.2.0
react-dom: ^18.2.0
react-redux: ^9.0.0-rc.0
Expand Down
2 changes: 1 addition & 1 deletion examples/publish-ci/react-native/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"jest": "^29.7.0",
"prettier": "^3.2.1",
"prettier": "^3.2.4",
"react-test-renderer": "18.2.0",
"ts-node": "^10.9.2",
"typescript": "^5.3.3"
Expand Down
10 changes: 5 additions & 5 deletions examples/publish-ci/react-native/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7805,12 +7805,12 @@ __metadata:
languageName: node
linkType: hard

"prettier@npm:^3.2.1":
version: 3.2.1
resolution: "prettier@npm:3.2.1"
"prettier@npm:^3.2.4":
version: 3.2.4
resolution: "prettier@npm:3.2.4"
bin:
prettier: bin/prettier.cjs
checksum: 01a5fcf1db4e8172365473e540a328304e501a20bf9b4577e359e431e480d602bcf082d51020aba24bd70ceda528632c6ff8039cedb2d430aeb4af2ca7652817
checksum: 6ec9385a836e0b9bac549e585101c086d1521c31d7b882d5c8bb7d7646da0693da5f31f4fff6dc080710e5e2d34c85e6fb2f8766876b3645c8be2f33b9c3d1a3
languageName: node
linkType: hard

Expand Down Expand Up @@ -7982,7 +7982,7 @@ __metadata:
eslint-config-prettier: ^9.1.0
eslint-plugin-prettier: ^5.1.3
jest: ^29.7.0
prettier: ^3.2.1
prettier: ^3.2.4
react: 18.2.0
react-native: ^0.73.2
react-redux: ^9.1.0
Expand Down
2 changes: 1 addition & 1 deletion examples/publish-ci/vite/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@types/react-dom": "^18.0.10",
"@vitejs/plugin-react": "^3.0.0",
"playwright": "^1.31.1",
"prettier": "^2.8.4",
"prettier": "^3.2.4",
"serve": "^14.2.0",
"typescript": "^4.9.4",
"vite": "^4.2.1"
Expand Down
12 changes: 6 additions & 6 deletions examples/publish-ci/vite/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3316,12 +3316,12 @@ __metadata:
languageName: node
linkType: hard

"prettier@npm:^2.8.4":
version: 2.8.4
resolution: "prettier@npm:2.8.4"
"prettier@npm:^3.2.4":
version: 3.2.4
resolution: "prettier@npm:3.2.4"
bin:
prettier: bin-prettier.js
checksum: c173064bf3df57b6d93d19aa98753b9b9dd7657212e33b41ada8e2e9f9884066bb9ca0b4005b89b3ab137efffdf8fbe0b462785aba20364798ff4303aadda57e
prettier: bin/prettier.cjs
checksum: 6ec9385a836e0b9bac549e585101c086d1521c31d7b882d5c8bb7d7646da0693da5f31f4fff6dc080710e5e2d34c85e6fb2f8766876b3645c8be2f33b9c3d1a3
languageName: node
linkType: hard

Expand Down Expand Up @@ -3657,7 +3657,7 @@ __metadata:
"@vitejs/plugin-react": ^3.0.0
msw: ^1.3.2
playwright: ^1.31.1
prettier: ^2.8.4
prettier: ^3.2.4
react: ^18.2.0
react-dom: ^18.2.0
react-redux: ^9.0.0-rc.0
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@
"@typescript-eslint/eslint-plugin": "6.12.0",
"@typescript-eslint/parser": "6.12.0",
"eslint": "^7.25.0",
"eslint-config-prettier": "^8.3.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-flowtype": "^5.7.2",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.23.2",
"eslint-plugin-react-hooks": "^4.2.0",
"netlify-plugin-cache": "^1.0.3",
"prettier": "^2.2.1",
"prettier": "^3.2.4",
"release-it": "^14.12.5",
"serve": "^14.2.0",
"typescript": "^5.2.2"
Expand Down
6 changes: 3 additions & 3 deletions packages/toolkit/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@
"console-testing-library": "0.6.1",
"esbuild-extra": "^0.3.1",
"eslint": "^7.25.0",
"eslint-config-prettier": "^8.3.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-flowtype": "^5.7.2",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.23.2",
"eslint-plugin-react-hooks": "^4.2.0",
"fs-extra": "^9.1.0",
Expand All @@ -82,7 +82,7 @@
"json-stringify-safe": "^5.0.1",
"msw": "^2.1.4",
"node-fetch": "^3.3.2",
"prettier": "^2.2.1",
"prettier": "^3.2.4",
"query-string": "^7.0.1",
"rimraf": "^3.0.2",
"size-limit": "^4.11.0",
Expand Down
3 changes: 2 additions & 1 deletion website/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
]
},
"devDependencies": {
"netlify-plugin-cache": "^1.0.3"
"netlify-plugin-cache": "^1.0.3",
"prettier": "^3.2.4"
}
}
45 changes: 10 additions & 35 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7280,9 +7280,9 @@ __metadata:
linkType: hard

"@pkgr/core@npm:^0.1.0":
version: 0.1.0
resolution: "@pkgr/core@npm:0.1.0"
checksum: eeff0e0e517b1ed10eb4c1a8971413a8349bbfdab727dbe7d4085fd94eab95f0c3beb51b9245fef30562849d2a7a119e07ca48c343c8c4ec4e64ee289f50fe5e
version: 0.1.1
resolution: "@pkgr/core@npm:0.1.1"
checksum: 6f25fd2e3008f259c77207ac9915b02f1628420403b2630c92a07ff963129238c9262afc9e84344c7a23b5cc1f3965e2cd17e3798219f5fd78a63d144d3cceba
languageName: node
linkType: hard

Expand Down Expand Up @@ -7438,12 +7438,12 @@ __metadata:
console-testing-library: 0.6.1
esbuild-extra: ^0.3.1
eslint: ^7.25.0
eslint-config-prettier: ^8.3.0
eslint-config-prettier: ^9.1.0
eslint-config-react-app: ^7.0.1
eslint-plugin-flowtype: ^5.7.2
eslint-plugin-import: ^2.22.1
eslint-plugin-jsx-a11y: ^6.4.1
eslint-plugin-prettier: ^3.4.0
eslint-plugin-prettier: ^5.1.3
eslint-plugin-react: ^7.23.2
eslint-plugin-react-hooks: ^4.2.0
fs-extra: ^9.1.0
Expand All @@ -7453,7 +7453,7 @@ __metadata:
json-stringify-safe: ^5.0.1
msw: ^2.1.4
node-fetch: ^3.3.2
prettier: ^2.2.1
prettier: ^3.2.4
query-string: ^7.0.1
redux: ^5.0.1
redux-thunk: ^3.1.0
Expand Down Expand Up @@ -15391,17 +15391,6 @@ __metadata:
languageName: node
linkType: hard

"eslint-config-prettier@npm:^8.3.0":
version: 8.3.0
resolution: "eslint-config-prettier@npm:8.3.0"
peerDependencies:
eslint: ">=7.0.0"
bin:
eslint-config-prettier: bin/cli.js
checksum: df4cea3032671995bb5ab07e016169072f7fa59f44a53251664d9ca60951b66cdc872683b5c6a3729c91497c11490ca44a79654b395dd6756beb0c3903a37196
languageName: node
linkType: hard

"eslint-config-prettier@npm:^9.1.0":
version: 9.1.0
resolution: "eslint-config-prettier@npm:9.1.0"
Expand Down Expand Up @@ -15573,21 +15562,6 @@ __metadata:
languageName: node
linkType: hard

"eslint-plugin-prettier@npm:^3.4.0":
version: 3.4.0
resolution: "eslint-plugin-prettier@npm:3.4.0"
dependencies:
prettier-linter-helpers: ^1.0.0
peerDependencies:
eslint: ">=5.0.0"
prettier: ">=1.13.0"
peerDependenciesMeta:
eslint-config-prettier:
optional: true
checksum: 30a07e8d12637d2988e371f6a20ff4c86fd7fdc3596d1d18d62c0367804f38e06a65052d0281234aeb2552e4d1908dcb2de20543413e038251a2717a46400a9d
languageName: node
linkType: hard

"eslint-plugin-prettier@npm:^5.1.3":
version: 5.1.3
resolution: "eslint-plugin-prettier@npm:5.1.3"
Expand Down Expand Up @@ -27509,16 +27483,16 @@ fsevents@^1.2.7:
"@typescript-eslint/eslint-plugin": 6.12.0
"@typescript-eslint/parser": 6.12.0
eslint: ^7.25.0
eslint-config-prettier: ^8.3.0
eslint-config-prettier: ^9.1.0
eslint-config-react-app: ^7.0.1
eslint-plugin-flowtype: ^5.7.2
eslint-plugin-import: ^2.22.1
eslint-plugin-jsx-a11y: ^6.4.1
eslint-plugin-prettier: ^3.4.0
eslint-plugin-prettier: ^5.1.3
eslint-plugin-react: ^7.23.2
eslint-plugin-react-hooks: ^4.2.0
netlify-plugin-cache: ^1.0.3
prettier: ^2.2.1
prettier: ^3.2.4
release-it: ^14.12.5
serve: ^14.2.0
typescript: ^5.2.2
Expand Down Expand Up @@ -31817,6 +31791,7 @@ fsevents@^1.2.7:
"@docusaurus/preset-classic": 2.1.0
classnames: ^2.2.6
netlify-plugin-cache: ^1.0.3
prettier: ^3.2.4
react: ^18.1.0
react-dom: ^18.1.0
react-lite-youtube-embed: ^2.0.3
Expand Down

0 comments on commit 9eb7331

Please sign in to comment.