rollup-plugin-node-resolve - npm Package Compare versions

Comparing version 3.0.0 to 3.0.1

CHANGELOG.md

 # rollup-plugin-node-resolve changelog
 
+## 3.0.1
+
+* Remove `browser-resolve` dependency ([#127](https://github.com/rollup/rollup-plugin-node-resolve/pull/127))
+
 ## 3.0.0
@@ -4,0 +8,0 @@

dist/rollup-plugin-node-resolve.cjs.js

@@ -7,8 +7,6 @@ 'use strict';
 var builtins = _interopDefault(require('builtin-modules'));
-var _nodeResolve = _interopDefault(require('resolve'));
-var browserResolve = _interopDefault(require('browser-resolve'));
+var resolveId = _interopDefault(require('resolve'));
 var isModule = _interopDefault(require('is-module'));
 var fs = _interopDefault(require('fs'));
 
-var COMMONJS_BROWSER_EMPTY = _nodeResolve.sync( 'browser-resolve/empty.js', __dirname );
 var ES6_BROWSER_EMPTY = path.resolve( __dirname, '../src/empty.js' );
@@ -32,8 +30,8 @@ var CONSOLE_WARN = function () {
 	var jail = options.jail;
+	var browserMapCache = {};
 
 	var onwarn = options.onwarn || CONSOLE_WARN;
-	var resolveId = options.browser ? browserResolve : _nodeResolve;
 
 	if ( options.skip ) {
-		throw new Error( 'options.skip is no longer supported — you should use the main Rollup `externals` option instead' );
+		throw new Error( 'options.skip is no longer supported — you should use the main Rollup `external` option instead' );
 	}
@@ -54,2 +52,13 @@
 
+			if (options.browser && browserMapCache[importer]) {
+				var browser = browserMapCache[importer];
+				if (browser[importee]) {
+					importee = browser[importee];
+				}
+				if (browser[importee] === false) {
+					return ES6_BROWSER_EMPTY;
+				}
+			}
+
+
 			var parts = importee.split( /[\/\\]/ );
@@ -68,2 +77,3 @@ var id = parts.shift();
 				var disregardResult = false;
+				var packageBrowserField = false;
 
@@ -75,3 +85,15 @@ resolveId(
 						packageFilter: function packageFilter ( pkg ) {
-							if ( useModule && pkg[ 'module' ] ) {
+							if (options.browser && typeof pkg[ 'browser' ] === 'object') {
+								packageBrowserField = Object.keys(pkg[ 'browser' ]).reduce(function (browser, key) {
+									browser[ key ] = pkg[ 'browser' ][key];
+									if (key[0] === '.' && !path.extname(key)) { browser[ key + '.js'] = browser[ key + '.json' ] = browser[ key ]; }
+									return browser;
+								}, {});
+							}
+
+							if (options.browser && typeof pkg[ 'browser' ] === 'string') {
+								pkg[ 'main' ] = pkg[ 'browser' ];
+							} else if (options.browser && pkg[ 'browser' ][ pkg[ 'main' ] ]) {
+								pkg[ 'main' ] = pkg[ 'browser' ][ pkg[ 'main' ] ];
+							} else if ( useModule && pkg[ 'module' ] ) {
 								pkg[ 'main' ] = pkg[ 'module' ];
@@ -88,2 +110,4 @@ } else if ( useJsnext && pkg[ 'jsnext:main' ] ) {
 					function ( err, resolved ) {
+						if (options.browser && packageBrowserField) { browserMapCache[resolved] = packageBrowserField; }
+
 						if ( !disregardResult && !err ) {
@@ -94,5 +118,3 @@ if ( resolved && fs.existsSync( resolved ) ) {
 
-							if ( resolved === COMMONJS_BROWSER_EMPTY ) {
-								fulfil( ES6_BROWSER_EMPTY );
-							} else if ( ~builtins.indexOf( resolved ) ) {
+							if ( ~builtins.indexOf( resolved ) ) {
 								fulfil( null );
@@ -99,0 +121,0 @@ } else if ( ~builtins.indexOf( importee ) && preferBuiltins ) {

dist/rollup-plugin-node-resolve.es.js

@@ -1,9 +0,7 @@
-import { dirname, normalize, resolve, sep } from 'path';
+import { dirname, extname, normalize, resolve, sep } from 'path';
 import builtins from 'builtin-modules';
-import _nodeResolve from 'resolve';
-import browserResolve from 'browser-resolve';
+import resolveId from 'resolve';
 import isModule from 'is-module';
 import fs from 'fs';
 
-var COMMONJS_BROWSER_EMPTY = _nodeResolve.sync( 'browser-resolve/empty.js', __dirname );
 var ES6_BROWSER_EMPTY = resolve( __dirname, '../src/empty.js' );
@@ -27,8 +25,8 @@ var CONSOLE_WARN = function () {
 	var jail = options.jail;
+	var browserMapCache = {};
 
 	var onwarn = options.onwarn || CONSOLE_WARN;
-	var resolveId = options.browser ? browserResolve : _nodeResolve;
 
 	if ( options.skip ) {
-		throw new Error( 'options.skip is no longer supported — you should use the main Rollup `externals` option instead' );
+		throw new Error( 'options.skip is no longer supported — you should use the main Rollup `external` option instead' );
 	}
@@ -49,2 +47,13 @@
 
+			if (options.browser && browserMapCache[importer]) {
+				var browser = browserMapCache[importer];
+				if (browser[importee]) {
+					importee = browser[importee];
+				}
+				if (browser[importee] === false) {
+					return ES6_BROWSER_EMPTY;
+				}
+			}
+
+
 			var parts = importee.split( /[\/\\]/ );
@@ -63,2 +72,3 @@ var id = parts.shift();
 				var disregardResult = false;
+				var packageBrowserField = false;
 
@@ -70,3 +80,15 @@ resolveId(
 						packageFilter: function packageFilter ( pkg ) {
-							if ( useModule && pkg[ 'module' ] ) {
+							if (options.browser && typeof pkg[ 'browser' ] === 'object') {
+								packageBrowserField = Object.keys(pkg[ 'browser' ]).reduce(function (browser, key) {
+									browser[ key ] = pkg[ 'browser' ][key];
+									if (key[0] === '.' && !extname(key)) { browser[ key + '.js'] = browser[ key + '.json' ] = browser[ key ]; }
+									return browser;
+								}, {});
+							}
+
+							if (options.browser && typeof pkg[ 'browser' ] === 'string') {
+								pkg[ 'main' ] = pkg[ 'browser' ];
+							} else if (options.browser && pkg[ 'browser' ][ pkg[ 'main' ] ]) {
+								pkg[ 'main' ] = pkg[ 'browser' ][ pkg[ 'main' ] ];
+							} else if ( useModule && pkg[ 'module' ] ) {
 								pkg[ 'main' ] = pkg[ 'module' ];
@@ -83,2 +105,4 @@ } else if ( useJsnext && pkg[ 'jsnext:main' ] ) {
 					function ( err, resolved ) {
+						if (options.browser && packageBrowserField) { browserMapCache[resolved] = packageBrowserField; }
+
 						if ( !disregardResult && !err ) {
@@ -89,5 +113,3 @@ if ( resolved && fs.existsSync( resolved ) ) {
 
-							if ( resolved === COMMONJS_BROWSER_EMPTY ) {
-								fulfil( ES6_BROWSER_EMPTY );
-							} else if ( ~builtins.indexOf( resolved ) ) {
+							if ( ~builtins.indexOf( resolved ) ) {
 								fulfil( null );
@@ -94,0 +116,0 @@ } else if ( ~builtins.indexOf( importee ) && preferBuiltins ) {

package.json

 {
   "name": "rollup-plugin-node-resolve",
   "description": "Bundle third-party dependencies in node_modules",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "devDependencies": {
@@ -32,3 +32,2 @@ "buble": "^0.15.2",
   "dependencies": {
-    "browser-resolve": "^1.11.0",
     "builtin-modules": "^1.1.0",
@@ -35,0 +34,0 @@ "is-module": "^1.0.0",

README.md

@@ -17,10 +17,11 @@ # rollup-plugin-node-resolve
 // rollup.config.js
-import { rollup } from 'rollup';
 import resolve from 'rollup-plugin-node-resolve';
 
 export default {
-  entry: 'main.js',
-  dest: 'bundle.js',
-  moduleName: 'MyModule',
-  format: 'iife'
+  input: 'main.js',
+  output: {
+    file: 'bundle.js',
+    format: 'iife'
+  },
+  name: 'MyModule',
   plugins: [
@@ -77,3 +78,2 @@ resolve({
 // rollup.config.js
-import { rollup } from 'rollup';
 import resolve from 'rollup-plugin-node-resolve';
@@ -83,8 +83,10 @@ import commonjs from 'rollup-plugin-commonjs';
 export default {
-  entry: 'main.js',
-  dest: 'bundle.js',
-  moduleName: 'MyModule',
-  format: 'iife'
+  input: 'main.js',
+  output: {
+    file: 'bundle.js',
+    format: 'iife'
+  },
+  name: 'MyModule',
   plugins: [
-    resolve({ jsnext: true, main: true }),
+    resolve(),
     commonjs()
@@ -91,0 +93,0 @@ ]

src/index.js

@@ -1,9 +0,7 @@
-import { dirname, resolve, normalize, sep } from 'path';
+import { dirname, resolve, extname, normalize, sep } from 'path';
 import builtins from 'builtin-modules';
-import _nodeResolve from 'resolve';
-import browserResolve from 'browser-resolve';
+import resolveId from 'resolve';
 import isModule from 'is-module';
 import fs from 'fs';
 
-const COMMONJS_BROWSER_EMPTY = _nodeResolve.sync( 'browser-resolve/empty.js', __dirname );
 const ES6_BROWSER_EMPTY = resolve( __dirname, '../src/empty.js' );
@@ -20,8 +18,8 @@ const CONSOLE_WARN = ( ...args ) => console.warn( ...args ); // eslint-disable-line no-console
 	const jail = options.jail;
+	const browserMapCache = {};
 
 	const onwarn = options.onwarn || CONSOLE_WARN;
-	const resolveId = options.browser ? browserResolve : _nodeResolve;
 
 	if ( options.skip ) {
-		throw new Error( 'options.skip is no longer supported — you should use the main Rollup `externals` option instead' );
+		throw new Error( 'options.skip is no longer supported — you should use the main Rollup `external` option instead' );
 	}
@@ -42,2 +40,13 @@
 
+			if (options.browser && browserMapCache[importer]) {
+				const browser = browserMapCache[importer];
+				if (browser[importee]) {
+					importee = browser[importee];
+				}
+				if (browser[importee] === false) {
+					return ES6_BROWSER_EMPTY;
+				}
+			}
+
+
 			const parts = importee.split( /[\/\\]/ );
@@ -56,2 +65,3 @@ let id = parts.shift();
 				let disregardResult = false;
+				let packageBrowserField = false;
 
@@ -63,3 +73,15 @@ resolveId(
 						packageFilter ( pkg ) {
-							if ( useModule && pkg[ 'module' ] ) {
+							if (options.browser && typeof pkg[ 'browser' ] === 'object') {
+								packageBrowserField = Object.keys(pkg[ 'browser' ]).reduce((browser, key) => {
+									browser[ key ] = pkg[ 'browser' ][key];
+									if (key[0] === '.' && !extname(key)) browser[ key + '.js'] = browser[ key + '.json' ] = browser[ key ];
+									return browser;
+								}, {});
+							}
+
+							if (options.browser && typeof pkg[ 'browser' ] === 'string') {
+								pkg[ 'main' ] = pkg[ 'browser' ];
+							} else if (options.browser && pkg[ 'browser' ][ pkg[ 'main' ] ]) {
+								pkg[ 'main' ] = pkg[ 'browser' ][ pkg[ 'main' ] ];
+							} else if ( useModule && pkg[ 'module' ] ) {
 								pkg[ 'main' ] = pkg[ 'module' ];
@@ -76,2 +98,4 @@ } else if ( useJsnext && pkg[ 'jsnext:main' ] ) {
 					( err, resolved ) => {
+						if (options.browser && packageBrowserField) browserMapCache[resolved] = packageBrowserField;
+
 						if ( !disregardResult && !err ) {
@@ -82,5 +106,3 @@ if ( resolved && fs.existsSync( resolved ) ) {
 
-							if ( resolved === COMMONJS_BROWSER_EMPTY ) {
-								fulfil( ES6_BROWSER_EMPTY );
-							} else if ( ~builtins.indexOf( resolved ) ) {
+							if ( ~builtins.indexOf( resolved ) ) {
 								fulfil( null );
@@ -87,0 +109,0 @@ } else if ( ~builtins.indexOf( importee ) && preferBuiltins ) {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

20096

increased by12.72%

Dependency count

3

decreased by-25%

Lines of code

363

increased by17.48%

Number of lines in readme file

98

increased by2.08%

Dependency changes

• - Removedbrowser-resolve@^1.11.0

• - Removedbrowser-resolve@1.11.3(transitive)

• - Removedresolve@1.1.7(transitive)