Skip to content

Commit

Permalink
Merge branch 'main' into feat/useBluetooth
Browse files Browse the repository at this point in the history
  • Loading branch information
michealroberts committed Apr 24, 2022
2 parents 8b691b8 + a22a128 commit 08f9114
Show file tree
Hide file tree
Showing 219 changed files with 4,191 additions and 1,955 deletions.
9 changes: 4 additions & 5 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ module.exports = {
node: true,
},
extends: '@antfu/eslint-config',
plugins: [
'markdown',
],
rules: {
'react/no-string-refs': 'off',
'react/no-unknown-property': 'off',
'react/display-name': 'off',
'vue/no-deprecated-functional-template': 'off',
'vue/one-component-per-file': 'off',
'vue/no-template-shadow': 'off',
Expand Down Expand Up @@ -43,14 +41,15 @@ module.exports = {
},
overrides: [
{
files: ['*.md', 'demo.vue', 'scripts/*.ts', '*.test.ts'],
files: ['**/*.md', '**/*.md/*.*', 'demo.vue', 'scripts/*.ts', '*.test.ts'],
rules: {
'no-alert': 'off',
'no-console': 'off',
'no-undef': 'off',
'no-unused-vars': 'off',
'@typescript-eslint/no-unused-vars': 'off',
'no-restricted-imports': 'off',
'@typescript-eslint/no-unused-vars': 'off',
'@typescript-eslint/no-redeclare': 'off',
},
},
{
Expand Down
74 changes: 74 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
name: CI

on:
push:
branches:
- main
- next

pull_request:
branches:
- main
- next

jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Install pnpm
uses: pnpm/action-setup@v2.2.1

- name: Set node
uses: actions/setup-node@v2
with:
node-version: 16.x
cache: pnpm

- name: Setup
run: npm i -g @antfu/ni

- name: Install
run: nci

- name: Lint
run: nr lint

test:
runs-on: ubuntu-latest

strategy:
matrix:
node: [14.x, 16.x]
fail-fast: false

steps:
- uses: actions/checkout@v2

- name: Install pnpm
uses: pnpm/action-setup@v2.2.1

- name: Set node version to ${{ matrix.node }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node }}
cache: pnpm

- name: Setup
run: npm i -g @antfu/ni

- name: Install
run: nci

- name: Build
run: nr build

- name: Typecheck
run: nr typecheck

- name: Test Vue 3
run: pnpm run test:3

- name: Test Vue 2
run: pnpm run test:2
38 changes: 0 additions & 38 deletions .github/workflows/lint.yml

This file was deleted.

48 changes: 0 additions & 48 deletions .github/workflows/test.yml

This file was deleted.

12 changes: 12 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@
"prepublish",
"vue"
],
"eslint.validate": [
"javascript",
"typescript",
"javascriptreact",
"typescriptreact",
"vue",
"html",
"json",
"jsonc",
"json5",
"markdown"
],
"vite.vitepress": true,
"vite.vitepressBase": "packages",
"vite.vitepressAutoRouting": true,
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Clone this repo to your local machine and install the dependencies.
pnpm install
```

We use Vitepress for rapid development and documenting. You can start it locally by
We use VitePress for rapid development and documenting. You can start it locally by

```bash
pnpm dev
Expand Down
14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
<p align="center">
<a href="https://github.com/vueuse/vueuse"><img src="https://raw.githubusercontent.com/vueuse/vueuse/main/packages/public/logo-vertical.png" alt="VueUse - Collection of essential Vue Composition Utilities" width="300"></a><br>
<a href="https://github.com/vueuse/vueuse#gh-light-mode-only">
<img src="https://raw.githubusercontent.com/vueuse/vueuse/main/packages/public/logo-vertical.png#gh-light-mode-only" alt="VueUse - Collection of essential Vue Composition Utilities" width="300">
</a>
<a href="https://github.com/vueuse/vueuse#gh-dark-mode-only">
<img src="https://raw.githubusercontent.com/vueuse/vueuse/main/packages/public/logo-vertical-dark.png#gh-dark-mode-only" alt="VueUse - Collection of essential Vue Composition Utilities" width="300">
</a>
<br>
Collection of essential Vue Composition Utilities
</p>

Expand All @@ -23,7 +29,7 @@ Collection of essential Vue Composition Utilities
- 🎪 [**Interactive docs & demos**](https://vueuse.org)
- 🕶 **Seamless migration**: Works for **both** Vue 3 and 2
-**Fully tree shakeable**: Only take what you want, [bundle size](https://vueuse.org/export-size)
- 🦾 **Type Strong**: Written in [Typescript](https://www.typescriptlang.org/), with [TS Docs](https://github.com/microsoft/tsdoc)
- 🦾 **Type Strong**: Written in [TypeScript](https://www.typescriptlang.org/), with [TS Docs](https://github.com/microsoft/tsdoc)
- 🔋 **SSR Friendly**
- 🌎 **No bundler required**: Usable via CDN
- 🔩 **Flexible**: Configurable event filters and targets
Expand All @@ -32,7 +38,7 @@ Collection of essential Vue Composition Utilities
## 🦄 Usage

```ts
import { useMouse, usePreferredDark, useLocalStorage } from '@vueuse/core'
import { useLocalStorage, useMouse, usePreferredDark } from '@vueuse/core'

export default {
setup() {
Expand All @@ -52,7 +58,7 @@ export default {
)

return { x, y, isDark, store }
}
},
}
```

Expand Down
1 change: 1 addition & 0 deletions meta/packages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ export const packages: PackageManifest[] = [
'focus-trap': 'focusTrap',
'drauu': 'Drauu',
'fuse.js': 'Fuse',
'change-case': 'changeCase',
},
},
{
Expand Down
8 changes: 5 additions & 3 deletions meta/versions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ export const currentVersion = `v${version}`

export const versions = [
{ version: currentVersion },
{ version: 'v5.3', link: 'https://v5-3-0.vueuse.org/' },
{ version: 'v4.11', link: 'https://v4-11-2.vueuse.org/' },
{ version: 'v4.0', link: 'https://v4-0-6.vueuse.org/' },
{ version: 'v7.7.1', link: 'https://v7-7-1.vueuse.org/' },
{ version: 'v6.7.6', link: 'https://v6-7-6.vueuse.org/' },
{ version: 'v5.3.0', link: 'https://v5-3-0.vueuse.org/' },
{ version: 'v4.11.2', link: 'https://v4-11-2.vueuse.org/' },
{ version: 'v4.0.6', link: 'https://v4-0-6.vueuse.org/' },
]
2 changes: 1 addition & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

[build]
publish = "packages/.vitepress/dist"
command = "npx pnpm i --store=node_modules/.pnpm-store && npm run docs:build"
command = "npx pnpm i --store=node_modules/.pnpm-store && npm run install-fonts && npm run docs:build"

[[redirects]]
from = "https://vueuse.js.org/*"
Expand Down

0 comments on commit 08f9114

Please sign in to comment.