Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to use nodenext module resolution #236640

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
9 changes: 5 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
"v8-inspect-profiler": "^0.1.1",
"vscode-oniguruma": "1.7.0",
"vscode-regexpp": "^3.1.0",
"vscode-textmate": "9.1.0",
"vscode-textmate": "9.2.0",
"yauzl": "^3.0.0",
"yazl": "^2.4.3"
},
Expand Down
9 changes: 5 additions & 4 deletions remote/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion remote/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"tas-client-umd": "0.2.0",
"vscode-oniguruma": "1.7.0",
"vscode-regexpp": "^3.1.0",
"vscode-textmate": "9.1.0",
"vscode-textmate": "9.2.0",
"yauzl": "^3.0.0",
"yazl": "^2.4.3"
},
Expand Down
9 changes: 5 additions & 4 deletions remote/web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion remote/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
"jschardet": "3.1.4",
"tas-client-umd": "0.2.0",
"vscode-oniguruma": "1.7.0",
"vscode-textmate": "9.1.0"
"vscode-textmate": "9.2.0"
}
}
2 changes: 1 addition & 1 deletion src/bootstrap-node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as path from 'path';
import * as fs from 'fs';
import { fileURLToPath } from 'url';
import { createRequire } from 'node:module';
import type { IProductConfiguration } from './vs/base/common/product';
import type { IProductConfiguration } from './vs/base/common/product.ts';
mjbvz marked this conversation as resolved.
Show resolved Hide resolved

const require = createRequire(import.meta.url);
const __dirname = path.dirname(fileURLToPath(import.meta.url));
Expand Down
4 changes: 2 additions & 2 deletions src/tsconfig.base.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"module": "es2022",
"moduleResolution": "node",
"moduleResolution": "nodenext",
"experimentalDecorators": true,
"noImplicitReturns": true,
"noImplicitOverride": true,
Expand All @@ -27,4 +27,4 @@
],
"allowSyntheticDefaultImports": true
}
}
}
2 changes: 1 addition & 1 deletion src/vs/platform/telemetry/common/1dsAppender.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ async function getClient(instrumentationKey: string, addInternalFlag?: boolean,

appInsightsCore.initialize(coreConfig, []);

appInsightsCore.addTelemetryInitializer((envelope) => {
appInsightsCore.addTelemetryInitializer((envelope: any) => {
// Opt the user out of 1DS data sharing
envelope['ext'] = envelope['ext'] ?? {};
envelope['ext']['web'] = envelope['ext']['web'] ?? {};
Expand Down
2 changes: 1 addition & 1 deletion src/vs/platform/telemetry/node/1dsAppender.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export class OneDataSystemAppender extends AbstractOneDataSystemAppender {
) {
// Override the way events get sent since node doesn't have XHTMLRequest
const customHttpXHROverride: IXHROverride = {
sendPOST: (payload: IPayloadData, oncomplete) => {
sendPOST: (payload: IPayloadData, oncomplete: OnCompleteFunc) => {
// Fire off the async request without awaiting it
sendPostAsync(requestService, payload, oncomplete);
}
Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/contrib/webview/browser/webviewMessages.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import type { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
import type { WebviewStyles } from 'vs/workbench/contrib/webview/browser/webview';
import type { IMouseWheelEvent } from '../../../../base/browser/mouseEvent.ts';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mjbvz I think here it should also be .js

import type { WebviewStyles } from './webview.ts';

type KeyEvent = {
key: string;
Expand Down
Loading