Skip to content

Commit

Permalink
chore(deps): update (jd-opensource#3120)
Browse files Browse the repository at this point in the history
  • Loading branch information
eiinu authored Jul 1, 2024
1 parent 2e81ea6 commit 69f9bc5
Show file tree
Hide file tree
Showing 8 changed files with 270 additions and 140 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"devDependencies": {
"@commitlint/cli": "^19.3.0",
"@commitlint/config-conventional": "^19.2.2",
"@eslint/config-inspector": "^0.4.12",
"@eslint/config-inspector": "^0.5.1",
"@eslint/eslintrc": "^3.1.0",
"@nutui/eslint-config": "workspace:*",
"@nutui/prettier-plugin": "workspace:*",
Expand All @@ -96,7 +96,7 @@
"@vue/test-utils": "^2.4.6",
"autoprefixer": "^10.4.19",
"codesandbox": "^2.2.3",
"eslint": "^9.3.0",
"eslint": "^9.6.0",
"eslint-config-flat-gitignore": "^0.1.5",
"fs-extra": "^11.2.0",
"happy-dom": "^14.12.3",
Expand All @@ -105,7 +105,7 @@
"lzutf8": "^0.6.3",
"markdown-it": "^14.1.0",
"nano-staged": "^0.8.0",
"prettier": "^3.2.5",
"prettier": "^3.3.2",
"rimraf": "^5.0.7",
"typescript": "^5.4.5",
"unplugin-vue-components": "^0.27.2",
Expand Down
8 changes: 4 additions & 4 deletions packages/nutui-eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@
"url": "https://github.com/jdf2e/nutui/issues"
},
"dependencies": {
"@stylistic/eslint-plugin": "^2.1.0",
"@eslint/js": "^9.6.0",
"@stylistic/eslint-plugin": "^2.3.0",
"@typescript-eslint/eslint-plugin": "^8.0.0-alpha.16",
"@typescript-eslint/parser": "^8.0.0-alpha.16",
"eslint-plugin-vue": "^9.26.0",
"typescript-eslint": "^8.0.0-alpha.16",
"vue-eslint-parser": "^9.4.2",
"@eslint/js": "^9.3.0"
"vue-eslint-parser": "^9.4.3"
},
"devDependencies": {
"eslint": "^9.3.0"
"eslint": "^9.6.0"
},
"peerDependencies": {
"eslint": "^8.44.0 || ^9.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/nutui-prettier-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"devDependencies": {
"linguist-languages": "^7.27.0",
"prettier": "^3.2.5"
"prettier": "^3.3.2"
},
"keywords": [],
"author": "jdf2e",
Expand Down
6 changes: 3 additions & 3 deletions packages/nutui-taro-demo/src/utils/useTranslate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ export const useTranslate = <
},
T2 extends T1
>(object: {
'zh-CN': T1
'en-US': T2
}) => {
'zh-CN': T1
'en-US': T2
}) => {
for (const [key, value] of Object.entries(object)) {
Locale.merge(key, value)
}
Expand Down
368 changes: 249 additions & 119 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/packages/__VUE/tabbar/__tests__/index.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ test('should render custom img when using img prop', async () => {
icon: (props: any) =>
props.active
? (
<img src="http://img13.360buyimg.com/uba/jfs/t1/29316/38/1115/3203/5c0f3d61E35d0c7da/9e557f2cb5c9dab6.jpg" />
<img src="http://img13.360buyimg.com/uba/jfs/t1/29316/38/1115/3203/5c0f3d61E35d0c7da/9e557f2cb5c9dab6.jpg" />
)
: (
<img src="http://img20.360buyimg.com/uba/jfs/t1/9996/36/8646/4833/5c0f3d61E7c1b7e0f/c98ad61124172e93.jpg" />
<img src="http://img20.360buyimg.com/uba/jfs/t1/9996/36/8646/4833/5c0f3d61E7c1b7e0f/c98ad61124172e93.jpg" />
)
}}
</TabbarItem>
Expand All @@ -47,10 +47,10 @@ test('should render custom img when using img prop', async () => {
icon: (props: any) =>
props.active
? (
<img src="http://img13.360buyimg.com/uba/jfs/t1/29316/38/1115/3203/5c0f3d61E35d0c7da/9e557f2cb5c9dab6.jpg" />
<img src="http://img13.360buyimg.com/uba/jfs/t1/29316/38/1115/3203/5c0f3d61E35d0c7da/9e557f2cb5c9dab6.jpg" />
)
: (
<img src="http://img20.360buyimg.com/uba/jfs/t1/9996/36/8646/4833/5c0f3d61E7c1b7e0f/c98ad61124172e93.jpg" />
<img src="http://img20.360buyimg.com/uba/jfs/t1/9996/36/8646/4833/5c0f3d61E7c1b7e0f/c98ad61124172e93.jpg" />
)
}}
</TabbarItem>
Expand Down
6 changes: 3 additions & 3 deletions src/sites/assets/util/useTranslate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ export const useTranslate = <
},
T2 extends T1
>(object: {
'zh-CN': T1
'en-US': T2
}) => {
'zh-CN': T1
'en-US': T2
}) => {
for (const [key, value] of Object.entries(object)) {
Locale.merge(key, value)
}
Expand Down
6 changes: 3 additions & 3 deletions src/sites/utils/useTranslate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ export const useTranslate = <
},
T2 extends T1
>(object: {
'zh-CN': T1
'en-US': T2
}) => {
'zh-CN': T1
'en-US': T2
}) => {
for (const [key, value] of Object.entries(object)) {
Locale.merge(key, value)
}
Expand Down

0 comments on commit 69f9bc5

Please sign in to comment.