Skip to content
This repository was archived by the owner on Jan 5, 2026. It is now read-only.

Commit 3226464

Browse files
tonyanzianotonyanziano
authored
Bumped electron to 13.6.1 (#2318)
* Bumped electron to 13.6.1 * Added changelog entry * Fixed broken test. * Updated electron-builder, electron-rebuild, and keytar * Added missing npmlog dependency * Bumped electron-builder to 22.11.4 * Downgraded electron-builder back to 22.9.1 * Downgraded electron-rebuild and keytar to previous versions * Updated package-lock * WIP of new electron download script * Fixed download script * Pulled electron-builder config out into a function that generates plat-specific config
1 parent ed0b611 commit 3226464

14 files changed

Lines changed: 2758 additions & 1934 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## Unreleased
8+
## Added
9+
- [main] Bumped `electron` to v13.6.1 in PR [2318](https://github.com/microsoft/BotFramework-Emulator/pull/2318)
810

911
## v4.14.0 - 2021 - 7 - 15
1012
## Added

‎package-lock.json‎

Lines changed: 2504 additions & 1797 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/app/client/src/ui/editor/welcomePage/welcomePage.scss.d.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ export const stepContent: string;
2323
export const spacing: string;
2424
export const marginFix: string;
2525
export const botInspectorHeaderContainer: string;
26+
export const flexRow: string;
27+
export const flexColumn: string;

‎packages/app/main/.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/app
22
/installer
3-
/dist
3+
/dist
4+
/customElectron

‎packages/app/main/package.json‎

Lines changed: 6 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
"rebuild:keytar:electron": "electron-rebuild",
1212
"build:electron": "babel ./src --out-dir app/server --extensions \".ts,.tsx\" --ignore \"**/*.spec.ts\" && npm run copy:extension:stubs",
1313
"copy:extension:stubs": "ncp src/extensions app/extensions",
14-
"dist": "electron-builder",
14+
"dist": "electron-builder --config scripts/config/getElectronBuilderConfig.js",
1515
"lint": "eslint --color --quiet --ext .js,.jsx,.ts,.tsx ./src",
1616
"lint:fix": "npm run lint -- --fix",
17-
"pack": "electron-builder --dir",
17+
"pack": "electron-builder --config scripts/config/getElectronBuilderConfig.js --dir",
1818
"start": "concurrently --kill-others --names \"electron,react-app\" --success first \"npm run start:electron:dev\" \"npm run start:react-app\"",
1919
"start:electron": "./node_modules/.bin/electron --inspect=7777 --remote-debugging-port=7778 .",
2020
"start:electron:dev": "cross-env ELECTRON_TARGET_URL=http://localhost:3000/ npm run start:electron",
@@ -81,6 +81,7 @@
8181
"@babel/plugin-transform-runtime": "^7.4.4",
8282
"@babel/preset-env": "^7.11.0",
8383
"@babel/preset-typescript": "^7.1.0",
84+
"@electron/get": "^1.13.1",
8485
"@types/async": "^2.0.47",
8586
"@types/chokidar": "^1.7.5",
8687
"@types/formidable": "^1.0.30",
@@ -102,14 +103,15 @@
102103
"concurrently": "^3.5.1",
103104
"cross-env": "^5.1.3",
104105
"del": "^3.0.0",
105-
"electron": "11.0.1",
106+
"electron": "13.6.1",
106107
"electron-builder": "22.9.1",
107108
"electron-rebuild": "2.3.4",
108109
"eslint": "7.19.0",
109110
"eslint-config-prettier": "^3.5.0",
110111
"eslint-plugin-import": "2.20.0",
111112
"eslint-plugin-notice": "^0.7.7",
112113
"eslint-plugin-prettier": "^3.0.1",
114+
"extract-zip": "^2.0.1",
113115
"fancy-log": "^1.3.2",
114116
"jest": "24.8.0",
115117
"license-list": "^0.1.3",
@@ -151,6 +153,7 @@
151153
"moment": "^2.22.1",
152154
"node-fetch": "^2.3.0",
153155
"node-uuid": "^1.4.8",
156+
"npmlog": "^5.0.1",
154157
"read-text-file": "^1.1.0",
155158
"redux": "^3.7.2",
156159
"redux-saga": "^0.16.0",
@@ -162,132 +165,5 @@
162165
"tslib": "^1.9.0",
163166
"ws": "^5.0.0",
164167
"xmldom": "^0.1.27"
165-
},
166-
"build": {
167-
"asar": true,
168-
"appId": "F3C061A6-FE81-4548-82ED-C1171D9856BB",
169-
"productName": "Bot Framework Emulator",
170-
"copyright": "Copyright © 2018 Microsoft Corporation",
171-
"electronDownload": {
172-
"version": "11.0.1"
173-
},
174-
"protocols": [
175-
{
176-
"name": "Bot Framework Emulator",
177-
"role": "Viewer",
178-
"schemes": [
179-
"bfemulator"
180-
]
181-
}
182-
],
183-
"fileAssociations": [
184-
{
185-
"name": "Bot",
186-
"ext": "bot"
187-
},
188-
{
189-
"name": "Transcript",
190-
"ext": "transcript"
191-
}
192-
],
193-
"asarUnpack": [
194-
"app/extensions/**",
195-
"node_modules/@bfemulator/extension-*/**"
196-
],
197-
"directories": {
198-
"buildResources": "./scripts/config/resources"
199-
},
200-
"files": [
201-
"**/*",
202-
"!**/node_modules/*/{README.md,README,readme.md,readme,test}",
203-
"!**/node_modules/.bin",
204-
"!**/*.{o,hprof,orig,pyc,pyo,rbc}",
205-
"!**/._*",
206-
"!**/{.DS_Store,.git,.hg,.svn,CVS,RCS,SCCS,__pycache__,thumbs.db,.gitignore,.gitattributes,.editorconfig,.idea,appveyor.yml,.travis.yml,circle.yml,.babelrc,.eslintignore,.eslintrc.js,.prettierrc,.eslintrc.react.js,.node-version}",
207-
"!.vscode${/*}",
208-
"!doc${/*}",
209-
"!**/{tsconfig.json,README.md,getlicenses.cmd}",
210-
"!**/node_modules/@types",
211-
"!./scripts",
212-
"!**/cache",
213-
"!./installer"
214-
],
215-
"win": {
216-
"artifactName": "BotFramework-Emulator-${version}-windows-setup.${ext}",
217-
"icon": "./scripts/config/resources/icon.ico",
218-
"target": [
219-
{
220-
"target": "nsis",
221-
"arch": [
222-
"ia32"
223-
]
224-
}
225-
]
226-
},
227-
"nsis": {
228-
"include": "./scripts/config/resources/nsis/installer.nsh",
229-
"perMachine": false,
230-
"allowElevation": true,
231-
"allowToChangeInstallationDirectory": true,
232-
"packElevateHelper": true,
233-
"unicode": true,
234-
"runAfterFinish": true,
235-
"installerHeader": "./scripts/config/resources/nsis/installerHeader.bmp",
236-
"installerIcon": "./scripts/config/resources/icon.ico",
237-
"installerSidebar": "./scripts/config/resources/nsis/installerSidebar.bmp",
238-
"uninstallerIcon": "./scripts/config/resources/icon.ico",
239-
"uninstallerSidebar": "./scripts/config/resources/nsis/installerSidebar.bmp",
240-
"createDesktopShortcut": true,
241-
"createStartMenuShortcut": true,
242-
"shortcutName": "Bot Framework Emulator (V4)",
243-
"oneClick": false
244-
},
245-
"mac": {
246-
"artifactName": "BotFramework-Emulator-${version}-mac.${ext}",
247-
"category": "public.app-category.developer-tools",
248-
"target": [
249-
{
250-
"target": "dmg",
251-
"arch": [
252-
"x64"
253-
]
254-
}
255-
],
256-
"extendInfo": {
257-
"NSMicrophoneUsageDescription": "This app requires microphone access to record audio."
258-
},
259-
"entitlements": "./scripts/config/resources/entitlements.plist"
260-
},
261-
"dmg": {
262-
"background": "./scripts/config/resources/background.tiff",
263-
"icon": "./scripts/config/resources/emulator_dmg.icns",
264-
"title": "Bot Framework Emulator Installer",
265-
"contents": [
266-
{
267-
"x": 140,
268-
"y": 244
269-
},
270-
{
271-
"x": 380,
272-
"y": 244,
273-
"type": "link",
274-
"path": "/Applications"
275-
}
276-
]
277-
},
278-
"linux": {
279-
"artifactName": "BotFramework-Emulator-${version}-${platform}-${arch}.${ext}",
280-
"category": "Development",
281-
"target": [
282-
{
283-
"target": "AppImage",
284-
"arch": [
285-
"x64"
286-
]
287-
}
288-
]
289-
},
290-
"publish": null,
291-
"remoteBuild": false
292168
}
293169
}

‎packages/app/main/scripts/config/getElectronBuilderConfig.js‎

Lines changed: 169 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
1+
//
2+
// Copyright (c) Microsoft. All rights reserved.
3+
// Licensed under the MIT license.
4+
//
5+
// Microsoft Bot Framework: http://botframework.com
6+
//
7+
// Bot Framework Emulator Github:
8+
// https://github.com/Microsoft/BotFramwork-Emulator
9+
//
10+
// Copyright (c) Microsoft Corporation
11+
// All rights reserved.
12+
//
13+
// MIT License:
14+
// Permission is hereby granted, free of charge, to any person obtaining
15+
// a copy of this software and associated documentation files (the
16+
// "Software"), to deal in the Software without restriction, including
17+
// without limitation the rights to use, copy, modify, merge, publish,
18+
// distribute, sublicense, and/or sell copies of the Software, and to
19+
// permit persons to whom the Software is furnished to do so, subject to
20+
// the following conditions:
21+
//
22+
// The above copyright notice and this permission notice shall be
23+
// included in all copies or substantial portions of the Software.
24+
//
25+
// THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT WARRANTY OF ANY KIND,
26+
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
27+
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
28+
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
29+
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
30+
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
31+
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
32+
//
33+
34+
const packageJson = require('../../package.json');
35+
const electronVersion = packageJson.devDependencies.electron;
36+
37+
const baseConfig = {
38+
asar: true,
39+
appId: 'F3C061A6-FE81-4548-82ED-C1171D9856BB',
40+
productName: 'Bot Framework Emulator',
41+
copyright: 'Copyright © 2018 Microsoft Corporation',
42+
protocols: [
43+
{
44+
name: 'Bot Framework Emulator',
45+
role: 'Viewer',
46+
schemes: ['bfemulator'],
47+
},
48+
],
49+
fileAssociations: [
50+
{
51+
name: 'Bot',
52+
ext: 'bot',
53+
},
54+
{
55+
name: 'Transcript',
56+
ext: 'transcript',
57+
},
58+
],
59+
asarUnpack: ['app/extensions/**', 'node_modules/@bfemulator/extension-*/**'],
60+
directories: {
61+
buildResources: './scripts/config/resources',
62+
},
63+
files: [
64+
'**/*',
65+
'!**/node_modules/*/{README.md,README,readme.md,readme,test}',
66+
'!**/node_modules/.bin',
67+
'!**/*.{o,hprof,orig,pyc,pyo,rbc}',
68+
'!**/._*',
69+
'!**/{.DS_Store,.git,.hg,.svn,CVS,RCS,SCCS,__pycache__,thumbs.db,.gitignore,.gitattributes,.editorconfig,.idea,appveyor.yml,.travis.yml,circle.yml,.babelrc,.eslintignore,.eslintrc.js,.prettierrc,.eslintrc.react.js,.node-version}',
70+
'!.vscode${/*}',
71+
'!doc${/*}',
72+
'!**/{tsconfig.json,README.md,getlicenses.cmd}',
73+
'!**/node_modules/@types',
74+
'!./scripts',
75+
'!**/cache',
76+
'!./installer',
77+
],
78+
win: {
79+
artifactName: 'BotFramework-Emulator-${version}-windows-setup.${ext}',
80+
icon: './scripts/config/resources/icon.ico',
81+
target: [
82+
{
83+
target: 'nsis',
84+
arch: ['ia32'],
85+
},
86+
],
87+
},
88+
nsis: {
89+
include: './scripts/config/resources/nsis/installer.nsh',
90+
perMachine: false,
91+
allowElevation: true,
92+
allowToChangeInstallationDirectory: true,
93+
packElevateHelper: true,
94+
unicode: true,
95+
runAfterFinish: true,
96+
installerHeader: './scripts/config/resources/nsis/installerHeader.bmp',
97+
installerIcon: './scripts/config/resources/icon.ico',
98+
installerSidebar: './scripts/config/resources/nsis/installerSidebar.bmp',
99+
uninstallerIcon: './scripts/config/resources/icon.ico',
100+
uninstallerSidebar: './scripts/config/resources/nsis/installerSidebar.bmp',
101+
createDesktopShortcut: true,
102+
createStartMenuShortcut: true,
103+
shortcutName: 'Bot Framework Emulator (V4)',
104+
oneClick: false,
105+
},
106+
mac: {
107+
artifactName: 'BotFramework-Emulator-${version}-mac.${ext}',
108+
category: 'public.app-category.developer-tools',
109+
target: [
110+
{
111+
target: 'dmg',
112+
arch: ['x64'],
113+
},
114+
],
115+
extendInfo: {
116+
NSMicrophoneUsageDescription: 'This app requires microphone access to record audio.',
117+
},
118+
entitlements: './scripts/config/resources/entitlements.plist',
119+
},
120+
dmg: {
121+
background: './scripts/config/resources/background.tiff',
122+
icon: './scripts/config/resources/emulator_dmg.icns',
123+
title: 'Bot Framework Emulator Installer',
124+
contents: [
125+
{
126+
x: 140,
127+
y: 244,
128+
},
129+
{
130+
x: 380,
131+
y: 244,
132+
type: 'link',
133+
path: '/Applications',
134+
},
135+
],
136+
},
137+
linux: {
138+
artifactName: 'BotFramework-Emulator-${version}-${platform}-${arch}.${ext}',
139+
category: 'Development',
140+
target: [
141+
{
142+
target: 'AppImage',
143+
arch: ['x64'],
144+
},
145+
],
146+
},
147+
publish: null,
148+
remoteBuild: false,
149+
};
150+
151+
module.exports = () => {
152+
if (process.platform === 'win32') {
153+
// on Windows we need to manually download the internal Electron binary
154+
// and then unsign it before packing it up to be signed
155+
return {
156+
...baseConfig,
157+
electronDist: 'customElectron',
158+
};
159+
} else {
160+
// on Mac and Linux we will download the internal Electron binary as-is
161+
// during the electron-builder pack call
162+
return {
163+
...baseConfig,
164+
electronDownload: {
165+
version: electronVersion,
166+
},
167+
};
168+
}
169+
};

0 commit comments

Comments
 (0)