Skip to content

Commit cb1381b

Browse files
JellyBrickJellyBrick
committed
fix: apply fix from eslint
1 parent f42f20f commit cb1381b

Some content is hidden

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

85 files changed

+1881
-1065
lines changed

‎eslint.config.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default tsEslint.config(
1212
tsEslint.configs.eslintRecommended,
1313
...tsEslint.configs.recommendedTypeChecked,
1414
prettier,
15-
{ ignores: ['dist', 'node_modules', '*.config.*js'] },
15+
{ ignores: ['dist', 'node_modules', '*.config.*js', '*.test.*js'] },
1616
{
1717
plugins: {
1818
stylistic,
@@ -54,7 +54,7 @@ export default tsEslint.config(
5454
afterLineComment: false,
5555
}],
5656
'stylistic/max-len': 'off',
57-
'stylistic/no-mixed-operators': 'error',
57+
'stylistic/no-mixed-operators': 'warn', // prettier does not support no-mixed-operators
5858
'stylistic/no-multi-spaces': ['error', { ignoreEOLComments: true }],
5959
'stylistic/no-tabs': 'error',
6060
'no-void': 'error',

‎src/custom-electron-prompt.d.ts

+19-19
Original file line numberDiff line numberDiff line change
@@ -64,29 +64,29 @@ declare module 'custom-electron-prompt' {
6464
export type PromptOptions<T extends string> = T extends 'input'
6565
? InputPromptOptions
6666
: T extends 'select'
67-
? SelectPromptOptions
68-
: T extends 'counter'
69-
? CounterPromptOptions
70-
: T extends 'keybind'
71-
? KeybindPromptOptions
72-
: T extends 'multiInput'
73-
? MultiInputPromptOptions
74-
: never;
67+
? SelectPromptOptions
68+
: T extends 'counter'
69+
? CounterPromptOptions
70+
: T extends 'keybind'
71+
? KeybindPromptOptions
72+
: T extends 'multiInput'
73+
? MultiInputPromptOptions
74+
: never;
7575

7676
type PromptResult<T extends string> = T extends 'input'
7777
? string
7878
: T extends 'select'
79-
? string
80-
: T extends 'counter'
81-
? number
82-
: T extends 'keybind'
83-
? {
84-
value: string;
85-
accelerator: string;
86-
}[]
87-
: T extends 'multiInput'
88-
? string[]
89-
: never;
79+
? string
80+
: T extends 'counter'
81+
? number
82+
: T extends 'keybind'
83+
? {
84+
value: string;
85+
accelerator: string;
86+
}[]
87+
: T extends 'multiInput'
88+
? string[]
89+
: never;
9090

9191
const prompt: <T extends Type>(
9292
options?: PromptOptions<T> & { type: T },

‎src/index.ts

+19-11
Original file line numberDiff line numberDiff line change
@@ -334,18 +334,20 @@ async function createMainWindow() {
334334
const display = screen.getDisplayNearestPoint(windowPosition);
335335
const primaryDisplay = screen.getPrimaryDisplay();
336336

337-
const scaleFactor = is.windows() ? primaryDisplay.scaleFactor / display.scaleFactor : 1;
337+
const scaleFactor = is.windows()
338+
? primaryDisplay.scaleFactor / display.scaleFactor
339+
: 1;
338340
const scaledWidth = Math.floor(windowSize.width * scaleFactor);
339341
const scaledHeight = Math.floor(windowSize.height * scaleFactor);
340342

341343
const scaledX = windowX;
342344
const scaledY = windowY;
343345

344346
if (
345-
scaledX + (scaledWidth / 2) < display.bounds.x - 8 || // Left
346-
scaledX + (scaledWidth / 2) > display.bounds.x + display.bounds.width || // Right
347+
scaledX + scaledWidth / 2 < display.bounds.x - 8 || // Left
348+
scaledX + scaledWidth / 2 > display.bounds.x + display.bounds.width || // Right
347349
scaledY < display.bounds.y - 8 || // Top
348-
scaledY + (scaledHeight / 2) > display.bounds.y + display.bounds.height // Bottom
350+
scaledY + scaledHeight / 2 > display.bounds.y + display.bounds.height // Bottom
349351
) {
350352
// Window is offscreen
351353
if (is.dev()) {
@@ -442,7 +444,7 @@ async function createMainWindow() {
442444
...defaultTitleBarOverlayOptions,
443445
height: Math.floor(
444446
defaultTitleBarOverlayOptions.height! *
445-
win.webContents.getZoomFactor(),
447+
win.webContents.getZoomFactor(),
446448
),
447449
});
448450
}
@@ -455,7 +457,7 @@ async function createMainWindow() {
455457
event.preventDefault();
456458

457459
win.webContents.loadURL(
458-
'https://accounts.google.com/ServiceLogin?ltmpl=music&service=youtube&continue=https%3A%2F%2Fwww.youtube.com%2Fsignin%3Faction_handle_signin%3Dtrue%26next%3Dhttps%253A%252F%252Fmusic.youtube.com%252F'
460+
'https://accounts.google.com/ServiceLogin?ltmpl=music&service=youtube&continue=https%3A%2F%2Fwww.youtube.com%2Fsignin%3Faction_handle_signin%3Dtrue%26next%3Dhttps%253A%252F%252Fmusic.youtube.com%252F',
459461
);
460462
}
461463
});
@@ -479,8 +481,8 @@ app.once('browser-window-created', (_event, win) => {
479481
const updatedUserAgent = is.macOS()
480482
? userAgents.mac
481483
: is.windows()
482-
? userAgents.windows
483-
: userAgents.linux;
484+
? userAgents.windows
485+
: userAgents.linux;
484486

485487
win.webContents.userAgent = updatedUserAgent;
486488
app.userAgentFallback = updatedUserAgent;
@@ -642,7 +644,9 @@ app.whenReady().then(async () => {
642644
// In dev mode, get string from process.env.VITE_DEV_SERVER_URL, else use fs.readFileSync
643645
if (is.dev() && process.env.ELECTRON_RENDERER_URL) {
644646
// HACK: to make vite work with electron renderer (supports hot reload)
645-
event.returnValue = [null, `
647+
event.returnValue = [
648+
null,
649+
`
646650
console.log('${LoggerPrefix}', 'Loading vite from dev server');
647651
(async () => {
648652
await new Promise((resolve) => {
@@ -663,7 +667,8 @@ app.whenReady().then(async () => {
663667
document.body.appendChild(rendererScript);
664668
})();
665669
0
666-
`];
670+
`,
671+
];
667672
} else {
668673
const rendererPath = path.join(__dirname, '..', 'renderer');
669674
const indexHTML = parse(
@@ -675,7 +680,10 @@ app.whenReady().then(async () => {
675680
scriptSrc.getAttribute('src')!,
676681
);
677682
const scriptString = fs.readFileSync(scriptPath, 'utf-8');
678-
event.returnValue = [url.pathToFileURL(scriptPath).toString(), scriptString + ';0'];
683+
event.returnValue = [
684+
url.pathToFileURL(scriptPath).toString(),
685+
scriptString + ';0',
686+
];
679687
}
680688
});
681689

‎src/loader/main.ts

+14-13
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,12 @@ const createContext = (
3434
win.webContents.send(event, ...args);
3535
},
3636
handle: (event: string, listener: CallableFunction) => {
37-
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
37+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return,@typescript-eslint/no-unsafe-call
3838
ipcMain.handle(event, (_, ...args: unknown[]) => listener(...args));
3939
},
4040
on: (event: string, listener: CallableFunction) => {
4141
ipcMain.on(event, (_, ...args: unknown[]) => {
42+
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
4243
listener(...args);
4344
});
4445
},
@@ -75,19 +76,19 @@ export const forceUnloadMainPlugin = async (
7576
);
7677
return;
7778
} else {
78-
console.log(
79-
LoggerPrefix,
80-
t('common.console.plugins.unload-failed', { pluginName: id }),
81-
);
82-
return Promise.reject();
79+
const message = t('common.console.plugins.unload-failed', {
80+
pluginName: id,
81+
});
82+
console.log(LoggerPrefix, message);
83+
return Promise.reject(new Error(message));
8384
}
8485
} catch (err) {
8586
console.error(
8687
LoggerPrefix,
8788
t('common.console.plugins.unload-failed', { pluginName: id }),
8889
);
8990
console.trace(err);
90-
return Promise.reject(err);
91+
return Promise.reject(err as Error);
9192
}
9293
};
9394

@@ -111,19 +112,19 @@ export const forceLoadMainPlugin = async (
111112
) {
112113
loadedPluginMap[id] = plugin;
113114
} else {
114-
console.log(
115-
LoggerPrefix,
116-
t('common.console.plugins.load-failed', { pluginName: id }),
117-
);
118-
return Promise.reject();
115+
const message = t('common.console.plugins.load-failed', {
116+
pluginName: id,
117+
});
118+
console.log(LoggerPrefix, message);
119+
return Promise.reject(new Error(message));
119120
}
120121
} catch (err) {
121122
console.error(
122123
LoggerPrefix,
123124
t('common.console.plugins.initialize-failed', { pluginName: id }),
124125
);
125126
console.trace(err);
126-
return Promise.reject(err);
127+
return Promise.reject(err as Error);
127128
}
128129
};
129130

‎src/loader/renderer.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ const loadedPluginMap: Record<
1818
export const createContext = <Config extends PluginConfig>(
1919
id: string,
2020
): RendererContext<Config> => ({
21-
getConfig: async () => window.ipcRenderer.invoke('ytmd:get-config', id),
21+
getConfig: async () =>
22+
window.ipcRenderer.invoke('ytmd:get-config', id) as Promise<Config>,
2223
setConfig: async (newConfig) => {
2324
await window.ipcRenderer.invoke('ytmd:set-config', id, newConfig);
2425
},
@@ -30,6 +31,7 @@ export const createContext = <Config extends PluginConfig>(
3031
window.ipcRenderer.invoke(event, ...args),
3132
on: (event: string, listener: CallableFunction) => {
3233
window.ipcRenderer.on(event, (_, ...args: unknown[]) => {
34+
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
3335
listener(...args);
3436
});
3537
},

0 commit comments

Comments
 (0)