diff --git a/dist b/dist index 5116d70a..93a3ff3d 160000 --- a/dist +++ b/dist @@ -1 +1 @@ -Subproject commit 5116d70adba8ebafa8a608fea4eb7ba301e345b5 +Subproject commit 93a3ff3d6e97793dcdd553442cddefd15fd7d992 diff --git a/gulpfile.helper.js b/gulpfile.helper.js index d494849e..745325a8 100644 --- a/gulpfile.helper.js +++ b/gulpfile.helper.js @@ -3,6 +3,7 @@ var $ = require('gulp-load-plugins')() var minimist = require('minimist') module.exports = function (gulp, helperOptions) { + var runSequence = require('run-sequence').use(gulp) var options = minimist(process.argv.slice(2), { string: ['modulename', 'export', 'name', 'testport', 'testfiles', 'regenerator'], default: { @@ -105,31 +106,35 @@ module.exports = function (gulp, helperOptions) { .pipe(gulp.dest('./')) }) - gulp.task('publish', ['test', 'updateSubmodule', 'bump', 'dist'], function () { - return gulp.src('./package.json', {read: false}) - .pipe($.prompt.confirm({ - message: 'Are you sure you want to publish this release?', - default: false - })) - .pipe($.shell([ - 'cp ./README.md ./dist/', - 'standard', - 'echo "Deploying version <%= getVersion(file.path) %>"', - 'git pull', - 'cd ./dist/ && git add -A', - 'cd ./dist/ && git commit -am "Deploy <%= getVersion(file.path) %>" -n', - 'cd ./dist/ && git push', - 'cd ./dist/ && git tag -a v<%= getVersion(file.path) %> -m "Release <%= getVersion(file.path) %>"', - 'cd ./dist/ && git push origin --tags', - 'git commit -am "Release <%= getVersion(file.path) %>" -n', - 'git push' - ], { - templateData: { - getVersion: function (s) { - return require(s).version + gulp.task('publish', function (cb) { + runSequence(['test', 'updateSubmodule', 'dist'], 'bump', function () { + return gulp.src('./package.json', {read: false}) + .pipe($.prompt.confirm({ + message: 'Are you sure you want to publish this release?', + default: false + })) + .pipe($.shell([ + 'cp ./README.md ./dist/', + 'standard', + 'echo "Deploying version <%= getVersion(file.path) %>"', + 'git pull', + 'cd ./dist/ && git add -A', + 'cd ./dist/ && git commit -am "Deploy <%= getVersion(file.path) %>" -n', + 'cd ./dist/ && git push', + 'cd ./dist/ && git tag -a v<%= getVersion(file.path) %> -m "Release <%= getVersion(file.path) %>"', + 'cd ./dist/ && git push origin --tags', + 'git commit -am "Release <%= getVersion(file.path) %>" -n', + 'git push', + 'echo Finished <%= callback() %>' + ], { + templateData: { + getVersion: function (s) { + return require(s).version + }, + callback: cb } - } - })) + })) + }) }) gulp.task('dev:node', ['test'], function () { diff --git a/package.json b/package.json index 990c3608..05d12ed9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "yjs", - "version": "0.6.32", + "version": "0.6.33", "description": "A framework for real-time p2p shared editing on arbitrary complex data types", "main": "y.js", "scripts": {