From b676c23d92c76709d5b53397042ab9cab9fd25e5 Mon Sep 17 00:00:00 2001 From: Greg Smith Date: Sat, 3 Dec 2016 10:43:51 -0800 Subject: [PATCH] Migrates jquery-ui to npm package jquery-ui has been updated in the regristry to point to npm:jquery-ui instead of github:components/jqueryui. Further, package-overrides that pointed at the github:components version of both jquery-ui and jquery have been updated to rely on the npm version of the package. Fixes #1008 --- package-overrides/github/CodeSeven/toastr@2.1.1.json | 2 +- package-overrides/github/CodeSeven/toastr@2.1.2.json | 2 +- package-overrides/github/Dogfalo/materialize@0.96.1.json | 2 +- package-overrides/github/Dogfalo/materialize@0.97.0.json | 2 +- package-overrides/github/Dogfalo/materialize@0.97.3.json | 2 +- .../github/Semantic-Org/Semantic-UI@1.11.8.json | 2 +- package-overrides/github/allpro/layout@1.4.3.json | 4 ++-- package-overrides/github/components/jquery@2.0.3.json | 5 ----- package-overrides/github/components/jquery@2.1.0.json | 3 --- package-overrides/github/components/jqueryui@1.11.3.json | 7 ------- package-overrides/github/fronteed/iCheck@1.0.2.json | 2 +- package-overrides/github/gvas/knockout-jqueryui@2.2.2.json | 2 +- package-overrides/github/heelhook/chardin.js@0.1.3.json | 2 +- .../github/kendo-labs/bower-kendo-ui@2015.1.511.json | 2 +- .../malihu/malihu-custom-scrollbar-plugin@3.0.8.json | 2 +- package-overrides/github/mar10/fancytree@2.8.0.json | 4 ++-- .../github/rniemeyer/knockout-sortable@0.12.0.json | 6 +++--- .../github/seiyria/bootstrap-slider@4.5.4.json | 2 +- .../github/timdream/wordcloud2.js@master.json | 2 +- package-overrides/github/twbs/bootstrap@4.0.0-alpha.json | 2 +- package-overrides/github/zurb/bower-foundation@5.0.2.json | 2 +- package-overrides/github/zurb/bower-foundation@5.5.1.json | 2 +- package-overrides/github/zurb/foundation@6.1.2.json | 2 +- package-overrides/npm/foundation-sites@5.5.1.json | 2 +- package-overrides/npm/materialize-css@0.97.5.json | 2 +- registry.json | 2 +- 26 files changed, 27 insertions(+), 42 deletions(-) delete mode 100644 package-overrides/github/components/jquery@2.0.3.json delete mode 100644 package-overrides/github/components/jquery@2.1.0.json delete mode 100644 package-overrides/github/components/jqueryui@1.11.3.json diff --git a/package-overrides/github/CodeSeven/toastr@2.1.1.json b/package-overrides/github/CodeSeven/toastr@2.1.1.json index 93b93f3..a42be57 100644 --- a/package-overrides/github/CodeSeven/toastr@2.1.1.json +++ b/package-overrides/github/CodeSeven/toastr@2.1.1.json @@ -2,7 +2,7 @@ "main": "toastr", "format": "global", "dependencies": { - "jquery": "github:components/jquery", + "jquery": "npm:jquery", "css": "github:systemjs/plugin-css" }, "files": ["toastr.js", "toastr.css", "build"], diff --git a/package-overrides/github/CodeSeven/toastr@2.1.2.json b/package-overrides/github/CodeSeven/toastr@2.1.2.json index bd5a798..961fcbe 100644 --- a/package-overrides/github/CodeSeven/toastr@2.1.2.json +++ b/package-overrides/github/CodeSeven/toastr@2.1.2.json @@ -2,7 +2,7 @@ "main": "toastr", "format": "global", "dependencies": { - "jquery": "github:components/jquery", + "jquery": "npm:jquery", "css": "github:systemjs/plugin-css" }, "files": ["toastr.js", "build"], diff --git a/package-overrides/github/Dogfalo/materialize@0.96.1.json b/package-overrides/github/Dogfalo/materialize@0.96.1.json index f3124cb..994d79a 100644 --- a/package-overrides/github/Dogfalo/materialize@0.96.1.json +++ b/package-overrides/github/Dogfalo/materialize@0.96.1.json @@ -10,7 +10,7 @@ } }, "dependencies": { - "jquery": "github:components/jquery", + "jquery": "npm:jquery", "css": "github:systemjs/plugin-css" } } diff --git a/package-overrides/github/Dogfalo/materialize@0.97.0.json b/package-overrides/github/Dogfalo/materialize@0.97.0.json index f3124cb..994d79a 100644 --- a/package-overrides/github/Dogfalo/materialize@0.97.0.json +++ b/package-overrides/github/Dogfalo/materialize@0.97.0.json @@ -10,7 +10,7 @@ } }, "dependencies": { - "jquery": "github:components/jquery", + "jquery": "npm:jquery", "css": "github:systemjs/plugin-css" } } diff --git a/package-overrides/github/Dogfalo/materialize@0.97.3.json b/package-overrides/github/Dogfalo/materialize@0.97.3.json index 0502560..9239853 100644 --- a/package-overrides/github/Dogfalo/materialize@0.97.3.json +++ b/package-overrides/github/Dogfalo/materialize@0.97.3.json @@ -10,7 +10,7 @@ } }, "dependencies": { - "jquery": "github:components/jquery", + "jquery": "npm:jquery", "css": "github:systemjs/plugin-css" } } diff --git a/package-overrides/github/Semantic-Org/Semantic-UI@1.11.8.json b/package-overrides/github/Semantic-Org/Semantic-UI@1.11.8.json index ea705d2..3441bd4 100644 --- a/package-overrides/github/Semantic-Org/Semantic-UI@1.11.8.json +++ b/package-overrides/github/Semantic-Org/Semantic-UI@1.11.8.json @@ -13,7 +13,7 @@ } }, "dependencies": { - "jquery": "github:components/jquery", + "jquery": "npm:jquery", "css": "github:systemjs/plugin-css" } } \ No newline at end of file diff --git a/package-overrides/github/allpro/layout@1.4.3.json b/package-overrides/github/allpro/layout@1.4.3.json index 4505be5..538caa5 100644 --- a/package-overrides/github/allpro/layout@1.4.3.json +++ b/package-overrides/github/allpro/layout@1.4.3.json @@ -5,8 +5,8 @@ "lib": "source/stable" }, "dependencies": { - "jquery": "github:components/jquery", - "jquery-ui": "github:components/jqueryui" + "jquery": "npm:jquery", + "jquery-ui": "npm:jquery-ui" }, "shim": { "jquery-ui-layout": { diff --git a/package-overrides/github/components/jquery@2.0.3.json b/package-overrides/github/components/jquery@2.0.3.json deleted file mode 100644 index 81d7941..0000000 --- a/package-overrides/github/components/jquery@2.0.3.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "main": "jquery", - "files": ["jquery.js"], - "format": "global" -} diff --git a/package-overrides/github/components/jquery@2.1.0.json b/package-overrides/github/components/jquery@2.1.0.json deleted file mode 100644 index 3e1e374..0000000 --- a/package-overrides/github/components/jquery@2.1.0.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "main": "jquery" -} diff --git a/package-overrides/github/components/jqueryui@1.11.3.json b/package-overrides/github/components/jqueryui@1.11.3.json deleted file mode 100644 index 68c746d..0000000 --- a/package-overrides/github/components/jqueryui@1.11.3.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "main": "jquery-ui.js", - "registry": "jspm", - "dependencies": { - "jquery": "*" - } -} diff --git a/package-overrides/github/fronteed/iCheck@1.0.2.json b/package-overrides/github/fronteed/iCheck@1.0.2.json index 836cf8f..5a603a8 100644 --- a/package-overrides/github/fronteed/iCheck@1.0.2.json +++ b/package-overrides/github/fronteed/iCheck@1.0.2.json @@ -4,7 +4,7 @@ "format": "global", "files":["icheck.js","icheck.min.js","skins/**/*"], "dependencies": { - "jquery": "github:components/jquery" + "jquery": "npm:jquery" }, "shim":{ "icheck": ["jquery"], diff --git a/package-overrides/github/gvas/knockout-jqueryui@2.2.2.json b/package-overrides/github/gvas/knockout-jqueryui@2.2.2.json index 7b938f6..d271e7b 100644 --- a/package-overrides/github/gvas/knockout-jqueryui@2.2.2.json +++ b/package-overrides/github/gvas/knockout-jqueryui@2.2.2.json @@ -2,7 +2,7 @@ "main": false, "dependencies": { "jquery": "npm:jquery", - "jqueryui": "github:components/jqueryui", + "jqueryui": "npm:jquery-ui", "knockout": "github:knockout/knockout" }, "map": { diff --git a/package-overrides/github/heelhook/chardin.js@0.1.3.json b/package-overrides/github/heelhook/chardin.js@0.1.3.json index e657650..e35cccf 100644 --- a/package-overrides/github/heelhook/chardin.js@0.1.3.json +++ b/package-overrides/github/heelhook/chardin.js@0.1.3.json @@ -9,7 +9,7 @@ ] }, "dependencies": { - "jquery": "github:components/jquery", + "jquery": "npm:jquery", "css": "github:systemjs/plugin-css" } } \ No newline at end of file diff --git a/package-overrides/github/kendo-labs/bower-kendo-ui@2015.1.511.json b/package-overrides/github/kendo-labs/bower-kendo-ui@2015.1.511.json index 50000f4..09db729 100644 --- a/package-overrides/github/kendo-labs/bower-kendo-ui@2015.1.511.json +++ b/package-overrides/github/kendo-labs/bower-kendo-ui@2015.1.511.json @@ -8,6 +8,6 @@ } }, "dependencies": { - "jquery": "github:components/jquery" + "jquery": "npm:jquery" } } diff --git a/package-overrides/github/malihu/malihu-custom-scrollbar-plugin@3.0.8.json b/package-overrides/github/malihu/malihu-custom-scrollbar-plugin@3.0.8.json index 5c574c5..707d4c1 100644 --- a/package-overrides/github/malihu/malihu-custom-scrollbar-plugin@3.0.8.json +++ b/package-overrides/github/malihu/malihu-custom-scrollbar-plugin@3.0.8.json @@ -10,7 +10,7 @@ "registry": "jspm", "format": "global", "dependencies": { - "jquery": "github:components/jquery" + "jquery": "npm:jquery" }, "shim": { "jquery.mCustomScrollbar": { diff --git a/package-overrides/github/mar10/fancytree@2.8.0.json b/package-overrides/github/mar10/fancytree@2.8.0.json index f5e1b48..e8423ab 100644 --- a/package-overrides/github/mar10/fancytree@2.8.0.json +++ b/package-overrides/github/mar10/fancytree@2.8.0.json @@ -5,8 +5,8 @@ "lib": "dist" }, "dependencies": { - "jquery": "github:components/jquery", - "jquery-ui": "github:components/jqueryui" + "jquery": "npm:jquery", + "jquery-ui": "npm:jquery-ui" }, "shim": { "jquery-fancytree": { diff --git a/package-overrides/github/rniemeyer/knockout-sortable@0.12.0.json b/package-overrides/github/rniemeyer/knockout-sortable@0.12.0.json index c6d62d2..d739c74 100644 --- a/package-overrides/github/rniemeyer/knockout-sortable@0.12.0.json +++ b/package-overrides/github/rniemeyer/knockout-sortable@0.12.0.json @@ -5,12 +5,12 @@ ], "main": "build/knockout-sortable.js", "dependencies": { - "jquery": "github:components/jquery@^2.1.4", - "jquery-ui": "github:components/jqueryui@^1.11.4", + "jquery": "npm:jquery@^2.1.4", + "jquery-ui": "npm:jquery-ui@^1.11.4", "knockout": "github:knockout/knockout@^3.3.0" }, "map": { "jquery-ui/draggable": "jquery-ui/ui/draggable", "jquery-ui/sortable": "jquery-ui/ui/sortable" } -} \ No newline at end of file +} diff --git a/package-overrides/github/seiyria/bootstrap-slider@4.5.4.json b/package-overrides/github/seiyria/bootstrap-slider@4.5.4.json index f3c11e9..80d2046 100644 --- a/package-overrides/github/seiyria/bootstrap-slider@4.5.4.json +++ b/package-overrides/github/seiyria/bootstrap-slider@4.5.4.json @@ -3,7 +3,7 @@ "format": "global", "files": ["dist/*","css/*","js/*","less/*","sass/*"], "dependencies": { - "jquery": "github:components/jquery" + "jquery": "npm:jquery" }, "shim":{ "js/bootstrap-slider": ["jquery"], diff --git a/package-overrides/github/timdream/wordcloud2.js@master.json b/package-overrides/github/timdream/wordcloud2.js@master.json index 24a2a34..d37fae3 100644 --- a/package-overrides/github/timdream/wordcloud2.js@master.json +++ b/package-overrides/github/timdream/wordcloud2.js@master.json @@ -3,6 +3,6 @@ "lib": "src" }, "shim": { - "wordcloud2.js": "github:components/jquery" + "wordcloud2.js": "npm:jquery" } } diff --git a/package-overrides/github/twbs/bootstrap@4.0.0-alpha.json b/package-overrides/github/twbs/bootstrap@4.0.0-alpha.json index 28da33f..d2066f3 100644 --- a/package-overrides/github/twbs/bootstrap@4.0.0-alpha.json +++ b/package-overrides/github/twbs/bootstrap@4.0.0-alpha.json @@ -16,6 +16,6 @@ } }, "dependencies": { - "jquery": "github:components/jquery" + "jquery": "npm:jquery" } } diff --git a/package-overrides/github/zurb/bower-foundation@5.0.2.json b/package-overrides/github/zurb/bower-foundation@5.0.2.json index 248a192..ed2cd41 100644 --- a/package-overrides/github/zurb/bower-foundation@5.0.2.json +++ b/package-overrides/github/zurb/bower-foundation@5.0.2.json @@ -7,7 +7,7 @@ } }, "dependencies": { - "jquery": "github:components/jquery" + "jquery": "npm:jquery" }, "ignore": [ "js/foundation.min.js", diff --git a/package-overrides/github/zurb/bower-foundation@5.5.1.json b/package-overrides/github/zurb/bower-foundation@5.5.1.json index c279d7e..47be2bf 100644 --- a/package-overrides/github/zurb/bower-foundation@5.5.1.json +++ b/package-overrides/github/zurb/bower-foundation@5.5.1.json @@ -9,7 +9,7 @@ } }, "dependencies": { - "jquery": "github:components/jquery" + "jquery": "npm:jquery" }, "ignore": [ "js/foundation.min.js", diff --git a/package-overrides/github/zurb/foundation@6.1.2.json b/package-overrides/github/zurb/foundation@6.1.2.json index 6f1809f..bdfb1df 100644 --- a/package-overrides/github/zurb/foundation@6.1.2.json +++ b/package-overrides/github/zurb/foundation@6.1.2.json @@ -8,6 +8,6 @@ } }, "dependencies": { - "jQuery": "github:components/jquery" + "jQuery": "npm:jquery" } } diff --git a/package-overrides/npm/foundation-sites@5.5.1.json b/package-overrides/npm/foundation-sites@5.5.1.json index 2b428c7..8c3e0df 100644 --- a/package-overrides/npm/foundation-sites@5.5.1.json +++ b/package-overrides/npm/foundation-sites@5.5.1.json @@ -9,6 +9,6 @@ } }, "dependencies": { - "jquery": "github:components/jquery" + "jquery": "npm:jquery" } } diff --git a/package-overrides/npm/materialize-css@0.97.5.json b/package-overrides/npm/materialize-css@0.97.5.json index bcdf11d..9944aa3 100644 --- a/package-overrides/npm/materialize-css@0.97.5.json +++ b/package-overrides/npm/materialize-css@0.97.5.json @@ -2,7 +2,7 @@ "format": "global", "main": "dist/js/materialize", "dependencies": { - "jquery": "github:components/jquery", + "jquery": "npm:jquery", "css": "github:systemjs/plugin-css" }, "shim": { diff --git a/registry.json b/registry.json index a4d89e7..bbcaf63 100644 --- a/registry.json +++ b/registry.json @@ -348,7 +348,7 @@ "jiff": "github:cujojs/jiff", "joi": "github:capaj/joi-browser", "jquery": "npm:jquery", - "jquery-ui": "github:components/jqueryui", + "jquery-ui": "npm:jquery-ui", "jquery-ui-layout": "github:allpro/layout", "jquery-autosize": "github:jackmoore/autosize", "jquery-custom-selection": "github:michalstocki/jquery-custom-selection",