Skip to content

Commit 2797075

Browse files
cironunesvsavkin
authored andcommitted
chore: use load-plugins to make gulpfile shorter
1 parent 3d05f52 commit 2797075

File tree

2 files changed

+19
-23
lines changed

2 files changed

+19
-23
lines changed

gulpfile.js

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
11
var benchpress = require('angular-benchpress/lib/cli');
2-
var clean = require('gulp-rimraf');
3-
var connect = require('gulp-connect');
4-
var ejs = require('gulp-ejs');
52
var es = require('event-stream');
63
var file2moduleName = require('./file2modulename');
74
var fs = require('fs');
85
var glob = require('glob');
96
var gulp = require('gulp');
7+
var $ = require('gulp-load-plugins')();
108
var merge = require('merge');
119
var mergeStreams = require('event-stream').merge;
1210
var path = require('path');
1311
var Q = require('q');
1412
var readline = require('readline');
15-
var rename = require('gulp-rename');
1613
var runSequence = require('run-sequence');
17-
var shell = require('gulp-shell');
1814
var spawn = require('child_process').spawn;
1915
var through2 = require('through2');
20-
var watch = require('gulp-watch');
21-
var changed = require('gulp-changed');
2216

2317
var js2es5Options = {
2418
sourceMaps: true,
@@ -88,7 +82,7 @@ var sourceTypeConfigs = {
8882

8983
gulp.task('modules/clean', function() {
9084
return gulp.src('build', {read: false})
91-
.pipe(clean());
85+
.pipe($.rimraf());
9286
});
9387

9488
gulp.task('modules/build.dart/src', function() {
@@ -99,7 +93,7 @@ gulp.task('modules/build.dart/pubspec', function() {
9993
var outputDir = sourceTypeConfigs.dart.outputDir;
10094
var files = [];
10195
var changedStream = gulp.src('modules/*/pubspec.yaml')
102-
.pipe(changed(outputDir)) // Only forward files that changed.
96+
.pipe($.changed(outputDir)) // Only forward files that changed.
10397
.pipe(through2.obj(function(file, enc, done) {
10498
files.push(path.resolve(process.cwd(), outputDir, file.relative));
10599
this.push(file);
@@ -160,19 +154,19 @@ function renameEs5ToJs(file) {
160154

161155
function createModuleTask(sourceTypeConfig) {
162156
var transpile = gulp.src(sourceTypeConfig.transpileSrc)
163-
.pipe(rename({extname: '.'+sourceTypeConfig.outputExt}))
164-
.pipe(rename(renameSrcToLib))
157+
.pipe($.rename({extname: '.'+sourceTypeConfig.outputExt}))
158+
.pipe($.rename(renameSrcToLib))
165159
.pipe(gulpTraceur(sourceTypeConfig.compilerOptions, file2moduleName))
166160
.pipe(gulp.dest(sourceTypeConfig.outputDir));
167161
var copy = gulp.src(sourceTypeConfig.copySrc)
168-
.pipe(rename(renameSrcToLib))
169-
.pipe(rename(renameEs5ToJs))
162+
.pipe($.rename(renameSrcToLib))
163+
.pipe($.rename(renameEs5ToJs))
170164
.pipe(gulp.dest(sourceTypeConfig.outputDir));
171165
// TODO: provide the list of files to the template
172166
// automatically!
173167
var html = gulp.src(sourceTypeConfig.htmlSrc)
174-
.pipe(rename(renameSrcToLib))
175-
.pipe(ejs({
168+
.pipe($.rename(renameSrcToLib))
169+
.pipe($.ejs({
176170
type: sourceTypeConfig.outputExt
177171
}))
178172
.pipe(gulp.dest(sourceTypeConfig.outputDir));
@@ -275,7 +269,7 @@ gulp.task('benchmarks/build.js', function() {
275269
gulp.task('benchmarks/build.dart2js.dart', function () {
276270
return gulp.src([
277271
"build/dart/benchmarks/lib/**/benchmark.dart"
278-
]).pipe(shell(['dart2js --package-root="build/dart/benchmarks/packages" -o "<%= file.path %>.js" <%= file.path %>']));
272+
]).pipe($.shell(['dart2js --package-root="build/dart/benchmarks/packages" -o "<%= file.path %>.js" <%= file.path %>']));
279273
});
280274

281275
gulp.task('benchmarks/create-bpconf.dart', function () {
@@ -313,7 +307,7 @@ gulp.task('benchmarks/build.dart', function() {
313307
// WEB SERVERS
314308

315309
gulp.task('serve', function() {
316-
connect.server({
310+
$.connect.server({
317311
root: [__dirname+'/build'],
318312
port: 8000,
319313
livereload: false,

package.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@
1111
"es6-module-loader": "^0.9.2",
1212
"systemjs": "^0.9.1",
1313
"angular-benchpress": "^0.1.3",
14-
"gulp": "^3.8.8",
15-
"gulp-changed": "^1.0.0",
16-
"gulp-rename": "^1.2.0",
17-
"gulp-watch": "^1.0.3",
18-
"gulp-shell": "^0.2.10",
1914
"karma-cli": "^0.0.4",
2015
"karma": "^0.12.23",
2116
"karma-chrome-launcher": "^0.1.4",
@@ -29,7 +24,14 @@
2924
"gulp-rimraf": "^0.1.0",
3025
"run-sequence": "^0.3.6",
3126
"glob": "^4.0.6",
32-
"gulp-ejs": "^0.3.1",
3327
"traceur": "0.0.74"
28+
},
29+
"devDependencies": {
30+
"gulp": "^3.8.8",
31+
"gulp-changed": "^1.0.0",
32+
"gulp-rename": "^1.2.0",
33+
"gulp-shell": "^0.2.10",
34+
"gulp-load-plugins": "^0.7.1",
35+
"gulp-ejs": "^0.3.1"
3436
}
3537
}

0 commit comments

Comments
 (0)