Skip to content

Commit 70c3b66

Browse files
amungeramunger
committed
Merge remote-tracking branch 'origin/main' into aamunger/fileBackedIW
2 parents 6266d3b + daa66ad commit 70c3b66

File tree

106 files changed

+1569
-1153
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+1569
-1153
lines changed

‎.vscode/launch.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
{
22
"version": "0.1.0",
33
"configurations": [
4+
{
5+
"request": "attach",
6+
"type": "node",
7+
""
8+
},
49
{
510
"type": "node",
611
"request": "launch",

‎.vscode/tasks.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,17 @@
112112
"dependsOrder": "sequence",
113113
"problemMatcher": []
114114
},
115+
{
116+
"label": "Kill VS Code - Build, Yarn, VS Code - Build",
117+
"dependsOn": [
118+
"Kill VS Code - Build",
119+
"npm: install",
120+
"VS Code - Build"
121+
],
122+
"group": "build",
123+
"dependsOrder": "sequence",
124+
"problemMatcher": []
125+
},
115126
{
116127
"type": "npm",
117128
"script": "watch-webd",

‎.yarnrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
disturl "https://electronjs.org/headers"
2-
target "22.3.10"
2+
target "22.3.11"
3+
ms_build_id "21658788"
34
runtime "electron"
45
build_from_source "true"

‎build/checksums/electron.txt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
3af1be2861b5de836b35e7a2e5eeaffa2b4517c3024ebd8658033be5aa98c3ce *electron-v22.3.11-darwin-arm64-symbols.zip
2+
5441f785aefc23d53466872b8f1836a172b20f0a0ddf019dfe6cfc498e9e8e19 *electron-v22.3.11-darwin-arm64.zip
3+
473ba98236a945113f3ea5e3b7d3c3d1bc108bb8c99c5d35917c4ee01c0bb4be *electron-v22.3.11-darwin-x64-symbols.zip
4+
8bd965b00c19de5e880feeff92e01cb0570c436ff6a97e271123e340fee157c3 *electron-v22.3.11-darwin-x64.zip
5+
689281dc20066f98673261b77337d018237f8b0d11f6e3b14dedec24d90f2df4 *electron-v22.3.11-linux-arm64-symbols.zip
6+
d9ade7f28e10c3ca0ddc5ada982574a3d84f30fb9f92a82608666608b801ca8a *electron-v22.3.11-linux-arm64.zip
7+
926a0adfb9bf1d2ed3cd26b0bcc8efe66eb793ddc309dff8e6f230abf12ca6e5 *electron-v22.3.11-linux-armv7l-symbols.zip
8+
857eadea9ba34dacf7822d4bb58fd62fd585cc5c5a5b81c0ac32e55108038382 *electron-v22.3.11-linux-armv7l.zip
9+
529057b7fe9be5958bd56b2d18b32d85cb9337ccb76878c67afb799b0f166130 *electron-v22.3.11-linux-x64-symbols.zip
10+
6b5d2a18eab1d14b9f60180c246fb07cd09b298e4e8da1bf517b83ca6c0d0242 *electron-v22.3.11-linux-x64.zip
11+
472a3a15ee7e94ba4cc47052ec4be90fa1072955367bdf135591f12e623af167 *electron-v22.3.11-win32-arm64-pdb.zip
12+
104a685a78556c61c3f7c6fe33f84a3091199150e44e701e513a5d49afef0c55 *electron-v22.3.11-win32-arm64-symbols.zip
13+
3debd92e3be6b74c6b8f25ec7963e8ab94fb877c50c06026aea4bac308311604 *electron-v22.3.11-win32-arm64.zip
14+
38617bd350dd5f757be2cd43afb2238ac42d97714f96a1f27839d04447a31d82 *electron-v22.3.11-win32-ia32-pdb.zip
15+
12b8a47ddae57eb55dcf8aa1fdf39b9575fcb150de1c9bb2444d8702a7d3efec *electron-v22.3.11-win32-ia32-symbols.zip
16+
463062b6bdc09c11ab083c667aae2d6b677f945449ff7bf482059c6086a28e7b *electron-v22.3.11-win32-ia32.zip
17+
3f5bf196a4de1c2b8efedc5f0ef690a41645b33a36e62c307164cb66e20cfaa7 *electron-v22.3.11-win32-x64-pdb.zip
18+
b4edb586a021013333badb6e1974e42e0b673f5f49bc7909a338b3e9ad46f7ef *electron-v22.3.11-win32-x64-symbols.zip
19+
7944be5db19c2fa16aa887ec0ca287e84dfe8676d8223165b811ffec1dd57b3d *electron-v22.3.11-win32-x64.zip
20+
f2e3db6dc9c7b6e779a034bc4ede297213a05f1a80e0d5fc7fa02e6f8438ecd2 *ffmpeg-v22.3.11-darwin-arm64.zip
21+
5b1732b2f67aa98cb5a0ad9b5caf085c11449bc9710971a2344c10f471cc986f *ffmpeg-v22.3.11-darwin-x64.zip
22+
8233e865973bed62bb1d16011a29eb1e39851725509523bb3c54281b9ecad7e0 *ffmpeg-v22.3.11-linux-arm64.zip
23+
18464ab29adc06c72602b30b4c101ed27edadccee9476f3bd54411e791b415ee *ffmpeg-v22.3.11-linux-armv7l.zip
24+
4467c2e6c5b45cf11d8c2e06bfed76982c95fc50701cf13350b19d100080addd *ffmpeg-v22.3.11-linux-x64.zip
25+
8abc4dddf1e105a3375f56a8dd804101c014919a87dcd231cdb3b19ad6c30f7a *ffmpeg-v22.3.11-win32-arm64.zip
26+
295d3d628460c4b25f751ebc3763bf7ec72a57a337f89ed1ef6f666e3dcfecf5 *ffmpeg-v22.3.11-win32-ia32.zip
27+
17c5e7ec2248521d7064cfa91e9d894981e53a6391e65b83e35ff4f30001b2c5 *ffmpeg-v22.3.11-win32-x64.zip

‎build/checksums/nodejs.txt

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,7 @@
1-
dfb37570ef34ac04f34c26d0ec558df60a9665df5961c01c1657c0ca495f2f01 node-v16.17.1-aix-ppc64.tar.gz
21
f9f02f7872e2e8ee54320fce13deb9d56904f32bb0615b6e21aa3371d8899150 node-v16.17.1-darwin-arm64.tar.gz
3-
09a45f60bfb9dfbea4f69044dc733ef983945acd92ca89ccccac267f3d71bd44 node-v16.17.1-darwin-arm64.tar.xz
42
3db26761ad8493b894d42260d7e65094b7af9bc473588739e61bc1c32d6ff955 node-v16.17.1-darwin-x64.tar.gz
5-
8e7089956fa01cf7d0045945c0863d282dc6818fb0476237c1396497e29a4254 node-v16.17.1-darwin-x64.tar.xz
6-
35ccb95caf02cda3bd680da4350a8ae5d666a7a9eae3afe5c2a1b3ef29aef108 node-v16.17.1-headers.tar.gz
7-
554c8d1b4b16e0f4c073b9df7c49c893716a3a533f25ac646f23619f5ccee7df node-v16.17.1-headers.tar.xz
83
adc7032888d4e672a4aac886baede8c04fccdd1a2e7ab4bcf325e3f336f44a3d node-v16.17.1-linux-arm64.tar.gz
9-
3dfb8fd8f6b97df69cdc56524abc906c50ef1d0bf091188616802e6c7c731389 node-v16.17.1-linux-arm64.tar.xz
104
aeab05e35f1d2824ecfb88ca321f1408b44d292b2775f2890972c828e00216d0 node-v16.17.1-linux-armv7l.tar.gz
11-
a035ceefb5e16f5fce98c8ddfdf721b96eec20542c72fb8781bcbb6ef20c5550 node-v16.17.1-linux-armv7l.tar.xz
12-
1f48de7bed99e973c4c50f1b7fc99fc9af5144d093fd6d2b50a1e43b5818bf05 node-v16.17.1-linux-ppc64le.tar.gz
13-
70305934661f89fca64053b85317a75f233d5e3fdb2caa6546a19262a519cf20 node-v16.17.1-linux-ppc64le.tar.xz
14-
029dad48018bda07b481213816549b632059fc673c30fdc7a353e04619128344 node-v16.17.1-linux-s390x.tar.gz
15-
1a47f604944c6aff37cb7483503155671cdb34bda9bfb8962007bc440fa04d77 node-v16.17.1-linux-s390x.tar.xz
165
da5658693243b3ecf6a4cba6751a71df1eb9e9703ca93b42a9404aed85f58ad0 node-v16.17.1-linux-x64.tar.gz
17-
06ba2eb34aa385967f5f58c87a44753f83212f6cccea892b33f80a2e7fda8384 node-v16.17.1-linux-x64.tar.xz
18-
12d10476ea7483298364c810c037b9316d1a73dc8c81cfeff7d794aecadde498 node-v16.17.1.pkg
19-
e423985f6019b2026f9a191adb56a96ae83ecd56cdf839cf94aa980168b7a90f node-v16.17.1.tar.gz
20-
6721feb4152d56d2c6b358ce397abd5a7f1daf09ee2e25c5021b9b4d3f86a330 node-v16.17.1.tar.xz
21-
9777e8c4b2864c5b54a0e4e9400f14887db68560a09b94b4113b560a64d1e680 node-v16.17.1-win-x64.7z
22-
ed290151efb417262b9808a70738d4ab79e9d53653a6a9f4b8dd97912e279dce node-v16.17.1-win-x64.zip
23-
0f8101648d5c9e49e89fee541da9e574f899716c32b7c51a732b1766b9fc4526 node-v16.17.1-win-x86.7z
24-
189b5e8b23226403e7b07a46614de19b444d369e694901e3668e2f549799cbcd node-v16.17.1-win-x86.zip
25-
1bdff65fb7642425c0d6826084d63c4be43520316f0ea0b46e6a51999a0ed7fc node-v16.17.1-x64.msi
26-
b737eb23a2c67c253b9364b5284123faf5220d567615bebd4ec4b81070e4d177 node-v16.17.1-x86.msi
276
f518a70dcab7c3fac5b2e1ef100b4f628edfb160f4fafa9a94ef222da8a6e9ab win-x64/node.exe
28-
2f459a64647db493da63c790ce368ad54f59f086d9f22f59c5018680420197b3 win-x64/node.lib
29-
23215ce7d1e9de9777c3407239e7cf18d29d60f757b772219421ab361ac67c74 win-x64/node_pdb.7z
30-
8e32ec12028fd3e3147435be79a858ed9c870aaafa1fcb291362307ef3c47547 win-x64/node_pdb.zip
317
2393aff88be19dbe0205cbde4ff0c1d89911b15de5c99c80f6e5e29604eecd12 win-x86/node.exe
32-
5018c3d42f3fbacbd06cb943b3f2696c8e67ca9bdf6864d0e263d6d6911dffd2 win-x86/node.lib
33-
05a4db56444a60ee70b0d2642d7f2d82a33339894d2d73bd07b1a41d6c869e04 win-x86/node_pdb.7z
34-
8f86eacb7f13a1bf6738cb0819d7854a2abca40fc2e9e1f91421e44ba52cad7e win-x86/node_pdb.zip

‎build/lib/electron.js

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

‎build/lib/electron.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,11 @@ function darwinBundleDocumentTypes(types: { [name: string]: string | string[] },
9090
});
9191
}
9292

93+
const { electronVersion, msBuildId } = util.getElectronVersion();
94+
9395
export const config = {
94-
version: product.electronRepository ? '22.5.7' : util.getElectronVersion(),
96+
version: electronVersion,
97+
tag: product.electronRepository ? `v${electronVersion}-${msBuildId}` : undefined,
9598
productAppName: product.nameLong,
9699
companyName: 'Microsoft Corporation',
97100
copyright: 'Copyright (C) 2023 Microsoft. All rights reserved',
@@ -188,7 +191,9 @@ export const config = {
188191
linuxExecutableName: product.applicationName,
189192
winIcon: 'resources/win32/code.ico',
190193
token: process.env['GITHUB_TOKEN'],
191-
repo: product.electronRepository || undefined
194+
repo: product.electronRepository || undefined,
195+
validateChecksum: true,
196+
checksumFile: path.join(root, 'build', 'checksums', 'electron.txt'),
192197
};
193198

194199
function getElectron(arch: string): () => NodeJS.ReadWriteStream {
@@ -212,7 +217,7 @@ function getElectron(arch: string): () => NodeJS.ReadWriteStream {
212217
}
213218

214219
async function main(arch = process.arch): Promise<void> {
215-
const version = product.electronRepository ? '22.5.7' : util.getElectronVersion();
220+
const version = electronVersion;
216221
const electronPath = path.join(root, '.build', 'electron');
217222
const versionFile = path.join(electronPath, 'version');
218223
const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`;

‎build/lib/stylelint/vscode-known-variables.json

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,9 @@
100100
"--vscode-diffEditor-removedLineBackground",
101101
"--vscode-diffEditor-removedTextBackground",
102102
"--vscode-diffEditor-removedTextBorder",
103+
"--vscode-diffEditor-unchangedCodeBackground",
103104
"--vscode-diffEditor-unchangedRegionBackground",
105+
"--vscode-diffEditor-unchangedRegionForeground",
104106
"--vscode-diffEditorGutter-insertedLineBackground",
105107
"--vscode-diffEditorGutter-removedLineBackground",
106108
"--vscode-diffEditorOverview-insertedForeground",
@@ -295,6 +297,16 @@
295297
"--vscode-focusBorder",
296298
"--vscode-foreground",
297299
"--vscode-icon-foreground",
300+
"--vscode-inlineChat-background",
301+
"--vscode-inlineChat-border",
302+
"--vscode-inlineChat-regionHighlight",
303+
"--vscode-inlineChat-shadow",
304+
"--vscode-inlineChatDiff-inserted",
305+
"--vscode-inlineChatInput-background",
306+
"--vscode-inlineChatInput-border",
307+
"--vscode-inlineChatInput-focusBorder",
308+
"--vscode-inlineChatInput-placeholderForeground",
309+
"--vscode-inlineChatrDiff-removed",
298310
"--vscode-input-background",
299311
"--vscode-input-border",
300312
"--vscode-input-foreground",
@@ -312,16 +324,6 @@
312324
"--vscode-inputValidation-warningBackground",
313325
"--vscode-inputValidation-warningBorder",
314326
"--vscode-inputValidation-warningForeground",
315-
"--vscode-inlineChat-background",
316-
"--vscode-inlineChat-border",
317-
"--vscode-inlineChat-regionHighlight",
318-
"--vscode-inlineChat-shadow",
319-
"--vscode-inlineChatDiff-inserted",
320-
"--vscode-inlineChatDiff-removed",
321-
"--vscode-inlineChatInput-background",
322-
"--vscode-inlineChatInput-border",
323-
"--vscode-inlineChatInput-focusBorder",
324-
"--vscode-inlineChatInput-placeholderForeground",
325327
"--vscode-keybindingLabel-background",
326328
"--vscode-keybindingLabel-border",
327329
"--vscode-keybindingLabel-bottomBorder",
@@ -745,4 +747,4 @@
745747
"--z-index-run-button-container",
746748
"--zoom-factor"
747749
]
748-
}
750+
}

‎build/lib/util.js

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

‎build/lib/util.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -384,10 +384,11 @@ export function streamToPromise(stream: NodeJS.ReadWriteStream): Promise<void> {
384384
});
385385
}
386386

387-
export function getElectronVersion(): string {
387+
export function getElectronVersion(): Record<string, string> {
388388
const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
389-
const target = /^target "(.*)"$/m.exec(yarnrc)![1];
390-
return target;
389+
const electronVersion = /^target "(.*)"$/m.exec(yarnrc)![1];
390+
const msBuildId = /^ms_build_id "(.*)"$/m.exec(yarnrc)![1];
391+
return { electronVersion, msBuildId };
391392
}
392393

393394
export function acquireWebNodePaths() {

0 commit comments

Comments
 (0)