@rollup/plugin-node-resolve 6.0.0 → 6.1.0

package/CHANGELOG.md

@@ -1,10 +1,26 @@
-# @rollup/plugin-node-resolve Change Log
+# @rollup/plugin-node-resolve ChangeLog
+
+## v6.1.0
+
+_2020-01-04_
+
+### Bugfixes
+
+- fix: allow deduplicating custom module dirs (#101)
+
+### Features
+
+- feat: add rootDir option (#98)
+
+### Updates
+
+- docs: improve doc related to mainFields (#138)
 
 ## 6.0.0
 
 _2019-11-25_
 
-- **Breaking:** Minimum compatible Rollup version is 1.2.0
+- **Breaking:** Minimum compatible Rollup version is 1.20.0
 - **Breaking:** Minimum supported Node version is 8.0.0
 - Published as @rollup/plugin-node-resolve
 

package/README.md

@@ -46,45 +46,40 @@ Then call `rollup` either via the [CLI](https://www.rollupjs.org/guide/en/#comma
 
 ### `mainFields`
 
-Type: `Array[String]`<br>
-Default: `['module', 'main']`
+Type: `Array[...String]`<br>
+Default: `['module', 'main']`<br>
+Valid values: `['browser', 'jsnext', 'module', 'main']`
 
-The fields to scan in a package.json to determine the entry point if this list contains "browser", overrides specified in "pkg.browser" will be used
+Specifies the properties to scan within a `package.json`, used to determine the bundle entry point. The order of property names is significant, as the first-found property is used as the resolved entry point. If the array contains `'browser'`, key/values specified in the `package.json` `browser` property will be used.
 
 ### `module`
 
-Type: `Boolean`<br>
-Default: `true`
-
 DEPRECATED: use "mainFields" instead
-Use "module" field for ES6 module if possible
 
-### `jsnext`
+Use `pkg.module` field for ES6 module if possible. This option takes precedence over both "jsnext" and "main" in the list if such are present.
 
-Type: `Boolean`<br>
-Default: `false`
+### `jsnext`
 
 DEPRECATED: use "mainFields" instead
-Use "jsnext:main" if possible, legacy field pointing to ES6 module in third-party libraries, deprecated in favor of "pkg.module", see: https://github.com/rollup/rollup/wiki/pkg.module
 
-### `main`
+Use `pkg['jsnext:main']` if possible, legacy field pointing to ES6 module in third-party libraries, deprecated in favor of `pkg.module`, see: https://github.com/rollup/rollup/wiki/pkg.module. This option takes precedence over "main" in the list if such is present.
 
-Type: `Boolean`<br>
-Default: `true`
+### `main`
 
 DEPRECATED: use "mainFields" instead
-Use "main" field or index.js, even if it's not an ES6 module (needs to be converted from CommonJS to ES6) – see https://github.com/rollup/rollup-plugin-commonjs
+
+Use `pkg.main` field or index.js, even if it's not an ES6 module (needs to be converted from CommonJS to ES6), see https://github.com/rollup/rollup-plugin-commonjs.
 
 ### `browser`
 
 Type: `Boolean`<br>
 Default: `false`
 
-Some package.json files have a "browser" field which specifies alternative files to load for people bundling for the browser. If that's you, either use this option or add "browser" to the "mainFields" option, otherwise pkg.browser will be ignored
+If `true`, instructs the plugin to use the `"browser"` property in `package.json` files to specify alternative files to load for bundling. This is useful when bundling for a browser environment. Alternatively, a value of `'browser'` can be added to the `mainFields` option. If `false`, any `"browser"` properties in package files will be ignored. This option takes precedence over `mainFields`.
 
 ### `extensions`
 
-Type: `Array[String]`<br>
+Type: `Array[...String]`<br>
 Default: `['.mjs', '.js', '.json', '.node']`
 
 Resolve extensions other than .js in the order specified.
@@ -105,7 +100,7 @@ Lock the module search in this path (like a chroot). Modules defined outside thi
 
 ### `only`
 
-Type: `Array[String|RegExp]`<br>
+Type: `Array[...String|RegExp]`<br>
 Default: `null`
 
 Example: `only: ['some_module', /^@some_scope\/.*$/]`
@@ -119,7 +114,7 @@ If true, inspect resolved files to check that they are ES2015 modules.
 
 ### `dedupe`
 
-Type: `Array[String]`<br>
+Type: `Array[...String]`<br>
 Default: `[]`
 
 Force resolving for these modules to root's node_modules that helps to prevent bundling the same package multiple times if package is imported from dependencies.
@@ -141,14 +136,26 @@ customResolveOptions: {
 }
 ```
 
-## Using with rollup-plugin-commonjs
+### `rootDir`
+
+Type: `String`<br>
+Default: `process.cwd()`
+
+Root directory to resolve modules from. Used when resolving entrypoint imports, and when resolving deduplicated modules. Useful when executing rollup in a package of a monorepository.
+
+```
+// Set the root directory to be the parent folder
+rootDir: path.join(process.cwd(), '..')
+```
+
+## Using with @rollup/plugin-commonjs
 
-Since most packages in your node_modules folder are probably legacy CommonJS rather than JavaScript modules, you may need to use [rollup-plugin-commonjs](https://github.com/rollup/rollup-plugin-commonjs):
+Since most packages in your node_modules folder are probably legacy CommonJS rather than JavaScript modules, you may need to use [@rollup/plugin-commonjs](https://github.com/rollup/plugins/packages/commonjs):
 
 ```js
 // rollup.config.js
 import resolve from '@rollup/plugin-node-resolve';
-import commonjs from 'rollup-plugin-commonjs';
+import commonjs from '@rollup/plugin-commonjs';
 
 export default {
   input: 'main.js',

package/dist/index.es.js

@@ -1,4 +1,4 @@
-import { dirname, join, resolve, normalize, sep, extname } from 'path';
+import { dirname, resolve, normalize, sep, extname } from 'path';
 import fs, { realpathSync } from 'fs';
 import builtinList from 'builtin-modules';
 import resolveId from 'resolve';
@@ -166,6 +166,7 @@ function nodeResolve(options = {}) {
   const isPreferBuiltinsSet = options.preferBuiltins === true || options.preferBuiltins === false;
   const preferBuiltins = isPreferBuiltinsSet ? options.preferBuiltins : true;
   const customResolveOptions = options.customResolveOptions || {};
+  const rootDir = options.rootDir || process.cwd();
   const jail = options.jail;
   const only = Array.isArray(options.only) ? options.only.map(o => o instanceof RegExp ? o : new RegExp(`^${String(o).replace(/[\\^$*+?.()|[\]{}]/g, '\\$&')}$`)) : null;
   const browserMapCache = new Map();
@@ -310,12 +311,7 @@ function nodeResolve(options = {}) {
 
 
       if (/\0/.test(importee)) return null;
-      const basedir = importer ? dirname(importer) : process.cwd();
-
-      if (shouldDedupe(importee)) {
-        importee = join(process.cwd(), 'node_modules', importee);
-      } // https://github.com/defunctzombie/package-browser-field-spec
-
+      const basedir = !importer || shouldDedupe(importee) ? rootDir : dirname(importer); // https://github.com/defunctzombie/package-browser-field-spec
 
       const browser = browserMapCache.get(importer);
 

package/dist/index.js

@@ -171,6 +171,7 @@ function nodeResolve(options = {}) {
   const isPreferBuiltinsSet = options.preferBuiltins === true || options.preferBuiltins === false;
   const preferBuiltins = isPreferBuiltinsSet ? options.preferBuiltins : true;
   const customResolveOptions = options.customResolveOptions || {};
+  const rootDir = options.rootDir || process.cwd();
   const jail = options.jail;
   const only = Array.isArray(options.only) ? options.only.map(o => o instanceof RegExp ? o : new RegExp(`^${String(o).replace(/[\\^$*+?.()|[\]{}]/g, '\\$&')}$`)) : null;
   const browserMapCache = new Map();
@@ -315,12 +316,7 @@ function nodeResolve(options = {}) {
 
 
       if (/\0/.test(importee)) return null;
-      const basedir = importer ? path.dirname(importer) : process.cwd();
-
-      if (shouldDedupe(importee)) {
-        importee = path.join(process.cwd(), 'node_modules', importee);
-      } // https://github.com/defunctzombie/package-browser-field-spec
-
+      const basedir = !importer || shouldDedupe(importee) ? rootDir : path.dirname(importer); // https://github.com/defunctzombie/package-browser-field-spec
 
       const browser = browserMapCache.get(importer);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-node-resolve",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "publishConfig": {
     "access": "public"
   },
@@ -8,7 +8,7 @@
   "license": "MIT",
   "repository": "rollup/plugins",
   "author": "Rich Harris <richard.a.harris@gmail.com>",
-  "homepage": "https://github.com/rollup/plugins/packages/node-resolve/#readme",
+  "homepage": "https://github.com/rollup/plugins/tree/master/packages/node-resolve/#readme",
   "bugs": "https://github.com/rollup/plugins/issues",
   "main": "dist/index.js",
   "engines": {
@@ -17,7 +17,7 @@
   "scripts": {
     "build": "rollup -c",
     "ci:coverage": "nyc pnpm run test && nyc report --reporter=text-lcov > coverage.lcov",
-    "ci:lint": "pnpm run build && pnpm run lint && pnpm run security",
+    "ci:lint": "pnpm run build && pnpm run lint",
     "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}",
     "ci:test": "pnpm run test -- --verbose && pnpm run test:ts",
     "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package",
@@ -28,7 +28,6 @@
     "prepare": "pnpm run build",
     "prepublishOnly": "pnpm run lint && pnpm run test && pnpm run test:ts",
     "pretest": "pnpm run build",
-    "security": "echo 'pnpm needs `npm audit` support'",
     "test": "ava",
     "test:ts": "tsc types/index.d.ts test/types.ts --noEmit"
   },
@@ -74,7 +73,6 @@
       "!**/types.ts"
     ]
   },
-  "jsnext:main": "dist/index.es.js",
   "module": "dist/index.es.js",
   "types": "types/index.d.ts"
 }

package/types/index.d.ts

@@ -92,6 +92,14 @@ export interface Options {
    * to node-resolve
    */
   customResolveOptions?: AsyncOpts;
+
+  /**
+   * Root directory to resolve modules from. Used when resolving entrypoint imports,
+   * and when resolving deduplicated modules. Useful when executing rollup in a package
+   * of a monorepository.
+   * @default process.cwd()
+   */
+  rootDir?: string;
 }
 
 /**