Merge branch 'v4' into feat-calendar-card

jdf2e · Dec 14, 2023 · 40863fa · 40863fa
2 parents dab82e3 + 2f7707e
commit 40863fa
Show file tree

Hide file tree

Showing 152 changed files with 4,947 additions and 6,748 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base", "schedule:weekly", "group:allNonMajor"
+    "config:base", "schedule:weekly"
   ],
   "labels": ["dependencies"],
   "ignorePaths": [

diff --git a/.github/workflows/github-repo-stats.yml b/.github/workflows/github-repo-stats.yml
@@ -7,6 +7,7 @@ on:
 jobs:
   j1:
     name: github-repo-stats
+    if: github.repository == 'jdf2e/nutui'
     runs-on: ubuntu-latest
     steps:
       - name: GHRS

diff --git a/.github/workflows/publish-beta.yml b/.github/workflows/publish-beta.yml
@@ -5,6 +5,7 @@ on:
 
 jobs:
   publish-beta:
+    if: github.repository == 'jdf2e/nutui'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code

diff --git a/.github/workflows/sync-gitee.yml b/.github/workflows/sync-gitee.yml
@@ -7,6 +7,7 @@ on:
 
 jobs:
   deploy-site-sync-gitee:
+    if: github.repository == 'jdf2e/nutui'
     runs-on: ubuntu-latest
     steps:
       - name: Sync to Gitee

diff --git a/.github/workflows/sync-h5.yml b/.github/workflows/sync-h5.yml
@@ -11,6 +11,7 @@ on:
 
 jobs:
   copy:
+    if: github.repository == 'jdf2e/nutui'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/sync-taro.yml b/.github/workflows/sync-taro.yml
@@ -11,6 +11,7 @@ on:
 
 jobs:
   copy:
+    if: github.repository == 'jdf2e/nutui'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/package.json b/package.json
@@ -72,41 +72,41 @@
     "@nutui/icons-vue": "^0.1.1",
     "@nutui/icons-vue-taro": "^0.0.9",
     "@nutui/touch-emulator": "workspace:^",
-    "sass": "^1.69.3",
+    "sass": "^1.69.5",
     "vue-router": "^4.2.5"
   },
   "devDependencies": {
-    "@commitlint/cli": "^18.0.0",
-    "@commitlint/config-conventional": "^18.0.0",
+    "@commitlint/cli": "^18.4.3",
+    "@commitlint/config-conventional": "^18.4.3",
     "@nutui/eslint-config": "workspace:*",
     "@nutui/prettier-plugin": "workspace:*",
     "@nutui/vite-plugins": "workspace:*",
     "@tarojs/taro": "3.6.19",
-    "@types/node": "^18.18.5",
-    "@vitejs/plugin-vue": "^4.5.0",
+    "@types/node": "^18.19.3",
+    "@vitejs/plugin-vue": "^4.5.2",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
-    "@vitest/coverage-v8": "^1.0.1",
-    "@vitest/ui": "^1.0.1",
-    "@vue/test-utils": "^2.4.1",
+    "@vitest/coverage-v8": "^1.0.2",
+    "@vitest/ui": "^1.0.2",
+    "@vue/test-utils": "^2.4.3",
     "autoprefixer": "^10.4.16",
     "codesandbox": "^2.2.3",
-    "eslint": "^8.51.0",
-    "fs-extra": "^11.1.1",
+    "eslint": "^8.55.0",
+    "fs-extra": "^11.2.0",
     "husky": "^8.0.3",
-    "inquirer": "^9.2.11",
-    "lint-staged": "^15.0.1",
+    "inquirer": "^9.2.12",
+    "lint-staged": "^15.2.0",
     "lzutf8": "^0.6.3",
-    "markdown-it": "^13.0.2",
-    "prettier": "^3.0.3",
+    "markdown-it": "^14.0.0",
+    "prettier": "^3.1.0",
     "rimraf": "^5.0.5",
-    "typescript": "^5.2.2",
+    "typescript": "^5.3.3",
     "unplugin-vue-components": "^0.26.0",
-    "vite": "^5.0.2",
-    "vitest": "^1.0.1",
+    "vite": "^5.0.7",
+    "vite-plugin-inspect": "^0.8.1",
+    "vitest": "^1.0.2",
     "vitest-canvas-mock": "^0.3.3",
-    "vue": "^3.3.4",
-    "vue-tsc": "^1.8.22",
-    "vite-plugin-inspect": "^0.8.0"
+    "vue": "^3.3.11",
+    "vue-tsc": "^1.8.25"
   },
   "engines": {
     "pnpm": ">= 8.0.0"

diff --git a/packages/nutui-auto-import-resolver/package.json b/packages/nutui-auto-import-resolver/package.json
@@ -45,8 +45,8 @@
   "author": "jdf2e",
   "license": "MIT",
   "devDependencies": {
-    "rimraf": "^5.0.0",
-    "typescript": "^5.3.2",
-    "vite": "^5.0.2"
+    "rimraf": "^5.0.5",
+    "typescript": "^5.3.3",
+    "vite": "^5.0.7"
   }
 }
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.7.5",
-    "@typescript-eslint/parser": "^6.7.5",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-vue": "^9.17.0",
+    "@typescript-eslint/eslint-plugin": "^6.13.2",
+    "@typescript-eslint/parser": "^6.13.2",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-vue": "^9.19.2",
     "vue-eslint-parser": "^9.3.2"
   },
   "devDependencies": {
-    "eslint": "^8.51.0"
+    "eslint": "^8.55.0"
   },
   "peerDependencies": {
     "eslint": "^7.32.0 || ^8.44.0"

diff --git a/packages/nutui-playground/package.json b/packages/nutui-playground/package.json
@@ -15,11 +15,11 @@
     "serve": "vite preview"
   },
   "devDependencies": {
-    "@types/node": "^18.18.5",
-    "@vitejs/plugin-vue": "^4.5.1",
+    "@types/node": "^18.19.3",
+    "@vitejs/plugin-vue": "^4.5.2",
     "rimraf": "^5.0.5",
-    "vite": "^5.0.4",
-    "vue": "^3.3.9"
+    "vite": "^5.0.7",
+    "vue": "^3.3.11"
   },
   "dependencies": {
     "@vue/repl": "^3.0.0",

diff --git a/packages/nutui-prettier-plugin/package.json b/packages/nutui-prettier-plugin/package.json
@@ -9,8 +9,8 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "devDependencies": {
-    "prettier": "^3.0.3",
-    "linguist-languages": "^7.27.0"
+    "linguist-languages": "^7.27.0",
+    "prettier": "^3.1.0"
   },
   "keywords": [],
   "author": "jdf2e",

diff --git a/packages/nutui-taro-demo/package.json b/packages/nutui-taro-demo/package.json
@@ -19,7 +19,7 @@
   ],
   "author": "",
   "dependencies": {
-    "@babel/runtime": "^7.23.2",
+    "@babel/runtime": "^7.23.5",
     "@nutui/icons-vue-taro": "^0.0.9",
     "@tarojs/components": "3.6.19",
     "@tarojs/helper": "3.6.19",
@@ -35,22 +35,22 @@
     "@tarojs/runtime": "3.6.19",
     "@tarojs/shared": "3.6.19",
     "@tarojs/taro": "3.6.19",
-    "vue": "^3.3.4"
+    "vue": "^3.3.11"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.2",
+    "@babel/core": "^7.23.5",
     "@tarojs/cli": "3.6.19",
     "@tarojs/webpack5-runner": "3.6.19",
-    "@types/webpack-env": "^1.18.2",
+    "@types/webpack-env": "^1.18.4",
     "babel-loader": "^9.1.3",
     "babel-preset-taro": "3.6.19",
     "css-loader": "^6.8.1",
-    "eslint": "^8.51.0",
+    "eslint": "^8.55.0",
     "eslint-config-taro": "3.6.19",
     "style-loader": "^3.3.3",
-    "stylelint": "^15.10.3",
-    "typescript": "^5.2.2",
-    "vue-loader": "^17.3.0",
+    "stylelint": "^16.0.1",
+    "typescript": "^5.3.3",
+    "vue-loader": "^17.3.1",
     "webpack": "^5.89.0"
   }
 }
diff --git a/packages/nutui-taro-demo/src/basic/pages/button/block.vue b/packages/nutui-taro-demo/src/basic/pages/button/block.vue
@@ -0,0 +1,3 @@
+<template>
+  <nut-button block type="primary">Block</nut-button>
+</template>
diff --git a/packages/nutui-taro-demo/src/basic/pages/button/color.vue b/packages/nutui-taro-demo/src/basic/pages/button/color.vue
@@ -0,0 +1,5 @@
+<template>
+  <nut-button color="#7232dd">Pure</nut-button>
+  <nut-button color="#7232dd" plain>Pure</nut-button>
+  <nut-button color="linear-gradient(to right, #ff6034, #ee0a24)"> Gradient </nut-button>
+</template>
diff --git a/packages/nutui-taro-demo/src/basic/pages/button/disabled.vue b/packages/nutui-taro-demo/src/basic/pages/button/disabled.vue
@@ -0,0 +1,5 @@
+<template>
+  <nut-button disabled type="primary">Disabled</nut-button>
+  <nut-button plain disabled type="info">Disabled</nut-button>
+  <nut-button plain disabled type="primary">Disabled</nut-button>
+</template>
diff --git a/packages/nutui-taro-demo/src/basic/pages/button/icon.vue b/packages/nutui-taro-demo/src/basic/pages/button/icon.vue
@@ -0,0 +1,16 @@
+<template>
+  <nut-button shape="square" plain type="primary">
+    <template #icon>
+      <StarFill />
+    </template>
+  </nut-button>
+  <nut-button shape="square" type="primary">
+    <template #icon>
+      <Star />
+    </template>
+    Star
+  </nut-button>
+</template>
+<script setup lang="ts">
+import { StarFill, Star } from '@nutui/icons-vue';
+</script>