ansi_up 3.0

removes need for typings

dev_mode/package.json

@@ -82,7 +82,7 @@
     "@phosphor/virtualdom": "^1.1.2",
     "@phosphor/widgets": "^1.5.0",
     "ajv": "~5.1.6",
-    "ansi_up": "~2.0.2",
+    "ansi_up": "^3.0.0",
     "codemirror": "~5.35.0",
     "comment-json": "^1.1.3",
     "es6-promise": "~4.1.1",

docs/source/developer/adding_content.rst

@@ -15,7 +15,7 @@ As an example: Add a leaflet viewer plugin for geoJSON files.
 
 -  If there are no typings, we must create our own. An example typings
    file that exports functions is
-   `ansi_up <https://github.com/jupyterlab/jupyterlab/blob/master/packages/rendermime/typings/ansi_up/ansi_up.d.ts>`__.
+   `path-posix <https://github.com/jupyterlab/jupyterlab/blob/master/packages/coreutils/typings/path-posix/path-posix.d.ts>`__.
    An example with a class is
    `xterm <https://github.com/jupyterlab/jupyterlab/blob/master/packages/terminal/typings/xterm/xterm.d.ts>`__.
 

packages/metapackage/src/typings.d.ts

@@ -4,6 +4,5 @@
 /// <reference path="../../codemirror/typings/codemirror/codemirror.d.ts"/>
 /// <reference path="../../coreutils/typings/path-posix/path-posix.d.ts"/>
 /// <reference path="../../coreutils/typings/url-parse/url-parse.d.ts"/>
-/// <reference path="../../rendermime/typings/ansi_up/ansi_up.d.ts"/>
 /// <reference path="../../terminal/typings/xterm/xterm.d.ts"/>
 /// <reference path="../../vdom-extension/src/transform-vdom.d.ts"/>

packages/rendermime/package.json

@@ -40,7 +40,7 @@
     "@phosphor/messaging": "^1.2.2",
     "@phosphor/signaling": "^1.2.2",
     "@phosphor/widgets": "^1.5.0",
-    "ansi_up": "~2.0.2",
+    "ansi_up": "^3.0.0",
     "marked": "~0.3.9"
   },
   "devDependencies": {

packages/rendermime/src/renderers.ts

@@ -3,13 +3,10 @@
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
 
-// AnsiUp 2.0 exports with a 'default' name that seems to prevent imports
 import {
-  AnsiUp
+  default as AnsiUp
 } from 'ansi_up';
 
-const AnsiUpConstructor = require('ansi_up').default;
-
 import * as marked
   from 'marked';
 
@@ -504,7 +501,7 @@ function renderText(options: renderText.IRenderOptions): Promise<void> {
   // Unpack the options.
   let { host, source } = options;
 
-  let ansiUp: AnsiUp = new AnsiUpConstructor();
+  const ansiUp = new AnsiUp();
   ansiUp.escape_for_html = true;
   ansiUp.use_classes = true;
 

packages/rendermime/src/typings.d.ts

@@ -1,5 +0,0 @@
-/*-----------------------------------------------------------------------------
-| Copyright (c) Jupyter Development Team.
-| Distributed under the terms of the Modified BSD License.
-|----------------------------------------------------------------------------*/
-/// <reference path="../typings/ansi_up/ansi_up.d.ts"/>

packages/rendermime/typings/ansi_up/ansi_up.d.ts

@@ -1,54 +0,0 @@
-// Type definitions for ansi_up v2.0.2
-// Adapted from typings that ship with ansi_up 2.0.2
-// Project: https://github.com/drudru/ansi_up
-
-
-declare module "ansi_up" {
-    interface AU_Color {
-        rgb: number[];
-        class_name: string;
-    }
-    interface TextWithData {
-        fg: AU_Color;
-        bg: AU_Color;
-        bright: boolean;
-        text: string;
-    }
-    interface Formatter {
-        transform(fragment: TextWithData, instance: AnsiUp): any;
-        compose(segments: any[], instance: AnsiUp): any;
-    }
-    function rgx(tmplObj: any, ...subst: any[]): RegExp;
-    class AnsiUp {
-        VERSION: string;
-        ansi_colors: {
-            rgb: number[];
-            class_name: string;
-        }[][];
-        htmlFormatter: Formatter;
-        textFormatter: Formatter;
-        private palette_256;
-        private fg;
-        private bg;
-        private bright;
-        private _use_classes;
-        private _escape_for_html;
-        private _sgr_regex;
-        private _buffer;
-        constructor();
-        use_classes: boolean;
-        escape_for_html: boolean;
-        private setup_256_palette();
-        private old_escape_for_html(txt);
-        private old_linkify(txt);
-        private detect_incomplete_ansi(txt);
-        private detect_incomplete_link(txt);
-        ansi_to(txt: string, formatter: Formatter): any;
-        ansi_to_html(txt: string): string;
-        ansi_to_text(txt: string): string;
-        private with_state(text);
-        private handle_incomplete_sequences(chunks);
-        private process_ansi(block);
-    }
-}
-

yarn.lock

@@ -532,9 +532,9 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi_up@~2.0.2:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/ansi_up/-/ansi_up-2.0.2.tgz#9b54de508c5c579f5b6968e65c1b863e0680ab92"
+ansi_up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/ansi_up/-/ansi_up-3.0.0.tgz#27f45d8f457d9ceff59e4ea03c8e6f13c1a303e8"
 
 anymatch@^1.3.0:
   version "1.3.2"