Skip to content

Commit f9fe702

Browse files
authored
Merge pull request #263 from amilosmanli/prettier-organize-imports
Ordering imports with prettier
2 parents fa7348f + 6941cc9 commit f9fe702

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+96
-90
lines changed

.prettierrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"singleQuote": true,
3-
"tabWidth": 2
3+
"tabWidth": 2,
4+
"organizeImportsSkipDestructiveCodeActions": true
45
}

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"jest": "^23.6.0",
2929
"microbundle": "^0.15.0",
3030
"prettier": "^2.8.3",
31+
"prettier-plugin-organize-imports": "^3.2.2",
3132
"ra-core": "3.10.0",
3233
"ts-jest": "^25",
3334
"tslint": "^5.16.0",

src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { DataProvider } from './providers/DataProvider';
21
import { AuthProvider } from './providers/AuthProvider';
2+
import { DataProvider } from './providers/DataProvider';
33
import { RAFirebaseOptions } from './providers/options';
44

55
export {

src/misc/document-parser.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import {
2-
FireStoreQueryDocumentSnapshot,
32
FireStoreDocumentSnapshot,
3+
FireStoreQueryDocumentSnapshot,
44
} from './firebase-models';
55
import { logWarn } from './logger';
6+
import * as ra from './react-admin-models';
67
import {
78
applyRefDocs,
89
translateDocFromFirestore,
910
} from './translate-from-firestore';
10-
import * as ra from './react-admin-models';
1111

1212
export function parseFireStoreDocument<T extends ra.Record>(
1313
doc: FireStoreQueryDocumentSnapshot | FireStoreDocumentSnapshot | undefined

src/misc/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ export * from './objectFlatten';
99
export * from './pathHelper';
1010
export * from './react-admin-models';
1111
export * from './status-code-translator';
12+
export * from './storage-parser';
1213
export * from './translate-from-firestore';
1314
export * from './translate-to-firestore';
14-
export * from './storage-parser';

src/misc/logger/firestore-logger.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { RAFirebaseOptions } from 'providers/options';
2-
import { LogNoOp, LoggerBase } from './logger-base';
2+
import { LoggerBase, LogNoOp } from './logger-base';
33

44
const LOGGER_ENABLEDKEY = 'LOGGING_FIRESTORE_COSTS_ENABLED';
55
const logger = new LoggerBase('💸firestore-costs:', LOGGER_ENABLEDKEY);

src/misc/logger/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export * from './logger-base';
2-
export * from './logger';
31
export * from './firestore-logger';
2+
export * from './logger';
3+
export * from './logger-base';

src/misc/react-admin-models.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// React-Admin Core
22
export {
3+
AuthProvider,
34
CreateParams,
45
CreateResult,
56
DataProvider,
@@ -15,12 +16,11 @@ export {
1516
GetManyResult,
1617
GetOneParams,
1718
GetOneResult,
19+
Identifier,
1820
Record,
1921
UpdateManyParams,
2022
UpdateManyResult,
2123
UpdateParams,
2224
UpdateResult,
23-
Identifier,
24-
AuthProvider,
2525
UserIdentity,
2626
} from 'ra-core';

src/misc/translate-from-firestore.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { set, has } from 'lodash';
1+
import { has, set } from 'lodash';
22
import { IFirebaseWrapper } from 'providers/database';
3+
import { FireStoreDocumentRef } from './firebase-models';
34
import { REF_INDENTIFIER } from './internal.models';
45
import { logError } from './logger';
5-
import { FireStoreDocumentRef } from './firebase-models';
66

77
export interface RefDocFound {
88
fieldPath: string;

src/providers/AuthProvider.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { messageTypes } from './../misc/messageTypes';
2-
import { log, retrieveStatusTxt, logWarn, logger } from '../misc';
3-
import { RAFirebaseOptions } from './options';
4-
import { FirebaseWrapper } from './database/firebase/FirebaseWrapper';
1+
import { log, logger, logWarn, retrieveStatusTxt } from '../misc';
2+
import { FireUser } from '../misc/firebase-models';
53
import {
64
AuthProvider as RaAuthProvider,
75
UserIdentity,
86
} from '../misc/react-admin-models';
7+
import { messageTypes } from './../misc/messageTypes';
98
import { IFirebaseWrapper } from './database';
10-
import { FireUser } from '../misc/firebase-models';
9+
import { FirebaseWrapper } from './database/firebase/FirebaseWrapper';
10+
import { RAFirebaseOptions } from './options';
1111

1212
class AuthClient {
1313
private fireWrapper: IFirebaseWrapper;

0 commit comments

Comments
 (0)