From ff6e54b71541831157bcc315ac57f11d8a2cd89a Mon Sep 17 00:00:00 2001 From: jos Date: Sat, 31 May 2014 21:01:30 +0200 Subject: [PATCH] Added zip task --- .gitignore | 1 + .npmignore | 1 + HISTORY.md | 9 +++++---- NOTICE | 6 +++--- README.md | 5 +++-- gulpfile.js | 34 +++++++--------------------------- 6 files changed, 20 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 3567b39..133def6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ build downloads node_modules +*.zip \ No newline at end of file diff --git a/.npmignore b/.npmignore index c0597e8..3244529 100644 --- a/.npmignore +++ b/.npmignore @@ -12,3 +12,4 @@ component.json Jakefile.js .npmignore .gitignore +*.zip \ No newline at end of file diff --git a/HISTORY.md b/HISTORY.md index e45f2e9..49a8291 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,13 +1,14 @@ -# JSON Editor Online - History +# JSON Editor - History -http://jsoneditoronline.org +https://github.com/josdejong/jsoneditor -## not yet released, version 3.0.0 +## 2014-05-31, version 3.0.0 +- Large code reorganization. - Editor must be loaded as `new JSONEditor(...)` instead of `new jsoneditor.JSONEditor(...)`. -- Large code reorganization. +- Web application has been moved to another project. ## 2014-01-03, version 2.3.6 diff --git a/NOTICE b/NOTICE index 53ca4b0..d8a1e43 100644 --- a/NOTICE +++ b/NOTICE @@ -1,7 +1,7 @@ -JSON Editor Online -http://jsoneditoronline.org +JSON Editor +https://github.com/josdejong/jsoneditor -Copyright (C) 2011-2013 Jos de Jong +Copyright (C) 2011-2014 Jos de Jong Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/README.md b/README.md index 670bf74..9b9d3b7 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,11 @@ -# JSON Editor Online +# JSON Editor +https://github.com/josdejong/jsoneditor http://jsoneditoronline.org/ ### Description -JSON Editor Online is a web-based tool to view, edit, and format JSON. +JSON Editor is a web-based tool to view, edit, and format JSON. It has various modes such as a tree editor, a code editor, and a plain text editor. diff --git a/gulpfile.js b/gulpfile.js index d51e735..f44095c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -9,6 +9,7 @@ var fs = require('fs'), merge = require('merge-stream'), mkdirp = require('mkdirp'), webpack = require('webpack'), + archiver = require('archiver'), uglify = require('uglify-js'); var ENTRY = './src/js/JSONEditor.js', @@ -161,33 +162,12 @@ gulp.task('asset-jsonlint', ['asset-clean'], function (done) { gulp.task('build-assets', ['asset-clean', 'asset-ace', 'asset-jsonlint'], function () {}); -// TODO: create zip file? -//gulp.task('zip', ['bundle', 'minify'], function () { -// var pkg = 'jsoneditor-' + require('./package.json').version; -// var file = BUILD + pkg + '.zip'; -// -// var zip = require('gulp-zip'); -// -// gulp.task('default', function () { -// gulp.src([ -// 'README.md', -// 'NOTICE', -// 'LICENSE', -// 'HISTORY.md', -// JSONEDITOR_JS, -// JSONEDITOR_CSS, -// JSONEDITOR_MIN_JS, -// JSONEDITOR_MAP_JS, -// JSONEDITOR_MIN_CSS, -// 'img/*.*', -// 'asset/**/*.*', -// 'docs/**/*.*', -// 'examples/**/*.*' -// ]) -// .pipe(zip(file)) -// .pipe(gulp.dest('.')); -// }); -//}); +// TODO: zip file using archiver +var pkg = 'jsoneditor-' + require('./package.json').version + '.zip'; +gulp.task('zip', shell.task([ + 'zip ' + pkg + ' ' + + 'README.md NOTICE LICENSE HISTORY.md jsoneditor.js jsoneditor.css jsoneditor.min.js jsoneditor.min.css jsoneditor.map img asset docs examples -r ' +])); // The default task (called when you run `gulp`) gulp.task('default', ['bundle', 'minify']);