Skip to content

Commit 3595be9

Browse files
committed
Fix problems related to the sort-imports rule
1 parent 3ff1931 commit 3595be9

38 files changed

+133
-130
lines changed

docs/virtual/matchers/index.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
import {
2-
createAsyncThunk,
3-
createReducer,
4-
PayloadAction,
5-
} from '@reduxjs/toolkit'
1+
import type { PayloadAction } from '@reduxjs/toolkit'
2+
import { createAsyncThunk, createReducer } from '@reduxjs/toolkit'
63

74
export interface Data {
85
isInteresting: boolean

packages/rtk-query-codegen-openapi/src/generate.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import camelCase from 'lodash.camelcase'
22
import path from 'node:path'
33
import ApiGenerator, {
44
getOperationName as _getOperationName,
5-
getReferenceName,
6-
isReference,
7-
supportDeepObjects,
85
createPropertyAssignment,
96
createQuestionToken,
7+
getReferenceName,
8+
isReference,
109
isValidIdentifier,
1110
keywordType,
11+
supportDeepObjects,
1212
} from 'oazapfts/generate'
1313
import type { OpenAPIV3 } from 'openapi-types'
1414
import ts from 'typescript'

packages/rtk-query-codegen-openapi/src/generators/react-hooks.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import ts from 'typescript'
21
import { getOperationName } from 'oazapfts/generate'
3-
import { capitalize, isQuery } from '../utils'
2+
import ts from 'typescript'
3+
import { getOverrides } from '../generate'
44
import type {
5-
OperationDefinition,
6-
EndpointOverrides,
75
ConfigFile,
6+
EndpointOverrides,
7+
OperationDefinition,
88
} from '../types'
9-
import { getOverrides } from '../generate'
9+
import { capitalize, isQuery } from '../utils'
1010
import { factory } from '../utils/factory'
1111

1212
type HooksConfigOptions = NonNullable<ConfigFile['hooks']>

packages/rtk-query-codegen-openapi/test/mocks/server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { headersToObject } from 'headers-polyfill'
2-
import { http, HttpResponse } from 'msw'
2+
import { HttpResponse, http } from 'msw'
33
import { setupServer } from 'msw/node'
44
import petstoreJSON from '../fixtures/petstore.json'
55
import petstoreYAML from '../fixtures/petstore.yaml.mock'

packages/rtk-query-graphql-request-base-query/src/GraphqlBaseQueryTypes.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import type { BaseQueryApi } from '@reduxjs/toolkit/query'
22
import type {
3+
ClientError,
34
GraphQLClient,
4-
RequestOptions,
55
RequestDocument,
6-
ClientError,
6+
RequestOptions,
77
} from 'graphql-request'
88

99
export type Document = RequestDocument

packages/rtk-query-graphql-request-base-query/src/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { isPlainObject } from '@reduxjs/toolkit'
22
import type { BaseQueryFn } from '@reduxjs/toolkit/query'
33
import type { DocumentNode } from 'graphql'
4-
import { GraphQLClient, ClientError, RequestOptions } from 'graphql-request'
4+
import type { RequestOptions } from 'graphql-request'
5+
import { ClientError, GraphQLClient } from 'graphql-request'
56
import type {
67
ErrorResponse,
78
GraphqlRequestBaseQueryArgs,

packages/toolkit/src/configureStore.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
import type {
2+
Action,
3+
Middleware,
24
Reducer,
35
ReducersMapObject,
4-
Middleware,
5-
Action,
6-
StoreEnhancer,
76
Store,
7+
StoreEnhancer,
88
UnknownAction,
99
} from 'redux'
1010
import {
1111
applyMiddleware,
12-
createStore,
13-
compose,
1412
combineReducers,
13+
compose,
14+
createStore,
1515
isPlainObject,
1616
} from 'redux'
1717
import type { DevToolsEnhancerOptions as DevToolsOptions } from './devtoolsExtension'
1818
import { composeWithDevTools } from './devtoolsExtension'
1919

2020
import type {
21-
ThunkMiddlewareFor,
2221
GetDefaultMiddleware,
22+
ThunkMiddlewareFor,
2323
} from './getDefaultMiddleware'
2424
import { buildGetDefaultMiddleware } from './getDefaultMiddleware'
2525
import type {
2626
ExtractDispatchExtensions,
27-
ExtractStoreExtensions,
2827
ExtractStateExtensions,
28+
ExtractStoreExtensions,
2929
UnknownIfNonSpecific,
3030
} from './tsHelpers'
3131
import type { Tuple } from './utils'

packages/toolkit/src/dynamicMiddleware/react/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import { createDynamicMiddleware as cDM } from '@reduxjs/toolkit'
99
import type { Context } from 'react'
1010
import type { ReactReduxContextValue } from 'react-redux'
1111
import {
12-
createDispatchHook,
1312
ReactReduxContext,
13+
createDispatchHook,
1414
useDispatch as useDefaultDispatch,
1515
} from 'react-redux'
1616
import type { Action, Dispatch, Middleware, UnknownAction } from 'redux'

packages/toolkit/src/entities/create_adapter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { EntityAdapter, EntityId, EntityAdapterOptions } from './models'
1+
import type { EntityAdapter, EntityAdapterOptions, EntityId } from './models'
22
import { createInitialStateFactory } from './entity_state'
33
import { createSelectorsFactory } from './state_selectors'
44
import { createSortedStateAdapter } from './sorted_state_adapter'

packages/toolkit/src/entities/sorted_state_adapter.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import type {
2-
IdSelector,
32
Comparer,
3+
DraftableEntityState,
4+
EntityId,
45
EntityStateAdapter,
6+
IdSelector,
57
Update,
6-
EntityId,
7-
DraftableEntityState,
88
} from './models'
99
import { createStateOperator } from './state_adapter'
1010
import { createUnsortedStateAdapter } from './unsorted_state_adapter'
1111
import {
12-
selectIdValue,
1312
ensureEntitiesArray,
14-
splitAddedUpdatedEntities,
1513
getCurrent,
14+
selectIdValue,
15+
splitAddedUpdatedEntities,
1616
} from './utils'
1717

1818
// Borrowed from Replay

0 commit comments

Comments
 (0)