Merge pull request #822 from Polymer/fix-wct-gulpfile

Remove run-sequence; fix ordering of gulp tasks
Polymer · Dec 19, 2018 · c3fe7c4 · c3fe7c4
2 parents deb9473 + 4fb96f3
commit c3fe7c4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/packages/web-component-tester/gulpfile.js b/packages/web-component-tester/gulpfile.js
@@ -21,7 +21,6 @@ const ts = require('gulp-typescript');
 const bower = require('bower');
 const path = require('path');
 const rollup = require('rollup');
-const runSequence = require('run-sequence');
 const typescript = require('typescript');
 
 const mochaConfig = {
@@ -89,15 +88,6 @@ gulp.task('build:typescript-browser', function() {
       .js.pipe(gulp.dest('./browser/'));
 });
 
-gulp.task('test', function() {
-  return runSequence(
-      'build:typescript-server', 'lint', 'test:unit', 'test:integration');
-});
-
-gulp.task('build-all', () => {
-  return runSequence('clean', 'lint', 'build');
-});
-
 // Specific tasks
 
 gulp.task(
@@ -206,8 +196,6 @@ gulp.task(
               .pipe(tslint())
               .pipe(tslint.report({formatter: 'verbose'})));
 
-gulp.task('default', gulp.series(['test']));
-
 gulp.task('build', gulp.series([
   'build:typescript-server',
   'build:browser',
@@ -216,13 +204,29 @@ gulp.task('build', gulp.series([
 
 gulp.task('lint', gulp.series(['tslint', 'depcheck']));
 
-gulp.task('prepublish', function() {
+gulp.task('test', gulp.series([
+  'build:typescript-server',
+  'lint',
+  'test:unit',
+  'test:integration'
+]));
+
+gulp.task('build-all', gulp.series([
+  'clean',
+  'lint',
+  'build'
+]));
+
+gulp.task('default', gulp.series(['test']));
+
+gulp.task('prepublish', gulp.series([
   // We can't run the integration tests here because on travis we may not
   // be running with an x instance when we do `npm install`. We can change
   // this to just `test` from `test:unit` once all supported npm versions
   // no longer run `prepublish` on install.
-  return runSequence('build-all', 'test:unit');
-});
+  'build-all',
+  'test:unit'
+]));
 
 function commonDepCheck(options) {
   const defaultOptions = {stickyDeps: new Set()};

diff --git a/packages/web-component-tester/package.json b/packages/web-component-tester/package.json
@@ -113,7 +113,6 @@
     "gulp-typescript": "^3.1.2",
     "rimraf": "^2.5.4",
     "rollup": "^0.25.1",
-    "run-sequence": "^1.0.1",
     "source-map-support": "^0.5.4",
     "watch": "^0.18.0",
     "wct-local": "^2.1.1",