Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

chore: update electron #9056

Merged
tonyanziano merged 4 commits into from
Mar 17, 2022
Merged

chore: update electron #9056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f18355
chore: update electron to currently supported version
OEvgeny Mar 16, 2022
5508a92
Trigger build
OEvgeny Mar 16, 2022
c786345
Use Electron v14.2.6
OEvgeny Mar 16, 2022
fe666da
Trigger build
OEvgeny Mar 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Composer/packages/electron-server/electron-builder-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"appId": "com.microsoft.botframework.composer",
"copyright": "Copyright © 2020 Microsoft Corporation",
"electronDownload": {
"version": "8.2.4"
"version": "14.2.6"
},
"directories": {
"buildResources": "resources",
Expand Down
4 changes: 2 additions & 2 deletions Composer/packages/electron-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"@types/node": "13.9.3",
"@types/rimraf": "^2.0.2",
"cross-env": "7.0.2",
"electron": "8.2.4",
"electron": "14.2.6",
"electron-builder": "^22.6.0",
"globby": "^11.0.1",
"js-yaml": "^3.13.1",
Expand All @@ -74,7 +74,7 @@
"node-fetch": "2.6.1",
"semver": "7.3.2",
"tslib": "2.0.3",
"uuid": "^8.3.1"
"uuid": "7.0.0"
},
"peerDependencies": {
"oneauth-mac": "1.11.0",
Expand Down
12 changes: 6 additions & 6 deletions Composer/packages/electron-server/src/appMenu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,10 @@ export function initAppMenu(win?: Electron.BrowserWindow) {
['Cut', 'Copy', 'Delete'].forEach((label) => {
const nativeModeId = label + '-native';
const actionModeId = label;
menu.getMenuItemById(nativeModeId).visible = mode === 'native';
menu.getMenuItemById(actionModeId).visible = mode === 'action';
menu.getMenuItemById(nativeModeId)!.visible = mode === 'native';
menu.getMenuItemById(actionModeId)!.visible = mode === 'action';
});
menu.getMenuItemById('Paste-native').visible = mode === 'native';
menu.getMenuItemById('Paste-native')!.visible = mode === 'native';
};

// Turn shortcuts to Action editing mode when Flow Editor is focused.
Expand All @@ -271,17 +271,17 @@ export function initAppMenu(win?: Electron.BrowserWindow) {
// Let menu enable/disable status reflects action selection states.
const actionSelected = !!state.actionSelected;
['Cut', 'Copy', 'Delete'].forEach((id) => {
menu.getMenuItemById(id).enabled = actionSelected;
menu.getMenuItemById(id)!.enabled = actionSelected;
});
} else {
toggleEditingMode(menu, 'native');
}

// Let menu undo/redo status reflects history status
const canUndo = !!state.canUndo;
menu.getMenuItemById('Undo').enabled = canUndo;
menu.getMenuItemById('Undo')!.enabled = canUndo;
const canRedo = !!state.canRedo;
menu.getMenuItemById('Redo').enabled = canRedo;
menu.getMenuItemById('Redo')!.enabled = canRedo;

Menu.setApplicationMenu(menu);
});
Expand Down
1 change: 1 addition & 0 deletions Composer/packages/electron-server/src/electronWindow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export default class ElectronWindow {
nodeIntegrationInWorker: false,
nodeIntegration: false,
preload: join(__dirname, 'preload.js'),
nativeWindowOpen: true,
},
show: false,
title: `Bot Framework Composer (v${app.getVersion()})`,
Expand Down
1 change: 1 addition & 0 deletions Composer/packages/electron-server/src/splash/splashScreen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export const initSplashScreen = async ({
webPreferences: {
// This is necessary to enable loading local images in the url protocol (window.loadURL)
webSecurity: false, // lgtm [js/disabling-electron-websecurity]
nativeWindowOpen: true,
},
});

Expand Down
25 changes: 17 additions & 8 deletions Composer/yarn-berry.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2530,7 +2530,7 @@ __metadata:
cross-env: 7.0.2
crypto: ^1.0.1
debug: 4.1.1
electron: 8.2.4
electron: 14.2.6
electron-builder: ^22.6.0
electron-updater: 4.2.5
fix-path: ^3.0.0
Expand All @@ -2549,7 +2549,7 @@ __metadata:
source-map-explorer: ^2.4.2
ts-node: ^8.4.1
tslib: 2.0.3
uuid: ^8.3.1
uuid: 7.0.0
peerDependencies:
oneauth-mac: 1.11.0
oneauth-win64: 1.14.0
Expand Down Expand Up @@ -12208,16 +12208,16 @@ __metadata:
languageName: node
linkType: hard

"electron@npm:8.2.4":
version: 8.2.4
resolution: "electron@npm:8.2.4"
"electron@npm:14.2.6":
version: 14.2.6
resolution: "electron@npm:14.2.6"
dependencies:
"@electron/get": ^1.0.1
"@types/node": ^12.0.12
"@types/node": ^14.6.2
extract-zip: ^1.0.3
bin:
electron: cli.js
checksum: 0adefca28eed9fe5a38fe89080ca79a5b29f0315716348f725c337cc4c82aad128da1579db2041f5a991a64b40b0409e2a06d0ba7a4bf9614de94b9b9c038253
checksum: f0ce42459502f9f7d937374699eefbb56dacc03b21c7e7933f5a865c4f1f05aba00eafa3a217fa97d91559ffffe5f57ab17c2001a5e122118957932e360bb707
languageName: node
linkType: hard

Expand Down Expand Up @@ -27282,7 +27282,16 @@ __metadata:
languageName: node
linkType: hard

"uuid@npm:8.3.2, uuid@npm:^8.3.0, uuid@npm:^8.3.1, uuid@npm:^8.3.2":
"uuid@npm:7.0.0":
version: 7.0.0
resolution: "uuid@npm:7.0.0"
bin:
uuid: dist/bin/uuid
checksum: ff663dd21aec8ca725b3bec22bbbabc21a2997a75ce49e839bf73420faf4b03cd919a7a8ad4e03c606485a695db56fb1e7bfd419742386df49145e98e8120e70
languageName: node
linkType: hard

"uuid@npm:8.3.2, uuid@npm:^8.3.0, uuid@npm:^8.3.2":
version: 8.3.2
resolution: "uuid@npm:8.3.2"
bin:
Expand Down
22 changes: 11 additions & 11 deletions Composer/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5408,7 +5408,7 @@
"@types/node" "*"
form-data "^3.0.0"

"@types/node@*", "@types/node@13.9.3", "@types/node@^12.0.12", "@types/node@^14.14.31":
"@types/node@*", "@types/node@13.9.3", "@types/node@^14.14.31", "@types/node@^14.6.2":
version "13.9.3"
resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.3.tgz#6356df2647de9eac569f9a52eda3480fa9e70b4d"
integrity sha512-01s+ac4qerwd6RHD+mVbOEsraDHSgUaefQlEdBbUolnQFjKwCr7luvAlEwW1RFojh67u0z4OUTjPn9LEl4zIkA==
Expand Down Expand Up @@ -10861,13 +10861,13 @@ electron-updater@4.2.5:
pako "^1.0.11"
semver "^7.1.3"

electron@8.2.4:
version "8.2.4"
resolved "https://registry.yarnpkg.com/electron/-/electron-8.2.4.tgz#c4e51ca8e84b5a5beaaabdae1024bd52ba487ba4"
integrity sha512-Lle0InIgSAHZxD5KDY0wZ1A2Zlc6GHwMhAxoHMzn05mndyP1YBkCYHc0TDDofzUTrsLFofduPjlknO5Oj9fTPA==
electron@14.2.6:
version "14.2.6"
resolved "https://registry.yarnpkg.com/electron/-/electron-14.2.6.tgz#d134da424d79f2ea59758899a9ba0cf18170bbec"
integrity sha512-yTPmuBO6/7baUUjhQ1E2URsNjEPsj+DMcleLf3VexVPU1Py0mXc5OpwI6LCq/jvuwyGiXOLK2Vx6h4bel6DoEw==
dependencies:
"@electron/get" "^1.0.1"
"@types/node" "^12.0.12"
"@types/node" "^14.6.2"
extract-zip "^1.0.3"

elegant-spinner@^1.0.1:
Expand Down Expand Up @@ -22837,6 +22837,11 @@ utils-merge@1.0.1:
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=

uuid@7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.0.tgz#1833d4b9ce50b732bfaa271f9cb74e974d303c79"
integrity sha512-LNUrNsXdI/fUsypJbWM8Jt4DgQdFAZh41p9C7WE9Cn+CULOEkoG2lgQyH68v3wnIy5K3fN4jdSt270K6IFA3MQ==

uuid@8.3.2, uuid@^8.3.2:
version "8.3.2"
resolved "https://botbuilder.myget.org/F/botbuilder-v4-js-daily/npm/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
Expand All @@ -22857,11 +22862,6 @@ uuid@^8.3.0:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea"
integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==

uuid@^8.3.1:
version "8.3.1"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==

v8-compile-cache@^2.0.3:
version "2.1.0"
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"
Expand Down