Skip to content

Commit 5a512fa

Browse files
FRSgitFRSgit
committed
chore: update linting configuration to eslint 9
fixup CI scripts
1 parent 7f8653e commit 5a512fa

27 files changed

+700
-557
lines changed

‎.eslintignore‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.eslintrc.js‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎.github/workflows/ci.yml‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ jobs:
1515
pnpm-cache: ${{ steps.vars.outputs.pnpm-cache }}
1616
key: ${{ steps.vars.outputs.key }}
1717
steps:
18-
- uses: actions/checkout@v3
19-
- uses: pnpm/action-setup@v2.2.4
20-
- uses: actions/setup-node@v3
18+
- uses: actions/checkout@v4
19+
- uses: pnpm/action-setup@v3
20+
- uses: actions/setup-node@v4
2121
with:
22-
node-version: "18.x"
22+
node-version-file: '.nvmrc'
2323
- id: vars
2424
run: |
2525
echo "pnpm-cache=$(pnpm store path --silent)" >> $GITHUB_OUTPUT
2626
echo "key=${{ runner.os }}-pnpm-${{ hashFiles('pnpm-lock.yaml') }}" >> $GITHUB_OUTPUT
2727
- name: Cache NPM and Cypress 📦
28-
uses: actions/cache@v3
28+
uses: actions/cache@v4
2929
id: cache
3030
with:
3131
path: |
@@ -44,13 +44,13 @@ jobs:
4444
runs-on: ubuntu-latest
4545
needs: cache
4646
steps:
47-
- uses: actions/checkout@v3
48-
- uses: pnpm/action-setup@v2.2.4
49-
- uses: actions/setup-node@v3
47+
- uses: actions/checkout@v4
48+
- uses: pnpm/action-setup@v3
49+
- uses: actions/setup-node@v4
5050
with:
51-
node-version: "18.x"
51+
node-version-file: '.nvmrc'
5252
- name: Cache NPM and Cypress 📦
53-
uses: actions/cache@v3
53+
uses: actions/cache@v4
5454
id: cache
5555
with:
5656
path: |
@@ -71,13 +71,13 @@ jobs:
7171
runs-on: ubuntu-latest
7272
needs: cache
7373
steps:
74-
- uses: actions/checkout@v3
75-
- uses: pnpm/action-setup@v2.2.4
76-
- uses: actions/setup-node@v3
74+
- uses: actions/checkout@v4
75+
- uses: pnpm/action-setup@v3
76+
- uses: actions/setup-node@v4
7777
with:
78-
node-version: "18.x"
78+
node-version-file: '.nvmrc'
7979
- name: Cache NPM and Cypress 📦
80-
uses: actions/cache@v3
80+
uses: actions/cache@v4
8181
id: cache
8282
with:
8383
path: |
@@ -108,13 +108,13 @@ jobs:
108108
runs-on: ubuntu-latest
109109
needs: cache
110110
steps:
111-
- uses: actions/checkout@v3
112-
- uses: pnpm/action-setup@v2.2.4
113-
- uses: actions/setup-node@v3
111+
- uses: actions/checkout@v4
112+
- uses: pnpm/action-setup@v3
113+
- uses: actions/setup-node@v4
114114
with:
115-
node-version: "18.x"
115+
node-version-file: '.nvmrc'
116116
- name: Cache NPM and Cypress 📦
117-
uses: actions/cache@v3
117+
uses: actions/cache@v4
118118
id: cache
119119
with:
120120
path: |
@@ -165,15 +165,14 @@ jobs:
165165
needs: [cache, prepare-release]
166166
if: needs.prepare-release.outputs.releases_created
167167
steps:
168-
- uses: actions/checkout@v3
169-
- uses: pnpm/action-setup@v2.2.4
170-
- uses: actions/setup-node@v3
168+
- uses: actions/checkout@v4
169+
- uses: pnpm/action-setup@v3
170+
- uses: actions/setup-node@v4
171171
with:
172-
node-version: "18.x"
172+
node-version-file: '.nvmrc'
173173
registry-url: 'https://registry.npmjs.org'
174-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
175174
- name: Cache NPM and Cypress 📦
176-
uses: actions/cache@v3
175+
uses: actions/cache@v4
177176
id: cache
178177
with:
179178
path: |

‎.nvmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
20.17.0

‎.prettierignore‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎eslint.config.mjs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { typescript, javascript } from '@frsource/eslint-config';
2+
import globals from 'globals';
3+
import cypress from 'eslint-plugin-cypress/flat'
4+
5+
/** @type {import("eslint").Linter.Config[]} */
6+
export default [
7+
...javascript,
8+
...typescript,
9+
{ ignores: ['**/dist', '**/coverage', '**/node_modules'] },
10+
{ rules: { '@typescript-eslint/no-invalid-void-type': 'off' } },
11+
{
12+
plugins: { cypress },
13+
files: ['examples/*/cypress/**', 'packages/*/src/**'],
14+
languageOptions: {
15+
globals: {
16+
...globals.es2021,
17+
...globals.node,
18+
...cypress.globals,
19+
},
20+
},
21+
},
22+
];

‎package.json‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@
2727
"cypress": ">=4.5.0"
2828
},
2929
"devDependencies": {
30-
"@typescript-eslint/eslint-plugin": "7.14.1",
31-
"@typescript-eslint/parser": "7.14.1",
32-
"eslint": "9.6.0",
33-
"eslint-config-prettier": "9.1.0",
34-
"eslint-plugin-cypress": "3.3.0",
35-
"eslint-plugin-eslint-comments": "3.2.0"
30+
"@frsource/eslint-config": "1.15.0",
31+
"eslint": "9.10.0",
32+
"eslint-plugin-cypress": "^3.5.0",
33+
"globals": "15.9.0"
3634
}
3735
}

‎packages/cypress-plugin-visual-regression-diff/.eslintignore‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎packages/cypress-plugin-visual-regression-diff/.prettierignore‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
node_modules
2-
dist
2+
**/node_modules
3+
**/coverage
34
coverage
5+
**/dist
6+
pnpm-lock.yaml
47
CHANGELOG.md
5-
.yarnrc.yml
6-
example/.yarnrc.yml
7-
.yarn

‎packages/cypress-plugin-visual-regression-diff/__tests__/fixtures/prepare-screenshot-for-cleanup.spec.cy.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
describe("Cleanup test", () => {
2-
it("Create screenshot to be removed", () => {
3-
cy.visit("/");
1+
describe('Cleanup test', () => {
2+
it('Create screenshot to be removed', () => {
3+
cy.visit('/');
44
cy.get('[data-testid="description"]').matchImage();
55
});
66
});

0 commit comments

Comments
 (0)