From 160d8bd150106ab3227f7bc786cbd2f2f4913147 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Wed, 1 Nov 2023 13:03:47 -0700 Subject: [PATCH] Fix module path mapping --- src/bootstrap-window.js | 14 +++++++------- .../contrib/terminal/browser/terminalInstance.ts | 2 +- .../commandDetectionCapability.test.ts | 2 +- .../partialCommandDetectionCapability.test.ts | 2 +- .../test/browser/xterm/decorationAddon.test.ts | 2 +- .../test/browser/xterm/lineDataEventAddon.test.ts | 2 +- .../browser/xterm/shellIntegrationAddon.test.ts | 2 +- .../test/browser/xterm/xtermTerminal.test.ts | 2 +- .../test/browser/bufferContentTracker.test.ts | 2 +- .../links/test/browser/terminalLinkManager.test.ts | 2 +- .../links/test/browser/terminalLinkOpeners.test.ts | 2 +- .../test/browser/terminalLocalLinkDetector.test.ts | 2 +- .../browser/terminalMultiLineLinkDetector.test.ts | 2 +- .../test/browser/terminalUriLinkDetector.test.ts | 2 +- .../test/browser/terminalWordLinkDetector.test.ts | 2 +- .../quickFix/test/browser/quickFixAddon.test.ts | 2 +- 16 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/bootstrap-window.js b/src/bootstrap-window.js index 6092ef033d1..cbbee6c6226 100644 --- a/src/bootstrap-window.js +++ b/src/bootstrap-window.js @@ -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`, diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts index cffb429dc13..4345fac23a4 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts @@ -693,7 +693,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { return xtermConstructor; } xtermConstructor = Promises.withAsyncBody(async (resolve) => { - const Terminal = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const Terminal = (await importAMDNodeModule('@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'); diff --git a/src/vs/workbench/contrib/terminal/test/browser/capabilities/commandDetectionCapability.test.ts b/src/vs/workbench/contrib/terminal/test/browser/capabilities/commandDetectionCapability.test.ts index 0b90d6d7cff..778cb44e2b2 100644 --- a/src/vs/workbench/contrib/terminal/test/browser/capabilities/commandDetectionCapability.test.ts +++ b/src/vs/workbench/contrib/terminal/test/browser/capabilities/commandDetectionCapability.test.ts @@ -62,7 +62,7 @@ suite('CommandDetectionCapability', () => { setup(async () => { disposables = new DisposableStore(); - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; xterm = new TerminalCtor({ allowProposedApi: true, cols: 80 }); instantiationService = disposables.add(new TestInstantiationService()); diff --git a/src/vs/workbench/contrib/terminal/test/browser/capabilities/partialCommandDetectionCapability.test.ts b/src/vs/workbench/contrib/terminal/test/browser/capabilities/partialCommandDetectionCapability.test.ts index b8bca605119..e37020815fd 100644 --- a/src/vs/workbench/contrib/terminal/test/browser/capabilities/partialCommandDetectionCapability.test.ts +++ b/src/vs/workbench/contrib/terminal/test/browser/capabilities/partialCommandDetectionCapability.test.ts @@ -26,7 +26,7 @@ suite('PartialCommandDetectionCapability', () => { } setup(async () => { - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; xterm = new TerminalCtor({ allowProposedApi: true, cols: 80 }) as TestTerminal; capability = new PartialCommandDetectionCapability(xterm); diff --git a/src/vs/workbench/contrib/terminal/test/browser/xterm/decorationAddon.test.ts b/src/vs/workbench/contrib/terminal/test/browser/xterm/decorationAddon.test.ts index 5906bf7bf34..89ca8e8e427 100644 --- a/src/vs/workbench/contrib/terminal/test/browser/xterm/decorationAddon.test.ts +++ b/src/vs/workbench/contrib/terminal/test/browser/xterm/decorationAddon.test.ts @@ -28,7 +28,7 @@ suite('DecorationAddon', () => { let instantiationService: TestInstantiationService; setup(async () => { - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; class TestTerminal extends TerminalCtor { override registerDecoration(decorationOptions: IDecorationOptions): IDecoration | undefined { if (decorationOptions.marker.isDisposed) { diff --git a/src/vs/workbench/contrib/terminal/test/browser/xterm/lineDataEventAddon.test.ts b/src/vs/workbench/contrib/terminal/test/browser/xterm/lineDataEventAddon.test.ts index b5bd350b013..f3b39ba1c16 100644 --- a/src/vs/workbench/contrib/terminal/test/browser/xterm/lineDataEventAddon.test.ts +++ b/src/vs/workbench/contrib/terminal/test/browser/xterm/lineDataEventAddon.test.ts @@ -25,7 +25,7 @@ suite('LineDataEventAddon', () => { let events: string[]; setup(async () => { - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 4 })); lineDataEventAddon = store.add(new LineDataEventAddon()); xterm.loadAddon(lineDataEventAddon); diff --git a/src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.test.ts b/src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.test.ts index 4a5b327f289..09f2a1bbdc4 100644 --- a/src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.test.ts +++ b/src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.test.ts @@ -38,7 +38,7 @@ suite('ShellIntegrationAddon', () => { let capabilities: ITerminalCapabilityStore; setup(async () => { - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@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); diff --git a/src/vs/workbench/contrib/terminal/test/browser/xterm/xtermTerminal.test.ts b/src/vs/workbench/contrib/terminal/test/browser/xterm/xtermTerminal.test.ts index 2455a2b23e2..dac3edf612b 100644 --- a/src/vs/workbench/contrib/terminal/test/browser/xterm/xtermTerminal.test.ts +++ b/src/vs/workbench/contrib/terminal/test/browser/xterm/xtermTerminal.test.ts @@ -129,7 +129,7 @@ suite('XtermTerminal', () => { instantiationService.stub(ILayoutService, new TestLayoutService()); configHelper = store.add(instantiationService.createInstance(TerminalConfigHelper)); - XTermBaseCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + XTermBaseCtor = (await importAMDNodeModule('@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)); diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts index 50c946c9541..4e7d8885cf4 100644 --- a/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts @@ -75,7 +75,7 @@ suite('Buffer Content Tracker', () => { if (!isWindows) { capabilities.add(TerminalCapability.NaiveCwdDetection, null!); } - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@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); diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkManager.test.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkManager.test.ts index c825a0910e0..79ee061f357 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkManager.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkManager.test.ts @@ -86,7 +86,7 @@ suite('TerminalLinkManager', () => { instantiationService.stub(IThemeService, themeService); instantiationService.stub(IViewDescriptorService, viewDescriptorService); - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@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({ get initialCwd() { diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkOpeners.test.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkOpeners.test.ts index ea417aa99a1..61a1edcc7f0 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkOpeners.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkOpeners.test.ts @@ -112,7 +112,7 @@ suite('Workbench - TerminalLinkOpeners', () => { } } } as Partial); - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; xterm = store.add(new TerminalCtor({ allowProposedApi: true })); }); diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLocalLinkDetector.test.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLocalLinkDetector.test.ts index 72eaadd203a..ee8aa3f858e 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLocalLinkDetector.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLocalLinkDetector.test.ts @@ -193,7 +193,7 @@ suite('Workbench - TerminalLocalLinkDetector', () => { resolver = instantiationService.createInstance(TerminalLinkResolver); validResources = []; - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; xterm = new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 }); }); diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalMultiLineLinkDetector.test.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalMultiLineLinkDetector.test.ts index c189647093d..bfb219e2fec 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalMultiLineLinkDetector.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalMultiLineLinkDetector.test.ts @@ -152,7 +152,7 @@ suite('Workbench - TerminalMultiLineLinkDetector', () => { resolver = instantiationService.createInstance(TerminalLinkResolver); validResources = []; - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; xterm = new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 }); }); diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalUriLinkDetector.test.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalUriLinkDetector.test.ts index 8e68a4db6a6..d9ab1364a72 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalUriLinkDetector.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalUriLinkDetector.test.ts @@ -41,7 +41,7 @@ suite('Workbench - TerminalUriLinkDetector', () => { }); validResources = []; - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; xterm = new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 }); detector = instantiationService.createInstance(TerminalUriLinkDetector, xterm, { initialCwd: '/parent/cwd', diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalWordLinkDetector.test.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalWordLinkDetector.test.ts index 8ff5edaf8e0..a12ddf68158 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalWordLinkDetector.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalWordLinkDetector.test.ts @@ -31,7 +31,7 @@ suite('Workbench - TerminalWordLinkDetector', () => { instantiationService.stub(IConfigurationService, configurationService); instantiationService.set(IProductService, TestProductService); - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 })); detector = store.add(instantiationService.createInstance(TerminalWordLinkDetector, xterm)); }); diff --git a/src/vs/workbench/contrib/terminalContrib/quickFix/test/browser/quickFixAddon.test.ts b/src/vs/workbench/contrib/terminalContrib/quickFix/test/browser/quickFixAddon.test.ts index 48cf3fd4aaf..f6dbee14fb3 100644 --- a/src/vs/workbench/contrib/terminalContrib/quickFix/test/browser/quickFixAddon.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/quickFix/test/browser/quickFixAddon.test.ts @@ -45,7 +45,7 @@ suite('QuickFixAddon', () => { setup(async () => { instantiationService = store.add(new TestInstantiationService()); - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; terminal = store.add(new TerminalCtor({ allowProposedApi: true, cols: 80,