File tree Expand file tree Collapse file tree 10 files changed +31
-12
lines changed Expand file tree Collapse file tree 10 files changed +31
-12
lines changed Original file line number Diff line number Diff line change @@ -149,7 +149,7 @@ describe('application loading', function () {
149
149
it ( 'gets the render process console logs and clears them' , async function ( ) {
150
150
await app . client . waitUntilWindowLoaded ( ) ;
151
151
let logs = await app . client . getRenderProcessLogs ( ) ;
152
- expect ( logs . length ) . to . equal ( 2 ) ;
152
+ expect ( logs . length ) . to . equal ( 3 ) ;
153
153
expect ( logs [ 0 ] . message ) . to . contain ( '7:14 "render warn"' ) ;
154
154
expect ( logs [ 0 ] . source ) . to . equal ( 'console-api' ) ;
155
155
expect ( logs [ 0 ] . level ) . to . equal ( 'WARNING' ) ;
Original file line number Diff line number Diff line change 1
1
const { app, BrowserWindow } = require ( 'electron' ) ;
2
+ require ( '@electron/remote/main' ) . initialize ( ) ;
2
3
3
4
let mainWindow = null ;
4
5
@@ -9,7 +10,8 @@ app.on('ready', function () {
9
10
height : 600 ,
10
11
webPreferences : {
11
12
nodeIntegration : true ,
12
- enableRemoteModule : true
13
+ enableRemoteModule : true ,
14
+ contextIsolation : false
13
15
}
14
16
} ) ;
15
17
mainWindow . loadFile ( 'index.html' ) ;
Original file line number Diff line number Diff line change 1
1
const { app, BrowserWindow, ipcMain } = require ( 'electron' ) ;
2
+ require ( '@electron/remote/main' ) . initialize ( ) ;
2
3
const fs = require ( 'fs' ) ;
3
4
const path = require ( 'path' ) ;
4
5
@@ -20,7 +21,8 @@ app.on('ready', function () {
20
21
height : 100 ,
21
22
webPreferences : {
22
23
enableRemoteModule : true ,
23
- nodeIntegration : true
24
+ nodeIntegration : true ,
25
+ contextIsolation : false ,
24
26
}
25
27
} ) ;
26
28
mainWindow . loadFile ( 'index.html' ) ;
Original file line number Diff line number Diff line change 1
1
const { app, BrowserWindow } = require ( 'electron' ) ;
2
+ require ( '@electron/remote/main' ) . initialize ( ) ;
2
3
3
4
let mainWindow = null ;
4
5
@@ -11,7 +12,8 @@ app.on('ready', function () {
11
12
minWidth : 100 ,
12
13
webPreferences : {
13
14
nodeIntegration : true ,
14
- enableRemoteModule : true
15
+ enableRemoteModule : true ,
16
+ contextIsolation : false ,
15
17
}
16
18
} ) ;
17
19
mainWindow . loadFile ( 'index.html' ) ;
Original file line number Diff line number Diff line change 1
1
const { app, BrowserWindow } = require ( 'electron' ) ;
2
+ require ( '@electron/remote/main' ) . initialize ( ) ;
2
3
3
4
let topWindow = null ;
4
5
let bottomWindow = null ;
@@ -11,7 +12,8 @@ app.on('ready', function () {
11
12
height : 100 ,
12
13
webPreferences : {
13
14
nodeIntegration : true ,
14
- enableRemoteModule : true
15
+ enableRemoteModule : true ,
16
+ contextIsolation : false
15
17
}
16
18
} ) ;
17
19
topWindow . loadFile ( 'index-top.html' ) ;
@@ -26,7 +28,8 @@ app.on('ready', function () {
26
28
height : 50 ,
27
29
webPreferences : {
28
30
nodeIntegration : true ,
29
- enableRemoteModule : true
31
+ enableRemoteModule : true ,
32
+ contextIsolation : false
30
33
}
31
34
} ) ;
32
35
bottomWindow . loadFile ( 'index-bottom.html' ) ;
Original file line number Diff line number Diff line change 1
1
const { app, BrowserWindow } = require ( 'electron' ) ;
2
+ require ( '@electron/remote/main' ) . initialize ( ) ;
2
3
3
4
let mainWindow = null ;
4
5
@@ -10,7 +11,8 @@ app.on('ready', function () {
10
11
height : 100 ,
11
12
webPreferences : {
12
13
nodeIntegration : false ,
13
- enableRemoteModule : true
14
+ enableRemoteModule : true ,
15
+ contextIsolation : false
14
16
}
15
17
} ) ;
16
18
mainWindow . loadFile ( 'index.html' ) ;
Original file line number Diff line number Diff line change 1
1
const { app, BrowserWindow } = require ( 'electron' ) ;
2
+ require ( '@electron/remote/main' ) . initialize ( ) ;
2
3
3
4
let mainWindow = null ;
4
5
@@ -9,8 +10,9 @@ app.on('ready', function () {
9
10
height : 600 ,
10
11
webPreferences : {
11
12
nodeIntegration : true ,
12
- webviewTag : true ,
13
- enableRemoteModule : true
13
+ contextIsolation : false ,
14
+ enableRemoteModule : true ,
15
+ webviewTag : true
14
16
}
15
17
} ) ;
16
18
mainWindow . loadFile ( 'index.html' ) ;
Original file line number Diff line number Diff line change 1
1
const { app, BrowserWindow } = require ( 'electron' ) ;
2
+ require ( '@electron/remote/main' ) . initialize ( ) ;
2
3
const path = require ( 'path' ) ;
3
4
4
5
let mainWindow = null ;
@@ -12,7 +13,8 @@ app.on('ready', function () {
12
13
webPreferences : {
13
14
nodeIntegration : false ,
14
15
preload : path . join ( __dirname , 'preload.js' ) ,
15
- enableRemoteModule : true
16
+ enableRemoteModule : true ,
17
+ contextIsolation : false
16
18
}
17
19
} ) ;
18
20
mainWindow . loadFile ( 'index.html' ) ;
Original file line number Diff line number Diff line change 1
1
const { app, BrowserWindow } = require ( 'electron' ) ;
2
+ require ( '@electron/remote/main' ) . initialize ( ) ;
2
3
3
4
let mainWindow = null ;
4
5
@@ -10,7 +11,8 @@ app.on('ready', function () {
10
11
height : 100 ,
11
12
webPreferences : {
12
13
nodeIntegration : true ,
13
- enableRemoteModule : true
14
+ enableRemoteModule : true ,
15
+ contextIsolation : false
14
16
}
15
17
} ) ;
16
18
mainWindow . loadFile ( 'index.html' ) ;
Original file line number Diff line number Diff line change 1
1
const { app, BrowserWindow } = require ( 'electron' ) ;
2
+ require ( '@electron/remote/main' ) . initialize ( ) ;
2
3
3
4
let mainWindow = null ;
4
5
@@ -11,8 +12,9 @@ app.on('ready', function () {
11
12
minWidth : 100 ,
12
13
webPreferences : {
13
14
nodeIntegration : true ,
15
+ enableRemoteModule : true ,
16
+ contextIsolation : false ,
14
17
webviewTag : true ,
15
- enableRemoteModule : true
16
18
}
17
19
} ) ;
18
20
mainWindow . loadFile ( 'index.html' ) ;
You can’t perform that action at this time.
0 commit comments