Skip to content

Commit

Permalink
Merge pull request #1741 from RCopeland/version-output
Browse files Browse the repository at this point in the history
update spark-react to get built with webpack, output version for vani…
  • Loading branch information
RCopeland authored Sep 13, 2019
2 parents cafcbc9 + 523982d commit 19121c4
Show file tree
Hide file tree
Showing 17 changed files with 16,680 additions and 6,800 deletions.
52 changes: 31 additions & 21 deletions gulp/angular/spark-angular/spark-angular.gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const runSequence = require('run-sequence');
const clean = require('gulp-clean');

// assumes previous run of setup-spark-packages
gulp.task('setup-spark-angular', (cb) => {
gulp.task('setup-spark-angular', cb => {
runSequence(
'link-spark-to-angular-dir',
'build-spark-angular',
Expand All @@ -14,29 +14,39 @@ gulp.task('setup-spark-angular', (cb) => {
);
});

gulp.task('build-spark-angular', (cb) => {
exec('cd src/angular/projects/spark-angular && ../../node_modules/.bin/ng build spark-angular', (err, stdout, stderr) => {
console.log(stdout);
console.log(stderr);
cb(err);
});
gulp.task('build-spark-angular', cb => {
exec(
'cd src/angular/projects/spark-angular && npm install && npm run build',
(err, stdout, stderr) => {
console.log(stdout);
console.log(stderr);
cb(err);
},
);
});

gulp.task('test-spark-angular', (cb) => {
exec('cd src/angular/projects/spark-angular && ../../node_modules/.bin/ng test spark-angular --watch=false', (err, stdout, stderr) => {
console.log(stdout);
console.log(stderr);
cb(err);
});
gulp.task('test-spark-angular', cb => {
exec(
'cd src/angular/projects/spark-angular && ../../node_modules/.bin/ng test spark-angular --watch=false',
(err, stdout, stderr) => {
console.log(stdout);
console.log(stderr);
cb(err);
},
);
});

gulp.task('clean-spark-angular', () => gulp.src(['src/angular/dist/spark-angular'], { read: false })
.pipe(clean()));
gulp.task('clean-spark-angular', () =>
gulp.src(['src/angular/dist/spark-angular'], { read: false }).pipe(clean()),
);

gulp.task('link-spark-angular', (cb) => {
exec('cd src/angular/dist/spark-angular && npm unlink && npm link', (err, stdout, stderr) => {
console.log(stdout);
console.log(stderr);
cb(err);
});
gulp.task('link-spark-angular', cb => {
exec(
'cd src/angular/dist/spark-angular && npm unlink && npm link',
(err, stdout, stderr) => {
console.log(stdout);
console.log(stderr);
cb(err);
},
);
});
Loading

0 comments on commit 19121c4

Please sign in to comment.