Skip to content

Commit 9e54d97

Browse files
authored
Merge branch 'master' into update-readme
2 parents fb991e3 + 11f986f commit 9e54d97

File tree

7 files changed

+39
-23
lines changed

7 files changed

+39
-23
lines changed

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3997,7 +3997,6 @@ Other Style Guides
39973997
- **Axept**: [axept/javascript](https://github.com/axept/javascript)
39983998
- **Billabong**: [billabong/javascript](https://github.com/billabong/javascript)
39993999
- **Bisk**: [bisk](https://github.com/Bisk/)
4000-
- **Bonhomme**: [bonhommeparis/javascript](https://github.com/bonhommeparis/javascript)
40014000
- **Brainshark**: [brainshark/javascript](https://github.com/brainshark/javascript)
40024001
- **CaseNine**: [CaseNine/javascript](https://github.com/CaseNine/javascript)
40034002
- **Cerner**: [Cerner](https://github.com/cerner/)
@@ -4010,7 +4009,6 @@ Other Style Guides
40104009
- **Digitpaint** [digitpaint/javascript](https://github.com/digitpaint/javascript)
40114010
- **Drupal**: [www.drupal.org](https://git.drupalcode.org/project/drupal/blob/8.6.x/core/.eslintrc.json)
40124011
- **Ecosia**: [ecosia/javascript](https://github.com/ecosia/javascript)
4013-
- **Evernote**: [evernote/javascript-style-guide](https://github.com/evernote/javascript-style-guide)
40144012
- **Evolution Gaming**: [evolution-gaming/javascript](https://github.com/evolution-gaming/javascript)
40154013
- **EvozonJs**: [evozonjs/javascript](https://github.com/evozonjs/javascript)
40164014
- **ExactTarget**: [ExactTarget/javascript](https://github.com/ExactTarget/javascript)
@@ -4023,10 +4021,10 @@ Other Style Guides
40234021
- **Grooveshark**: [grooveshark/javascript](https://github.com/grooveshark/javascript)
40244022
- **Grupo-Abraxas**: [Grupo-Abraxas/javascript](https://github.com/Grupo-Abraxas/javascript)
40254023
- **Happeo**: [happeo/javascript](https://github.com/happeo/javascript)
4026-
- **Honey**: [honeyscience/javascript](https://github.com/honeyscience/javascript)
40274024
- **How About We**: [howaboutwe/javascript](https://github.com/howaboutwe/javascript-style-guide)
40284025
- **HubSpot**: [HubSpot/javascript](https://github.com/HubSpot/javascript)
40294026
- **Hyper**: [hyperoslo/javascript-playbook](https://github.com/hyperoslo/javascript-playbook/blob/master/style.md)
4027+
- **ILIAS**: [ILIAS](https://github.com/ILIAS-eLearning/ILIAS)
40304028
- **InterCity Group**: [intercitygroup/javascript-style-guide](https://github.com/intercitygroup/javascript-style-guide)
40314029
- **Jam3**: [Jam3/Javascript-Code-Conventions](https://github.com/Jam3/Javascript-Code-Conventions)
40324030
- **JSSolutions**: [JSSolutions/javascript](https://github.com/JSSolutions/javascript)
@@ -4049,7 +4047,6 @@ Other Style Guides
40494047
- **Pier 1**: [Pier1/javascript](https://github.com/pier1/javascript)
40504048
- **Qotto**: [Qotto/javascript-style-guide](https://github.com/Qotto/javascript-style-guide)
40514049
- **React**: [reactjs.org/docs/how-to-contribute.html#style-guide](https://reactjs.org/docs/how-to-contribute.html#style-guide)
4052-
- **REI**: [reidev/js-style-guide](https://github.com/rei/code-style-guides/)
40534050
- **Ripple**: [ripple/javascript-style-guide](https://github.com/ripple/javascript-style-guide)
40544051
- **Sainsbury’s Supermarkets**: [jsainsburyplc](https://github.com/jsainsburyplc)
40554052
- **Shutterfly**: [shutterfly/javascript](https://github.com/shutterfly/javascript)
@@ -4073,6 +4070,7 @@ Other Style Guides
40734070
- **WeBox Studio**: [weboxstudio/javascript](https://github.com/weboxstudio/javascript)
40744071
- **Weggo**: [Weggo/javascript](https://github.com/Weggo/javascript)
40754072
- **Zillow**: [zillow/javascript](https://github.com/zillow/javascript)
4073+
- **Zit Software**: [zit-software/javascript](https://github.com/zit-software/javascript)
40764074
- **ZocDoc**: [ZocDoc/javascript](https://github.com/ZocDoc/javascript)
40774075

40784076
**[⬆ back to top](#table-of-contents)**

css-in-javascript/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
- Use an underscore for modifiers to other styles.
3636

37-
> Why? Similar to BEM, this naming convention makes it clear that the styles are intended to modify the element preceded by the underscore. Underscores do not need to be quoted, so they are preferred over other characters, such as dashes.
37+
> Why? Similar to [BEM](https://getbem.com/introduction/), this naming convention makes it clear that the styles are intended to modify the element preceded by the underscore. Underscores do not need to be quoted, so they are preferred over other characters, such as dashes.
3838

3939
```js
4040
// bad

packages/eslint-config-airbnb-base/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,20 +68,20 @@
6868
},
6969
"homepage": "https://github.com/airbnb/javascript",
7070
"devDependencies": {
71-
"@babel/runtime": "^7.23.9",
71+
"@babel/runtime": "^7.25.6",
7272
"babel-preset-airbnb": "^4.5.0",
7373
"babel-tape-runner": "^3.0.0",
7474
"eclint": "^2.8.1",
7575
"eslint": "^7.32.0 || ^8.2.0",
7676
"eslint-find-rules": "^4.1.0",
77-
"eslint-plugin-import": "^2.29.1",
77+
"eslint-plugin-import": "^2.30.0",
7878
"in-publish": "^2.0.1",
7979
"safe-publish-latest": "^2.0.0",
80-
"tape": "^5.7.5"
80+
"tape": "^5.9.0"
8181
},
8282
"peerDependencies": {
8383
"eslint": "^7.32.0 || ^8.2.0",
84-
"eslint-plugin-import": "^2.29.1"
84+
"eslint-plugin-import": "^2.30.0"
8585
},
8686
"engines": {
8787
"node": "^10.12.0 || >=12.0.0"

packages/eslint-config-airbnb-base/whitespace.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,11 @@ if (CLIEngine) {
5151
const path = require('path');
5252
const { execSync } = require('child_process');
5353

54-
module.exports = JSON.parse(String(execSync(path.join(__dirname, 'whitespace-async.js'))));
54+
// NOTE: ESLint adds runtime statistics to the output (so it's no longer JSON) if TIMING is set
55+
module.exports = JSON.parse(String(execSync(path.join(__dirname, 'whitespace-async.js'), {
56+
env: {
57+
...process.env,
58+
TIMING: undefined,
59+
}
60+
})));
5561
}

packages/eslint-config-airbnb/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,27 +69,27 @@
6969
"eslint-config-airbnb-base": "^15.0.0"
7070
},
7171
"devDependencies": {
72-
"@babel/runtime": "^7.23.9",
72+
"@babel/runtime": "^7.25.6",
7373
"babel-preset-airbnb": "^4.5.0",
7474
"babel-tape-runner": "^3.0.0",
7575
"eclint": "^2.8.1",
7676
"eslint": "^7.32.0 || ^8.2.0",
7777
"eslint-find-rules": "^4.1.0",
78-
"eslint-plugin-import": "^2.29.1",
79-
"eslint-plugin-jsx-a11y": "^6.8.0",
80-
"eslint-plugin-react": "^7.34.1",
81-
"eslint-plugin-react-hooks": "^4.6.0",
78+
"eslint-plugin-import": "^2.30.0",
79+
"eslint-plugin-jsx-a11y": "^6.10.0",
80+
"eslint-plugin-react": "^7.36.1",
81+
"eslint-plugin-react-hooks": "^5.1.0",
8282
"in-publish": "^2.0.1",
8383
"react": ">= 0.13.0",
8484
"safe-publish-latest": "^2.0.0",
85-
"tape": "^5.7.5"
85+
"tape": "^5.9.0"
8686
},
8787
"peerDependencies": {
8888
"eslint": "^7.32.0 || ^8.2.0",
89-
"eslint-plugin-import": "^2.29.1",
90-
"eslint-plugin-jsx-a11y": "^6.8.0",
91-
"eslint-plugin-react": "^7.34.1",
92-
"eslint-plugin-react-hooks": "^4.6.0"
89+
"eslint-plugin-import": "^2.30.0",
90+
"eslint-plugin-jsx-a11y": "^6.10.0",
91+
"eslint-plugin-react": "^7.36.1",
92+
"eslint-plugin-react-hooks": "^5.1.0"
9393
},
9494
"engines": {
9595
"node": "^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0"

packages/eslint-config-airbnb/rules/react.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -583,17 +583,23 @@ module.exports = {
583583
// TODO: semver-major, enable
584584
'react/jsx-no-leaked-render': 'off',
585585

586-
// https://github.com/jsx-eslint/eslint-plugin-react/blob/66b58dd4864678eb869a7bf434c72ff7ac530eb1/docs/rules/no-object-type-as-default-prop.md
587586
// https://github.com/jsx-eslint/eslint-plugin-react/blob/66b58dd4864678eb869a7bf434c72ff7ac530eb1/docs/rules/no-object-type-as-default-prop.md
588587
// TODO: semver-major, enable
589588
'react/no-object-type-as-default-prop': 'off',
590589

591-
// https://github.com/jsx-eslint/eslint-plugin-react/blob/66b58dd4864678eb869a7bf434c72ff7ac530eb1/docs/rules/sort-default-props.md
592590
// https://github.com/jsx-eslint/eslint-plugin-react/blob/66b58dd4864678eb869a7bf434c72ff7ac530eb1/docs/rules/sort-default-props.md
593591
// TODO: semver-major, enable?
594592
'react/sort-default-props': ['off', {
595593
ignoreCase: false
596594
}],
595+
596+
// https://github.com/jsx-eslint/eslint-plugin-react/blob/9668ee0762acd5c23f53cd3a372e2d8d9563944d/docs/rules/forward-ref-uses-ref.md
597+
// TODO: semver-major, enable
598+
'react/forward-ref-uses-ref': 'off',
599+
600+
// https://github.com/jsx-eslint/eslint-plugin-react/blob/9668ee0762acd5c23f53cd3a372e2d8d9563944d/docs/rules/jsx-props-no-spread-multi.md
601+
// TODO: semver-major, enable
602+
'react/jsx-props-no-spread-multi': 'off',
597603
},
598604

599605
settings: {

packages/eslint-config-airbnb/whitespace.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,11 @@ if (CLIEngine) {
5151
const path = require('path');
5252
const { execSync } = require('child_process');
5353

54-
module.exports = JSON.parse(String(execSync(path.join(__dirname, 'whitespace-async.js'))));
54+
// NOTE: ESLint adds runtime statistics to the output (so it's no longer JSON) if TIMING is set
55+
module.exports = JSON.parse(String(execSync(path.join(__dirname, 'whitespace-async.js'), {
56+
env: {
57+
...process.env,
58+
TIMING: undefined,
59+
}
60+
})));
5561
}

0 commit comments

Comments
 (0)