Skip to content

Commit 6181efb

Browse files
brantstunsbrantstuns
committed
Upgraded to Gulp 4 to support Node 12 builds and fixed issue with 12pm vs 12am on time selector
1 parent cbbec1b commit 6181efb

7 files changed

Lines changed: 720 additions & 357 deletions

File tree

‎dist/react-datetime.js‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
react-datetime v2.16.3-membean5
2+
react-datetime v2.16.3-membean7
33
undefined
44
MIT: https://github.com/YouCanBookMe/react-datetime/raw/master/LICENSE
55
*/
@@ -23755,11 +23755,11 @@ return /******/ (function(modules) { // webpackBootstrap
2375523755
for (var i = 0; i < 24; i++) {
2375623756
var formattedTime;
2375723757
if (i === 0) {
23758-
formattedTime = { hour: i, amPm: 'am' };
23759-
} else if (i > 12) {
23760-
formattedTime = { hour: i, amPm: 'pm' };
23758+
formattedTime = { hour: i, amPm: 'AM' };
23759+
} else if (i >= 12) {
23760+
formattedTime = { hour: i, amPm: 'PM' };
2376123761
} else {
23762-
formattedTime = { hour: i, amPm: 'am' };
23762+
formattedTime = { hour: i, amPm: 'AM' };
2376323763
}
2376423764
times.push(formattedTime);
2376523765
}
@@ -23771,7 +23771,7 @@ return /******/ (function(modules) { // webpackBootstrap
2377123771
} else if (time.hour === 0) {
2377223772
formattedHour = 12;
2377323773
}
23774-
var timeString = formattedHour + ':00';
23774+
var timeString = formattedHour + ':00' + time.amPm;
2377523775
return React.createElement('li', {
2377623776
key: idx, className: 'time-selector-time', onClick: function () {
2377723777
that.props.setTime(time);
@@ -23784,7 +23784,8 @@ return /******/ (function(modules) { // webpackBootstrap
2378423784
date = this.props.viewDate,
2378523785
locale = date.localeData(),
2378623786
tableChildren,
23787-
timeSelector
23787+
timeSelector,
23788+
daysClass
2378823789
;
2378923790

2379023791
tableChildren = [
@@ -23799,14 +23800,22 @@ return /******/ (function(modules) { // webpackBootstrap
2379923800
React.createElement('tbody', { key: 'tb' }, this.renderDays())
2380023801
];
2380123802

23802-
timeSelector = React.createElement('ul', { className: 'time-selector-times' }, this.renderTimes());
23803+
if (this.props.showTimeSelector) {
23804+
timeSelector = React.createElement('div', { className: 'time-selector-container', key: 'time-selector' }, [
23805+
React.createElement('ul', { className: 'time-selector-times', key: 'time-selector-list' }, this.renderTimes())
23806+
]);
23807+
daysClass = 'rdtDays';
23808+
} else {
23809+
daysClass = 'rdtDays rdtNoTime';
23810+
}
2380323811

2380423812
if (footer)
2380523813
tableChildren.push(footer);
2380623814

23807-
return React.createElement('div', { className: 'rdtDays' },
23808-
[React.createElement('table', { key: 'table' }, tableChildren), React.createElement('div', { className: 'time-selector-container', key: 'time-selector' }, this.props.showTimeSelector ? timeSelector : null)]
23809-
);
23815+
return React.createElement('div', { className: daysClass }, [
23816+
React.createElement('table', { key: 'table' }, tableChildren),
23817+
timeSelector
23818+
]);
2381023819
},
2381123820

2381223821
/**

‎dist/react-datetime.min.js‎

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

‎dist/react-datetime.min.js.map‎

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

‎gulpfile.js‎

Lines changed: 68 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,80 @@
1-
const babel = require('gulp-babel'),
2-
gulp = require('gulp'),
3-
insert = require('gulp-insert'),
4-
plumber = require('gulp-plumber'),
5-
rename = require('gulp-rename'),
6-
sourcemaps = require('gulp-sourcemaps'),
7-
through = require('through2'),
8-
uglify = require('gulp-uglify'),
9-
webpack = require('webpack-stream')
10-
;
1+
const babel = require("gulp-babel"),
2+
gulp = require("gulp"),
3+
insert = require("gulp-insert"),
4+
plumber = require("gulp-plumber"),
5+
rename = require("gulp-rename"),
6+
sourcemaps = require("gulp-sourcemaps"),
7+
through = require("through2"),
8+
uglify = require("gulp-uglify"),
9+
webpack = require("webpack-stream");
10+
const pack = require("./package.json");
1111

12-
const pack = require( './package.json' );
13-
14-
gulp.task( 'sub', () => {
15-
// Reason behind having sub as separate task:
16-
// https://github.com/shama/webpack-stream/issues/114
17-
return gulp.src( './DateTime.js' )
18-
.pipe( webpack( getWebpackConfig() ) )
19-
.pipe( gulp.dest( 'tmp/' ) );
12+
gulp.task("sub", () => {
13+
// Reason behind having sub as separate task:
14+
// https://github.com/shama/webpack-stream/issues/114
15+
return gulp
16+
.src("./DateTime.js")
17+
.pipe(webpack(getWebpackConfig()))
18+
.pipe(gulp.dest("tmp/"));
2019
});
2120

22-
gulp.task( 'build', ['sub'], () => {
23-
return gulp.src( ['tmp/react-datetime.js'] )
24-
.pipe( sourcemaps.init( { loadMaps: true } ) )
25-
.pipe( through.obj( function( file, enc, cb ) {
26-
// Dont pipe through any source map files as
27-
// it will be handled by gulp-sourcemaps
28-
const isSourceMap = /\.map$/.test( file.path );
29-
if ( !isSourceMap ) this.push( file );
30-
cb();
31-
}))
32-
.pipe( plumber() )
33-
// .pipe( babel( { presets: [ 'es2015'] } ) )
34-
.pipe( insert.prepend( setHeader ) )
35-
.pipe( gulp.dest( 'dist/' ) ) // Save .js
36-
.pipe( uglify() )
37-
.pipe( insert.prepend( setHeader ) )
38-
.pipe( rename( { extname: '.min.js' } ) )
39-
.pipe( sourcemaps.write( '.' ) )
40-
.pipe( gulp.dest( 'dist/' ) ); // Save .min.js
41-
// TODO: Remove tmp folder
42-
});
21+
gulp.task(
22+
"build",
23+
gulp.series("sub", () => {
24+
return (
25+
gulp
26+
.src(["tmp/react-datetime.js"])
27+
.pipe(sourcemaps.init({ loadMaps: true }))
28+
.pipe(
29+
through.obj(function(file, enc, cb) {
30+
// Dont pipe through any source map files as
31+
// it will be handled by gulp-sourcemaps
32+
const isSourceMap = /\.map$/.test(file.path);
33+
if (!isSourceMap) this.push(file);
34+
cb();
35+
})
36+
)
37+
.pipe(plumber())
38+
// .pipe( babel( { presets: [ 'es2015'] } ) )
39+
.pipe(insert.prepend(setHeader))
40+
.pipe(gulp.dest("dist/")) // Save .js
41+
.pipe(uglify())
42+
.pipe(insert.prepend(setHeader))
43+
.pipe(rename({ extname: ".min.js" }))
44+
.pipe(sourcemaps.write("."))
45+
.pipe(gulp.dest("dist/"))
46+
); // Save .min.js
47+
// TODO: Remove tmp folder
48+
})
49+
);
4350

44-
gulp.task( 'default', ['build'] );
51+
gulp.task("default", gulp.series("build"));
4552

4653
/*
4754
* Utility functions
4855
*/
4956

5057
const getWebpackConfig = () => {
51-
return {
52-
devtool: '#cheap-module-source-map',
53-
output: {
54-
library: 'Datetime',
55-
libraryTarget: 'umd',
56-
filename: 'react-datetime.js'
57-
},
58-
module: {
59-
loaders: [
60-
{
61-
test: /\.json$/,
62-
loader: 'json-loader'
63-
}
64-
]
65-
}
66-
};
58+
return {
59+
devtool: "#cheap-module-source-map",
60+
output: {
61+
library: "Datetime",
62+
libraryTarget: "umd",
63+
filename: "react-datetime.js"
64+
},
65+
module: {
66+
loaders: [
67+
{
68+
test: /\.json$/,
69+
loader: "json-loader"
70+
}
71+
]
72+
}
73+
};
6774
};
6875

69-
const setHeader = ( '/*\n%%name%% v%%version%%\n%%homepage%%\n%%license%%: https://github.com/YouCanBookMe/react-datetime/raw/master/LICENSE\n*/\n' )
70-
.replace( '%%name%%', pack.name)
71-
.replace( '%%version%%', pack.version)
72-
.replace( '%%license%%', pack.license)
73-
.replace( '%%homepage%%', pack.homepage)
74-
;
76+
const setHeader = "/*\n%%name%% v%%version%%\n%%homepage%%\n%%license%%: https://github.com/YouCanBookMe/react-datetime/raw/master/LICENSE\n*/\n"
77+
.replace("%%name%%", pack.name)
78+
.replace("%%version%%", pack.version)
79+
.replace("%%license%%", pack.license)
80+
.replace("%%homepage%%", pack.homepage);

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-datetime",
3-
"version": "2.16.3-membean6",
3+
"version": "2.16.3-membean7",
44
"description": "A lightweight but complete datetime picker React.js component",
55
"repository": {
66
"type": "git",
@@ -49,7 +49,7 @@
4949
"enzyme": "^3.0.0",
5050
"enzyme-adapter-react-15": "^1.0.5",
5151
"eslint": "^3.1.0",
52-
"gulp": "^3.9.0",
52+
"gulp": "^4.0.2",
5353
"gulp-babel": "^6.1",
5454
"gulp-insert": "^0.4.0",
5555
"gulp-plumber": "^1.1.0",
@@ -79,4 +79,4 @@
7979
"prop-types": "^15.5.7",
8080
"react-onclickoutside": "^6.5.0"
8181
}
82-
}
82+
}

‎src/DaysView.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ var DateTimePickerDays = createClass({
1414
for (var i = 0; i < 24; i++) {
1515
var formattedTime;
1616
if (i === 0) {
17-
formattedTime = { hour: i, amPm: 'am' };
18-
} else if (i > 12) {
19-
formattedTime = { hour: i, amPm: 'pm' };
17+
formattedTime = { hour: i, amPm: 'AM' };
18+
} else if (i >= 12) {
19+
formattedTime = { hour: i, amPm: 'PM' };
2020
} else {
21-
formattedTime = { hour: i, amPm: 'am' };
21+
formattedTime = { hour: i, amPm: 'AM' };
2222
}
2323
times.push(formattedTime);
2424
}

0 commit comments

Comments
 (0)