Add license field to package definition(s).

blueimp · blueimp · commit 8e38f6913c54 · 2015-07-24T18:35:23.000+02:00
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -35,20 +35,6 @@ module.exports = function (grunt) {
                 src: ['test/test.js']
             }
         },
-        mocha: {
-            all: {
-                src: ['test/index.html'],
-                options: {
-                    run: true,
-                    bail: true,
-                    log: true,
-                    reporter: 'Spec'
-                },
-                mocha: {
-                    ignoreLeaks: false
-                }
-            }
-        },
         uglify: {
             production: {
                 src: [
@@ -61,11 +47,10 @@ module.exports = function (grunt) {
 
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-simple-mocha');
-    grunt.loadNpmTasks('grunt-mocha');
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-bump-build-git');
 
-    grunt.registerTask('test', ['jshint', 'simplemocha', 'mocha']);
+    grunt.registerTask('test', ['jshint', 'simplemocha']);
     grunt.registerTask('default', ['test', 'uglify']);
 
 };
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "blueimp-tmpl",
-  "version": "2.5.4",
+  "version": "2.5.5",
   "title": "JavaScript Templates",
   "description": "< 1KB lightweight, fast & powerful JavaScript templating engine with zero dependencies. Compatible with server-side environments like node.js, module loaders like RequireJS and all web browsers.",
   "keywords": [
@@ -24,12 +24,7 @@
     "url": "git://github.com/blueimp/JavaScript-Templates.git"
   },
   "bugs": "https://github.com/blueimp/JavaScript-Templates/issues",
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "http://www.opensource.org/licenses/MIT"
-    }
-  ],
+  "license": "MIT",
   "main": "js/tmpl.js",
   "ignore": [
     "/*.*",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blueimp-tmpl",
-  "version": "2.5.4",
+  "version": "2.5.5",
   "title": "JavaScript Templates",
   "description": "< 1KB lightweight, fast & powerful JavaScript templating engine with zero dependencies. Compatible with server-side environments like node.js, module loaders like RequireJS and all web browsers.",
   "keywords": [
@@ -24,19 +24,13 @@
     "url": "git://github.com/blueimp/JavaScript-Templates.git"
   },
   "bugs": "https://github.com/blueimp/JavaScript-Templates/issues",
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "http://www.opensource.org/licenses/MIT"
-    }
-  ],
+  "license": "MIT",
   "devDependencies": {
     "grunt": "~0.4.5",
     "grunt-contrib-uglify": "~0.5.0",
     "grunt-contrib-jshint": "~0.10.0",
     "grunt-bump-build-git": "~1.1.1",
     "grunt-simple-mocha": "~0.4.0",
-    "grunt-mocha": "~0.4.11",
     "expect.js": "0.3.1"
   },
   "scripts": {
diff --git a/test/index.html b/test/index.html
@@ -19,25 +19,21 @@
 <meta charset="utf-8">
 <title>JavaScript Templates Test</title>
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link rel="stylesheet" href="https://blueimp.github.io/cdn/css/mocha.min.css">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mocha/2.2.5/mocha.min.css">
 </head>
 <body>
 <div id="mocha"></div>
-<script src="https://blueimp.github.io/cdn/js/mocha.min.js"></script>
-<script src="https://blueimp.github.io/cdn/js/expect.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/2.2.5/mocha.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/expect.js/0.2.0/expect.min.js"></script>
 <script>
-/* global mocha */
 mocha.setup('bdd');
 </script>
 <script type="text/x-tmpl" id="template">{%=o.value%}</script>
 <script src="../js/tmpl.js"></script>
 <script src="test.js"></script>
 <script>
-/* global window, mocha */
-if (!window.PHANTOMJS) {
-	mocha.checkLeaks();
-	mocha.run();
-}
+mocha.checkLeaks();
+mocha.run();
 </script>
-</body> 
+</body>
 </html>
