Compare commits

...

5 Commits

Author SHA1 Message Date
Electron Bot
747842c930 Bump v13.0.0-beta.3 2021-03-08 07:01:55 -08:00
trop[bot]
174e939b26 test: exit after app.relaunch is called (#28031)
Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
2021-03-07 19:45:31 +09:00
trop[bot]
f8df8ea9d5 test: fix contextIsolation value for later added test (#28004)
Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
2021-03-05 10:10:59 +09:00
Electron Bot
da5e0e5ac2 Bump v13.0.0-beta.2 2021-03-04 07:01:51 -08:00
Electron Bot
b136c51747 Bump v13.0.0-beta.1 2021-03-03 13:38:42 -08:00
7 changed files with 21 additions and 14 deletions

View File

@@ -1 +1 @@
13.0.0-nightly.20210303
13.0.0-beta.3

View File

@@ -1,6 +1,6 @@
{
"name": "electron",
"version": "13.0.0-nightly.20210303",
"version": "13.0.0-beta.3",
"repository": "https://github.com/electron/electron",
"description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
"devDependencies": {

View File

@@ -50,8 +50,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 13,0,0,20210303
PRODUCTVERSION 13,0,0,20210303
FILEVERSION 13,0,0,3
PRODUCTVERSION 13,0,0,3
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L

View File

@@ -295,9 +295,9 @@ describe('app module', () => {
const child = cp.spawn(process.execPath, [appPath]);
child.stdout.on('data', (c) => console.log(c.toString()));
child.stderr.on('data', (c) => console.log(c.toString()));
child.on('exit', (code) => {
child.on('exit', (code, signal) => {
if (code !== 0) {
done(`Process exited with code ${code}`);
console.log(`Process exited with code "${code}" signal "${signal}"`);
}
});
});

View File

@@ -152,13 +152,15 @@ describe('chrome extensions', () => {
const [, loadedExtension] = await loadedPromise;
const [, readyExtension] = await emittedOnce(customSession, 'extension-ready');
expect(loadedExtension).to.deep.equal(extension);
expect(readyExtension).to.deep.equal(extension);
// Compare JSON string to print more information if failed.
const expected = JSON.stringify(extension);
expect(JSON.stringify(loadedExtension)).to.equal(expected);
expect(JSON.stringify(readyExtension)).to.equal(expected);
const unloadedPromise = emittedOnce(customSession, 'extension-unloaded');
await customSession.removeExtension(extension.id);
const [, unloadedExtension] = await unloadedPromise;
expect(unloadedExtension).to.deep.equal(extension);
expect(JSON.stringify(unloadedExtension)).to.equal(expected);
});
it('lists loaded extensions in getAllExtensions', async () => {

View File

@@ -1,7 +1,13 @@
const { app, BrowserWindow } = require('electron');
app.once('ready', () => {
const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true } });
const w = new BrowserWindow({
show: false,
webPreferences: {
contextIsolation: false,
nodeIntegration: true
}
});
w.webContents.once('crashed', () => {
app.quit();
});

View File

@@ -14,10 +14,9 @@ app.whenReady().then(() => {
client.end(String(lastArg === '--second'));
});
client.once('end', () => {
if (lastArg !== '--second') {
app.relaunch({ args: process.argv.slice(1).concat('--second') });
}
app.exit(0);
});
if (lastArg !== '--second') {
app.relaunch({ args: process.argv.slice(1).concat('--second') });
}
});