Skip to content

Commit 47ee604

Browse files
ToinaneToinane
committed
feat: update dependencies & add temp update check
1 parent 98db538 commit 47ee604

36 files changed

+11357
-3896
lines changed

‎package-lock.json

+8,360-1,430
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "colorpicker",
33
"productName": "colorpicker",
4-
"version": "2.0.4",
4+
"version": "2.0.5",
55
"description": "Colorpicker is a little Electron app that can show colors with hex/rgb code, and generate shading for your color.",
66
"main": "src/main.js",
77
"scripts": {
@@ -15,7 +15,7 @@
1515
"release-window": "electron-builder --publish=never --config colorpicker-build.json --win nsis portable",
1616
"nightly": "electron-builder --publish=never --config colorpicker-build-nightly.json",
1717
"nightly-linux": "electron-builder --publish=never --config colorpicker-build-nightly.json --linux deb appImage",
18-
"rebuild": "npm rebuild --runtime=electron --target=8.2.1 --disturl=https://atom.io/download/electron --abi=76"
18+
"rebuild": "npm rebuild --runtime=electron --target=9.4.4 --disturl=https://atom.io/download/electron --abi=80"
1919
},
2020
"repository": "https://github.com/toinane/colorpicker",
2121
"keywords": [
@@ -29,22 +29,22 @@
2929
"crea-that"
3030
],
3131
"dependencies": {
32-
"electron-json-storage": "^4.1.8",
32+
"electron-json-storage": "^4.4.0",
3333
"request": "^2.88.2",
3434
"robotjs": "git+https://github.com/Toinane/robotjs",
35-
"sortablejs": "^1.10.2",
36-
"tippy.js": "^6.1.1"
35+
"sortablejs": "^1.13.0",
36+
"tippy.js": "^6.3.1"
3737
},
3838
"optionalDependencies": {
39+
"iohook": "^0.9.0",
3940
"osx-mouse": "git+https://github.com/Toinane/osx-mouse",
40-
"win-mouse": "git+https://github.com/Toinane/win-mouse",
41-
"iohook": "^0.6.5"
41+
"win-mouse": "git+https://github.com/Toinane/win-mouse"
4242
},
4343
"devDependencies": {
44-
"electron": "8.5.2",
45-
"electron-builder": "22.4.1",
44+
"electron": "9.4.4",
45+
"electron-builder": "22.10.5",
4646
"minimist": "^1.2.5",
47-
"standard": "14.3.3"
47+
"standard": "16.0.3"
4848
},
4949
"author": {
5050
"name": "Toinane",
@@ -56,7 +56,7 @@
5656
"license": "GPL-3.0",
5757
"iohook": {
5858
"targets": [
59-
"electron-76"
59+
"electron-80"
6060
],
6161
"platforms": [
6262
"linux"

‎src/browsers/colorpicker.js

+17-15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
'use strict';
1+
"use strict";
22

3-
const { BrowserWindow } = require('electron');
3+
const { BrowserWindow, nativeImage } = require("electron");
44

55
module.exports = (dirname, storage, util) => {
66
const { touchbar } = util;
@@ -12,7 +12,7 @@ module.exports = (dirname, storage, util) => {
1212
* @return {void} [new Colorpicker]
1313
*/
1414
let init = (force, color) => {
15-
const size = storage.get('size');
15+
const size = storage.get("size");
1616
if (win === null || win === undefined || force)
1717
createWindow(size.width, size.height);
1818
else win.show();
@@ -25,7 +25,7 @@ module.exports = (dirname, storage, util) => {
2525
* @return {void}
2626
*/
2727
let createWindow = (width, height) => {
28-
const pos = storage.get('pos');
28+
const pos = storage.get("pos");
2929
let options = {
3030
frame: false,
3131
autoHideMenuBar: true,
@@ -34,10 +34,10 @@ module.exports = (dirname, storage, util) => {
3434
minWidth: 440,
3535
minHeight: 150,
3636
transparent: true,
37-
icon: `${dirname}/build/icon.png`,
37+
icon: nativeImage.createFromPath(`${dirname}/build/icon.png`),
3838
webPreferences: {
39-
nodeIntegration: true
40-
}
39+
nodeIntegration: true,
40+
},
4141
};
4242
if (pos) {
4343
options.x = pos.x;
@@ -49,7 +49,7 @@ module.exports = (dirname, storage, util) => {
4949

5050
if (touchbar) win.setTouchBar(touchbar);
5151

52-
win.on('closed', () => {
52+
win.on("closed", () => {
5353
win = undefined;
5454
let totalWin = BrowserWindow.getAllWindows();
5555
for (let wins of totalWin) wins.close();
@@ -63,25 +63,27 @@ module.exports = (dirname, storage, util) => {
6363
* @param {BrowserWindow} win [current window]
6464
* @return {void}
6565
*/
66-
let windowEvents = win => {
66+
let windowEvents = (win) => {
6767
let timing;
6868

69-
win.on('focus', event => win.webContents.send('hasLooseFocus', false));
70-
win.on('blur', event => win.webContents.send('hasLooseFocus', true));
69+
win.on("focus", (event) =>
70+
win.webContents.send("hasLooseFocus", false)
71+
);
72+
win.on("blur", (event) => win.webContents.send("hasLooseFocus", true));
7173

72-
win.on('resize', event => {
74+
win.on("resize", (event) => {
7375
const size = win.getBounds();
7476
clearTimeout(timing);
7577
timing = setTimeout(
7678
() =>
7779
storage.add({
78-
size: { width: size.width, height: size.height }
80+
size: { width: size.width, height: size.height },
7981
}),
8082
300
8183
);
8284
});
8385

84-
win.on('move', event => {
86+
win.on("move", (event) => {
8587
const pos = win.getBounds();
8688
clearTimeout(timing);
8789
timing = setTimeout(
@@ -95,6 +97,6 @@ module.exports = (dirname, storage, util) => {
9597

9698
return {
9799
init: init,
98-
getWindow: getWindow
100+
getWindow: getWindow,
99101
};
100102
};

‎src/browsers/colorsbook.js

+11-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
'use strict';
1+
"use strict";
22

3-
const { BrowserWindow } = require('electron');
3+
const { BrowserWindow, nativeImage } = require("electron");
44

55
module.exports = (dirname, storage) => {
66
let win;
@@ -25,26 +25,28 @@ module.exports = (dirname, storage) => {
2525
height: 400,
2626
minHeight: 285,
2727
minWidth: 360,
28-
icon: `${dirname}/build/icon.png`,
28+
icon: nativeImage.createFromPath(`${dirname}/build/icon.png`),
2929
webPreferences: {
30-
nodeIntegration: true
31-
}
30+
nodeIntegration: true,
31+
},
3232
});
3333

3434
win.loadURL(`file://${dirname}/views/colorsbook.html`);
3535

36-
win.on('closed', () => {
36+
win.on("closed", () => {
3737
win = undefined;
3838
});
3939

40-
win.on('focus', event => win.webContents.send('hasLooseFocus', false));
41-
win.on('blur', event => win.webContents.send('hasLooseFocus', true));
40+
win.on("focus", (event) =>
41+
win.webContents.send("hasLooseFocus", false)
42+
);
43+
win.on("blur", (event) => win.webContents.send("hasLooseFocus", true));
4244
};
4345

4446
let getWindow = () => win;
4547

4648
return {
4749
init: init,
48-
getWindow: getWindow
50+
getWindow: getWindow,
4951
};
5052
};

‎src/browsers/index.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
'use strict'
1+
"use strict";
22

33
module.exports = (dirname, storage, util) => ({
4-
colorpicker: require('./colorpicker')(dirname, storage, util),
5-
colorsbook: require('./colorsbook')(dirname, storage, util),
6-
picker: require('./picker')(dirname, storage, util),
7-
preview: require('./preview')(dirname, storage, util),
8-
settings: require('./settings')(dirname, storage, util),
9-
support: require('./support')(dirname, storage, util)
10-
})
4+
colorpicker: require("./colorpicker")(dirname, storage, util),
5+
colorsbook: require("./colorsbook")(dirname, storage, util),
6+
picker: require("./picker")(dirname, storage, util),
7+
preview: require("./preview")(dirname, storage, util),
8+
settings: require("./settings")(dirname, storage, util),
9+
support: require("./support")(dirname, storage, util),
10+
});

‎src/browsers/picker.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
'use strict';
1+
"use strict";
22

3-
const { BrowserWindow } = require('electron');
3+
const { BrowserWindow, nativeImage } = require("electron");
44

55
module.exports = (dirname, storage) => {
66
let win;
@@ -22,14 +22,14 @@ module.exports = (dirname, storage) => {
2222
resizable: false,
2323
focusable: true,
2424
hasShadow: false,
25-
icon: `${dirname}/build/icon.png`,
25+
icon: nativeImage.createFromPath(`${dirname}/build/icon.png`),
2626
webPreferences: {
27-
nodeIntegration: true
28-
}
27+
nodeIntegration: true,
28+
},
2929
});
3030

3131
win.loadURL(`file://${dirname}/views/picker.html`);
32-
win.on('closed', () => {
32+
win.on("closed", () => {
3333
win = undefined;
3434
});
3535
};
@@ -38,6 +38,6 @@ module.exports = (dirname, storage) => {
3838

3939
return {
4040
init: init,
41-
getWindow: getWindow
41+
getWindow: getWindow,
4242
};
4343
};

‎src/browsers/preview.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
'use strict';
1+
"use strict";
22

3-
const { BrowserWindow } = require('electron');
3+
const { BrowserWindow, nativeImage } = require("electron");
44

55
module.exports = (dirname, storage) => {
66
let win;
@@ -27,16 +27,16 @@ module.exports = (dirname, storage) => {
2727
height: 300,
2828
resizable: false,
2929
fullscreenable: false,
30-
icon: `${dirname}/build/icon.png`,
30+
icon: nativeImage.createFromPath(`${dirname}/build/icon.png`),
3131
webPreferences: {
32-
nodeIntegration: true
33-
}
32+
nodeIntegration: true,
33+
},
3434
};
3535

3636
win = new BrowserWindow(options);
3737
win.loadURL(`file://${dirname}/views/preview.html`);
3838

39-
win.on('closed', () => {
39+
win.on("closed", () => {
4040
win = undefined;
4141
});
4242
};
@@ -45,6 +45,6 @@ module.exports = (dirname, storage) => {
4545

4646
return {
4747
init: init,
48-
getWindow: getWindow
48+
getWindow: getWindow,
4949
};
5050
};

‎src/browsers/settings.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
'use strict';
1+
"use strict";
22

3-
const { BrowserWindow } = require('electron');
3+
const { BrowserWindow, nativeImage } = require("electron");
44

55
module.exports = (dirname, storage) => {
66
let win;
@@ -28,16 +28,16 @@ module.exports = (dirname, storage) => {
2828
minWidth: 460,
2929
minHeight: 340,
3030
fullscreenable: false,
31-
icon: `${dirname}/build/icon.png`,
31+
icon: nativeImage.createFromPath(`${dirname}/build/icon.png`),
3232
webPreferences: {
33-
nodeIntegration: true
34-
}
33+
nodeIntegration: true,
34+
},
3535
};
3636

3737
win = new BrowserWindow(options);
3838
win.loadURL(`file://${dirname}/views/settings.html`);
3939

40-
win.on('closed', () => {
40+
win.on("closed", () => {
4141
win = undefined;
4242
});
4343
};
@@ -46,6 +46,6 @@ module.exports = (dirname, storage) => {
4646

4747
return {
4848
init: init,
49-
getWindow: getWindow
49+
getWindow: getWindow,
5050
};
5151
};

0 commit comments

Comments
 (0)