Skip to content

Commit

Permalink
packages upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
dvdknaap committed May 4, 2019
1 parent da0896d commit 80d8cb7
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 21 deletions.
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
11 changes: 6 additions & 5 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -25,7 +26,7 @@ export default {
],
}),
resolve({
module: true,
mainFields: ['module', 'main'], // Default: ['module', 'main']
}),
cjs({
include: ['node_modules/bootstrap/**', 'node_modules/jquery/**'],
Expand Down
2 changes: 1 addition & 1 deletion scss/mixins/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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'] {
Expand Down

0 comments on commit 80d8cb7

Please sign in to comment.