Skip to content

Commit ca8da4e

Browse files
DiamondYuanDiamondYuan
committed
🚨 fix lint and upgrate father
1 parent 41029e8 commit ca8da4e

File tree

22 files changed

+677
-12710
lines changed

22 files changed

+677
-12710
lines changed

‎.fatherrc.ts‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
1-
export default {
2-
preCommit: {
3-
eslint: true,
4-
prettier: true
5-
}
6-
};
1+
export default {};

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
"eslint-config-prettier": "^6.11.0",
2828
"eslint-plugin-prettier": "^3.1.3",
2929
"eslint-plugin-react": "^7.19.0",
30-
"father": "^2.13.6",
3130
"lerna": "^3.15.0",
3231
"prettier": "^2.0.5",
3332
"shelljs": "^0.8.3",
34-
"typescript": "^3.5.3"
33+
"typescript": "^3.8.3",
34+
"father-build": "^1.18.0"
3535
},
3636
"dependencies": {
3737
"@types/jest": "^24.0.15"

‎packages/areaSelector/src/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ export default class AreaSelector implements IAreaSelector {
3030
const element = document.createElement('div');
3131
element.setAttribute('id', styles.crossLine);
3232
document.body.appendChild(element);
33-
$('html').one('mousedown', event => {
33+
$('html').one('mousedown', (event) => {
3434
this.mousedownPoint = {
3535
clientX: event.clientX!,
3636
clientY: event.clientY!,
3737
};
3838
$(`#${styles.crossLine}`).remove();
3939
this.startClip = true;
40-
$('html').one('mouseup', event => {
40+
$('html').one('mouseup', (event) => {
4141
this.mouseupPoint = {
4242
clientX: event.clientX!,
4343
clientY: event.clientY!,

‎packages/chromePromise/src/browserAction.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
class BrowserAction {
22
public setIcon(detail: chrome.browserAction.TabIconDetails) {
3-
return new Promise<void>(resolve => {
3+
return new Promise<void>((resolve) => {
44
chrome.browserAction.setIcon(detail, resolve);
55
});
66
}

‎packages/chromePromise/src/cookies.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
class Cookies {
22
public get(details: chrome.cookies.Details): Promise<chrome.cookies.Cookie | null> {
3-
return new Promise(resolve => {
3+
return new Promise((resolve) => {
44
chrome.cookies.get(details, resolve);
55
});
66
}
77

88
public set(details: chrome.cookies.SetDetails): Promise<chrome.cookies.Cookie | null> {
9-
return new Promise(resolve => {
9+
return new Promise((resolve) => {
1010
chrome.cookies.set(details, resolve);
1111
});
1212
}
1313

1414
public getAll(details: chrome.cookies.GetAllDetails): Promise<chrome.cookies.Cookie[]> {
15-
return new Promise(resolve => {
15+
return new Promise((resolve) => {
1616
chrome.cookies.getAll(details, resolve);
1717
});
1818
}
1919

2020
public remove(details: chrome.cookies.Details): Promise<chrome.cookies.Details> {
21-
return new Promise(resolve => {
21+
return new Promise((resolve) => {
2222
chrome.cookies.remove(details, resolve);
2323
});
2424
}

‎packages/chromePromise/src/storage/storageArea.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ export default class StorageArea {
3434
};
3535

3636
public remove = (keys: string | string[]) => {
37-
return new Promise<void>(resolve => {
37+
return new Promise<void>((resolve) => {
3838
this.storage.remove(keys, resolve);
3939
});
4040
};
4141

4242
public get = (keys?: string | string[] | Object | null) => {
4343
return new Promise<{ [key: string]: any }>((resolve, reject) => {
4444
if (isUndefined(keys)) {
45-
this.storage.get(items => {
45+
this.storage.get((items) => {
4646
let err = chrome.runtime.lastError;
4747
if (chrome.runtime.lastError) {
4848
reject(err);
@@ -53,7 +53,7 @@ export default class StorageArea {
5353
return;
5454
}
5555

56-
this.storage.get(keys, items => {
56+
this.storage.get(keys, (items) => {
5757
let err = chrome.runtime.lastError;
5858
if (chrome.runtime.lastError) {
5959
reject(err);
@@ -65,7 +65,7 @@ export default class StorageArea {
6565
};
6666

6767
public getBytesInUse = (keys?: string | string[] | null) => {
68-
return new Promise<number>(resolve => {
68+
return new Promise<number>((resolve) => {
6969
if (isUndefined(keys)) {
7070
this.storage.getBytesInUse(resolve);
7171
} else {

‎packages/chromePromise/src/tabs.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
class Tabs {
22
public getCurrent = (): Promise<chrome.tabs.Tab> => {
3-
return new Promise(resolve => {
3+
return new Promise((resolve) => {
44
chrome.tabs.getCurrent(resolve);
55
});
66
};
77

88
public sendMessage = <T = any>(tabId: number, message: any, options?: chrome.tabs.MessageSendOptions) => {
9-
return new Promise<T>(resolve => {
9+
return new Promise<T>((resolve) => {
1010
if (options) {
1111
chrome.tabs.sendMessage(tabId, message, options, resolve);
1212
} else {
@@ -16,13 +16,13 @@ class Tabs {
1616
};
1717

1818
public executeScript = <T extends any[]>(details: chrome.tabs.InjectDetails, tabId?: number): Promise<T> => {
19-
return new Promise(resolve => {
19+
return new Promise((resolve) => {
2020
if (typeof tabId === 'number') {
21-
chrome.tabs.executeScript(tabId, details, r => {
21+
chrome.tabs.executeScript(tabId, details, (r) => {
2222
resolve(r as T);
2323
});
2424
} else {
25-
chrome.tabs.executeScript(details, r => {
25+
chrome.tabs.executeScript(details, (r) => {
2626
resolve(r as T);
2727
});
2828
}
@@ -31,11 +31,11 @@ class Tabs {
3131

3232
public remove(tabId: number | number[]) {
3333
if (Array.isArray(tabId)) {
34-
return new Promise(r => {
34+
return new Promise((r) => {
3535
chrome.tabs.remove(tabId, r);
3636
});
3737
}
38-
return new Promise(r => {
38+
return new Promise((r) => {
3939
chrome.tabs.remove(tabId as number, r);
4040
});
4141
}
@@ -46,21 +46,21 @@ class Tabs {
4646
*/
4747
public captureVisibleTab(arg1?: chrome.tabs.CaptureVisibleTabOptions | number): Promise<string> {
4848
if (typeof arg1 === 'undefined') {
49-
return new Promise<string>(r => {
50-
chrome.tabs.captureVisibleTab(res => {
49+
return new Promise<string>((r) => {
50+
chrome.tabs.captureVisibleTab((res) => {
5151
r(res);
5252
});
5353
});
5454
}
5555
if (typeof arg1 === 'number') {
56-
return new Promise<string>(r => {
57-
chrome.tabs.captureVisibleTab(arg1, res => {
56+
return new Promise<string>((r) => {
57+
chrome.tabs.captureVisibleTab(arg1, (res) => {
5858
r(res);
5959
});
6060
});
6161
}
62-
return new Promise<string>(r => {
63-
chrome.tabs.captureVisibleTab(arg1, res => {
62+
return new Promise<string>((r) => {
63+
chrome.tabs.captureVisibleTab(arg1, (res) => {
6464
r(res);
6565
});
6666
});

‎packages/highlight/src/index.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default class Highlighter implements IHighlighter {
1515

1616
public start() {
1717
return new Promise<HTMLElement>((resolve, reject) => {
18-
$('html').one('click', event => {
18+
$('html').one('click', (event) => {
1919
if (!this.previous) {
2020
return;
2121
}
@@ -28,9 +28,7 @@ export default class Highlighter implements IHighlighter {
2828

2929
const keydownEventHandler = (event: JQuery.KeyDownEvent<HTMLElement, undefined, HTMLElement, HTMLElement>) => {
3030
if (event.keyCode === 27) {
31-
$('html')
32-
.find(`.${highlight_class}`)
33-
.removeClass(highlight_class);
31+
$('html').find(`.${highlight_class}`).removeClass(highlight_class);
3432
$('html').off('mousemove', this.mousemoveEvent);
3533
$('html').off('keydown', keydownEventHandler);
3634
this.previous = null;

‎packages/shared/src/storage.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ export abstract class AbstractStorageService implements IStorageService {
4343
const eventListener = (changes: { [key: string]: chrome.storage.StorageChange }, areaName: string) => {
4444
if (areaName === this.storageType) {
4545
const keys = Object.keys(changes);
46-
keys.forEach(key => {
46+
keys.forEach((key) => {
4747
const value = changes[key];
4848
this.items.set(key, value.newValue);
49-
this.listeners.forEach(fun => {
49+
this.listeners.forEach((fun) => {
5050
fun(key);
5151
});
5252
});
@@ -65,7 +65,7 @@ export abstract class AbstractStorageService implements IStorageService {
6565

6666
public async init() {
6767
const initData = (await this.database.get(null)) || {};
68-
Object.keys(initData).forEach(key => {
68+
Object.keys(initData).forEach((key) => {
6969
this.items.set(key, initData[key]);
7070
});
7171
}

‎packages/shared/src/types.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export function isString(str: any): str is string {
4141
* @returns whether the provided parameter is a JavaScript Array and each element in the array is a string.
4242
*/
4343
export function isStringArray(value: any): value is string[] {
44-
return isArray(value) && (<any[]>value).every(elem => isString(elem));
44+
return isArray(value) && (<any[]>value).every((elem) => isString(elem));
4545
}
4646

4747
/**
@@ -180,7 +180,7 @@ export function getAllMethodNames(obj: object): string[] {
180180

181181
export function createProxyObject<T extends object>(methodNames: string[], invoke: (method: string, args: any[]) => any): T {
182182
const createProxyMethod = (method: string): (() => any) => {
183-
return function() {
183+
return function () {
184184
const args = Array.prototype.slice.call(arguments, 0);
185185
return invoke(method, args);
186186
};

0 commit comments

Comments
 (0)