Skip to content

Commit a5be962

Browse files
removed webpack from build process as it was causing errors
1 parent 04f091d commit a5be962

File tree

7 files changed

+15
-85
lines changed

7 files changed

+15
-85
lines changed

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ export default React.createClass({
5050

5151
## Methods
5252

53-
- **reset()** {*Void*} - Resets the idleTimer
54-
- **pause()** {*Void*} - Pauses the idleTimer
55-
- **resume()** {*Void*} - Resumes a paused idleTimer
56-
- **getRemainingTime()** {*Number*} - Returns the remaining time in milliseconds
57-
- **getElapsedTime()** {*Number*} - Returns the elapsed time in milliseconds
58-
- **lastActiveTime()** {*String*} - Returns the last active time as a number or a formatted string if the `format` prop is defined
53+
- **reset()** *{Void}* - Resets the idleTimer
54+
- **pause()** *{Void}* - Pauses the idleTimer
55+
- **resume()** *{Void}* - Resumes a paused idleTimer
56+
- **getRemainingTime()** *{Number}* - Returns the remaining time in milliseconds
57+
- **getElapsedTime()** *{Number}* - Returns the elapsed time in milliseconds
58+
- **lastActiveTime()** *{String}* - Returns the last active time as a number or a formatted string if the `format` prop is defined
5959
- **isIdle()** {*Boolean*} - Returns whether or not user is idle
6060

6161

build/index.js

Lines changed: 1 addition & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/App.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import IdleTimer from '../src/index';
2+
import IdleTimer from '../build/index';
33

44
export default React.createClass({
55

gulpfile.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ var path = require('path'),
1010
webpack = require('webpack'),
1111
WebpackDevServer = require('webpack-dev-server'),
1212
WebpackDevConfig = require('./webpack.dev.config'),
13-
WebpackProdConfig = require('./webpack.prod.config'),
1413
jest = require('gulp-jest'),
1514
eslint = require('gulp-eslint'),
1615
del = require('del'),
@@ -82,13 +81,10 @@ gulp.task("build-dev", function(callback) {
8281

8382

8483
gulp.task('build', function(callback) {
85-
86-
webpack(WebpackProdConfig, function(err, stats) {
87-
if(err) throw new gutil.PluginError("webpack", err);
88-
gutil.log("[webpack]", stats.toString());
89-
callback();
90-
});
91-
84+
return gulp.src(['./src/index.js', '!./src/__tests__/*.js'])
85+
.pipe(babel())
86+
.pipe(uglify())
87+
.pipe(gulp.dest('./build'));
9288
});
9389

9490
/////////////////////

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-idle-timer",
3-
"version": "1.0.2",
3+
"version": "1.1.0",
44
"description": "Activity detection for React.js",
55
"main": "build/index.js",
66
"scripts": {

src/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export default React.createClass({
5454
return {
5555
idle: false,
5656
oldDate: +new Date(),
57-
lastActive: null,
57+
lastActive: +new Date(),
5858
remaining: null,
5959
tId: null,
6060
pageX: null,
@@ -74,7 +74,7 @@ export default React.createClass({
7474
});
7575
},
7676

77-
render() { return <div>{this.props.children}</div> },
77+
render() { return <div>{this.props.children ? this.props.children : ''}</div> },
7878

7979
/////////////////////
8080
// Private Methods //

webpack.prod.config.js

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)