From 344149302e8c49e2c81c85cc26b323499a74cd83 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Wed, 6 Nov 2013 12:54:51 +0200 Subject: [PATCH 1/9] move to separate plugin repos --- registry.json | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/registry.json b/registry.json index 0abcef5..8558514 100644 --- a/registry.json +++ b/registry.json @@ -1,11 +1,9 @@ { - "!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", + "!css": "github:jspm/plugin-css", + "!font": "github:jspm/plugin-font", + "!image": "github:jspm/plugin-image", + "!json": "github:jspm/plugin-json", + "!text": "github:jspm/plugin-text", "angular": "cdnjs:angular.js", "angular-ui": "cdnjs:angular-ui/angular-ui", From 46ab7ee3015191149dfb1100d8d10794cf66001c Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Wed, 6 Nov 2013 14:24:23 +0200 Subject: [PATCH 2/9] plugins as normal names --- registry.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/registry.json b/registry.json index 8558514..5ec501f 100644 --- a/registry.json +++ b/registry.json @@ -5,6 +5,12 @@ "!json": "github:jspm/plugin-json", "!text": "github:jspm/plugin-text", + "css": "github:jspm/plugin-css", + "font": "github:jspm/plugin-font", + "image": "github:jspm/plugin-image", + "json": "github:jspm/plugin-json", + "text": "github:jspm/plugin-text", + "angular": "cdnjs:angular.js", "angular-ui": "cdnjs:angular-ui/angular-ui", "angularFire": "github:firebase/angularFire", From 49478b693d0487612142f9770d9d2850acaf68aa Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Wed, 6 Nov 2013 14:26:33 +0200 Subject: [PATCH 3/9] remove old plugin names --- registry.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/registry.json b/registry.json index 5ec501f..eea6e08 100644 --- a/registry.json +++ b/registry.json @@ -1,10 +1,4 @@ { - "!css": "github:jspm/plugin-css", - "!font": "github:jspm/plugin-font", - "!image": "github:jspm/plugin-image", - "!json": "github:jspm/plugin-json", - "!text": "github:jspm/plugin-text", - "css": "github:jspm/plugin-css", "font": "github:jspm/plugin-font", "image": "github:jspm/plugin-image", From f02d9a069d709a44ed07b92fdf4ec348ea2cfa76 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Wed, 6 Nov 2013 15:52:17 +0200 Subject: [PATCH 4/9] Update angularFire@0.3.1.json --- package-overrides/github/firebase/angularFire@0.3.1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-overrides/github/firebase/angularFire@0.3.1.json b/package-overrides/github/firebase/angularFire@0.3.1.json index 0ac79f0..482b085 100644 --- a/package-overrides/github/firebase/angularFire@0.3.1.json +++ b/package-overrides/github/firebase/angularFire@0.3.1.json @@ -1,5 +1,5 @@ { - "dependencyShim": { + "shim": { "angularFire": ["angular@1.1.5"] } } From 8bc36a99f3c8b01af9b9e8438b0ca23fbe5a39ef Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Wed, 6 Nov 2013 15:52:48 +0200 Subject: [PATCH 5/9] Update backbone@1.1.0.json --- 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 c3c6985..62910f6 100644 --- a/package-overrides/github/jashkenas/backbone@1.1.0.json +++ b/package-overrides/github/jashkenas/backbone@1.1.0.json @@ -1,6 +1,6 @@ { "main": "backbone", - "dependencyShim": { + "shim": { "backbone": ["underscore"] }, "dependencyMap": { From fcc0f1ee6dd1bc9a72b560c7f40745c498e5f338 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Wed, 6 Nov 2013 15:53:25 +0200 Subject: [PATCH 6/9] Update backbone.marionette@1.2.2.json --- .../github/marionettejs/backbone.marionette@1.2.2.json | 2 +- 1 file changed, 1 insertion(+), 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 543ead6..215428c 100644 --- a/package-overrides/github/marionettejs/backbone.marionette@1.2.2.json +++ b/package-overrides/github/marionettejs/backbone.marionette@1.2.2.json @@ -7,7 +7,7 @@ "backbone": "github:backbone@1.1.0", "underscore": "npm:underscore@1.5.2" }, - "dependencyShim": { + "shim": { "backbone.marionette.min": ["backbone", "underscore"] } } From 3d2fd044b9ab225290a5bffc1145399b4a3a8fe8 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Wed, 6 Nov 2013 15:54:51 +0200 Subject: [PATCH 7/9] Update backbone.marionette@1.2.2.json --- .../github/marionettejs/backbone.marionette@1.2.2.json | 6 +----- 1 file changed, 1 insertion(+), 5 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 215428c..f17755f 100644 --- a/package-overrides/github/marionettejs/backbone.marionette@1.2.2.json +++ b/package-overrides/github/marionettejs/backbone.marionette@1.2.2.json @@ -3,11 +3,7 @@ "directories": { "lib": "lib" }, - "dependencyMap": { - "backbone": "github:backbone@1.1.0", - "underscore": "npm:underscore@1.5.2" - }, "shim": { - "backbone.marionette.min": ["backbone", "underscore"] + "backbone.marionette.min": ["backbone@1.1.0", "underscore@1.5.2"] } } From 1df4cc903a35de1c2983d80607832734fb0bba8a Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Wed, 6 Nov 2013 15:55:10 +0200 Subject: [PATCH 8/9] Update bootstrap@3.0.0.json --- package-overrides/github/twbs/bootstrap@3.0.0.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-overrides/github/twbs/bootstrap@3.0.0.json b/package-overrides/github/twbs/bootstrap@3.0.0.json index b947fb9..6be08d8 100644 --- a/package-overrides/github/twbs/bootstrap@3.0.0.json +++ b/package-overrides/github/twbs/bootstrap@3.0.0.json @@ -1,6 +1,6 @@ { "main": "dist/js/bootstrap", - "dependencyShim": { + "shim": { "dist/js/bootstrap": ["jquery", "../css/bootstrap.css!"] }, "dependencyMap": { From 013644e51f40c1f60d6daceadcf8edd22c4ca6b5 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Wed, 6 Nov 2013 15:55:53 +0200 Subject: [PATCH 9/9] Update angularFire@0.3.1.json --- package-overrides/github/firebase/angularFire@0.3.1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-overrides/github/firebase/angularFire@0.3.1.json b/package-overrides/github/firebase/angularFire@0.3.1.json index 482b085..e169df5 100644 --- a/package-overrides/github/firebase/angularFire@0.3.1.json +++ b/package-overrides/github/firebase/angularFire@0.3.1.json @@ -1,5 +1,5 @@ { "shim": { - "angularFire": ["angular@1.1.5"] + "angularFire": ["angular@1.1.5/angular"] } }