From cf5e691072c62994d2ed7b04eed19276b6b88a7e Mon Sep 17 00:00:00 2001 From: Ashley Grant Date: Wed, 24 Aug 2016 20:54:41 -0400 Subject: [PATCH] fix bootstrap 3.3.7 and add jquery 3.1.0 overrides --- .../github/twbs/bootstrap@3.3.7.json | 30 ++++++++++++------- package-overrides/npm/jquery@3.1.0.json | 3 ++ 2 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 package-overrides/npm/jquery@3.1.0.json diff --git a/package-overrides/github/twbs/bootstrap@3.3.7.json b/package-overrides/github/twbs/bootstrap@3.3.7.json index 7def460..2cf5984 100644 --- a/package-overrides/github/twbs/bootstrap@3.3.7.json +++ b/package-overrides/github/twbs/bootstrap@3.3.7.json @@ -1,12 +1,20 @@ { - "main": "dist/js/bootstrap.js", - "shim": { - "dist/js/bootstrap": { - "deps": ["jquery"], - "exports": "$" - } - }, - "dependencies": { - "jquery": "*" - } -} + "main": "js/bootstrap.js", + "shim": { + "js/bootstrap": { + "deps": [ + "jquery" + ], + "exports": "$" + } + }, + "dependencies": { + "jquery": "jspm:jquery@*" + }, + "files": [ + "dist", + "fonts", + "js", + "css" + ] +} \ No newline at end of file diff --git a/package-overrides/npm/jquery@3.1.0.json b/package-overrides/npm/jquery@3.1.0.json new file mode 100644 index 0000000..3dabf1b --- /dev/null +++ b/package-overrides/npm/jquery@3.1.0.json @@ -0,0 +1,3 @@ +{ + "format": "amd" +}