cleanup

buildutils/src/ensure-repo.ts

@@ -72,7 +72,7 @@ function ensureAllPackages(): string[] {
     if (index.indexOf(name) === -1) {
       valid = false;
     }
-    lines.push('import "' + name + '";\n');
+    lines.push('import "' + name + '";');
 
     if (!valid) {
       messages.push('Updated: ' + name);

jupyterlab/package.json

@@ -132,56 +132,56 @@
     ],
     "version": "0.29.0.dev0",
     "linkedPackages": {
-      "@jupyterlab/application": "../packagesapplication",
-      "@jupyterlab/application-extension": "../packagesapplication-extension",
-      "@jupyterlab/apputils": "../packagesapputils",
-      "@jupyterlab/apputils-extension": "../packagesapputils-extension",
-      "@jupyterlab/cells": "../packagescells",
-      "@jupyterlab/codeeditor": "../packagescodeeditor",
-      "@jupyterlab/codemirror": "../packagescodemirror",
-      "@jupyterlab/codemirror-extension": "../packagescodemirror-extension",
-      "@jupyterlab/completer": "../packagescompleter",
-      "@jupyterlab/completer-extension": "../packagescompleter-extension",
-      "@jupyterlab/console": "../packagesconsole",
-      "@jupyterlab/console-extension": "../packagesconsole-extension",
-      "@jupyterlab/coreutils": "../packagescoreutils",
-      "@jupyterlab/csvviewer": "../packagescsvviewer",
-      "@jupyterlab/csvviewer-extension": "../packagescsvviewer-extension",
-      "@jupyterlab/docmanager": "../packagesdocmanager",
-      "@jupyterlab/docmanager-extension": "../packagesdocmanager-extension",
-      "@jupyterlab/docregistry": "../packagesdocregistry",
-      "@jupyterlab/faq-extension": "../packagesfaq-extension",
-      "@jupyterlab/filebrowser": "../packagesfilebrowser",
-      "@jupyterlab/filebrowser-extension": "../packagesfilebrowser-extension",
-      "@jupyterlab/fileeditor": "../packagesfileeditor",
-      "@jupyterlab/fileeditor-extension": "../packagesfileeditor-extension",
-      "@jupyterlab/help-extension": "../packageshelp-extension",
-      "@jupyterlab/imageviewer": "../packagesimageviewer",
-      "@jupyterlab/imageviewer-extension": "../packagesimageviewer-extension",
-      "@jupyterlab/inspector": "../packagesinspector",
-      "@jupyterlab/inspector-extension": "../packagesinspector-extension",
-      "@jupyterlab/launcher": "../packageslauncher",
-      "@jupyterlab/launcher-extension": "../packageslauncher-extension",
-      "@jupyterlab/markdownviewer-extension": "../packagesmarkdownviewer-extension",
-      "@jupyterlab/notebook": "../packagesnotebook",
-      "@jupyterlab/notebook-extension": "../packagesnotebook-extension",
-      "@jupyterlab/outputarea": "../packagesoutputarea",
-      "@jupyterlab/pdf-extension": "../packagespdf-extension",
-      "@jupyterlab/rendermime": "../packagesrendermime",
-      "@jupyterlab/rendermime-interfaces": "../packagesrendermime-interfaces",
-      "@jupyterlab/running": "../packagesrunning",
-      "@jupyterlab/running-extension": "../packagesrunning-extension",
-      "@jupyterlab/services": "../packagesservices",
-      "@jupyterlab/settingeditor-extension": "../packagessettingeditor-extension",
-      "@jupyterlab/shortcuts-extension": "../packagesshortcuts-extension",
-      "@jupyterlab/tabmanager-extension": "../packagestabmanager-extension",
-      "@jupyterlab/terminal": "../packagesterminal",
-      "@jupyterlab/terminal-extension": "../packagesterminal-extension",
-      "@jupyterlab/theme-dark-extension": "../packagestheme-dark-extension",
-      "@jupyterlab/theme-light-extension": "../packagestheme-light-extension",
-      "@jupyterlab/tooltip": "../packagestooltip",
-      "@jupyterlab/tooltip-extension": "../packagestooltip-extension",
-      "@jupyterlab/vega2-extension": "../packagesvega2-extension"
+      "@jupyterlab/application": "../packages/application",
+      "@jupyterlab/application-extension": "../packages/application-extension",
+      "@jupyterlab/apputils": "../packages/apputils",
+      "@jupyterlab/apputils-extension": "../packages/apputils-extension",
+      "@jupyterlab/cells": "../packages/cells",
+      "@jupyterlab/codeeditor": "../packages/codeeditor",
+      "@jupyterlab/codemirror": "../packages/codemirror",
+      "@jupyterlab/codemirror-extension": "../packages/codemirror-extension",
+      "@jupyterlab/completer": "../packages/completer",
+      "@jupyterlab/completer-extension": "../packages/completer-extension",
+      "@jupyterlab/console": "../packages/console",
+      "@jupyterlab/console-extension": "../packages/console-extension",
+      "@jupyterlab/coreutils": "../packages/coreutils",
+      "@jupyterlab/csvviewer": "../packages/csvviewer",
+      "@jupyterlab/csvviewer-extension": "../packages/csvviewer-extension",
+      "@jupyterlab/docmanager": "../packages/docmanager",
+      "@jupyterlab/docmanager-extension": "../packages/docmanager-extension",
+      "@jupyterlab/docregistry": "../packages/docregistry",
+      "@jupyterlab/faq-extension": "../packages/faq-extension",
+      "@jupyterlab/filebrowser": "../packages/filebrowser",
+      "@jupyterlab/filebrowser-extension": "../packages/filebrowser-extension",
+      "@jupyterlab/fileeditor": "../packages/fileeditor",
+      "@jupyterlab/fileeditor-extension": "../packages/fileeditor-extension",
+      "@jupyterlab/help-extension": "../packages/help-extension",
+      "@jupyterlab/imageviewer": "../packages/imageviewer",
+      "@jupyterlab/imageviewer-extension": "../packages/imageviewer-extension",
+      "@jupyterlab/inspector": "../packages/inspector",
+      "@jupyterlab/inspector-extension": "../packages/inspector-extension",
+      "@jupyterlab/launcher": "../packages/launcher",
+      "@jupyterlab/launcher-extension": "../packages/launcher-extension",
+      "@jupyterlab/markdownviewer-extension": "../packages/markdownviewer-extension",
+      "@jupyterlab/notebook": "../packages/notebook",
+      "@jupyterlab/notebook-extension": "../packages/notebook-extension",
+      "@jupyterlab/outputarea": "../packages/outputarea",
+      "@jupyterlab/pdf-extension": "../packages/pdf-extension",
+      "@jupyterlab/rendermime": "../packages/rendermime",
+      "@jupyterlab/rendermime-interfaces": "../packages/rendermime-interfaces",
+      "@jupyterlab/running": "../packages/running",
+      "@jupyterlab/running-extension": "../packages/running-extension",
+      "@jupyterlab/services": "../packages/services",
+      "@jupyterlab/settingeditor-extension": "../packages/settingeditor-extension",
+      "@jupyterlab/shortcuts-extension": "../packages/shortcuts-extension",
+      "@jupyterlab/tabmanager-extension": "../packages/tabmanager-extension",
+      "@jupyterlab/terminal": "../packages/terminal",
+      "@jupyterlab/terminal-extension": "../packages/terminal-extension",
+      "@jupyterlab/theme-dark-extension": "../packages/theme-dark-extension",
+      "@jupyterlab/theme-light-extension": "../packages/theme-light-extension",
+      "@jupyterlab/tooltip": "../packages/tooltip",
+      "@jupyterlab/tooltip-extension": "../packages/tooltip-extension",
+      "@jupyterlab/vega2-extension": "../packages/vega2-extension"
     }
   }
 }

package.json

@@ -7,10 +7,10 @@
     "build:main": "npm run build",
     "build:main:prod": "npm run build:packages && cd jupyterlab && npm run build:prod",
     "build:packages": "cd packages/all-packages && npm run build",
-    "build:scripts": "cd scripts && npm run build",
     "build:src": "lerna run build --scope \"@jupyterlab/!(test-|example-)*\"",
     "build:static": "node buildutils/lib/make-release.js",
     "build:test": "lerna run build:test",
+    "build:utils": "cd buildutils && npm run build",
     "clean": "node buildutils/lib/clean-packages.js examples packages",
     "clean:examples": "node buildutils/lib/clean-packages.js examples",
     "clean:main": "cd jupyterlab && npm run clean",
@@ -20,7 +20,7 @@
     "coverage": "lerna run coverage --stream",
     "docs": "lerna run docs",
     "get:dependency": "node buildutils/lib/get-dependency.js",
-    "install": "lerna bootstrap --hoist && npm run build:scripts",
+    "install": "lerna bootstrap --hoist && npm run build:utils",
     "integrity": "node buildutils/lib/ensure-repo.js",
     "patch:release": "node buildutils/lib/patch-release.js",
     "publish": "npm run clean:slate && lerna publish --force-publish=* -m \"Publish\"",

packages/all-packages/src/index.ts

@@ -2,101 +2,52 @@
 // Distributed under the terms of the Modified BSD License.
 
 import "@jupyterlab/application";
-
 import "@jupyterlab/application-extension";
-
 import "@jupyterlab/apputils";
-
 import "@jupyterlab/apputils-extension";
-
 import "@jupyterlab/cells";
-
 import "@jupyterlab/codeeditor";
-
 import "@jupyterlab/codemirror";
-
 import "@jupyterlab/codemirror-extension";
-
 import "@jupyterlab/completer";
-
 import "@jupyterlab/completer-extension";
-
 import "@jupyterlab/console";
-
 import "@jupyterlab/console-extension";
-
 import "@jupyterlab/coreutils";
-
 import "@jupyterlab/csvviewer";
-
 import "@jupyterlab/csvviewer-extension";
-
 import "@jupyterlab/docmanager";
-
 import "@jupyterlab/docmanager-extension";
-
 import "@jupyterlab/docregistry";
-
 import "@jupyterlab/faq-extension";
-
 import "@jupyterlab/filebrowser";
-
 import "@jupyterlab/filebrowser-extension";
-
 import "@jupyterlab/fileeditor";
-
 import "@jupyterlab/fileeditor-extension";
-
 import "@jupyterlab/help-extension";
-
 import "@jupyterlab/imageviewer";
-
 import "@jupyterlab/imageviewer-extension";
-
 import "@jupyterlab/inspector";
-
 import "@jupyterlab/inspector-extension";
-
 import "@jupyterlab/launcher";
-
 import "@jupyterlab/launcher-extension";
-
 import "@jupyterlab/markdownviewer-extension";
-
 import "@jupyterlab/notebook";
-
 import "@jupyterlab/notebook-extension";
-
 import "@jupyterlab/outputarea";
-
 import "@jupyterlab/pdf-extension";
-
 import "@jupyterlab/rendermime";
-
 import "@jupyterlab/rendermime-interfaces";
-
 import "@jupyterlab/running";
-
 import "@jupyterlab/running-extension";
-
 import "@jupyterlab/services";
-
 import "@jupyterlab/settingeditor-extension";
-
 import "@jupyterlab/shortcuts-extension";
-
 import "@jupyterlab/tabmanager-extension";
-
 import "@jupyterlab/terminal";
-
 import "@jupyterlab/terminal-extension";
-
 import "@jupyterlab/theme-dark-extension";
-
 import "@jupyterlab/theme-light-extension";
-
 import "@jupyterlab/tooltip";
-
 import "@jupyterlab/tooltip-extension";
-
-import "@jupyterlab/vega2-extension";
+import "@jupyterlab/vega2-extension";