diff --git a/addons/addon-fit/src/FitAddon.ts b/addons/addon-fit/src/FitAddon.ts index b315478b2..4d7b6bbc8 100644 --- a/addons/addon-fit/src/FitAddon.ts +++ b/addons/addon-fit/src/FitAddon.ts @@ -5,7 +5,7 @@ import type { Terminal, ITerminalAddon, IRenderDimensions } from '@xterm/xterm'; import type { FitAddon as IFitApi } from '@xterm/addon-fit'; -import { ViewportConstants } from '../../../out-esbuild/browser/shared/Constants'; +import { ViewportConstants } from '../../../out/browser/shared/Constants'; interface ITerminalDimensions { /** diff --git a/addons/addon-image/src/ImageAddon.ts b/addons/addon-image/src/ImageAddon.ts index 9169c8b7d..47ad70614 100644 --- a/addons/addon-image/src/ImageAddon.ts +++ b/addons/addon-image/src/ImageAddon.ts @@ -5,7 +5,7 @@ import type { ITerminalAddon, IDisposable } from '@xterm/xterm'; import type { ImageAddon as IImageApi } from '@xterm/addon-image'; -import { Emitter, type IEvent } from '../../../out-esbuild/common/Event'; +import { Emitter, type IEvent } from '../../../out/common/Event'; import { IIPHandler } from './IIPHandler'; import { ImageRenderer } from './ImageRenderer'; import { ImageStorage, CELL_SIZE_DEFAULT } from './ImageStorage'; diff --git a/addons/addon-image/src/ImageRenderer.ts b/addons/addon-image/src/ImageRenderer.ts index dfdcc31fc..c103e11b6 100644 --- a/addons/addon-image/src/ImageRenderer.ts +++ b/addons/addon-image/src/ImageRenderer.ts @@ -6,7 +6,7 @@ import { toRGBA8888 } from 'sixel/lib/Colors'; import { IDisposable } from '@xterm/xterm'; import { ICellSize, ImageLayer, ITerminalExt, IImageSpec, IRenderDimensions, IRenderService } from './Types'; -import { Disposable, MutableDisposable, toDisposable } from '../../../out-esbuild/common/Lifecycle'; +import { Disposable, MutableDisposable, toDisposable } from '../../../out/common/Lifecycle'; const enum Constants { PLACEHOLDER_LENGTH = 4096, diff --git a/addons/addon-image/src/Types.ts b/addons/addon-image/src/Types.ts index 22d0b4cbc..4370f6562 100644 --- a/addons/addon-image/src/Types.ts +++ b/addons/addon-image/src/Types.ts @@ -6,13 +6,13 @@ import { IDisposable, IMarker, Terminal } from '@xterm/xterm'; // private imports from base repo we build against -import { Attributes, BgFlags, Content, ExtFlags, UnderlineStyle } from '../../../out-esbuild/common/buffer/Constants'; -import type { AttributeData } from '../../../out-esbuild/common/buffer/AttributeData'; -import type { IParams, IDcsHandler, IOscHandler, IApcHandler, IEscapeSequenceParser } from '../../../out-esbuild/common/parser/Types'; -import type { IBufferLine, IExtendedAttrs, IInputHandler } from '../../../out-esbuild/common/Types'; -import type { ITerminal, ReadonlyColorSet } from '../../../out-esbuild/browser/Types'; -import type { IRenderDimensions } from '../../../out-esbuild/browser/renderer/shared/Types'; -import type { ICoreBrowserService, IRenderService, IThemeService } from '../../../out-esbuild/browser/services/Services'; +import { Attributes, BgFlags, Content, ExtFlags, UnderlineStyle } from '../../../out/common/buffer/Constants'; +import type { AttributeData } from '../../../out/common/buffer/AttributeData'; +import type { IParams, IDcsHandler, IOscHandler, IApcHandler, IEscapeSequenceParser } from '../../../out/common/parser/Types'; +import type { IBufferLine, IExtendedAttrs, IInputHandler } from '../../../out/common/Types'; +import type { ITerminal, ReadonlyColorSet } from '../../../out/browser/Types'; +import type { IRenderDimensions } from '../../../out/browser/renderer/shared/Types'; +import type { ICoreBrowserService, IRenderService, IThemeService } from '../../../out/browser/services/Services'; export const enum Cell { CONTENT = 0, // codepoint and wcwidth information (enum Content) diff --git a/addons/addon-progress/src/ProgressAddon.ts b/addons/addon-progress/src/ProgressAddon.ts index c544a1b81..6ac00e9fb 100644 --- a/addons/addon-progress/src/ProgressAddon.ts +++ b/addons/addon-progress/src/ProgressAddon.ts @@ -5,7 +5,7 @@ import type { Terminal, ITerminalAddon, IDisposable } from '@xterm/xterm'; import type { ProgressAddon as IProgressApi, IProgressState } from '@xterm/addon-progress'; -import type { Emitter, IEvent } from '../../../out-esbuild/common/Event'; +import type { Emitter, IEvent } from '../../../out/common/Event'; const enum ProgressType { diff --git a/addons/addon-search/src/DecorationManager.ts b/addons/addon-search/src/DecorationManager.ts index 143afa52f..1da171c91 100644 --- a/addons/addon-search/src/DecorationManager.ts +++ b/addons/addon-search/src/DecorationManager.ts @@ -5,7 +5,7 @@ import type { Terminal, IDisposable, IDecoration } from '@xterm/xterm'; import type { ISearchDecorationOptions } from '@xterm/addon-search'; -import { dispose, Disposable, toDisposable } from '../../../out-esbuild/common/Lifecycle'; +import { dispose, Disposable, toDisposable } from '../../../out/common/Lifecycle'; import type { ISearchResult } from './SearchEngine'; /** diff --git a/addons/addon-search/src/SearchAddon.ts b/addons/addon-search/src/SearchAddon.ts index e46802d36..519d12560 100644 --- a/addons/addon-search/src/SearchAddon.ts +++ b/addons/addon-search/src/SearchAddon.ts @@ -5,9 +5,9 @@ import type { Terminal, IDisposable, ITerminalAddon } from '@xterm/xterm'; import type { SearchAddon as ISearchApi, ISearchOptions, ISearchAddonOptions, ISearchResultChangeEvent, ISearchDecorationOptions } from '@xterm/addon-search'; -import { Emitter, type IEvent } from '../../../out-esbuild/common/Event'; -import { Disposable, MutableDisposable, toDisposable } from '../../../out-esbuild/common/Lifecycle'; -import { disposableTimeout } from '../../../out-esbuild/common/Async'; +import { Emitter, type IEvent } from '../../../out/common/Event'; +import { Disposable, MutableDisposable, toDisposable } from '../../../out/common/Lifecycle'; +import { disposableTimeout } from '../../../out/common/Async'; import { SearchLineCache } from './SearchLineCache'; import { SearchState } from './SearchState'; import { SearchEngine, type ISearchResult } from './SearchEngine'; diff --git a/addons/addon-search/src/SearchEngine.test.ts b/addons/addon-search/src/SearchEngine.test.ts index 8de43d771..c69f04acc 100644 --- a/addons/addon-search/src/SearchEngine.test.ts +++ b/addons/addon-search/src/SearchEngine.test.ts @@ -5,9 +5,9 @@ import { assert } from 'chai'; import { SearchEngine } from './SearchEngine'; import { SearchLineCache } from './SearchLineCache'; -import { Terminal } from '../../../out-esbuild/browser/public/Terminal'; +import { Terminal } from '../../../out/browser/public/Terminal'; import type { ISearchOptions } from '@xterm/addon-search'; -import { DisposableStore } from '../../../out-esbuild/common/Lifecycle'; +import { DisposableStore } from '../../../out/common/Lifecycle'; function writeP(terminal: Terminal, data: string): Promise { return new Promise(r => terminal.write(data, r)); diff --git a/addons/addon-search/src/SearchLineCache.test.ts b/addons/addon-search/src/SearchLineCache.test.ts index 490ba7d1b..b7891ea95 100644 --- a/addons/addon-search/src/SearchLineCache.test.ts +++ b/addons/addon-search/src/SearchLineCache.test.ts @@ -4,8 +4,8 @@ */ import { assert } from 'chai'; import { SearchLineCache, LineCacheEntry } from './SearchLineCache'; -import { Terminal } from '../../../out-esbuild/browser/public/Terminal'; -import { timeout } from '../../../out-esbuild/common/Async'; +import { Terminal } from '../../../out/browser/public/Terminal'; +import { timeout } from '../../../out/common/Async'; function writeP(terminal: Terminal, data: string): Promise { return new Promise(r => terminal.write(data, r)); diff --git a/addons/addon-search/src/SearchLineCache.ts b/addons/addon-search/src/SearchLineCache.ts index a0d8af61f..6a1b1130f 100644 --- a/addons/addon-search/src/SearchLineCache.ts +++ b/addons/addon-search/src/SearchLineCache.ts @@ -4,8 +4,8 @@ */ import type { Terminal } from '@xterm/xterm'; -import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from '../../../out-esbuild/common/Lifecycle'; -import { disposableTimeout } from '../../../out-esbuild/common/Async'; +import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from '../../../out/common/Lifecycle'; +import { disposableTimeout } from '../../../out/common/Async'; export type LineCacheEntry = [ /** diff --git a/addons/addon-search/src/SearchResultTracker.ts b/addons/addon-search/src/SearchResultTracker.ts index 9e35fda99..9c834a184 100644 --- a/addons/addon-search/src/SearchResultTracker.ts +++ b/addons/addon-search/src/SearchResultTracker.ts @@ -5,8 +5,8 @@ import type { ISearchResultChangeEvent } from '@xterm/addon-search'; import type { IDisposable } from '@xterm/xterm'; -import { Emitter, type IEvent } from '../../../out-esbuild/common/Event'; -import { Disposable } from '../../../out-esbuild/common/Lifecycle'; +import { Emitter, type IEvent } from '../../../out/common/Event'; +import { Disposable } from '../../../out/common/Lifecycle'; import type { ISearchResult } from './SearchEngine'; /** diff --git a/addons/addon-serialize/benchmark/SerializeAddon.benchmark.ts b/addons/addon-serialize/benchmark/SerializeAddon.benchmark.ts index 8dac5a591..815bd9b3b 100644 --- a/addons/addon-serialize/benchmark/SerializeAddon.benchmark.ts +++ b/addons/addon-serialize/benchmark/SerializeAddon.benchmark.ts @@ -6,8 +6,8 @@ import { perfContext, before, ThroughputRuntimeCase } from 'xterm-benchmark'; import { spawn } from 'node-pty'; -import { Utf8ToUtf32, stringFromCodePoint } from '../../../out-esbuild/common/input/TextDecoder'; -import { Terminal } from '../../../out-esbuild/browser/public/Terminal'; +import { Utf8ToUtf32, stringFromCodePoint } from '../../../out/common/input/TextDecoder'; +import { Terminal } from '../../../out/browser/public/Terminal'; import { SerializeAddon } from '../src/SerializeAddon'; class TestTerminal extends Terminal { diff --git a/addons/addon-serialize/src/SerializeAddon.test.ts b/addons/addon-serialize/src/SerializeAddon.test.ts index 773daaec1..2c3f51050 100644 --- a/addons/addon-serialize/src/SerializeAddon.test.ts +++ b/addons/addon-serialize/src/SerializeAddon.test.ts @@ -6,10 +6,10 @@ import jsdom = require('jsdom'); import { assert } from 'chai'; import { SerializeAddon } from './SerializeAddon'; -import { Terminal } from '../../../out-esbuild/browser/public/Terminal'; -import { SelectionModel } from '../../../out-esbuild/browser/selection/SelectionModel'; -import { IBufferService } from '../../../out-esbuild/common/services/Services'; -import { ThemeService } from '../../../out-esbuild/browser/services/ThemeService'; +import { Terminal } from '../../../out/browser/public/Terminal'; +import { SelectionModel } from '../../../out/browser/selection/SelectionModel'; +import { IBufferService } from '../../../out/common/services/Services'; +import { ThemeService } from '../../../out/browser/services/ThemeService'; function sgr(...seq: string[]): string { return `\x1b[${seq.join(';')}m`; diff --git a/addons/addon-serialize/src/SerializeAddon.ts b/addons/addon-serialize/src/SerializeAddon.ts index 3afb3b3d6..335d0cad7 100644 --- a/addons/addon-serialize/src/SerializeAddon.ts +++ b/addons/addon-serialize/src/SerializeAddon.ts @@ -7,9 +7,9 @@ import type { IBuffer, IBufferCell, IBufferRange, ITerminalAddon, Terminal } from '@xterm/xterm'; import type { IHTMLSerializeOptions, SerializeAddon as ISerializeApi, ISerializeOptions, ISerializeRange } from '@xterm/addon-serialize'; -import { IAttributeData, IColor } from '../../../out-esbuild/common/Types'; -import { DEFAULT_ANSI_COLORS } from '../../../out-esbuild/browser/Types'; -import { UnderlineStyle } from '../../../out-esbuild/common/buffer/Constants'; +import { IAttributeData, IColor } from '../../../out/common/Types'; +import { DEFAULT_ANSI_COLORS } from '../../../out/browser/Types'; +import { UnderlineStyle } from '../../../out/common/buffer/Constants'; function constrain(value: number, low: number, high: number): number { return Math.max(low, Math.min(value, high)); diff --git a/addons/addon-unicode-graphemes/benchmark/UnicodeGraphemeAddon.benchmark.ts b/addons/addon-unicode-graphemes/benchmark/UnicodeGraphemeAddon.benchmark.ts index aa812a7d2..51788b2cd 100644 --- a/addons/addon-unicode-graphemes/benchmark/UnicodeGraphemeAddon.benchmark.ts +++ b/addons/addon-unicode-graphemes/benchmark/UnicodeGraphemeAddon.benchmark.ts @@ -6,8 +6,8 @@ import { perfContext, before, ThroughputRuntimeCase } from 'xterm-benchmark'; import { spawn } from 'node-pty'; -import { Utf8ToUtf32, stringFromCodePoint } from '../../../out-esbuild/common/input/TextDecoder'; -import { CoreBrowserTerminal } from '../../../out-esbuild/browser/CoreBrowserTerminal'; +import { Utf8ToUtf32, stringFromCodePoint } from '../../../out/common/input/TextDecoder'; +import { CoreBrowserTerminal } from '../../../out/browser/CoreBrowserTerminal'; import { UnicodeGraphemeProvider } from '../src/UnicodeGraphemeProvider'; diff --git a/addons/addon-unicode-graphemes/src/UnicodeGraphemeProvider.ts b/addons/addon-unicode-graphemes/src/UnicodeGraphemeProvider.ts index e57be0f0b..275483bc2 100644 --- a/addons/addon-unicode-graphemes/src/UnicodeGraphemeProvider.ts +++ b/addons/addon-unicode-graphemes/src/UnicodeGraphemeProvider.ts @@ -4,8 +4,8 @@ */ import { IUnicodeVersionProvider } from '@xterm/xterm'; -import { UnicodeCharProperties, UnicodeCharWidth } from '../../../out-esbuild/common/services/Services'; -import { UnicodeService } from '../../../out-esbuild/common/services/UnicodeService'; +import { UnicodeCharProperties, UnicodeCharWidth } from '../../../out/common/services/Services'; +import { UnicodeService } from '../../../out/common/services/UnicodeService'; import * as UC from './third-party/UnicodeProperties'; export class UnicodeGraphemeProvider implements IUnicodeVersionProvider { diff --git a/addons/addon-unicode11/src/UnicodeV11.ts b/addons/addon-unicode11/src/UnicodeV11.ts index 869c9524e..f55df9062 100644 --- a/addons/addon-unicode11/src/UnicodeV11.ts +++ b/addons/addon-unicode11/src/UnicodeV11.ts @@ -4,8 +4,8 @@ */ import { IUnicodeVersionProvider } from '@xterm/xterm'; -import { UnicodeCharProperties, UnicodeCharWidth } from '../../../out-esbuild/common/services/Services'; -import { UnicodeService } from '../../../out-esbuild/common/services/UnicodeService'; +import { UnicodeCharProperties, UnicodeCharWidth } from '../../../out/common/services/Services'; +import { UnicodeService } from '../../../out/common/services/UnicodeService'; const BMP_COMBINING = [ [0x0300, 0x036F], [0x0483, 0x0489], [0x0591, 0x05BD], diff --git a/addons/addon-webgl/src/CellColorResolver.ts b/addons/addon-webgl/src/CellColorResolver.ts index 20ddb4321..3f846920f 100644 --- a/addons/addon-webgl/src/CellColorResolver.ts +++ b/addons/addon-webgl/src/CellColorResolver.ts @@ -1,12 +1,12 @@ -import { ISelectionRenderModel } from '../../../out-esbuild/browser/renderer/shared/Types'; -import { ICoreBrowserService, IThemeService } from '../../../out-esbuild/browser/services/Services'; -import { ReadonlyColorSet } from '../../../out-esbuild/browser/Types'; -import { Attributes, BgFlags, ExtFlags, FgFlags, NULL_CELL_CODE, UnderlineStyle } from '../../../out-esbuild/common/buffer/Constants'; -import { IDecorationService, IOptionsService } from '../../../out-esbuild/common/services/Services'; -import { ICellData } from '../../../out-esbuild/common/Types'; +import { ISelectionRenderModel } from '../../../out/browser/renderer/shared/Types'; +import { ICoreBrowserService, IThemeService } from '../../../out/browser/services/Services'; +import { ReadonlyColorSet } from '../../../out/browser/Types'; +import { Attributes, BgFlags, ExtFlags, FgFlags, NULL_CELL_CODE, UnderlineStyle } from '../../../out/common/buffer/Constants'; +import { IDecorationService, IOptionsService } from '../../../out/common/services/Services'; +import { ICellData } from '../../../out/common/Types'; import { Terminal } from '@xterm/xterm'; -import { rgba } from '../../../out-esbuild/common/Color'; -import { treatGlyphAsBackgroundColor } from '../../../out-esbuild/browser/renderer/shared/RendererUtils'; +import { rgba } from '../../../out/common/Color'; +import { treatGlyphAsBackgroundColor } from '../../../out/browser/renderer/shared/RendererUtils'; import { blockPatternCodepoints } from './customGlyphs/CustomGlyphDefinitions'; // Work variables to avoid garbage collection diff --git a/addons/addon-webgl/src/CharAtlasCache.ts b/addons/addon-webgl/src/CharAtlasCache.ts index 4d3e3b0af..f465a4a04 100644 --- a/addons/addon-webgl/src/CharAtlasCache.ts +++ b/addons/addon-webgl/src/CharAtlasCache.ts @@ -5,10 +5,10 @@ import { TextureAtlas } from './TextureAtlas'; import { ITerminalOptions, Terminal } from '@xterm/xterm'; -import { ITerminal, ReadonlyColorSet } from '../../../out-esbuild/browser/Types'; +import { ITerminal, ReadonlyColorSet } from '../../../out/browser/Types'; import { ICharAtlasConfig, ITextureAtlas } from './Types'; import { generateConfig, configEquals } from './CharAtlasUtils'; -import type { ILogService } from '../../../out-esbuild/common/services/Services'; +import type { ILogService } from '../../../out/common/services/Services'; interface ITextureAtlasCacheEntry { atlas: ITextureAtlas; diff --git a/addons/addon-webgl/src/CharAtlasUtils.test.ts b/addons/addon-webgl/src/CharAtlasUtils.test.ts index 82c81e47a..a4dc0f50c 100644 --- a/addons/addon-webgl/src/CharAtlasUtils.test.ts +++ b/addons/addon-webgl/src/CharAtlasUtils.test.ts @@ -6,8 +6,8 @@ import { assert } from 'chai'; import { configEquals } from './CharAtlasUtils'; import { ICharAtlasConfig } from './Types'; -import { NULL_COLOR } from '../../../out-esbuild/common/Color'; -import { IColor } from '../../../out-esbuild/common/Types'; +import { NULL_COLOR } from '../../../out/common/Color'; +import { IColor } from '../../../out/common/Types'; function createTestConfig(overrides: Partial = {}): ICharAtlasConfig { const color: IColor = { css: '#ffffff', rgba: 0xffffffff }; diff --git a/addons/addon-webgl/src/CharAtlasUtils.ts b/addons/addon-webgl/src/CharAtlasUtils.ts index f99207a37..901bd9dbb 100644 --- a/addons/addon-webgl/src/CharAtlasUtils.ts +++ b/addons/addon-webgl/src/CharAtlasUtils.ts @@ -4,10 +4,10 @@ */ import { ICharAtlasConfig } from './Types'; -import { Attributes } from '../../../out-esbuild/common/buffer/Constants'; +import { Attributes } from '../../../out/common/buffer/Constants'; import { ITerminalOptions } from '@xterm/xterm'; -import { IColorSet, ReadonlyColorSet } from '../../../out-esbuild/browser/Types'; -import { NULL_COLOR } from '../../../out-esbuild/common/Color'; +import { IColorSet, ReadonlyColorSet } from '../../../out/browser/Types'; +import { NULL_COLOR } from '../../../out/common/Color'; export function generateConfig(deviceCellWidth: number, deviceCellHeight: number, deviceCharWidth: number, deviceCharHeight: number, options: Required, colors: ReadonlyColorSet, devicePixelRatio: number, deviceMaxTextureSize: number, customGlyphs: boolean = true): ICharAtlasConfig { // null out some fields that don't matter diff --git a/addons/addon-webgl/src/Constants.ts b/addons/addon-webgl/src/Constants.ts index 7f9eef206..1703f4da8 100644 --- a/addons/addon-webgl/src/Constants.ts +++ b/addons/addon-webgl/src/Constants.ts @@ -3,7 +3,7 @@ * @license MIT */ -import { isFirefox, isLegacyEdge } from '../../../out-esbuild/common/Platform'; +import { isFirefox, isLegacyEdge } from '../../../out/common/Platform'; export const DIM_OPACITY = 0.5; // The text baseline is set conditionally by browser. Using 'ideographic' for Firefox or Legacy Edge diff --git a/addons/addon-webgl/src/CursorBlinkStateManager.ts b/addons/addon-webgl/src/CursorBlinkStateManager.ts index 6fe109bac..9ead4d8bc 100644 --- a/addons/addon-webgl/src/CursorBlinkStateManager.ts +++ b/addons/addon-webgl/src/CursorBlinkStateManager.ts @@ -3,8 +3,8 @@ * @license MIT */ -import { RendererConstants } from '../../../out-esbuild/browser/renderer/shared/Constants'; -import { ICoreBrowserService } from '../../../out-esbuild/browser/services/Services'; +import { RendererConstants } from '../../../out/browser/renderer/shared/Constants'; +import { ICoreBrowserService } from '../../../out/browser/services/Services'; const enum Constants { /** diff --git a/addons/addon-webgl/src/DevicePixelObserver.ts b/addons/addon-webgl/src/DevicePixelObserver.ts index ba52cf4ee..111409910 100644 --- a/addons/addon-webgl/src/DevicePixelObserver.ts +++ b/addons/addon-webgl/src/DevicePixelObserver.ts @@ -3,7 +3,7 @@ * @license MIT */ -import { toDisposable, IDisposable } from '../../../out-esbuild/common/Lifecycle'; +import { toDisposable, IDisposable } from '../../../out/common/Lifecycle'; export function observeDevicePixelDimensions(element: HTMLElement, parentWindow: Window & typeof globalThis, callback: (deviceWidth: number, deviceHeight: number) => void): IDisposable { // Observe any resizes to the element and extract the actual pixel size of the element if the diff --git a/addons/addon-webgl/src/GlyphRenderer.ts b/addons/addon-webgl/src/GlyphRenderer.ts index 218863bf3..523c94b41 100644 --- a/addons/addon-webgl/src/GlyphRenderer.ts +++ b/addons/addon-webgl/src/GlyphRenderer.ts @@ -3,14 +3,14 @@ * @license MIT */ import { TextureAtlas } from './TextureAtlas'; -import { IRenderDimensions } from '../../../out-esbuild/browser/renderer/shared/Types'; -import { NULL_CELL_CODE } from '../../../out-esbuild/common/buffer/Constants'; -import { Disposable, toDisposable } from '../../../out-esbuild/common/Lifecycle'; +import { IRenderDimensions } from '../../../out/browser/renderer/shared/Types'; +import { NULL_CELL_CODE } from '../../../out/common/buffer/Constants'; +import { Disposable, toDisposable } from '../../../out/common/Lifecycle'; import { Terminal } from '@xterm/xterm'; import { IRenderModel, IWebGL2RenderingContext, IWebGLVertexArrayObject, type IRasterizedGlyph, type ITextureAtlas } from './Types'; import { createProgram, GLTexture, PROJECTION_MATRIX } from './WebglUtils'; -import type { ILogService, IOptionsService } from '../../../out-esbuild/common/services/Services'; -import { allowRescaling, throwIfFalsy } from '../../../out-esbuild/browser/renderer/shared/RendererUtils'; +import type { ILogService, IOptionsService } from '../../../out/common/services/Services'; +import { allowRescaling, throwIfFalsy } from '../../../out/browser/renderer/shared/RendererUtils'; interface IVertices { attributes: Float32Array; diff --git a/addons/addon-webgl/src/RectangleRenderer.ts b/addons/addon-webgl/src/RectangleRenderer.ts index 35256f87e..7eb8b0506 100644 --- a/addons/addon-webgl/src/RectangleRenderer.ts +++ b/addons/addon-webgl/src/RectangleRenderer.ts @@ -3,18 +3,18 @@ * @license MIT */ -import { IRenderDimensions } from '../../../out-esbuild/browser/renderer/shared/Types'; -import { IThemeService } from '../../../out-esbuild/browser/services/Services'; -import { ReadonlyColorSet } from '../../../out-esbuild/browser/Types'; -import { Attributes, FgFlags } from '../../../out-esbuild/common/buffer/Constants'; -import { Disposable, toDisposable } from '../../../out-esbuild/common/Lifecycle'; -import { IColor } from '../../../out-esbuild/common/Types'; +import { IRenderDimensions } from '../../../out/browser/renderer/shared/Types'; +import { IThemeService } from '../../../out/browser/services/Services'; +import { ReadonlyColorSet } from '../../../out/browser/Types'; +import { Attributes, FgFlags } from '../../../out/common/buffer/Constants'; +import { Disposable, toDisposable } from '../../../out/common/Lifecycle'; +import { IColor } from '../../../out/common/Types'; import { Terminal } from '@xterm/xterm'; import { RenderModelConstants } from './RenderModel'; import { IRenderModel, IWebGL2RenderingContext, IWebGLVertexArrayObject } from './Types'; import { createProgram, expandFloat32Array, PROJECTION_MATRIX } from './WebglUtils'; -import { throwIfFalsy } from '../../../out-esbuild/browser/renderer/shared/RendererUtils'; -import type { ILogService } from '../../../out-esbuild/common/services/Services'; +import { throwIfFalsy } from '../../../out/browser/renderer/shared/RendererUtils'; +import type { ILogService } from '../../../out/common/services/Services'; const enum VertexAttribLocations { POSITION = 0, diff --git a/addons/addon-webgl/src/RenderModel.ts b/addons/addon-webgl/src/RenderModel.ts index db983a6b3..d277bf2cc 100644 --- a/addons/addon-webgl/src/RenderModel.ts +++ b/addons/addon-webgl/src/RenderModel.ts @@ -4,8 +4,8 @@ */ import { ICursorRenderModel, IRenderModel } from './Types'; -import { ISelectionRenderModel } from '../../../out-esbuild/browser/renderer/shared/Types'; -import { createSelectionRenderModel } from '../../../out-esbuild/browser/renderer/shared/SelectionRenderModel'; +import { ISelectionRenderModel } from '../../../out/browser/renderer/shared/Types'; +import { createSelectionRenderModel } from '../../../out/browser/renderer/shared/SelectionRenderModel'; export const enum RenderModelConstants { INDICIES_PER_CELL = 4, diff --git a/addons/addon-webgl/src/TextureAtlas.ts b/addons/addon-webgl/src/TextureAtlas.ts index 9a11da76f..2cef96b07 100644 --- a/addons/addon-webgl/src/TextureAtlas.ts +++ b/addons/addon-webgl/src/TextureAtlas.ts @@ -3,19 +3,19 @@ * @license MIT */ -import { IColorContrastCache } from '../../../out-esbuild/browser/Types'; +import { IColorContrastCache } from '../../../out/browser/Types'; import { DIM_OPACITY, TEXT_BASELINE } from './Constants'; import { tryDrawCustomGlyph } from './customGlyphs/CustomGlyphRasterizer'; -import { computeNextVariantOffset, treatGlyphAsBackgroundColor, isPowerlineGlyph, isRestrictedPowerlineGlyph, throwIfFalsy } from '../../../out-esbuild/browser/renderer/shared/RendererUtils'; +import { computeNextVariantOffset, treatGlyphAsBackgroundColor, isPowerlineGlyph, isRestrictedPowerlineGlyph, throwIfFalsy } from '../../../out/browser/renderer/shared/RendererUtils'; import { IBoundingBox, ICharAtlasConfig, IRasterizedGlyph, ITextureAtlas } from './Types'; -import { NULL_COLOR, channels, color, rgba } from '../../../out-esbuild/common/Color'; -import { FourKeyMap } from '../../../out-esbuild/common/MultiKeyMap'; -import { IdleTaskQueue } from '../../../out-esbuild/common/TaskQueue'; -import { IColor } from '../../../out-esbuild/common/Types'; -import { AttributeData } from '../../../out-esbuild/common/buffer/AttributeData'; -import { Attributes, DEFAULT_COLOR, DEFAULT_EXT, UnderlineStyle } from '../../../out-esbuild/common/buffer/Constants'; -import { ILogService, IUnicodeService } from '../../../out-esbuild/common/services/Services'; -import { Emitter } from '../../../out-esbuild/common/Event'; +import { NULL_COLOR, channels, color, rgba } from '../../../out/common/Color'; +import { FourKeyMap } from '../../../out/common/MultiKeyMap'; +import { IdleTaskQueue } from '../../../out/common/TaskQueue'; +import { IColor } from '../../../out/common/Types'; +import { AttributeData } from '../../../out/common/buffer/AttributeData'; +import { Attributes, DEFAULT_COLOR, DEFAULT_EXT, UnderlineStyle } from '../../../out/common/buffer/Constants'; +import { ILogService, IUnicodeService } from '../../../out/common/services/Services'; +import { Emitter } from '../../../out/common/Event'; /** * A shared object which is used to draw nothing for a particular cell. diff --git a/addons/addon-webgl/src/Types.ts b/addons/addon-webgl/src/Types.ts index 23f4fbbee..6ca47502d 100644 --- a/addons/addon-webgl/src/Types.ts +++ b/addons/addon-webgl/src/Types.ts @@ -4,10 +4,10 @@ */ import { FontWeight } from '@xterm/xterm'; -import { IColorSet } from '../../../out-esbuild/browser/Types'; -import { ISelectionRenderModel } from '../../../out-esbuild/browser/renderer/shared/Types'; -import { CursorInactiveStyle, CursorStyle, type IDisposable } from '../../../out-esbuild/common/Types'; -import type { IEvent } from '../../../out-esbuild/common/Event'; +import { IColorSet } from '../../../out/browser/Types'; +import { ISelectionRenderModel } from '../../../out/browser/renderer/shared/Types'; +import { CursorInactiveStyle, CursorStyle, type IDisposable } from '../../../out/common/Types'; +import type { IEvent } from '../../../out/common/Event'; export interface IRenderModel { cells: Uint32Array; diff --git a/addons/addon-webgl/src/WebglAddon.ts b/addons/addon-webgl/src/WebglAddon.ts index 44782ee89..aa0516755 100644 --- a/addons/addon-webgl/src/WebglAddon.ts +++ b/addons/addon-webgl/src/WebglAddon.ts @@ -5,14 +5,14 @@ import type { ITerminalAddon, Terminal } from '@xterm/xterm'; import type { IWebglAddonOptions, WebglAddon as IWebglApi } from '@xterm/addon-webgl'; -import { ICharacterJoinerService, ICharSizeService, ICoreBrowserService, IRenderService, IThemeService } from '../../../out-esbuild/browser/services/Services'; -import { ITerminal } from '../../../out-esbuild/browser/Types'; -import { Disposable, toDisposable } from '../../../out-esbuild/common/Lifecycle'; -import { getSafariVersion, isSafari } from '../../../out-esbuild/common/Platform'; -import { ICoreService, IDecorationService, ILogService, IOptionsService } from '../../../out-esbuild/common/services/Services'; +import { ICharacterJoinerService, ICharSizeService, ICoreBrowserService, IRenderService, IThemeService } from '../../../out/browser/services/Services'; +import { ITerminal } from '../../../out/browser/Types'; +import { Disposable, toDisposable } from '../../../out/common/Lifecycle'; +import { getSafariVersion, isSafari } from '../../../out/common/Platform'; +import { ICoreService, IDecorationService, ILogService, IOptionsService } from '../../../out/common/services/Services'; import { IWebGL2RenderingContext } from './Types'; import { WebglRenderer } from './WebglRenderer'; -import { Emitter, EventUtils } from '../../../out-esbuild/common/Event'; +import { Emitter, EventUtils } from '../../../out/common/Event'; export class WebglAddon extends Disposable implements ITerminalAddon, IWebglApi { private _terminal?: Terminal; diff --git a/addons/addon-webgl/src/WebglRenderer.ts b/addons/addon-webgl/src/WebglRenderer.ts index 2fd549267..7d6ee54f7 100644 --- a/addons/addon-webgl/src/WebglRenderer.ts +++ b/addons/addon-webgl/src/WebglRenderer.ts @@ -3,19 +3,19 @@ * @license MIT */ -import { ITerminal } from '../../../out-esbuild/browser/Types'; +import { ITerminal } from '../../../out/browser/Types'; import { CellColorResolver } from './CellColorResolver'; import { acquireTextureAtlas, removeTerminalFromCache } from './CharAtlasCache'; import { CursorBlinkStateManager } from './CursorBlinkStateManager'; import { observeDevicePixelDimensions } from './DevicePixelObserver'; -import { IRenderDimensions, IRenderer, IRequestRedrawEvent } from '../../../out-esbuild/browser/renderer/shared/Types'; -import { ICharSizeService, ICharacterJoinerService, ICoreBrowserService, IThemeService } from '../../../out-esbuild/browser/services/Services'; -import { CharData, IBufferLine, ICellData } from '../../../out-esbuild/common/Types'; -import { AttributeData } from '../../../out-esbuild/common/buffer/AttributeData'; -import { CellData } from '../../../out-esbuild/common/buffer/CellData'; -import { Attributes, Content, FgFlags, NULL_CELL_CHAR, NULL_CELL_CODE } from '../../../out-esbuild/common/buffer/Constants'; -import { TextBlinkStateManager } from '../../../out-esbuild/browser/renderer/shared/TextBlinkStateManager'; -import { ICoreService, IDecorationService, ILogService, IOptionsService } from '../../../out-esbuild/common/services/Services'; +import { IRenderDimensions, IRenderer, IRequestRedrawEvent } from '../../../out/browser/renderer/shared/Types'; +import { ICharSizeService, ICharacterJoinerService, ICoreBrowserService, IThemeService } from '../../../out/browser/services/Services'; +import { CharData, IBufferLine, ICellData } from '../../../out/common/Types'; +import { AttributeData } from '../../../out/common/buffer/AttributeData'; +import { CellData } from '../../../out/common/buffer/CellData'; +import { Attributes, Content, FgFlags, NULL_CELL_CHAR, NULL_CELL_CODE } from '../../../out/common/buffer/Constants'; +import { TextBlinkStateManager } from '../../../out/browser/renderer/shared/TextBlinkStateManager'; +import { ICoreService, IDecorationService, ILogService, IOptionsService } from '../../../out/common/services/Services'; import { Terminal } from '@xterm/xterm'; import { GlyphRenderer } from './GlyphRenderer'; import { RectangleRenderer } from './RectangleRenderer'; @@ -23,10 +23,10 @@ import { COMBINED_CHAR_BIT_MASK, RenderModel, RenderModelConstants } from './Ren import { IWebGL2RenderingContext, type ITextureAtlas } from './Types'; import { LinkRenderLayer } from './renderLayer/LinkRenderLayer'; import { IRenderLayer } from './renderLayer/Types'; -import { Emitter, EventUtils } from '../../../out-esbuild/common/Event'; -import { addDisposableListener } from '../../../out-esbuild/browser/Dom'; -import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from '../../../out-esbuild/common/Lifecycle'; -import { createRenderDimensions } from '../../../out-esbuild/browser/renderer/shared/RendererUtils'; +import { Emitter, EventUtils } from '../../../out/common/Event'; +import { addDisposableListener } from '../../../out/browser/Dom'; +import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from '../../../out/common/Lifecycle'; +import { createRenderDimensions } from '../../../out/browser/renderer/shared/RendererUtils'; const enum Constants { MERGE_RETRY_LIMIT = 32 diff --git a/addons/addon-webgl/src/WebglUtils.ts b/addons/addon-webgl/src/WebglUtils.ts index ac98f2da2..497143824 100644 --- a/addons/addon-webgl/src/WebglUtils.ts +++ b/addons/addon-webgl/src/WebglUtils.ts @@ -3,8 +3,8 @@ * @license MIT */ -import { throwIfFalsy } from '../../../out-esbuild/browser/renderer/shared/RendererUtils'; -import type { ILogService } from '../../../out-esbuild/common/services/Services'; +import { throwIfFalsy } from '../../../out/browser/renderer/shared/RendererUtils'; +import type { ILogService } from '../../../out/common/services/Services'; /** * A matrix that when multiplies will translate 0-1 coordinates (left to right, diff --git a/addons/addon-webgl/src/customGlyphs/CustomGlyphRasterizer.ts b/addons/addon-webgl/src/customGlyphs/CustomGlyphRasterizer.ts index d8690a88d..12440ed7c 100644 --- a/addons/addon-webgl/src/customGlyphs/CustomGlyphRasterizer.ts +++ b/addons/addon-webgl/src/customGlyphs/CustomGlyphRasterizer.ts @@ -3,8 +3,8 @@ * @license MIT */ -import { throwIfFalsy } from '../../../../out-esbuild/browser/renderer/shared/RendererUtils'; -import type { ILogService } from '../../../../out-esbuild/common/services/Services'; +import { throwIfFalsy } from '../../../../out/browser/renderer/shared/RendererUtils'; +import type { ILogService } from '../../../../out/common/services/Services'; import { customGlyphDefinitions } from './CustomGlyphDefinitions'; import { CustomGlyphDefinitionType, CustomGlyphScaleType, CustomGlyphVectorType, type CustomGlyphDefinitionPart, type CustomGlyphPathDrawFunctionDefinition, type CustomGlyphPatternDefinition, type ICustomGlyphSolidOctantBlockVector, type ICustomGlyphVectorShape } from './Types'; diff --git a/addons/addon-webgl/src/renderLayer/BaseRenderLayer.ts b/addons/addon-webgl/src/renderLayer/BaseRenderLayer.ts index f7d231b18..382ae5a76 100644 --- a/addons/addon-webgl/src/renderLayer/BaseRenderLayer.ts +++ b/addons/addon-webgl/src/renderLayer/BaseRenderLayer.ts @@ -3,16 +3,16 @@ * @license MIT */ -import { ReadonlyColorSet } from '../../../../out-esbuild/browser/Types'; +import { ReadonlyColorSet } from '../../../../out/browser/Types'; import { acquireTextureAtlas } from '../CharAtlasCache'; -import { IRenderDimensions } from '../../../../out-esbuild/browser/renderer/shared/Types'; -import { ICoreBrowserService, IThemeService } from '../../../../out-esbuild/browser/services/Services'; -import { Disposable, toDisposable } from '../../../../out-esbuild/common/Lifecycle'; -import { CellData } from '../../../../out-esbuild/common/buffer/CellData'; -import { IOptionsService } from '../../../../out-esbuild/common/services/Services'; +import { IRenderDimensions } from '../../../../out/browser/renderer/shared/Types'; +import { ICoreBrowserService, IThemeService } from '../../../../out/browser/services/Services'; +import { Disposable, toDisposable } from '../../../../out/common/Lifecycle'; +import { CellData } from '../../../../out/common/buffer/CellData'; +import { IOptionsService } from '../../../../out/common/services/Services'; import { Terminal } from '@xterm/xterm'; import { IRenderLayer } from './Types'; -import { throwIfFalsy } from '../../../../out-esbuild/browser/renderer/shared/RendererUtils'; +import { throwIfFalsy } from '../../../../out/browser/renderer/shared/RendererUtils'; import { TEXT_BASELINE } from '../Constants'; import type { ITextureAtlas } from '../Types'; diff --git a/addons/addon-webgl/src/renderLayer/LinkRenderLayer.ts b/addons/addon-webgl/src/renderLayer/LinkRenderLayer.ts index be1ab0d0c..ddb4fb594 100644 --- a/addons/addon-webgl/src/renderLayer/LinkRenderLayer.ts +++ b/addons/addon-webgl/src/renderLayer/LinkRenderLayer.ts @@ -4,11 +4,11 @@ */ import { is256Color } from '../CharAtlasUtils'; -import { INVERTED_DEFAULT_COLOR } from '../../../../out-esbuild/browser/renderer/shared/Constants'; -import { IRenderDimensions } from '../../../../out-esbuild/browser/renderer/shared/Types'; -import { ICoreBrowserService, IThemeService } from '../../../../out-esbuild/browser/services/Services'; -import { ILinkifier2, ILinkifierEvent } from '../../../../out-esbuild/browser/Types'; -import { IOptionsService } from '../../../../out-esbuild/common/services/Services'; +import { INVERTED_DEFAULT_COLOR } from '../../../../out/browser/renderer/shared/Constants'; +import { IRenderDimensions } from '../../../../out/browser/renderer/shared/Types'; +import { ICoreBrowserService, IThemeService } from '../../../../out/browser/services/Services'; +import { ILinkifier2, ILinkifierEvent } from '../../../../out/browser/Types'; +import { IOptionsService } from '../../../../out/common/services/Services'; import { Terminal } from '@xterm/xterm'; import { BaseRenderLayer } from './BaseRenderLayer'; diff --git a/addons/addon-webgl/src/renderLayer/Types.ts b/addons/addon-webgl/src/renderLayer/Types.ts index e70e676cf..763348ec8 100644 --- a/addons/addon-webgl/src/renderLayer/Types.ts +++ b/addons/addon-webgl/src/renderLayer/Types.ts @@ -4,7 +4,7 @@ */ import { IDisposable, Terminal } from '@xterm/xterm'; -import { IRenderDimensions } from '../../../../out-esbuild/browser/renderer/shared/Types'; +import { IRenderDimensions } from '../../../../out/browser/renderer/shared/Types'; export interface IRenderLayer extends IDisposable { /** diff --git a/bin/esbuild_all.mjs b/bin/esbuild_all.mjs index 1a3aadea5..13da4ce5c 100644 --- a/bin/esbuild_all.mjs +++ b/bin/esbuild_all.mjs @@ -7,19 +7,30 @@ import { argv } from "process"; /** @type {{cp: import("child_process").ChildProcessByStdio, name: string}[]} */ const jobs = []; -// Core job -jobs.push(createJob('xterm', [])); +// Core job must finish before addons (addon tests resolve src/* via out-esbuild). +const xtermJob = createJob('xterm', []); +const xtermCode = await new Promise(r => { + xtermJob.cp.on('exit', code => { + log(`Finished \x1b[32m${xtermJob.name}\x1b[0m${code ? ' \x1b[31mwith errors\x1b[0m' : ''}`); + r(code ?? 1); + }); +}); +if (xtermCode !== 0) { + process.exit(xtermCode); +} // Addon jobs const addons = (await readdir('addons')).filter(e => e.startsWith('addon-')).map(e => e.replace('addon-', '')); +/** @type {{cp: import("child_process").ChildProcessByStdio, name: string}[]} */ +const addonJobs = []; for (const addon of addons) { - jobs.push(createJob(`xterm-addon-${addon}`, [`--addon=${addon}`])); + addonJobs.push(createJob(`xterm-addon-${addon}`, [`--addon=${addon}`])); } // Demo job - This requires the others to be built so it's not included when building all // jobs.push(createJob('demo-client', [`--demo-client`])); -await Promise.all(jobs.map((job, i) => { +await Promise.all(addonJobs.map(job => { return new Promise(r => { job.cp.on('exit', code => { log(`Finished \x1b[32m${job.name}\x1b[0m${code ? ' \x1b[31mwith errors\x1b[0m' : ''}`); diff --git a/src/tsconfig-library-base.json b/src/tsconfig-library-base.json index 00cecc066..3bd3fc0aa 100644 --- a/src/tsconfig-library-base.json +++ b/src/tsconfig-library-base.json @@ -5,6 +5,7 @@ "strict": true, "declarationMap": true, "experimentalDecorators": true, - "downlevelIteration": true + "downlevelIteration": true, + "preserveConstEnums": true } }