Merge remote-tracking branch 'upstream/v4' into v4

Author: irisSong

.github/workflows/ci.yml

@@ -21,6 +21,11 @@ jobs:
         with:
           version: 9
 
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'pnpm'
+
       - name: Install dependencies
         run: pnpm install
 

.prettierrc

@@ -8,5 +8,5 @@
   "proseWrap": "preserve",
   "htmlWhitespaceSensitivity": "strict",
   "trailingComma": "none",
-  "plugins": ["@nutui/prettier-plugin"]
+  "plugins": ["prettier-markdown-table"]
 }

CHANGELOG.md

@@ -94,7 +94,7 @@
 | [@nutui/icons-vue](https://github.com/jdf2e/nutui-icons) | `@nutui/nutui` 使用的图标库 | ![nutui](https://img.shields.io/npm/v/@nutui/icons-vue.svg?label=%20) |
 | [@nutui/icons-vue-taro](https://github.com/jdf2e/nutui-icons) | `@nutui/nutui-taro` 使用的图标库 | ![nutui](https://img.shields.io/npm/v/@nutui/icons-vue-taro.svg?label=%20) |
 | [@nutui/touch-emulator](packages/nutui-touch-emulator) | 在桌面端使用 NutUI 的辅助库 | ![nutui](https://img.shields.io/npm/v/@nutui/touch-emulator.svg?label=%20) |
-| [@nutui/auto-import-resolver](packages/nutui-auto-import-resolver) | `unplugin-auto-import` 插件的 reolver 配置 | ![nutui](https://img.shields.io/npm/v/@nutui/auto-import-resolver.svg?label=%20) |
+| [@nutui/auto-import-resolver](packages/nutui-auto-import-resolver) | `unplugin-auto-import` 插件的 resolver 配置 | ![nutui](https://img.shields.io/npm/v/@nutui/auto-import-resolver.svg?label=%20) |
 | [@nutui/playground](packages/nutui-playground) | NutUI 在线 Playground | - |
 | [nutui-demo](https://github.com/jdf2e/nutui-demo) | NutUI 官方示例合集 | - |
 
@@ -106,6 +106,7 @@
 | --- | --- |
 | [nutui-uniapp](https://github.com/nutui-uniapp/nutui-uniapp) | 基于 NutUI 4.x 版本开发的 uni-app 组件库 |
 | [jwaterwater/uni-nutui](https://github.com/jwaterwater/uni-nutui) | 基于 NutUI 3.x 版本开发的 uni-app 组件库 |
+| [common-intellisense](https://github.com/Simon-He95/common-intellisense) | 提供 NutUI 4.x 版本智能提示的 vscode 插件 |
 
 ## 项目状态
 

README.md

@@ -102,6 +102,7 @@ Site: [nutui.jd.com](https://nutui.jd.com)
 | --- | --- |
 | [nutui-uniapp](https://github.com/nutui-uniapp/nutui-uniapp) | uni-app UI Components based on NutUI 4.x |
 | [jwaterwater/uni-nutui](https://github.com/jwaterwater/uni-nutui) | uni-app UI Components based on NutUI 3.x |
+| [common-intellisense](https://github.com/Simon-He95/common-intellisense) | vscode extension for NutUI 4.x Intellisense |
 
 ## Status
 

README_EN.md

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui",
-  "version": "4.3.10",
+  "version": "4.3.13",
   "description": "京东风格的轻量级移动端 Vue2、Vue3 组件库（支持小程序开发）",
   "main": "dist/nutui.umd.js",
   "module": "dist/nutui.es.js",
@@ -84,15 +84,14 @@
     "@eslint/config-inspector": "^0.5.1",
     "@eslint/eslintrc": "^3.1.0",
     "@nutui/eslint-config": "workspace:*",
-    "@nutui/prettier-plugin": "workspace:*",
     "@nutui/vite-plugins": "workspace:*",
-    "@tarojs/taro": "3.6.30",
+    "@tarojs/taro": "3.6.34",
     "@types/node": "^20.14.9",
     "@vitejs/plugin-vue": "^5.0.5",
     "@vitejs/plugin-vue-jsx": "^4.0.0",
-    "@vitest/coverage-istanbul": "^1.6.0",
-    "@vitest/coverage-v8": "^1.6.0",
-    "@vitest/ui": "^1.6.0",
+    "@vitest/coverage-istanbul": "^2.0.1",
+    "@vitest/coverage-v8": "^2.0.1",
+    "@vitest/ui": "^2.0.1",
     "@vue/test-utils": "^2.4.6",
     "autoprefixer": "^10.4.19",
     "codesandbox": "^2.2.3",
@@ -101,19 +100,20 @@
     "fs-extra": "^11.2.0",
     "happy-dom": "^14.12.3",
     "husky": "^9.0.11",
-    "inquirer": "^9.3.2",
+    "inquirer": "^10.0.1",
     "lzutf8": "^0.6.3",
     "markdown-it": "^14.1.0",
     "nano-staged": "^0.8.0",
     "prettier": "^3.3.2",
-    "rimraf": "^5.0.7",
+    "prettier-markdown-table": "^1.0.2",
+    "rimraf": "^6.0.0",
     "typescript": "^5.4.5",
     "unplugin-vue-components": "^0.27.2",
     "vite": "^5.3.2",
     "vite-plugin-vue-devtools": "^7.2.1",
-    "vitest": "^1.6.0",
+    "vitest": "^2.0.1",
     "vitest-canvas-mock": "^0.3.3",
-    "vue": "^3.4.31",
+    "vue": "^3.5.10",
     "vue-tsc": "^1.8.27"
   },
   "engines": {

package.json

@@ -45,7 +45,7 @@
   "author": "jdf2e",
   "license": "MIT",
   "devDependencies": {
-    "rimraf": "^5.0.7",
+    "rimraf": "^6.0.0",
     "typescript": "^5.4.5",
     "vite": "^5.3.2"
   }

packages/nutui-auto-import-resolver/package.json

@@ -17,6 +17,9 @@ export default [
   ...pluginVue.configs['flat/recommended'],
   {
     rules: {
+      'no-empty': ['error', {
+        allowEmptyCatch: true
+      }],
       // typescript-eslint
       '@typescript-eslint/no-explicit-any': 'off',
       '@typescript-eslint/ban-types': 'off',

packages/nutui-eslint-config/index.js

@@ -17,7 +17,7 @@
   "devDependencies": {
     "@types/node": "^20.14.9",
     "@vitejs/plugin-vue": "^5.0.5",
-    "rimraf": "^5.0.7",
+    "rimraf": "^6.0.0",
     "vite": "^5.3.2",
     "vue": "^3.4.31"
   },