diff --git a/.babelrc b/.babelrc index a4ac5ba8..4ef551af 100644 --- a/.babelrc +++ b/.babelrc @@ -1,5 +1,5 @@ { - "presets": ["react", "es2015", "stage-0"], + "presets": ["es2015", "stage-0", "react"], "env": { "development": { "plugins": [ diff --git a/components/animations/zoom-in.scss b/components/animations/zoom-in.scss index f0015383..5303756a 100644 --- a/components/animations/zoom-in.scss +++ b/components/animations/zoom-in.scss @@ -7,7 +7,7 @@ .enterActive, .leaveActive { transition-timing-function: $animation-curve-fast-out-slow-in; transition-duration: 500ms; - transition-property: transform, opacity; + transition: transform, opacity; } .enter { diff --git a/components/animations/zoom-out.scss b/components/animations/zoom-out.scss index 0437a447..9a09cf27 100644 --- a/components/animations/zoom-out.scss +++ b/components/animations/zoom-out.scss @@ -7,7 +7,7 @@ .enterActive, .leaveActive { transition-timing-function: $animation-curve-fast-out-slow-in; transition-duration: 500ms; - transition-property: transform, opacity; + transition: transform, opacity; } .enter { diff --git a/components/radio/style.scss b/components/radio/style.scss index ed0a9e87..21567db0 100644 --- a/components/radio/style.scss +++ b/components/radio/style.scss @@ -56,7 +56,7 @@ content: ""; background-color: $radio-inner-color; border-radius: 50%; - transition-property: transform; + transition: transform; transform: scale(0); } } diff --git a/docs/.babelrc b/docs/.babelrc index a4ac5ba8..4ef551af 100644 --- a/docs/.babelrc +++ b/docs/.babelrc @@ -1,5 +1,5 @@ { - "presets": ["react", "es2015", "stage-0"], + "presets": ["es2015", "stage-0", "react"], "env": { "development": { "plugins": [ diff --git a/docs/package.json b/docs/package.json index 3141e5b9..08cf6425 100644 --- a/docs/package.json +++ b/docs/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "classnames": "^2.2.1", - "codemirror": "^5.8.0", + "codemirror": "^5.10.0", "history": "^1.17.0", "react": "^0.14.3", "react-dom": "^0.14.3", @@ -18,7 +18,7 @@ }, "devDependencies": { "autoprefixer": "^6.0.3", - "babel-core": "^6.3.15", + "babel-core": "^6.3.26", "babel-eslint": "^5.0.0-beta4", "babel-loader": "^6.2.0", "babel-plugin-react-transform": "^2.0.0-beta1", @@ -26,7 +26,7 @@ "babel-preset-react": "^6.3.13", "babel-preset-stage-0": "^6.3.13", "babel-preset-stage-2": "^6.3.13", - "cross-env": "^1.0.4", + "cross-env": "^1.0.5", "css-loader": "^0.21.0", "express": "^4.13.3", "extract-text-webpack-plugin": "^0.8.2", diff --git a/karma.conf.js b/karma.conf.js index ba434c83..8128a2d2 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,3 +1,4 @@ +require("babel-polyfill"); const webpackConfig = require('./webpack.config.test'); module.exports = function (config) { @@ -7,7 +8,7 @@ module.exports = function (config) { frameworks: ['mocha'], files: [ './node_modules/phantomjs-polyfill/bind-polyfill.js', - './node_modules/babel-core/browser-polyfill.js', + './node_modules/babel-polyfill/dist/polyfill.js', 'tests.webpack.js' ], reporters: ['dots'], diff --git a/package.json b/package.json index b05e4ca6..753ce158 100644 --- a/package.json +++ b/package.json @@ -52,41 +52,42 @@ }, "devDependencies": { "autoprefixer": "^6.0.3", - "babel-core": "^6.3.15", + "babel-cli": "^6.3.17", + "babel-core": "^6.3.26", "babel-eslint": "^5.0.0-beta4", "babel-loader": "^6.2.0", "babel-plugin-react-transform": "^2.0.0-beta1", + "babel-polyfill": "^6.3.14", "babel-preset-es2015": "^6.3.13", "babel-preset-react": "^6.3.13", "babel-preset-stage-0": "^6.3.13", - "babel-preset-stage-2": "^6.3.13", "bluebird": "^3.0.5", "core-js": "^1.2.6", "cpx": "^1.2.1", - "cross-env": "^1.0.4", + "cross-env": "^1.0.5", "css-loader": "^0.21.0", "eslint": "^1.10.3", "eslint-plugin-babel": "^3.0.0", "eslint-plugin-react": "^3.11.3", - "expect": "^1.8.0", + "expect": "^1.13.4", "express": "^4.13.3", "extract-text-webpack-plugin": "^0.8.2", - "glob": "^6.0.1", - "karma": "^0.13.3", - "karma-chrome-launcher": "^0.2.0", - "karma-cli": "^0.1.0", - "karma-mocha": "^0.2.0", - "karma-phantomjs-launcher": "~0.2", + "glob": "^6.0.2", + "karma": "^0.13.15", + "karma-chrome-launcher": "^0.2.2", + "karma-cli": "^0.1.2", + "karma-mocha": "^0.2.1", + "karma-phantomjs-launcher": "~0.2.1", "karma-webpack": "^1.7.0", - "mocha": "^2.3.3", + "mocha": "^2.3.4", "node-sass": "^3.3.3", "normalize.css": "^3.0.3", - "phantomjs": "^1.9.18", + "phantomjs": "^1.9.19", "phantomjs-polyfill": "0.0.1", "postcss-loader": "^0.7.0", "react": "^0.14.3", - "react-addons-css-transition-group": "^0.14.0", - "react-addons-test-utils": "^0.14.0", + "react-addons-css-transition-group": "^0.14.3", + "react-addons-test-utils": "^0.14.3", "react-docgen": "^2.4.0", "react-dom": "^0.14.3", "react-transform-catch-errors": "^1.0.0",