Skip to content

Commit b46d35c

Browse files
committed
Don't import from node in extensions for URL and TextEncoder
Fixes #90162 Follow up on b1c5e2f
1 parent 1251bf0 commit b46d35c

File tree

6 files changed

+25
-5
lines changed

6 files changed

+25
-5
lines changed

extensions/git/src/fileSystemProvider.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { fromGitUri, toGitUri } from './uri';
99
import { Model, ModelChangeEvent, OriginalResourceChangeEvent } from './model';
1010
import { filterEvent, eventToPromise, isDescendant, pathEquals, EmptyDisposable } from './util';
1111
import { Repository } from './repository';
12-
import { TextEncoder } from 'util';
1312

1413
interface CacheRow {
1514
uri: Uri;

extensions/git/src/typings/refs.d.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
/// <reference path='../../../../src/vs/vscode.d.ts'/>
7-
/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
7+
/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
8+
/// <reference path="../../../types/lib.textEncoder.d.ts" />

extensions/types/lib.textEncoder.d.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*---------------------------------------------------------------------------------------------
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for license information.
4+
*--------------------------------------------------------------------------------------------*/
5+
6+
// Define TextEncoder + TextDecoder globals for both browser and node runtimes
7+
//
8+
// Proper fix: https://github.com/microsoft/TypeScript/issues/31535
9+
10+
declare var TextDecoder: typeof import('util').TextDecoder;
11+
declare var TextEncoder: typeof import('util').TextEncoder;

extensions/types/lib.url.d.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/*---------------------------------------------------------------------------------------------
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for license information.
4+
*--------------------------------------------------------------------------------------------*/
5+
6+
// Define Url global for both browser and node runtimes
7+
//
8+
// Copied from https://github.com/DefinitelyTyped/DefinitelyTyped/issues/34960
9+
10+
declare const URL: typeof import('url').URL;

extensions/vscode-api-tests/src/extension.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
import * as vscode from 'vscode';
1616

1717
declare const window: unknown;
18-
declare const TextEncoder: any;
19-
declare const TextDecoder: any;
20-
declare const URL: any;
2118

2219
const textEncoder = new TextEncoder();
2320
const SCHEME = 'memfs';

extensions/vscode-api-tests/src/typings/ref.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@
55

66
/// <reference path="../../../../src/vs/vscode.d.ts" />
77
/// <reference path="../../../../src/vs/vscode.proposed.d.ts" />
8+
/// <reference path="../../../types/lib.textEncoder.d.ts" />
9+
/// <reference path="../../../types/lib.url.d.ts" />
810
/// <reference types='@types/node'/>

0 commit comments

Comments
 (0)