Skip to content

Commit

Permalink
Don't import from node in extensions for URL and TextEncoder
Browse files Browse the repository at this point in the history
Fixes #90162

Follow up on b1c5e2f
  • Loading branch information
mjbvz committed Feb 7, 2020
1 parent 1251bf0 commit b46d35c
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 5 deletions.
1 change: 0 additions & 1 deletion extensions/git/src/fileSystemProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { fromGitUri, toGitUri } from './uri';
import { Model, ModelChangeEvent, OriginalResourceChangeEvent } from './model';
import { filterEvent, eventToPromise, isDescendant, pathEquals, EmptyDisposable } from './util';
import { Repository } from './repository';
import { TextEncoder } from 'util';

interface CacheRow {
uri: Uri;
Expand Down
3 changes: 2 additions & 1 deletion extensions/git/src/typings/refs.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
/// <reference path="../../../types/lib.textEncoder.d.ts" />
11 changes: 11 additions & 0 deletions extensions/types/lib.textEncoder.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

// Define TextEncoder + TextDecoder globals for both browser and node runtimes
//
// Proper fix: https://github.com/microsoft/TypeScript/issues/31535

declare var TextDecoder: typeof import('util').TextDecoder;
declare var TextEncoder: typeof import('util').TextEncoder;
10 changes: 10 additions & 0 deletions extensions/types/lib.url.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

// Define Url global for both browser and node runtimes
//
// Copied from https://github.com/DefinitelyTyped/DefinitelyTyped/issues/34960

declare const URL: typeof import('url').URL;
3 changes: 0 additions & 3 deletions extensions/vscode-api-tests/src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
import * as vscode from 'vscode';

declare const window: unknown;
declare const TextEncoder: any;
declare const TextDecoder: any;
declare const URL: any;

const textEncoder = new TextEncoder();
const SCHEME = 'memfs';
Expand Down
2 changes: 2 additions & 0 deletions extensions/vscode-api-tests/src/typings/ref.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@

/// <reference path="../../../../src/vs/vscode.d.ts" />
/// <reference path="../../../../src/vs/vscode.proposed.d.ts" />
/// <reference path="../../../types/lib.textEncoder.d.ts" />
/// <reference path="../../../types/lib.url.d.ts" />
/// <reference types='@types/node'/>

0 comments on commit b46d35c

Please sign in to comment.