Skip to content
This repository was archived by the owner on Apr 9, 2019. It is now read-only.

Commit 388340b

Browse files
committed
ES6 module syntax
1 parent d2e400a commit 388340b

File tree

15 files changed

+50
-91
lines changed

15 files changed

+50
-91
lines changed

examples/src/example.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
const React = require('react');
2-
const ReactDOM = require('react-dom');
1+
import React from 'react';
2+
import ReactDOM from 'react-dom';
33

4-
const NavigationController = require('../../src/navigation-controller');
5-
const View =require('./view');
4+
import NavigationController from '../../src/navigation-controller';
5+
import View from './view';
66

77
class App extends React.Component {
88
constructor(props) {

examples/src/view.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const React = require('react');
1+
import React from 'react';
2+
import NavigationController from '../../src/navigation-controller';
23

3-
const NavigationController = require('../../src/navigation-controller');
44
const {
55
Transition
66
} = NavigationController;
@@ -95,4 +95,4 @@ View.defaultProps ={
9595
index: 1
9696
};
9797

98-
module.exports = View;
98+
export default View;

karma.conf.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ module.exports = function(config) {
7272
},
7373
resolve: {
7474
extensions: ['', '.js', '.jsx']
75-
},
76-
externals: {
77-
'react': 'React',
78-
'react/addons': 'React'
7975
}
8076
},
8177

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
"chai": "^3.4.1",
3434
"karma": "^0.13.19",
3535
"karma-chai": "^0.1.0",
36-
"karma-chrome-launcher": "^0.2.2",
3736
"karma-mocha": "^0.2.1",
3837
"karma-phantomjs-launcher": "^0.2.3",
3938
"karma-spec-reporter": "0.0.23",
@@ -42,6 +41,7 @@
4241
"mocha": "^2.3.4",
4342
"phantomjs": "^1.9.19",
4443
"react": "^0.14.6",
44+
"react-addons-test-utils": "^0.14.6",
4545
"react-dom": "^0.14.6",
4646
"sinon": "^1.17.2",
4747
"webpack": "^1.12.11",

spec/navigation-controller.spec.jsx

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
1-
const React = require('react/addons');
2-
const {
1+
import React from 'react/addons';
2+
3+
import {
34
isCompositeComponent,
45
renderIntoDocument
5-
} = React.addons.TestUtils;
6+
} from 'react-addons-test-utils';
7+
8+
import rebound from 'rebound';
69

7-
const rebound = require('rebound');
10+
import NavigationController from '../src/navigation-controller';
11+
import View from '../examples/src/view';
812

9-
const NavigationController = require('../src/navigation-controller');
10-
const {
11-
Transition
12-
} = NavigationController;
13+
import { getVendorPrefix } from '../src/util/dom';
1314

14-
const {
15-
getVendorPrefix
16-
} = require('../src/util/dom');
15+
const { Transition } = NavigationController;
1716

1817
const transformPrefix = getVendorPrefix('transform');
1918

20-
const View = require('../examples/src/view');
2119
class ViewA extends View { }
2220
class ViewB extends View { }
2321
class ViewC extends View { }

spec/util/array.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
const {
1+
import {
22
dropRight,
33
last,
44
takeRight
5-
} = require('../../src/util/array');
5+
} from '../../src/util/array';
66

77
describe('Util', () => {
88
describe('Array', () => {

spec/util/dom.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const {
1+
import {
22
getVendorPrefix
3-
} = require('../../src/util/dom');
3+
} from '../../src/util/dom';
44

55
describe('Util', () => {
66
describe('DOM', () => {

spec/util/object.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const {
1+
import {
22
assign
3-
} = require('../../src/util/object');
3+
} from '../../src/util/object';
44

55
describe('Util', () => {
66
describe('Object', () => {

spec/util/string.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const {
1+
import {
22
capitalize
3-
} = require('../../src/util/string');
3+
} from '../../src/util/string';
44

55
describe('Util', () => {
66
describe('String', () => {

src/navigation-controller.jsx

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,24 @@
1-
const React = require('react');
1+
import React from 'react';
2+
import rebound from 'rebound';
3+
import classNames from 'classnames';
4+
5+
import { getVendorPrefix } from './util/dom';
6+
import { dropRight, last, takeRight } from './util/array';
7+
import { assign } from './util/object';
8+
9+
import * as Transition from './util/transition';
210

3-
const rebound = require('rebound');
411
const {
512
SpringSystem,
613
SpringConfig,
714
OrigamiValueConverter
815
} = rebound;
16+
917
const {
1018
mapValueInRange
1119
} = rebound.MathUtil;
1220

13-
const {
14-
getVendorPrefix
15-
} = require('./util/dom');
16-
17-
const {
18-
dropRight,
19-
last,
20-
takeRight
21-
} = require('./util/array');
22-
23-
const {
24-
assign
25-
} = require('./util/object');
26-
27-
const Transition = require('./util/transition');
2821

29-
const classNames = require('classnames');
3022
const transformPrefix = getVendorPrefix('transform');
3123

3224
const optionTypes = {
@@ -575,4 +567,4 @@ NavigationController.defaultProps = {
575567

576568
NavigationController.Transition = Transition;
577569

578-
module.exports = NavigationController;
570+
export default NavigationController;

0 commit comments

Comments
 (0)