Skip to content

Commit

Permalink
Merge branch 'main' into feature/useAsyncValidator
Browse files Browse the repository at this point in the history
  • Loading branch information
antfu committed May 31, 2022
2 parents 8ca56b5 + bbb8334 commit 711a3f4
Show file tree
Hide file tree
Showing 50 changed files with 1,614 additions and 1,008 deletions.
70 changes: 35 additions & 35 deletions package.json
@@ -1,11 +1,11 @@
{
"name": "@vueuse/monorepo",
"version": "8.4.2",
"version": "8.5.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",
Expand Down Expand Up @@ -34,84 +34,84 @@
"watch": "esno scripts/build.ts --watch"
},
"devDependencies": {
"@antfu/eslint-config": "^0.23.0",
"@antfu/eslint-config": "^0.24.2",
"@antfu/ni": "^0.16.2",
"@iconify/json": "^2.1.35",
"@iconify/json": "^2.1.48",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-replace": "^4.0.0",
"@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.35",
"@types/prettier": "^2.6.1",
"@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",
"@vitest/ui": "^0.12.9",
"@vue/compiler-sfc": "^3.2.36",
"@vue/composition-api": "^1.6.2",
"@vue/test-utils": "^2.0.0",
"@vue/theme": "^1.0.2",
"axios": "^0.27.2",
"bumpp": "^7.1.1",
"consola": "^2.15.3",
"cross-env": "^7.0.3",
"esbuild-register": "^3.3.2",
"eslint": "^8.14.0",
"esno": "^0.14.1",
"eslint": "^8.16.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": "^12.4.2",
"markdown-table": "^3.0.2",
"md5": "^2.3.0",
"msw": "^0.39.2",
"msw": "^0.41.0",
"node-fetch": "^3.2.4",
"ohmyfetch": "^0.4.16",
"pnpm": "^7.0.0",
"postcss": "^8.4.13",
"ohmyfetch": "^0.4.18",
"pnpm": "^7.1.7",
"postcss": "^8.4.14",
"postcss-nested": "^5.0.6",
"prettier": "^2.6.2",
"prism-theme-vars": "^0.2.2",
"prism-theme-vars": "^0.2.3",
"remove-markdown": "^0.5.0",
"rimraf": "^3.0.2",
"rollup": "^2.71.1",
"rollup": "^2.74.1",
"rollup-plugin-dts": "^4.2.1",
"rollup-plugin-esbuild": "^4.9.1",
"sharp": "^0.30.4",
"sharp": "^0.30.5",
"simple-git": "^3.7.1",
"simple-git-hooks": "^2.7.0",
"typescript": "4.6.4",
"unocss": "^0.32.9",
"typescript": "4.7.2",
"unocss": "^0.34.1",
"unplugin-icons": "^0.14.3",
"unplugin-vue-components": "^0.19.3",
"vite": "^2.9.7",
"unplugin-vue-components": "^0.19.5",
"vite": "^2.9.9",
"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.12.9",
"vue": "^3.2.36",
"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"
]
}
}
4 changes: 2 additions & 2 deletions packages/.test/mockServer.ts
Expand Up @@ -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

Expand Down
38 changes: 19 additions & 19 deletions packages/components/package.json
@@ -1,37 +1,37 @@
{
"name": "@vueuse/components",
"version": "8.4.2",
"version": "8.5.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": {
".": {
"types": "./index.d.ts",
"import": "./index.mjs",
"require": "./index.cjs",
"types": "./index.d.ts"
"require": "./index.cjs"
},
"./*": "./*"
},
"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:*",
Expand Down
18 changes: 13 additions & 5 deletions packages/contributors.json
@@ -1,7 +1,7 @@
[
"antfu",
"wheatjs",
"webfansplz",
"wheatjs",
"okxiaoliang4",
"sibbng",
"anteriovieira",
Expand All @@ -27,6 +27,7 @@
"ArcherGu",
"daikiojm",
"Demivan",
"jbaubree",
"ansidev",
"marshallswain",
"victortolbert",
Expand All @@ -35,8 +36,10 @@
"Talljack",
"markthree",
"AllenYu0118",
"LittleSound",
"peter50216",
"amrbashir",
"bodograumann",
"thisprojectworks",
"hikariNTU",
"heartbeatLV",
Expand All @@ -47,7 +50,6 @@
"Flamenco",
"husayt",
"Jay214",
"jbaubree",
"JessicaSachs",
"JserWang",
"wvffle",
Expand All @@ -71,10 +73,10 @@
"macheteHot",
"unknownzjc",
"vaaski",
"yyyang1996",
"sapphi-red",
"FRSgit",
"climba03003",
"AaronBeaudoin",
"soub4i",
"adrianjost",
"avfrancev",
Expand All @@ -90,14 +92,13 @@
"heyitsarpit",
"zhl1232",
"aryraditya",
"LittleSound",
"azrikahar",
"baboon-king",
"benlesh",
"benatkin",
"blackhu0804",
"Bobakanoosh",
"bodograumann",
"bperel",
"MssText",
"CharlesOkwuagwu",
"caozhong1996",
Expand Down Expand Up @@ -127,6 +128,7 @@
"hchiam",
"IIFelix",
"ilkome",
"iagafonov",
"ivanq3w",
"jairoblatt",
"Jamiewarb",
Expand Down Expand Up @@ -171,6 +173,7 @@
"praburangki",
"QiroNT",
"ramonakira",
"Redemption198",
"neelance",
"wobsoriano",
"rromanv",
Expand All @@ -187,6 +190,7 @@
"thalesagapito",
"thierrymichel",
"tmkx",
"tobyzerner",
"livthomas",
"scvnc",
"viniciuskneves",
Expand All @@ -195,7 +199,9 @@
"xiaoxiangmoe",
"Zenthae",
"vhhsyt",
"chaii3",
"r1ader",
"hchlq",
"iGalaxyz",
"winter-ice",
"monkeywithacupcake",
Expand All @@ -207,6 +213,7 @@
"lvjiaxuan",
"lxhyl",
"lzdFeiFei",
"odex21",
"ordago",
"tolking",
"reslear",
Expand All @@ -216,6 +223,7 @@
"taidaid",
"userquin",
"wangjing013",
"xuxucode",
"yangger6",
"zmtlwzy",
"7ooz",
Expand Down
1 change: 1 addition & 0 deletions packages/core/index.ts
Expand Up @@ -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'
Expand Down
44 changes: 22 additions & 22 deletions packages/core/package.json
@@ -1,43 +1,43 @@
{
"name": "@vueuse/core",
"version": "8.4.2",
"version": "8.5.0",
"description": "Collection of essential Vue Composition Utilities",
"keywords": [
"vue",
"vue-use",
"utils"
],
"license": "MIT",
"author": "Anthony Fu <https://github.com/antfu>",
"license": "MIT",
"funding": "https://github.com/sponsors/antfu",
"homepage": "https://github.com/vueuse/vueuse#readme",
"repository": {
"type": "git",
"url": "git+https://github.com/vueuse/vueuse.git",
"directory": "packages/core"
},
"funding": "https://github.com/sponsors/antfu",
"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": {
".": {
"types": "./index.d.ts",
"import": "./index.mjs",
"require": "./index.cjs",
"types": "./index.d.ts"
"require": "./index.cjs"
},
"./*": "./*",
"./metadata": {
"types": "./metadata.d.ts",
"import": "./metadata.mjs",
"require": "./metadata.cjs",
"types": "./metadata.d.ts"
"require": "./metadata.cjs"
}
},
"sideEffects": false,
"bugs": {
"url": "https://github.com/vueuse/vueuse/issues"
},
"homepage": "https://github.com/vueuse/vueuse#readme",
"main": "./index.cjs",
"module": "./index.mjs",
"unpkg": "./index.iife.min.js",
"jsdelivr": "./index.iife.min.js",
"types": "./index.d.ts",
"peerDependencies": {
"@vue/composition-api": "^1.1.0",
"vue": "^2.6.0 || ^3.2.0"
Expand Down

0 comments on commit 711a3f4

Please sign in to comment.