Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove run-sequence; fix ordering of gulp tasks #822

Merged
merged 1 commit into from
Dec 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions packages/web-component-tester/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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',
Expand All @@ -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()};
Expand Down
1 change: 0 additions & 1 deletion packages/web-component-tester/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down