diff options
| -rw-r--r-- | .github/workflows/lint.yml | 1 | ||||
| -rw-r--r-- | packages/client/package.json | 3 | ||||
| -rw-r--r-- | packages/sw/.eslintrc.js | 4 | ||||
| -rw-r--r-- | packages/sw/package.json | 6 | ||||
| -rw-r--r-- | yarn.lock | 9 |
5 files changed, 15 insertions, 8 deletions
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5e93c04aa3..50d86e696b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,6 +14,7 @@ jobs: workspace:
- backend
- client
+ - sw
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
diff --git a/packages/client/package.json b/packages/client/package.json index 1d0c5ee4ec..5a05e0bbf3 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -84,6 +84,7 @@ "eslint-plugin-import": "2.26.0", "eslint-plugin-vue": "9.8.0", "rollup": "3.5.1", - "start-server-and-test": "1.14.0" + "start-server-and-test": "1.14.0", + "vue-eslint-parser": "^9.1.0" } } diff --git a/packages/sw/.eslintrc.js b/packages/sw/.eslintrc.js index 9d56daca83..ae9c53244a 100644 --- a/packages/sw/.eslintrc.js +++ b/packages/sw/.eslintrc.js @@ -6,10 +6,10 @@ module.exports = { parserOptions: { "parser": "@typescript-eslint/parser", tsconfigRootDir: __dirname, - //project: ['./tsconfig.json'], + project: ['./tsconfig.json'], }, extends: [ - //"../shared/.eslintrc.js", + "../shared/.eslintrc.js", ], globals: { "require": false, diff --git a/packages/sw/package.json b/packages/sw/package.json index 7ff08d2011..b3935011c4 100644 --- a/packages/sw/package.json +++ b/packages/sw/package.json @@ -4,7 +4,7 @@ "scripts": { "watch": "node build.js watch", "build": "node build.js", - "lint": "eslint --quiet src/**/*.{ts}" + "lint": "eslint --quiet src/**/*.ts" }, "dependencies": { "esbuild": "^0.14.42", @@ -12,6 +12,8 @@ "misskey-js": "0.0.14" }, "devDependencies": { - "eslint": "^8.16.0" + "@typescript-eslint/parser": "^5.45.0", + "eslint": "^8.16.0", + "eslint-plugin-import": "^2.26.0" } } @@ -2706,7 +2706,7 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:5.45.0": +"@typescript-eslint/parser@npm:5.45.0, @typescript-eslint/parser@npm:^5.45.0": version: 5.45.0 resolution: "@typescript-eslint/parser@npm:5.45.0" dependencies: @@ -4875,6 +4875,7 @@ __metadata: vanilla-tilt: 1.7.3 vite: 3.2.4 vue: 3.2.45 + vue-eslint-parser: ^9.1.0 vue-prism-editor: 2.0.0-alpha.2 vuedraggable: 4.0.1 languageName: unknown @@ -6940,7 +6941,7 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-import@npm:2.26.0": +"eslint-plugin-import@npm:2.26.0, eslint-plugin-import@npm:^2.26.0": version: 2.26.0 resolution: "eslint-plugin-import@npm:2.26.0" dependencies: @@ -15702,8 +15703,10 @@ __metadata: version: 0.0.0-use.local resolution: "sw@workspace:packages/sw" dependencies: + "@typescript-eslint/parser": ^5.45.0 esbuild: ^0.14.42 eslint: ^8.16.0 + eslint-plugin-import: ^2.26.0 idb-keyval: ^6.1.0 misskey-js: 0.0.14 languageName: unknown @@ -16959,7 +16962,7 @@ __metadata: languageName: node linkType: hard -"vue-eslint-parser@npm:^9.0.1": +"vue-eslint-parser@npm:^9.0.1, vue-eslint-parser@npm:^9.1.0": version: 9.1.0 resolution: "vue-eslint-parser@npm:9.1.0" dependencies: |