1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00

Update to @rollup/plugin-node-resolve v8.1.0. (#31249)

This commit is contained in:
XhmikosR 2020-07-07 10:23:11 +03:00 committed by GitHub
parent 29bba35a7b
commit bd72dfc41d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 10 deletions

View file

@ -2,7 +2,7 @@
const path = require('path') const path = require('path')
const { babel } = require('@rollup/plugin-babel') 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 banner = require('./banner.js')
const BUNDLE = process.env.BUNDLE === 'true' const BUNDLE = process.env.BUNDLE === 'true'
@ -27,7 +27,7 @@ if (BUNDLE) {
// Remove last entry in external array to bundle Popper // Remove last entry in external array to bundle Popper
external.pop() external.pop()
delete globals['popper.js'] delete globals['popper.js']
plugins.push(resolve()) plugins.push(nodeResolve())
} }
const rollupConfig = { const rollupConfig = {

View file

@ -1,7 +1,7 @@
/* eslint-env node */ /* eslint-env node */
const resolve = require('@rollup/plugin-node-resolve')
const { babel } = require('@rollup/plugin-babel') const { babel } = require('@rollup/plugin-babel')
const { nodeResolve } = require('@rollup/plugin-node-resolve')
module.exports = { module.exports = {
input: 'js/tests/integration/bundle.js', input: 'js/tests/integration/bundle.js',
@ -10,7 +10,7 @@ module.exports = {
format: 'iife' format: 'iife'
}, },
plugins: [ plugins: [
resolve(), nodeResolve(),
babel({ babel({
exclude: 'node_modules/**', exclude: 'node_modules/**',
babelHelpers: 'bundled' babelHelpers: 'bundled'

View file

@ -1,9 +1,10 @@
/* eslint-env node */ /* eslint-env node */
const path = require('path') const path = require('path')
const ip = require('ip') const ip = require('ip')
const { babel } = require('@rollup/plugin-babel') const { babel } = require('@rollup/plugin-babel')
const istanbul = require('rollup-plugin-istanbul') const istanbul = require('rollup-plugin-istanbul')
const resolve = require('@rollup/plugin-node-resolve') const { nodeResolve } = require('@rollup/plugin-node-resolve')
const { const {
browsers, browsers,
@ -79,7 +80,7 @@ const conf = {
// Inline the required helpers in each file // Inline the required helpers in each file
babelHelpers: 'inline' babelHelpers: 'inline'
}), }),
resolve() nodeResolve()
], ],
output: { output: {
format: 'iife', format: 'iife',

20
package-lock.json generated
View file

@ -1083,14 +1083,16 @@
} }
}, },
"@rollup/plugin-node-resolve": { "@rollup/plugin-node-resolve": {
"version": "7.1.3", "version": "8.1.0",
"resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz", "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-8.1.0.tgz",
"integrity": "sha512-RxtSL3XmdTAE2byxekYLnx+98kEUOrPHF/KRVjLH+DEIHy6kjIw7YINQzn+NXiH/NTrQLAwYs0GWB+csWygA9Q==", "integrity": "sha512-ovq7ZM3JJYUUmEjjO+H8tnUdmQmdQudJB7xruX8LFZ1W2q8jXdPUS6SsIYip8ByOApu4RR7729Am9WhCeCMiHA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@rollup/pluginutils": "^3.0.8", "@rollup/pluginutils": "^3.0.8",
"@types/resolve": "0.0.8", "@types/resolve": "0.0.8",
"builtin-modules": "^3.1.0", "builtin-modules": "^3.1.0",
"deep-freeze": "^0.0.1",
"deepmerge": "^4.2.2",
"is-module": "^1.0.0", "is-module": "^1.0.0",
"resolve": "^1.14.2" "resolve": "^1.14.2"
} }
@ -3288,12 +3290,24 @@
"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
"dev": true "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": { "deep-is": {
"version": "0.1.3", "version": "0.1.3",
"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
"dev": true "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": { "defaults": {
"version": "1.0.3", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",

View file

@ -97,7 +97,7 @@
"@babel/preset-env": "^7.10.4", "@babel/preset-env": "^7.10.4",
"@rollup/plugin-babel": "^5.0.4", "@rollup/plugin-babel": "^5.0.4",
"@rollup/plugin-commonjs": "^13.0.0", "@rollup/plugin-commonjs": "^13.0.0",
"@rollup/plugin-node-resolve": "^7.1.3", "@rollup/plugin-node-resolve": "^8.1.0",
"autoprefixer": "^9.8.4", "autoprefixer": "^9.8.4",
"bundlewatch": "^0.2.7", "bundlewatch": "^0.2.7",
"clean-css-cli": "^4.3.0", "clean-css-cli": "^4.3.0",