浏览代码

Fix application build

Steven Silvester 8 年之前
父节点
当前提交
ae9dc7a180
共有 6 个文件被更改,包括 13 次插入6 次删除
  1. 5 2
      jupyterlab/package.json
  2. 1 1
      jupyterlab/tsconfig.json
  3. 1 1
      lerna.json
  4. 2 1
      package.json
  5. 2 0
      packages/console/src/index.ts
  6. 2 1
      setup.py

+ 5 - 2
jupyterlab/package.json

@@ -1,11 +1,13 @@
 {
   "private": true,
-  "name": "jupyterlab-main",
+  "name": "@jupyterlab/main",
+  "version": "0.1.0",
   "scripts": {
     "build": "tsc && webpack",
     "clean": "rimraf build"
   },
   "dependencies": {
+    "@jupyterlab/application": "^0.1.0",
     "@jupyterlab/about-extension": "^0.1.0",
     "@jupyterlab/application-extension": "^0.1.0",
     "@jupyterlab/apputils-extension": "^0.1.0",
@@ -13,6 +15,7 @@
     "@jupyterlab/completer-extension": "^0.1.0",
     "@jupyterlab/console-extension": "^0.1.0",
     "@jupyterlab/csvwidget-extension": "^0.1.0",
+    "@jupyterlab/default-theme": "^0.1.0",
     "@jupyterlab/docmanager-extension": "^0.1.0",
     "@jupyterlab/docregistry-extension": "^0.1.0",
     "@jupyterlab/editorwidget-extension": "^0.1.0",
@@ -40,6 +43,6 @@
     "rimraf": "^2.5.2",
     "url-loader": "^0.5.7",
     "watch": "^0.18.0",
-    "webpack": "^1.13.1"
+    "webpack": "^1.12.11"
   }
 }

+ 1 - 1
jupyterlab/tsconfig.json

@@ -9,7 +9,7 @@
     "target": "ES5",
     "outDir": "./build",
     "lib": ["ES5", "ES2015.Promise", "DOM", "ES2015.Collection"],
-    "types": []
+    "types": ["node"]
   },
   "include": ["src/*"]
 }

+ 1 - 1
lerna.json

@@ -1,7 +1,7 @@
 {
   "lerna": "2.0.0-beta.38",
   "packages": [
-    "jupyterlab/*",
+    "jupyterlab",
     "examples/*",
     "packages/*",
     "test"

+ 2 - 1
package.json

@@ -1,5 +1,6 @@
 {
-  "private": true,
+  "name": "@jupyterlab/private",
+  "version": "0.1.0",
   "dependencies": {
   },
   "devDependencies": {

+ 2 - 0
packages/console/src/index.ts

@@ -9,6 +9,8 @@ import {
   JSONObject
 } from '@phosphor/coreutils';
 
+export * from './foreign';
+export * from './history';
 export * from './panel';
 export * from './tracker';
 export * from './widget';

+ 2 - 1
setup.py

@@ -28,6 +28,7 @@ PY3 = (sys.version_info[0] >= 3)
 #-----------------------------------------------------------------------------
 
 from distutils import log
+import io
 import json
 import os
 from glob import glob
@@ -107,7 +108,7 @@ except ImportError:
     pass
 
 
-setup_args['cmdclass'] = cmdclass
+#setup_args['cmdclass'] = cmdclass
 
 
 setuptools_args = {}