Skip to content

Commit d2c763e

Browse files
committed
chore: load scripts via "script loader"
Slowly migrating to script manager
1 parent 696d7b4 commit d2c763e

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

src/electron.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ function createWindow() {
1717
icon: path.resolve(app.getAppPath(), 'src', 'uc.png'),
1818
});
1919

20-
// TODO: make a script manager, instead of using this thing
21-
win.webContents.session.setPreloads([
22-
path.resolve(app.getPath('userData'), 'scripts', 'underscript.bundle.js'),
23-
]);
24-
2520
win.webContents.session.webRequest.onHeadersReceived((details, callback) => {
2621
callback({
2722
responseHeaders: {
@@ -116,6 +111,8 @@ ipcMain.on('set-password', (_, username, password) => keytar.setPassword('UnderS
116111

117112
ipcMain.handle('get-password', (_, username) => keytar.getPassword('UnderScript', username));
118113

114+
ipcMain.handle('dir:scripts', () => path.resolve(app.getPath('userData'), 'scripts'));
115+
119116
app.on('window-all-closed', () => {
120117
if (process.platform !== 'darwin') {
121118
app.quit();

src/preload/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
require('./scripts');
12
require('./rememberMe');
23
require('./zoom');
34
require('./plugin');

src/preload/scripts.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
const { ipcRenderer } = require('electron');
2+
const { resolve } = require('path');
3+
4+
ipcRenderer.invoke('dir:scripts').then((dir) => {
5+
require(resolve(dir, 'underscript.bundle.js'));
6+
});

0 commit comments

Comments
 (0)