From c390a331c51a896ed064ae620c04efc22837f09e Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Fri, 16 Dec 2022 15:22:53 -0800 Subject: [PATCH] Switch to standard imports (#169451) --- extensions/github/src/pushErrorHandler.ts | 2 +- extensions/microsoft-authentication/src/AADHelper.ts | 2 +- extensions/npm/src/preferred-pm.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/github/src/pushErrorHandler.ts b/extensions/github/src/pushErrorHandler.ts index 7c3da24e8e0..6d4b4112811 100644 --- a/extensions/github/src/pushErrorHandler.ts +++ b/extensions/github/src/pushErrorHandler.ts @@ -7,7 +7,7 @@ import { TextDecoder } from 'util'; import { commands, env, ProgressLocation, Uri, window, workspace, QuickPickOptions, FileType, l10n } from 'vscode'; import { getOctokit } from './auth'; import { GitErrorCodes, PushErrorHandler, Remote, Repository } from './typings/git'; -import path = require('path'); +import * as path from 'path'; type Awaited = T extends PromiseLike ? Awaited : T; diff --git a/extensions/microsoft-authentication/src/AADHelper.ts b/extensions/microsoft-authentication/src/AADHelper.ts index f6bd8ecbd45..18c44ac3802 100644 --- a/extensions/microsoft-authentication/src/AADHelper.ts +++ b/extensions/microsoft-authentication/src/AADHelper.ts @@ -5,7 +5,7 @@ import * as vscode from 'vscode'; import * as querystring from 'querystring'; -import path = require('path'); +import * as path from 'path'; import Logger from './logger'; import { isSupportedEnvironment } from './utils'; import { generateCodeChallenge, generateCodeVerifier, randomUUID } from './cryptoUtils'; diff --git a/extensions/npm/src/preferred-pm.ts b/extensions/npm/src/preferred-pm.ts index 58be79acfdb..f69933d10f1 100644 --- a/extensions/npm/src/preferred-pm.ts +++ b/extensions/npm/src/preferred-pm.ts @@ -4,9 +4,9 @@ *--------------------------------------------------------------------------------------------*/ import findWorkspaceRoot = require('../node_modules/find-yarn-workspace-root'); -import findUp = require('find-up'); +import * as findUp from 'find-up'; import * as path from 'path'; -import whichPM = require('which-pm'); +import * as whichPM from 'which-pm'; import { Uri, workspace } from 'vscode'; interface PreferredProperties {