From 2b528bad97ce86ab500094699632d00f3c4c02a1 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 23 Mar 2018 13:04:59 -0400 Subject: [PATCH] version json file on dist --- gulpfile.js | 9 ++- package-lock.json | 152 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 1 + src/manifest.json | 2 +- src/version.json | 3 + 5 files changed, 165 insertions(+), 2 deletions(-) create mode 100644 src/version.json diff --git a/gulpfile.js b/gulpfile.js index 4bba2a6719c..a3dfa9616b3 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -12,6 +12,7 @@ var gulp = require('gulp'), ngAnnotate = require('gulp-ng-annotate'), preprocess = require('gulp-preprocess'), runSequence = require('run-sequence'), + jeditor = require("gulp-json-editor"), merge = require('merge-stream'), ngConfig = require('gulp-ng-config'), settings = require('./settings.json'), @@ -448,10 +449,16 @@ gulp.task('dist:preprocess', function () { .pipe(gulp.dest('.')); }); +gulp.task('dist:version', function () { + gulp.src(paths.webroot + 'version.json').pipe(jeditor({ + 'version': project.version + })).pipe(gulp.dest(paths.dist)); +}); + gulp.task('dist', ['build'], function (cb) { return runSequence( 'dist:clean', - ['dist:move', 'dist:css', 'dist:js:app', 'dist:js:lib', 'dist:js:fallback', 'dist:js:u2f'], + ['dist:move', 'dist:css', 'dist:js:app', 'dist:js:lib', 'dist:js:fallback', 'dist:js:u2f', 'dist:version'], 'dist:preprocess', cb); }); diff --git a/package-lock.json b/package-lock.json index 907e4309e63..be30f088320 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,12 @@ "through": "https://registry.npmjs.org/through/-/through-2.3.8.tgz" } }, + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "dev": true + }, "accepts": { "version": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz", "integrity": "sha1-5fHzkoxtlf2WVYw27D2dDeSm7Oo=", @@ -333,6 +339,15 @@ "integrity": "sha1-rzLbDQqnBNBYNqzqcvBp8JEbelE=", "dev": true }, + "ansi-colors": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", + "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", + "dev": true, + "requires": { + "ansi-wrap": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz" + } + }, "ansi-gray": { "version": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=", @@ -713,6 +728,12 @@ "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", "dev": true }, + "bluebird": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", + "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", + "dev": true + }, "bn.js": { "version": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=", @@ -1462,6 +1483,16 @@ "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz" } }, + "config-chain": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz", + "integrity": "sha1-q6CXR9++TD5w52am5BWG4YWfxvI=", + "dev": true, + "requires": { + "ini": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "proto-list": "1.2.4" + } + }, "connect": { "version": "https://registry.npmjs.org/connect/-/connect-3.6.5.tgz", "integrity": "sha1-+43ee6B2OHfQ7J352sC0tA5yx9o=", @@ -1761,6 +1792,12 @@ "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", "dev": true }, + "deepmerge": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.1.0.tgz", + "integrity": "sha512-Q89Z26KAfA3lpPGhbF6XMfYAm3jIV3avViy6KOJ2JLzFbeWHOvPQUu5aSJIWXap3gDZC2y1eF5HXEPI2wGqgvw==", + "dev": true + }, "defaults": { "version": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", @@ -1844,6 +1881,12 @@ "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=", "dev": true }, + "detect-indent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz", + "integrity": "sha1-OHHMCmoALow+Wzz38zYmRnXwa50=", + "dev": true + }, "detective": { "version": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz", "integrity": "sha1-DspzFDOEQv67bWXaVMELscgrJG4=", @@ -2002,6 +2045,42 @@ "jsbn": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz" } }, + "editorconfig": { + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz", + "integrity": "sha512-WkjsUNVCu+ITKDj73QDvi0trvpdDWdkDyHybDGSXPfekLCqwmpD7CP7iPbvBgosNuLcI96XTDwNa75JyFl7tEQ==", + "dev": true, + "requires": { + "bluebird": "3.5.1", + "commander": "2.15.1", + "lru-cache": "3.2.0", + "semver": "5.5.0", + "sigmund": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" + }, + "dependencies": { + "commander": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", + "dev": true + }, + "lru-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz", + "integrity": "sha1-cXibO39Tmb7IVl3aOKow0qCX7+4=", + "dev": true, + "requires": { + "pseudomap": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz" + } + }, + "semver": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", + "dev": true + } + } + }, "ee-first": { "version": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", @@ -4524,6 +4603,19 @@ "through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz" } }, + "gulp-json-editor": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/gulp-json-editor/-/gulp-json-editor-2.2.2.tgz", + "integrity": "sha512-4Om5cpjmmB6Nj2OlpRvh8TbMgIWz/OivYpvGR+iki8iQs45iuNUrvFi/ao+niQIe7sIJLWuoMkJmc3rCVvuS3Q==", + "dev": true, + "requires": { + "deepmerge": "2.1.0", + "detect-indent": "5.0.0", + "js-beautify": "1.7.5", + "plugin-error": "1.0.1", + "through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz" + } + }, "gulp-less": { "version": "https://registry.npmjs.org/gulp-less/-/gulp-less-3.3.2.tgz", "integrity": "sha1-9mNq3MZhUKiQJxn6WZY/x/hipJo=", @@ -5298,6 +5390,18 @@ "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c=", "dev": true }, + "js-beautify": { + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.5.tgz", + "integrity": "sha512-9OhfAqGOrD7hoQBLJMTA+BKuKmoEtTJXzZ7WDF/9gvjtey1koVLuZqIY6c51aPDjbNdNtIXAkiWKVhziawE9Og==", + "dev": true, + "requires": { + "config-chain": "1.1.11", + "editorconfig": "0.13.3", + "mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "nopt": "3.0.6" + } + }, "js-yaml": { "version": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", "integrity": "sha1-LnhEFka9RoLpY/IrbpKCPDCcYtw=", @@ -6438,6 +6542,15 @@ } } }, + "nopt": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "dev": true, + "requires": { + "abbrev": "1.1.1" + } + }, "normalize-package-data": { "version": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=", @@ -6947,6 +7060,39 @@ "pinkie": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz" } }, + "plugin-error": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", + "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==", + "dev": true, + "requires": { + "ansi-colors": "1.1.0", + "arr-diff": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "arr-union": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "extend-shallow": "3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", + "is-extendable": "1.0.1" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz" + } + } + } + }, "posix-character-classes": { "version": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", @@ -6998,6 +7144,12 @@ "asap": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz" } }, + "proto-list": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", + "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=", + "dev": true + }, "prr": { "version": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", diff --git a/package.json b/package.json index a61988513af..0980664b838 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "gulp-ng-annotate": "2.0.0", "gulp-ng-config": "1.5.0", "gulp-connect": "5.0.0", + "gulp-json-editor": "2.2.2", "jshint": "2.9.5", "gulp-jshint": "2.0.4", "rimraf": "2.6.2", diff --git a/src/manifest.json b/src/manifest.json index f8a8d899bca..e09dc0ca199 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,5 +1,5 @@ { - "name": "bitwarden vault", + "name": "Bitwarden Vault", "icons": [ { "src": "images/icons/android-chrome-192x192.png", diff --git a/src/version.json b/src/version.json new file mode 100644 index 00000000000..d1992e209e1 --- /dev/null +++ b/src/version.json @@ -0,0 +1,3 @@ +{ + "version": "0.0.0" +}