Skip to content

Commit c968411

Browse files
technote-spacetechnote-space
committed
chore: import order
1 parent 0f70d72 commit c968411

17 files changed

+482
-63
lines changed

‎.eslintrc.json renamed to ‎.eslintrc

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"plugin:@typescript-eslint/eslint-recommended"
66
],
77
"plugins": [
8-
"@typescript-eslint"
8+
"@typescript-eslint",
9+
"import"
910
],
1011
"parser": "@typescript-eslint/parser",
1112
"parserOptions": {
@@ -15,7 +16,8 @@
1516
"env": {
1617
"node": true,
1718
"jest": true,
18-
"es6": true
19+
"es6": true,
20+
"browser": true
1921
},
2022
"settings": {
2123
"react": {
@@ -47,12 +49,6 @@
4749
}
4850
}
4951
],
50-
"no-magic-numbers": [
51-
"error",
52-
{
53-
"ignoreArrayIndexes": true
54-
}
55-
],
5652
"eqeqeq": "error",
5753
"block-scoped-var": "error",
5854
"complexity": [
@@ -61,7 +57,6 @@
6157
"maximum": 20
6258
}
6359
],
64-
"curly": "error",
6560
"default-case": "error",
6661
"dot-location": [
6762
"error",
@@ -78,16 +73,6 @@
7873
"after": true
7974
}
8075
],
81-
"id-length": [
82-
"error",
83-
{
84-
"min": 2,
85-
"properties": "never",
86-
"exceptions": [
87-
"$"
88-
]
89-
}
90-
],
9176
"indent": [
9277
"error",
9378
2,
@@ -119,19 +104,12 @@
119104
}
120105
],
121106
"semi": [
122-
"error",
123-
"always"
107+
"error"
124108
],
125-
"@typescript-eslint/naming-convention": [
126-
"error",
127-
{
128-
"selector": "interface",
129-
"format": ["PascalCase"],
130-
"custom": {
131-
"regex": "^I[A-Z]",
132-
"match": true
133-
}
134-
}
135-
]
109+
"sort-imports": 0,
110+
"import/order": [2, {
111+
"groups": ["type", "builtin", "external", "internal", "parent", "sibling", "index", "object"],
112+
"alphabetize": { "order": "asc", "caseInsensitive": true }
113+
}]
136114
}
137-
}
115+
}

‎__tests__/file.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-magic-numbers */
2-
import { describe, expect, it, vi } from 'vitest';
32
import { resolve } from 'path';
3+
import { describe, expect, it, vi } from 'vitest';
44
import { findMarkdownFiles } from '../src';
55

66
describe('findMarkdownFiles', () => {

‎__tests__/params.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable no-magic-numbers */
22
import { describe, expect, it } from 'vitest';
3-
import { extractParams, getStartSection, getParamsSection } from '../src/lib/params';
43
import { CLOSING_COMMENT, OPENING_COMMENT } from '../src';
4+
import { extractParams, getStartSection, getParamsSection } from '../src/lib/params';
55

66
describe('extractParams', () => {
77
const opening = OPENING_COMMENT.replace('\n', ' ');

‎__tests__/transform-custom-mode.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable no-magic-numbers */
2-
import { describe, expect, it } from 'vitest';
3-
import { resolve } from 'path';
42
import { readFileSync } from 'fs';
3+
import { resolve } from 'path';
4+
import { describe, expect, it } from 'vitest';
55
import { transform } from '../src';
66

77
describe('transform', () => {

‎__tests__/transform-footer.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable no-magic-numbers */
2-
import { describe, expect, it } from 'vitest';
3-
import { resolve } from 'path';
42
import { readFileSync } from 'fs';
3+
import { resolve } from 'path';
4+
import { describe, expect, it } from 'vitest';
55
import { transform } from '../src';
66

77
describe('transform', () => {

‎__tests__/transform-html.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable no-magic-numbers */
2-
import { describe, expect, it } from 'vitest';
3-
import { resolve } from 'path';
42
import { readFileSync } from 'fs';
3+
import { resolve } from 'path';
4+
import { describe, expect, it } from 'vitest';
55
import { transform } from '../src';
66

77
describe('transform', () => {

‎__tests__/transform-nested-markdown.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable no-magic-numbers */
2-
import { describe, expect, it } from 'vitest';
3-
import { resolve } from 'path';
42
import { readFileSync } from 'fs';
3+
import { resolve } from 'path';
4+
import { describe, expect, it } from 'vitest';
55
import { transform } from '../src';
66

77
describe('transform', () => {

‎__tests__/transform-not-transformed.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable no-magic-numbers */
2-
import { describe, expect, it } from 'vitest';
3-
import { resolve } from 'path';
42
import { readFileSync } from 'fs';
3+
import { resolve } from 'path';
4+
import { describe, expect, it } from 'vitest';
55
import { transform } from '../src';
66

77
describe('transform', () => {

‎__tests__/transform-override-params.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable no-magic-numbers */
2-
import { describe, expect, it } from 'vitest';
3-
import { resolve } from 'path';
42
import { readFileSync } from 'fs';
3+
import { resolve } from 'path';
4+
import { describe, expect, it } from 'vitest';
55
import { transform } from '../src';
66

77
describe('transform', () => {

‎__tests__/transform-title.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable no-magic-numbers */
2-
import { describe, expect, it } from 'vitest';
3-
import { resolve } from 'path';
42
import { readFileSync } from 'fs';
3+
import { resolve } from 'path';
4+
import { describe, expect, it } from 'vitest';
55
import { transform } from '../src';
66

77
describe('transform', () => {

‎__tests__/transform-weird-headers.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable no-magic-numbers */
2-
import { describe, expect, it } from 'vitest';
3-
import { resolve } from 'path';
42
import { readFileSync } from 'fs';
3+
import { resolve } from 'path';
4+
import { describe, expect, it } from 'vitest';
55
import { transform } from '../src';
66

77
describe('transform', () => {

‎__tests__/transform.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* eslint-disable no-magic-numbers */
22
import { describe, expect, it } from 'vitest';
33
import { transform } from '../src';
4-
import { getLinesToToc, matchesStart, matchesEnd } from '../src/lib/transform';
54
import { OPENING_COMMENT, CLOSING_COMMENT } from '../src';
5+
import { getLinesToToc, matchesStart, matchesEnd } from '../src/lib/transform';
66

77
const check = (
88
name: string,

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
"@typescript-eslint/parser": "^5.29.0",
5858
"c8": "^7.11.3",
5959
"eslint": "^8.18.0",
60+
"eslint-plugin-import": "^2.26.0",
6061
"husky": "^8.0.1",
6162
"lint-staged": "^13.0.2",
6263
"typescript": "^4.7.4",

‎src/lib/file.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import path from 'path';
21
import fs from 'fs';
3-
import { FileInfo, FileAndDirs } from '../types';
2+
import path from 'path';
43
import { MARKDOWN_EXTENSIONS, IGNORED_DIRS } from '..';
4+
import { FileInfo, FileAndDirs } from '../types';
55

66
const separateFilesAndDirs = (fileInfos: Array<FileInfo>): FileAndDirs => ({
77
directories: fileInfos.filter(info => info.stat.isDirectory() && !IGNORED_DIRS.includes(info.name)),

‎src/lib/get-html-headers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import * as htmlparser from 'htmlparser2';
21
import * as md from '@textlint/markdown-to-ast';
2+
import * as htmlparser from 'htmlparser2';
33
import { HeaderData, Header } from '../types';
44

55
const addLinenos = (lines: Array<string>, headers: Array<HeaderData>): Array<Omit<Header, 'rank'> & HeaderData> => {

‎src/lib/transform.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
import type { TxtNode } from '@textlint/ast-node-types';
21
import type { TransformOptions, Header, HeaderWithRepetition, HeaderWithAnchor, SectionInfo, TransformResult } from '../types';
2+
import type { TxtNode } from '@textlint/ast-node-types';
33
import { anchor, getUrlHash } from '@technote-space/anchor-markdown-header';
4-
import updateSection from 'update-section';
54
import * as md from '@textlint/markdown-to-ast';
6-
import { getHtmlHeaders } from './get-html-headers';
7-
import { getStartSection, extractParams, getParamsSection } from './params';
8-
import { replaceVariables } from './utils';
5+
import updateSection from 'update-section';
96
import {
107
OPENING_COMMENT,
118
CLOSING_COMMENT,
@@ -16,6 +13,9 @@ import {
1613
DEFAULT_ITEM_TEMPLATE,
1714
DEFAULT_SEPARATOR,
1815
} from '..';
16+
import { getHtmlHeaders } from './get-html-headers';
17+
import { getStartSection, extractParams, getParamsSection } from './params';
18+
import { replaceVariables } from './utils';
1919

2020
const getTargetComments = (checkComments: Array<string>, defaultComments: string): Array<string> => {
2121
if (checkComments.length) {

0 commit comments

Comments
 (0)