From 8da9df4e4a452f325cb901e346482655ee0c8a6a Mon Sep 17 00:00:00 2001 From: Jarred de Beer Date: Fri, 1 Nov 2013 21:59:36 +0200 Subject: [PATCH 1/4] including directory entry --- .../github/marionettejs/backbone.marionette@1.2.2.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-overrides/github/marionettejs/backbone.marionette@1.2.2.json b/package-overrides/github/marionettejs/backbone.marionette@1.2.2.json index 7c2f6e6..6c5649a 100644 --- a/package-overrides/github/marionettejs/backbone.marionette@1.2.2.json +++ b/package-overrides/github/marionettejs/backbone.marionette@1.2.2.json @@ -1,9 +1,9 @@ { - "main": "lib/backbone.marionette.min", - "dependencyShim": { - "lib/backbone.marionette.min": ["backbone"] + "main": "backbone.marionette.min", + "directories": { + "lib": "lib" }, "dependencyMap": { - "backbone": "backbone@1.1.0" + "backbone": "github:jashkenas/backbone@1.1.0/backbone" } } From b7b9917a7b09eab508b95d1d04490613f3928c47 Mon Sep 17 00:00:00 2001 From: Jarred de Beer Date: Fri, 1 Nov 2013 22:09:52 +0200 Subject: [PATCH 2/4] adding dependencyShim --- .../github/marionettejs/backbone.marionette@1.2.2.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package-overrides/github/marionettejs/backbone.marionette@1.2.2.json b/package-overrides/github/marionettejs/backbone.marionette@1.2.2.json index 6c5649a..543ead6 100644 --- a/package-overrides/github/marionettejs/backbone.marionette@1.2.2.json +++ b/package-overrides/github/marionettejs/backbone.marionette@1.2.2.json @@ -4,6 +4,10 @@ "lib": "lib" }, "dependencyMap": { - "backbone": "github:jashkenas/backbone@1.1.0/backbone" + "backbone": "github:backbone@1.1.0", + "underscore": "npm:underscore@1.5.2" + }, + "dependencyShim": { + "backbone.marionette.min": ["backbone", "underscore"] } } From eec84a3f74b758541d392fe3bdaad2e2d88e6b79 Mon Sep 17 00:00:00 2001 From: Jarred de Beer Date: Fri, 1 Nov 2013 22:12:23 +0200 Subject: [PATCH 3/4] altering dependency map --- package-overrides/github/jashkenas/backbone@1.1.0.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-overrides/github/jashkenas/backbone@1.1.0.json b/package-overrides/github/jashkenas/backbone@1.1.0.json index d58b9e9..c3c6985 100644 --- a/package-overrides/github/jashkenas/backbone@1.1.0.json +++ b/package-overrides/github/jashkenas/backbone@1.1.0.json @@ -4,6 +4,6 @@ "backbone": ["underscore"] }, "dependencyMap": { - "underscore": "underscore@1.5.2" + "underscore": "npm:underscore@1.5.2" } } From 70fe82f1c4ec86df051df9f1176f626385e19195 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Mon, 4 Nov 2013 17:33:54 +0200 Subject: [PATCH 4/4] add plugins to registry --- registry.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/registry.json b/registry.json index a00effe..e15f910 100644 --- a/registry.json +++ b/registry.json @@ -1,4 +1,12 @@ { + "!css": "github:jspm/plugins/css", + "!font": "github:jspm/plugins/font", + "!hbs": "github:jspm/plugins/hbs", + "!html": "github:jspm/plugins/html", + "!image": "github:jspm/plugins/image", + "!json": "github:jspm/plugins/json", + "!text": "github:jspm/plugins/text", + "angular": "cdnjs:angular.js/{version}#angular", "angular-ui": "cdnjs:angular-ui/{version}#angular-ui", "angularFire": "github:firebase/angularFire",