diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 58878a03e..136770fd9 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -1,9 +1,13 @@ name: CI on: push: - branches: [master] + branches: + - 'master' pull_request: - branches: [master] + types: + - 'opened' + - 'synchronize' + - 'reopened' permissions: contents: read @@ -27,15 +31,13 @@ jobs: strategy: matrix: node: [18, 20] - os: [ubuntu-latest] eslint: [8, 9] include: # On old Node version - - eslint: 8 - node: 17 - os: ubuntu-latest + - node: 17 + eslint: 8 - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v3 diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts index 77c052a58..afa635d7e 100644 --- a/docs/.vitepress/config.mts +++ b/docs/.vitepress/config.mts @@ -32,7 +32,7 @@ export default async () => { { title: 'Base Rules', categoryIds: ['base'] }, { title: 'Priority A: Essential', - categoryIds: ['vue3-essential', 'essential'] + categoryIds: ['vue3-essential', 'vue2-essential'] }, { title: 'Priority A: Essential for Vue.js 3.x', @@ -40,11 +40,11 @@ export default async () => { }, { title: 'Priority A: Essential for Vue.js 2.x', - categoryIds: ['essential'] + categoryIds: ['vue2-essential'] }, { title: 'Priority B: Strongly Recommended', - categoryIds: ['vue3-strongly-recommended', 'strongly-recommended'] + categoryIds: ['vue3-strongly-recommended', 'vue2-strongly-recommended'] }, { title: 'Priority B: Strongly Recommended for Vue.js 3.x', @@ -52,11 +52,11 @@ export default async () => { }, { title: 'Priority B: Strongly Recommended for Vue.js 2.x', - categoryIds: ['strongly-recommended'] + categoryIds: ['vue2-strongly-recommended'] }, { title: 'Priority C: Recommended', - categoryIds: ['vue3-recommended', 'recommended'] + categoryIds: ['vue3-recommended', 'vue2-recommended'] }, { title: 'Priority C: Recommended for Vue.js 3.x', @@ -64,7 +64,7 @@ export default async () => { }, { title: 'Priority C: Recommended for Vue.js 2.x', - categoryIds: ['recommended'] + categoryIds: ['vue2-recommended'] } ] diff --git a/docs/rules/array-bracket-newline.md b/docs/rules/array-bracket-newline.md index 10182aeba..550723b5d 100644 --- a/docs/rules/array-bracket-newline.md +++ b/docs/rules/array-bracket-newline.md @@ -10,7 +10,7 @@ since: v7.1.0 > Enforce linebreaks after opening and before closing array brackets in `