Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Go Live #599

Merged
merged 55 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
1a1bf94
Automated: Add dependabot config file
Sep 10, 2024
f728b59
Bump typescript-eslint from 8.5.0 to 8.6.0
dependabot[bot] Sep 16, 2024
8c273c4
Automated: Add dependabot config file
Sep 17, 2024
717934a
Automated: Add Semgrep Github action
fishbrain-terraform[bot] Sep 17, 2024
ef35bf1
Automated: Add outsanding PRs github action
fishbrain-terraform[bot] Sep 17, 2024
a01d7ba
Merge pull request #574 from fishbrain/dependabot/npm_and_yarn/typesc…
dalen Sep 17, 2024
87e87e2
Bump eslint-plugin-react from 7.35.2 to 7.36.1
dependabot[bot] Sep 17, 2024
21ac9b5
Merge pull request #571 from fishbrain/dependabot/npm_and_yarn/eslint…
pedro-belem Sep 19, 2024
ed84d00
Bump eslint-plugin-compat from 6.0.0 to 6.0.1
dependabot[bot] Sep 19, 2024
8257ff7
Merge pull request #573 from fishbrain/dependabot/npm_and_yarn/eslint…
pedro-belem Sep 19, 2024
3e3c664
Bump eslint from 9.10.0 to 9.11.0
dependabot[bot] Sep 20, 2024
026fc66
Merge pull request #576 from fishbrain/dependabot/npm_and_yarn/eslint…
igorbelo Sep 23, 2024
17845fd
Bump typescript-eslint from 8.6.0 to 8.7.0
dependabot[bot] Sep 23, 2024
9370870
Bump eslint from 9.11.0 to 9.11.1
dependabot[bot] Sep 23, 2024
386aeca
Merge pull request #579 from fishbrain/dependabot/npm_and_yarn/eslint…
lhansford Sep 24, 2024
5b34d8e
Bump @eslint/js from 9.10.0 to 9.11.1
dependabot[bot] Sep 24, 2024
8d6bb93
Merge pull request #577 from fishbrain/dependabot/npm_and_yarn/eslint…
dalen Sep 24, 2024
6ee7f1f
Merge pull request #578 from fishbrain/dependabot/npm_and_yarn/typesc…
dalen Sep 24, 2024
37e2390
Automated: Add Semgrep Github Action
fishbrain-terraform[bot] Sep 30, 2024
2a82248
Automated: Add Semgrep Github Action
fishbrain-terraform[bot] Sep 30, 2024
830504c
Automated: Add dependabot config file
Sep 30, 2024
fe3f8ad
Bump globals from 15.9.0 to 15.10.0
dependabot[bot] Oct 1, 2024
33d85b3
Merge pull request #582 from fishbrain/dependabot/npm_and_yarn/global…
igorbelo Oct 3, 2024
b5e1e5f
Bump typescript-eslint from 8.7.0 to 8.8.0
dependabot[bot] Oct 3, 2024
82a1904
Merge pull request #581 from fishbrain/dependabot/npm_and_yarn/typesc…
dalen Oct 7, 2024
8791343
Bump eslint from 9.11.1 to 9.12.0
dependabot[bot] Oct 7, 2024
87f93fd
Merge pull request #585 from fishbrain/dependabot/npm_and_yarn/eslint…
dalen Oct 7, 2024
48c1473
Bump @eslint/js from 9.11.1 to 9.12.0
dependabot[bot] Oct 7, 2024
a7ce3cb
Bump eslint-plugin-react from 7.36.1 to 7.37.1
dependabot[bot] Oct 7, 2024
923ce69
Merge pull request #584 from fishbrain/dependabot/npm_and_yarn/eslint…
dalen Oct 7, 2024
41332e9
Merge pull request #583 from fishbrain/dependabot/npm_and_yarn/eslint…
dalen Oct 7, 2024
b00e7d3
Bump typescript from 5.6.2 to 5.6.3
dependabot[bot] Oct 9, 2024
dd1d98c
Merge pull request #587 from fishbrain/dependabot/npm_and_yarn/typesc…
dalen Oct 10, 2024
76ba52e
Bump globals from 15.10.0 to 15.11.0
dependabot[bot] Oct 10, 2024
acb3ea0
Merge pull request #588 from fishbrain/dependabot/npm_and_yarn/global…
lhansford Oct 11, 2024
bfcbb66
Bump typescript-eslint from 8.8.0 to 8.8.1
dependabot[bot] Oct 11, 2024
982fd66
Merge pull request #586 from fishbrain/dependabot/npm_and_yarn/typesc…
dalen Oct 11, 2024
26421cf
Bump typescript-eslint from 8.8.1 to 8.9.0
dependabot[bot] Oct 14, 2024
6ec407e
Merge pull request #589 from fishbrain/dependabot/npm_and_yarn/typesc…
dalen Oct 15, 2024
326c723
Bump typescript-eslint from 8.9.0 to 8.10.0
dependabot[bot] Oct 17, 2024
494e5f7
Merge pull request #590 from fishbrain/dependabot/npm_and_yarn/typesc…
pedro-belem Oct 18, 2024
2c790c6
Bump eslint from 9.12.0 to 9.13.0
dependabot[bot] Oct 18, 2024
025cf6c
Bump typescript-eslint from 8.10.0 to 8.11.0
dependabot[bot] Oct 21, 2024
1e9b27f
Merge pull request #592 from fishbrain/dependabot/npm_and_yarn/eslint…
pedro-belem Oct 22, 2024
3be6fb7
Bump @eslint/js from 9.12.0 to 9.13.0
dependabot[bot] Oct 22, 2024
63032cc
Merge pull request #594 from fishbrain/dependabot/npm_and_yarn/typesc…
dalen Oct 22, 2024
ddefcc1
Merge pull request #591 from fishbrain/dependabot/npm_and_yarn/eslint…
dalen Oct 22, 2024
8c57165
Bump eslint-plugin-react from 7.37.1 to 7.37.2
dependabot[bot] Oct 23, 2024
e5307ee
Merge pull request #595 from fishbrain/dependabot/npm_and_yarn/eslint…
lhansford Oct 28, 2024
e6cc887
Bump eslint-plugin-jsx-a11y from 6.10.0 to 6.10.2
dependabot[bot] Oct 28, 2024
a459f9a
Merge pull request #596 from fishbrain/dependabot/npm_and_yarn/eslint…
lhansford Oct 28, 2024
4dd3569
Re-enable react hooks rules
lhansford Oct 28, 2024
5f6b8a9
Merge pull request #597 from fishbrain/re-add-react-hooks-rules
lhansford Oct 28, 2024
517044f
Add testing-library plugin
lhansford Oct 28, 2024
f181402
Merge pull request #598 from fishbrain/add-testing-lib-plugin
lhansford Oct 28, 2024
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
8 changes: 6 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,20 @@ version: 2

"updates":
- "directory": "/"
"ignore":
- "dependency-name": "@types/node"
"update-types":
- "version-update:semver-patch"
"open-pull-requests-limit": 10
"package-ecosystem": "npm"
"reviewers":
- "fishbrain/web-developers"
- "fishbrain/platform-team"
"schedule":
"interval": "daily"
- "directory": "/"
"open-pull-requests-limit": 10
"package-ecosystem": "github-actions"
"reviewers":
- "fishbrain/web-developers"
- "fishbrain/platform-team"
"schedule":
"interval": "daily"
3 changes: 1 addition & 2 deletions .github/workflows/semgrep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@ on:

jobs:
semgrep:
name: Scan
name: Semgrep
runs-on: warp-ubuntu-latest-x64-2x
timeout-minutes: 15 # There's been issues with some runs hanging. This times out after 15 minutes instead of the default 360.
env:
SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
container:
image: semgrep/semgrep
if: (github.actor != 'dependabot[bot]')
steps:
- uses: actions/checkout@v4
- run: semgrep ci
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@fishbrain/eslint-config-monorepo",
"private": true,
"description": "ESLint configs for Fishbrain projects",
"version": "6.0.11",
"version": "6.1.0",
"workspaces": [
"packages/*"
],
Expand Down
8 changes: 4 additions & 4 deletions packages/base/package.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"name": "@fishbrain/eslint-config-base",
"packageManager": "[email protected]",
"version": "6.0.11",
"version": "6.1.0",
"type": "module",
"exports": "./index.js",
"scripts": {
"test": "eslint index.js eslint.config.js"
},
"dependencies": {
"@eslint/js": "^9.10.0",
"eslint": "^9.10.0",
"@eslint/js": "^9.13.0",
"eslint": "^9.13.0",
"eslint-plugin-jest": "^28.8.3",
"eslint-plugin-prettier": "^5.2.1",
"prettier": "^3.3.3",
"typescript-eslint": "^8.5.0"
"typescript-eslint": "^8.11.0"
},
"peerDependencies": {
"typescript": "^5.5.4"
Expand Down
18 changes: 14 additions & 4 deletions packages/react/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ import tseslint from 'typescript-eslint';
import reactPlugin from 'eslint-plugin-react';
import jsxA11yPlugin from 'eslint-plugin-jsx-a11y';
import compatPlugin from 'eslint-plugin-compat';
import pluginReactHooks from 'eslint-plugin-react-hooks';
import globals from 'globals';
import testingLibraryPlugin from 'eslint-plugin-testing-library';

import {
config as baseConfig,
Expand All @@ -25,8 +27,17 @@ const reactConfig = [
},
jsxA11yPlugin.flatConfigs.recommended,
compatPlugin.configs['flat/recommended'],
{
files: ['**/**/*.{js,ts,jsx,tsx}'],
plugins: {
'react-hooks': pluginReactHooks,
},
rules: pluginReactHooks.configs.recommended.rules,
},
];

const testingConfig = [testingLibraryPlugin.configs['flat/react']];

const customRules = {
rules: {
// 'jsx-a11y/label-has-for': 'off', // This is deprecated but in the recommended extension for some reason // TODO: Check if needed
Expand All @@ -39,16 +50,15 @@ const customRules = {
'react/no-render-return-value': 'off',
'react/prop-types': 'off', // No need for prop types with Typescript
'react/react-in-jsx-scope': 'off',

// TODO: Disabled until https://github.com/facebook/react/issues/28313 is resolved.
// 'react-hooks/exhaustive-deps': 'error',
// 'react-hooks/rules-of-hooks': 'error',
'react-hooks/exhaustive-deps': 'error',
'react-hooks/rules-of-hooks': 'error',
},
};

export const config = tseslint.config(
...baseConfig,
...reactConfig,
...testingConfig,
customRules,
);

Expand Down
22 changes: 12 additions & 10 deletions packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
{
"name": "@fishbrain/eslint-config-react",
"packageManager": "[email protected]",
"version": "6.0.11",
"version": "6.1.0",
"type": "module",
"exports": "./index.js",
"scripts": {
"test": "eslint index.js eslint.config.js"
"test": "eslint index.js eslint.config.js"
},
"devDependencies": {
"react": "^18.3.1",
"typescript": "^5.6.2"
"typescript": "^5.6.3"
},
"dependencies": {
"@eslint/js": "^9.10.0",
"@eslint/js": "^9.13.0",
"@fishbrain/eslint-config-base": "workspace:^",
"eslint": "^9.10.0",
"eslint-plugin-compat": "^6.0.0",
"eslint-plugin-jsx-a11y": "^6.10.0",
"eslint-plugin-react": "^7.35.2",
"globals": "^15.9.0",
"typescript-eslint": "^8.5.0"
"eslint": "^9.13.0",
"eslint-plugin-compat": "^6.0.1",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-plugin-testing-library": "^6.4.0",
"globals": "^15.11.0",
"typescript-eslint": "^8.11.0"
},
"peerDependencies": {
"react": "^18"
Expand Down
Loading