Skip to content

Commit c9c48de

Browse files
committed
Fix CI issues
1 parent 5b7af03 commit c9c48de

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

.github/workflows/lint-js-and-ruby.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
yarn run knip
8282
yarn run knip --production
8383
- name: Lint JS
84-
run: yarn start lint
84+
run: yarn run eslint --report-unused-disable-directives
8585
- name: Check formatting
8686
run: yarn start format.listDifferent
8787
- name: Type-check TypeScript

.prettierignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,3 @@ spec/dummy/public
1717
.rubocop.yml
1818
# Intentionally invalid
1919
spec/react_on_rails/fixtures/i18n/locales_symbols/
20-
21-
# Weirdly, fixing this file creates linting errors, even though it shouldn't make a difference.
22-
# Resolve later when upgrading ESLint.
23-
.eslintrc

eslint.config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ const config = tsEslint.config([
3333
'**/public/packs*/*',
3434
'**/gen-examples',
3535
'**/bundle/',
36+
// These files can't be included in tsconfig.json because they can't be compiled under Node 16
37+
'eslint.config.ts',
3638
'knip.ts',
3739
]),
3840
{

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
"target": "es5",
1515
"typeRoots": ["./node_modules/@types", "./node_package/types"]
1616
},
17-
"include": ["node_package/src/**/*", "node_package/types/**/*", "eslint.config.ts"]
17+
"include": ["node_package/src/**/*", "node_package/types/**/*"]
1818
}

0 commit comments

Comments
 (0)