From 6892616cf83d9687df93c957d76f1671a19fb9a2 Mon Sep 17 00:00:00 2001 From: Aaike Van Roekghem Date: Mon, 9 Mar 2015 02:37:10 +0700 Subject: [PATCH 1/8] include all files in skins --- package-overrides/github/fronteed/iCheck@1.0.2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-overrides/github/fronteed/iCheck@1.0.2.json b/package-overrides/github/fronteed/iCheck@1.0.2.json index 79142a8..836cf8f 100644 --- a/package-overrides/github/fronteed/iCheck@1.0.2.json +++ b/package-overrides/github/fronteed/iCheck@1.0.2.json @@ -2,7 +2,7 @@ "main": "icheck.js", "registry": "jspm", "format": "global", - "files":["icheck.js","icheck.min.js","skins/*"], + "files":["icheck.js","icheck.min.js","skins/**/*"], "dependencies": { "jquery": "github:components/jquery" }, From 9ddac82f58c4ec002febe48d861cfe9d87dd6fea Mon Sep 17 00:00:00 2001 From: Aaike Van Roekghem Date: Mon, 9 Mar 2015 11:13:54 +0700 Subject: [PATCH 2/8] core-js ->zloirock/core-js --- package-overrides/github/zloirock/core-js@0.4.10.json | 6 ++++++ registry.json | 1 + 2 files changed, 7 insertions(+) create mode 100644 package-overrides/github/zloirock/core-js@0.4.10.json diff --git a/package-overrides/github/zloirock/core-js@0.4.10.json b/package-overrides/github/zloirock/core-js@0.4.10.json new file mode 100644 index 0000000..ef4ec74 --- /dev/null +++ b/package-overrides/github/zloirock/core-js@0.4.10.json @@ -0,0 +1,6 @@ +{ + "main":"client/core.js", + "directories":{ + "lib": "client" + } +} \ No newline at end of file diff --git a/registry.json b/registry.json index f56b42e..9b9a9dc 100644 --- a/registry.json +++ b/registry.json @@ -94,6 +94,7 @@ "cola": "github:cujojs/cola", "console": "github:jspm/nodelibs-console", "constants": "github:jspm/nodelibs-constants", + "core-js": "github:zloirock/core-js", "cram": "github:cujojs/cram", "crypto": "github:jspm/nodelibs-crypto", "curl": "github:cujojs/curl", From d9b90821b3f8e05c214988c37e6da23c55970745 Mon Sep 17 00:00:00 2001 From: Aaike Van Roekghem Date: Mon, 9 Mar 2015 11:42:39 +0700 Subject: [PATCH 3/8] js-beautify ->npm:js-beautify and beautify-web/js-beautify --- package-overrides/github/beautify-web/js-beautify@1.5.5.json | 3 +++ package-overrides/npm/js-beautify@1.5.5.json | 3 +++ registry.json | 1 + 3 files changed, 7 insertions(+) create mode 100644 package-overrides/github/beautify-web/js-beautify@1.5.5.json create mode 100644 package-overrides/npm/js-beautify@1.5.5.json diff --git a/package-overrides/github/beautify-web/js-beautify@1.5.5.json b/package-overrides/github/beautify-web/js-beautify@1.5.5.json new file mode 100644 index 0000000..3eaf84d --- /dev/null +++ b/package-overrides/github/beautify-web/js-beautify@1.5.5.json @@ -0,0 +1,3 @@ +{ + "main": "js/lib/beautify.js" +} \ No newline at end of file diff --git a/package-overrides/npm/js-beautify@1.5.5.json b/package-overrides/npm/js-beautify@1.5.5.json new file mode 100644 index 0000000..d1a0e8b --- /dev/null +++ b/package-overrides/npm/js-beautify@1.5.5.json @@ -0,0 +1,3 @@ +{ + "files": ["js/**/*"] +} \ No newline at end of file diff --git a/registry.json b/registry.json index 9b9a9dc..91a1aa3 100644 --- a/registry.json +++ b/registry.json @@ -81,6 +81,7 @@ "backbone.babysitter": "github:marionettejs/backbone.babysitter", "backbone.wreqr": "github:marionettejs/backbone.wreqr", "baconjs": "npm:baconjs", + "js-beautify": "github:beautify-web/js-beautify", "big.js": "npm:big.js", "bignumber.js": "npm:bignumber.js", "bootstrap": "github:twbs/bootstrap", From c26417aca62a4c982d5ad9661fb84ed056bf81b8 Mon Sep 17 00:00:00 2001 From: Aaike Van Roekghem Date: Mon, 9 Mar 2015 19:40:57 +0700 Subject: [PATCH 4/8] changed to directories.lib --- package-overrides/npm/js-beautify@1.5.5.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package-overrides/npm/js-beautify@1.5.5.json b/package-overrides/npm/js-beautify@1.5.5.json index d1a0e8b..ebd4818 100644 --- a/package-overrides/npm/js-beautify@1.5.5.json +++ b/package-overrides/npm/js-beautify@1.5.5.json @@ -1,3 +1,5 @@ { - "files": ["js/**/*"] + "directories": { + "lib": "js" + } } \ No newline at end of file From e77ab974351308727a26b46c48e6e61db6c6a8b9 Mon Sep 17 00:00:00 2001 From: Aaike Van Roekghem Date: Mon, 9 Mar 2015 20:06:33 +0700 Subject: [PATCH 5/8] fix --- registry.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/registry.json b/registry.json index 91a1aa3..4425f4c 100644 --- a/registry.json +++ b/registry.json @@ -81,7 +81,6 @@ "backbone.babysitter": "github:marionettejs/backbone.babysitter", "backbone.wreqr": "github:marionettejs/backbone.wreqr", "baconjs": "npm:baconjs", - "js-beautify": "github:beautify-web/js-beautify", "big.js": "npm:big.js", "bignumber.js": "npm:bignumber.js", "bootstrap": "github:twbs/bootstrap", @@ -149,6 +148,7 @@ "jquery.cookie": "github:carhartl/jquery-cookie", "jquery.hammer": "github:hammerjs/jquery.hammer.js", "jquery-validation": "github:jzaefferer/jquery-validation", + "js-beautify": "github:beautify-web/js-beautify", "jsfromhell": "github:jonasraoni/JSFromHell", "jsplumb": "github:sporritt/jsPlumb", "kickstrap": "github:ajkochanowicz/Kickstrap", From dabc0d33e4b9aa19d2f41f5035582234cafea45a Mon Sep 17 00:00:00 2001 From: Aaike Van Roekghem Date: Tue, 10 Mar 2015 13:42:39 +0700 Subject: [PATCH 6/8] added aliases for babel and benchmark --- registry.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/registry.json b/registry.json index 4425f4c..b47847b 100644 --- a/registry.json +++ b/registry.json @@ -77,10 +77,12 @@ "firebase": "github:firebase/firebase-bower", "angularFire": "github:firebase/angularFire", "angularfire": "github:firebase/angularfire", + "babel": "npm:babel", "backbone": "npm:backbone", "backbone.babysitter": "github:marionettejs/backbone.babysitter", "backbone.wreqr": "github:marionettejs/backbone.wreqr", "baconjs": "npm:baconjs", + "benchmark": "npm:benchmark", "big.js": "npm:big.js", "bignumber.js": "npm:bignumber.js", "bootstrap": "github:twbs/bootstrap", From 4fa6bcb0562359301a57d95a12d30e737f41e9e1 Mon Sep 17 00:00:00 2001 From: Aaike Van Roekghem Date: Tue, 10 Mar 2015 14:09:19 +0700 Subject: [PATCH 7/8] removed babel alias, npm lib has too many dependencies --- registry.json | 1 - 1 file changed, 1 deletion(-) diff --git a/registry.json b/registry.json index b47847b..fe338f8 100644 --- a/registry.json +++ b/registry.json @@ -77,7 +77,6 @@ "firebase": "github:firebase/firebase-bower", "angularFire": "github:firebase/angularFire", "angularfire": "github:firebase/angularfire", - "babel": "npm:babel", "backbone": "npm:backbone", "backbone.babysitter": "github:marionettejs/backbone.babysitter", "backbone.wreqr": "github:marionettejs/backbone.wreqr", From ed39e47315643861868c752e161262a39c0e5d1f Mon Sep 17 00:00:00 2001 From: Aaike Van Roekghem Date: Tue, 10 Mar 2015 15:33:05 +0700 Subject: [PATCH 8/8] wrong override --- package-overrides/github/zloirock/core-js@0.4.10.json | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 package-overrides/github/zloirock/core-js@0.4.10.json diff --git a/package-overrides/github/zloirock/core-js@0.4.10.json b/package-overrides/github/zloirock/core-js@0.4.10.json deleted file mode 100644 index ef4ec74..0000000 --- a/package-overrides/github/zloirock/core-js@0.4.10.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "main":"client/core.js", - "directories":{ - "lib": "client" - } -} \ No newline at end of file