Skip to content

Commit d9a26b9

Browse files
committed
feat(webpack): Update dependencies and webpack config
1 parent e9db13d commit d9a26b9

25 files changed

+21199
-6838
lines changed

.babelrc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
{
2-
"presets": [
3-
"react",
4-
"es2015"
5-
],
6-
"plugins": ["transform-runtime"]
2+
"presets": ["@babel/preset-env"],
3+
"plugins": ["@babel/plugin-transform-runtime"]
74
}

examples/events.js

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,43 @@
11
import $ from 'jquery'
2-
import React, {Component} from 'react' // eslint-disable-line
2+
import React, {Component} from 'react'
33
import {PropTypes} from 'prop-types'
44
import ReactDOM from 'react-dom'
5-
import ReactCSSTransitionGroup from 'react-addons-css-transition-group'
5+
import {CSSTransition, TransitionGroup} from 'react-transition-group'
66

77
class Events extends Component {
88
render () {
9+
const transitionOptions = {
10+
classNames: 'events',
11+
in: true,
12+
timeout: 500
13+
}
14+
15+
const defaultContent = (<CSSTransition key='empty-entry' {...transitionOptions}>
16+
<div>Nothing to see yet.</div>
17+
</CSSTransition>)
18+
919
const content = this.props.list.map(function (entry) {
10-
return <Events.Entry key={entry.id} { ...entry } />
20+
return (<CSSTransition key={entry.id} {...transitionOptions}>
21+
<div className='events-list-entry'>
22+
<span className='event-name'>{entry.name}</span>
23+
{entry.content}
24+
</div>
25+
</CSSTransition>)
1126
})
1227

1328
return (<div className='events-list'>
14-
<ReactCSSTransitionGroup transitionName='events' transitionLeave={false} transitionEnterTimeout={500}>
15-
{content.length ? content : (<div key='empty-entry'>
16-
Nothing to see yet.
17-
</div>)}
18-
</ReactCSSTransitionGroup>
29+
<TransitionGroup
30+
children={content.length ? content : defaultContent}
31+
enter={true}
32+
exit={false}
33+
/>
1934
</div>)
2035
}
2136
}
2237
Events.propTypes = {
2338
list: PropTypes.array
2439
}
2540

26-
Events.Entry = class Entry extends Component {
27-
render () {
28-
return (<div className='events-list-entry'>
29-
<span className='event-name'>{this.props.name}</span>
30-
{this.props.content}
31-
</div>)
32-
}
33-
}
34-
Events.Entry.propTypes = {
35-
name: PropTypes.string,
36-
content: PropTypes.object
37-
}
38-
3941
class CursorPosition extends Component {
4042
render () {
4143
return (<span className='cursor-position'>

examples/iframe.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<meta name="description" content="">
88
<meta name="viewport" content="width=device-width">
99

10-
<script src="/hmr.js"></script>
1110
<script src="dist/styles.js"></script>
1211
</head>
1312
<body>

examples/index.css

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -314,15 +314,6 @@ article {
314314
opacity: .99;
315315
}
316316

317-
.events-list .events-leave {
318-
opacity: .6;
319-
transition: opacity .4s ease-in;
320-
}
321-
322-
.events-list .events-leave.events-leave-active {
323-
opacity: .01;
324-
}
325-
326317

327318
/* Event styles */
328319

examples/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<meta name="description" content="">
88
<meta name="viewport" content="width=device-width">
99

10-
<script src="/hmr.js"></script>
1110
<script src="dist/styles.js"></script>
1211
</head>
1312
<body>

karma.conf.js

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
1-
const path = require('path')
2-
31
process.env.BUILD_TEST = 'true'
4-
const webpackConfig = require('./webpack.config')
5-
delete webpackConfig.entry
6-
delete webpackConfig.output
7-
webpackConfig.module.preLoaders = [{
8-
test: /\.js$/,
9-
include: path.resolve('src/'),
10-
loader: 'babel-istanbul'
11-
}]
2+
/* eslint-disable no-unused-vars */
3+
const {
4+
entry: _entry,
5+
output: _output,
6+
...webpackConfig
7+
} = require('./webpack.config')
8+
/* eslint-enable no-unused-vars */
129

1310
module.exports = function (config) {
1411
config.set({
1512
basePath: './',
1613

17-
frameworks: ['jasmine'],
14+
frameworks: ['jasmine', 'webpack'],
15+
16+
plugins: [
17+
'karma-chrome-launcher',
18+
'karma-coverage',
19+
'karma-jasmine',
20+
'karma-sourcemap-loader',
21+
'karma-webpack'
22+
],
1823

1924
files: [{
2025
pattern: 'spec/*.spec.js',
@@ -27,7 +32,10 @@ module.exports = function (config) {
2732

2833
coverageReporter: {
2934
dir: 'coverage',
30-
reporters: [{type: 'lcov', subdir: 'lcov'}]
35+
reporters: [
36+
{type: 'lcov', subdir: 'lcov'},
37+
{type: 'text-summary', subdir: '.'}
38+
]
3139
},
3240

3341
webpack: webpackConfig,

0 commit comments

Comments
 (0)