Skip to content

Commit 18a9305

Browse files
author
[email protected]
committed
gulp version update
1 parent db47720 commit 18a9305

File tree

2 files changed

+57
-49
lines changed

2 files changed

+57
-49
lines changed

‎gulpfile.js

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var glob = require('glob');
88
var fs = require('fs');
99
var configRegex = /\[(.*)\]/;
1010
var shelljs = require('shelljs');
11-
var runSequence = require('run-sequence');
11+
var runSequence = require('gulp4-run-sequence');
1212

1313
function extend(copied, first, second, deep) {
1414
var result = copied || {};
@@ -49,7 +49,7 @@ function isObject(obj) {
4949
return value === undefined || value === null;
5050
}
5151

52-
gulp.task('scripts', function (done) {
52+
gulp.task('scripts', gulp.series(function (done) {
5353
var ts = require('gulp-typescript');
5454
var tsProject = ts.createProject('tsconfig.json', { typescript: require('typescript') });
5555

@@ -59,8 +59,8 @@ gulp.task('scripts', function (done) {
5959
.on('end', function () {
6060
done();
6161
});
62-
});
63-
gulp.task('create-locale', function () {
62+
}));
63+
gulp.task('create-locale', gulp.series(function (done) {
6464
var localeJson = glob.sync('./src/**/locale.json', { silent: true });
6565
if(localeJson.length) {
6666
// baseUtil;
@@ -73,29 +73,30 @@ gulp.task('create-locale', function () {
7373
} else {
7474
fs.writeFileSync('./src/common/locale-string.ts', 'export let Locale: Object={};');
7575
}
76-
})
76+
done();
77+
}));
7778

78-
gulp.task('serve', function () {
79+
gulp.task('serve', gulp.series(function () {
7980
shelljs.exec('node --max-old-space-size=8192 node_modules/gulp/bin/gulp serve-max', { silent: false });
80-
});
81+
}));
8182

8283

8384

8485

8586
/**
8687
* Compile styles
8788
*/
88-
gulp.task('styles', function () {
89+
gulp.task('styles', gulp.series(function () {
8990
var sass = require('gulp-sass');
9091
return gulp.src(['./**/*.scss', '!./node_modules/**/*.scss'], { base: './' })
9192
.pipe(sass({
9293
outputStyle: 'expanded',
9394
includePaths: './node_modules/@syncfusion/'
9495
}))
9596
.pipe(gulp.dest('.'));
96-
});
97+
}));
9798

98-
gulp.task('generate-router', function (done) {
99+
gulp.task('generate-router', gulp.series(function (done) {
99100
var imports = '';
100101
var compRoutes = '';
101102
var allconfig = '';
@@ -178,24 +179,26 @@ gulp.task('generate-router', function (done) {
178179
fs.writeFileSync('./src/common/all-routes.tsx',allroutes);
179180
fs.writeFileSync('./src/common/search-index.json', JSON.stringify(instance.toJSON()));
180181
done();
181-
});
182-
gulp.task('build', function (done) {
183-
if( shelljs.exec('node --max-old-space-size=4096 ./node_modules/gulp/bin/gulp.js react-build').code!==0){
182+
}));
183+
gulp.task('build', gulp.series(function (done) {
184+
// var sValue = shelljs.exec('node --max-old-space-size=4096 ./node_modules/gulp/bin/gulp.js react-build', { silent: true });
185+
if( shelljs.exec('node --max-old-space-size=4096 ./node_modules/gulp/bin/gulp.js react-build').code !==0){
184186
process.exit(1);
185187
}
186-
});
188+
done();
189+
}));
187190

188-
gulp.task('react-build', function (done) {
191+
gulp.task('react-build', gulp.series(function (done) {
189192
runSequence('create-locale','generate-router','styles','scripts','bundle','plnkr-json','cssfile', done);
190-
});
193+
}));
191194

192-
gulp.task('bundle', function () {
195+
gulp.task('bundle', gulp.series(function () {
193196
return gulp.src("./src/common/index.js")
194197
.pipe(gulpWebpack(webpackConfig,webpack))
195198
.pipe(gulp.dest('dist/'));
196-
});
199+
}));
197200

198-
gulp.task('plnkr-json', function() {
201+
gulp.task('plnkr-json', gulp.series(function(done) {
199202
var files = glob.sync('./src/**/*.tsx', { silent: true, ignore: [
200203
'./src/common/**/*.tsx', './src/**/*-routes.tsx', './src/**/config.tsx'] });
201204
var sys = fs.readFileSync('./src/common/plnk-template/systemjs.config.js','utf8');
@@ -331,7 +334,8 @@ gulp.task('plnkr-json', function() {
331334
}
332335

333336
}
334-
});
337+
done();
338+
}));
335339
function getStringWithOutDescription(code, descRegex) {
336340
var lines = code.split('\n');
337341
var desStartLine = null;
@@ -359,7 +363,7 @@ function getStringWithOutDescription(code, descRegex) {
359363
}
360364
return lines.join('\n');
361365
}
362-
gulp.task('serve-max', ['react-build'], function (done) {
366+
gulp.task('serve-max', gulp.series('react-build', function (done) {
363367
var browserSync = require('browser-sync');
364368
var bs = browserSync.create('Essential JS 2 react');
365369
var options = {
@@ -369,8 +373,9 @@ gulp.task('serve-max', ['react-build'], function (done) {
369373
ui: false
370374
};
371375
bs.init(options, done);
372-
});
373-
gulp.task('cssfile', function () {
376+
}));
377+
gulp.task('cssfile', gulp.series(function (done) {
374378
gulp.src('./node_modules/@syncfusion/ej2/*.css')
375379
.pipe(gulp.dest('./styles/'));
376-
});
380+
done();
381+
}));

‎package.json

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,54 +6,56 @@
66
"license": "SEE LICENSE IN license",
77
"dependencies": {
88
"@syncfusion/ej2": "*",
9+
"@syncfusion/ej2-react-barcode-generator": "*",
910
"@syncfusion/ej2-react-base": "*",
1011
"@syncfusion/ej2-react-buttons": "*",
1112
"@syncfusion/ej2-react-calendars": "*",
1213
"@syncfusion/ej2-react-charts": "*",
13-
"@syncfusion/ej2-react-diagrams": "*",
1414
"@syncfusion/ej2-react-circulargauge": "*",
15+
"@syncfusion/ej2-react-diagrams": "*",
16+
"@syncfusion/ej2-react-documenteditor": "*",
1517
"@syncfusion/ej2-react-dropdowns": "*",
1618
"@syncfusion/ej2-react-filemanager": "*",
19+
"@syncfusion/ej2-react-gantt": "*",
1720
"@syncfusion/ej2-react-grids": "*",
21+
"@syncfusion/ej2-react-heatmap": "*",
22+
"@syncfusion/ej2-react-inplace-editor": "*",
1823
"@syncfusion/ej2-react-inputs": "*",
19-
"@syncfusion/ej2-react-layouts":"*",
24+
"@syncfusion/ej2-react-kanban": "*",
25+
"@syncfusion/ej2-react-layouts": "*",
2026
"@syncfusion/ej2-react-lineargauge": "*",
21-
"@syncfusion/ej2-react-barcode-generator": "*",
2227
"@syncfusion/ej2-react-lists": "*",
23-
"@syncfusion/ej2-react-kanban": "*",
2428
"@syncfusion/ej2-react-maps": "*",
25-
"@syncfusion/ej2-react-treemap": "*",
26-
"@syncfusion/ej2-react-heatmap": "*",
2729
"@syncfusion/ej2-react-navigations": "*",
28-
"@syncfusion/ej2-react-notifications": "*",
29-
"@syncfusion/ej2-react-inplace-editor": "*",
30-
"@syncfusion/ej2-react-treegrid": "*",
30+
"@syncfusion/ej2-react-notifications": "*",
31+
"@syncfusion/ej2-react-pdfviewer": "*",
32+
"@syncfusion/ej2-react-pivotview": "*",
3133
"@syncfusion/ej2-react-popups": "*",
34+
"@syncfusion/ej2-react-progressbar": "*",
35+
"@syncfusion/ej2-react-querybuilder": "*",
36+
"@syncfusion/ej2-react-richtexteditor": "*",
3237
"@syncfusion/ej2-react-schedule": "*",
3338
"@syncfusion/ej2-react-splitbuttons": "*",
34-
"@syncfusion/ej2-react-documenteditor": "*",
35-
"@syncfusion/ej2-react-richtexteditor":"*",
36-
"@syncfusion/ej2-react-pivotview":"*",
37-
"@syncfusion/ej2-react-pdfviewer":"*",
38-
"@syncfusion/ej2-react-querybuilder":"*",
39-
"@syncfusion/ej2-react-gantt":"*",
40-
"@syncfusion/ej2-react-spreadsheet":"*",
41-
"@syncfusion/ej2-react-progressbar":"*",
39+
"@syncfusion/ej2-react-spreadsheet": "*",
40+
"@syncfusion/ej2-react-treegrid": "*",
41+
"@syncfusion/ej2-react-treemap": "*",
42+
"@types/codemirror": "0.0.56",
43+
"@types/marked": "^0.3.0",
44+
"@types/moment-timezone": "0.5.7",
4245
"@types/react": "^15.0.24",
4346
"@types/react-dom": "^15.5.1",
4447
"@types/react-router": "4.0.19",
45-
"@types/moment-timezone": "0.5.7",
48+
"codemirror": "^5.37.0",
4649
"fuse.js": "3.2.0",
50+
"gulp4-run-sequence": "^1.0.1",
51+
"marked": "^0.3.19",
4752
"moment-timezone": "0.5.13",
53+
"npm-force-resolutions": "0.0.3",
4854
"react": "16.3.1",
4955
"react-dom": "16.3.1",
5056
"react-redux": "^5.0.5",
5157
"react-router": "4.3.1",
5258
"react-router-dom": "4.3.0",
53-
"@types/marked": "^0.3.0",
54-
"@types/codemirror": "0.0.56",
55-
"marked": "^0.3.19",
56-
"codemirror": "^5.37.0",
5759
"tributejs": "^3.7.3"
5860
},
5961
"devDependencies": {
@@ -73,13 +75,14 @@
7375
"webpack": "2.5.1",
7476
"gulp-webpack": "^1.5.0",
7577
"es6-promise": "^3.2.1",
76-
"gulp": "^3.9.1",
78+
"gulp": "^4.0.2",
7779
"gulp-sass": "^3.1.0",
7880
"gulp-typescript": "^3.1.6",
7981
"run-sequence": "^2.2.0",
80-
"shelljs": "^0.7.8",
82+
"shelljs": "*",
8183
"requirejs": "^2.3.3",
82-
"typescript": "2.3.4"
84+
"typescript": "2.3.4",
85+
"graceful-fs": "^4.2.4"
8386
},
8487
"config": {
8588
"ghooks": {

0 commit comments

Comments
 (0)