Skip to content

Commit

Permalink
Merge branch 'main' into head-tag
Browse files Browse the repository at this point in the history
  • Loading branch information
Mister-Hope committed Nov 20, 2023
2 parents 9a6d689 + 009501d commit 3491a4b
Show file tree
Hide file tree
Showing 326 changed files with 7,015 additions and 4,758 deletions.
15 changes: 8 additions & 7 deletions .commitlintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
const fs = require('fs')
const path = require('path')

const getSubDirectories = (dir) => fs.readdirSync(dir).filter(item => fs.statSync(path.join(dir, item)).isDirectory())
const getSubDirectories = (dir) =>
fs
.readdirSync(dir)
.filter((item) => fs.statSync(path.join(dir, item)).isDirectory())
const corePackages = getSubDirectories(path.resolve(__dirname, 'packages'))
const ecosystemPackages = getSubDirectories(path.resolve(__dirname, 'ecosystem'))
const ecosystemPackages = getSubDirectories(
path.resolve(__dirname, 'ecosystem'),
)

module.exports = {
extends: ['@commitlint/config-conventional'],
rules: {
'scope-enum': [
2,
'always',
[...corePackages, ...ecosystemPackages],
],
'scope-enum': [2, 'always', [...corePackages, ...ecosystemPackages]],
'footer-max-line-length': [0],
},
}
2 changes: 2 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ module.exports = {
__VUE_HMR_RUNTIME__: 'readonly',
__VUE_OPTIONS_API__: 'readonly',
__VUE_PROD_DEVTOOLS__: 'readonly',
// workaround for vue3.3 slots, should be removed once eslint-plugin-vue supports this
defineSlots: 'readonly',
},
overrides: [
{
Expand Down
15 changes: 12 additions & 3 deletions .github/workflows/check-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node: ['14', '16', '18']
node: ['18', '20']
bundler: ['vite', 'webpack']

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
cache: pnpm
Expand All @@ -45,3 +45,12 @@ jobs:
run: pnpm docs:build
env:
DOCS_BUNDLER: ${{ matrix.bundler }}

check-docs-result:
if: ${{ always() }}
name: check-docs result
runs-on: ubuntu-latest
needs: [check-docs]
steps:
- if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
run: exit 1
15 changes: 12 additions & 3 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node: ['14', '16', '18']
node: ['18', '20']

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
cache: pnpm
Expand All @@ -45,3 +45,12 @@ jobs:

- name: Test
run: pnpm test

check-result:
if: ${{ always() }}
name: check result
runs-on: ubuntu-latest
needs: [check]
steps:
- if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
run: exit 1
6 changes: 3 additions & 3 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ jobs:
runs-on: ubuntu-latest

env:
NODE_VERSION: '16'
NODE_VERSION: '18'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
cache: pnpm
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ jobs:

env:
DOCS_GA_ID: G-CTB8FQ7VMW
NODE_VERSION: '16'
NODE_VERSION: '18'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

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

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
cache: pnpm
Expand All @@ -37,7 +37,7 @@ jobs:
run: pnpm docs:release

- name: Deploy to GitHub Pages
uses: crazy-max/ghaction-github-pages@v2.2.0
uses: crazy-max/ghaction-github-pages@v4
with:
repo: vuepress/vuepress.github.io
target_branch: main
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/issue-commented.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
if: contains(github.event.issue.labels.*.name, 'stale')
runs-on: ubuntu-latest
steps:
- uses: actions-cool/issues-helper@v2
- uses: actions-cool/issues-helper@v3
with:
actions: 'remove-labels'
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/issue-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
name: label stale issues
runs-on: ubuntu-latest
steps:
- uses: actions-cool/issues-helper@v2
- uses: actions-cool/issues-helper@v3
with:
actions: 'check-inactive'
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -23,7 +23,7 @@ jobs:
name: close stale issues
runs-on: ubuntu-latest
steps:
- uses: actions-cool/issues-helper@v2
- uses: actions-cool/issues-helper@v3
with:
actions: 'close-issues'
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -34,7 +34,7 @@ jobs:
name: close need-reproduction issues
runs-on: ubuntu-latest
steps:
- uses: actions-cool/issues-helper@v2
- uses: actions-cool/issues-helper@v3
with:
actions: 'close-issues'
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/issue-labeled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
if: github.event.label.name == 'invalid'
runs-on: ubuntu-latest
steps:
- uses: actions-cool/issues-helper@v2
- uses: actions-cool/issues-helper@v3
with:
actions: 'close-issue, create-comment'
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -22,7 +22,7 @@ jobs:
if: github.event.label.name == 'need reproduction'
runs-on: ubuntu-latest
steps:
- uses: actions-cool/issues-helper@v2
- uses: actions-cool/issues-helper@v3
with:
actions: 'create-comment'
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
pnpm-lock.yaml
*.html
*.md
1 change: 1 addition & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"recommendations": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"vue.volar"
]
}
2 changes: 2 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"editor.insertSpaces": true,
"editor.tabSize": 2,
"files.encoding": "utf8",
Expand Down
Loading

0 comments on commit 3491a4b

Please sign in to comment.