isDev -> is package

This commit is contained in:
TC
2019-06-08 13:25:30 +02:00
parent 147ac48de6
commit a85325f33d
3 changed files with 33 additions and 20 deletions

View File

@ -2,7 +2,7 @@
const path = require("path");
const electron = require("electron");
const isDev = require("electron-is-dev");
const is = require("electron-is");
const { autoUpdater } = require("electron-updater");
const { setApplicationMenu } = require("./menu");
@ -57,7 +57,7 @@ function createMainWindow() {
injectCSS(win.webContents, path.join(__dirname, "youtube-music.css"));
win.webContents.on("did-finish-load", () => {
if (isDev) {
if (is.dev()) {
console.log("did finish load");
win.webContents.openDevTools();
}
@ -73,7 +73,7 @@ function createMainWindow() {
});
win.webContents.on("did-fail-load", () => {
if (isDev) {
if (is.dev()) {
console.log("did fail load");
}
win.webContents.loadFile(path.join(__dirname, "error.html"));
@ -129,7 +129,7 @@ app.on("activate", () => {
app.on("ready", () => {
setApplicationMenu();
mainWindow = createMainWindow();
if (!isDev) {
if (!is.dev()) {
autoUpdater.checkForUpdatesAndNotify();
autoUpdater.on("update-available", () => {
const dialogOpts = {

43
package-lock.json generated
View File

@ -113,6 +113,18 @@
"bloom-filter-cpp": "^1.2.2",
"hashset-cpp": "^2.1.1",
"nan": "^2.10.0"
},
"dependencies": {
"bloom-filter-cpp": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/bloom-filter-cpp/-/bloom-filter-cpp-1.2.2.tgz",
"integrity": "sha512-ZqEMFVy05r2IA35Ah8+KUBTg0S5h5iIeiQW7gLiPiF8ysXMC0vI8VkIcxeNX/aGhhVm0YwlE3OG1VOPnY5XmeQ=="
},
"hashset-cpp": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/hashset-cpp/-/hashset-cpp-2.1.1.tgz",
"integrity": "sha512-599bBFIuKI78NvLbkCkU/2UmOC2u+Z7S5xqwVHQhW+TZXRzx0XeTupGmoVfGur5sx86fcdFYUOpeKwi9/OS9hg=="
}
}
},
"ajv": {
@ -579,11 +591,6 @@
"inherits": "~2.0.0"
}
},
"bloom-filter-cpp": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/bloom-filter-cpp/-/bloom-filter-cpp-1.2.0.tgz",
"integrity": "sha512-R5axBRU0tvJK6tZmTFj8pMdjWtjh6eUWDUVj2I8nyeCYVOUKbW+uzM8VsWvMlAYs82fdUUZmA4/rNGkHW+dPNw=="
},
"bluebird": {
"version": "3.5.4",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
@ -1770,16 +1777,27 @@
"jimp": "^0.2.27"
}
},
"electron-is": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/electron-is/-/electron-is-3.0.0.tgz",
"integrity": "sha512-aQv1y3WrDZ+mtO8acbhiiip/8fa0Et7cvZyvlqJm2H7fih4hiJWEFRyYxzLgDG2kmiLdF8l3y5tbek5JFOPQkQ==",
"requires": {
"electron-is-dev": "^0.3.0",
"semver": "^5.5.0"
},
"dependencies": {
"electron-is-dev": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-0.3.0.tgz",
"integrity": "sha1-FOb9pcaOnk7L7/nM8DfL18BcWv4="
}
}
},
"electron-is-accelerator": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz",
"integrity": "sha1-UJ5RDCala1Xhf4Y6SwThEYRqsns="
},
"electron-is-dev": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-1.0.1.tgz",
"integrity": "sha512-iwM3EotA9HTXqMGpQRkR/kT8OZqBbdfHTnlwcxsjSLYqY8svvsq0MuujsWCn3/vtgRmDv/PC/gKUUpoZvi5C1w=="
},
"electron-localshortcut": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/electron-localshortcut/-/electron-localshortcut-3.1.0.tgz",
@ -3284,11 +3302,6 @@
"pinkie-promise": "^2.0.0"
}
},
"hashset-cpp": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/hashset-cpp/-/hashset-cpp-2.1.0.tgz",
"integrity": "sha512-+HbrTNQH/qiWeObpS0ZFP0INA4yalHCm0j/lHW1V6h106DO+EOp26xQQqFsjGtrqy6vgB7hucTZarByazSd1Uw=="
},
"highlight.js": {
"version": "9.15.6",
"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.6.tgz",

View File

@ -41,7 +41,7 @@
"dependencies": {
"ad-block" : "^4.1.3",
"electron-debug" : "^2.0.0",
"electron-is-dev" : "^1.0.1",
"electron-is" : "^3.0.0",
"electron-localshortcut": "^3.1.0",
"electron-store" : "^2.0.0",
"electron-updater" : "^4.0.6"