Skip to content

Commit

Permalink
migrate to babel 6
Browse files Browse the repository at this point in the history
  • Loading branch information
azazdeaz committed Mar 20, 2016
1 parent f53a08a commit 330e05e
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 22 deletions.
3 changes: 2 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"stage": 0,
"presets": ["es2015", "stage-1", "react"],
"plugins": ["dev-expression"]
}
5 changes: 3 additions & 2 deletions demo/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ var menuItems = [
})
]

@ThemeDecorator(ThemeManager.getMuiTheme(RawTheme))
export default class App extends React.Component {
class App extends React.Component {

static contextTypes = {
router: React.PropTypes.func
Expand Down Expand Up @@ -65,3 +64,5 @@ export default class App extends React.Component {
)
}
}

export default ThemeDecorator(ThemeManager.getMuiTheme(RawTheme))(App)
22 changes: 12 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"lib-watch": "npm run lib && babel ./src --out-dir lib --source-maps --source-maps --watch",
"browser-build": "webpack --config webpack.browser.config.js",
"publish-browser": "npm run browser-build && gh-pages --dist browser --branch browser",
"test": "mocha --compilers js:babel/register",
"test": "mocha --compilers js:babel-register",
"test-debug": "node-debug _mocha --compilers js:babel/register"
},
"repository": {
Expand All @@ -34,17 +34,19 @@
],
"homepage": "https://github.com/azazdeaz/react-gsap-enhancer",
"devDependencies": {
"@azazdeaz/component-playground": "^1.0.1",
"babel": "^5.6.23",
"babel-core": "^5.8.12",
"babel-eslint": "^3.1.23",
"babel-loader": "^5.3.1",
"@azazdeaz/component-playground": "^2.0.1",
"babel-cli": "^6.6.5",
"babel-loader": "^6.2.4",
"babel-plugin-dev-expression": "^0.2.1",
"babel-preset-es2015": "^6.6.0",
"babel-preset-react": "^6.5.0",
"babel-preset-stage-1": "^6.5.0",
"babel-register": "^6.7.2",
"chai": "^3.2.0",
"chai-spies": "^0.7.0",
"coveralls": "^2.11.4",
"custom-drag": "0.0.3",
"eslint": "^0.24.0",
"eslint-plugin-babel": "^1.1.0",
"eslint-plugin-mocha": "^0.5.1",
"eslint-plugin-react": "^2.6.4",
"file-loader": "^0.8.4",
Expand All @@ -54,22 +56,22 @@
"gulp-gh-pages": "^0.5.2",
"gulp-util": "^3.0.6",
"history": "^1.13.1",
"isparta": "^3.0.4",
"lodash": "^3.10.1",
"material-ui": "^0.13.2",
"mocha": "^2.3.2",
"node-libs-browser": "^0.5.2",
"radium": "^0.15.1",
"raw-loader": "^0.5.1",
"react": "^0.14.3",
"react-addons-transition-group": "^0.14.7",
"react-dom": "^0.14.3",
"react-matterkit": "0.0.34",
"react-motion": "^0.2.7",
"react-router": "^1.0.0",
"react-tap-event-plugin": "^0.2.1",
"redux": "^0.12.0",
"webpack": "^1.10.5",
"webpack-dev-server": "^1.10.1"
},
"dependencies": {
"radium": "^0.16.6"
}
}
2 changes: 1 addition & 1 deletion test/attachRefs/test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var React = require('react')
var ReactDOM = require('react-dom')
var assert = require('chai').assert
var attachRefs = require('../../src/attachRefs')
import attachRefs from '../../src/attachRefs'

describe('attachRefs', () => {
const oriFindDOMNode = ReactDOM.findDOMNode
Expand Down
8 changes: 5 additions & 3 deletions test/controller/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var spies = require('chai-spies')
chai.use(spies)
chai.should()

var Controller = require('../../src/Controller')
import Controller from '../../src/Controller'

function wrapWarn() {
const ori = console.warn
Expand All @@ -16,17 +16,19 @@ function wrapWarn() {
function createMockGSAPAnimation() {
var mock = {}
var paused = false
var reversed = false
mock.time = chai.spy((v) => v === undefined ? 0 : mock)
mock.pause = chai.spy(() => {
paused = true
return mock
})
mock.delay = chai.spy(() => 0)
mock.paused = chai.spy(() => paused)
mock.invalidate = chai.spy(() => mock)
mock.restart = chai.spy(() => mock)
mock.kill = chai.spy(() => mock)
mock.play = chai.spy(() => mock)
mock.paused = chai.spy(v => {if (v === undefined) return paused; else {paused = v; return mock;}})
mock.reversed = chai.spy(v => {if (v === undefined) return reversed; else {reversed = v; return mock;}})
return mock
}

Expand Down Expand Up @@ -143,7 +145,7 @@ describe('Controller', () => {
controller.pause()
gsapAnimation.pause.should.have.been.called.once()
controller.attach()
gsapAnimation.pause.should.have.been.called.twice()
gsapAnimation.paused.should.have.been.called.with(true)
})

describe('replace animation source', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/gsap-enhancer/test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var React = require('react')
var Component = React.Component
var GSAP = require('../../src/gsap-enhancer')
import GSAP from '../../src/gsap-enhancer'
var chai = require('chai')
var spies = require('chai-spies')
var assert = chai.assert
Expand Down
2 changes: 1 addition & 1 deletion test/target/test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var assert = require('chai').assert
var createTarget = require('../../src/createTarget')
import createTarget from '../../src/createTarget'

function createFakeTree(rootDesign) {
function create(design) {
Expand Down
6 changes: 3 additions & 3 deletions test/utils/test.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
var FakeNode = require('./FakeNode')
var {
import FakeNode from './FakeNode'
import {
walkItemTree,
reattachAll,
restoreRenderedStyles,
saveRenderedStyles
} = require('../../src/utils')
} from '../../src/utils'
var chai = require('chai')
var spies = require('chai-spies')
var assert = chai.assert
Expand Down

0 comments on commit 330e05e

Please # to comment.