-
-
Notifications
You must be signed in to change notification settings - Fork 585
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(commonjs): validate node-resolve peer version (#1038)
- Loading branch information
1 parent
0b9a0e8
commit 0dc11e6
Showing
5 changed files
with
66 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,30 @@ | ||
export default function validateRollupVersion(rollupVersion, peerDependencyVersion) { | ||
const [major, minor] = rollupVersion.split('.').map(Number); | ||
const versionRegexp = /\^(\d+\.\d+)\.\d+/g; | ||
export default function validateVersion(actualVersion, peerDependencyVersion, name) { | ||
const versionRegexp = /\^(\d+\.\d+\.\d+)/g; | ||
let minMajor = Infinity; | ||
let minMinor = Infinity; | ||
let minPatch = Infinity; | ||
let foundVersion; | ||
// eslint-disable-next-line no-cond-assign | ||
while ((foundVersion = versionRegexp.exec(peerDependencyVersion))) { | ||
const [foundMajor, foundMinor] = foundVersion[1].split('.').map(Number); | ||
const [foundMajor, foundMinor, foundPatch] = foundVersion[1].split('.').map(Number); | ||
if (foundMajor < minMajor) { | ||
minMajor = foundMajor; | ||
minMinor = foundMinor; | ||
minPatch = foundPatch; | ||
} | ||
} | ||
if (major < minMajor || (major === minMajor && minor < minMinor)) { | ||
if (!actualVersion) { | ||
throw new Error( | ||
`Insufficient Rollup version: "@rollup/plugin-commonjs" requires at least rollup@${minMajor}.${minMinor} but found rollup@${rollupVersion}.` | ||
`Insufficient ${name} version: "@rollup/plugin-commonjs" requires at least ${name}@${minMajor}.${minMinor}.${minPatch}.` | ||
); | ||
} | ||
const [major, minor, patch] = actualVersion.split('.').map(Number); | ||
if ( | ||
major < minMajor || | ||
(major === minMajor && (minor < minMinor || (minor === minMinor && patch < minPatch))) | ||
) { | ||
throw new Error( | ||
`Insufficient ${name} version: "@rollup/plugin-commonjs" requires at least ${name}@${minMajor}.${minMinor}.${minPatch} but found ${name}@${actualVersion}.` | ||
); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
import * as path from 'path'; | ||
import os from 'os'; | ||
|
||
import resolve from '@rollup/plugin-node-resolve'; | ||
import nodeResolve from '@rollup/plugin-node-resolve'; | ||
|
||
import test from 'ava'; | ||
import { getLocator } from 'locate-character'; | ||
|
@@ -91,7 +91,7 @@ test('supports an object of multiple entry points', async (t) => { | |
b: require.resolve('./fixtures/samples/multiple-entry-points/b.js'), | ||
c: require.resolve('./fixtures/samples/multiple-entry-points/c.js') | ||
}, | ||
plugins: [resolve(), commonjs()] | ||
plugins: [nodeResolve(), commonjs()] | ||
}); | ||
|
||
const { output } = await bundle.generate({ | ||
|
@@ -212,7 +212,7 @@ test.serial('handles symlinked node_modules with preserveSymlinks: false', (t) = | |
throw new Error(`Unexpected warning: ${warning.message}`); | ||
}, | ||
plugins: [ | ||
resolve({ | ||
nodeResolve({ | ||
preserveSymlinks: false, | ||
preferBuiltins: false | ||
}), | ||
|
@@ -400,7 +400,7 @@ test('rewrites top-level defines', async (t) => { | |
test('respects options.external', async (t) => { | ||
const bundle = await rollup({ | ||
input: 'fixtures/samples/external/main.js', | ||
plugins: [resolve(), commonjs()], | ||
plugins: [nodeResolve(), commonjs()], | ||
external: ['baz'] | ||
}); | ||
|
||
|
@@ -731,3 +731,35 @@ test('does not transform typeof exports for mixed modules', async (t) => { | |
t.is(code.includes('typeof exports'), true, '"typeof exports" not found in the code'); | ||
t.snapshot(code); | ||
}); | ||
|
||
test('throws when using an old node_resolve version', async (t) => { | ||
let error = null; | ||
try { | ||
await rollup({ | ||
input: 'ignored', | ||
plugins: [commonjs(), { name: nodeResolve().name }] | ||
}); | ||
} catch (err) { | ||
error = err; | ||
} | ||
t.like(error, { | ||
message: | ||
'Insufficient @rollup/plugin-node-resolve version: "@rollup/plugin-commonjs" requires at least @rollup/[email protected].' | ||
}); | ||
}); | ||
|
||
test('throws when using an inadequate node_resolve version', async (t) => { | ||
let error = null; | ||
try { | ||
await rollup({ | ||
input: 'ignored', | ||
plugins: [commonjs(), { name: nodeResolve().name, version: '13.0.5' }] | ||
}); | ||
} catch (err) { | ||
error = err; | ||
} | ||
t.like(error, { | ||
message: | ||
'Insufficient @rollup/plugin-node-resolve version: "@rollup/plugin-commonjs" requires at least @rollup/[email protected] but found @rollup/[email protected].' | ||
}); | ||
}); |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.