Remove src project

addons/xterm-addon-serialize/benchmark/SerializeAddon.benchmark.ts

@@ -7,7 +7,7 @@ import { perfContext, before, ThroughputRuntimeCase } from 'xterm-benchmark';
 
 import { spawn } from 'node-pty';
 import { Utf8ToUtf32, stringFromCodePoint } from 'common/input/TextDecoder';
-import { Terminal } from 'public/Terminal';
+import { Terminal } from 'browser/public/Terminal';
 import { SerializeAddon } from 'SerializeAddon';
 
 class TestTerminal extends Terminal {

addons/xterm-addon-serialize/benchmark/tsconfig.json

@@ -11,8 +11,6 @@
     "paths": {
       "common/*": ["../../../src/common/*"],
       "browser/*": ["../../../src/browser/*"],
-      "public/*": ["../../../src/public/*"],
-      "Terminal": ["../../../src/Terminal"],
       "SerializeAddon": ["../src/SerializeAddon"]
     }
   },

demo/client.ts

@@ -8,7 +8,7 @@
 /// <reference path="../typings/xterm.d.ts"/>
 
 // Use tsc version (yarn watch)
-import { Terminal } from '../out/public/Terminal';
+import { Terminal } from '../out/browser/public/Terminal';
 import { AttachAddon } from '../addons/xterm-addon-attach/out/AttachAddon';
 import { FitAddon } from '../addons/xterm-addon-fit/out/FitAddon';
 import { SearchAddon, ISearchOptions } from '../addons/xterm-addon-search/out/SearchAddon';

src/Types.d.ts

@@ -1,15 +0,0 @@
-/**
- * Copyright (c) 2017 The xterm.js authors. All rights reserved.
- * @license MIT
- */
-
-import { IDisposable, IMarker, ISelectionPosition, ILinkProvider } from 'xterm';
-import { IAttributeData, CharData, ITerminalOptions, ICoreTerminal } from 'common/Types';
-import { IEvent } from 'common/EventEmitter';
-import { ILinkifier, ILinkMatcherOptions, IViewport, ILinkifier2 } from 'browser/Types';
-import { IOptionsService, IUnicodeService } from 'common/services/Services';
-import { IBuffer, IBufferSet } from 'common/buffer/Types';
-import { IParams, IFunctionIdentifier } from 'common/parser/Types';
-import { Linkifier } from 'browser/Linkifier';
-import { Linkifier2 } from 'browser/Linkifier2';
-

src/browser/public/AddonManager.test.ts

@@ -42,9 +42,9 @@ describe('AddonManager', () => {
         public activate(): void {}
         public dispose(): void { called++; }
       }
-      manager.loadAddon(null, new Addon());
-      manager.loadAddon(null, new Addon());
-      manager.loadAddon(null, new Addon());
+      manager.loadAddon(null!, new Addon());
+      manager.loadAddon(null!, new Addon());
+      manager.loadAddon(null!, new Addon());
       assert.equal(manager.addons.length, 3);
       manager.dispose();
       assert.equal(called, 3);

src/browser/public/Terminal.ts

@@ -8,8 +8,8 @@ import { ITerminal } from 'browser/Types';
 import { IBufferLine, ICellData } from 'common/Types';
 import { IBuffer, IBufferSet } from 'common/buffer/Types';
 import { CellData } from 'common/buffer/CellData';
-import { Terminal as TerminalCore } from '../browser/Terminal';
-import * as Strings from '../browser/LocalizableStrings';
+import { Terminal as TerminalCore } from '../Terminal';
+import * as Strings from '../LocalizableStrings';
 import { IEvent, EventEmitter } from 'common/EventEmitter';
 import { AddonManager } from './AddonManager';
 import { IParams } from 'common/parser/Types';
@@ -17,7 +17,7 @@ import { IParams } from 'common/parser/Types';
 export class Terminal implements ITerminalApi {
   private _core: ITerminal;
   private _addonManager: AddonManager;
-  private _parser: IParser;
+  private _parser: IParser | undefined;
 
   constructor(options?: ITerminalOptions) {
     this._core = new TerminalCore(options);
@@ -81,11 +81,11 @@ export class Terminal implements ITerminalApi {
   public deregisterCharacterJoiner(joinerId: number): void {
     this._core.deregisterCharacterJoiner(joinerId);
   }
-  public registerMarker(cursorYOffset: number): IMarker {
+  public registerMarker(cursorYOffset: number): IMarker | undefined {
     this._verifyIntegers(cursorYOffset);
     return this._core.addMarker(cursorYOffset);
   }
-  public addMarker(cursorYOffset: number): IMarker {
+  public addMarker(cursorYOffset: number): IMarker | undefined {
     return this.registerMarker(cursorYOffset);
   }
   public hasSelection(): boolean {

src/tsconfig.json

@@ -1,34 +0,0 @@
-{
-  "extends": "./tsconfig-base",
-  "compilerOptions": {
-    "module": "commonjs",
-    "lib": [
-      "dom",
-      "es5",
-      "es6",
-      "scripthost",
-      "es2015.promise"
-    ],
-    "rootDir": ".",
-    "outDir": "../out",
-    "baseUrl": ".",
-    "paths": {
-      "common/*": [ "./common/*" ],
-      "browser/*": [ "./browser/*" ]
-    },
-
-    "noUnusedLocals": true,
-    "noImplicitAny": true
-  },
-  "include": [
-    "./**/*",
-    "../typings/xterm.d.ts"
-  ],
-  "exclude": [
-    "./addons/**/*"
-  ],
-  "references": [
-    { "path": "./common" },
-    { "path": "./browser" }
-  ]
-}

tsconfig.all.json

@@ -2,7 +2,7 @@
   "files": [],
   "include": [],
   "references": [
-    { "path": "./src" },
+    { "path": "./src/browser" },
     { "path": "./test/api" },
     { "path": "./test/benchmark" },
     { "path": "./addons/xterm-addon-attach/src" },

typings/xterm.d.ts

@@ -799,8 +799,9 @@ declare module 'xterm' {
      * (EXPERIMENTAL) Adds a marker to the normal buffer and returns it. If the
      * alt buffer is active, undefined is returned.
      * @param cursorYOffset The y position offset of the marker from the cursor.
+     * @returns The new marker or undefined.
      */
-    registerMarker(cursorYOffset: number): IMarker;
+    registerMarker(cursorYOffset: number): IMarker | undefined;
 
     /**
      * @deprecated use `registerMarker` instead.

webpack.config.js

@@ -12,7 +12,7 @@ const path = require('path');
  * output by tsc (because of `baseUrl` and `paths` in `tsconfig.json`.
  */
 module.exports = {
-  entry: './out/public/Terminal.js',
+  entry: './out/browser/public/Terminal.js',
   devtool: 'source-map',
   module: {
     rules: [