formatting json files in grunt build

sagiegurari · Jul 30, 2016 · e6eb250 · e6eb250
1 parent 4fefeef
commit e6eb250
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -108,7 +108,7 @@ See [contributing guide](.github/CONTRIBUTING.md)
 
 | Date        | Version | Description |
 | ----------- | ------- | ----------- |
-| 2016-07-30  | v0.0.86 | Maintenance |
+| 2016-07-30  | v0.0.87 | Maintenance |
 | 2016-06-14  | v0.0.78 | Published via NPM (in addition to bower) |
 | 2016-06-14  | v0.0.77 | Maintenance |
 | 2016-03-08  | v0.0.65 | Added webNotification.permissionGranted attribute |

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-web-notification",
-  "version": "0.0.86",
+  "version": "0.0.87",
   "description": "AngularJS service for displaying web notifications.",
   "authors": [
     "Sagie Gur-Ari <sagiegurari@gmail.com>"
@@ -16,8 +16,8 @@
   "ignore": [
     "node_modules",
     "bower_components",
-	".github",
-	"project",
+    ".github",
+    "project",
     "test",
     "tests",
     "example",

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,6 +1,6 @@
 | Date        | Version | Description |
 | ----------- | ------- | ----------- |
-| 2016-07-30  | v0.0.86 | Maintenance |
+| 2016-07-30  | v0.0.87 | Maintenance |
 | 2016-06-14  | v0.0.78 | Published via NPM (in addition to bower) |
 | 2016-06-14  | v0.0.77 | Maintenance |
 | 2016-03-08  | v0.0.65 | Added webNotification.permissionGranted attribute |

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-web-notification",
-  "version": "0.0.86",
+  "version": "0.0.87",
   "description": "AngularJS service for displaying web notifications.",
   "author": {
     "name": "Sagie Gur-Ari",

diff --git a/project/build/common.js b/project/build/common.js
@@ -11,7 +11,8 @@ module.exports = function (grunt) {
     ]);
 
     grunt.registerTask('format', 'Format Code.', [
-        'jsbeautifier:full'
+        'jsbeautifier:full',
+        'jsonlint:format'
     ]);
 
     grunt.registerTask('docs', 'Generate docs.', [

diff --git a/project/build/jsbeautifier.js b/project/build/jsbeautifier.js
@@ -8,7 +8,7 @@ module.exports.tasks = {
             },
             src: [
                 require('../../bower.json').main,
-                'project/build/**/*.js'
+                'project/**/*.js'
             ]
         }
     }

diff --git a/project/build/jsonlint.js b/project/build/jsonlint.js
@@ -4,8 +4,19 @@ module.exports.tasks = {
     jsonlint: {
         full: {
             src: [
-                '*.json'
+                '*.json',
+                'project/**/*.json'
             ]
+        },
+        format: {
+            src: [
+                '*.json',
+                'project/**/*.json'
+            ],
+            options: {
+                format: true,
+                indent: 2
+            }
         }
     }
 };