Skip to content

Commit ad29e80

Browse files
authored
chore: duplicate eslint rules locally to allow warning (#10579)
1 parent bc1b16a commit ad29e80

File tree

17 files changed

+58
-10
lines changed

17 files changed

+58
-10
lines changed

.eslintplugin/index.js

+2
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ exports.rules = {
99
'ban-types-eventually': require('@typescript-eslint/eslint-plugin').rules[
1010
'ban-types'
1111
],
12+
'prefer-rest-params-eventually': require('eslint/lib/rules/prefer-rest-params'),
13+
'prefer-spread-eventually': require('eslint/lib/rules/prefer-spread'),
1214
};

.eslintrc.js

+34-1
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,41 @@ module.exports = {
3232
'import/default': 'off',
3333
'no-dupe-class-members': 'off',
3434
'no-unused-vars': 'off',
35-
// TODO: turn these on at some point
35+
},
36+
},
37+
{
38+
files: [
39+
'packages/jest-jasmine2/src/jasmine/Env.ts',
40+
'packages/jest-jasmine2/src/jasmine/ReportDispatcher.ts',
41+
'packages/jest-jasmine2/src/jasmine/Spec.ts',
42+
'packages/jest-jasmine2/src/jasmine/SpyStrategy.ts',
43+
'packages/jest-jasmine2/src/jasmine/Suite.ts',
44+
'packages/jest-jasmine2/src/jasmine/createSpy.ts',
45+
'packages/jest-jasmine2/src/jasmine/jasmineLight.ts',
46+
'packages/jest-mock/src/__tests__/index.test.ts',
47+
'packages/jest-mock/src/index.ts',
48+
'packages/pretty-format/src/__tests__/Immutable.test.ts',
49+
'packages/pretty-format/src/__tests__/prettyFormat.test.ts',
50+
],
51+
rules: {
52+
'local/prefer-rest-params-eventually': 'warn',
3653
'prefer-rest-params': 'off',
54+
},
55+
},
56+
{
57+
files: [
58+
'packages/expect/src/index.ts',
59+
'packages/jest-fake-timers/src/legacyFakeTimers.ts',
60+
'packages/jest-jasmine2/src/jasmine/Env.ts',
61+
'packages/jest-jasmine2/src/jasmine/ReportDispatcher.ts',
62+
'packages/jest-jasmine2/src/jasmine/Spec.ts',
63+
'packages/jest-jasmine2/src/jasmine/Suite.ts',
64+
'packages/jest-jasmine2/src/jasmine/jasmineLight.ts',
65+
'packages/jest-jasmine2/src/jestExpect.ts',
66+
'packages/jest-resolve/src/index.ts',
67+
],
68+
rules: {
69+
'local/prefer-spread-eventually': 'warn',
3770
'prefer-spread': 'off',
3871
},
3972
},

packages/expect/src/index.ts

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
*
77
*/
88

9+
/* eslint-disable local/prefer-spread-eventually */
10+
911
import * as matcherUtils from 'jest-matcher-utils';
1012
import type {
1113
AsyncExpectationResult,

packages/jest-fake-timers/src/legacyFakeTimers.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
/* eslint-disable local/ban-types-eventually */
8+
/* eslint-disable local/ban-types-eventually, local/prefer-spread-eventually */
99

1010
import util = require('util');
1111
import type {ModuleMocker} from 'jest-mock';

packages/jest-jasmine2/src/jasmine/Env.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
2828
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
2929
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3030
*/
31-
/* eslint-disable sort-keys */
31+
/* eslint-disable sort-keys, local/prefer-spread-eventually, local/prefer-rest-params-eventually */
3232

3333
import {AssertionError} from 'assert';
3434
import chalk = require('chalk');

packages/jest-jasmine2/src/jasmine/ReportDispatcher.ts

+3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
2828
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
2929
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3030
*/
31+
32+
/* eslint-disable local/prefer-spread-eventually, local/prefer-rest-params-eventually */
33+
3134
import type {Reporter, RunDetails} from '../types';
3235
import type {SpecResult} from './Spec';
3336
import type {SuiteResult} from './Suite';

packages/jest-jasmine2/src/jasmine/Spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
2828
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
2929
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3030
*/
31-
/* eslint-disable sort-keys */
31+
/* eslint-disable sort-keys, local/prefer-spread-eventually, local/prefer-rest-params-eventually */
3232

3333
import {AssertionError} from 'assert';
3434
import type {Config} from '@jest/types';

packages/jest-jasmine2/src/jasmine/SpyStrategy.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
2929
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3030
*/
3131

32-
/* eslint-disable local/ban-types-eventually */
32+
/* eslint-disable local/ban-types-eventually, local/prefer-rest-params-eventually */
3333

3434
export default class SpyStrategy {
3535
identity: () => string;

packages/jest-jasmine2/src/jasmine/Suite.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
2929
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3030
*/
3131

32-
/* eslint-disable local/ban-types-eventually, sort-keys */
32+
/* eslint-disable local/ban-types-eventually, sort-keys, local/prefer-spread-eventually, local/prefer-rest-params-eventually */
3333

3434
import {convertDescriptorToString} from 'jest-util';
3535
import type {Config} from '@jest/types';

packages/jest-jasmine2/src/jasmine/createSpy.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
2828
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
2929
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3030
*/
31-
/* eslint-disable sort-keys */
31+
/* eslint-disable sort-keys, local/prefer-rest-params-eventually */
3232

3333
import type {Spy} from '../types';
3434
import CallTracker, {Context} from './CallTracker';

packages/jest-jasmine2/src/jasmine/jasmineLight.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
2828
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
2929
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3030
*/
31-
/* eslint-disable sort-keys */
31+
/* eslint-disable sort-keys, local/prefer-spread-eventually, local/prefer-rest-params-eventually */
3232

3333
import type {Jasmine, SpecDefinitionsFn} from '../types';
3434
import createSpy from './createSpy';

packages/jest-jasmine2/src/jestExpect.ts

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8+
/* eslint-disable local/prefer-spread-eventually */
9+
810
import expect = require('expect');
911
import type {Global} from '@jest/types';
1012
import {

packages/jest-mock/src/__tests__/index.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
*/
88

9-
/* eslint-disable local/ban-types-eventually */
9+
/* eslint-disable local/ban-types-eventually, local/prefer-rest-params-eventually */
1010

1111
import vm, {Context} from 'vm';
1212
import {ModuleMocker} from '../';

packages/jest-mock/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
/* eslint-disable local/ban-types-eventually */
8+
/* eslint-disable local/ban-types-eventually, local/prefer-rest-params-eventually */
99

1010
type Global = NodeJS.Global; // | Window – add once TS improves typings;
1111

packages/jest-resolve/src/index.ts

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8+
/* eslint-disable local/prefer-spread-eventually */
9+
810
import * as path from 'path';
911
import type {Config} from '@jest/types';
1012
import type {ModuleMap} from 'jest-haste-map';

packages/pretty-format/src/__tests__/Immutable.test.ts

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8+
/* eslint-disable local/prefer-rest-params-eventually */
9+
810
import React from 'react';
911
import Immutable from 'immutable';
1012

packages/pretty-format/src/__tests__/prettyFormat.test.ts

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8+
/* eslint-disable local/prefer-rest-params-eventually */
9+
810
import prettyFormat from '../';
911

1012
function returnArguments(..._args: Array<unknown>) {

0 commit comments

Comments
 (0)