Merge branch 'v4-tabs-layout' of https://github.com/iCheng/nutui into…

… v4-tabs-layout
jdf2e · Jan 2, 2024 · fbe8a09 · fbe8a09
2 parents 52b6c47 + 81f6932
commit fbe8a09
Show file tree

Hide file tree

Showing 11 changed files with 963 additions and 495 deletions.
diff --git a/package.json b/package.json
@@ -72,7 +72,7 @@
     "@nutui/icons-vue": "^0.1.1",
     "@nutui/icons-vue-taro": "^0.0.9",
     "@nutui/touch-emulator": "workspace:^",
-    "sass": "^1.69.5",
+    "sass": "^1.69.6",
     "vue-router": "^4.2.5"
   },
   "devDependencies": {
@@ -82,31 +82,31 @@
     "@nutui/prettier-plugin": "workspace:*",
     "@nutui/vite-plugins": "workspace:*",
     "@tarojs/taro": "3.6.21",
-    "@types/node": "^18.19.3",
-    "@vitejs/plugin-vue": "^5.0.0",
+    "@types/node": "^18.19.4",
+    "@vitejs/plugin-vue": "^5.0.1",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "@vitest/coverage-v8": "^1.1.0",
     "@vitest/ui": "^1.1.0",
     "@vue/test-utils": "^2.4.3",
     "autoprefixer": "^10.4.16",
     "codesandbox": "^2.2.3",
-    "eslint": "^8.55.0",
+    "eslint": "^8.56.0",
     "fs-extra": "^11.2.0",
     "husky": "^8.0.3",
     "inquirer": "^9.2.12",
     "lint-staged": "^15.2.0",
     "lzutf8": "^0.6.3",
     "markdown-it": "^14.0.0",
-    "prettier": "^3.1.0",
+    "prettier": "^3.1.1",
     "rimraf": "^5.0.5",
     "typescript": "^5.3.3",
     "unplugin-vue-components": "^0.26.0",
-    "vite": "^5.0.7",
+    "vite": "^5.0.10",
     "vite-plugin-inspect": "^0.8.1",
     "vitest": "^1.1.0",
     "vitest-canvas-mock": "^0.3.3",
-    "vue": "^3.3.11",
-    "vue-tsc": "^1.8.25"
+    "vue": "^3.4.2",
+    "vue-tsc": "^1.8.27"
   },
   "engines": {
     "pnpm": ">= 8.0.0"

diff --git a/packages/nutui-auto-import-resolver/package.json b/packages/nutui-auto-import-resolver/package.json
@@ -47,6 +47,6 @@
   "devDependencies": {
     "rimraf": "^5.0.5",
     "typescript": "^5.3.3",
-    "vite": "^5.0.7"
+    "vite": "^5.0.10"
   }
 }
diff --git a/packages/nutui-eslint-config/package.json b/packages/nutui-eslint-config/package.json
@@ -24,14 +24,14 @@
     "url": "https://github.com/jdf2e/nutui/issues"
   },
   "dependencies": {
-    "@typescript-eslint/eslint-plugin": "^6.13.2",
-    "@typescript-eslint/parser": "^6.13.2",
+    "@typescript-eslint/eslint-plugin": "^6.16.0",
+    "@typescript-eslint/parser": "^6.16.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-vue": "^9.19.2",
     "vue-eslint-parser": "^9.3.2"
   },
   "devDependencies": {
-    "eslint": "^8.55.0"
+    "eslint": "^8.56.0"
   },
   "peerDependencies": {
     "eslint": "^7.32.0 || ^8.44.0"

diff --git a/packages/nutui-playground/package.json b/packages/nutui-playground/package.json
@@ -15,14 +15,14 @@
     "serve": "vite preview"
   },
   "devDependencies": {
-    "@types/node": "^18.19.3",
-    "@vitejs/plugin-vue": "^5.0.0",
+    "@types/node": "^18.19.4",
+    "@vitejs/plugin-vue": "^5.0.1",
     "rimraf": "^5.0.5",
-    "vite": "^5.0.7",
-    "vue": "^3.3.11"
+    "vite": "^5.0.10",
+    "vue": "^3.4.2"
   },
   "dependencies": {
-    "@vue/repl": "^3.0.0",
+    "@vue/repl": "^3.1.0",
     "file-saver": "^2.0.5",
     "jszip": "^3.10.1"
   }

diff --git a/packages/nutui-playground/src/download/template/package.json b/packages/nutui-playground/src/download/template/package.json
@@ -7,13 +7,13 @@
     "serve": "vite preview"
   },
   "dependencies": {
-    "vue": "^3.3.8",
-    "@nutui/nutui": "^4.2.2",
+    "vue": "^3.4.2",
+    "@nutui/nutui": "^4.2.6",
     "@nutui/touch-emulator": "^1.0.0"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^5.0.0",
-    "vite": "^5.0.2",
+    "@vitejs/plugin-vue": "^5.0.1",
+    "vite": "^5.0.10",
     "unplugin-vue-components": "^0.26.0"
   }
 }
diff --git a/packages/nutui-prettier-plugin/package.json b/packages/nutui-prettier-plugin/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "linguist-languages": "^7.27.0",
-    "prettier": "^3.1.0"
+    "prettier": "^3.1.1"
   },
   "keywords": [],
   "author": "jdf2e",

diff --git a/packages/nutui-taro-demo/package.json b/packages/nutui-taro-demo/package.json
@@ -35,7 +35,7 @@
     "@tarojs/runtime": "3.6.21",
     "@tarojs/shared": "3.6.21",
     "@tarojs/taro": "3.6.21",
-    "vue": "^3.3.11"
+    "vue": "^3.4.2"
   },
   "devDependencies": {
     "@babel/core": "^7.23.5",
@@ -50,7 +50,7 @@
     "style-loader": "^3.3.3",
     "stylelint": "^16.0.1",
     "typescript": "^5.3.3",
-    "vue-loader": "^17.3.1",
+    "vue-loader": "^17.4.1",
     "webpack": "^5.89.0"
   }
 }
diff --git a/packages/nutui-taro-demo/tsconfig.json b/packages/nutui-taro-demo/tsconfig.json
@@ -16,6 +16,7 @@
     "baseUrl": ".",
     "rootDir": ".",
     "jsx": "preserve",
+    "jsxImportSource": "vue",
     "allowJs": true,
     "resolveJsonModule": true,
     "typeRoots": ["node_modules/@types"],