Skip to content

Commit 0899c8c

Browse files
committed
chore: Bump electron@4.2.7
1 parent ea1f613 commit 0899c8c

5 files changed

Lines changed: 46 additions & 43 deletions

File tree

.yarnrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
disturl "https://atom.io/download/electron"
2-
target "4.2.5"
2+
target "4.2.7"
33
runtime "electron"

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@
6060
"git": {
6161
"name": "electron",
6262
"repositoryUrl": "https://github.com/electron/electron",
63-
"commitHash": "5d67ec3da5376a5058990e8a9557bc9124ad59a8"
63+
"commitHash": "36ea114ac0616e469e75ae94e6d53af48925e036"
6464
}
6565
},
6666
"isOnlyProductionDependency": true,
6767
"license": "MIT",
68-
"version": "4.2.5"
68+
"version": "4.2.7"
6969
},
7070
{
7171
"component": {

src/typings/electron.d.ts

Lines changed: 38 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Type definitions for Electron 4.2.5
1+
// Type definitions for Electron 4.2.7
22
// Project: http://electronjs.org/
33
// Definitions by: The Electron Team <https://github.com/electron/electron>
44
// Definitions: https://github.com/electron/electron-typescript-definitions
@@ -3479,14 +3479,14 @@ declare namespace Electron {
34793479
* Creates a new NativeImage instance from the NSImage that maps to the given image
34803480
* name. See NSImageName for a list of possible values. The hslShift is applied to
34813481
* the image with the following rules This means that [-1, 0, 1] will make the
3482-
* image completely white and [-1, 1, 0] will make the image completely black. In
3483-
* some cases, the NSImageName doesn't match its string representation; one example
3484-
* of this is NSFolderImageName, whose string representation would actually be
3485-
* NSFolder. Therefore, you'll need to determine the correct string representation
3486-
* for your image before passing it in. This can be done with the following: echo
3487-
* -e '#import <Cocoa/Cocoa.h>\nint main() { NSLog(@"%@", SYSTEM_IMAGE_NAME); }' |
3488-
* clang -otest -x objective-c -framework Cocoa - && ./test where SYSTEM_IMAGE_NAME
3489-
* should be replaced with any value from this list.
3482+
* image completely white and [-1, 1, 0] will make the image completely black. In
3483+
* some cases, the NSImageName doesn't match its string representation; one example
3484+
* of this is NSFolderImageName, whose string representation would actually be
3485+
* NSFolder. Therefore, you'll need to determine the correct string representation
3486+
* for your image before passing it in. This can be done with the following: echo
3487+
* -e '#import <Cocoa/Cocoa.h>\nint main() { NSLog(@"%@", SYSTEM_IMAGE_NAME); }' |
3488+
* clang -otest -x objective-c -framework Cocoa - && ./test where SYSTEM_IMAGE_NAME
3489+
* should be replaced with any value from this list.
34903490
*/
34913491
static createFromNamedImage(imageName: string, hslShift: number[]): NativeImage;
34923492
/**
@@ -3737,6 +3737,17 @@ declare namespace Electron {
37373737
once(event: 'unlock-screen', listener: Function): this;
37383738
addListener(event: 'unlock-screen', listener: Function): this;
37393739
removeListener(event: 'unlock-screen', listener: Function): this;
3740+
/**
3741+
* Calculate the system idle state. idleThreshold is the amount of time (in
3742+
* seconds) before considered idle. callback will be called synchronously on some
3743+
* systems and with an idleState argument that describes the system's state. locked
3744+
* is available on supported systems only.
3745+
*/
3746+
querySystemIdleState(idleThreshold: number, callback: (idleState: 'active' | 'idle' | 'locked' | 'unknown') => void): void;
3747+
/**
3748+
* Calculate system idle time in seconds.
3749+
*/
3750+
querySystemIdleTime(callback: (idleTime: number) => void): void;
37403751
}
37413752

37423753
interface PowerSaveBlocker extends EventEmitter {
@@ -4418,30 +4429,6 @@ declare namespace Electron {
44184429
* The new RGBA color the user assigned to be their system accent color.
44194430
*/
44204431
newColor: string) => void): this;
4421-
/**
4422-
* NOTE: This event is only emitted after you have called
4423-
* startAppLevelAppearanceTrackingOS
4424-
*/
4425-
on(event: 'appearance-changed', listener: (
4426-
/**
4427-
* Can be `dark` or `light`
4428-
*/
4429-
newAppearance: ('dark' | 'light')) => void): this;
4430-
once(event: 'appearance-changed', listener: (
4431-
/**
4432-
* Can be `dark` or `light`
4433-
*/
4434-
newAppearance: ('dark' | 'light')) => void): this;
4435-
addListener(event: 'appearance-changed', listener: (
4436-
/**
4437-
* Can be `dark` or `light`
4438-
*/
4439-
newAppearance: ('dark' | 'light')) => void): this;
4440-
removeListener(event: 'appearance-changed', listener: (
4441-
/**
4442-
* Can be `dark` or `light`
4443-
*/
4444-
newAppearance: ('dark' | 'light')) => void): this;
44454432
on(event: 'color-changed', listener: (event: Event) => void): this;
44464433
once(event: 'color-changed', listener: (event: Event) => void): this;
44474434
addListener(event: 'color-changed', listener: (event: Event) => void): this;
@@ -8789,17 +8776,33 @@ declare namespace Electron {
87898776
* The type of media access being requested, can be video, audio or unknown
87908777
*/
87918778
mediaType: ('video' | 'audio' | 'unknown');
8779+
/**
8780+
* The last URL the requesting frame loaded
8781+
*/
8782+
requestingUrl: string;
8783+
/**
8784+
* Whether the frame making the request is the main frame
8785+
*/
8786+
isMainFrame: boolean;
87928787
}
87938788

87948789
interface PermissionRequestHandlerDetails {
87958790
/**
87968791
* The url of the openExternal request.
87978792
*/
8798-
externalURL: string;
8793+
externalURL?: string;
87998794
/**
88008795
* The types of media access being requested, elements can be video or audio
88018796
*/
8802-
mediaTypes: Array<'video' | 'audio'>;
8797+
mediaTypes?: Array<'video' | 'audio'>;
8798+
/**
8799+
* The last URL the requesting frame loaded
8800+
*/
8801+
requestingUrl: string;
8802+
/**
8803+
* Whether the frame making the request is the main frame
8804+
*/
8805+
isMainFrame: boolean;
88038806
}
88048807

88058808
interface PluginCrashedEvent extends Event {

test/smoke/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@types/webdriverio": "4.6.1",
2323
"concurrently": "^3.5.1",
2424
"cpx": "^1.5.0",
25-
"electron": "4.2.5",
25+
"electron": "4.2.7",
2626
"htmlparser2": "^3.9.2",
2727
"mkdirp": "^0.5.1",
2828
"mocha": "^5.2.0",

test/smoke/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -676,10 +676,10 @@ electron-download@^4.1.0:
676676
semver "^5.4.1"
677677
sumchecker "^2.0.2"
678678

679-
electron@4.2.5:
680-
version "4.2.5"
681-
resolved "https://registry.yarnpkg.com/electron/-/electron-4.2.5.tgz#1d1432c38e2b2190318f7ca30897cdfdcf942e5a"
682-
integrity sha512-P132MXzTtyn2ZaekhKi5JeHzmTAMuR/uQt4hrg3vfJV7fpncx9SL6UFwHAK1DU13iiyZJqqIziNUu+o8nODHsA==
679+
electron@4.2.7:
680+
version "4.2.7"
681+
resolved "https://registry.yarnpkg.com/electron/-/electron-4.2.7.tgz#bdd2dbf489a4a4255405bd8330cc8509831d29ba"
682+
integrity sha512-Azpkw0OPzKVipSsN9/0DrBQhXOpG48Q1gTG7Akchtv37s8TijMe403TUgHxGGhw2ti117ek51kYf7NXLhjXqoA==
683683
dependencies:
684684
"@types/node" "^10.12.18"
685685
electron-download "^4.1.0"

0 commit comments

Comments
 (0)