eslint-import-resolver-node 0.3.4 → 0.3.7

package/index.js

@@ -1,47 +1,69 @@
-var resolve = require('resolve')
-  , path = require('path')
+'use strict';
 
-var log = require('debug')('eslint-plugin-import:resolver:node')
+const resolve = require('resolve');
+const isCoreModule = require('is-core-module');
+const path = require('path');
 
-exports.interfaceVersion = 2
+const log = require('debug')('eslint-plugin-import:resolver:node');
+
+exports.interfaceVersion = 2;
 
 exports.resolve = function (source, file, config) {
-  log('Resolving:', source, 'from:', file)
-  var resolvedPath
+  log('Resolving:', source, 'from:', file);
+  let resolvedPath;
 
-  if (resolve.isCore(source)) {
-    log('resolved to core')
-    return { found: true, path: null }
+  if (isCoreModule(source)) {
+    log('resolved to core');
+    return { found: true, path: null };
   }
 
   try {
-    resolvedPath = resolve.sync(source, opts(file, config))
-    log('Resolved to:', resolvedPath)
-    return { found: true, path: resolvedPath }
+    const cachedFilter = function (pkg, dir) { return packageFilter(pkg, dir, config); };
+    resolvedPath = resolve.sync(source, opts(file, config, cachedFilter));
+    log('Resolved to:', resolvedPath);
+    return { found: true, path: resolvedPath };
   } catch (err) {
-    log('resolve threw error:', err)
-    return { found: false }
+    log('resolve threw error:', err);
+    return { found: false };
   }
-}
+};
 
-function opts(file, config) {
+function opts(file, config, packageFilter) {
   return Object.assign({
-      // more closely matches Node (#333)
-      // plus 'mjs' for native modules! (#939)
-      extensions: ['.mjs', '.js', '.json', '.node'],
-    },
-    config,
-    {
-      // path.resolve will handle paths relative to CWD
-      basedir: path.dirname(path.resolve(file)),
-      packageFilter: packageFilter,
-
-    })
+    // more closely matches Node (#333)
+    // plus 'mjs' for native modules! (#939)
+    extensions: ['.mjs', '.js', '.json', '.node'],
+  },
+  config,
+  {
+    // path.resolve will handle paths relative to CWD
+    basedir: path.dirname(path.resolve(file)),
+    packageFilter,
+  });
 }
 
-function packageFilter(pkg) {
-  if (pkg['jsnext:main']) {
-    pkg['main'] = pkg['jsnext:main']
+function identity(x) { return x; }
+
+function packageFilter(pkg, dir, config) {
+  let found = false;
+  const file = path.join(dir, 'dummy.js');
+  if (pkg.module) {
+    try {
+      resolve.sync(String(pkg.module).replace(/^(?:\.\/)?/, './'), opts(file, config, identity));
+      pkg.main = pkg.module;
+      found = true;
+    } catch (err) {
+      log('resolve threw error trying to find pkg.module:', err);
+    }
+  }
+  if (!found && pkg['jsnext:main']) {
+    try {
+      resolve.sync(String(pkg['jsnext:main']).replace(/^(?:\.\/)?/, './'), opts(file, config, identity));
+      pkg.main = pkg['jsnext:main'];
+      found = true;
+    } catch (err) {
+      log('resolve threw error trying to find pkg[\'jsnext:main\']:', err);
+    }
   }
-  return pkg
+  return pkg;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-import-resolver-node",
-  "version": "0.3.4",
+  "version": "0.3.7",
   "description": "Node default behavior import resolution plugin for eslint-plugin-import.",
   "main": "index.js",
   "files": [
@@ -9,12 +9,11 @@
   "scripts": {
     "prepublishOnly": "cp ../../{LICENSE,.npmrc} ./",
     "tests-only": "nyc mocha",
-    "test": "npm run tests-only",
-    "coveralls": "nyc report --reporter lcovonly && cd ../.. && coveralls < ./resolvers/node/coverage/lcov.info"
+    "test": "npm run tests-only"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/benmosher/eslint-plugin-import"
+    "url": "https://github.com/import-js/eslint-plugin-import"
   },
   "keywords": [
     "eslint",
@@ -26,22 +25,17 @@
   "author": "Ben Mosher (me@benmosher.com)",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/benmosher/eslint-plugin-import/issues"
+    "url": "https://github.com/import-js/eslint-plugin-import/issues"
   },
-  "homepage": "https://github.com/benmosher/eslint-plugin-import",
+  "homepage": "https://github.com/import-js/eslint-plugin-import",
   "dependencies": {
-    "debug": "^2.6.9",
-    "resolve": "^1.13.1"
+    "debug": "^3.2.7",
+    "is-core-module": "^2.11.0",
+    "resolve": "^1.22.1"
   },
   "devDependencies": {
     "chai": "^3.5.0",
-    "coveralls": "^3.0.0",
     "mocha": "^3.5.3",
-    "nyc": "^11.7.1"
-  },
-  "nyc": {
-    "exclude": [
-      "test/"
-    ]
+    "nyc": "^11.9.0"
   }
 }

package/CHANGELOG.md

@@ -1,63 +0,0 @@
-# Change Log
-All notable changes to this resolver will be documented in this file.
-This project adheres to [Semantic Versioning](http://semver.org/).
-This change log adheres to standards from [Keep a CHANGELOG](http://keepachangelog.com).
-
-## Unreleased
-
-## v0.3.4 - 2020-06-16
-### Added
-- add `.node` extension ([#1663])
-
-## v0.3.3 - 2020-01-10
-### Changed
-- [meta] copy LICENSE file to all npm packages on prepublish ([#1595], thanks [@opichals])
-
-## v0.3.2 - 2018-01-05
-### Added
-- `.mjs` extension detected by default to support `experimental-modules` ([#939])
-
-### Deps
-- update `debug`, `resolve`
-
-## v0.3.1 - 2017-06-23
-### Changed
-- bumped `debug` dep to match other packages
-
-## v0.3.0 - 2016-12-15
-### Changed
-- bumped `resolve` to fix issues with Node builtins (thanks [@SkeLLLa] and [@ljharb])
-
-### Fixed
-- use `files` in `package.json` to ship only `index.js` ([#531], thanks for noticing [@lukeapage])
-
-## v0.2.3 - 2016-08-20
-### Added
-- debug logging (use `DEBUG=eslint-plugin-import:resolver:node eslint [...]`)
-
-## v0.2.2 - 2016-07-14
-### Fixed
-- Node resolver no longer declares the import plugin as a `peerDependency`. See [#437]
-  for a well-articulated and thoughtful expression of why this doesn't make sense.
-  Thanks [@jasonkarns] for the issue and the PR to fix it ([#438]).
-
-  Also, apologies to the others who expressed this before, but I never understood
-  what the problem was.😅
-
-## v0.2.1
-### Fixed
-- find files with `.json` extensions (#333, thanks for noticing @jfmengels)
-
-[#438]: https://github.com/benmosher/eslint-plugin-import/pull/438
-
-[#1663]: https://github.com/benmosher/eslint-plugin-import/issues/1663
-[#1595]: https://github.com/benmosher/eslint-plugin-import/pull/1595
-[#939]: https://github.com/benmosher/eslint-plugin-import/issues/939
-[#531]: https://github.com/benmosher/eslint-plugin-import/issues/531
-[#437]: https://github.com/benmosher/eslint-plugin-import/issues/437
-
-[@jasonkarns]: https://github.com/jasonkarns
-[@lukeapage]: https://github.com/lukeapage
-[@SkeLLLa]: https://github.com/SkeLLLa
-[@ljharb]: https://github.com/ljharb
-[@opichals]: https://github.com/opichals