Bläddra i källkod

Use relative paths for the dev linked packages

Steven Silvester 7 år sedan
förälder
incheckning
9d7c9639a6
3 ändrade filer med 61 tillägg och 53 borttagningar
  1. 51 51
      jupyterlab/package.json
  2. 2 1
      jupyterlab/update-core.js
  3. 8 1
      jupyterlab/webpack.config.js

+ 51 - 51
jupyterlab/package.json

@@ -141,57 +141,57 @@
     ],
     "version": "0.28.0.dev0",
     "linkedPackages": {
-      "@jupyterlab/application": "/Users/ssilvester/workspace/jupyter/lab/packages/application",
-      "@jupyterlab/application-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/application-extension",
-      "@jupyterlab/apputils": "/Users/ssilvester/workspace/jupyter/lab/packages/apputils",
-      "@jupyterlab/apputils-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/apputils-extension",
-      "@jupyterlab/buildutils": "/Users/ssilvester/workspace/jupyter/lab/packages/buildutils",
-      "@jupyterlab/cells": "/Users/ssilvester/workspace/jupyter/lab/packages/cells",
-      "@jupyterlab/codeeditor": "/Users/ssilvester/workspace/jupyter/lab/packages/codeeditor",
-      "@jupyterlab/codemirror": "/Users/ssilvester/workspace/jupyter/lab/packages/codemirror",
-      "@jupyterlab/codemirror-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/codemirror-extension",
-      "@jupyterlab/completer": "/Users/ssilvester/workspace/jupyter/lab/packages/completer",
-      "@jupyterlab/completer-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/completer-extension",
-      "@jupyterlab/console": "/Users/ssilvester/workspace/jupyter/lab/packages/console",
-      "@jupyterlab/console-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/console-extension",
-      "@jupyterlab/coreutils": "/Users/ssilvester/workspace/jupyter/lab/packages/coreutils",
-      "@jupyterlab/csvviewer": "/Users/ssilvester/workspace/jupyter/lab/packages/csvviewer",
-      "@jupyterlab/csvviewer-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/csvviewer-extension",
-      "@jupyterlab/docmanager": "/Users/ssilvester/workspace/jupyter/lab/packages/docmanager",
-      "@jupyterlab/docmanager-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/docmanager-extension",
-      "@jupyterlab/docregistry": "/Users/ssilvester/workspace/jupyter/lab/packages/docregistry",
-      "@jupyterlab/faq-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/faq-extension",
-      "@jupyterlab/filebrowser": "/Users/ssilvester/workspace/jupyter/lab/packages/filebrowser",
-      "@jupyterlab/filebrowser-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/filebrowser-extension",
-      "@jupyterlab/fileeditor": "/Users/ssilvester/workspace/jupyter/lab/packages/fileeditor",
-      "@jupyterlab/fileeditor-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/fileeditor-extension",
-      "@jupyterlab/help-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/help-extension",
-      "@jupyterlab/imageviewer": "/Users/ssilvester/workspace/jupyter/lab/packages/imageviewer",
-      "@jupyterlab/imageviewer-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/imageviewer-extension",
-      "@jupyterlab/inspector": "/Users/ssilvester/workspace/jupyter/lab/packages/inspector",
-      "@jupyterlab/inspector-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/inspector-extension",
-      "@jupyterlab/launcher": "/Users/ssilvester/workspace/jupyter/lab/packages/launcher",
-      "@jupyterlab/launcher-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/launcher-extension",
-      "@jupyterlab/markdownviewer-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/markdownviewer-extension",
-      "@jupyterlab/notebook": "/Users/ssilvester/workspace/jupyter/lab/packages/notebook",
-      "@jupyterlab/notebook-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/notebook-extension",
-      "@jupyterlab/outputarea": "/Users/ssilvester/workspace/jupyter/lab/packages/outputarea",
-      "@jupyterlab/pdf-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/pdf-extension",
-      "@jupyterlab/rendermime": "/Users/ssilvester/workspace/jupyter/lab/packages/rendermime",
-      "@jupyterlab/rendermime-interfaces": "/Users/ssilvester/workspace/jupyter/lab/packages/rendermime-interfaces",
-      "@jupyterlab/running": "/Users/ssilvester/workspace/jupyter/lab/packages/running",
-      "@jupyterlab/running-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/running-extension",
-      "@jupyterlab/services": "/Users/ssilvester/workspace/jupyter/lab/packages/services",
-      "@jupyterlab/settingeditor-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/settingeditor-extension",
-      "@jupyterlab/shortcuts-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/shortcuts-extension",
-      "@jupyterlab/tabmanager-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/tabmanager-extension",
-      "@jupyterlab/terminal": "/Users/ssilvester/workspace/jupyter/lab/packages/terminal",
-      "@jupyterlab/terminal-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/terminal-extension",
-      "@jupyterlab/theme-dark-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/theme-dark-extension",
-      "@jupyterlab/theme-light-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/theme-light-extension",
-      "@jupyterlab/tooltip": "/Users/ssilvester/workspace/jupyter/lab/packages/tooltip",
-      "@jupyterlab/tooltip-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/tooltip-extension",
-      "@jupyterlab/vega2-extension": "/Users/ssilvester/workspace/jupyter/lab/packages/vega2-extension"
+      "@jupyterlab/application": "../packages/application",
+      "@jupyterlab/application-extension": "../packages/application-extension",
+      "@jupyterlab/apputils": "../packages/apputils",
+      "@jupyterlab/apputils-extension": "../packages/apputils-extension",
+      "@jupyterlab/buildutils": "../packages/buildutils",
+      "@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"
     }
   }
 }

+ 2 - 1
jupyterlab/update-core.js

@@ -33,7 +33,8 @@ packages.forEach(function(packagePath) {
 
   // Make sure it is included as a dependency and a linked package.
   corePackage.dependencies[data.name] = '^' + String(data.version);
-  corePackage.jupyterlab.linkedPackages[data.name] = packagePath;
+  var relativePath = '../packages/' + path.basename(packagePath);
+  corePackage.jupyterlab.linkedPackages[data.name] = relativePath;
 
   var jlab = data.jupyterlab;
   if (!jlab) {

+ 8 - 1
jupyterlab/webpack.config.js

@@ -38,6 +38,13 @@ hash.update(fs.readFileSync('./package.json'));
 var digest = hash.digest('hex');
 fs.writeFileSync(path.resolve(buildDir, 'hash.md5'), digest);
 
+// Handle linked packages.
+var linkedPackages = {};
+Object.keys(package_data.jupyterlab.linkedPackages).forEach(function (name) {
+  let raw = package_data.jupyterlab.linkedPackages[name];
+  linkedPackages[name] = fs.realpathSync(raw);
+});
+
 module.exports = {
   entry:  path.resolve(buildDir, 'index.out.js'),
   output: {
@@ -61,7 +68,7 @@ module.exports = {
     ],
   },
   resolve: {
-    alias: package_data.jupyterlab.linkedPackages
+    alias: linkedPackages
   },
   watchOptions: {
     ignored: /node_modules/