From 80d8cb791faf405cd0f4fc968aafcad2ba6a3242 Mon Sep 17 00:00:00 2001
From: dannyvdknaap <dannyvdknaap@gmail.com>
Date: Sat, 4 May 2019 18:32:27 +0200
Subject: [PATCH] packages upgrades

---
 package.json            | 30 +++++++++++++++---------------
 rollup.config.js        | 11 ++++++-----
 scss/mixins/_forms.scss |  2 +-
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index b6efe24f..230aad56 100644
--- a/package.json
+++ b/package.json
@@ -45,24 +45,24 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@babel/core": "^7.0.0-beta.38",
-    "@babel/plugin-proposal-object-rest-spread": "^7.0.0-beta.38",
-    "@babel/preset-env": "^7.0.0-beta.38",
-    "babel-core": "^6.25.0",
-    "babel-minify": "^0.2.0",
+    "@babel/core": "^7.4.4",
+    "@babel/plugin-proposal-object-rest-spread": "^7.4.4",
+    "@babel/preset-env": "^7.4.4",
+    "babel-core": "^6.26.3",
+    "babel-minify": "^0.5.0",
     "babel-plugin-module-resolver": "3",
     "babel-plugin-transform-es2015-modules-strip": "^0.1.1",
-    "bootstrap": "^4.0.0",
+    "bootstrap": "^4.3.1",
     "cssnano-cli": "^1.0.5",
-    "jquery": ">=3.0.0",
-    "node-sass": "^4.5.3",
-    "node-sass-tilde-importer": "^1.0.0",
-    "popper.js": "^1.11.0",
-    "prettier": "^1.5.3",
-    "rollup": "^0.50.0",
-    "rollup-plugin-babel": "^4.0.0-beta.0",
-    "rollup-plugin-commonjs": "^8.2.6",
-    "rollup-plugin-node-resolve": "^3.0.2"
+    "jquery": ">=3.4.1",
+    "node-sass": "^4.12.0",
+    "node-sass-tilde-importer": "^1.0.2",
+    "popper.js": "^1.15.0",
+    "prettier": "^1.17.0",
+    "rollup": "^1.11.2",
+    "rollup-plugin-babel": "^4.3.2",
+    "rollup-plugin-commonjs": "^9.3.4",
+    "rollup-plugin-node-resolve": "^4.2.3"
   },
   "files": [
     "dist",
diff --git a/rollup.config.js b/rollup.config.js
index 2d7cf15a..41978759 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -8,14 +8,15 @@ const babelOptions = JSON.parse(fs.readFileSync('./.babelrc'));
 export default {
   output: {
     format: 'umd',
-  },
-  globals: {
-    jquery: 'jQuery',
-    'popper.js': 'Popper',
+    globals: {
+      jquery: 'jQuery',
+      'popper.js': 'Popper',
+    },
   },
   external: ['jquery', 'popper.js'],
   plugins: [
     babel({
+      exclude: 'node_modules/**', // only transpile our source code
       externalHelpersWhitelist: [
         // Include only required helpers
         'defineProperties',
@@ -25,7 +26,7 @@ export default {
       ],
     }),
     resolve({
-      module: true,
+      mainFields: ['module', 'main'], // Default: ['module', 'main']
     }),
     cjs({
       include: ['node_modules/bootstrap/**', 'node_modules/jquery/**'],
diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index f2d78ec2..0bf7fe20 100644
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
@@ -156,7 +156,7 @@
     // on focus set borders and labels to the validation color
 
     // Use the BS provided mixin for the bulk of the color
-    @include form-validation-state("valid", $label-color);
+    @include form-validation-state("valid", $label-color, "none");
 
     [class^='bmd-label'],
     [class*=' bmd-label'] {