Skip to content

Commit

Permalink
yarn upgrade + dep fix
Browse files Browse the repository at this point in the history
Set `@electron/remote` range to avoid version `2.0.4` as the typings are
bogus.
  • Loading branch information
paul-marechal committed Feb 8, 2022
1 parent 37ed897 commit d4b1e4a
Show file tree
Hide file tree
Showing 5 changed files with 372 additions and 477 deletions.
4 changes: 2 additions & 2 deletions packages/core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ export class SomeClass {
## Re-Exports

- `@theia/core/electron-shared/...`
- `@electron/remote` (from [`@electron/remote@^2.0.1`](https://www.npmjs.com/package/@electron/remote))
- `@electron/remote/main` (from [`@electron/remote@^2.0.1`](https://www.npmjs.com/package/@electron/remote))
- `@electron/remote` (from [`@electron/remote@^2.0.1 <2.0.4 || >2.0.4`](https://www.npmjs.com/package/@electron/remote))
- `@electron/remote/main` (from [`@electron/remote@^2.0.1 <2.0.4 || >2.0.4`](https://www.npmjs.com/package/@electron/remote))
- `native-keymap` (from [`native-keymap@^2.2.1`](https://www.npmjs.com/package/native-keymap))
- `electron` (from [`electron@^15.3.5`](https://www.npmjs.com/package/electron))
- `electron-store` (from [`electron-store@^8.0.0`](https://www.npmjs.com/package/electron-store))
Expand Down
4 changes: 2 additions & 2 deletions packages/electron/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ The `@theia/electron` extension bundles all Electron-specific dependencies and c
## Re-Exports

- `@theia/electron/shared/...`
- `@electron/remote` (from [`@electron/remote@^2.0.1`](https://www.npmjs.com/package/@electron/remote))
- `@electron/remote/main` (from [`@electron/remote@^2.0.1`](https://www.npmjs.com/package/@electron/remote))
- `@electron/remote` (from [`@electron/remote@^2.0.1 <2.0.4 || >2.0.4`](https://www.npmjs.com/package/@electron/remote))
- `@electron/remote/main` (from [`@electron/remote@^2.0.1 <2.0.4 || >2.0.4`](https://www.npmjs.com/package/@electron/remote))
- `native-keymap` (from [`native-keymap@^2.2.1`](https://www.npmjs.com/package/native-keymap))
- `electron` (from [`electron@^15.3.5`](https://www.npmjs.com/package/electron))
- `electron-store` (from [`electron-store@^8.0.0`](https://www.npmjs.com/package/electron-store))
Expand Down
2 changes: 1 addition & 1 deletion packages/electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "1.22.1",
"description": "Theia - Electron utility package",
"dependencies": {
"@electron/remote": "^2.0.1",
"@electron/remote": "^2.0.1 <2.0.4 || >2.0.4",
"electron-store": "^8.0.0",
"fix-path": "^3.0.0",
"native-keymap": "^2.2.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export class ElectronWebviewWidgetFactory extends WebviewWidgetFactory {
* @param endpoint cookie's target url
*/
protected async attachElectronSecurityCookie(endpoint: string): Promise<void> {
await electronRemote.session.defaultSession!.cookies.set({
await electronRemote.session.defaultSession.cookies.set({
url: endpoint,
name: ElectronSecurityToken,
value: JSON.stringify(this.container.get(ElectronSecurityToken)),
Expand All @@ -59,7 +59,7 @@ export class ElectronCustomEditorWidgetFactory extends CustomEditorWidgetFactory
* @param endpoint cookie's target url
*/
protected async attachElectronSecurityCookie(endpoint: string): Promise<void> {
await electronRemote.session.defaultSession!.cookies.set({
await electronRemote.session.defaultSession.cookies.set({
url: endpoint,
name: ElectronSecurityToken,
value: JSON.stringify(this.container.get(ElectronSecurityToken)),
Expand Down
Loading

0 comments on commit d4b1e4a

Please sign in to comment.