rollup-plugin-node-resolve
Advanced tools
Comparing version 1.7.3 to 2.0.0
# rollup-plugin-node-resolve changelog | ||
## 2.0.0 | ||
* Add support `module` field in package.json as an official alternative to jsnext | ||
## 1.7.3 | ||
@@ -4,0 +8,0 @@ |
@@ -23,2 +23,4 @@ 'use strict'; | ||
var skip = options.skip || []; | ||
var useJsnext = options.jsnext === true; | ||
var useModule = options.module !== false; | ||
var useMain = options.main !== false; | ||
@@ -59,13 +61,12 @@ var isPreferBuiltinsSet = options.preferBuiltins === true || options.preferBuiltins === false; | ||
packageFilter: function packageFilter ( pkg ) { | ||
if ( options.jsnext ) { | ||
var main = pkg[ 'jsnext:main' ]; | ||
if ( main ) { | ||
pkg[ 'main' ] = main; | ||
} else if ( !useMain ) { | ||
if ( skip === true ) accept( false ); | ||
else reject( Error( ("Package " + importee + " (imported by " + importer + ") does not have a jsnext:main field. You should either allow legacy modules with options.main, or skip it with options.skip = ['" + importee + "'])") ) ); | ||
} | ||
} else if ( !useMain ) { | ||
if ( !useJsnext && !useMain && !useModule ) { | ||
if ( skip === true ) accept( false ); | ||
else reject( Error( ("To import from a package in node_modules (" + importee + "), either options.jsnext or options.main must be true") ) ); | ||
else reject( Error( ("To import from a package in node_modules (" + importee + "), either options.jsnext, options.module or options.main must be true") ) ); | ||
} else if ( useModule && pkg[ 'module' ] ) { | ||
pkg[ 'main' ] = pkg[ 'module' ]; | ||
} else if ( useJsnext && pkg[ 'jsnext:main' ] ) { | ||
pkg[ 'main' ] = pkg[ 'jsnext:main' ]; | ||
} else if ( ( useJsnext || useModule ) && !useMain ) { | ||
if ( skip === true ) accept( false ); | ||
else reject( Error( ("Package " + importee + " (imported by " + importer + ") does not have a module or jsnext:main field. You should either allow legacy modules with options.main, or skip it with options.skip = ['" + importee + "'])") ) ); | ||
} | ||
@@ -72,0 +73,0 @@ return pkg; |
@@ -19,2 +19,4 @@ import { resolve, normalize, dirname } from 'path'; | ||
var skip = options.skip || []; | ||
var useJsnext = options.jsnext === true; | ||
var useModule = options.module !== false; | ||
var useMain = options.main !== false; | ||
@@ -55,13 +57,12 @@ var isPreferBuiltinsSet = options.preferBuiltins === true || options.preferBuiltins === false; | ||
packageFilter: function packageFilter ( pkg ) { | ||
if ( options.jsnext ) { | ||
var main = pkg[ 'jsnext:main' ]; | ||
if ( main ) { | ||
pkg[ 'main' ] = main; | ||
} else if ( !useMain ) { | ||
if ( skip === true ) accept( false ); | ||
else reject( Error( ("Package " + importee + " (imported by " + importer + ") does not have a jsnext:main field. You should either allow legacy modules with options.main, or skip it with options.skip = ['" + importee + "'])") ) ); | ||
} | ||
} else if ( !useMain ) { | ||
if ( !useJsnext && !useMain && !useModule ) { | ||
if ( skip === true ) accept( false ); | ||
else reject( Error( ("To import from a package in node_modules (" + importee + "), either options.jsnext or options.main must be true") ) ); | ||
else reject( Error( ("To import from a package in node_modules (" + importee + "), either options.jsnext, options.module or options.main must be true") ) ); | ||
} else if ( useModule && pkg[ 'module' ] ) { | ||
pkg[ 'main' ] = pkg[ 'module' ]; | ||
} else if ( useJsnext && pkg[ 'jsnext:main' ] ) { | ||
pkg[ 'main' ] = pkg[ 'jsnext:main' ]; | ||
} else if ( ( useJsnext || useModule ) && !useMain ) { | ||
if ( skip === true ) accept( false ); | ||
else reject( Error( ("Package " + importee + " (imported by " + importer + ") does not have a module or jsnext:main field. You should either allow legacy modules with options.main, or skip it with options.skip = ['" + importee + "'])") ) ); | ||
} | ||
@@ -68,0 +69,0 @@ return pkg; |
{ | ||
"name": "rollup-plugin-node-resolve", | ||
"description": "Bundle third-party dependencies in node_modules", | ||
"version": "1.7.3", | ||
"version": "2.0.0", | ||
"devDependencies": { | ||
@@ -19,5 +19,5 @@ "buble": "^0.10.6", | ||
"scripts": { | ||
"pretest": "rollup -c", | ||
"test": "mocha", | ||
"pretest": "npm run build", | ||
"build": "rollup -c", | ||
"posttest": "eslint src test/*.js", | ||
"prepublish": "npm test" | ||
@@ -24,0 +24,0 @@ }, |
@@ -14,2 +14,4 @@ import { dirname, resolve, normalize } from 'path'; | ||
const skip = options.skip || []; | ||
const useJsnext = options.jsnext === true; | ||
const useModule = options.module !== false; | ||
const useMain = options.main !== false; | ||
@@ -31,3 +33,3 @@ const isPreferBuiltinsSet = options.preferBuiltins === true || options.preferBuiltins === false; | ||
let parts = importee.split( /[\/\\]/ ); | ||
const parts = importee.split( /[\/\\]/ ); | ||
let id = parts.shift(); | ||
@@ -51,13 +53,12 @@ | ||
packageFilter ( pkg ) { | ||
if ( options.jsnext ) { | ||
const main = pkg[ 'jsnext:main' ]; | ||
if ( main ) { | ||
pkg[ 'main' ] = main; | ||
} else if ( !useMain ) { | ||
if ( skip === true ) accept( false ); | ||
else reject( Error( `Package ${importee} (imported by ${importer}) does not have a jsnext:main field. You should either allow legacy modules with options.main, or skip it with options.skip = ['${importee}'])` ) ); | ||
} | ||
} else if ( !useMain ) { | ||
if ( !useJsnext && !useMain && !useModule ) { | ||
if ( skip === true ) accept( false ); | ||
else reject( Error( `To import from a package in node_modules (${importee}), either options.jsnext or options.main must be true` ) ); | ||
else reject( Error( `To import from a package in node_modules (${importee}), either options.jsnext, options.module or options.main must be true` ) ); | ||
} else if ( useModule && pkg[ 'module' ] ) { | ||
pkg[ 'main' ] = pkg[ 'module' ]; | ||
} else if ( useJsnext && pkg[ 'jsnext:main' ] ) { | ||
pkg[ 'main' ] = pkg[ 'jsnext:main' ]; | ||
} else if ( ( useJsnext || useModule ) && !useMain ) { | ||
if ( skip === true ) accept( false ); | ||
else reject( Error( `Package ${importee} (imported by ${importer}) does not have a module or jsnext:main field. You should either allow legacy modules with options.main, or skip it with options.skip = ['${importee}'])` ) ); | ||
} | ||
@@ -64,0 +65,0 @@ return pkg; |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
16226
257