diff --git a/dist b/dist index 4cb0f2b5b9293b521db173f01263e6f9d1a8e6d1..15a472df44c95844df894006919193186b80004d 160000 --- a/dist +++ b/dist @@ -1 +1 @@ -Subproject commit 4cb0f2b5b9293b521db173f01263e6f9d1a8e6d1 +Subproject commit 15a472df44c95844df894006919193186b80004d diff --git a/gulpfile.helper.js b/gulpfile.helper.js index f4f152435570dce5b50fef360388d6fbaa93718d..2e1ea71f8595e6f6680a8c0948741b3198784aba 100644 --- a/gulpfile.helper.js +++ b/gulpfile.helper.js @@ -121,13 +121,14 @@ module.exports = function (gulp, helperOptions) { gulp.task('updateSubmodule', function () { return gulp.src('./package.json', {read: false}) .pipe($.shell([ - 'git submodule update --init' + 'git submodule update --init', + 'cd dist && git pull origin dist' ])) }) gulp.task('bump', function () { var bumptype - return gulp.src(['./package.json', './dist/package.json', './dist/bower.json'], {base: '.'}) + return gulp.src(['./package.json', './bower.json', './dist/bower.json'], {base: '.'}) .pipe($.prompt.prompt({ type: 'checkbox', name: 'bump', @@ -145,14 +146,14 @@ module.exports = function (gulp, helperOptions) { gulp.task('publish', function (cb) { /* TODO: include 'test',*/ - runSequence(['updateSubmodule', 'dist'], 'bump', function () { + runSequence('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/', + // 'cp README.md dist', 'standard', 'echo "Deploying version <%= getVersion(file.path) %>"', 'git pull', @@ -163,6 +164,7 @@ module.exports = function (gulp, helperOptions) { 'cd ./dist/ && git push origin --tags', 'git commit -am "Release <%= getVersion(file.path) %>" -n', 'git push', + 'npm publish', 'echo Finished <%= callback() %>' ], { templateData: { diff --git a/package.json b/package.json index e92656562571d1161b470a19aff9b2946cf34f9d..25182b3117b5323cdfb87c2a08e888f33de6590d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "yjs", - "version": "0.7.3", + "version": "0.7.6", "description": "A framework for real-time p2p shared editing on arbitrary complex data types", "main": "./src/y.js", "scripts": { @@ -72,5 +72,8 @@ "standard": "^5.2.2", "vinyl-buffer": "^1.0.0", "vinyl-source-stream": "^1.1.0" + }, + "dependencies": { + "babel-eslint": "^5.0.0-beta6" } }