Skip to content
This repository has been archived by the owner on Sep 28, 2020. It is now read-only.

fix: eslint path #283

Merged
merged 3 commits into from Jul 4, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 20 additions & 6 deletions index.js
Expand Up @@ -160,21 +160,35 @@ module.exports = function(input, map) {
loaderUtils.getOptions(webpack)
);

var userEslintPath = userOptions.eslintPath;

var eslintPkgPath = "eslint/package.json";
if (userEslintPath) {
eslintPkgPath = userEslintPath + "/package.json";
var userEslintPath = eslintPkgPath;

if (userOptions.eslintPath) {
userEslintPath = userOptions.eslintPath + "/package.json";
}

var eslintVersion;

try {
eslintVersion = require(require.resolve(userEslintPath)).version;
} catch (_) {
// ignored
}

var eslintVersion = require(eslintPkgPath).version;
if (!eslintVersion) {
try {
eslintVersion = require(require.resolve(eslintPkgPath)).version;
} catch (_) {
// ignored
}
}

var config = assign(
// loader defaults
{
cacheIdentifier: JSON.stringify({
"eslint-loader": pkg.version,
eslint: eslintVersion
eslint: eslintVersion || "unknown version"
}),
eslintPath: "eslint"
},
Expand Down