From 6d7012f2602ecf637c1ffa3d0b51b35829a38955 Mon Sep 17 00:00:00 2001 From: pointbiz Date: Mon, 5 Jan 2015 19:09:03 -0400 Subject: [PATCH] update grunt build process --- Gruntfile.js | 19 +++++++++++++++++-- bitaddress.org.html | 2 +- package.json | 14 ++++++++++---- src/bitaddress-ui.html | 2 +- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 7e742ae..bdd0a92 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,3 +1,5 @@ +var packageObject = require('./package.json'); + module.exports = function (grunt) { // Project configuration. grunt.initConfig({ @@ -39,13 +41,26 @@ module.exports = function (grunt) { { token: "//ninja.detailwallet.js", file: "./src/ninja.detailwallet.js" }, { token: "//qrcode.js", file: "./src/qrcode.js" }, { token: "//securerandom.js", file: "./src/securerandom.js" }, - { token: "//main.css", file: "./src/main.css" } + { token: "//main.css", file: "./src/main.css" }, + { token: "//version", string: packageObject.version } ] } + }, + + lineending: { // Task + dist: { // Target + options: { // Target options + eol: 'lf' + }, + files: { // Files to process + './bitaddress.org.html': ['./bitaddress.org.html'] + } + } } }); grunt.file.defaultEncoding = 'utf-8'; grunt.loadNpmTasks("grunt-combine"); - grunt.registerTask("default", ["combine:single"]); + grunt.loadNpmTasks('grunt-lineending'); + grunt.registerTask("default", ["combine:single", "lineending"]); }; diff --git a/bitaddress.org.html b/bitaddress.org.html index ff044d4..f0b2ec0 100644 --- a/bitaddress.org.html +++ b/bitaddress.org.html @@ -6879,7 +6879,7 @@ body, html { height: 99%; }
- Version History (v2.9.5) + Version History (2.9.6) (PGP) 527B 5C82 B1F6 B2DB 72A0
ECBF 8749 7B91 6397 4F5A
diff --git a/package.json b/package.json index 0380d80..d2de52e 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,20 @@ { "name": "bitaddress.org", - "version": "2.9.5", - "sha1sum": "49713367a1fa3f9ed189702064fd7cc5c3584699", + "version": "2.9.6", + "sha1sum": "b392e9bcc432b1c246317378f90c84544e5401d5", + "sha256sum": "c613440db6af79ceda44e98affbc9d4cc3914c2d39b304d5bacf13beab039e82", "description": "Open Source JavaScript Client-Side Bitcoin Wallet Generator", "main": "Gruntfile.js", "dependencies": { "grunt": "~0.4.1", - "grunt-combine": "~0.8.3" + "grunt-combine": "~0.8.3", + "grunt-lineending": "~0.2.4" + }, + "devDependencies": { + "grunt": "~0.4.1", + "grunt-combine": "~0.8.3", + "grunt-lineending": "~0.2.4" }, - "devDependencies": {}, "scripts": { "test": "" }, diff --git a/src/bitaddress-ui.html b/src/bitaddress-ui.html index fdda10f..b9b9f17 100644 --- a/src/bitaddress-ui.html +++ b/src/bitaddress-ui.html @@ -465,7 +465,7 @@
- Version History (v2.9.5) + Version History (//version) (PGP) 527B 5C82 B1F6 B2DB 72A0
ECBF 8749 7B91 6397 4F5A