From a7ebbed30e9f18a29e901850378fa800d6b46537 Mon Sep 17 00:00:00 2001 From: Paul Frazee Date: Mon, 25 Mar 2019 13:23:17 -0500 Subject: [PATCH 1/5] Update protocol registration for electron v5 --- app/background-process.js | 8 ++++---- app/webview-preload.js | 10 +--------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/app/background-process.js b/app/background-process.js index a948248537..da3e7823eb 100644 --- a/app/background-process.js +++ b/app/background-process.js @@ -57,7 +57,10 @@ if (beakerCore.getEnvVar('BEAKER_TEST_DRIVER')) { app.enableSandbox() // configure the protocols -protocol.registerStandardSchemes(['dat', 'beaker'], { secure: true }) +protocol.registerSchemesAsPrivileged([ + {scheme: 'dat', privileges: {standard: true, secure: true, allowServiceWorkers: true, supportFetchAPI: true, corsEnabled: true}}, + {scheme: 'beaker', privileges: {standard: true, secure: true, allowServiceWorkers: true, supportFetchAPI: true, corsEnabled: true}} +]) // handle OS event to open URLs app.on('open-url', (e, url) => { @@ -122,9 +125,6 @@ app.on('ready', async function () { throw new Error('Failed to create protocol: dat') } }) - - // configure chromium's permissions for the protocols - protocol.registerServiceWorkerSchemes(['dat']) }) app.on('quit', () => { diff --git a/app/webview-preload.js b/app/webview-preload.js index e3a960b590..b2f2077606 100644 --- a/app/webview-preload.js +++ b/app/webview-preload.js @@ -7,15 +7,7 @@ import { setup as setupExecuteJavascript } from './webview-preload/execute-javas import setupExitFullScreenHackfix from './webview-preload/exit-full-screen-hackfix' import readableStreamAsyncIteratorPolyfill from './webview-preload/readable-stream-async-iterator-polyfill' -// register protocol behaviors -/* This marks the scheme as: - - Secure - - Allowing Service Workers - - Supporting Fetch API - - CORS Enabled -*/ -webFrame.registerURLSchemeAsPrivileged('dat', { bypassCSP: false }) -webFrame.setSpellCheckProvider('en-US', true, beakerCoreWebview.createSpellChecker(rpcAPI)) +webFrame.setSpellCheckProvider('en-US', beakerCoreWebview.createSpellChecker(rpcAPI)) // HACKS setupExitFullScreenHackfix() From 789cfdbf63e32cfba790f08017abb87f96dbf304 Mon Sep 17 00:00:00 2001 From: Paul Frazee Date: Mon, 25 Mar 2019 13:23:40 -0500 Subject: [PATCH 2/5] Bump electron@5.0.0-beta.6 --- package.json | 2 +- tasks/rebuild.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 4a8cb25fd6..62b5294d95 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "name": "beakerbrowser", "devDependencies": { "browserify": "^13.0.1", - "electron": "4.1.0", + "electron": "5.0.0-beta.6", "electron-builder": "~20.38.5", "eslint": "^4.5.0", "eslint-plugin-import": "^2.7.0", diff --git a/tasks/rebuild.js b/tasks/rebuild.js index 252501ff10..825af8fe62 100644 --- a/tasks/rebuild.js +++ b/tasks/rebuild.js @@ -2,7 +2,7 @@ var gulp = require('gulp') var path = require('path') var run = require('./util-run') -//(cd app && npm rebuild --runtime=electron --target=4.1.0 --disturl=https://atom.io/download/atom-shell --build-from-source); gulp build +//(cd app && npm rebuild --runtime=electron --target=5.0.0-beta.6 --disturl=https://atom.io/download/atom-shell --build-from-source); gulp build gulp.task('rebuild', gulp.series(function () { // TODO read electron version @@ -17,7 +17,7 @@ gulp.task('rebuild', gulp.series(function () { LDFLAGS: '-mmacosx-version-min=10.10' } } - run(`npm rebuild --runtime=electron --target=4.1.0 --disturl=https://atom.io/download/atom-shell --build-from-source`, {cwd, env, shell: true}, function () { + run(`npm rebuild --runtime=electron --target=5.0.0-beta.6 --disturl=https://atom.io/download/atom-shell --build-from-source`, {cwd, env, shell: true}, function () { run(`npm run build`, {shell: true}, function () { resolve() }) From 6d2a88656e80cfd6152e7677825626c73fff8edd Mon Sep 17 00:00:00 2001 From: Paul Frazee Date: Mon, 25 Mar 2019 15:18:55 -0500 Subject: [PATCH 3/5] Use beaker-core electron5 branch --- app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index c2bbea9673..d84ef24a5e 100644 --- a/app/package.json +++ b/app/package.json @@ -8,7 +8,7 @@ "copyright": "© 2019, Blue Link Labs", "main": "background-process.build.js", "dependencies": { - "@beaker/core": "beakerbrowser/beaker-core#46716e74cd5abcc6519e30e58fe927b92bb7d958", + "@beaker/core": "beakerbrowser/beaker-core#electron5", "@beaker/dat-archive-file-diff": "^1.0.0", "anymatch": "^1.3.2", "await-lock": "^1.1.3", From 7fa1a0a815ceb9bfc3ec408cd355fd372cfdbf47 Mon Sep 17 00:00:00 2001 From: Paul Frazee Date: Fri, 26 Apr 2019 13:25:41 -0500 Subject: [PATCH 4/5] Bump electron@5.0.0 --- package.json | 2 +- tasks/rebuild.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 69565d21af..ee870b009a 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "name": "beakerbrowser", "devDependencies": { "browserify": "^13.0.1", - "electron": "5.0.0-beta.6", + "electron": "5.0.0", "electron-builder": "~20.38.5", "eslint": "^4.5.0", "eslint-plugin-import": "^2.7.0", diff --git a/tasks/rebuild.js b/tasks/rebuild.js index 825af8fe62..7aa3e9f497 100644 --- a/tasks/rebuild.js +++ b/tasks/rebuild.js @@ -2,7 +2,7 @@ var gulp = require('gulp') var path = require('path') var run = require('./util-run') -//(cd app && npm rebuild --runtime=electron --target=5.0.0-beta.6 --disturl=https://atom.io/download/atom-shell --build-from-source); gulp build +//(cd app && npm rebuild --runtime=electron --target=5.0.0 --disturl=https://atom.io/download/atom-shell --build-from-source); gulp build gulp.task('rebuild', gulp.series(function () { // TODO read electron version @@ -17,7 +17,7 @@ gulp.task('rebuild', gulp.series(function () { LDFLAGS: '-mmacosx-version-min=10.10' } } - run(`npm rebuild --runtime=electron --target=5.0.0-beta.6 --disturl=https://atom.io/download/atom-shell --build-from-source`, {cwd, env, shell: true}, function () { + run(`npm rebuild --runtime=electron --target=5.0.0 --disturl=https://atom.io/download/atom-shell --build-from-source`, {cwd, env, shell: true}, function () { run(`npm run build`, {shell: true}, function () { resolve() }) From f3f886592599e3de21dea15c1875dab161b5e097 Mon Sep 17 00:00:00 2001 From: Paul Frazee Date: Fri, 26 Apr 2019 13:29:28 -0500 Subject: [PATCH 5/5] Rename test for consistency --- ...-page-web-api.js => experimental-capture-page-web-api-test.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/{experimental-capture-page-web-api.js => experimental-capture-page-web-api-test.js} (100%) diff --git a/tests/experimental-capture-page-web-api.js b/tests/experimental-capture-page-web-api-test.js similarity index 100% rename from tests/experimental-capture-page-web-api.js rename to tests/experimental-capture-page-web-api-test.js