From ce754b88df9e0aab77fbb371c2c73d8aba871fab Mon Sep 17 00:00:00 2001 From: Ben Word Date: Fri, 11 Aug 2017 17:59:18 -0600 Subject: [PATCH] BS4 now requires Popper --- package-lock.json | 22 +++++++++------------- package.json | 1 + resources/assets/build/webpack.config.js | 3 +-- yarn.lock | 4 ++++ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 35f3021..d6d0e27 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "sage", - "version": "9.0.0-beta.3", + "version": "9.0.0-beta.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -655,13 +655,9 @@ } }, "bootstrap": { - "version": "4.0.0-alpha.6", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.0.0-alpha.6.tgz", - "integrity": "sha1-T1TdM6wN6sOyhAe8LffsYIhpycg=", - "requires": { - "jquery": "3.2.1", - "tether": "1.4.0" - } + "version": "4.0.0-beta", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.0.0-beta.tgz", + "integrity": "sha512-I/r3fYtUZr+rUNkh8HI+twxZ56p6ehNn27eA1XSebLVQKAJ2xZHnEvZrSR+UR2A/bONcd9gHC3xatVhQlH6R6w==" }, "brace-expansion": { "version": "1.1.8", @@ -8402,6 +8398,11 @@ "logalot": "2.1.0" } }, + "popper.js": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.11.1.tgz", + "integrity": "sha512-wwp6RVokzjO4qh86qFeTw/zEw8y0uqB1U82LWTUExBDq8EJx/8svxDXVQB2jxTjRX+J+S++tQkbWnbOuOykZFw==" + }, "portscanner": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-2.1.1.tgz", @@ -12640,11 +12641,6 @@ } } }, - "tether": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/tether/-/tether-1.4.0.tgz", - "integrity": "sha1-D5+hcfdb9YSF2BSelHmdeudNHBo=" - }, "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", diff --git a/package.json b/package.json index 6766732..0150079 100644 --- a/package.json +++ b/package.json @@ -127,6 +127,7 @@ }, "dependencies": { "bootstrap": "^4.0.0-beta", + "popper.js": "^1.11.0", "jquery": "1.12.4 - 3" } } diff --git a/resources/assets/build/webpack.config.js b/resources/assets/build/webpack.config.js index b893b8c..2fee5ee 100644 --- a/resources/assets/build/webpack.config.js +++ b/resources/assets/build/webpack.config.js @@ -151,8 +151,7 @@ let webpackConfig = { $: 'jquery', jQuery: 'jquery', 'window.jQuery': 'jquery', - Tether: 'tether', - 'window.Tether': 'tether', + Popper: 'popper.js' }), new webpack.LoaderOptionsPlugin({ minimize: config.enabled.optimize, diff --git a/yarn.lock b/yarn.lock index 4c2f88c..3d125a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4415,6 +4415,10 @@ pngquant-bin@^3.0.0: bin-wrapper "^3.0.0" logalot "^2.0.0" +popper.js@^1.11.0: + version "1.11.1" + resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.11.1.tgz#f5aca9a73bca1ce1fdbd9be8b1ba68677cbdd8e0" + portscanner@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/portscanner/-/portscanner-2.1.1.tgz#eabb409e4de24950f5a2a516d35ae769343fbb96"