Skip to content

Commit

Permalink
verion bumps
Browse files Browse the repository at this point in the history
  • Loading branch information
dvx committed Jan 23, 2021
1 parent 241ec4b commit a0dc9e9
Show file tree
Hide file tree
Showing 3 changed files with 1,081 additions and 1,149 deletions.
50 changes: 25 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"build": "node-gyp rebuild --target=4.0.1 --arch=x64 --dist-url=https://atom.io/download/electron",
"start": "electron ./pack/main.bundle.js",
"dev": "yarn run development",
"development": "rimraf pack && webpack --watch --config ./webpack.dev.js --progress --colors",
"production": "rimraf pack && webpack --config ./webpack.prod.js --progress --colors",
"development": "rimraf pack && webpack --watch --config ./webpack.dev.js --progress --color",
"production": "rimraf pack && webpack --config ./webpack.prod.js --progress --color",
"pack": "yarn run build && yarn run production && rimraf dist && electron-builder --dir",
"dist": "yarn run build && yarn run production && rimraf dist && electron-builder",
"clean": "rimraf build && rimraf pack && rimraf dist",
Expand All @@ -38,39 +38,39 @@
"devDependencies": {
"@types/electron-settings": "2.2.3",
"@types/electron-util": "^0.11.1",
"@types/express": "^4.16.0",
"@types/lodash": "^4.14.119",
"@types/react": "^16.7.18",
"@types/react-dom": "^16.0.11",
"@types/express": "^4.17.11",
"@types/lodash": "^4.14.168",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"copy-pkg-json-webpack-plugin": "^0.0.39",
"copy-webpack-plugin": "^6.0.2",
"css-loader": "^3.6.0",
"electron": "^9.0.5",
"electron-builder": "^22.7.0",
"file-loader": "^6.0.0",
"html-webpack-plugin": "^4.3.0",
"copy-webpack-plugin": "^7.0.0",
"css-loader": "^5.0.1",
"electron": "^11.2.1",
"electron-builder": "^22.9.1",
"file-loader": "^6.2.0",
"html-webpack-plugin": "^4.5.1",
"native-ext-loader": "^2.3.0",
"node-addon-api": "^3.0.0",
"node-gyp": "^7.0.0",
"node-sass": "^4.12.0",
"node-addon-api": "^3.1.0",
"node-gyp": "^7.1.2",
"node-sass": "^5.0.0",
"rimraf": "^3.0.2",
"sass-loader": "^8.0.2",
"style-loader": "^1.2.1",
"ts-loader": "^7.0.5",
"typescript": "^3.6.3",
"webpack": "^4.28.4",
"webpack-cli": "^3.2.1",
"sass-loader": "^10.1.1",
"style-loader": "^2.0.0",
"ts-loader": "^8.0.14",
"typescript": "^4.1.3",
"webpack": "^4.44.2",
"webpack-cli": "^4.4.0",
"webpack-permissions-plugin": "^1.0.0"
},
"dependencies": {
"@types/node": "^14.0.14",
"@types/node": "^14.14.22",
"bindings": "^1.3.1",
"electron-settings": "2.2.3",
"electron-transparency-mouse-fix": "^1.0.0-beta",
"electron-util": "^0.14.1",
"electron-util": "^0.14.2",
"frameless-titlebar": "^2.1.3",
"react": "^16.7.0",
"react-dom": "^16.7.0",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-new-window": "^0.1.2"
}
}
5 changes: 3 additions & 2 deletions src/main/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ function createWindow() {
allowRunningInsecureContent: false,
nodeIntegration: true,
nativeWindowOpen: true,
enableRemoteModule: true,
},
backgroundColor: '#00000000',
});
Expand Down Expand Up @@ -188,7 +189,7 @@ function createWindow() {
});
}

function createSettingsWindow(event: Electron.NewWindowEvent, options: any) {
function createSettingsWindow(event: Electron.NewWindowWebContentsEvent, options: any) {
// Open settings window as modal
Object.assign(options, {
x:
Expand Down Expand Up @@ -217,7 +218,7 @@ function createSettingsWindow(event: Electron.NewWindowEvent, options: any) {
}
}

function createAboutWindow(event: Electron.NewWindowEvent, options: any) {
function createAboutWindow(event: Electron.NewWindowWebContentsEvent, options: any) {
Object.assign(options, {
x:
screen.getDisplayMatching(mainWindow.getBounds()).bounds.x -
Expand Down
Loading

0 comments on commit a0dc9e9

Please sign in to comment.