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

Comparing version 4.0.0 to 4.0.1

CHANGELOG.md

 # rollup-plugin-node-resolve changelog
 
+## 4.0.1 (2019-02-22)
+
+* Fix issue when external modules are specified in `package.browser` ([#143](https://github.com/rollup/rollup-plugin-node-resolve/pull/143) by @keithamus)
+* Fix `package.browser` mapping issue when `false` is specified ([#183](https://github.com/rollup/rollup-plugin-node-resolve/pull/183) by @allex)
+
 ## 4.0.0 (2018-12-09)
@@ -4,0 +9,0 @@

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

@@ -36,3 +36,3 @@ 'use strict';
 				function (err) {
-					if (err.code == 'ENOENT') { return false; }
+					if (err.code === 'ENOENT') { return false; }
 					delete isFileCache[file];
@@ -87,3 +87,3 @@ throw err;
 
-		resolveId: function resolveId$$1 ( importee, importer ) {
+		resolveId: function resolveId ( importee, importer ) {
 			var this$1 = this;
@@ -95,2 +95,3 @@
 
+			// https://github.com/defunctzombie/package-browser-field-spec
 			if (options.browser && browserMapCache[importer]) {
@@ -107,3 +108,2 @@ var resolvedImportee = path.resolve( basedir, importee );
 
-
 			var parts = importee.split( /[/\\]/ );
@@ -132,3 +132,6 @@ var id = parts.shift();
 						packageBrowserField = Object.keys(pkg[ 'browser' ]).reduce(function (browser, key) {
-							var resolved = pkg[ 'browser' ][ key ] === false ? false : path.resolve( pkgRoot, pkg[ 'browser' ][ key ] );
+							var resolved = pkg[ 'browser' ][ key ];
+							if (resolved && resolved[0] === '.') {
+								resolved = path.resolve( pkgRoot, pkg[ 'browser' ][ key ] );
+							}
 							browser[ key ] = resolved;
@@ -173,6 +176,9 @@ if ( key[0] === '.' ) {
 			)
-				.catch(function () { return false; })
 				.then(function (resolved) {
-					if (options.browser && packageBrowserField) {
-						if (packageBrowserField[ resolved ]) {
+					if ( resolved && options.browser && packageBrowserField ) {
+						if ( packageBrowserField.hasOwnProperty(resolved) ) {
+							if (!packageBrowserField[resolved]) {
+								browserMapCache[resolved] = packageBrowserField;
+								return ES6_BROWSER_EMPTY;
+							}
 							resolved = packageBrowserField[ resolved ];
@@ -183,3 +189,3 @@ }
 
-					if ( !disregardResult && resolved !== false ) {
+					if ( !disregardResult ) {
 						if ( !preserveSymlinks && resolved && fs.existsSync( resolved ) ) {
@@ -208,5 +214,6 @@ resolved = fs.realpathSync( resolved );
 					} else {
-						return resolved === false ? null : resolved;
+						return resolved;
 					}
-				});
+				})
+				.catch(function () { return null; });
 		}
@@ -213,0 +220,0 @@ };

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

@@ -1,2 +0,2 @@
-import { dirname, extname, normalize, resolve, sep } from 'path';
+import { dirname, resolve, normalize, sep, extname } from 'path';
 import builtins from 'builtin-modules';
@@ -32,3 +32,3 @@ import resolveId from 'resolve';
 				function (err) {
-					if (err.code == 'ENOENT') { return false; }
+					if (err.code === 'ENOENT') { return false; }
 					delete isFileCache[file];
@@ -83,3 +83,3 @@ throw err;
 
-		resolveId: function resolveId$$1 ( importee, importer ) {
+		resolveId: function resolveId ( importee, importer ) {
 			var this$1 = this;
@@ -91,2 +91,3 @@
 
+			// https://github.com/defunctzombie/package-browser-field-spec
 			if (options.browser && browserMapCache[importer]) {
@@ -103,3 +104,2 @@ var resolvedImportee = resolve( basedir, importee );
 
-
 			var parts = importee.split( /[/\\]/ );
@@ -128,3 +128,6 @@ var id = parts.shift();
 						packageBrowserField = Object.keys(pkg[ 'browser' ]).reduce(function (browser, key) {
-							var resolved = pkg[ 'browser' ][ key ] === false ? false : resolve( pkgRoot, pkg[ 'browser' ][ key ] );
+							var resolved = pkg[ 'browser' ][ key ];
+							if (resolved && resolved[0] === '.') {
+								resolved = resolve( pkgRoot, pkg[ 'browser' ][ key ] );
+							}
 							browser[ key ] = resolved;
@@ -169,6 +172,9 @@ if ( key[0] === '.' ) {
 			)
-				.catch(function () { return false; })
 				.then(function (resolved) {
-					if (options.browser && packageBrowserField) {
-						if (packageBrowserField[ resolved ]) {
+					if ( resolved && options.browser && packageBrowserField ) {
+						if ( packageBrowserField.hasOwnProperty(resolved) ) {
+							if (!packageBrowserField[resolved]) {
+								browserMapCache[resolved] = packageBrowserField;
+								return ES6_BROWSER_EMPTY;
+							}
 							resolved = packageBrowserField[ resolved ];
@@ -179,3 +185,3 @@ }
 
-					if ( !disregardResult && resolved !== false ) {
+					if ( !disregardResult ) {
 						if ( !preserveSymlinks && resolved && fs.existsSync( resolved ) ) {
@@ -204,5 +210,6 @@ resolved = fs.realpathSync( resolved );
 					} else {
-						return resolved === false ? null : resolved;
+						return resolved;
 					}
-				});
+				})
+				.catch(function () { return null; });
 		}
@@ -209,0 +216,0 @@ };

package.json

 {
   "name": "rollup-plugin-node-resolve",
   "description": "Bundle third-party dependencies in node_modules",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "devDependencies": {
     "buble": "^0.19.6",
-    "es5-ext": "^0.10.46",
-    "eslint": "^5.10.0",
-    "mocha": "^5.2.0",
-    "rollup": "^0.67.4",
-    "rollup-plugin-buble": "^0.19.4",
+    "es5-ext": "^0.10.47",
+    "eslint": "^5.14.1",
+    "mocha": "^6.0.0",
+    "rollup": "^1.2.2",
+    "rollup-plugin-buble": "^0.19.6",
     "rollup-plugin-commonjs": "^9.2.0",
@@ -35,3 +35,3 @@ "string-capitalize": "^1.0.1",
     "is-module": "^1.0.0",
-    "resolve": "^1.8.1"
+    "resolve": "^1.10.0"
   },
@@ -38,0 +38,0 @@ "repository": "rollup/rollup-plugin-node-resolve",

src/index.js

@@ -32,3 +32,3 @@ import {dirname, extname, normalize, resolve, sep} from 'path';
 				err => {
-					if (err.code == 'ENOENT') return false;
+					if (err.code === 'ENOENT') return false;
 					delete isFileCache[file];
@@ -86,2 +86,3 @@ throw err;
 
+			// https://github.com/defunctzombie/package-browser-field-spec
 			if (options.browser && browserMapCache[importer]) {
@@ -98,3 +99,2 @@ const resolvedImportee = resolve( basedir, importee );
 
-
 			const parts = importee.split( /[/\\]/ );
@@ -123,3 +123,6 @@ let id = parts.shift();
 						packageBrowserField = Object.keys(pkg[ 'browser' ]).reduce((browser, key) => {
-							const resolved = pkg[ 'browser' ][ key ] === false ? false : resolve( pkgRoot, pkg[ 'browser' ][ key ] );
+							let resolved = pkg[ 'browser' ][ key ];
+							if (resolved && resolved[0] === '.') {
+								resolved = resolve( pkgRoot, pkg[ 'browser' ][ key ] );
+							}
 							browser[ key ] = resolved;
@@ -164,6 +167,9 @@ if ( key[0] === '.' ) {
 			)
-				.catch(() => false)
 				.then(resolved => {
-					if (options.browser && packageBrowserField) {
-						if (packageBrowserField[ resolved ]) {
+					if ( resolved && options.browser && packageBrowserField ) {
+						if ( packageBrowserField.hasOwnProperty(resolved) ) {
+							if (!packageBrowserField[resolved]) {
+								browserMapCache[resolved] = packageBrowserField;
+								return ES6_BROWSER_EMPTY;
+							}
 							resolved = packageBrowserField[ resolved ];
@@ -174,3 +180,3 @@ }
 
-					if ( !disregardResult && resolved !== false ) {
+					if ( !disregardResult ) {
 						if ( !preserveSymlinks && resolved && fs.existsSync( resolved ) ) {
@@ -199,7 +205,8 @@ resolved = fs.realpathSync( resolved );
 					} else {
-						return resolved === false ? null : resolved;
+						return resolved;
 					}
-				});
+				})
+				.catch(() => null);
 		}
 	};
 }

New alerts

Filesystem access

Supply chain risk

Accesses the file system, and could potentially read sensitive data.

Found 1 instance in 1 package

Fixed alerts

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

Filesystem access

Supply chain risk

Accesses the file system, and could potentially read sensitive data.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

30496

3.56%

Lines of code

549

4.57%

Number of medium supply chain risk alerts

0

-100%

Dependency changes

• Updated

  resolve@^1.10.0