Don't import from node in extensions for URL and TextEncoder

Fixes #90162

Follow up on b1c5e2f19b
This commit is contained in:
Matt Bierner 2020-02-07 15:51:13 -08:00
parent 1251bf0a6e
commit b46d35c25c
6 changed files with 25 additions and 5 deletions

View file

@ -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;

View file

@ -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
extensions/types/lib.textEncoder.d.ts vendored Normal file
View file

@ -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
extensions/types/lib.url.d.ts vendored Normal file
View file

@ -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;

View file

@ -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';

View file

@ -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'/>