Merge branch 'meteor-integration' of https://github.com/MeteorPackagi…

…ng/nvd3 into pull-request-782

Conflicts:
	GruntFile.js

GruntFile.js

@@ -37,6 +37,18 @@ module.exports = function(grunt) {
                 }
             }
         },
+        replace: {
+            version: {
+                src: [
+                    'package.js'
+                ],
+                overwrite: true,
+                replacements: [{
+                    from: /(version?\s?=?\:?\s\')([\d\.]*)\'/gi,
+                    to: '$1' + _pkg.version + "'"
+                }]
+            }
+        },
         jshint: {
             foo: {
                 src: "src/**/*.js"
@@ -108,9 +120,10 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-contrib-cssmin');
     grunt.loadNpmTasks('grunt-karma');
+    grunt.loadNpmTasks('grunt-text-replace');
 
     grunt.registerTask('default', ['concat','copy','karma:unit']);
-    grunt.registerTask('production', ['concat', 'uglify', 'copy', 'cssmin']);
+    grunt.registerTask('production', ['concat', 'uglify', 'copy', 'cssmin', 'replace']);
     grunt.registerTask('release', ['production']);
     grunt.registerTask('lint', ['jshint']);
 };

package.js

@@ -0,0 +1,17 @@
+// Package metadata for Meteor.js full stack web framework
+// This file is defined in Meteor documentation at http://docs.meteor.com/#/full/packagejs
+// and used by Meteor https://www.meteor.com/ and its package repository Atmosphere https://atmospherejs.com
+
+Package.describe({
+    "name": 'nvd3:nvd3',
+    summary: 'Nvd3.org charts.',
+    version: '1.7.1',
+    git: "https://github.com/novus/nvd3.git"
+});
+Package.on_use(function (api) {
+    api.versionsFrom("[email protected]");
+    api.use('d3js:[email protected]', 'client');
+    api.add_files('build/nv.d3.js', 'client');
+    api.add_files('build/nv.d3.css', 'client');
+    api.export("nv");
+});

package.json

@@ -26,6 +26,7 @@
     "grunt-contrib-jshint": "^0.11.0",
     "grunt-contrib-uglify": "~0.2.0",
     "grunt-contrib-watch": "~0.3.1",
+    "grunt-text-replace": "^0.4.0",
     "grunt-karma": "^0.9.0",
     "karma": "^0.12.23",
     "karma-chrome-launcher": "^0.1.4",