Skip to content

Commit

Permalink
Update dependencies, gems and regenerate package-lock.json
Browse files Browse the repository at this point in the history
* @rollup/plugin-node-resolve 8.1.0
* popper.js 1.16.1
* qunit 2.10.1
* rollup 2.21.0
  • Loading branch information
XhmikosR committed Jul 9, 2020
1 parent f40e1b6 commit 1930d4e
Show file tree
Hide file tree
Showing 8 changed files with 65 additions and 51 deletions.
4 changes: 2 additions & 2 deletions Gemfile.lock
Expand Up @@ -52,9 +52,9 @@ GEM
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
mini_portile2 (2.4.0)
nokogiri (1.10.9)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
nokogiri (1.10.9-x64-mingw32)
nokogiri (1.10.10-x64-mingw32)
mini_portile2 (~> 2.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
Expand Down
4 changes: 2 additions & 2 deletions _config.yml
Expand Up @@ -63,8 +63,8 @@ cdn:
js_bundle_hash: "sha384-1CmrxMRARb6aLqgBO7yyAxTOQE2AKb9GfXnEo760AUcUmFx3ibVJJAzGytlQcNXd"
jquery: "https://code.jquery.com/jquery-3.5.1.slim.min.js"
jquery_hash: "sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj"
popper: "https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
popper_hash: "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
popper: "https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"
popper_hash: "sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN"

toc:
min_level: 2
Expand Down
4 changes: 2 additions & 2 deletions build/rollup.config.js
Expand Up @@ -2,7 +2,7 @@

const path = require('path')
const { babel } = require('@rollup/plugin-babel')
const resolve = require('@rollup/plugin-node-resolve')
const { nodeResolve } = require('@rollup/plugin-node-resolve')
const banner = require('./banner.js')

const BUNDLE = process.env.BUNDLE === 'true'
Expand All @@ -27,7 +27,7 @@ if (BUNDLE) {
// Remove last entry in external array to bundle Popper
external.pop()
delete globals['popper.js']
plugins.push(resolve())
plugins.push(nodeResolve())
}

module.exports = {
Expand Down
4 changes: 2 additions & 2 deletions js/tests/integration/rollup.bundle.js
@@ -1,8 +1,8 @@
/* eslint-env node */

const resolve = require('@rollup/plugin-node-resolve')
const commonjs = require('@rollup/plugin-commonjs')
const { babel } = require('@rollup/plugin-babel')
const { nodeResolve } = require('@rollup/plugin-node-resolve')

module.exports = {
input: 'js/tests/integration/bundle.js',
Expand All @@ -11,7 +11,7 @@ module.exports = {
format: 'iife'
},
plugins: [
resolve(),
nodeResolve(),
commonjs(),
babel({
exclude: 'node_modules/**',
Expand Down
2 changes: 1 addition & 1 deletion nuget/bootstrap.nuspec
Expand Up @@ -18,7 +18,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<dependencies>
<dependency id="jQuery" version="[3.0.0,4)" />
<dependency id="popper.js" version="[1.16.0,2)" />
<dependency id="popper.js" version="[1.16.1,2)" />
</dependencies>
<tags>css mobile-first responsive front-end framework web</tags>
<contentFiles>
Expand Down
2 changes: 1 addition & 1 deletion nuget/bootstrap.sass.nuspec
Expand Up @@ -18,7 +18,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<dependencies>
<dependency id="jQuery" version="[3.0.0,4)" />
<dependency id="popper.js" version="[1.16.0,2)" />
<dependency id="popper.js" version="[1.16.1,2)" />
</dependencies>
<tags>css sass mobile-first responsive front-end framework web</tags>
<contentFiles>
Expand Down
82 changes: 48 additions & 34 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions package.json
Expand Up @@ -73,7 +73,7 @@
"docs-serve": "bundle exec jekyll serve",
"docs-serve-only": "npm run docs-serve -- --skip-initial-build --no-watch",
"lockfile-lint": "lockfile-lint --allowed-hosts npm --allowed-schemes https: --empty-hostname false --type npm --path package-lock.json",
"update-deps": "ncu -u -x \"jquery,karma-browserstack-launcher,popper.js,qunit,sinon\" && npm update && bundle update && cross-env-shell echo Manually update \\\"site/docs/$npm_package_version_short/assets/js/vendor/\\\"",
"update-deps": "ncu -u -x \"jquery,karma-browserstack-launcher,sinon\" && npm update && bundle update && cross-env-shell echo Manually update \\\"site/docs/$npm_package_version_short/assets/js/vendor/\\\"",
"release": "npm-run-all dist release-sri docs-production release-zip*",
"release-sri": "node build/generate-sri.js",
"release-version": "node build/change-version.js",
Expand Down Expand Up @@ -106,15 +106,15 @@
"dependencies": {},
"peerDependencies": {
"jquery": "1.9.1 - 3",
"popper.js": "^1.16.0"
"popper.js": "^1.16.1"
},
"devDependencies": {
"@babel/cli": "^7.10.4",
"@babel/core": "^7.10.4",
"@babel/preset-env": "^7.10.4",
"@rollup/plugin-babel": "^5.0.4",
"@rollup/plugin-commonjs": "^13.0.0",
"@rollup/plugin-node-resolve": "^7.1.3",
"@rollup/plugin-node-resolve": "^8.1.0",
"autoprefixer": "^9.8.4",
"babel-eslint": "^10.1.0",
"babel-plugin-istanbul": "^6.0.0",
Expand All @@ -140,10 +140,10 @@
"node-sass": "^4.14.1",
"nodemon": "^2.0.4",
"npm-run-all": "^4.1.5",
"popper.js": "^1.16.0",
"popper.js": "^1.16.1",
"postcss-cli": "^7.1.1",
"qunit": "2.9.2",
"rollup": "^2.19.0",
"qunit": "^2.10.1",
"rollup": "^2.21.0",
"shelljs": "^0.8.4",
"shx": "^0.3.2",
"sinon": "^7.5.0",
Expand Down Expand Up @@ -175,7 +175,7 @@
"dependencies": {},
"peerDependencies": {
"jquery": "1.9.1 - 3",
"popper.js": "^1.16.0"
"popper.js": "^1.16.1"
}
}
}

0 comments on commit 1930d4e

Please sign in to comment.