Skip to content

Commit cc7ba25

Browse files
authored
Merge pull request microsoft#230269 from microsoft/joh/sparkling-loon
eng - use `esModuleInterop` for extensions
2 parents 370f561 + e6f315d commit cc7ba25

File tree

15 files changed

+17
-16
lines changed

15 files changed

+17
-16
lines changed

extensions/extension-editing/src/extensionLinter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ export class ExtensionLinter {
290290

291291
const text = document.getText();
292292
if (!this.markdownIt) {
293-
this.markdownIt = new (await import('markdown-it'));
293+
this.markdownIt = new ((await import('markdown-it')).default);
294294
}
295295
const tokens = this.markdownIt.parse(text, {});
296296
const tokensAndPositions: TokenAndPosition[] = (function toTokensAndPositions(this: ExtensionLinter, tokens: MarkdownItType.Token[], begin = 0, end = text.length): TokenAndPosition[] {

extensions/git/src/git.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as path from 'path';
88
import * as os from 'os';
99
import * as cp from 'child_process';
1010
import { fileURLToPath } from 'url';
11-
import * as which from 'which';
11+
import which from 'which';
1212
import { EventEmitter } from 'events';
1313
import * as iconv from '@vscode/iconv-lite-umd';
1414
import * as filetype from 'file-type';

extensions/git/src/repository.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import TelemetryReporter from '@vscode/extension-telemetry';
77
import * as fs from 'fs';
88
import * as path from 'path';
9-
import * as picomatch from 'picomatch';
9+
import picomatch from 'picomatch';
1010
import { CancellationError, CancellationToken, CancellationTokenSource, Command, commands, Disposable, Event, EventEmitter, FileDecoration, l10n, LogLevel, LogOutputChannel, Memento, ProgressLocation, ProgressOptions, RelativePattern, scm, SourceControl, SourceControlInputBox, SourceControlInputBoxValidation, SourceControlInputBoxValidationType, SourceControlResourceDecorations, SourceControlResourceGroup, SourceControlResourceState, TabInputNotebookDiff, TabInputTextDiff, TabInputTextMultiDiff, ThemeColor, Uri, window, workspace, WorkspaceEdit } from 'vscode';
1111
import { ActionButton } from './actionButton';
1212
import { ApiRepository } from './api/api1';

extensions/git/src/test/smoke.test.ts

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

66
import 'mocha';
7-
import * as assert from 'assert';
7+
import assert from 'assert';
88
import { workspace, commands, window, Uri, WorkspaceEdit, Range, TextDocument, extensions, TabInputTextDiff } from 'vscode';
99
import * as cp from 'child_process';
1010
import * as fs from 'fs';

extensions/git/src/util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { Event, Disposable, EventEmitter, SourceControlHistoryItemRef } from 'vs
77
import { dirname, sep, relative } from 'path';
88
import { Readable } from 'stream';
99
import { promises as fs, createReadStream } from 'fs';
10-
import * as byline from 'byline';
10+
import byline from 'byline';
1111

1212
export const isMacintosh = process.platform === 'darwin';
1313
export const isWindows = process.platform === 'win32';

extensions/html-language-features/server/src/test/words.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) Microsoft Corporation. All rights reserved.
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
5-
import * as assert from 'assert';
5+
import assert from 'assert';
66
import * as words from '../utils/strings';
77
import * as fs from 'fs';
88
import * as path from 'path';

extensions/ipynb/src/notebookSerializer.ts

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

66
import type * as nbformat from '@jupyterlab/nbformat';
7-
import * as detectIndent from 'detect-indent';
7+
import detectIndent from 'detect-indent';
88
import * as vscode from 'vscode';
99
import { getPreferredLanguage, jupyterNotebookModelToNotebookData } from './deserializers';
1010
import * as fnv from '@enonic/fnv-plus';

extensions/markdown-language-features/src/markdownEngine.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ export class MarkdownItEngine implements IMdParser {
129129
if (!this._md) {
130130
this._md = (async () => {
131131
const markdownIt = await import('markdown-it');
132-
let md: MarkdownIt = markdownIt(await getMarkdownOptions(() => md));
132+
let md: MarkdownIt = markdownIt.default(await getMarkdownOptions(() => md));
133133
md.linkify.set({ fuzzyLink: false });
134134

135135
for (const plugin of this._contributionProvider.contributions.markdownItPlugins.values()) {
@@ -143,7 +143,7 @@ export class MarkdownItEngine implements IMdParser {
143143
const frontMatterPlugin = await import('markdown-it-front-matter');
144144
// Extract rules from front matter plugin and apply at a lower precedence
145145
let fontMatterRule: any;
146-
frontMatterPlugin({
146+
frontMatterPlugin.default(<any>{
147147
block: {
148148
ruler: {
149149
before: (_id: any, _id2: any, rule: any) => { fontMatterRule = rule; }

extensions/npm/src/npmMain.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { NpmScriptsTreeDataProvider } from './npmView';
1111
import { getPackageManager, invalidateTasksCache, NpmTaskProvider, hasPackageJson } from './tasks';
1212
import { invalidateHoverScriptsCache, NpmScriptHoverProvider } from './scriptHover';
1313
import { NpmScriptLensProvider } from './npmScriptLens';
14-
import * as which from 'which';
14+
import which from 'which';
1515

1616
let treeDataProvider: NpmScriptsTreeDataProvider | undefined;
1717

extensions/npm/src/preferred-pm.ts

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

66
import findWorkspaceRoot = require('../node_modules/find-yarn-workspace-root');
7-
import * as findUp from 'find-up';
7+
import findUp from 'find-up';
88
import * as path from 'path';
9-
import * as whichPM from 'which-pm';
9+
import whichPM from 'which-pm';
1010
import { Uri, workspace } from 'vscode';
1111

1212
interface PreferredProperties {

0 commit comments

Comments
 (0)