Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions lib/util/version.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,31 @@ function resetWarningFlag() {
warnedForMissingVersion = false;
}

let cachedDetectedReactVersion;

function resetDetectedVersion() {
cachedDetectedReactVersion = undefined;
}

function detectReactVersion() {
if (cachedDetectedReactVersion) {
return cachedDetectedReactVersion;
}

try {
const reactPath = resolve.sync('react', {basedir: process.cwd()});
const react = require(reactPath); // eslint-disable-line global-require, import/no-dynamic-require
return react.version;
cachedDetectedReactVersion = react.version;
return cachedDetectedReactVersion;
} catch (e) {
if (e.code === 'MODULE_NOT_FOUND') {
if (!warnedForMissingVersion) {
error('Warning: React version was set to "detect" in eslint-plugin-react settings, '
+ 'but the "react" package is not installed. Assuming latest React version for linting.');
warnedForMissingVersion = true;
}
return '999.999.999';
cachedDetectedReactVersion = '999.999.999';
return cachedDetectedReactVersion;
}
throw e;
}
Expand Down Expand Up @@ -116,5 +128,6 @@ function testFlowVersion(context, methodVer) {
module.exports = {
testReactVersion,
testFlowVersion,
resetWarningFlag
resetWarningFlag,
resetDetectedVersion
};
1 change: 1 addition & 0 deletions tests/util/version.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ describe('Version', () => {
sinon.stub(console, 'error');
expectedErrorArgs = [];
versionUtil.resetWarningFlag();
versionUtil.resetDetectedVersion();
});

afterEach(() => {
Expand Down