Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/.bundle/
.bundle/
/.yardoc
/_yardoc/
/coverage/
coverage/
/doc/
/pkg/
/spec/reports/
Expand All @@ -12,6 +12,8 @@
/spec/examples.txt
/spec/react_on_rails/dummy-for-generators/

tmp/

# RVM
.ruby-version
.ruby-gemset
Expand All @@ -23,6 +25,7 @@ node_modules
yarn-debug.*
yarn-error.*
npm-debug.*
.yarn-integrity

/gen-examples

Expand All @@ -39,3 +42,21 @@ yalc.lock

# TypeScript
*.tsbuildinfo

# Dummy app
/spec/dummy/vendor/bundle
/spec/dummy/db/*.sqlite3*
/spec/dummy/log/**/*
!/spec/dummy/log/.keep
/spec/dummy/public/assets/
/spec/dummy/public/webpack/
/spec/dummy/spec/examples.txt

# ReScript build files
/spec/dummy/.merlin
/spec/dummy/lib/bs/
/spec/dummy/.bsb.lock
/spec/dummy/**/*.res.js

# Generated by ROR FS-based Registry
generated
15 changes: 10 additions & 5 deletions eslint.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import path from 'node:path';
import { globalIgnores } from 'eslint/config';
import prettierRecommended from 'eslint-plugin-prettier/recommended';
import globals from 'globals';
import tsEslint from 'typescript-eslint';
import { includeIgnoreFile } from '@eslint/compat';
import js from '@eslint/js';
import { FlatCompat } from '@eslint/eslintrc';

Expand All @@ -12,6 +14,7 @@ const compat = new FlatCompat({
});

const config = tsEslint.config([
includeIgnoreFile(path.resolve(__dirname, '.gitignore')),
globalIgnores([
// compiled code
'node_package/lib/',
Expand All @@ -26,16 +29,18 @@ const config = tsEslint.config([
'spec/dummy/client/app/packs/server-bundle.js',
'**/*.res.js',
'**/coverage',
'**/assets/webpack/**/*',
'**/public/webpack/**/*',
'**/generated/**/*',
'**/assets/webpack/',
'**/public/webpack/',
'**/generated/',
'**/app/assets/javascripts/application.js',
'**/cable.js',
'**/public/packs*/*',
'**/public/packs*/',
'**/gen-examples/',
'**/bundle/',
// dependencies
'**/node_modules/**/*',
'**/node_modules/',
// fixtures
'**/fixtures/',
]),
{
files: ['**/*.[jt]s', '**/*.[jt]sx', '**/*.[cm][jt]s'],
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"@babel/eslint-parser": "^7.26.10",
"@babel/preset-env": "^7.20.2",
"@babel/preset-react": "^7.26.3",
"@eslint/compat": "^1.2.7",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.2.0",
Expand Down
1 change: 1 addition & 0 deletions script/convert
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ gsub_file_content("../package.json", /"globals": "[^"]*",/, "")
gsub_file_content("../package.json", /"knip": "[^"]*",/, "")
gsub_file_content("../package.json", /"typescript-eslint": "[^"]*",/, "")
gsub_file_content("../package.json", %r{"@arethetypeswrong/cli": "[^"]*",}, "")
gsub_file_content("../package.json", %r{"@eslint/compat": "[^"]*",}, "")
gsub_file_content("../package.json", %r{"@testing-library/dom": "[^"]*",}, "")
gsub_file_content("../package.json", %r{"@testing-library/react": "[^"]*",}, "")
gsub_file_content("../package.json", /"knip": "[^"]*",/, "")
Expand Down
40 changes: 0 additions & 40 deletions spec/dummy/.gitignore

This file was deleted.

5 changes: 5 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1073,6 +1073,11 @@
resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0"
integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==

"@eslint/compat@^1.2.7":
version "1.2.7"
resolved "https://registry.yarnpkg.com/@eslint/compat/-/compat-1.2.7.tgz#f1a890281631ad27530479420b743dd92626e819"
integrity sha512-xvv7hJE32yhegJ8xNAnb62ggiAwTYHBpUCWhRxEj/ksvgDJuSXfoDkBcRYaYNFiJ+jH0IE3K16hd+xXzhBgNbg==

"@eslint/config-array@^0.19.2":
version "0.19.2"
resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.19.2.tgz#3060b809e111abfc97adb0bb1172778b90cb46aa"
Expand Down
Loading