[Pkg-javascript-commits] [leaflet-markercluster] 19/128: Added magic-string devDependency

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository leaflet-markercluster.

commit 6328db92fd55b207119735edadbda18334767321
Author: ghybs <ghybs1 at gmail.com>
Date:   Thu Nov 19 10:59:14 2015 +0400

    Added magic-string devDependency
    
    into package.json because of Leaflet v1.0.0-beta.2 which now uses that package in build.js.
    This Leaflet build.js is required by markercluster karma.conf.
---
 package.json       | 3 ++-
 spec/karma.conf.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 4af12cf..9dddbd0 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,8 @@
 		"mocha": "~1.10.0",
 		"karma": "~0.8.5",
 		"uglify-js": "~2.3.6",
-		"jake": "~0.5.16"
+		"jake": "~0.5.16",
+	    "magic-string": "^0.7.0"
 	},
 	"main": "dist/leaflet.markercluster.js",
 	"scripts": {
diff --git a/spec/karma.conf.js b/spec/karma.conf.js
index dc64d62..3c7a941 100644
--- a/spec/karma.conf.js
+++ b/spec/karma.conf.js
@@ -1,6 +1,6 @@
 // Karma configuration
 var libSources = require(__dirname+'/../build/build.js').getFiles();
-var leafletSources = require(__dirname+'/../node_modules/leaflet/build/build.js').getFiles();
+var leafletSources = require(__dirname+'/../node_modules/leaflet/build/build.js').getFiles(); // Caution Leaflet 1.0.0-beta.2 build needs magic-string
 
 // base path, that will be used to resolve files and exclude
 basePath = '';

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/leaflet-markercluster.git