From 4965bf2b628876b5cd48201d33afe834ed0f1633 Mon Sep 17 00:00:00 2001 From: Thomas Burleson Date: Fri, 17 Apr 2015 09:26:36 -0500 Subject: [PATCH 1/6] Revert "remove travis notifications override" This reverts commit 403e93a8c793c4ba95cb2bb544fddd6b75fd929a. --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index acdea89..e7906ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,3 +4,7 @@ node_js: branches: only: - master +notifications: + email: + recipients: + - i@2fd.me From 078ea0f7fb29e08d08eb3bd7ac937163e2787905 Mon Sep 17 00:00:00 2001 From: Thomas Burleson Date: Fri, 17 Apr 2015 09:38:38 -0500 Subject: [PATCH 2/6] Update Angular Material to use cjs format with entry point set to `index` --- .travis.yml | 4 ---- .../angular/bower-material@0.9.0-rc1.json | 11 +++++++++++ .../github/angular/bower-material@master.json | 19 +++++-------------- 3 files changed, 16 insertions(+), 18 deletions(-) create mode 100644 package-overrides/github/angular/bower-material@0.9.0-rc1.json diff --git a/.travis.yml b/.travis.yml index e7906ca..acdea89 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,3 @@ node_js: branches: only: - master -notifications: - email: - recipients: - - i@2fd.me diff --git a/package-overrides/github/angular/bower-material@0.9.0-rc1.json b/package-overrides/github/angular/bower-material@0.9.0-rc1.json new file mode 100644 index 0000000..7749c2e --- /dev/null +++ b/package-overrides/github/angular/bower-material@0.9.0-rc1.json @@ -0,0 +1,11 @@ +{ + "main": "index", + "format":"cjs", + "registry": "jspm", + "dependencies": { + "angular": "^1.3.15", + "angular-animate": "^1.3.15", + "angular-aria": "^1.3.15", + "css": "^0.1.0" + } +} diff --git a/package-overrides/github/angular/bower-material@master.json b/package-overrides/github/angular/bower-material@master.json index 19ed5ff..7749c2e 100644 --- a/package-overrides/github/angular/bower-material@master.json +++ b/package-overrides/github/angular/bower-material@master.json @@ -1,20 +1,11 @@ { - "main": "angular-material", - "shim": { - "angular-material": { - "deps": [ - "./angular-material.css!", - "angular", - "angular-animate", - "angular-aria" - ] - } - }, + "main": "index", + "format":"cjs", "registry": "jspm", "dependencies": { - "angular": "^1.3.0", - "angular-animate": "^1.3.0", - "angular-aria": "^1.3.0", + "angular": "^1.3.15", + "angular-animate": "^1.3.15", + "angular-aria": "^1.3.15", "css": "^0.1.0" } } From 42c405a6b8a9bc3c60ec7045e29708a306615075 Mon Sep 17 00:00:00 2001 From: Thomas Burleson Date: Fri, 17 Apr 2015 09:40:35 -0500 Subject: [PATCH 3/6] remove overrides on master branch --- .../github/angular/bower-material@master.json | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 package-overrides/github/angular/bower-material@master.json diff --git a/package-overrides/github/angular/bower-material@master.json b/package-overrides/github/angular/bower-material@master.json deleted file mode 100644 index 7749c2e..0000000 --- a/package-overrides/github/angular/bower-material@master.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "main": "index", - "format":"cjs", - "registry": "jspm", - "dependencies": { - "angular": "^1.3.15", - "angular-animate": "^1.3.15", - "angular-aria": "^1.3.15", - "css": "^0.1.0" - } -} From 0e062a476f90250c25fcc981e57521cb1ef649b6 Mon Sep 17 00:00:00 2001 From: Thomas Burleson Date: Fri, 17 Apr 2015 09:44:42 -0500 Subject: [PATCH 4/6] add peerDependency overrides for 0.9.0-rc1 --- .../github/angular/bower-material@0.9.0-rc1.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package-overrides/github/angular/bower-material@0.9.0-rc1.json b/package-overrides/github/angular/bower-material@0.9.0-rc1.json index 7749c2e..6dab190 100644 --- a/package-overrides/github/angular/bower-material@0.9.0-rc1.json +++ b/package-overrides/github/angular/bower-material@0.9.0-rc1.json @@ -7,5 +7,10 @@ "angular-animate": "^1.3.15", "angular-aria": "^1.3.15", "css": "^0.1.0" + }, + "peerDependencies": { + "angular": "github:angular/angular@1.3.15", + "angular-animate": "github:angular/angular-animate@1.3.15", + "angular-aria": "github:angular/angular-aria@1.3.15" } } From 65ab537adeef84712963f5b092136b76f91feb72 Mon Sep 17 00:00:00 2001 From: Thomas Burleson Date: Fri, 17 Apr 2015 09:55:09 -0500 Subject: [PATCH 5/6] remove `peerDependencies` from overrides --- .../github/angular/bower-material@0.9.0-rc1.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package-overrides/github/angular/bower-material@0.9.0-rc1.json b/package-overrides/github/angular/bower-material@0.9.0-rc1.json index 6dab190..7749c2e 100644 --- a/package-overrides/github/angular/bower-material@0.9.0-rc1.json +++ b/package-overrides/github/angular/bower-material@0.9.0-rc1.json @@ -7,10 +7,5 @@ "angular-animate": "^1.3.15", "angular-aria": "^1.3.15", "css": "^0.1.0" - }, - "peerDependencies": { - "angular": "github:angular/angular@1.3.15", - "angular-animate": "github:angular/angular-animate@1.3.15", - "angular-aria": "github:angular/angular-aria@1.3.15" } } From ac0787f35dfb1ad5fd0e7b2f9f4c8fc1c9f141da Mon Sep 17 00:00:00 2001 From: Thomas Burleson Date: Fri, 17 Apr 2015 15:24:16 -0500 Subject: [PATCH 6/6] update(overrides) - add CSS shim & full dependency names for Angular Material. --- .../github/angular/bower-material@0.9.0-rc1.json | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/package-overrides/github/angular/bower-material@0.9.0-rc1.json b/package-overrides/github/angular/bower-material@0.9.0-rc1.json index 7749c2e..3c83e95 100644 --- a/package-overrides/github/angular/bower-material@0.9.0-rc1.json +++ b/package-overrides/github/angular/bower-material@0.9.0-rc1.json @@ -3,9 +3,14 @@ "format":"cjs", "registry": "jspm", "dependencies": { - "angular": "^1.3.15", - "angular-animate": "^1.3.15", - "angular-aria": "^1.3.15", - "css": "^0.1.0" + "angular": "github:angular/bower-angular@^1.3.15", + "angular-animate": "github:angular/bower-angular-animate@^1.3.15", + "angular-aria": "github:angular/bower-angular-aria@^1.3.15", + "css": "github:systemjs/plugin-css@^0.1.9" + }, + "shim": { + "angular-material": { + "deps": [ "./angular-material.css!" ] + } } }