From 53412dea7abb2ff66fa715b610f5b725a1816e76 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 19 Jun 2019 15:40:16 +0000 Subject: [PATCH 1/8] fix(deps): update dependency electron-window-state to v5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4253e0fe..3d738816 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "angular-sanitize": "^1.6.2", "angular-toastr": "^2.1.1", "angular-ui-router": "^0.4.2", - "electron-window-state": "^4.0.2", + "electron-window-state": "^5.0.0", "font-awesome": "^4.7.0", "fs-extra": "^3.0.1", "jquery": "^3.1.1", From 7203558e586f91f096eb5dffeb0deabb67edc24f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 19 Jun 2019 15:40:25 +0000 Subject: [PATCH 2/8] fix(deps): update dependency fs-extra to v8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4253e0fe..625a64aa 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "angular-ui-router": "^0.4.2", "electron-window-state": "^4.0.2", "font-awesome": "^4.7.0", - "fs-extra": "^3.0.1", + "fs-extra": "^8.0.0", "jquery": "^3.1.1", "lodash": "^4.17.4", "mkdirp": "^0.5.1", From 0b49b771130c6421edb99374fdd1ae5bd5ed81f0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 19 Jun 2019 16:27:51 +0000 Subject: [PATCH 3/8] fix(deps): update dependency normalize.css to v8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4253e0fe..695b28d3 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "moment": "^2.17.1", "ng-dialog": "^1.0.0", "ng-infinite-scroll": "^1.3.0", - "normalize.css": "^7.0.0", + "normalize.css": "^8.0.0", "react": "^15.5.4", "react-dom": "^15.5.4", "toastr": "^2.1.2", From ac23a7547aefc8d0034327e3daf710cb5c821879 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 19 Jun 2019 16:27:57 +0000 Subject: [PATCH 4/8] fix(deps): update react monorepo to v16 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4253e0fe..61a1fff0 100644 --- a/package.json +++ b/package.json @@ -56,8 +56,8 @@ "ng-dialog": "^1.0.0", "ng-infinite-scroll": "^1.3.0", "normalize.css": "^7.0.0", - "react": "^15.5.4", - "react-dom": "^15.5.4", + "react": "^16.0.0", + "react-dom": "^16.0.0", "toastr": "^2.1.2", "universal-analytics": "^0.4.8", "user-home": "^2.0.0" From a2304b450b9ef857eb5be1b686cff6ecae8c0755 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 17 Jul 2019 16:52:23 +0000 Subject: [PATCH 5/8] chore(deps): update dependency babel-core to v6.26.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4253e0fe..66682dbe 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "author": "Michael Lancaster", "license": "GPL-3.0", "devDependencies": { - "babel-core": "6.24.1", + "babel-core": "6.26.3", "babel-loader": "^7.0.0", "babel-preset-es2015": "^6.22.0", "babel-preset-react": "^6.23.0", From a0741de3f78c84ebe00d1811b7860a516cc89294 Mon Sep 17 00:00:00 2001 From: Jake Jarrett Date: Sat, 31 Aug 2019 11:11:47 +1000 Subject: [PATCH 6/8] Update code to support electron 5 & fixes login bug --- main.js | 11 +++++++---- package.json | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/main.js b/main.js index a922f33f..ce40fbfb 100644 --- a/main.js +++ b/main.js @@ -54,16 +54,16 @@ function authenticateUser() { contents = authenticationWindow.webContents; - contents.on('did-get-redirect-request', (event, oldUrl, newUrl) => { + contents.on('did-navigate', (_event, url, httpResponseCode) => { const access_tokenStr = 'access_token='; const expires_inStr = '&expires_in'; let accessToken; - if (newUrl.indexOf('access_token=') < 0) { + if (url.indexOf('access_token=') < 0) { return false; } - accessToken = newUrl.substring(newUrl.indexOf(access_tokenStr) + 13, newUrl.indexOf(expires_inStr)); + accessToken = url.substring(url.indexOf(access_tokenStr) + 13, url.indexOf(expires_inStr)); setUserData(accessToken); authenticationWindow.destroy(); @@ -93,7 +93,10 @@ function initMainWindow() { minWidth: 800, minHeight: 640, center: true, - frame: false + frame: false, + webPreferences: { + nodeIntegration: true + } }); mainWindow.loadURL(`file://${__dirname}/app/index.html`); diff --git a/package.json b/package.json index c5529f57..ad99d890 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "babel-preset-react": "^6.23.0", "babel-preset-stage-0": "^6.22.0", "babel-register": "^6.23.0", - "electron": "^1.6.11", + "electron": "^6.0.6", "electron-packager": "^8.5.1", "eslint": "^4.0.0", "eslint-plugin-react": "^7.1.0", From d87104796daa99b56f927c80b30f91c091e3d637 Mon Sep 17 00:00:00 2001 From: Jake Jarrett Date: Sat, 31 Aug 2019 11:22:42 +1000 Subject: [PATCH 7/8] Woops forgot to remove scope --- main.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main.js b/main.js index ce40fbfb..dfc195ac 100644 --- a/main.js +++ b/main.js @@ -65,6 +65,8 @@ function authenticateUser() { accessToken = url.substring(url.indexOf(access_tokenStr) + 13, url.indexOf(expires_inStr)); + accessToken = accessToken.split('&scope=')[0]; + setUserData(accessToken); authenticationWindow.destroy(); }); From be61e8a5c49f9482c4d60be6d58a370e58ccdf15 Mon Sep 17 00:00:00 2001 From: Jake Jarrett Date: Sat, 22 Feb 2020 14:38:57 +1100 Subject: [PATCH 8/8] Bumps version of electron & electron packager --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 31b9f94b..09d077a0 100644 --- a/package.json +++ b/package.json @@ -17,9 +17,9 @@ "webpack:dev": "./node_modules/.bin/webpack -d --watch --config ./webpack.dev.js", "sass:prod": "./node_modules/.bin/node-sass --include-path ./app/public/stylesheets/sass --output-style compressed ./app/public/stylesheets/sass/app.scss ./app/public/stylesheets/css/app.css", "sass:dev": "./node_modules/.bin/node-sass --recursive --include-path ./app/public/stylesheets/sass --output-style expanded ./app/public/stylesheets/sass/app.scss ./app/public/stylesheets/css/app.css", - "package:osx": "electron-packager ./ Soundnode --platform=darwin --out ./dist/Soundnode --electron-version 1.4.4 --overwrite --icon ./app/soundnode.ico", - "package:linux": "electron-packager ./ Soundnode --platform=linux --out ./dist/Soundnode --electron-version 1.4.4 --overwrite --icon ./app/soundnode.icns", - "package:win32": "electron-packager ./ Soundnode --platform=win32 --out ./dist/Soundnode --electron-version 1.4.4 --overwrite --icon ./app/soundnode.icns", + "package:osx": "electron-packager ./ Soundnode --platform=darwin --out ./dist/Soundnode --electron-version 8.0.1 --overwrite --icon ./app/soundnode.ico", + "package:linux": "electron-packager ./ Soundnode --platform=linux --out ./dist/Soundnode --electron-version 8.0.1 --overwrite --icon ./app/soundnode.icns", + "package:win32": "electron-packager ./ Soundnode --platform=win32 --out ./dist/Soundnode --electron-version 8.0.1 --overwrite --icon ./app/soundnode.icns", "package:all": "npm run package:osx && npm run package:linux && npm run package:win32" }, "author": "Michael Lancaster", @@ -31,8 +31,8 @@ "babel-preset-react": "^6.23.0", "babel-preset-stage-0": "^6.22.0", "babel-register": "^6.23.0", - "electron": "^6.0.6", - "electron-packager": "^8.5.1", + "electron": "^8.0.1", + "electron-packager": "^14.2.1", "eslint": "^4.0.0", "eslint-plugin-react": "^7.1.0", "install": "^0.10.1",