Skip to content

Commit

Permalink
Replace babel-polyfill with babel-runtime to avoid conflict with react
Browse files Browse the repository at this point in the history
  • Loading branch information
rockuw committed Mar 16, 2016
1 parent 58b0d8c commit 051a0a7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"presets": ["es2015"]
"presets": ["es2015"],
"plugins": ["transform-runtime"]
}
2 changes: 0 additions & 2 deletions browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
* Export `OSS` as standalone lib which can be used in browser
*/

require('babel-polyfill');

var OSS = require('.');
OSS.Buffer = require('buffer').Buffer;
OSS.co = require('co');
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
"homepage": "https://github.com/aliyun/oss-nodejs-sdk",
"devDependencies": {
"autod": "^2.4.2",
"babel-polyfill": "^6.3.14",
"babel-runtime": "^6.6.1",
"babel-plugin-transform-runtime": "^6.6.0",
"babel-preset-es2015": "^6.3.13",
"babelify": "^7.2.0",
"bluebird": "^3.1.5",
Expand Down

0 comments on commit 051a0a7

Please sign in to comment.