From 38bcf108c9cc2b3b6c4b118710f73669fa8b3c04 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 9 Jul 2020 15:21:41 +0300 Subject: [PATCH] Update dependencies, gems and regenerate package-lock.json (#31261) * @rollup/plugin-node-resolve 8.1.0 * popper.js 1.16.1 * qunit 2.10.1 * rollup 2.21.0 --- Gemfile.lock | 4 +- _config.yml | 4 +- build/rollup.config.js | 4 +- js/tests/integration/rollup.bundle.js | 4 +- nuget/bootstrap.nuspec | 2 +- nuget/bootstrap.sass.nuspec | 2 +- package-lock.json | 82 ++++++++++++++++----------- package.json | 14 ++--- 8 files changed, 65 insertions(+), 51 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7a9e31dc95..65a6db50d0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) diff --git a/_config.yml b/_config.yml index 83b32c0a73..0c958a0948 100644 --- a/_config.yml +++ b/_config.yml @@ -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 diff --git a/build/rollup.config.js b/build/rollup.config.js index 95e412f0e7..6294204cde 100644 --- a/build/rollup.config.js +++ b/build/rollup.config.js @@ -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' @@ -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 = { diff --git a/js/tests/integration/rollup.bundle.js b/js/tests/integration/rollup.bundle.js index e554d8ce47..7e6f662cd6 100644 --- a/js/tests/integration/rollup.bundle.js +++ b/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', @@ -11,7 +11,7 @@ module.exports = { format: 'iife' }, plugins: [ - resolve(), + nodeResolve(), commonjs(), babel({ exclude: 'node_modules/**', diff --git a/nuget/bootstrap.nuspec b/nuget/bootstrap.nuspec index 142f077e4a..9d8d190d3c 100644 --- a/nuget/bootstrap.nuspec +++ b/nuget/bootstrap.nuspec @@ -18,7 +18,7 @@ false - + css mobile-first responsive front-end framework web diff --git a/nuget/bootstrap.sass.nuspec b/nuget/bootstrap.sass.nuspec index c7fa2794e1..72b1e3aaf1 100644 --- a/nuget/bootstrap.sass.nuspec +++ b/nuget/bootstrap.sass.nuspec @@ -18,7 +18,7 @@ false - + css sass mobile-first responsive front-end framework web diff --git a/package-lock.json b/package-lock.json index b0d0dc4650..671d5ebb8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1096,14 +1096,16 @@ } }, "@rollup/plugin-node-resolve": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz", - "integrity": "sha512-RxtSL3XmdTAE2byxekYLnx+98kEUOrPHF/KRVjLH+DEIHy6kjIw7YINQzn+NXiH/NTrQLAwYs0GWB+csWygA9Q==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-8.1.0.tgz", + "integrity": "sha512-ovq7ZM3JJYUUmEjjO+H8tnUdmQmdQudJB7xruX8LFZ1W2q8jXdPUS6SsIYip8ByOApu4RR7729Am9WhCeCMiHA==", "dev": true, "requires": { "@rollup/pluginutils": "^3.0.8", "@types/resolve": "0.0.8", "builtin-modules": "^3.1.0", + "deep-freeze": "^0.0.1", + "deepmerge": "^4.2.2", "is-module": "^1.0.0", "resolve": "^1.14.2" } @@ -1208,9 +1210,9 @@ "dev": true }, "@types/node": { - "version": "14.0.14", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.14.tgz", - "integrity": "sha512-syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ==", + "version": "14.0.20", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.20.tgz", + "integrity": "sha512-MRn/NP3dee8yL5QhbSA6riuwkS+UOcsPUMOIOG3KMUQpuor/2TopdRBu8QaaB4fGU+gz/bzyDWt0FtUbeJ8H1A==", "dev": true }, "@types/normalize-package-data": { @@ -2151,9 +2153,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001094", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001094.tgz", - "integrity": "sha512-ufHZNtMaDEuRBpTbqD93tIQnngmJ+oBknjvr0IbFympSdtFpAUFmNv4mVKbb53qltxFx0nK3iy32S9AqkLzUNA==", + "version": "1.0.30001096", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001096.tgz", + "integrity": "sha512-PFTw9UyVfbkcMEFs82q8XVlRayj7HKvnhu5BLcmjGpv+SNyiWasCcWXPGJuO0rK0dhLRDJmtZcJ+LHUfypbw1w==", "dev": true }, "caseless": { @@ -2760,12 +2762,24 @@ "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true }, + "deep-freeze": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz", + "integrity": "sha1-OgsABd4YZygZ39OM0x+RF5yJPoQ=", + "dev": true + }, "deep-is": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", "dev": true }, + "deepmerge": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", + "dev": true + }, "defaults": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", @@ -2989,9 +3003,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.488", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.488.tgz", - "integrity": "sha512-NReBdOugu1yl8ly+0VDtiQ6Yw/1sLjnvflWq0gvY1nfUXU2PbA+1XAVuEb7ModnwL/MfUPjby7e4pAFnSHiy6Q==", + "version": "1.3.494", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.494.tgz", + "integrity": "sha512-EOZuaDT3L1sCIMAVN5J0nGuGWVq5dThrdl0d8XeDYf4MOzbXqZ19OLKesN8TZj0RxtpYjqHpiw/fR6BKWdMwYA==", "dev": true }, "emoji-regex": { @@ -5220,9 +5234,9 @@ "dev": true }, "js-base64": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.2.tgz", - "integrity": "sha512-1hgLrLIrmCgZG+ID3VoLNLOSwjGnoZa8tyrUdEteMeIzsT6PH7PMLyUvbDwzNE56P3PNxyvuIOx4Uh2E5rzQIw==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.3.tgz", + "integrity": "sha512-fiUvdfCaAXoQTHdKMgTvg6IkecXDcVz6V5rlftUTclF9IKBjMizvSdQaCl/z/6TApDeby5NL+axYou3i0mu1Pg==", "dev": true }, "js-reporters": { @@ -5810,9 +5824,9 @@ } }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", "dev": true }, "lodash.merge": { @@ -6283,9 +6297,9 @@ } }, "node-releases": { - "version": "1.1.58", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz", - "integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==", + "version": "1.1.59", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.59.tgz", + "integrity": "sha512-H3JrdUczbdiwxN5FuJPyCHnGHIFqQ0wWxo+9j1kAXAzqNMAHlo+4I/sYYxpyK0irQ73HgdiyzD32oqQDcU2Osw==", "dev": true }, "node-sass": { @@ -6512,9 +6526,9 @@ } }, "node-watch": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/node-watch/-/node-watch-0.6.0.tgz", - "integrity": "sha512-XAgTL05z75ptd7JSVejH1a2Dm1zmXYhuDr9l230Qk6Z7/7GPcnAs/UyJJ4ggsXSvWil8iOzwQLW0zuGUvHpG8g==", + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/node-watch/-/node-watch-0.6.1.tgz", + "integrity": "sha512-gwQiR7weFRV8mAtT0x0kXkZ18dfRLB45xH7q0hCOVQMLfLb2f1ZaSvR57q4/b/Vj6B0RwMNJYbvb69e1yM7qEA==", "dev": true }, "nodemon": { @@ -7322,9 +7336,9 @@ } }, "popper.js": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.0.tgz", - "integrity": "sha512-+G+EkOPoE5S/zChTpmBSSDYmhXJ5PsW8eMhH8cP/CQHMFPBG/kC9Y5IIw6qNYgdJ+/COf0ddY2li28iHaZRSjw==", + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", + "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", "dev": true }, "posix-character-classes": { @@ -7829,15 +7843,15 @@ "dev": true }, "qunit": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/qunit/-/qunit-2.9.2.tgz", - "integrity": "sha512-wTOYHnioWHcx5wa85Wl15IE7D6zTZe2CQlsodS14yj7s2FZ3MviRnQluspBZsueIDEO7doiuzKlv05yfky1R7w==", + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/qunit/-/qunit-2.10.1.tgz", + "integrity": "sha512-6ntXpabAW+ycodADqsC2QWPr6xLubag3WBujaAfOlltgwkBVDmM0gkB5dS2Mc4RAszmvtYzyYDSMZX5ibwkNWw==", "dev": true, "requires": { "commander": "2.12.2", "js-reporters": "1.2.1", "minimatch": "3.0.4", - "node-watch": "0.6.0", + "node-watch": "0.6.1", "resolve": "1.9.0" }, "dependencies": { @@ -8308,9 +8322,9 @@ } }, "rollup": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.19.0.tgz", - "integrity": "sha512-nny5Vs4jwY3vbQAXgOyU4ZDZqLvMKm/umnsVry/demVL6ve8ke1XhdpYE0eiWencASmx/qFPw6pP8P7MLJl9XA==", + "version": "2.21.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.21.0.tgz", + "integrity": "sha512-BEGgy+wSzux7Ycq58pRiWEOBZaXRXTuvzl1gsm7gqmsAHxkWf9nyA5V2LN9fGSHhhDQd0/C13iRzSh4bbIpWZQ==", "dev": true, "requires": { "fsevents": "~2.1.2" diff --git a/package.json b/package.json index d420be57bf..9b4630bb1e 100644 --- a/package.json +++ b/package.json @@ -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", @@ -106,7 +106,7 @@ "dependencies": {}, "peerDependencies": { "jquery": "1.9.1 - 3", - "popper.js": "^1.16.0" + "popper.js": "^1.16.1" }, "devDependencies": { "@babel/cli": "^7.10.4", @@ -114,7 +114,7 @@ "@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", @@ -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", @@ -175,7 +175,7 @@ "dependencies": {}, "peerDependencies": { "jquery": "1.9.1 - 3", - "popper.js": "^1.16.0" + "popper.js": "^1.16.1" } } }