Skip to content

Commit c219822

Browse files
author
Malte W
committed
updated babel
1 parent 419bff5 commit c219822

File tree

5 files changed

+36
-24
lines changed

5 files changed

+36
-24
lines changed

.babelrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
"stage": 0,
3-
"loose": "all"
2+
"presets": ["react", "es2015", "stage-1"]
43
}

.eslintrc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@
99
"react/jsx-uses-react": 2,
1010
"react/jsx-uses-vars": 2,
1111
"react/react-in-jsx-scope": 2,
12-
"indent": [2, 4, {"indentSwitchCase": true}]
12+
"react/no-multi-comp": 0,
13+
"indent": [0, 4],
14+
"new-cap": 0,
15+
"comma-dangle": 0,
16+
"camelcase": 0,
17+
"id-length": 0,
18+
"no-nested-ternary": 0
1319
},
1420
"plugins": [
1521
"react"

examples/simple/package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@
2424
"homepage": "https://github.com/malte-wessel/react-custom-scrollbars",
2525
"dependencies": {},
2626
"devDependencies": {
27-
"babel-core": "^5.6.18",
28-
"babel-loader": "^5.1.4",
27+
"babel-core": "^6.2.1",
28+
"babel-loader": "^6.2.0",
29+
"eslint": "^1.6.0",
30+
"eslint-config-airbnb": "^0.1.0",
31+
"eslint-plugin-react": "^3.5.1",
2932
"lodash": "^3.10.1",
3033
"node-libs-browser": "^0.5.2",
31-
"react-hot-loader": "^1.2.7",
3234
"webpack": "^1.9.11",
3335
"webpack-dev-server": "^1.9.0"
3436
}

examples/simple/webpack.config.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@ var webpack = require('webpack');
44
var entry = [];
55
if(process.env.NODE_ENV === 'development') {
66
entry.push(
7-
'webpack-dev-server/client?http://localhost:3000',
8-
'webpack/hot/only-dev-server'
7+
'webpack-dev-server/client?http://localhost:3000'
98
);
109
}
1110

1211
var plugins = [
13-
new webpack.HotModuleReplacementPlugin(),
1412
new webpack.NoErrorsPlugin()
1513
];
14+
1615
if(process.env.NODE_ENV === 'production') {
1716
plugins.push(
1817
new webpack.optimize.UglifyJsPlugin({
@@ -27,7 +26,7 @@ var loaders = [];
2726
if(process.env.NODE_ENV === 'development') {
2827
loaders.push({
2928
test: /\.js$/,
30-
loaders: ['react-hot', 'babel'],
29+
loaders: ['babel'],
3130
exclude: /node_modules/,
3231
include: __dirname
3332
});

package.json

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
"build": "babel src --out-dir lib",
99
"build:umd": "webpack src/index.js dist/react-custom-scrollbars.js && NODE_ENV=production webpack src/index.js dist/react-custom-scrollbars.min.js",
1010
"lint": "eslint src test examples",
11-
"test": "NODE_ENV=test mocha --compilers js:babel/register --recursive",
12-
"test:watch": "NODE_ENV=test mocha --compilers js:babel/register --recursive --watch",
13-
"test:cov": "babel-node ./node_modules/.bin/isparta cover ./node_modules/.bin/_mocha -- --recursive",
11+
"test": "NODE_ENV=test mocha --compilers js:babel-register --recursive",
12+
"test:watch": "NODE_ENV=test mocha --compilers js:babel-register --recursive --watch",
1413
"prepublish": "npm run lint && npm run test && npm run clean && npm run build"
1514
},
1615
"repository": {
@@ -32,15 +31,19 @@
3231
},
3332
"homepage": "https://github.com/malte-wessel/react-custom-scrollbars",
3433
"devDependencies": {
35-
"babel": "^5.5.8",
36-
"babel-core": "^5.6.18",
37-
"babel-eslint": "^3.1.15",
38-
"babel-loader": "^5.1.4",
39-
"eslint": "^0.23",
40-
"eslint-config-airbnb": "0.0.6",
41-
"eslint-plugin-react": "^2.3.0",
34+
"babel-cli": "^6.2.0",
35+
"babel-core": "^6.2.1",
36+
"babel-eslint": "4.*",
37+
"babel-loader": "^6.2.0",
38+
"babel-preset-es2015": "^6.1.18",
39+
"babel-preset-react": "^6.3.13",
40+
"babel-preset-stage-1": "^6.1.18",
41+
"babel-register": "^6.3.13",
42+
"babel-runtime": "^6.3.19",
43+
"eslint": "^1.6.0",
44+
"eslint-config-airbnb": "^0.1.0",
45+
"eslint-plugin-react": "^3.5.1",
4246
"expect": "^1.6.0",
43-
"isparta": "^3.0.3",
4447
"mocha": "^2.2.5",
4548
"react": "^0.14.3",
4649
"react-dom": "^0.14.3",
@@ -49,8 +52,11 @@
4952
"webpack-dev-server": "^1.8.2"
5053
},
5154
"peerDependencies": {
52-
"react": "^0.14.3",
53-
"react-dom": "^0.14.3"
55+
"react": "^0.14.5",
56+
"react-dom": "^0.14.5"
5457
},
55-
"dependencies": {}
58+
"dependencies": {
59+
"dom-css": "^2.0.0",
60+
"raf": "^3.1.0"
61+
}
5662
}

0 commit comments

Comments
 (0)