Skip to content

Commit c39c543

Browse files
KalmaegiKalmaegi
authored
Merge branch 'main' into terminal_localEchoStyle_adjust
2 parents f0c5439 + 637fdea commit c39c543

File tree

163 files changed

+2581
-1756
lines changed

Some content is hidden

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

163 files changed

+2581
-1756
lines changed

‎.eslintrc.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@
233233
"electron",
234234
"events",
235235
"fs",
236+
"fs/promises",
236237
"graceful-fs",
237238
"http",
238239
"https",
@@ -244,6 +245,7 @@
244245
"os",
245246
"path",
246247
"perf_hooks",
248+
"readline",
247249
"stream",
248250
"string_decoder",
249251
"tas-client-umd",

‎.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/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/gulpfile.reh.js‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,9 @@ const serverWithWebEntryPoints = [
125125

126126
function getNodeVersion() {
127127
const yarnrc = fs.readFileSync(path.join(REPO_ROOT, 'remote', '.yarnrc'), 'utf8');
128-
const target = /^target "(.*)"$/m.exec(yarnrc)[1];
129-
return target;
128+
const nodeVersion = /^target "(.*)"$/m.exec(yarnrc)[1];
129+
const internalNodeVersion = /^ms_build_id "(.*)"$/m.exec(yarnrc)[1];
130+
return { nodeVersion, internalNodeVersion };
130131
}
131132

132133
function getNodeChecksum(nodeVersion, platform, arch) {
@@ -156,7 +157,7 @@ function getNodeChecksum(nodeVersion, platform, arch) {
156157
return undefined;
157158
}
158159

159-
const nodeVersion = getNodeVersion();
160+
const { nodeVersion, internalNodeVersion } = getNodeVersion();
160161

161162
BUILD_TARGETS.forEach(({ platform, arch }) => {
162163
gulp.task(task.define(`node-${platform}-${arch}`, () => {
@@ -193,7 +194,7 @@ function nodejs(platform, arch) {
193194
arch = 'x64';
194195
}
195196

196-
log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from ${product.nodejs.repository}...`);
197+
log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from ${product.nodejsRepository}...`);
197198

198199
const checksumSha256 = getNodeChecksum(nodeVersion, platform, arch);
199200

@@ -205,14 +206,14 @@ function nodejs(platform, arch) {
205206

206207
switch (platform) {
207208
case 'win32':
208-
return (product.nodejs.repository !== 'https://nodejs.org' ?
209-
fetchGithub(product.nodejs.repository, { version: product.nodejs.version, name: `win-${arch}-node.exe`, checksumSha256 }) :
209+
return (product.nodejsRepository !== 'https://nodejs.org' ?
210+
fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: `win-${arch}-node.exe`, checksumSha256 }) :
210211
fetchUrls(`/dist/v${nodeVersion}/win-${arch}/node.exe`, { base: 'https://nodejs.org', checksumSha256 }))
211212
.pipe(rename('node.exe'));
212213
case 'darwin':
213214
case 'linux':
214-
return (product.nodejs.repository !== 'https://nodejs.org' ?
215-
fetchGithub(product.nodejs.repository, { version: product.nodejs.version, name: `node-v${nodeVersion}-${platform}-${arch}.tar.gz`, checksumSha256 }) :
215+
return (product.nodejsRepository !== 'https://nodejs.org' ?
216+
fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: `node-v${nodeVersion}-${platform}-${arch}.tar.gz`, checksumSha256 }) :
216217
fetchUrls(`/dist/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`, { base: 'https://nodejs.org', checksumSha256 })
217218
).pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar())))
218219
.pipe(filter('**/node'))

‎build/lib/electron.js‎

Lines changed: 5 additions & 3 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: 5 additions & 2 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',
@@ -212,7 +215,7 @@ function getElectron(arch: string): () => NodeJS.ReadWriteStream {
212215
}
213216

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@
312312
"--vscode-inputValidation-warningBackground",
313313
"--vscode-inputValidation-warningBorder",
314314
"--vscode-inputValidation-warningForeground",
315+
"--vscode-inlineChat-background",
315316
"--vscode-inlineChat-border",
316317
"--vscode-inlineChat-regionHighlight",
317318
"--vscode-inlineChat-shadow",

‎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() {

‎build/linux/debian/install-sysroot.js‎

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

0 commit comments

Comments
 (0)