Merge remote-tracking branch 'ups/master' into pr/1148

src/shared/CharAtlasGenerator.ts

@@ -3,8 +3,8 @@
  * @license MIT
  */
 
+import { FontWeight } from 'xterm';
 import { isFirefox } from './utils/Browser';
-import { FontWeight } from './Types';
 
 declare const Promise: any;
 

src/shared/Types.ts

@@ -1,6 +0,0 @@
-/**
- * Copyright (c) 2018 The xterm.js authors. All rights reserved.
- * @license MIT
- */
-
- export type FontWeight = 'normal' | 'bold' | '100' | '200' | '300' | '400' | '500' | '600' | '700' | '800' | '900';

src/shared/utils/Browser.ts

@@ -24,6 +24,6 @@ export const isLinux = platform.indexOf('Linux') >= 0;
  * @param {Array} array The array to search for the given element.
  * @param {Object} el The element to look for into the array
  */
-export function contains(arr: any[], el: any): boolean {
+function contains(arr: any[], el: any): boolean {
   return arr.indexOf(el) >= 0;
-};
+}