Merge branch 'next' into hxy/uploader/0903

.husky/commit-msg

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npx --no-install commitlint --edit $1

.prettierrc

@@ -6,5 +6,5 @@
   "printWidth": 80,
   "proseWrap": "preserve",
   "endOfLine": "auto",
-  "plugins": ["@nutui/prettier-plugin"]
+  "plugins": ["prettier-markdown-table"]
 }

CHANGELOG.md

@@ -1,3 +1,46 @@
+# v2.6.21
+
+`2024-09-27`
+
+- 🏡 chore: update dependency linguist-languages to be included within package (#2607)
+- :sparkles: feat(Uploader): add support for deleteIcon prop customization (#2618)
+- :bug: fix: 修改jd小程序高版本弹幕不滚动问题 (#2612)
+
+# v2.6.20
+
+`2024-09-20`
+
+- :bug: fix: i18n (#2597)
+- :bug: fix: 类型构建错误 (#2605)
+- 🏡 chore: replace local prettier plugin with npm package (#2603)
+
+# v2.6.19
+
+`2024-09-13`
+
+- 🏡 chore(deps): update dependency vite-plugin-dts to v4 (#2533)
+- :bug: fix(cascader): 受控状态下 value 变化时同步组件选中状态 (#2591)
+- :bug: fix: 移除不必要的 fragment 元素 (#2587)
+- :bug: fix(datepicker): show zero on page (#2582)
+- :bug: fix: findDomNode from transition (#2525)
+- :bug: fix(props): add mergeProps utility to resolve all defaultProps warnings (#2581)
+- 🪵 refactor: resolve sass nested rules warning (#2579)
+
+# v2.6.18
+
+`2024-09-06`
+
+- 🏡 chore: remove deprecated (#2573)
+- 🏡 chore(deps): update dependency marked to v14 (#2532)
+- :sparkles: feat: demos for popup & dialog (#2574)
+- :sparkles: feat: beforeupload (#2567)
+- :bug: fix: remove icons defaultprops (#2571)
+- :bug: fix(input): type props didnot work when equals number|digit (#2563)
+- :bug: fix: dialog
+- :bug: fix(sticky): should rerender when zIndex changes (#2572)
+- :bug: fix(sticky): rerender sticky when threshold change (#2564)
+- :bug: fix(deps): update dependency jscodeshift to v17 (#2534)
+
 # v2.6.17
 
 `2024-08-30`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui-react",
-  "version": "2.6.17",
+  "version": "2.6.21",
   "style": "dist/style.css",
   "main": "dist/nutui.react.umd.js",
   "module": "dist/esm/nutui-react.es.js",
@@ -91,12 +91,12 @@
   },
   "lint-staged": {
     "*.{scss,md}": "prettier --write",
-    "*.{ts,tsx,js,md}": "eslint"
+    "*.{ts,tsx,js}": "eslint"
   },
   "dependencies": {
     "@babel/runtime": "^7.23.9",
-    "@nutui/icons-react": "^1.0.4",
-    "@nutui/icons-react-taro": "^1.0.4",
+    "@nutui/icons-react": "^1.0.5",
+    "@nutui/icons-react-taro": "^1.0.5",
     "@nutui/touch-emulator": "^1.0.0",
     "@react-spring/web": "~9.6.1",
     "@use-gesture/react": "10.2.20",
@@ -118,7 +118,7 @@
     "@commitlint/cli": "^19.0.3",
     "@commitlint/config-conventional": "^19.0.3",
     "@loadable/component": "^5.16.3",
-    "@nutui/prettier-plugin": "workspace:*",
+    "prettier-markdown-table": "^1.0.2",
     "@mdx-js/mdx": "^3.0.1",
     "@mdx-js/react": "^3.0.1",
     "@mdx-js/rollup": "^3.0.1",
@@ -171,7 +171,6 @@
     "husky": "^9.0.11",
     "inquirer": "^10.1.4",
     "jscodeshift": "^17.0.0",
-    "linguist-languages": "^7.27.0",
     "lint-staged": "^15.2.2",
     "lzutf8": "0.6.3",
     "map-stream": "0.0.7",
@@ -208,7 +207,7 @@
     "unist-util-visit": "^5.0.0",
     "vinyl-fs": "^4.0.0",
     "vite": "^5.1.3",
-    "vite-plugin-dts": "3.6.4",
+    "vite-plugin-dts": "4.2.1",
     "vitest": "^2.0.4",
     "vitest-canvas-mock": "^0.3.3"
   },