From 5bd4e4d1de8ad33965ac237fc876dfc88b7b2637 Mon Sep 17 00:00:00 2001 From: Andreas Grimm Date: Wed, 5 Nov 2014 15:12:52 +0100 Subject: [PATCH 01/16] add angular-material@0.5.1 --- .../github/angular/bower-material@0.5.1.json | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 package-overrides/github/angular/bower-material@0.5.1.json diff --git a/package-overrides/github/angular/bower-material@0.5.1.json b/package-overrides/github/angular/bower-material@0.5.1.json new file mode 100644 index 0000000..0c8e7ab --- /dev/null +++ b/package-overrides/github/angular/bower-material@0.5.1.json @@ -0,0 +1,25 @@ +{ + "main": "angular-material", + "shim": { + "angular-material": { + "deps": [ + "./angular-material.css!", + "angular", + "hammer", + "angular-animate", + "angular-aria" + ] + } + }, + "registry": "jspm", + "dependencies": { + "angular": "^1.3.0", + "angular-animate": "^1.3.0", + "angular-aria": "^1.3.0", + "hammer": "^2.0.4", + "css": "^0.1.0" + }, + "buildConfig": { + "minify": true + } +} From 4de8a763cc937ad97d694f3d7434cac08a32bab4 Mon Sep 17 00:00:00 2001 From: Max Peterson Date: Thu, 13 Nov 2014 12:50:17 -0600 Subject: [PATCH 02/16] Add postal.js to registry --- registry.json | 1 + 1 file changed, 1 insertion(+) diff --git a/registry.json b/registry.json index 6b5e4ed..de69ab1 100644 --- a/registry.json +++ b/registry.json @@ -69,6 +69,7 @@ "parallax": "github:wagerfield/parallax", "pikaday": "github:dbushell/Pikaday", "poly": "github:cujojs/poly", + "postal": "npm:postal", "pouchdb": "github:pouchdb/pouchdb", "prism": "github:LeaVerou/prism", "quint": "github:jquery/qunit", From 3cc58485b1d4b26d004b3f41e40c98b5046728b0 Mon Sep 17 00:00:00 2001 From: Aleksandar Djindjic Date: Fri, 14 Nov 2014 14:32:53 +0100 Subject: [PATCH 03/16] new inonic and angular sanitize --- .../github/driftyco/ionic@1.0.0-beta.13 | 22 +++++++++++++++++++ registry.json | 1 + 2 files changed, 23 insertions(+) create mode 100644 package-overrides/github/driftyco/ionic@1.0.0-beta.13 diff --git a/package-overrides/github/driftyco/ionic@1.0.0-beta.13 b/package-overrides/github/driftyco/ionic@1.0.0-beta.13 new file mode 100644 index 0000000..ee2634f --- /dev/null +++ b/package-overrides/github/driftyco/ionic@1.0.0-beta.13 @@ -0,0 +1,22 @@ +{ + "directories": { + "lib": "release" + }, + "main": "js/ionic", + "shim": { + "js/ionic": { + "deps": ["../css/ionic.css!"] + }, + "js/ionic-angular": { + "deps": ["angular", "./ionic"] + } + }, + "registry": "jspm", + "dependencies": { + "css": "0.1.0", + "angular": "^1.3.2", + "angular-animate": "^1.3.2", + "angular-sanitize": "^1.3.2", + "angular-ui-router": "0.2.10" + } +} diff --git a/registry.json b/registry.json index 6b5e4ed..729bdf9 100644 --- a/registry.json +++ b/registry.json @@ -18,6 +18,7 @@ "angular-ui-router": "github:angular-ui/ui-router", "angular-ui-router-extras": "github:christopherthielen/ui-router-extras", "angular-ui-tree": "github:JimLiu/angular-ui-tree", + "angular-sanitize": "github:angular/bower-angular-sanitize", "angularFire": "github:firebase/angularFire", "backbone": "npm:backbone", "backbone.babysitter": "github:marionettejs/backbone.babysitter", From 5bafd12c4371a95a30478a5875474605b0a0d51e Mon Sep 17 00:00:00 2001 From: "james@jamespamplin.com" Date: Mon, 17 Nov 2014 11:07:36 +0000 Subject: [PATCH 04/16] Added Sentry's raven-js client to registry with main override --- package-overrides/github/getsentry/raven-js@1.1.16.json | 3 +++ registry.json | 1 + 2 files changed, 4 insertions(+) create mode 100644 package-overrides/github/getsentry/raven-js@1.1.16.json diff --git a/package-overrides/github/getsentry/raven-js@1.1.16.json b/package-overrides/github/getsentry/raven-js@1.1.16.json new file mode 100644 index 0000000..0e77e4d --- /dev/null +++ b/package-overrides/github/getsentry/raven-js@1.1.16.json @@ -0,0 +1,3 @@ +{ + "main": "dist/raven.min" +} diff --git a/registry.json b/registry.json index 7e71c43..8eaf66e 100644 --- a/registry.json +++ b/registry.json @@ -76,6 +76,7 @@ "quint": "github:jquery/qunit", "raphael": "github:DmitryBaranovskiy/raphael", "ratchet": "github:maker/ratchet", + "raven-js": "github:getsentry/raven-js", "react": "npm:react", "react-router": "npm:react-router", "reqwest": "github:ded/reqwest", From d90305b3ae0e4b6269596474426c0e203d3a08bc Mon Sep 17 00:00:00 2001 From: Aleksandar Djindjic Date: Mon, 17 Nov 2014 20:22:55 +0100 Subject: [PATCH 05/16] correct config I have tested it and it works with: jspm install ionic=github:driftyco/ionic -o '...' but just dont know will it make map config automatically for import 'ionic' when I jspm install ionic with new config in registry after pull request? Thanks! --- .../github/driftyco/ionic@1.0.0-beta.13 | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/package-overrides/github/driftyco/ionic@1.0.0-beta.13 b/package-overrides/github/driftyco/ionic@1.0.0-beta.13 index ee2634f..f57551e 100644 --- a/package-overrides/github/driftyco/ionic@1.0.0-beta.13 +++ b/package-overrides/github/driftyco/ionic@1.0.0-beta.13 @@ -1,22 +1,26 @@ { - "directories": { - "lib": "release" - }, - "main": "js/ionic", - "shim": { - "js/ionic": { - "deps": ["../css/ionic.css!"] + "registry": "jspm", + "directories": { + "lib": "release" }, - "js/ionic-angular": { - "deps": ["angular", "./ionic"] + "main": "js/ionic-angular", + "shim": { + "js/ionic-angular": { + "deps": [ + "../css/ionic.css!", + "./ionic", + "angular", + "angular-animate", + "angular-sanitize", + "angular-ui-router" + ] + } + }, + "dependencies": { + "css": "0.1.0", + "angular": "^1.3.2", + "angular-animate": "^1.3.2", + "angular-sanitize": "^1.3.2", + "angular-ui-router": "0.2.10" } - }, - "registry": "jspm", - "dependencies": { - "css": "0.1.0", - "angular": "^1.3.2", - "angular-animate": "^1.3.2", - "angular-sanitize": "^1.3.2", - "angular-ui-router": "0.2.10" - } } From b055d8eb984a7a327073d53c101e99056db9a586 Mon Sep 17 00:00:00 2001 From: Aleksandar Djindjic Date: Mon, 17 Nov 2014 22:55:49 +0100 Subject: [PATCH 06/16] Update registry.json --- registry.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/registry.json b/registry.json index 8eaf66e..c7db9c0 100644 --- a/registry.json +++ b/registry.json @@ -43,7 +43,7 @@ "handlebars": "github:components/handlebars.js", "handlebars.js": "github:components/handlebars.js", "intro": "github:usablica/intro.js", - "ionic": "github:driftyco/ionic", + "ionic": "github:driftyco/ionic-bower", "jcrop": "github:tapmodo/Jcrop", "jiff": "github:cujojs/jiff", "jquery": "github:components/jquery", From 4378dc59d8239bfdce3b6618a2b2465c234d02f2 Mon Sep 17 00:00:00 2001 From: Aleksandar Djindjic Date: Tue, 18 Nov 2014 11:00:24 +0100 Subject: [PATCH 07/16] overrides with angular as dependency --- .../github/angular-ui/ui-router@0.2.12.json | 15 +++++++++++++++ .../angular/bower-angular-sanitize@1.3.0.json | 15 +++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 package-overrides/github/angular-ui/ui-router@0.2.12.json create mode 100644 package-overrides/github/angular/bower-angular-sanitize@1.3.0.json diff --git a/package-overrides/github/angular-ui/ui-router@0.2.12.json b/package-overrides/github/angular-ui/ui-router@0.2.12.json new file mode 100644 index 0000000..6720f3f --- /dev/null +++ b/package-overrides/github/angular-ui/ui-router@0.2.12.json @@ -0,0 +1,15 @@ +{ + "directories": { + "lib": "release" + }, + "main": "angular-ui-router", + "shim": { + "angular-ui-router": { + "deps": ["angular"] + } + }, + "registry": "jspm", + "dependencies": { + "angular": "^1.3.2" + } +} diff --git a/package-overrides/github/angular/bower-angular-sanitize@1.3.0.json b/package-overrides/github/angular/bower-angular-sanitize@1.3.0.json new file mode 100644 index 0000000..8ff4c8e --- /dev/null +++ b/package-overrides/github/angular/bower-angular-sanitize@1.3.0.json @@ -0,0 +1,15 @@ +{ + "main": "angular-sanitize", + "shim": { + "angular-sanitize": { + "deps": ["angular"] + } + }, + "registry": "jspm", + "dependencies": { + "angular": "^1.3.0" + }, + "buildConfig": { + "minify": true + } +} From 8fcfaef65e6cfd33eba1218a92f63f0081ce3a2a Mon Sep 17 00:00:00 2001 From: guybedford Date: Tue, 18 Nov 2014 12:16:43 +0200 Subject: [PATCH 08/16] add ionic-bower --- .../github/driftyco/ionic-bower@1.0.0-beta.13 | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package-overrides/github/driftyco/ionic-bower@1.0.0-beta.13 diff --git a/package-overrides/github/driftyco/ionic-bower@1.0.0-beta.13 b/package-overrides/github/driftyco/ionic-bower@1.0.0-beta.13 new file mode 100644 index 0000000..f57551e --- /dev/null +++ b/package-overrides/github/driftyco/ionic-bower@1.0.0-beta.13 @@ -0,0 +1,26 @@ +{ + "registry": "jspm", + "directories": { + "lib": "release" + }, + "main": "js/ionic-angular", + "shim": { + "js/ionic-angular": { + "deps": [ + "../css/ionic.css!", + "./ionic", + "angular", + "angular-animate", + "angular-sanitize", + "angular-ui-router" + ] + } + }, + "dependencies": { + "css": "0.1.0", + "angular": "^1.3.2", + "angular-animate": "^1.3.2", + "angular-sanitize": "^1.3.2", + "angular-ui-router": "0.2.10" + } +} From 1a891d547046d40944847ebcd6911548162a821f Mon Sep 17 00:00:00 2001 From: Aleksandar Djindjic Date: Tue, 18 Nov 2014 12:37:20 +0100 Subject: [PATCH 09/16] Without release sub folder in case of bower --- package-overrides/github/driftyco/ionic-bower@1.0.0-beta.13 | 3 --- 1 file changed, 3 deletions(-) diff --git a/package-overrides/github/driftyco/ionic-bower@1.0.0-beta.13 b/package-overrides/github/driftyco/ionic-bower@1.0.0-beta.13 index f57551e..0abcb77 100644 --- a/package-overrides/github/driftyco/ionic-bower@1.0.0-beta.13 +++ b/package-overrides/github/driftyco/ionic-bower@1.0.0-beta.13 @@ -1,8 +1,5 @@ { "registry": "jspm", - "directories": { - "lib": "release" - }, "main": "js/ionic-angular", "shim": { "js/ionic-angular": { From 4f8d743c1e5973797eb411bbd17380796fdfa436 Mon Sep 17 00:00:00 2001 From: Aleksandar Djindjic Date: Wed, 19 Nov 2014 22:00:25 +0100 Subject: [PATCH 10/16] Rename ionic-bower@1.0.0-beta.13 to ionic-bower@1.0.0-beta.13.json --- .../{ionic-bower@1.0.0-beta.13 => ionic-bower@1.0.0-beta.13.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package-overrides/github/driftyco/{ionic-bower@1.0.0-beta.13 => ionic-bower@1.0.0-beta.13.json} (100%) diff --git a/package-overrides/github/driftyco/ionic-bower@1.0.0-beta.13 b/package-overrides/github/driftyco/ionic-bower@1.0.0-beta.13.json similarity index 100% rename from package-overrides/github/driftyco/ionic-bower@1.0.0-beta.13 rename to package-overrides/github/driftyco/ionic-bower@1.0.0-beta.13.json From 4d2db0cd12244730f4d2d945307360a4230189eb Mon Sep 17 00:00:00 2001 From: guybedford Date: Thu, 20 Nov 2014 15:28:04 +0200 Subject: [PATCH 11/16] unminify --- package-overrides/github/components/jquery@2.1.0.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-overrides/github/components/jquery@2.1.0.json b/package-overrides/github/components/jquery@2.1.0.json index f6508ad..3e1e374 100644 --- a/package-overrides/github/components/jquery@2.1.0.json +++ b/package-overrides/github/components/jquery@2.1.0.json @@ -1,3 +1,3 @@ { - "main": "jquery.min" + "main": "jquery" } From d8ee4e37c7d45033b673c12d2b12bcd63c71e5ee Mon Sep 17 00:00:00 2001 From: Aleksandar Djindjic Date: Tue, 25 Nov 2014 23:00:18 +0100 Subject: [PATCH 12/16] firebase and angular fire with dependencies and versions --- .../github/firebase/angularFire@0.9.0.json | 13 +++++++++++++ .../github/firebase/firebase-bower@2.0.4.json | 7 +++++++ registry.json | 1 + 3 files changed, 21 insertions(+) create mode 100644 package-overrides/github/firebase/angularFire@0.9.0.json create mode 100644 package-overrides/github/firebase/firebase-bower@2.0.4.json diff --git a/package-overrides/github/firebase/angularFire@0.9.0.json b/package-overrides/github/firebase/angularFire@0.9.0.json new file mode 100644 index 0000000..8248b09 --- /dev/null +++ b/package-overrides/github/firebase/angularFire@0.9.0.json @@ -0,0 +1,13 @@ +{ + "files": ["angularfire.js"], + "shim": { + "angularFire": ["firebase", "angular"] + }, + "buildConfig": { + "uglify": "true" + }, + "dependencies": { + "angular": "^1.3.2", + "firebase": "^2.0.4" + } +} diff --git a/package-overrides/github/firebase/firebase-bower@2.0.4.json b/package-overrides/github/firebase/firebase-bower@2.0.4.json new file mode 100644 index 0000000..0853c91 --- /dev/null +++ b/package-overrides/github/firebase/firebase-bower@2.0.4.json @@ -0,0 +1,7 @@ +{ + "main": "firebase", + "registry": "jspm", + "buildConfig": { + "minify": true + } +} \ No newline at end of file diff --git a/registry.json b/registry.json index c7db9c0..1978990 100644 --- a/registry.json +++ b/registry.json @@ -19,6 +19,7 @@ "angular-ui-router-extras": "github:christopherthielen/ui-router-extras", "angular-ui-tree": "github:JimLiu/angular-ui-tree", "angular-sanitize": "github:angular/bower-angular-sanitize", + "firebase": "github:firebase/firebase-bower", "angularFire": "github:firebase/angularFire", "backbone": "npm:backbone", "backbone.babysitter": "github:marionettejs/backbone.babysitter", From 968787857620372cc3a93dacdd44fb82c97fe754 Mon Sep 17 00:00:00 2001 From: Aleksandar Djindjic Date: Wed, 26 Nov 2014 09:55:12 +0100 Subject: [PATCH 13/16] no build config, directories.lib fixed --- .../{angularFire@0.9.0.json => angularfire@0.9.0.json} | 8 ++++---- .../github/firebase/firebase-bower@2.0.4.json | 5 +---- registry.json | 1 + 3 files changed, 6 insertions(+), 8 deletions(-) rename package-overrides/github/firebase/{angularFire@0.9.0.json => angularfire@0.9.0.json} (61%) diff --git a/package-overrides/github/firebase/angularFire@0.9.0.json b/package-overrides/github/firebase/angularfire@0.9.0.json similarity index 61% rename from package-overrides/github/firebase/angularFire@0.9.0.json rename to package-overrides/github/firebase/angularfire@0.9.0.json index 8248b09..fe859e0 100644 --- a/package-overrides/github/firebase/angularFire@0.9.0.json +++ b/package-overrides/github/firebase/angularfire@0.9.0.json @@ -1,10 +1,10 @@ { + "directories": { + "lib": "dist" + }, "files": ["angularfire.js"], "shim": { - "angularFire": ["firebase", "angular"] - }, - "buildConfig": { - "uglify": "true" + "angularfire": ["firebase", "angular"] }, "dependencies": { "angular": "^1.3.2", diff --git a/package-overrides/github/firebase/firebase-bower@2.0.4.json b/package-overrides/github/firebase/firebase-bower@2.0.4.json index 0853c91..cecb0ea 100644 --- a/package-overrides/github/firebase/firebase-bower@2.0.4.json +++ b/package-overrides/github/firebase/firebase-bower@2.0.4.json @@ -1,7 +1,4 @@ { "main": "firebase", - "registry": "jspm", - "buildConfig": { - "minify": true - } + "registry": "jspm" } \ No newline at end of file diff --git a/registry.json b/registry.json index 1978990..60e4b40 100644 --- a/registry.json +++ b/registry.json @@ -21,6 +21,7 @@ "angular-sanitize": "github:angular/bower-angular-sanitize", "firebase": "github:firebase/firebase-bower", "angularFire": "github:firebase/angularFire", + "angularfire": "github:firebase/angularfire", "backbone": "npm:backbone", "backbone.babysitter": "github:marionettejs/backbone.babysitter", "backbone.wreqr": "github:marionettejs/backbone.wreqr", From d23e53516f58a23628dc7d87d386421328a17e2f Mon Sep 17 00:00:00 2001 From: guybedford Date: Thu, 27 Nov 2014 14:25:34 +0200 Subject: [PATCH 14/16] angular fire correction --- package-overrides/github/firebase/angularfire@0.9.0.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-overrides/github/firebase/angularfire@0.9.0.json b/package-overrides/github/firebase/angularfire@0.9.0.json index fe859e0..f9a6d72 100644 --- a/package-overrides/github/firebase/angularfire@0.9.0.json +++ b/package-overrides/github/firebase/angularfire@0.9.0.json @@ -2,7 +2,7 @@ "directories": { "lib": "dist" }, - "files": ["angularfire.js"], + "files": ["dist/angularfire.js"], "shim": { "angularfire": ["firebase", "angular"] }, From ca5852be215df2510d1e47e661cff437318a52a7 Mon Sep 17 00:00:00 2001 From: guybedford Date: Thu, 27 Nov 2014 14:59:11 +0200 Subject: [PATCH 15/16] correct angularfire override --- package-overrides/github/firebase/angularfire@0.9.0.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package-overrides/github/firebase/angularfire@0.9.0.json b/package-overrides/github/firebase/angularfire@0.9.0.json index f9a6d72..73f224a 100644 --- a/package-overrides/github/firebase/angularfire@0.9.0.json +++ b/package-overrides/github/firebase/angularfire@0.9.0.json @@ -6,6 +6,7 @@ "shim": { "angularfire": ["firebase", "angular"] }, + "registry": "jspm", "dependencies": { "angular": "^1.3.2", "firebase": "^2.0.4" From c0f0c062044eeac3c092c76083101ac91ff9a31a Mon Sep 17 00:00:00 2001 From: Andreas Grimm Date: Thu, 4 Dec 2014 20:06:34 +0100 Subject: [PATCH 16/16] add angular-material@0.6.0 --- .../github/angular/bower-material@0.6.0.json | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 package-overrides/github/angular/bower-material@0.6.0.json diff --git a/package-overrides/github/angular/bower-material@0.6.0.json b/package-overrides/github/angular/bower-material@0.6.0.json new file mode 100644 index 0000000..0de3760 --- /dev/null +++ b/package-overrides/github/angular/bower-material@0.6.0.json @@ -0,0 +1,25 @@ +{ + "main": "angular-material", + "shim": { + "angular-material": { + "deps": [ + "./angular-material.css!", + "angular", + "hammer", + "angular-animate", + "angular-aria" + ] + } + }, + "registry": "jspm", + "dependencies": { + "angular": "^1.3.0", + "angular-animate": "^1.3.0", + "angular-aria": "^1.3.0", + "hammer": "^2.0.2", + "css": "^0.1.0" + }, + "buildConfig": { + "minify": true + } +}