Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 09:08:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix module path mapping

Browse Source
This commit is contained in:
Daniel Imms
2023-11-01 13:03:47 -07:00
parent 9d1bc6ae59
commit 160d8bd150
16 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bootstrap-window.js
Vendored
+7 -7
View File
@@ -112,13 +112,13 @@
'vscode-textmate': `${baseNodeModulesPath}/vscode-textmate/release/main.js`,
'vscode-oniguruma': `${baseNodeModulesPath}/vscode-oniguruma/release/main.js`,
'vsda': `${baseNodeModulesPath}/vsda/index.js`,
'xterm': `${baseNodeModulesPath}/xterm/lib/xterm.js`,
'@xterm/addon-canvas': `${baseNodeModulesPath}/xterm-addon-canvas/lib/xterm-addon-canvas.js`,
'xterm-addon-image': `${baseNodeModulesPath}/xterm-addon-image/lib/xterm-addon-image.js`,
'@xterm/addon-search': `${baseNodeModulesPath}/xterm-addon-search/lib/xterm-addon-search.js`,
'@xterm/addon-serialize': `${baseNodeModulesPath}/xterm-addon-serialize/lib/xterm-addon-serialize.js`,
'@xterm/addon-unicode11': `${baseNodeModulesPath}/xterm-addon-unicode11/lib/xterm-addon-unicode11.js`,
'@xterm/addon-webgl': `${baseNodeModulesPath}/xterm-addon-webgl/lib/xterm-addon-webgl.js`,
'@xterm/xterm': `${baseNodeModulesPath}/@xterm/xterm/lib/xterm.js`,
'@xterm/addon-canvas': `${baseNodeModulesPath}/@xterm/addon-canvas/lib/addon-canvas.js`,
'@xterm/addon-image': `${baseNodeModulesPath}/@xterm/addon-image/lib/addon-image.js`,
'@xterm/addon-search': `${baseNodeModulesPath}/@xterm/addon-search/lib/addon-search.js`,
'@xterm/addon-serialize': `${baseNodeModulesPath}/@xterm/addon-serialize/lib/addon-serialize.js`,
'@xterm/addon-unicode11': `${baseNodeModulesPath}/@xterm/addon-unicode11/lib/addon-unicode11.js`,
'@xterm/addon-webgl': `${baseNodeModulesPath}/@xterm/addon-webgl/lib/addon-webgl.js`,
'@vscode/iconv-lite-umd': `${baseNodeModulesPath}/@vscode/iconv-lite-umd/lib/iconv-lite-umd.js`,
'jschardet': `${baseNodeModulesPath}/jschardet/dist/jschardet.min.js`,
'@vscode/vscode-languagedetection': `${baseNodeModulesPath}/@vscode/vscode-languagedetection/dist/lib/index.js`,
src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
+1 -1
View File
@@ -693,7 +693,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
return xtermConstructor;
}
xtermConstructor = Promises.withAsyncBody<typeof XTermTerminal>(async (resolve) => {
const Terminal = (await importAMDNodeModule<typeof import('xterm')>('xterm', 'lib/xterm.js')).Terminal;
const Terminal = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
// Localize strings
Terminal.strings.promptLabel = nls.localize('terminal.integrated.a11yPromptLabel', 'Terminal input');
Terminal.strings.tooMuchOutput = keybinding ? nls.localize('terminal.integrated.useAccessibleBuffer', 'Use the accessible buffer {0} to manually review output', keybinding.getLabel()) : nls.localize('terminal.integrated.useAccessibleBufferNoKb', 'Use the Terminal: Focus Accessible Buffer command to manually review output');
src/vs/workbench/contrib/terminal/test/browser/capabilities/commandDetectionCapability.test.ts
+1 -1
View File
@@ -62,7 +62,7 @@ suite('CommandDetectionCapability', () => {
setup(async () => {
disposables = new DisposableStore();
const TerminalCtor = (await importAMDNodeModule<typeof import('xterm')>('xterm', 'lib/xterm.js')).Terminal;
const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
xterm = new TerminalCtor({ allowProposedApi: true, cols: 80 });
instantiationService = disposables.add(new TestInstantiationService());
src/vs/workbench/contrib/terminal/test/browser/capabilities/partialCommandDetectionCapability.test.ts
+1 -1
View File
@@ -26,7 +26,7 @@ suite('PartialCommandDetectionCapability', () => {
}
setup(async () => {
const TerminalCtor = (await importAMDNodeModule<typeof import('xterm')>('xterm', 'lib/xterm.js')).Terminal;
const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
xterm = new TerminalCtor({ allowProposedApi: true, cols: 80 }) as TestTerminal;
capability = new PartialCommandDetectionCapability(xterm);
src/vs/workbench/contrib/terminal/test/browser/xterm/decorationAddon.test.ts
+1 -1
View File
@@ -28,7 +28,7 @@ suite('DecorationAddon', () => {
let instantiationService: TestInstantiationService;
setup(async () => {
const TerminalCtor = (await importAMDNodeModule<typeof import('xterm')>('xterm', 'lib/xterm.js')).Terminal;
const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
class TestTerminal extends TerminalCtor {
override registerDecoration(decorationOptions: IDecorationOptions): IDecoration | undefined {
if (decorationOptions.marker.isDisposed) {
src/vs/workbench/contrib/terminal/test/browser/xterm/lineDataEventAddon.test.ts
+1 -1
View File
@@ -25,7 +25,7 @@ suite('LineDataEventAddon', () => {
let events: string[];
setup(async () => {
const TerminalCtor = (await importAMDNodeModule<typeof import('xterm')>('xterm', 'lib/xterm.js')).Terminal;
const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 4 }));
lineDataEventAddon = store.add(new LineDataEventAddon());
xterm.loadAddon(lineDataEventAddon);
src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.test.ts
+1 -1
View File
@@ -38,7 +38,7 @@ suite('ShellIntegrationAddon', () => {
let capabilities: ITerminalCapabilityStore;
setup(async () => {
const TerminalCtor = (await importAMDNodeModule<typeof import('xterm')>('xterm', 'lib/xterm.js')).Terminal;
const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 }));
shellIntegrationAddon = store.add(new TestShellIntegrationAddon('', true, undefined, new NullLogService()));
xterm.loadAddon(shellIntegrationAddon);
src/vs/workbench/contrib/terminal/test/browser/xterm/xtermTerminal.test.ts
+1 -1
View File
@@ -129,7 +129,7 @@ suite('XtermTerminal', () => {
instantiationService.stub(ILayoutService, new TestLayoutService());
configHelper = store.add(instantiationService.createInstance(TerminalConfigHelper));
XTermBaseCtor = (await importAMDNodeModule<typeof import('xterm')>('xterm', 'lib/xterm.js')).Terminal;
XTermBaseCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
const capabilityStore = store.add(new TerminalCapabilityStore());
xterm = store.add(instantiationService.createInstance(TestXtermTerminal, XTermBaseCtor, configHelper, 80, 30, { getBackgroundColor: () => undefined }, capabilityStore, '', new MockContextKeyService().createKey('', true)!, true));
src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts
+1 -1
View File
@@ -75,7 +75,7 @@ suite('Buffer Content Tracker', () => {
if (!isWindows) {
capabilities.add(TerminalCapability.NaiveCwdDetection, null!);
}
const TerminalCtor = (await importAMDNodeModule<typeof import('xterm')>('xterm', 'lib/xterm.js')).Terminal;
const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
xterm = store.add(instantiationService.createInstance(XtermTerminal, TerminalCtor, configHelper, 80, 30, { getBackgroundColor: () => undefined }, capabilities, '', new MockContextKeyService().createKey('', true)!, true));
const container = document.createElement('div');
xterm.raw.open(container);
src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkManager.test.ts
+1 -1
View File
@@ -86,7 +86,7 @@ suite('TerminalLinkManager', () => {
instantiationService.stub(IThemeService, themeService);
instantiationService.stub(IViewDescriptorService, viewDescriptorService);
const TerminalCtor = (await importAMDNodeModule<typeof import('xterm')>('xterm', 'lib/xterm.js')).Terminal;
const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 }));
linkManager = store.add(instantiationService.createInstance(TestLinkManager, xterm, upcastPartial<ITerminalProcessManager>({
get initialCwd() {
src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkOpeners.test.ts
+1 -1
View File
@@ -112,7 +112,7 @@ suite('Workbench - TerminalLinkOpeners', () => {
}
}
} as Partial<IEditorService>);
const TerminalCtor = (await importAMDNodeModule<typeof import('xterm')>('xterm', 'lib/xterm.js')).Terminal;
const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
xterm = store.add(new TerminalCtor({ allowProposedApi: true }));
});
src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLocalLinkDetector.test.ts
+1 -1
View File
@@ -193,7 +193,7 @@ suite('Workbench - TerminalLocalLinkDetector', () => {
resolver = instantiationService.createInstance(TerminalLinkResolver);
validResources = [];
const TerminalCtor = (await importAMDNodeModule<typeof import('xterm')>('xterm', 'lib/xterm.js')).Terminal;
const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
xterm = new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 });
});
src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalMultiLineLinkDetector.test.ts
+1 -1
View File
@@ -152,7 +152,7 @@ suite('Workbench - TerminalMultiLineLinkDetector', () => {
resolver = instantiationService.createInstance(TerminalLinkResolver);
validResources = [];
const TerminalCtor = (await importAMDNodeModule<typeof import('xterm')>('xterm', 'lib/xterm.js')).Terminal;
const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
xterm = new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 });
});
src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalUriLinkDetector.test.ts
+1 -1
View File
@@ -41,7 +41,7 @@ suite('Workbench - TerminalUriLinkDetector', () => {
});
validResources = [];
const TerminalCtor = (await importAMDNodeModule<typeof import('xterm')>('xterm', 'lib/xterm.js')).Terminal;
const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
xterm = new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 });
detector = instantiationService.createInstance(TerminalUriLinkDetector, xterm, {
initialCwd: '/parent/cwd',
src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalWordLinkDetector.test.ts
+1 -1
View File
@@ -31,7 +31,7 @@ suite('Workbench - TerminalWordLinkDetector', () => {
instantiationService.stub(IConfigurationService, configurationService);
instantiationService.set(IProductService, TestProductService);
const TerminalCtor = (await importAMDNodeModule<typeof import('xterm')>('xterm', 'lib/xterm.js')).Terminal;
const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 }));
detector = store.add(instantiationService.createInstance(TerminalWordLinkDetector, xterm));
});
src/vs/workbench/contrib/terminalContrib/quickFix/test/browser/quickFixAddon.test.ts
+1 -1
View File
@@ -45,7 +45,7 @@ suite('QuickFixAddon', () => {
setup(async () => {
instantiationService = store.add(new TestInstantiationService());
const TerminalCtor = (await importAMDNodeModule<typeof import('xterm')>('xterm', 'lib/xterm.js')).Terminal;
const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
terminal = store.add(new TerminalCtor({
allowProposedApi: true,
cols: 80,