Upgrade to bootstrap.native 2.0.26

6f25adf0 · JC Brand · 8bc3aaa2 · 6f25adf0 · 6f25adf0 · 6f25adf0
Commit 6f25adf0 authored Apr 18, 2019 by JC Brand
Showing with 162 additions and 66 deletions

dist/converse.js dist/converse.js +154 -58

package-lock.json package-lock.json +5 -6

package.json package.json +2 -2

webpack.config.js webpack.config.js +1 -0

No files found.
--- a/dist/converse.js
+++ b/dist/converse.js
--- a/package-lock.json
+++ b/package-lock.json
@@ -2686,15 +2686,14 @@
      "dev": true
    },
    "bootstrap.native": {
-      "version": "2.0.24",
+      "version": "2.0.26",
-      "resolved": "https://registry.npmjs.org/bootstrap.native/-/bootstrap.native-2.0.24.tgz",
+      "resolved": "https://registry.npmjs.org/bootstrap.native/-/bootstrap.native-2.0.26.tgz",
-      "integrity": "sha512-yJZNOE9i3W7/yWtidaPGYDRMs5cyOn5W08jfyOV5e4DRm8APF8BiEkEZDsu3xtrNm/fBzUIf+K+u4Qs1qadjxw==",
+      "integrity": "sha512-m1W61Mt3Y3pu6SU24sg5mZ0nHpxpBCVHVGyJGvEuWPjC/9+gpVvv0EEmbKOoLgZ6XU50QLqvNsh4SiKsjVnJTg==",
      "dev": true
    },
    "bootstrap.native-loader": {
-      "version": "1.0.7",
+      "version": "github:conversejs/bootstrap.native-loader#d8fcbc059562136ffd50b305fdc6eb2bde90f006",
-      "resolved": "https://registry.npmjs.org/bootstrap.native-loader/-/bootstrap.native-loader-1.0.7.tgz",
+      "from": "github:conversejs/bootstrap.native-loader#d8fcbc059562136ffd50b305fdc6eb2bde90f006",
-      "integrity": "sha512-P8EnLyAUnwLDeR//cyo+RzwfIVkaUpBrbhry/EbsjZDNLh5HIG6SAmTYU9bZyRRfGlX0ReDBK/SOuQ64qxksRg==",
      "dev": true
    },
    "bourbon": {

--- a/package.json
+++ b/package.json
@@ -42,8 +42,8 @@
    "backbone.overview": "^1.0.2",
    "backbone.vdomview": "^1.0.1",
    "bootstrap": "^4.0.0",
-    "bootstrap.native": "^2.0.24",
+    "bootstrap.native": "^2.0.26",
-    "bootstrap.native-loader": "^1.0.7",
+    "bootstrap.native-loader": "conversejs/bootstrap.native-loader#d8fcbc059562136ffd50b305fdc6eb2bde90f006",
    "bourbon": "^4.3.2",
    "bytebuffer": "^3.5.5",
    "clean-css-cli": "^4.0.10",

--- a/webpack.config.js
+++ b/webpack.config.js
@@ -73,6 +73,7 @@ const config = {
            use: {
                loader: 'bootstrap.native-loader',
                options: {
+                    bs_version: 4,
                    ignore: ['carousel', 'scrollspy']
                }
            }