66'use strict' ;
77
88var pragmaUtil = require ( '../util/pragma' ) ;
9+ var versionUtil = require ( '../util/version' ) ;
910
1011// ------------------------------------------------------------------------------
1112// Constants
@@ -20,15 +21,6 @@ var DEPRECATED_MESSAGE = '{{oldMethod}} is deprecated since React {{version}}{{n
2021module . exports = function ( context ) {
2122
2223 var sourceCode = context . getSourceCode ( ) ;
23-
24- // Validate React version passed in options
25- // (append the patch version if missing, allowing shorthands like 0.12 for React 0.12.0)
26- var optVer = context . options [ 0 ] ? context . options [ 0 ] . react : '999.999.999' ;
27- optVer = / ^ [ 0 - 9 ] + \. [ 0 - 9 ] + $ / . test ( optVer ) ? optVer + '.0' : optVer ;
28- optVer = optVer . split ( '.' ) . map ( function ( part ) {
29- return Number ( part ) ;
30- } ) ;
31-
3224 var pragma = pragmaUtil . getFromContext ( context ) ;
3325
3426 function getDeprecated ( ) {
@@ -60,24 +52,13 @@ module.exports = function(context) {
6052 return deprecated ;
6153 }
6254
63- function checkVersion ( methodVer ) {
64- methodVer = methodVer . split ( '.' ) . map ( function ( part ) {
65- return Number ( part ) ;
66- } ) ;
67- var higherMajor = methodVer [ 0 ] < optVer [ 0 ] ;
68- var higherMinor = methodVer [ 0 ] === optVer [ 0 ] && methodVer [ 1 ] < optVer [ 1 ] ;
69- var higherOrEqualPatch = methodVer [ 0 ] === optVer [ 0 ] && methodVer [ 1 ] === optVer [ 1 ] && methodVer [ 2 ] <= optVer [ 2 ] ;
70-
71- return higherMajor || higherMinor || higherOrEqualPatch ;
72- }
73-
7455 function isDeprecated ( type , method ) {
7556 var deprecated = getDeprecated ( ) ;
7657
7758 return (
7859 deprecated [ type ] &&
7960 deprecated [ type ] [ method ] &&
80- checkVersion ( deprecated [ type ] [ method ] [ 0 ] )
61+ versionUtil . test ( context , deprecated [ type ] [ method ] [ 0 ] )
8162 ) ;
8263 }
8364
0 commit comments