Update package.json and gruntfile.js

pierresh · Jan 17, 2018 · 30c186d · 30c186d
1 parent 0ddf61f
commit 30c186d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 41 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -57,34 +57,8 @@ module.exports = function (grunt) {
           'morris.min.js': 'morris.js'
         }
       }
-    },
-    mocha: {
-      index: ['spec/specs.html'],
-      options: {run: true}
-    },
-    watch: {
-      all: {
-        files: ['lib/**/*.coffee', 'spec/lib/**/*.coffee', 'spec/support/**/*.coffee', 'less/**/*.less'],
-        tasks: 'default'
-      },
-      dev: {
-        files:  'lib/*.coffee' ,
-        tasks: ['concat:build/morris.coffee', 'coffee:lib']
-      }
-    },
-    shell: {
-      visual_spec: {
-        command: './run.sh',
-        options: {
-          stdout: true,
-          failOnError: true,
-          execOptions: {
-            cwd: 'spec/viz'
-          }
-        }
-      }
     }
   });
 
-  grunt.registerTask('default', ['concat', 'coffee', 'less', 'uglify', 'mocha', 'shell:visual_spec']);
+  grunt.registerTask('default', ['concat', 'coffee', 'less', 'uglify']);
 };
diff --git a/package.json b/package.json
@@ -1,20 +1,20 @@
 {
-  "name": "morris.js",
+  "name": "morris.js06",
   "version": "0.6",
-  "homepage": "http://morrisjs.github.com/morris.js",
+  "homepage": "http://pierresh.github.com/morris.js",
   "license": "BSD-2-Clause",
-  "description": "Easy, pretty charts",
+  "description": "An improved work of the great plugin morrisjs with many new features and jQuery dependencies removed",
   "author": {
     "name": "Olly Smith",
     "email": "[email protected]"
   },
   "main": "morris.min.js",
   "repository": {
     "type": "git",
-    "url": "git://github.com/morrisjs/morris.js.git"
+    "url": "git://github.com/pierresh/morris.js.git"
   },
   "bugs": {
-    "url": "https://github.com/morrisjs/morris.js/issues"
+    "url": "https://github.com/pierresh/morris.js/issues"
   },
   "devDependencies": {
     "matchdep": "~0.1.2",

diff --git a/spec/specs.html b/spec/specs.html
@@ -2,21 +2,19 @@
 <head>
   <meta charset="utf-8">
   <title>morris.js tests</title>
-  <link rel="stylesheet" href="../bower_components/mocha/mocha.css" type="text/css" media="screen" />
+  <link rel="stylesheet" href="../node_modules/mocha/mocha.css" type="text/css" media="screen" />
   <link rel="stylesheet" href="../morris.css" type="text/css" media="screen" />
   <!-- jQuery packaging changed for 2.1.0, so try to load both paths, one will work. -->
-  <script src="../bower_components/jquery/dist/jquery.js"></script>
-  <script src="../bower_components/jquery/jquery.js"></script>
-  <script type="text/javascript" src="../bower_components/raphael/raphael-min.js"></script>
+  <script src="http://localhost/morris.js/examples/lib/jquery.min.js"></script>
+  <script type="text/javascript" src="http://localhost/morris.js/examples/lib/raphael-min.js"></script>
 </head>
 <body>
   <div id="mocha"></div>
 
-  <script type="text/javascript" src="../bower_components/mocha/mocha.js"></script>
-  <script type="text/javascript" src="../bower_components/chai/chai.js"></script>
-  <script type="text/javascript" src="../bower_components/chai-jquery/chai-jquery.js"></script>
-  <script type="text/javascript" src="../bower_components/sinon/index.js"></script>
-  <script type="text/javascript" src="../bower_components/sinon-chai/lib/sinon-chai.js"></script>
+  <script type="text/javascript" src="../node_modules/mocha/mocha.js"></script>
+  <script type="text/javascript" src="../node_modules/chai/chai.js"></script>
+  <script type="text/javascript" src="../node_modules/chai-jquery/chai-jquery.js"></script>
+
   <script>
     mocha.setup('bdd');
     should = chai.should();