Fix addon and dist builds after path mapping removal
Import shared core from ../../../out/common|browser in addons so tsc and runtime agree. Enable preserveConstEnums so const enums remain in compiled out/ for addon consumers. Build xterm esbuild before addons so out-esbuild exists for parallel addon jobs. Verified: npm run setup, esbuild-demo-client, package. Co-authored-by: Daniel Imms <Tyriar@users.noreply.github.com>
This commit is contained in:
co-authored by
Daniel Imms
parent
9a96b27566
commit
584954b4fb
@@ -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';
|
||||
|
||||
/**
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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<void> {
|
||||
return new Promise(r => terminal.write(data, r));
|
||||
|
||||
@@ -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<void> {
|
||||
return new Promise(r => terminal.write(data, r));
|
||||
|
||||
@@ -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 = [
|
||||
/**
|
||||
|
||||
@@ -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';
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user