Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXhmikosR <xhmikosr@gmail.com>2020-07-07 10:23:11 +0300
committerGitHub <noreply@github.com>2020-07-07 10:23:11 +0300
commitbd72dfc41d64f5bdc59c621073990733d1db9f4c (patch)
tree7867f870e52f739fbe411ae8c0e61f19e3d93db5
parent29bba35a7b67bb03017a59fdba364a35097ee8e2 (diff)
Update to `@rollup/plugin-node-resolve` v8.1.0. (#31249)
-rw-r--r--build/rollup.config.js4
-rw-r--r--js/tests/integration/rollup.bundle.js4
-rw-r--r--js/tests/karma.conf.js5
-rw-r--r--package-lock.json20
-rw-r--r--package.json2
5 files changed, 25 insertions, 10 deletions
diff --git a/build/rollup.config.js b/build/rollup.config.js
index a792502172..1ee6745523 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())
}
const rollupConfig = {
diff --git a/js/tests/integration/rollup.bundle.js b/js/tests/integration/rollup.bundle.js
index 0ac6e406ae..9e2ed26c1c 100644
--- a/js/tests/integration/rollup.bundle.js
+++ b/js/tests/integration/rollup.bundle.js
@@ -1,7 +1,7 @@
/* eslint-env node */
-const resolve = require('@rollup/plugin-node-resolve')
const { babel } = require('@rollup/plugin-babel')
+const { nodeResolve } = require('@rollup/plugin-node-resolve')
module.exports = {
input: 'js/tests/integration/bundle.js',
@@ -10,7 +10,7 @@ module.exports = {
format: 'iife'
},
plugins: [
- resolve(),
+ nodeResolve(),
babel({
exclude: 'node_modules/**',
babelHelpers: 'bundled'
diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js
index 8281593e25..e87ee1cc71 100644
--- a/js/tests/karma.conf.js
+++ b/js/tests/karma.conf.js
@@ -1,9 +1,10 @@
/* eslint-env node */
+
const path = require('path')
const ip = require('ip')
const { babel } = require('@rollup/plugin-babel')
const istanbul = require('rollup-plugin-istanbul')
-const resolve = require('@rollup/plugin-node-resolve')
+const { nodeResolve } = require('@rollup/plugin-node-resolve')
const {
browsers,
@@ -79,7 +80,7 @@ const conf = {
// Inline the required helpers in each file
babelHelpers: 'inline'
}),
- resolve()
+ nodeResolve()
],
output: {
format: 'iife',
diff --git a/package-lock.json b/package-lock.json
index 7bfcfd2a7b..71cdf80ba1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1083,14 +1083,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"
}
@@ -3288,12 +3290,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",
diff --git a/package.json b/package.json
index 6d71a43edc..899b08fb4d 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,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",
"bundlewatch": "^0.2.7",
"clean-css-cli": "^4.3.0",