Skip to content

Commit 9c57b96

Browse files
committed
updating lint rules to fix tests
1 parent 3c9bdaa commit 9c57b96

31 files changed

+19578
-8224
lines changed

.babelrc

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
2+
"presets": ["react-app"],
23
"plugins": [
3-
'transform-class-properties',
4-
'react-html-attrs',
5-
'transform-function-bind'
6-
],
7-
"presets": ["react", "es2015", "stage-0"]
4+
"@babel/plugin-syntax-class-properties",
5+
"@babel/plugin-syntax-jsx"
6+
]
87
}

.eslintrc.js

-41
This file was deleted.

.eslintrc.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"plugins": ["react", "prettier"],
3+
"rules": {
4+
"prettier/prettier": "error",
5+
"import/no-anonymous-default-export": "off",
6+
"egegeg": "off"
7+
},
8+
"parser":"@babel/eslint-parser",
9+
"parserOptions": {
10+
"sourceType": "module",
11+
"ecmaVersion": 6,
12+
"ecmaFeatures": {
13+
"experimentalObjectRestSpread": true
14+
}
15+
},
16+
"env": {
17+
"es6": true,
18+
"node": true
19+
}
20+
}

.prettierrc.json

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"tabWidth": 4,
3+
"printWidth": 80,
4+
"singleQuote": true,
5+
"trailingComma": "none",
6+
"bracketSpacing": true,
7+
"jsxBracketSameLine": false,
8+
"parser": "babel",
9+
"semi": true,
10+
"requirePragma": false,
11+
"proseWrap": "preserve",
12+
"arrowParens": "avoid",
13+
"eslintIntegration": false,
14+
"endOfLine": "auto"
15+
}

package-lock.json

+18,816-7,509
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+10-15
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,17 @@
1010
"react-textarea-autosize": "^6.1.0"
1111
},
1212
"devDependencies": {
13-
"babel-core": "^6.26.3",
14-
"babel-eslint": "^8.2.5",
15-
"babel-loader": "^7.1.4",
16-
"babel-plugin-react-html-attrs": "^2.0.0",
17-
"babel-plugin-transform-class-properties": "^6.24.1",
18-
"babel-plugin-transform-function-bind": "^6.22.0",
19-
"babel-plugin-transform-node-env-inline": "^0.2.0",
20-
"babel-preset-es2015": "^6.24.1",
21-
"babel-preset-react": "^6.24.1",
22-
"babel-preset-stage-0": "^6.24.1",
13+
"@babel/eslint-parser": "^7.12.1",
14+
"@babel/plugin-syntax-class-properties": "^7.12.1",
15+
"@babel/plugin-syntax-jsx": "^7.12.1",
2316
"chai": "^4.1.2",
2417
"coveralls": "^3.1.0",
2518
"css-loader": "^4.2.2",
2619
"enzyme": "^3.2.0",
2720
"enzyme-adapter-react-16": "^1.1.1",
28-
"eslint": "^5.0.1",
29-
"eslint-plugin-babel": "^5.1.0",
30-
"eslint-plugin-react": "^7.10.0",
21+
"eslint": "^7.16.0",
22+
"eslint-plugin-prettier": "^3.3.1",
23+
"eslint-plugin-react": "^7.21.5",
3124
"html-webpack-plugin": "2.30.1",
3225
"ignore-styles": "^5.0.1",
3326
"jsdom": "^16.4.0",
@@ -37,10 +30,12 @@
3730
"node-sass": "^4.14.1",
3831
"npm-check": "^5.9.2",
3932
"nyc": "^15.1.0",
33+
"prettier": "^2.2.1",
4034
"react": "^16.4.0",
4135
"react-dom": "^16.4.0",
4236
"react-github-button": "^0.1.11",
4337
"react-hot-loader": "^4.12.21",
38+
"react-scripts": "4.0.1",
4439
"react-select": "^1.1.0",
4540
"react-test-renderer": "^16.4.0",
4641
"sass-loader": "^10.0.1",
@@ -68,8 +63,8 @@
6863
"test:unit": "nyc mocha test/**/*-test.js",
6964
"test:coverage": "NODE_ENV=test nyc report --reporter=text-lcov | coveralls",
7065
"test:watch": "nyc mocha -w test/**/*-test.js",
71-
"lint": "./node_modules/.bin/eslint src",
72-
"lint-fixup": "./node_modules/.bin/eslint src --ext .js,.jsx --fix",
66+
"lint": "BABEL_ENV=test ./node_modules/.bin/eslint src",
67+
"lint-fixup": "BABEL_ENV=test ./node_modules/.bin/eslint src --ext .js,.jsx --fix",
7368
"upgrade-interactive": "npm-check --update"
7469
},
7570
"repository": {

src/js/components/ArrayGroup.js

+94-60
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default class extends React.PureComponent {
1919
};
2020
}
2121

22-
toggleCollapsed = (i) => {
22+
toggleCollapsed = i => {
2323
const newExpanded = [];
2424
for (const j in this.state.expanded) {
2525
newExpanded.push(this.state.expanded[j]);
@@ -28,26 +28,33 @@ export default class extends React.PureComponent {
2828
this.setState({
2929
expanded: newExpanded
3030
});
31-
}
31+
};
3232

3333
getExpandedIcon(i) {
3434
const { theme, iconStyle } = this.props;
3535

3636
if (this.state.expanded[i]) {
37-
return <ExpandedIcon {...{theme, iconStyle}}/>;
37+
return <ExpandedIcon {...{ theme, iconStyle }} />;
3838
}
3939

40-
return <CollapsedIcon {...{theme, iconStyle}} />;
40+
return <CollapsedIcon {...{ theme, iconStyle }} />;
4141
}
4242

4343
render() {
4444
const {
45-
src, groupArraysAfterLength, depth,
46-
name, theme, jsvRoot, namespace, parent_type,
45+
src,
46+
groupArraysAfterLength,
47+
depth,
48+
name,
49+
theme,
50+
jsvRoot,
51+
namespace,
52+
parent_type,
4753
...rest
4854
} = this.props;
4955

50-
let expanded_icon, object_padding_left = 0;
56+
let expanded_icon,
57+
object_padding_left = 0;
5158

5259
const array_group_padding_left = this.props.indentWidth * SINGLE_INDENT;
5360

@@ -58,59 +65,86 @@ export default class extends React.PureComponent {
5865
const size = groupArraysAfterLength;
5966
const groups = Math.ceil(src.length / size);
6067

61-
return (<div class='object-key-val'
62-
{...Theme(theme, jsvRoot ? 'jsv-root' : 'objectKeyVal', {paddingLeft: object_padding_left})}
63-
>
64-
<ObjectName {...this.props} />
65-
66-
<span>
67-
<VariableMeta size={src.length} {...this.props}/>
68-
</span>
69-
{[...Array(groups)].map((_, i) =>
70-
<div key={i} class='object-key-val array-group' {...Theme(theme, 'objectKeyVal', {
71-
marginLeft: 6,
72-
paddingLeft: array_group_padding_left
73-
})} >
74-
<span {...Theme(theme, 'brace-row')}>
75-
76-
<div class='icon-container' {...Theme(theme, 'icon-container')}
77-
onClick={(e) => {this.toggleCollapsed(i);}}>
78-
{this.getExpandedIcon(i)}
79-
</div>
80-
{this.state.expanded[i] ?
81-
<ObjectComponent
82-
key={name + i}
83-
depth={0}
84-
name={false}
85-
collapsed={false}
86-
groupArraysAfterLength={size}
87-
index_offset={i * size}
88-
src={src.slice(i * size, i * size + size)}
89-
namespace={namespace}
90-
type="array"
91-
parent_type="array_group"
92-
theme={theme}
93-
{...rest}
94-
/>
95-
: <span {...Theme(theme, 'brace')} onClick={(e) => {this.toggleCollapsed(i);}} class='array-group-brace'>
96-
[
97-
<div {...Theme(theme, 'array-group-meta-data')} class='array-group-meta-data'>
98-
<span class='object-size'
99-
{...Theme(theme, 'object-size')}>
100-
{i * size}
101-
{' - '}
102-
{i * size + size > src.length ? src.length : i * size + size}
103-
</span>
104-
</div>
105-
]
106-
</span>
107-
}
108-
109-
</span>
110-
</div>
111-
)}
112-
</div>
68+
return (
69+
<div
70+
class="object-key-val"
71+
{...Theme(theme, jsvRoot ? 'jsv-root' : 'objectKeyVal', {
72+
paddingLeft: object_padding_left
73+
})}
74+
>
75+
<ObjectName {...this.props} />
76+
77+
<span>
78+
<VariableMeta size={src.length} {...this.props} />
79+
</span>
80+
{[...Array(groups)].map((_, i) => (
81+
<div
82+
key={i}
83+
class="object-key-val array-group"
84+
{...Theme(theme, 'objectKeyVal', {
85+
marginLeft: 6,
86+
paddingLeft: array_group_padding_left
87+
})}
88+
>
89+
<span {...Theme(theme, 'brace-row')}>
90+
<div
91+
class="icon-container"
92+
{...Theme(theme, 'icon-container')}
93+
onClick={e => {
94+
this.toggleCollapsed(i);
95+
}}
96+
>
97+
{this.getExpandedIcon(i)}
98+
</div>
99+
{this.state.expanded[i] ? (
100+
<ObjectComponent
101+
key={name + i}
102+
depth={0}
103+
name={false}
104+
collapsed={false}
105+
groupArraysAfterLength={size}
106+
index_offset={i * size}
107+
src={src.slice(i * size, i * size + size)}
108+
namespace={namespace}
109+
type="array"
110+
parent_type="array_group"
111+
theme={theme}
112+
{...rest}
113+
/>
114+
) : (
115+
<span
116+
{...Theme(theme, 'brace')}
117+
onClick={e => {
118+
this.toggleCollapsed(i);
119+
}}
120+
class="array-group-brace"
121+
>
122+
[
123+
<div
124+
{...Theme(
125+
theme,
126+
'array-group-meta-data'
127+
)}
128+
class="array-group-meta-data"
129+
>
130+
<span
131+
class="object-size"
132+
{...Theme(theme, 'object-size')}
133+
>
134+
{i * size}
135+
{' - '}
136+
{i * size + size > src.length
137+
? src.length
138+
: i * size + size}
139+
</span>
140+
</div>
141+
]
142+
</span>
143+
)}
144+
</span>
145+
</div>
146+
))}
147+
</div>
113148
);
114149
}
115-
116150
}

0 commit comments

Comments
 (0)