Skip to content

Commit 1092d16

Browse files
authored
Merge pull request microsoft#186712 from microsoft/joh/fragile-thrush
set emit-target and libs to ES2022, avoid static-blocks, fix `Error#cause` conflict
2 parents 804b56b + eeae481 commit 1092d16

File tree

6 files changed

+7
-29
lines changed

6 files changed

+7
-29
lines changed

build/lib/tsb/transpiler.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/lib/tsb/transpiler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ export class SwcTranspiler implements ITranspiler {
376376
tsx: false,
377377
decorators: true
378378
},
379-
target: 'es2020',
379+
target: 'es2022',
380380
loose: false,
381381
minify: {
382382
compress: false,

src/tsconfig.base.json

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,10 @@
1717
"./vs/*"
1818
]
1919
},
20+
"target": "es2022",
21+
"useDefineForClassFields": false,
2022
"lib": [
21-
"ES2016",
22-
"ES2017.Object",
23-
"ES2017.String",
24-
"ES2017.Intl",
25-
"ES2017.TypedArrays",
26-
"ES2018.AsyncIterable",
27-
"ES2018.AsyncGenerator",
28-
"ES2018.Promise",
29-
"ES2018.Regexp",
30-
"ES2018.Intl",
31-
"ES2019.Array",
32-
"ES2019.Object",
33-
"ES2019.String",
34-
"ES2019.Symbol",
35-
"ES2020.BigInt",
36-
"ES2020.Promise",
37-
"ES2020.String",
38-
"ES2020.Symbol.WellKnown",
39-
"ES2020.Intl",
40-
"ES2021.Promise",
41-
"ES2021.String",
42-
"ES2021.WeakRef",
23+
"ES2022",
4324
"DOM",
4425
"DOM.Iterable",
4526
"WebWorker.ImportScripts"

src/tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"allowJs": true,
88
"resolveJsonModule": true,
99
"outDir": "../out/vs",
10-
"target": "es2021",
1110
"types": [
1211
"keytar",
1312
"mocha",

src/vs/base/node/zip.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ export type ExtractErrorType = 'CorruptZip' | 'Incomplete';
3636
export class ExtractError extends Error {
3737

3838
readonly type?: ExtractErrorType;
39-
readonly cause: Error;
4039

4140
constructor(type: ExtractErrorType | undefined, cause: Error) {
4241
let message = cause.message;

src/vs/workbench/api/common/extensionHostMain.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,11 @@ export interface IConsolePatchFn {
3434

3535
export abstract class ErrorHandler {
3636

37-
static {
37+
static async installEarlyHandler(accessor: ServicesAccessor): Promise<void> {
38+
3839
// increase number of stack frames (from 10, https://github.com/v8/v8/wiki/Stack-Trace-API)
3940
Error.stackTraceLimit = 100;
40-
}
4141

42-
static async installEarlyHandler(accessor: ServicesAccessor): Promise<void> {
4342
// does NOT dependent of extension information, can be installed immediately, and simply forwards
4443
// to the log service and main thread errors
4544
const logService = accessor.get(ILogService);

0 commit comments

Comments
 (0)