Skip to content

Commit ccaa313

Browse files
Merge branch 'master' into chrome-ai-rtd-module
2 parents 6f1b64c + fd7ddc4 commit ccaa313

File tree

3 files changed

+9
-371
lines changed

3 files changed

+9
-371
lines changed

gulpfile.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,21 @@ const standaloneDebuggingConfig = require('./webpack.debugging.js');
1616
var helpers = require('./gulpHelpers.js');
1717
var concat = require('gulp-concat');
1818
var replace = require('gulp-replace');
19-
var shell = require('gulp-shell');
19+
const execaCmd = require('execa');
2020
var gulpif = require('gulp-if');
2121
var through = require('through2');
2222
var fs = require('fs');
2323
var jsEscape = require('gulp-js-escape');
2424
const path = require('path');
25-
const execa = require('execa');
2625
const {minify} = require('terser');
2726
const Vinyl = require('vinyl');
2827
const wrap = require('gulp-wrap');
2928
const rename = require('gulp-rename');
3029

30+
function execaTask(cmd) {
31+
return () => execaCmd.shell(cmd, {stdio: 'inherit'});
32+
}
33+
3134

3235
var prebid = require('./package.json');
3336
var port = 9999;
@@ -86,7 +89,7 @@ function lint(done) {
8689
if (!(typeof argv.lintWarnings === 'boolean' ? argv.lintWarnings : true)) {
8790
args.push('--quiet')
8891
}
89-
return shell.task(args.join(' '))().then(() => {
92+
return execaTask(args.join(' '))().then(() => {
9093
done();
9194
}, (err) => {
9295
done(err);
@@ -407,7 +410,7 @@ function runWebdriver({file}) {
407410
wdioConf
408411
];
409412
}
410-
return execa(wdioCmd, wdioOpts, {
413+
return execaCmd(wdioCmd, wdioOpts, {
411414
stdio: 'inherit',
412415
env: Object.assign({}, process.env, {FORCE_COLOR: '1'})
413416
});
@@ -450,9 +453,7 @@ function testCoverage(done) {
450453

451454
function coveralls() { // 2nd arg is a dependency: 'test' must be finished
452455
// first send results of istanbul's test coverage to coveralls.io.
453-
return gulp.src('gulpfile.js', { read: false }) // You have to give it a file, but you don't
454-
// have to read it.
455-
.pipe(shell('cat build/coverage/lcov.info | node_modules/coveralls/bin/coveralls.js'));
456+
return execaTask('cat build/coverage/lcov.info | node_modules/coveralls/bin/coveralls.js')();
456457
}
457458

458459
// This task creates postbid.js. Postbid setup is different from prebid.js
@@ -553,7 +554,7 @@ gulp.task(viewCoverage);
553554
gulp.task('coveralls', gulp.series('test-coverage', coveralls));
554555

555556
// npm will by default use .gitignore, so create an .npmignore that is a copy of it except it includes "dist"
556-
gulp.task('setup-npmignore', shell.task("sed 's/^\\/\\?dist\\/\\?$//g;w .npmignore' .gitignore", {quiet: true}));
557+
gulp.task('setup-npmignore', execaTask("sed 's/^\\/\\?dist\\/\\?$//g;w .npmignore' .gitignore"));
557558
gulp.task('build', gulp.series(clean, 'build-bundle-prod', updateCreativeExample, setupDist));
558559
gulp.task('build-release', gulp.series('build', 'setup-npmignore'));
559560
gulp.task('build-postbid', gulp.series(escapePostbidConfig, buildPostbid));

0 commit comments

Comments
 (0)