Skip to content

Commit f9349e8

Browse files
eslint-plugin-import: Enable more checks (#2366)
1 parent a1d1d89 commit f9349e8

File tree

7 files changed

+29
-26
lines changed

7 files changed

+29
-26
lines changed

.eslintrc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ rules:
7676
import/no-webpack-loader-syntax: error
7777
import/no-self-import: error
7878
import/no-cycle: off # TODO
79-
import/no-useless-path-segments: off # TODO
79+
import/no-useless-path-segments: error
8080
import/no-relative-parent-imports: off
8181

8282
# Helpful warnings
@@ -98,12 +98,12 @@ rules:
9898

9999
# Style guide
100100
# https://github.com/benmosher/eslint-plugin-import#style-guide
101-
import/first: off # TODO
101+
import/first: error
102102
import/exports-last: off
103103
import/no-duplicates: error
104104
import/no-namespace: error
105105
import/extensions: [error, never] # TODO: switch to ignorePackages
106-
import/order: off # TODO
106+
import/order: error
107107
import/newline-after-import: error
108108
import/prefer-default-export: off
109109
import/max-dependencies: off

resources/gen-changelog.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44

55
const util = require('util');
66
const https = require('https');
7-
const { exec } = require('./utils');
7+
88
const packageJSON = require('../package.json');
99

10+
const { exec } = require('./utils');
11+
1012
const graphqlRequest = util.promisify(graphqlRequestImpl);
1113
const labelsConfig = {
1214
'PR: breaking change 💥': {

src/language/__tests__/schema-parser-test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ import { describe, it } from 'mocha';
55

66
import dedent from '../../jsutils/dedent';
77

8+
import { kitchenSinkSDL } from '../../__fixtures__';
9+
810
import { parse } from '../parser';
911

1012
import toJSONDeep from './toJSONDeep';
11-
import { kitchenSinkSDL } from '../../__fixtures__';
1213

1314
function expectSyntaxError(text) {
1415
return expect(() => parse(text)).to.throw();

src/language/printLocation.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// @flow strict
22

3-
import { type Location } from '../language/ast';
4-
import { type Source } from '../language/source';
5-
import { type SourceLocation, getLocation } from '../language/location';
3+
import { type Location } from './ast';
4+
import { type Source } from './source';
5+
import { type SourceLocation, getLocation } from './location';
66

77
/**
88
* Render a helpful description of the location in the GraphQL Source document.

src/type/__tests__/validation-test.js

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ import inspect from '../../jsutils/inspect';
88

99
import { parse } from '../../language/parser';
1010

11-
import { GraphQLSchema } from '../../type/schema';
12-
import { GraphQLString } from '../../type/scalars';
13-
import { GraphQLDirective } from '../../type/directives';
11+
import { extendSchema } from '../../utilities/extendSchema';
12+
import { buildSchema } from '../../utilities/buildASTSchema';
13+
14+
import { GraphQLSchema } from '../schema';
15+
import { GraphQLString } from '../scalars';
16+
import { GraphQLDirective } from '../directives';
17+
import { validateSchema, assertValidSchema } from '../validate';
1418
import {
1519
type GraphQLNamedType,
1620
type GraphQLInputType,
@@ -23,12 +27,7 @@ import {
2327
GraphQLUnionType,
2428
GraphQLEnumType,
2529
GraphQLInputObjectType,
26-
} from '../../type/definition';
27-
28-
import { extendSchema } from '../../utilities/extendSchema';
29-
import { buildSchema } from '../../utilities/buildASTSchema';
30-
31-
import { validateSchema, assertValidSchema } from '../validate';
30+
} from '../definition';
3231

3332
const SomeScalarType = new GraphQLScalarType({ name: 'SomeScalar' });
3433

src/utilities/schemaPrinter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import {
3232
isInputObjectType,
3333
} from '../type/definition';
3434

35-
import { astFromValue } from '../utilities/astFromValue';
35+
import { astFromValue } from './astFromValue';
3636

3737
type Options = {|
3838
/**

src/validation/specifiedRules.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,15 @@ import { OverlappingFieldsCanBeMerged } from './rules/OverlappingFieldsCanBeMerg
8484
// Spec Section: "Input Object Field Uniqueness"
8585
import { UniqueInputFieldNames } from './rules/UniqueInputFieldNames';
8686

87+
// SDL-specific validation rules
88+
import { LoneSchemaDefinition } from './rules/LoneSchemaDefinition';
89+
import { UniqueOperationTypes } from './rules/UniqueOperationTypes';
90+
import { UniqueTypeNames } from './rules/UniqueTypeNames';
91+
import { UniqueEnumValueNames } from './rules/UniqueEnumValueNames';
92+
import { UniqueFieldDefinitionNames } from './rules/UniqueFieldDefinitionNames';
93+
import { UniqueDirectiveNames } from './rules/UniqueDirectiveNames';
94+
import { PossibleTypeExtensions } from './rules/PossibleTypeExtensions';
95+
8796
/**
8897
* This set includes all validation rules defined by the GraphQL spec.
8998
*
@@ -119,14 +128,6 @@ export const specifiedRules = Object.freeze([
119128
UniqueInputFieldNames,
120129
]);
121130

122-
import { LoneSchemaDefinition } from './rules/LoneSchemaDefinition';
123-
import { UniqueOperationTypes } from './rules/UniqueOperationTypes';
124-
import { UniqueTypeNames } from './rules/UniqueTypeNames';
125-
import { UniqueEnumValueNames } from './rules/UniqueEnumValueNames';
126-
import { UniqueFieldDefinitionNames } from './rules/UniqueFieldDefinitionNames';
127-
import { UniqueDirectiveNames } from './rules/UniqueDirectiveNames';
128-
import { PossibleTypeExtensions } from './rules/PossibleTypeExtensions';
129-
130131
/**
131132
* @internal
132133
*/

0 commit comments

Comments
 (0)