@rollup/plugin-node-resolve 8.1.0 → 8.4.0

package/CHANGELOG.md

@@ -1,5 +1,47 @@
 # @rollup/plugin-node-resolve ChangeLog
 
+## v8.4.0
+
+_2020-07-12_
+
+### Features
+
+- feat: preserve search params and hashes (#487)
+- feat: support .js imports in TypeScript (#480)
+
+### Updates
+
+- docs: fix named export use in readme (#456)
+- docs: correct mainFields valid values (#469)
+
+## v8.3.0
+
+_2020-07-12_
+
+### Features
+
+- feat: preserve search params and hashes (#487)
+- feat: support .js imports in TypeScript (#480)
+
+### Updates
+
+- docs: fix named export use in readme (#456)
+- docs: correct mainFields valid values (#469)
+
+## v8.2.0
+
+_2020-07-12_
+
+### Features
+
+- feat: preserve search params and hashes (#487)
+- feat: support .js imports in TypeScript (#480)
+
+### Updates
+
+- docs: fix named export use in readme (#456)
+- docs: correct mainFields valid values (#469)
+
 ## v8.1.0
 
 _2020-06-22_

package/README.md

@@ -28,7 +28,7 @@ npm install @rollup/plugin-node-resolve --save-dev
 Create a `rollup.config.js` [configuration file](https://www.rollupjs.org/guide/en/#configuration-files) and import the plugin:
 
 ```js
-import resolve from '@rollup/plugin-node-resolve';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
 
 export default {
   input: 'src/index.js',
@@ -36,7 +36,7 @@ export default {
     dir: 'output',
     format: 'cjs'
   },
-  plugins: [resolve()]
+  plugins: [nodeResolve()]
 };
 ```
 
@@ -107,7 +107,7 @@ Locks the module search within specified path (e.g. chroot). Modules defined out
 
 Type: `Array[...String]`<br>
 Default: `['module', 'main']`<br>
-Valid values: `['browser', 'jsnext', 'module', 'main']`
+Valid values: `['browser', 'jsnext:main', 'module', 'main']`
 
 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.
 

package/dist/cjs/index.js

@@ -51,6 +51,41 @@ function _asyncToGenerator(fn) {
   };
 }
 
+function _slicedToArray(arr, i) {
+  return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+}
+
+function _arrayWithHoles(arr) {
+  if (Array.isArray(arr)) return arr;
+}
+
+function _iterableToArrayLimit(arr, i) {
+  if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
+  var _arr = [];
+  var _n = true;
+  var _d = false;
+  var _e = undefined;
+
+  try {
+    for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
+      _arr.push(_s.value);
+
+      if (i && _arr.length === i) break;
+    }
+  } catch (err) {
+    _d = true;
+    _e = err;
+  } finally {
+    try {
+      if (!_n && _i["return"] != null) _i["return"]();
+    } finally {
+      if (_d) throw _e;
+    }
+  }
+
+  return _arr;
+}
+
 function _unsupportedIterableToArray(o, minLen) {
   if (!o) return;
   if (typeof o === "string") return _arrayLikeToArray(o, minLen);
@@ -68,6 +103,10 @@ function _arrayLikeToArray(arr, len) {
   return arr2;
 }
 
+function _nonIterableRest() {
+  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+
 function _createForOfIteratorHelper(o) {
   if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) {
     if (Array.isArray(o) || (o = _unsupportedIterableToArray(o))) {
@@ -468,7 +507,20 @@ function nodeResolve(opts = {}) {
         } // ignore IDs with null character, these belong to other plugins
 
 
-        if (/\0/.test(importee)) return null;
+        if (/\0/.test(importee)) return null; // strip hash and query params from import
+
+        const _importee$split = importee.split('#'),
+              _importee$split2 = _slicedToArray(_importee$split, 2),
+              withoutHash = _importee$split2[0],
+              hash = _importee$split2[1];
+
+        const _withoutHash$split = withoutHash.split('?'),
+              _withoutHash$split2 = _slicedToArray(_withoutHash$split, 2),
+              importPath = _withoutHash$split2[0],
+              params = _withoutHash$split2[1];
+
+        const importSuffix = `${params ? `?${params}` : ''}${hash ? `#${hash}` : ''}`;
+        importee = importPath;
         const basedir = !importer || dedupe(importee) ? rootDir : path.dirname(importer); // https://github.com/defunctzombie/package-browser-field-spec
 
         const browser = browserMapCache.get(importer);
@@ -565,6 +617,17 @@ function nodeResolve(opts = {}) {
           // find anything, we resolve the builtin which just returns back
           // the built-in's name.
           importSpecifierList.push(`${importee}/`);
+        } // TypeScript files may import '.js' to refer to either '.ts' or '.tsx'
+
+
+        if (importer && importee.endsWith('.js')) {
+          for (var _i = 0, _arr = ['.ts', '.tsx']; _i < _arr.length; _i++) {
+            const ext = _arr[_i];
+
+            if (importer.endsWith(ext) && extensions.includes(ext)) {
+              importSpecifierList.push(importee.replace(/.js$/, ext));
+            }
+          }
         }
 
         importSpecifierList.push(importee);
@@ -615,7 +678,7 @@ function nodeResolve(opts = {}) {
 
             if (isModule(code)) {
               return {
-                id: resolved,
+                id: `${resolved}${importSuffix}`,
                 moduleSideEffects: hasModuleSideEffects(resolved)
               };
             }
@@ -624,7 +687,7 @@ function nodeResolve(opts = {}) {
           }
 
           const result = {
-            id: resolved,
+            id: `${resolved}${importSuffix}`,
             moduleSideEffects: hasModuleSideEffects(resolved)
           };
           return result;

package/dist/es/index.js

@@ -44,6 +44,41 @@ function _asyncToGenerator(fn) {
   };
 }
 
+function _slicedToArray(arr, i) {
+  return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+}
+
+function _arrayWithHoles(arr) {
+  if (Array.isArray(arr)) return arr;
+}
+
+function _iterableToArrayLimit(arr, i) {
+  if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
+  var _arr = [];
+  var _n = true;
+  var _d = false;
+  var _e = undefined;
+
+  try {
+    for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
+      _arr.push(_s.value);
+
+      if (i && _arr.length === i) break;
+    }
+  } catch (err) {
+    _d = true;
+    _e = err;
+  } finally {
+    try {
+      if (!_n && _i["return"] != null) _i["return"]();
+    } finally {
+      if (_d) throw _e;
+    }
+  }
+
+  return _arr;
+}
+
 function _unsupportedIterableToArray(o, minLen) {
   if (!o) return;
   if (typeof o === "string") return _arrayLikeToArray(o, minLen);
@@ -61,6 +96,10 @@ function _arrayLikeToArray(arr, len) {
   return arr2;
 }
 
+function _nonIterableRest() {
+  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+
 function _createForOfIteratorHelper(o) {
   if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) {
     if (Array.isArray(o) || (o = _unsupportedIterableToArray(o))) {
@@ -461,7 +500,20 @@ function nodeResolve(opts = {}) {
         } // ignore IDs with null character, these belong to other plugins
 
 
-        if (/\0/.test(importee)) return null;
+        if (/\0/.test(importee)) return null; // strip hash and query params from import
+
+        const _importee$split = importee.split('#'),
+              _importee$split2 = _slicedToArray(_importee$split, 2),
+              withoutHash = _importee$split2[0],
+              hash = _importee$split2[1];
+
+        const _withoutHash$split = withoutHash.split('?'),
+              _withoutHash$split2 = _slicedToArray(_withoutHash$split, 2),
+              importPath = _withoutHash$split2[0],
+              params = _withoutHash$split2[1];
+
+        const importSuffix = `${params ? `?${params}` : ''}${hash ? `#${hash}` : ''}`;
+        importee = importPath;
         const basedir = !importer || dedupe(importee) ? rootDir : dirname(importer); // https://github.com/defunctzombie/package-browser-field-spec
 
         const browser = browserMapCache.get(importer);
@@ -558,6 +610,17 @@ function nodeResolve(opts = {}) {
           // find anything, we resolve the builtin which just returns back
           // the built-in's name.
           importSpecifierList.push(`${importee}/`);
+        } // TypeScript files may import '.js' to refer to either '.ts' or '.tsx'
+
+
+        if (importer && importee.endsWith('.js')) {
+          for (var _i = 0, _arr = ['.ts', '.tsx']; _i < _arr.length; _i++) {
+            const ext = _arr[_i];
+
+            if (importer.endsWith(ext) && extensions.includes(ext)) {
+              importSpecifierList.push(importee.replace(/.js$/, ext));
+            }
+          }
         }
 
         importSpecifierList.push(importee);
@@ -608,7 +671,7 @@ function nodeResolve(opts = {}) {
 
             if (isModule(code)) {
               return {
-                id: resolved,
+                id: `${resolved}${importSuffix}`,
                 moduleSideEffects: hasModuleSideEffects(resolved)
               };
             }
@@ -617,7 +680,7 @@ function nodeResolve(opts = {}) {
           }
 
           const result = {
-            id: resolved,
+            id: `${resolved}${importSuffix}`,
             moduleSideEffects: hasModuleSideEffects(resolved)
           };
           return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-node-resolve",
-  "version": "8.1.0",
+  "version": "8.4.0",
   "publishConfig": {
     "access": "public"
   },
@@ -48,22 +48,23 @@
     "rollup": "^1.20.0||^2.0.0"
   },
   "dependencies": {
-    "@rollup/pluginutils": "^3.0.8",
-    "@types/resolve": "0.0.8",
+    "@rollup/pluginutils": "^3.1.0",
+    "@types/resolve": "1.17.1",
     "builtin-modules": "^3.1.0",
     "deep-freeze": "^0.0.1",
     "deepmerge": "^4.2.2",
     "is-module": "^1.0.0",
-    "resolve": "^1.14.2"
+    "resolve": "^1.17.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.9.0",
-    "@babel/preset-env": "^7.9.0",
-    "@rollup/plugin-json": "^4.0.1",
+    "@babel/core": "^7.10.4",
+    "@babel/plugin-transform-typescript": "^7.10.4",
+    "@babel/preset-env": "^7.10.4",
+    "@rollup/plugin-babel": "^5.0.4",
+    "@rollup/plugin-commonjs": "^13.0.0",
+    "@rollup/plugin-json": "^4.1.0",
     "es5-ext": "^0.10.53",
     "rollup": "^2.12.0",
-    "rollup-plugin-babel": "^4.3.3",
-    "rollup-plugin-commonjs": "^10.1.0",
     "source-map": "^0.7.3",
     "string-capitalize": "^1.0.1"
   },