Skip to content

Commit 086327c

Browse files
committed
Support React 16
1 parent b41e6b8 commit 086327c

29 files changed

+8141
-1906
lines changed

example/package.json

+8-7
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@
55
"homepage": "https://ethanselzer.github.io/react-lazy-tree",
66
"devDependencies": {
77
"gh-pages": "^0.12.0",
8-
"react-scripts": "0.9.5"
8+
"react-scripts": "1.0.17"
99
},
1010
"dependencies": {
1111
"bootstrap": "^3.3.7",
12-
"react": "^15.3.2",
13-
"react-bootstrap": "^0.30.7",
14-
"react-dom": "^15.3.2",
15-
"react-helmet": "^4.0.0",
16-
"react-lazy-tree": "^1.0.0",
17-
"react-router": "^3.0.0",
12+
"prop-types": "^15.6.0",
13+
"react": "16.1.0",
14+
"react-bootstrap": "0.31.5",
15+
"react-dom": "16.1.0",
16+
"react-helmet": "5.2.0",
17+
"react-lazy-tree": "1.0.4",
18+
"react-router": "3.2.0",
1819
"react-syntax-highlighter": "^4.0.1"
1920
},
2021
"scripts": {

example/src/components/Catalog.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import React, { Component } from 'react';
22
import { Link } from 'react-router';
33
import ReactLazyTree from 'react-lazy-tree';
44

5-
import data from '../../data/tree';
5+
import data from '../data/tree.json';
66

7-
import '../../styles/catalog.css';
7+
import '../styles/catalog.css';
88

99
class Catalog extends Component {
1010
render() {

example/src/components/Hamburger.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import React, { Component } from 'react';
22
import ReactLazyTree from 'react-lazy-tree';
33

4-
import data from '../../data/tree';
4+
import data from '../data/tree.json';
55
import Label from '../components/Label';
66

7-
import '../../styles/hamburger.css';
7+
import '../styles/hamburger.css';
88

99
class Hamburger extends Component {
1010
render() {

example/src/components/Header.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import React from 'react';
22
import { Navbar, Nav, NavItem } from 'react-bootstrap';
33

4-
import npmLogo from '../../images/npm-logo.png';
5-
import githubLogo from '../../images/github-logo.png';
4+
import npmLogo from '../images/npm-logo.png';
5+
import githubLogo from '../images/github-logo.png';
66

7-
import '../../styles/header.css';
7+
import '../styles/header.css';
88

99
class Navigation extends React.Component {
1010
constructor(props) {

example/src/components/Viewer.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React, { Component } from 'react';
22
import ReactLazyTree from 'react-lazy-tree';
33

4-
import data from '../../data/tree';
4+
import data from '../data/tree.json';
55

6-
import '../../styles/viewer.css';
6+
import '../styles/viewer.css';
77

88
class Viewer extends Component {
99
render() {
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

example/src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { hashHistory } from 'react-router';
44

55
import Routes from './router';
66

7-
import '../styles/fonts.css';
7+
import './styles/fonts.css';
88
import './index.css';
99

1010
ReactDOM.render(

example/src/pages/Catalog.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import codeString from '../code-examples/catalog';
1717
import cssString from '../code-examples/catalog-css';
1818

1919
import 'bootstrap/dist/css/bootstrap.css';
20-
import '../../styles/app.css';
20+
import '../styles/app.css';
2121

2222
registerLanguage('javascript', js);
2323
registerLanguage('css', css);

example/src/pages/Hamburger.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import Hamburger from '../components/Hamburger';
1616
import codeString from '../code-examples/hamburger';
1717
import cssString from '../code-examples/hamburger-css';
1818

19-
import qr from '../../images/hamburger-qr.png';
19+
import qr from '../images/hamburger-qr.png';
2020

2121
import 'bootstrap/dist/css/bootstrap.css';
22-
import '../../styles/app.css';
22+
import '../styles/app.css';
2323

2424
registerLanguage('javascript', js);
2525
registerLanguage('css', css);

example/src/pages/Home.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import Helmet from 'react-helmet';
33

44
import Header from '../components/Header';
55

6-
import hamburger from '../../images/hamburger.png';
7-
import catalog from '../../images/catalog.png';
8-
import qr from '../../images/hamburger-qr.png';
9-
import viewer from '../../images/viewer.png';
6+
import hamburger from '../images/hamburger.png';
7+
import catalog from '../images/catalog.png';
8+
import qr from '../images/hamburger-qr.png';
9+
import viewer from '../images/viewer.png';
1010

1111
import 'bootstrap/dist/css/bootstrap.css';
12-
import '../../styles/app.css';
12+
import '../styles/app.css';
1313

1414
import {
1515
Clearfix,

example/src/pages/Viewer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import codeString from '../code-examples/viewer';
1717
import cssString from '../code-examples/viewer-css';
1818

1919
import 'bootstrap/dist/css/bootstrap.css';
20-
import '../../styles/app.css';
20+
import '../styles/app.css';
2121

2222
registerLanguage('javascript', js);
2323
registerLanguage('css', css);
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@font-face {
22
font-family: 'rack-icons';
3-
src: url('./../fonts/rack-icons.woff') format('woff');
3+
src: url('../fonts/rack-icons.woff') format('woff');
44
font-weight: normal;
55
font-style: normal;
66
}
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)