From f224de041543a9374c18f5f01caac3f0a5aa561b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Sat, 9 May 2020 00:40:46 +0200 Subject: [PATCH 1/9] feat: Support ESLint 7.x BREAKING CHANGE: Requires Node@^10.12.x || 12.x --- .github/workflows/CI.yml | 25 +++++++++++++++++-------- package.json | 6 +++--- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 9ea8903c..8d51938b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -21,7 +21,7 @@ jobs: - name: Install Node.js uses: actions/setup-node@v1 with: - node-version: 12 + node-version: 14 - name: Install Packages run: npm install - name: Lint @@ -32,17 +32,26 @@ jobs: strategy: matrix: - eslint: [6, 5] - node: [13, 12, 10, 8, "8.10.0"] + eslint: [7, 6, 5] + node: [14, 12, 12.0, 10, 10.12] exclude: - # Run ESLint 5 on only the LTS. - - node: 13 - eslint: 5 + # Run ESLint 6 on only the latest LTS. + - node: 14 + eslint: 6 + - node: 12.0 + eslint: 6 - node: 10 + eslint: 6 + - node: 10.12 + eslint: 6 + # Run ESLint 5 on only the latest LTS. + - node: 14 + eslint: 5 + - node: 12.0 eslint: 5 - - node: 8 + - node: 10 eslint: 5 - - node: "8.10.0" + - node: 10.12 eslint: 5 runs-on: ubuntu-latest diff --git a/package.json b/package.json index 6705f0a9..ab4cd6e1 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "description": "The ESLint custom parser for `.vue` files.", "engines": { - "node": ">=8.10" + "node": "^10.12.0 || >=12.0.0" }, "main": "index.js", "files": [ @@ -16,7 +16,7 @@ "debug": "^4.1.1", "eslint-scope": "^5.0.0", "eslint-visitor-keys": "^1.1.0", - "espree": "^6.1.2", + "espree": "^7.0.0", "esquery": "^1.0.1", "lodash": "^4.17.15" }, @@ -33,7 +33,7 @@ "codecov": "^3.1.0", "cross-spawn": "^6.0.5", "dts-bundle": "^0.7.3", - "eslint": "^6.1.0", + "eslint": "^7.0.0", "fs-extra": "^7.0.1", "mocha": "^6.1.4", "npm-run-all": "^4.1.5", From c6364fc8d24ba6bd2847f2a9dfa9096621a6fe09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Sun, 10 May 2020 16:08:01 +0200 Subject: [PATCH 2/9] tests: Update testing matrix --- .github/workflows/CI.yml | 75 +++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 8d51938b..165007b2 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -12,47 +12,50 @@ jobs: name: Lint runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v1 - with: - fetch-depth: 1 - - name: Checkout submodules - run: git submodule update --init - - name: Install Node.js - uses: actions/setup-node@v1 - with: - node-version: 14 - - name: Install Packages - run: npm install - - name: Lint - run: npm run -s lint + - name: Checkout + uses: actions/checkout@v2 + - name: Install Node.js + uses: actions/setup-node@v1 + with: + node: 14 + - name: Install Packages + run: npm install + - name: Lint + run: npm run -s lint test: name: Test - strategy: matrix: - eslint: [7, 6, 5] - node: [14, 12, 12.0, 10, 10.12] - exclude: - # Run ESLint 6 on only the latest LTS. - - node: 14 - eslint: 6 - - node: 12.0 - eslint: 6 - - node: 10 - eslint: 6 - - node: 10.12 - eslint: 6 - # Run ESLint 5 on only the latest LTS. - - node: 14 - eslint: 5 - - node: 12.0 - eslint: 5 - - node: 10 - eslint: 5 - - node: 10.12 - eslint: 5 + eslint: [7] + node: [14] + os: [ubuntu-latest] + include: + # On other platforms + - eslint: 7 + node: 14 + os: windows-latest + - eslint: 7 + node: 14 + os: macos-latest + # On old Node.js versions + - eslint: 7 + node: 12 + os: ubuntu-latest + - eslint: 7 + node: 10 + os: ubuntu-latest + # On old ESLint versions + - eslint: 6 + node: 14 + os: ubuntu-latest + - eslint: 5 + node: 14 + os: ubuntu-latest + # On the minimum supported ESLint/Node.js version + - eslint: 5 + node: 8.10.0 + os: ubuntu-latest runs-on: ubuntu-latest steps: From ec00de3c0c6d042941ccd9a36d93b8e6b4cd0dc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Sun, 10 May 2020 16:09:22 +0200 Subject: [PATCH 3/9] chore: Resolve discussions --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ab4cd6e1..1220d07d 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "7.0.0", "description": "The ESLint custom parser for `.vue` files.", "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=8.10" }, "main": "index.js", "files": [ From e7c58f52432eabbca8a0b5a0fdf765b56b5effaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Sun, 10 May 2020 16:12:41 +0200 Subject: [PATCH 4/9] fix: Fix CI --- .github/workflows/CI.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 165007b2..f5b1fce3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -14,10 +14,12 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + - name: Checkout submodules + run: git submodule update --init - name: Install Node.js uses: actions/setup-node@v1 with: - node: 14 + node-version: 14 - name: Install Packages run: npm install - name: Lint @@ -60,9 +62,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v1 - with: - fetch-depth: 1 + uses: actions/checkout@v2 - name: Checkout submodules run: git submodule update --init - name: Install Node.js v${{ matrix.node }} From 2b32aed28befdb4ecc32c23c94bd7c5f734d654f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Sun, 10 May 2020 16:18:35 +0200 Subject: [PATCH 5/9] fix: Fix CI? --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index f5b1fce3..d954554c 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -73,7 +73,7 @@ jobs: run: npm install - name: Install ESLint v${{ matrix.eslint }} run: | - if [ ${{ matrix.eslint }} -eq 6 ]; then + if [ ${{ matrix.eslint }} != 5 ]; then cd test/fixtures/eslint npm install else From fb1ec8c8313ce322198a36784a40d43ac9324108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Sun, 10 May 2020 16:22:25 +0200 Subject: [PATCH 6/9] fix: Fix CI? --- .github/workflows/CI.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d954554c..3d79363e 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -59,7 +59,6 @@ jobs: node: 8.10.0 os: ubuntu-latest - runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v2 From 4ce5b1bd56c177be09878c93507e522facbedb12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Sun, 10 May 2020 16:26:37 +0200 Subject: [PATCH 7/9] fix: Fix CI --- .github/workflows/CI.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3d79363e..8b9d725c 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -72,15 +72,15 @@ jobs: run: npm install - name: Install ESLint v${{ matrix.eslint }} run: | - if [ ${{ matrix.eslint }} != 5 ]; then - cd test/fixtures/eslint - npm install - else + if [ ${{ matrix.eslint }} -eq 5 ]; then npm install --no-save eslint@5.16.0 cd test/fixtures/eslint git checkout v5.16.0 npm install eslint-utils@1.4.0 npm install + else + cd test/fixtures/eslint + npm install fi - name: Build run: npm run -s build From 6bdfa29904e1701867616fa6b1d4fbd5ad741560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Mon, 11 May 2020 10:25:07 +0200 Subject: [PATCH 8/9] fix: Fix CI --- .github/workflows/CI.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 8b9d725c..c2d614cb 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -59,6 +59,7 @@ jobs: node: 8.10.0 os: ubuntu-latest + runs-on: ${{ matrix.os }} steps: - name: Checkout uses: actions/checkout@v2 From c5408220b9962bf420c93bd63128b5b8c8feb554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Mon, 11 May 2020 10:30:20 +0200 Subject: [PATCH 9/9] chore: Update dependencies --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1220d07d..2195ace8 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@types/lodash": "^4.14.120", "@types/mocha": "^5.2.4", "@types/node": "^10.12.21", - "@typescript-eslint/parser": "^1.2.0", + "@typescript-eslint/parser": "^2.31.0", "babel-eslint": "^10.0.1", "chokidar": "^2.0.4", "codecov": "^3.1.0",