Merge branch 'main' into zojize/main

.github/workflows/publish.yml

@@ -26,10 +26,10 @@ jobs:
 
       - run: pnpm install
 
-      - run: npx conventional-github-releaser -p angular
+      - run: npx changelogithub
         continue-on-error: true
         env:
-          CONVENTIONAL_GITHUB_RELEASER_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
       - run: pnpm run publish:ci
         env:

.npmrc

@@ -1 +1,2 @@
 shamefully-hoist=true
+strict-peer-dependencies=false

package.json

@@ -1,11 +1,11 @@
 {
   "name": "@vueuse/monorepo",
-  "version": "8.5.0",
+  "version": "8.6.0",
   "private": true,
-  "packageManager": "pnpm@7.0.0",
+  "packageManager": "pnpm@7.1.7",
   "description": "Collection of essential Vue Composition Utilities",
-  "license": "MIT",
   "author": "Anthony Fu<https://github.com/antfu>",
+  "license": "MIT",
   "scripts": {
     "build": "nr update && esno scripts/build.ts",
     "build:redirects": "esno scripts/redirects.ts",
@@ -34,85 +34,85 @@
     "watch": "esno scripts/build.ts --watch"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^0.23.0",
+    "@antfu/eslint-config": "^0.25.1",
     "@antfu/ni": "^0.16.2",
-    "@iconify/json": "^2.1.35",
+    "@iconify/json": "^2.1.62",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-replace": "^4.0.0",
     "@type-challenges/utils": "^0.1.1",
     "@types/fs-extra": "^9.0.13",
     "@types/js-yaml": "^4.0.5",
     "@types/md5": "^2.3.2",
-    "@types/node": "^17.0.31",
-    "@types/prettier": "^2.6.0",
+    "@types/node": "^17.0.43",
+    "@types/prettier": "^2.6.3",
     "@types/semver": "^7.3.9",
-    "@types/sharp": "^0.30.2",
-    "@vitest/ui": "^0.10.2",
-    "@vue/compiler-sfc": "^3.2.33",
-    "@vue/composition-api": "^1.6.0",
-    "@vue/test-utils": "^2.0.0-rc.21",
+    "@types/sharp": "^0.30.4",
+    "@vitest/ui": "^0.15.0",
+    "@vue/compiler-sfc": "^3.2.37",
+    "@vue/composition-api": "^1.6.2",
+    "@vue/test-utils": "^2.0.1",
     "@vue/theme": "^1.0.2",
     "axios": "^0.27.2",
-    "bumpp": "^7.1.1",
+    "bumpp": "^7.2.0",
     "consola": "^2.15.3",
     "cross-env": "^7.0.3",
-    "esbuild-register": "^3.3.2",
-    "eslint": "^8.14.0",
-    "esno": "^0.14.1",
+    "esbuild-register": "^3.3.3",
+    "eslint": "^8.17.0",
+    "esno": "^0.16.3",
     "export-size": "^0.5.2",
     "fast-glob": "^3.2.11",
     "firebase": "^8.10.0",
     "fs-extra": "^10.1.0",
-    "fuse.js": "^6.6.0",
+    "fuse.js": "^6.6.2",
     "google-font-installer": "^1.2.0",
     "gray-matter": "^4.0.3",
     "js-yaml": "^4.1.0",
     "jsdom": "^19.0.0",
-    "lint-staged": "^12.4.1",
+    "lint-staged": "^13.0.1",
     "markdown-table": "^3.0.2",
     "md5": "^2.3.0",
-    "msw": "^0.39.2",
-    "node-fetch": "^3.2.4",
-    "ohmyfetch": "^0.4.16",
-    "pnpm": "^7.0.0",
-    "postcss": "^8.4.13",
+    "msw": "^0.42.1",
+    "node-fetch": "^3.2.6",
+    "ohmyfetch": "^0.4.18",
+    "pnpm": "^7.2.1",
+    "postcss": "^8.4.14",
     "postcss-nested": "^5.0.6",
-    "prettier": "^2.6.2",
-    "prism-theme-vars": "^0.2.2",
+    "prettier": "^2.7.0",
+    "prism-theme-vars": "^0.2.3",
     "remove-markdown": "^0.5.0",
     "rimraf": "^3.0.2",
-    "rollup": "^2.71.1",
-    "rollup-plugin-dts": "^4.2.1",
+    "rollup": "^2.75.6",
+    "rollup-plugin-dts": "^4.2.2",
     "rollup-plugin-esbuild": "^4.9.1",
-    "sharp": "^0.30.4",
+    "sharp": "^0.30.6",
     "simple-git": "^3.7.1",
-    "simple-git-hooks": "^2.7.0",
-    "typescript": "4.6.4",
-    "unocss": "^0.32.9",
+    "simple-git-hooks": "^2.8.0",
+    "typescript": "4.7.3",
+    "unocss": "^0.39.0",
     "unplugin-icons": "^0.14.3",
-    "unplugin-vue-components": "^0.19.3",
-    "vite": "^2.9.7",
+    "unplugin-vue-components": "^0.19.6",
+    "vite": "^2.9.12",
     "vite-plugin-inspect": "^0.5.0",
     "vite-plugin-pwa": "^0.12.0",
-    "vitepress": "^0.22.3",
-    "vitest": "^0.10.2",
-    "vue": "^3.2.33",
+    "vitepress": "^0.22.4",
+    "vitest": "^0.15.0",
+    "vue": "^3.2.37",
     "vue2": "npm:vue@^2.6.14"
   },
-  "lint-staged": {
-    "*.{js,ts,tsx,vue,md}": [
-      "eslint --fix"
-    ]
-  },
   "pnpm": {
     "neverBuiltDependencies": [
       "electron"
     ],
     "overrides": {
-      "vue-demi": "0.12.5"
+      "vue-demi": "0.13.0"
     }
   },
   "simple-git-hooks": {
     "pre-commit": "npx lint-staged"
+  },
+  "lint-staged": {
+    "*.{js,ts,tsx,vue,md}": [
+      "eslint --fix"
+    ]
   }
 }

packages/.test/mockServer.ts

@@ -4,14 +4,14 @@
  */
 
 import { setupServer } from 'msw/node'
-import type { DefaultRequestBody, PathParams, RestContext, RestRequest } from 'msw'
+import type { RestContext, RestRequest } from 'msw'
 import { rest } from 'msw'
 
 const defaultJsonMessage = { hello: 'world' }
 const defaultTextMessage = 'Hello World'
 const baseUrl = 'https://example.com'
 
-const commonTransformers = (req: RestRequest<DefaultRequestBody, PathParams>, _: any, ctx: RestContext) => {
+const commonTransformers = (req: RestRequest, _: any, ctx: RestContext) => {
   const t = []
   const qs = req.url.searchParams
 

packages/add-ons.md

@@ -69,6 +69,7 @@ Utilities for vue-router
 
 ## Integrations - [`@vueuse/integrations`](https://vueuse.org/integrations/README.html)
 Integration wrappers for utility libraries
+  - [`useAsyncValidator`](https://vueuse.org/integrations/useAsyncValidator/) — wrapper for [`async-validator`](https://github.com/yiminghe/async-validator)
   - [`useAxios`](https://vueuse.org/integrations/useAxios/) — wrapper for [`axios`](https://github.com/axios/axios)
   - [`useChangeCase`](https://vueuse.org/integrations/useChangeCase/) — wrapper for [`change-case`](https://github.com/blakeembrey/change-case)
   - [`useCookies`](https://vueuse.org/integrations/useCookies/) — wrapper for [`universal-cookie`](https://www.npmjs.com/package/universal-cookie)

packages/components/package.json

@@ -1,37 +1,37 @@
 {
   "name": "@vueuse/components",
-  "version": "8.5.0",
+  "version": "8.6.0",
   "description": "Renderless components for VueUse",
-  "keywords": [
-    "vue",
-    "vue-use",
-    "utils"
-  ],
-  "license": "MIT",
   "author": "Jacob Clevenger<https://github.com/wheatjs>",
+  "license": "MIT",
+  "homepage": "https://github.com/vueuse/vueuse/tree/main/packages/components#readme",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vueuse/vueuse.git",
     "directory": "packages/components"
   },
-  "main": "./index.cjs",
-  "module": "./index.mjs",
-  "types": "./index.d.ts",
-  "unpkg": "./index.iife.min.js",
-  "jsdelivr": "./index.iife.min.js",
+  "bugs": {
+    "url": "https://github.com/vueuse/vueuse/issues"
+  },
+  "keywords": [
+    "vue",
+    "vue-use",
+    "utils"
+  ],
+  "sideEffects": false,
   "exports": {
     ".": {
-      "import": "./index.mjs",
+      "types": "./index.d.ts",
       "require": "./index.cjs",
-      "types": "./index.d.ts"
+      "import": "./index.mjs"
     },
     "./*": "./*"
   },
-  "sideEffects": false,
-  "bugs": {
-    "url": "https://github.com/vueuse/vueuse/issues"
-  },
-  "homepage": "https://github.com/vueuse/vueuse/tree/main/packages/components#readme",
+  "main": "./index.cjs",
+  "module": "./index.mjs",
+  "unpkg": "./index.iife.min.js",
+  "jsdelivr": "./index.iife.min.js",
+  "types": "./index.d.ts",
   "dependencies": {
     "@vueuse/core": "workspace:*",
     "@vueuse/shared": "workspace:*",

packages/contributors.json

@@ -11,7 +11,7 @@
   "lstoeferle",
   "harmyderoman",
   "Shinigami92",
-  "michael-observerly",
+  "michealroberts",
   "sxzz",
   "wtykirby",
   "Donskelle",
@@ -27,6 +27,7 @@
   "ArcherGu",
   "daikiojm",
   "Demivan",
+  "jbaubree",
   "ansidev",
   "marshallswain",
   "victortolbert",
@@ -38,6 +39,7 @@
   "LittleSound",
   "peter50216",
   "amrbashir",
+  "bodograumann",
   "thisprojectworks",
   "hikariNTU",
   "heartbeatLV",
@@ -48,7 +50,6 @@
   "Flamenco",
   "husayt",
   "Jay214",
-  "jbaubree",
   "JessicaSachs",
   "JserWang",
   "wvffle",
@@ -91,13 +92,15 @@
   "heyitsarpit",
   "zhl1232",
   "aryraditya",
+  "aurium",
   "azrikahar",
   "baboon-king",
   "benlesh",
   "benatkin",
   "blackhu0804",
   "Bobakanoosh",
-  "bodograumann",
+  "bperel",
+  "bryceandy",
   "MssText",
   "CharlesOkwuagwu",
   "caozhong1996",
@@ -127,6 +130,7 @@
   "hchiam",
   "IIFelix",
   "ilkome",
+  "iagafonov",
   "ivanq3w",
   "jairoblatt",
   "Jamiewarb",
@@ -159,6 +163,7 @@
   "michaelhue",
   "mdbetancourt",
   "edimitchel",
+  "michael-harvey",
   "MinatoHikari",
   "ElMassimo",
   "Nicholaiii",
@@ -188,6 +193,7 @@
   "thalesagapito",
   "thierrymichel",
   "tmkx",
+  "tobyzerner",
   "livthomas",
   "scvnc",
   "viniciuskneves",
@@ -196,6 +202,7 @@
   "xiaoxiangmoe",
   "Zenthae",
   "vhhsyt",
+  "chaii3",
   "r1ader",
   "hchlq",
   "iGalaxyz",
@@ -209,6 +216,7 @@
   "lvjiaxuan",
   "lxhyl",
   "lzdFeiFei",
+  "odex21",
   "ordago",
   "tolking",
   "reslear",
@@ -218,9 +226,11 @@
   "taidaid",
   "userquin",
   "wangjing013",
+  "xuxucode",
   "yangger6",
   "zmtlwzy",
   "7ooz",
+  "hannoeru",
   "nooooooom",
   "Coiven",
   "songlairui",

packages/core/index.ts

@@ -32,6 +32,7 @@ export * from './useDevicesList'
 export * from './useDisplayMedia'
 export * from './useDocumentVisibility'
 export * from './useDraggable'
+export * from './useDropZone'
 export * from './useElementBounding'
 export * from './useElementByPoint'
 export * from './useElementHover'

packages/core/onClickOutside/index.ts

@@ -66,7 +66,11 @@ export function onClickOutside(
       shouldListen.value = !!el && !e.composedPath().includes(el)
     }, { passive: true }),
     useEventListener(window, 'pointerup', (e) => {
-      fallback = window.setTimeout(() => listener(e), 50)
+      if (e.button === 0) {
+        const path = e.composedPath()
+        e.composedPath = () => path
+        fallback = window.setTimeout(() => listener(e), 50)
+      }
     }, { passive: true }),
   ]