Explorar o código

Merge renderers into rendermime to avoid cycle

Steven Silvester %!s(int64=8) %!d(string=hai) anos
pai
achega
bd43cfb3f6

+ 3 - 1
package.json

@@ -1,6 +1,8 @@
 {
   "private": true,
-  "dependencies": {},
+  "dependencies": {
+    "lerna": "^2.0.0-beta.38"
+  },
   "devDependencies": {
     "lerna": "2.0.0-beta.38"
   },

+ 0 - 42
packages/renderers/package.json

@@ -1,42 +0,0 @@
-{
-  "name": "@jupyterlab/renderers",
-  "version": "0.1.0",
-  "description": "JupyterLab - MIME Renderers",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "files": [
-    "lib/*.d.ts",
-    "lib/*.js"
-  ],
-  "directories": {
-    "lib": "lib/"
-  },
-  "dependencies": {
-    "@jupyterlab/codemirror": "^0.1.0",
-    "@jupyterlab/rendermime": "^0.1.0",
-    "@phosphor/coreutils": "^0.1.5",
-    "@phosphor/messaging": "^0.1.2",
-    "@phosphor/widgets": "^0.3.0",
-    "ansi_up": "^1.3.0",
-    "codemirror": "^5.24.2",
-    "marked": "^0.3.6"
-  },
-  "devDependencies": {
-    "rimraf": "^2.5.2",
-    "typescript": "^2.2.1"
-  },
-  "scripts": {
-    "build": "tsc",
-    "clean": "rimraf lib"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/jupyterlab/jupyterlab.git"
-  },
-  "author": "Project Jupyter",
-  "license": "BSD-3-Clause",
-  "bugs": {
-    "url": "https://github.com/jupyterlab/jupyterlab/issues"
-  },
-  "homepage": "https://github.com/jupyterlab/jupyterlab"
-}

+ 0 - 15
packages/renderers/tsconfig.json

@@ -1,15 +0,0 @@
-{
-  "compilerOptions": {
-    "declaration": true,
-    "noImplicitAny": true,
-    "noEmitOnError": true,
-    "noUnusedLocals": true,
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "target": "ES5",
-    "outDir": "./lib",
-    "lib": ["ES5", "ES2015.Promise", "DOM", "ES2015.Collection"],
-    "types": []
-  },
-  "include": ["src/*"]
-}

+ 0 - 1
packages/rendermime/package.json

@@ -14,7 +14,6 @@
   "dependencies": {
     "@jupyterlab/apputils": "^0.1.0",
     "@jupyterlab/coreutils": "^0.1.0",
-    "@jupyterlab/renderers": "^0.1.0",
     "@jupyterlab/services": "^0.40.1",
     "@phosphor/algorithm": "^0.1.1",
     "@phosphor/coreutils": "^0.1.5",

+ 3 - 0
packages/rendermime/src/index.ts

@@ -9,9 +9,12 @@ import {
   RenderMime
 } from './rendermime';
 
+export * from './latex';
 export * from './mimemodel';
 export * from './outputmodel';
 export * from './rendermime';
+export * from './renderers';
+export * from './widgets';
 
 
 /* tslint:disable */

+ 0 - 0
packages/renderers/src/latex.ts → packages/rendermime/src/latex.ts


+ 0 - 0
packages/renderers/src/index.ts → packages/rendermime/src/renderers.ts


+ 6 - 7
packages/rendermime/src/rendermime.ts

@@ -29,19 +29,18 @@ import {
   ISanitizer, defaultSanitizer
 } from '@jupyterlab/apputils';
 
+import {
+  MimeModel
+} from './mimemodel';
+
 import {
   HTMLRenderer, LatexRenderer, ImageRenderer, TextRenderer,
   JavaScriptRenderer, SVGRenderer, MarkdownRenderer, PDFRenderer
-} from '@jupyterlab/renderers';
+} from './renderers';
 
 import {
   RenderedText
-} from '@jupyterlab/renderers/widget';
-
-import {
-  MimeModel
-} from './mimemodel';
-
+} from './widgets';
 
 /**
  * A composite renderer.

+ 0 - 0
packages/renderers/src/widget.ts → packages/rendermime/src/widgets.ts


+ 0 - 0
packages/renderers/style/index.css → packages/rendermime/style/index.css