Skip to content

Commit 9b9baed

Browse files
committed
Update dependencies
1 parent 74e5132 commit 9b9baed

38 files changed

+6775
-388
lines changed

.babelrc

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
{
2-
"presets": ["es2015", "stage-1", "react"],
3-
"plugins": ["add-module-exports"]
2+
"presets": [
3+
["env", { "loose": true }],
4+
"stage-1",
5+
"react"
6+
],
7+
"plugins": ["add-module-exports"],
8+
9+
"env": {
10+
"test": {
11+
"plugins": ["istanbul"]
12+
}
13+
}
414
}

.eslintrc

+20-27
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,32 @@
11
{
2-
"extends": "eslint:recommended",
2+
"extends": [
3+
"eslint:recommended",
4+
"plugin:react/recommended"
5+
],
36
"env": {
47
"browser": true,
58
"node": true
69
},
7-
"ecmaFeatures": {
8-
"jsx": true
9-
},
1010
"parser": "babel-eslint",
1111
"plugins": [
1212
"react"
1313
],
1414
"rules": {
15-
"constructor-super": 2,
16-
"comma-spacing": 2,
17-
"comma-style": [2, "last"],
18-
"one-var": [2, { "initialized": "never" }],
19-
"key-spacing": 0,
20-
"no-this-before-super": 2,
21-
"no-underscore-dangle": 0,
22-
"no-unused-vars": [2, { "vars": "all", "args": "none" }],
23-
"no-var": 2,
24-
"quotes": [2, "single", "avoid-escape"],
25-
"react/display-name": 0,
26-
"react/jsx-boolean-value": [2, "never"],
27-
"react/jsx-no-duplicate-props": 2,
28-
"react/jsx-no-undef": 2,
29-
"react/jsx-uses-react": 2,
30-
"react/no-did-mount-set-state": 0,
31-
"react/no-did-update-set-state": 0,
32-
"react/react-in-jsx-scope": 2,
33-
"react/self-closing-comp": 2,
34-
"react/wrap-multilines": 2,
35-
"react/jsx-uses-vars": 2,
36-
"space-infix-ops": 2,
37-
"strict": [2, "never"]
15+
"comma-spacing": "error",
16+
"comma-style": ["error", "last"],
17+
"no-unused-vars": ["error", { "vars": "all", "args": "none" }],
18+
"no-var": "error",
19+
"one-var": ["error", { "initialized": "never" }],
20+
"quotes": ["error", "single", "avoid-escape"],
21+
"space-infix-ops": "error",
22+
"strict": ["error", "never"],
23+
"react/no-find-dom-node": "off",
24+
"react/jsx-boolean-value": ["error", "never"],
25+
"react/jsx-wrap-multilines": "error",
26+
"react/no-unescaped-entities": "off",
27+
"react/prop-types": ["error", {
28+
"ignore": ["children", "className"]
29+
}],
30+
"react/self-closing-comp": "error"
3831
}
3932
}

.travis.yml

+10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11
sudo: false
2+
23
language: node_js
34
node_js:
45
- stable
6+
7+
env:
8+
- BROWSER=ChromeCi
9+
10+
cache:
11+
directories:
12+
- node_modules
13+
514
before_install:
615
- export CHROME_BIN=chromium-browser
716
- export DISPLAY=:99.0
817
- sh -e /etc/init.d/xvfb start
18+
919
branches:
1020
only:
1121
- master

examples/.eslintrc

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"rules": {
3+
"react/prop-types": "off"
4+
}
5+
}

examples/App.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import Playground from '@monastic.panic/component-playground/Playground';
2+
import PropTypes from 'prop-types';
13
import React from 'react';
24
import ReactDOM, { findDOMNode } from 'react-dom';
3-
import PropTypes from 'prop-types';
45
import Button from 'react-bootstrap/lib/Button';
5-
import Playground from '@monastic.panic/component-playground/Playground';
66

77
import PropTable from './PropTable';
88

examples/Overlay.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,11 @@ class OverlayExample extends React.Component {
9696

9797
return (
9898
<div className='overlay-example'>
99-
<Button bsStyle='primary' ref='target' onClick={this.toggle}>
99+
<Button
100+
bsStyle='primary'
101+
ref={(c) => { this.target = c; }}
102+
onClick={this.toggle}
103+
>
100104
I am an Overlay target
101105
</Button>
102106
<p>
@@ -108,7 +112,7 @@ class OverlayExample extends React.Component {
108112
onHide={() => this.setState({ show: false })}
109113
placement={this.state.placement}
110114
container={this}
111-
target={ props => findDOMNode(this.refs.target)}
115+
target={() => findDOMNode(this.target)}
112116
>
113117
<ToolTip>
114118
I&rsquo;m placed to the: <strong>{this.state.placement}</strong>

examples/Portal.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ class PortalExample extends React.Component {
2626
<div className='panel-body'>
2727
<span>It looks like I will render here.</span>
2828

29-
<Portal container={()=> this.refs.container}>
29+
<Portal container={() => this.container}>
3030
{ this.state.show && child }
3131
</Portal>
3232
</div>
3333
</div>
3434

3535
<div className='panel panel-default'>
36-
<div ref='container' className='panel-body'/>
36+
<div ref={(c) => { this.container = c; }} className='panel-body'/>
3737
</div>
3838
</div>
3939
);

examples/Position.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,11 @@ class PositionExample extends React.Component {
7070

7171
return (
7272
<div className='overlay-example'>
73-
<Button bsStyle='primary' ref='target' onClick={this.toggle}>
73+
<Button
74+
bsStyle='primary'
75+
ref={(c) => { this.target = c; }}
76+
onClick={this.toggle}
77+
>
7478
I am a Position target
7579
</Button>
7680
<p>
@@ -80,7 +84,7 @@ class PositionExample extends React.Component {
8084
<Position
8185
container={this}
8286
placement={this.state.placement}
83-
target={props => findDOMNode(this.refs.target)}
87+
target={() => findDOMNode(this.target)}
8488
>
8589
<ToolTip>
8690
I'm placed to the: <strong>{this.state.placement}</strong>

examples/PropTable.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import merge from 'lodash/merge';
2-
import React from 'react';
32
import PropTypes from 'prop-types';
3+
import React from 'react';
44
import Label from 'react-bootstrap/lib/Label';
55
import Table from 'react-bootstrap/lib/Table';
66

examples/server.js

-25
This file was deleted.

karma.conf.js

+33-53
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,59 @@
1-
/* eslint no-var: 0, babel/object-shorthand: 0 */
2-
require('babel-core/register');
1+
const webpack = require('webpack');
32

4-
var webpackConfig = require('./webpack/test.config.js');
5-
var isCI = process.env.CONTINUOUS_INTEGRATION === 'true';
6-
var runCoverage = process.env.COVERAGE === 'true' || isCI;
7-
8-
var reporters = ['mocha'];
9-
10-
if (runCoverage) {
11-
webpackConfig = require('./webpack/test-coverage.config');
12-
reporters.push('coverage');
13-
14-
if (isCI) {
15-
reporters.push('coveralls');
16-
}
3+
const coverageReporters = ['coverage'];
4+
if (process.env.CONTINUOUS_INTEGRATION === 'true') {
5+
coverageReporters.push('coveralls');
176
}
187

19-
module.exports = function (config) {
20-
config.set({
8+
module.exports = (config) => {
9+
const { env } = process;
2110

22-
basePath: '',
23-
24-
frameworks: [
25-
'mocha',
26-
'sinon-chai'
27-
],
11+
config.set({
12+
frameworks: ['mocha', 'sinon-chai'],
2813

29-
files: [
30-
'test/index.js'
31-
],
14+
files: ['test/index.js'],
3215

3316
preprocessors: {
34-
'test/index.js': ['webpack', 'sourcemap']
17+
'test/index.js': ['webpack', 'sourcemap'],
3518
},
3619

37-
webpack: webpackConfig,
20+
webpack: {
21+
module: {
22+
rules: [
23+
{ test: /\.js$/, exclude: /node_modules/, use: 'babel-loader' },
24+
],
25+
},
26+
plugins: [
27+
new webpack.DefinePlugin({
28+
'process.env.NODE_ENV': JSON.stringify('test'),
29+
__DEV__: true,
30+
}),
31+
],
32+
devtool: 'cheap-module-inline-source-map',
33+
},
3834

3935
webpackMiddleware: {
40-
noInfo: true
36+
noInfo: true,
4137
},
4238

43-
reporters: reporters,
39+
reporters: ['mocha', ...coverageReporters],
4440

4541
mochaReporter: {
46-
output: 'autowatch'
42+
output: 'autowatch',
4743
},
4844

4945
coverageReporter: {
50-
dir: '.coverage',
51-
reporters: [
52-
{ type: 'html' },
53-
{ type: 'lcovonly' }
54-
]
46+
type: 'lcov',
47+
dir: 'coverage',
5548
},
5649

57-
port: 9876,
58-
59-
colors: true,
60-
61-
logLevel: config.LOG_INFO,
62-
63-
autoWatch: true,
64-
65-
browsers: [ isCI ? 'ChromeTravisCI' : 'Chrome' ],
66-
6750
customLaunchers: {
68-
ChromeTravisCI: {
51+
ChromeCi: {
6952
base: 'Chrome',
70-
flags: ['--no-sandbox']
71-
}
53+
flags: ['--no-sandbox'],
54+
},
7255
},
7356

74-
captureTimeout: 60000,
75-
browserNoActivityTimeout: 45000,
76-
77-
singleRun: isCI
57+
browsers: env.BROWSER ? env.BROWSER.split(',') : ['Chrome'],
7858
});
7959
};

0 commit comments

Comments
 (0)