Skip to content

Commit fd570dc

Browse files
committed
Simplify gulp tasks
1 parent 8d152b5 commit fd570dc

File tree

3 files changed

+11
-77
lines changed

3 files changed

+11
-77
lines changed

gulpfile.js

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,15 @@ if (task === 'build' || cli.analyze) {
1717
}
1818

1919
gulp.task('clean', gulp.parallel(cleanNodeScripts, cleanViewerScripts));
20-
gulp.task('build', gulp.series('clean', compileNodeScripts(), compileViewerScripts));
20+
gulp.task('build', gulp.series('clean', compileNodeScripts, compileViewerScripts));
2121
gulp.task('watch', gulp.series('build', watch));
2222
gulp.task('default', gulp.task('watch'));
2323

2424
function watch() {
25-
gulp.watch(NODE_SRC, gulp.series(cleanNodeScripts, compileNodeScripts(true)));
25+
gulp
26+
.watch(NODE_SRC, gulp.series(cleanNodeScripts, compileNodeScripts))
27+
// TODO: replace with `emitErrors: false` option after https://github.com/gulpjs/glob-watcher/pull/34 will be merged
28+
.on('error', () => {});
2629
}
2730

2831
function cleanViewerScripts() {
@@ -35,18 +38,13 @@ function cleanNodeScripts() {
3538
return del(NODE_DEST);
3639
}
3740

38-
function compileNodeScripts(justLogErrors) {
39-
return function compileNodeScripts() {
40-
const babel = require('gulp-babel');
41-
const plumber = require('gulp-plumber');
42-
const noop = require('gulp-noop');
41+
function compileNodeScripts() {
42+
const babel = require('gulp-babel');
4343

44-
return gulp
45-
.src(NODE_SRC)
46-
.pipe(justLogErrors ? plumber() : noop())
47-
.pipe(babel())
48-
.pipe(gulp.dest(NODE_DEST));
49-
};
44+
return gulp
45+
.src(NODE_SRC)
46+
.pipe(babel())
47+
.pipe(gulp.dest(NODE_DEST));
5048
}
5149

5250
function compileViewerScripts() {

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@
6666
"exports-loader": "0.6.4",
6767
"gulp": "4.0.0",
6868
"gulp-babel": "7.0.1",
69-
"gulp-noop": "1.0.0",
70-
"gulp-plumber": "1.2.0",
7169
"mocha": "5.0.0",
7270
"nightmare": "2.10.0",
7371
"preact": "8.2.7",

yarn.lock

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,6 @@ ansi-colors@^1.0.1:
131131
dependencies:
132132
ansi-wrap "^0.1.0"
133133

134-
ansi-cyan@^0.1.1:
135-
version "0.1.1"
136-
resolved "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873"
137-
dependencies:
138-
ansi-wrap "0.1.0"
139-
140134
ansi-escapes@^3.0.0:
141135
version "3.0.0"
142136
resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92"
@@ -151,12 +145,6 @@ [email protected]:
151145
version "0.0.7"
152146
resolved "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
153147

154-
ansi-red@^0.1.1:
155-
version "0.1.1"
156-
resolved "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c"
157-
dependencies:
158-
ansi-wrap "0.1.0"
159-
160148
ansi-regex@^2.0.0:
161149
version "2.1.1"
162150
resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -220,13 +208,6 @@ argparse@^1.0.7:
220208
dependencies:
221209
sprintf-js "~1.0.2"
222210

223-
arr-diff@^1.0.1:
224-
version "1.1.0"
225-
resolved "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a"
226-
dependencies:
227-
arr-flatten "^1.0.1"
228-
array-slice "^0.2.3"
229-
230211
arr-diff@^2.0.0:
231212
version "2.0.0"
232213
resolved "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
@@ -253,10 +234,6 @@ arr-map@^2.0.0, arr-map@^2.0.2:
253234
dependencies:
254235
make-iterator "^1.0.0"
255236

256-
arr-union@^2.0.1:
257-
version "2.1.0"
258-
resolved "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d"
259-
260237
arr-union@^3.1.0:
261238
version "3.1.0"
262239
resolved "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
@@ -297,10 +274,6 @@ array-last@^1.1.1:
297274
dependencies:
298275
is-number "^4.0.0"
299276

300-
array-slice@^0.2.3:
301-
version "0.2.3"
302-
resolved "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
303-
304277
array-slice@^1.0.0:
305278
version "1.1.0"
306279
resolved "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
@@ -2437,12 +2410,6 @@ express@^4.16.2:
24372410
utils-merge "1.0.1"
24382411
vary "~1.1.2"
24392412

2440-
extend-shallow@^1.1.2:
2441-
version "1.1.4"
2442-
resolved "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071"
2443-
dependencies:
2444-
kind-of "^1.1.0"
2445-
24462413
extend-shallow@^2.0.1:
24472414
version "2.0.1"
24482415
resolved "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -2978,21 +2945,6 @@ gulp-cli@^2.0.0:
29782945
v8flags "^3.0.1"
29792946
yargs "^7.1.0"
29802947

2981-
2982-
version "1.0.0"
2983-
resolved "https://registry.npmjs.org/gulp-noop/-/gulp-noop-1.0.0.tgz#082b1142493512ce5c5ab2e1ec3e7bb48b575c79"
2984-
dependencies:
2985-
through2 "^2.0.1"
2986-
2987-
2988-
version "1.2.0"
2989-
resolved "https://registry.npmjs.org/gulp-plumber/-/gulp-plumber-1.2.0.tgz#18ea03912c9ee483f8a5499973b5954cd90f6ad8"
2990-
dependencies:
2991-
chalk "^1.1.3"
2992-
fancy-log "^1.3.2"
2993-
plugin-error "^0.1.2"
2994-
through2 "^2.0.3"
2995-
29962948
29972949
version "4.0.0"
29982950
resolved "https://registry.npmjs.org/gulp/-/gulp-4.0.0.tgz#95766c601dade4a77ed3e7b2b6dc03881b596366"
@@ -3761,10 +3713,6 @@ killable@^1.0.0:
37613713
version "1.0.0"
37623714
resolved "https://registry.npmjs.org/killable/-/killable-1.0.0.tgz#da8b84bd47de5395878f95d64d02f2449fe05e6b"
37633715

3764-
kind-of@^1.1.0:
3765-
version "1.1.0"
3766-
resolved "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44"
3767-
37683716
kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0:
37693717
version "3.2.2"
37703718
resolved "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -4733,16 +4681,6 @@ pkg-dir@^2.0.0:
47334681
dependencies:
47344682
find-up "^2.1.0"
47354683

4736-
plugin-error@^0.1.2:
4737-
version "0.1.2"
4738-
resolved "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace"
4739-
dependencies:
4740-
ansi-cyan "^0.1.1"
4741-
ansi-red "^0.1.1"
4742-
arr-diff "^1.0.1"
4743-
arr-union "^2.0.1"
4744-
extend-shallow "^1.1.2"
4745-
47464684
plugin-error@^1.0.1:
47474685
version "1.0.1"
47484686
resolved "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"

0 commit comments

Comments
 (0)