@neovici/cfg 1.12.1 → 1.12.2

package/eslint/node-enhanced.js

@@ -1,60 +1,26 @@
-/* eslint-disable */
-const resolve = require('enhanced-resolve'),
- path = require('path'),
- isCore = require('is-core-module');
+/* eslint-env node */
+/* eslint-disable import/group-exports */
+const { create } = require('enhanced-resolve'),
+	path = require('path'),
+	isCore = require('is-core-module');
 
-exports.interfaceVersion = 2;
+let resolver;
 
-exports.resolve = function (source, file, config) {
-  let resolvedPath;
+exports.interfaceVersion = 2;
 
-  if (isCore(source)) {
-    return { found: true, path: null };
-  }
+exports.resolve = (source, file, config = {}) => {
+	resolver = resolver || create.sync(config);
+	if (isCore(source)) {
+		return { found: true, path: null };
+	}
 
-  try {
-    const cachedFilter = function (pkg, dir) { return packageFilter(pkg, dir, config); };
-    resolvedPath = resolve.sync(source, opts(file, config, cachedFilter));
-    return { found: true, path: resolvedPath };
-  } catch (err) {
-    return { found: false };
-  }
+	try {
+		const resolved = resolver({}, path.dirname(file), source);
+		return {
+			found: true,
+			path: resolved,
+		};
+	} catch (err) {
+		return { found: false };
+	}
 };
-
-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,
-  });
-}
-
-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) {
-    }
-  }
-  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) {
-    }
-  }
-  return pkg;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neovici/cfg",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "description": "Configuration for Neovici packages",
   "homepage": "https://github.com/Neovici/cfg#readme",
   "bugs": {