Skip to content

Commit 6b44611

Browse files
committed
🔧 update eslint
1 parent 5cf4b13 commit 6b44611

File tree

5 files changed

+317
-1389
lines changed

5 files changed

+317
-1389
lines changed

‎.eslintrc.js

-60
This file was deleted.

‎.github/workflows/ci.yml

+9-5
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,14 @@ jobs:
1313
- uses: actions/setup-python@v4
1414
with:
1515
python-version: 3.x
16-
- uses: actions/setup-node@v3
16+
- name: Install pnpm
17+
uses: pnpm/action-setup@v4
1718
with:
18-
node-version: '16'
19-
cache: 'yarn'
19+
version: 9
20+
- uses: actions/setup-node@v4
21+
with:
22+
node-version: '20'
23+
cache: 'pnpm'
2024
- uses: actions/cache@v1
2125
with:
2226
key: v0-${{ runner.os }}-pip-lint-${{ hashFiles('setup.py') }}
@@ -27,12 +31,12 @@ jobs:
2731
- name: Install dependencies # TODO: move to requirements.txt
2832
run: |
2933
pip install flake8 black isort
30-
yarn install
34+
pnpm install
3135
- name: Run flake8
3236
run: flake8 froide_campaign --statistics
3337
- name: Run black
3438
run: black --check froide_campaign
3539
- name: Run isort
3640
run: isort --check froide_campaign
3741
- name: Run eslint
38-
run: yarn lint
42+
run: pnpm lint

‎eslint.config.mjs

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
import config from '@okfde/eslint-config-froide'
2+
export default config

‎package.json

+5-17
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,12 @@
2121
},
2222
"homepage": "https://github.com/okfde/froide-campaign#readme",
2323
"devDependencies": {
24-
"@types/leaflet": "^1.7.11",
25-
"@typescript-eslint/eslint-plugin": "^5.52.0",
26-
"@typescript-eslint/parser": "^5.52.0",
27-
"@vue/eslint-config-typescript": "^11.0.3",
28-
"eslint": "^8.34.0",
29-
"eslint-config-prettier": "^8.9.0",
30-
"eslint-plugin-html": "^7.1.0",
31-
"eslint-plugin-import": "^2.27.5",
32-
"eslint-plugin-n": "^15.6.1",
33-
"eslint-plugin-prettier": "^4.0.0",
34-
"eslint-plugin-promise": "^6.0.0",
35-
"eslint-plugin-vue": "^9.9.0",
36-
"prettier": "^2.8.4",
37-
"prettier-config-standard": "^5.0.0",
38-
"typescript": "^4.9.5",
39-
"vue-eslint-parser": "^9.3.1"
24+
"@okfde/eslint-config-froide": "github:okfde/eslint-config-froide",
25+
"typescript": "^4.9.5"
4026
},
4127
"dependencies": {
4228
"@turf/bbox": "^6.0.1",
29+
"@types/leaflet": "^1.7.11",
4330
"@vue-leaflet/vue-leaflet": "^0.8.3",
4431
"deepmerge": "^4.2.2",
4532
"froide": "okfde/froide",
@@ -51,5 +38,6 @@
5138
},
5239
"peerDependencies": {
5340
"froide": "github:okfde/froide"
54-
}
41+
},
42+
"prettier": "prettier-config-standard"
5543
}

0 commit comments

Comments
 (0)