Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/actions/github-scr…
Browse files Browse the repository at this point in the history
…ipt-6.4.1
  • Loading branch information
joshblack authored Oct 16, 2023
2 parents c68bb34 + f547825 commit 1b23d9b
Show file tree
Hide file tree
Showing 20 changed files with 1,426 additions and 1,894 deletions.
22 changes: 11 additions & 11 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,34 @@
module.exports = {
extends: ['eslint:recommended', 'plugin:github/recommended'],
parserOptions: {
ecmaVersion: 'latest'
ecmaVersion: 'latest',
},
env: {
commonjs: true,
node: true
node: true,
},
rules: {
'import/no-commonjs': 'off',
'no-shadow': 'off',
'no-unused-vars': [
'error',
{
varsIgnorePattern: '^_'
}
]
varsIgnorePattern: '^_',
},
],
},
overrides: [
{
files: ['**/*.test.js'],
env: {
jest: true
}
jest: true,
},
},
{
files: ['.eslintrc.js'],
rules: {
'filenames/match-regex': 'off'
}
}
]
'filenames/match-regex': 'off',
},
},
],
}
2 changes: 1 addition & 1 deletion docs/rules/no-deprecated-colors.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const ThemeGetExample = styled.div`
function ExampleComponent() {
const styles = {
// Enabling `checkAllStrings` will find deprecated colors used like this:
color: 'text.primary'
color: 'text.primary',
}
return <Box sx={styles}>Hello</Box>
}
Expand Down
Loading

0 comments on commit 1b23d9b

Please sign in to comment.