Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Jul 7, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
596ce92
Update to `@rollup/plugin-node-resolve` v8.1.0.
XhmikosR Jun 22, 2020
9f25bda
Merge branch 'main' into rollup-node-resolve
XhmikosR Jul 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
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())
}

const rollupConfig = {
Expand Down
4 changes: 2 additions & 2 deletions js/tests/integration/rollup.bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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',
Expand All @@ -10,7 +10,7 @@ module.exports = {
format: 'iife'
},
plugins: [
resolve(),
nodeResolve(),
babel({
exclude: 'node_modules/**',
babelHelpers: 'bundled'
Expand Down
5 changes: 3 additions & 2 deletions js/tests/karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -79,7 +80,7 @@ const conf = {
// Inline the required helpers in each file
babelHelpers: 'inline'
}),
resolve()
nodeResolve()
],
output: {
format: 'iife',
Expand Down
20 changes: 17 additions & 3 deletions package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down