Merge branch 'master' of https://github.com/fredrikekelund/heatmap.js into fredrikekelund-master

Author: pa7

Gruntfile.js

@@ -58,28 +58,6 @@ module.exports = function(grunt) {
         files: packagejson.buildFiles,
         tasks: ['concat', 'jshint', 'uglify']
       }
-    },
-    copy: {
-      npmPreRelease: {
-        files: [
-          { flatten: true, expand: true, src: 'build/*', dest: 'dist/' },
-          { expand:true, src: 'build/*/**', dest: 'dist/' },
-          { expand:true, src: 'examples/*/**', dest: 'dist/' },
-          { expand: true, src: 'docs/*/**', dest: 'dist/' },
-          { expand: true, src: 'plugins/*', dest: 'dist/' },
-          { src: 'package.json', dest: 'dist/' },
-          { src: 'LICENSE', dest: 'dist/' },
-          { src: 'README.md', dest: 'dist/' }
-        ]
-      }
-    },
-    shell: {
-      npmRelease: {
-        command: [
-          'cd dist',
-          'npm publish'
-        ].join('&&')
-      }
     }
   });
 
@@ -88,11 +66,8 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-watch');
-  grunt.loadNpmTasks('grunt-contrib-copy');
-  grunt.loadNpmTasks('grunt-shell');
 
 
   // Default task.
   grunt.registerTask('default', ['concat', 'jshint', 'uglify', 'watch']);
-  grunt.registerTask('publishToNpm', ['concat', 'jshint', 'uglify', 'copy:npmPreRelease', 'shell:npmRelease']);
 };

package.json

@@ -1,18 +1,21 @@
 {
   "name": "heatmap.js",
-  "version": "2.0.2",
+  "version": "2.0.5",
   "description": "Dynamic JavaScript Heatmaps for the Web",
-  "homepage": "http://www.patrick-wied.at/static/heatmapjs/",
-  "main": "heatmap.min.js",
+  "homepage": "https://www.patrick-wied.at/static/heatmapjs/",
+  "author": {
+    "name": "Patrick Wied",
+    "email": "[email protected]",
+    "url": "https://www.patrick-wied.at/"
+  },
+  "main": "build/heatmap.js",
   "devDependencies": {
     "grunt": ">= 0.4.1",
     "coffee-script": ">= 1.6.3",
     "grunt-contrib-uglify": ">= 0.2.0",
     "grunt-contrib-concat": ">= 0.1.3",
     "grunt-contrib-watch": "0.2.0rc7",
-    "grunt-contrib-jshint": ">= 0.3.0",
-    "grunt-contrib-copy": ">= 0.7.0",
-    "grunt-shell": "^0.7.0"
+    "grunt-contrib-jshint": ">= 0.3.0"
   },
   "keywords": [
     "heatmap",
@@ -23,12 +26,21 @@
     "leaflet heatmap",
     "leaflet"
   ],
+  "files": [
+    "build",
+    "plugins",
+    "examples",
+    "docs",
+    "package.json",
+    "LICENSE",
+    "README.md"
+  ],
   "buildFiles": [
-    "src/config.js", 
-    "src/data.js", 
-    "src/renderer/canvas2d.js", 
-    "src/renderer.js", 
-    "src/util.js", 
+    "src/config.js",
+    "src/data.js",
+    "src/renderer/canvas2d.js",
+    "src/renderer.js",
+    "src/util.js",
     "src/core.js"
   ]
 }