Skip to content

Commit 41f4a9d

Browse files
committed
update dependencies
1 parent da17644 commit 41f4a9d

23 files changed

+7855
-209
lines changed

.babelrc

+14-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
{
2-
"plugins": ["transform-decorators-legacy", "transform-runtime", "transform-es3-property-literals", "transform-es3-member-expression-literals"],
3-
"presets": ["es2015-loose", "stage-0", "react"]
2+
"plugins": [
3+
"transform-runtime",
4+
"transform-es3-property-literals",
5+
"transform-es3-member-expression-literals",
6+
"transform-object-rest-spread",
7+
"transform-class-properties"
8+
],
9+
"presets": [[
10+
"env",
11+
{
12+
"loose": true,
13+
"shippedProposals": true
14+
}
15+
], "react"]
416
}

.eslintrc

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
{
22
"parser": "babel-eslint",
3-
"extends": "eslint-config-airbnb",
3+
"extends": [
4+
"eslint:recommended",
5+
"standard",
6+
"plugin:react/recommended",
7+
"prettier"
8+
],
49
"env": {
510
"browser": true,
611
"mocha": true,
712
"node": true
813
},
914
"rules": {
15+
"no-restricted-syntax": 0,
1016
"comma-dangle": 0,
11-
"jsx-quotes": [1, "prefer-single"],
12-
// "react/jsx-uses-react": 2,
13-
// "react/jsx-uses-vars": 2,
14-
// "react/react-in-jsx-scope": 2,
15-
// "no-console": 1,
16-
// "no-dupe-keys": 0,
1717
"no-param-reassign": 0,
18-
// Disables warning for default arguments (to be removed)
1918
"space-infix-ops": 0,
2019
"react/sort-comp": [
2120
1, {
@@ -46,6 +45,8 @@
4645
]
4746
},
4847
"plugins": [
48+
"prettier",
49+
"standard",
4950
"react",
5051
"babel"
5152
]

.yarnclean

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# test directories
2+
__tests__
3+
test
4+
tests
5+
powered-test
6+
7+
# asset directories
8+
docs
9+
doc
10+
website
11+
images
12+
assets
13+
14+
# examples
15+
example
16+
examples
17+
18+
# code coverage directories
19+
coverage
20+
.nyc_output
21+
22+
# build scripts
23+
Makefile
24+
Gulpfile.js
25+
Gruntfile.js
26+
27+
# configs
28+
.tern-project
29+
.gitattributes
30+
.editorconfig
31+
.*ignore
32+
.eslintrc
33+
.jshintrc
34+
.flowconfig
35+
.documentup.json
36+
.yarn-metadata.json
37+
.*.yml
38+
*.yml
39+
40+
# misc
41+
*.gz
42+
*.md

examples/.babelrc

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
{
2-
"presets": ["es2015-loose", "stage-0", "react"]
2+
"plugins": [
3+
"transform-object-rest-spread",
4+
"transform-class-properties"
5+
],
6+
"presets": [
7+
"env", "react"
8+
]
39
}

examples/.eslintrc

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
2-
"ecmaFeatures": {
3-
"jsx": true,
4-
"modules": true
5-
},
2+
"extends": [
3+
"eslint:recommended",
4+
"standard",
5+
"plugin:react/recommended",
6+
"prettier"
7+
],
68
"env": {
79
"browser": true,
810
"node": true
@@ -16,6 +18,8 @@
1618
"react/react-in-jsx-scope": 2
1719
},
1820
"plugins": [
21+
"prettier",
22+
"standard",
1923
"react"
2024
]
2125
}

examples/package.json

+16-14
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "react-hot-boilerplate",
2+
"name": "react-json-tree-example",
33
"version": "1.0.0",
4-
"description": "Boilerplate for ReactJS project with hot code reloading",
4+
"description": "React-Json-Tree example",
55
"scripts": {
66
"start": "node server.js",
77
"lint": "eslint src",
@@ -22,28 +22,30 @@
2222
"edit",
2323
"webpack"
2424
],
25-
"author": "Dan Abramov <[email protected]> (http://github.com/gaearon)",
2625
"license": "MIT",
2726
"bugs": {
2827
"url": "https://github.com/gaearon/react-hot-boilerplate/issues"
2928
},
3029
"homepage": "https://github.com/gaearon/react-hot-boilerplate",
3130
"devDependencies": {
32-
"babel-core": "^6.7.7",
33-
"babel-eslint": "^7.1.1",
34-
"babel-loader": "^6.2.4",
35-
"babel-preset-es2015": "^6.6.0",
36-
"babel-preset-es2015-loose": "^8.0.0",
31+
"babel-core": "^6.26.0",
32+
"babel-eslint": "^8.0.1",
33+
"babel-loader": "^7.1.2",
34+
"babel-plugin-transform-class-properties": "^6.24.1",
35+
"babel-plugin-transform-object-rest-spread": "^6.26.0",
3736
"babel-preset-react": "^6.5.0",
38-
"babel-preset-stage-0": "^6.5.0",
39-
"eslint-plugin-react": "^6.10.0",
40-
"webpack": "^2.2.1",
37+
"eslint": "^4.10.0",
38+
"eslint-plugin-babel": "^4.1.2",
39+
"eslint-plugin-import": "^2.8.0",
40+
"eslint-plugin-jsx-a11y": "^6.0.2",
41+
"eslint-plugin-react": "^7.4.0",
42+
"webpack": "^3.8.1",
4143
"webpack-dev-server": "^2.4.1"
4244
},
4345
"dependencies": {
4446
"immutable": "^3.8.1",
45-
"react": "^15.0.0",
46-
"react-base16-styling": "^0.4.7",
47-
"react-dom": "^15.0.0"
47+
"react": "^16.0.0",
48+
"react-base16-styling": "^0.5.3",
49+
"react-dom": "^16.0.0"
4850
}
4951
}

examples/src/App.js

+48-47
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
2-
import JSONTree from '../../src';
32
import { Map } from 'immutable';
3+
import JSONTree from '../../src';
44

55
const getLabelStyle = ({ style }, nodeType, expanded) => ({
66
style: {
@@ -17,18 +17,26 @@ const getBoolStyle = ({ style }, nodeType) => ({
1717
}
1818
});
1919

20-
const getItemString = (type) => (<span> // {type}</span>);
20+
const getItemString = type => (
21+
<span>
22+
{' // '}
23+
{type}
24+
</span>
25+
);
2126

2227
const getValueLabelStyle = ({ style }, nodeType, keyPath) => ({
2328
style: {
2429
...style,
25-
color: !isNaN(keyPath[0]) && !(parseInt(keyPath, 10) % 2) ?
26-
'#33F' : style.color
30+
color:
31+
!Number.isNaN(keyPath[0]) && !(parseInt(keyPath, 10) % 2)
32+
? '#33F'
33+
: style.color
2734
}
2835
});
2936

3037
// eslint-disable-next-line max-len
31-
const longString = 'Loremipsumdolorsitamet,consecteturadipiscingelit.Namtempusipsumutfelisdignissimauctor.Maecenasodiolectus,finibusegetultricesvel,aliquamutelit.Loremipsumdolorsitamet,consecteturadipiscingelit.Namtempusipsumutfelisdignissimauctor.Maecenasodiolectus,finibusegetultricesvel,aliquamutelit.Loremipsumdolorsitamet,consecteturadipiscingelit.Namtempusipsumutfelisdignissimauctor.Maecenasodiolectus,finibusegetultricesvel,aliquamutelit.';
38+
const longString =
39+
'Loremipsumdolorsitamet,consecteturadipiscingelit.Namtempusipsumutfelisdignissimauctor.Maecenasodiolectus,finibusegetultricesvel,aliquamutelit.Loremipsumdolorsitamet,consecteturadipiscingelit.Namtempusipsumutfelisdignissimauctor.Maecenasodiolectus,finibusegetultricesvel,aliquamutelit.Loremipsumdolorsitamet,consecteturadipiscingelit.Namtempusipsumutfelisdignissimauctor.Maecenasodiolectus,finibusegetultricesvel,aliquamutelit.';
3240

3341
const data = {
3442
array: [1, 2, 3],
@@ -57,7 +65,10 @@ const data = {
5765
emptyObject: {},
5866
symbol: Symbol('value'),
5967
// eslint-disable-next-line new-cap
60-
immutable: Map([['key', 'value'], [{ objectKey: 'value' }, { objectKey: 'value' }]]),
68+
immutable: Map([
69+
['key', 'value'],
70+
[{ objectKey: 'value' }, { objectKey: 'value' }]
71+
]),
6172
map: new window.Map([
6273
['key', 'value'],
6374
[0, 'value'],
@@ -98,44 +109,29 @@ const theme = {
98109

99110
const App = () => (
100111
<div>
101-
<JSONTree
102-
data={data}
103-
theme={theme}
104-
invertTheme
105-
/>
112+
<JSONTree data={data} theme={theme} invertTheme />
106113
<br />
107114
<h3>Dark Theme</h3>
108-
<JSONTree
109-
data={data}
110-
theme={theme}
111-
invertTheme={false}
112-
/>
115+
<JSONTree data={data} theme={theme} invertTheme={false} />
113116
<br />
114117
<h3>Hidden Root</h3>
115-
<JSONTree
116-
data={data}
117-
theme={theme}
118-
hideRoot
119-
/>
118+
<JSONTree data={data} theme={theme} hideRoot />
120119
<br />
121120
<h3>Base16 Greenscreen Theme</h3>
122-
<JSONTree
123-
data={data}
124-
theme='greenscreen'
125-
invertTheme={false}
126-
/>
121+
<JSONTree data={data} theme="greenscreen" invertTheme={false} />
127122
<h4>Inverted Theme</h4>
128-
<JSONTree
129-
data={data}
130-
theme='greenscreen'
131-
invertTheme
132-
/>
123+
<JSONTree data={data} theme="greenscreen" invertTheme />
133124
<br />
134125
<h3>Style Customization</h3>
135126
<ul>
136-
<li>Label changes between uppercase/lowercase based on the expanded state.</li>
127+
<li>
128+
Label changes between uppercase/lowercase based on the expanded state.
129+
</li>
137130
<li>Array keys are styled based on their parity.</li>
138-
<li>The labels of objects, arrays, and iterables are customized as "// type".</li>
131+
<li>
132+
The labels of objects, arrays, and iterables are customized as &quot;//
133+
type&quot;.
134+
</li>
139135
<li>See code for details.</li>
140136
</ul>
141137
<div>
@@ -151,33 +147,38 @@ const App = () => (
151147
/>
152148
</div>
153149
<h3>More Fine Grained Rendering</h3>
154-
<p>Pass <code>labelRenderer</code> or <code>valueRenderer</code>.</p>
150+
<p>
151+
Pass <code>labelRenderer</code> or <code>valueRenderer</code>.
152+
</p>
155153
<div>
156154
<JSONTree
157155
data={data}
158156
theme={theme}
159157
labelRenderer={([raw]) => <span>(({raw})):</span>}
160-
valueRenderer={raw => <em>😐 {raw} 😐</em>}
158+
valueRenderer={raw => (
159+
<em>
160+
<span role="img" aria-label="mellow">
161+
😐
162+
</span>{' '}
163+
{raw}{' '}
164+
<span role="img" aria-label="mellow">
165+
😐
166+
</span>
167+
</em>
168+
)}
161169
/>
162170
</div>
163-
<p>Sort object keys with <code>sortObjectKeys</code> prop.</p>
171+
<p>
172+
Sort object keys with <code>sortObjectKeys</code> prop.
173+
</p>
164174
<div>
165-
<JSONTree
166-
data={data}
167-
theme={theme}
168-
sortObjectKeys
169-
/>
175+
<JSONTree data={data} theme={theme} sortObjectKeys />
170176
</div>
171177
<p>Collapsed root node</p>
172178
<div>
173-
<JSONTree
174-
data={data}
175-
theme={theme}
176-
shouldExpandNode={() => false}
177-
/>
179+
<JSONTree data={data} theme={theme} shouldExpandNode={() => false} />
178180
</div>
179181
</div>
180182
);
181183

182184
export default App;
183-

0 commit comments

Comments
 (0)