Merge branch 'master' of https://github.com/jupyterlab/jupyterlab

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1, 0, 4, 'final', 0
+current_version = 1, 1, 0, 'alpha', 1
 commit = False
 tag = False
 parse = (?P<major>\d+)\,\ (?P<minor>\d+)\,\ (?P<patch>\d+)\,\ \'(?P<release>\S+)\'\,\ (?P<build>\d+)

.github/lock.yml

@@ -0,0 +1,38 @@
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 10000
+
+# Skip issues and pull requests created before a given timestamp. Timestamp must
+# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
+skipCreatedBefore: false
+
+# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
+exemptLabels: []
+
+# Label to add before locking, such as `outdated`. Set to `false` to disable
+lockLabel: false
+
+# Comment to post before locking. Set to `false` to disable
+lockComment: >
+  This thread has been automatically locked since there has not been
+  any recent activity after it was closed. Please open a [new issue](https://github.com/jupyterlab/jupyterlab/issues/new/choose)
+  for related discussion.
+
+# Assign `resolved` as the reason for locking. Set to `false` to disable
+setLockReason: true
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings just for `issues` or `pulls`
+# issues:
+#   exemptLabels:
+#     - help-wanted
+#   lockLabel: outdated
+
+# pulls:
+#   daysUntilLock: 30
+
+# Repository to extend settings from
+# _extends: repo

buildutils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/buildutils",
-  "version": "1.0.2",
+  "version": "1.1.0-alpha.1",
   "description": "JupyterLab - Build Utilities",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {

buildutils/src/ensure-repo.ts

@@ -146,9 +146,10 @@ function ensureJupyterlab(): string[] {
   corePackage.jupyterlab.mimeExtensions = {};
   corePackage.jupyterlab.linkedPackages = {};
   corePackage.dependencies = {};
+  corePackage.resolutions = {};
 
   let singletonPackages = corePackage.jupyterlab.singletonPackages;
-  let vendorPackages = corePackage.jupyterlab.vendor;
+  const coreData = new Map<string, any>();
 
   utils.getCorePaths().forEach(pkgPath => {
     let dataPath = path.join(pkgPath, 'package.json');
@@ -158,55 +159,52 @@ function ensureJupyterlab(): string[] {
     } catch (e) {
       return;
     }
-    // Determine whether to include the package.
-    if (!data.jupyterlab) {
-      return;
-    }
-    // Skip if explicitly marked as not a core dep.
-    if (
-      'coreDependency' in data.jupyterlab &&
-      !data.jupyterlab.coreDependency
-    ) {
-      return;
-    }
-    // Skip if it is not marked as an extension or a core dep.
-    if (
-      !data.jupyterlab.coreDependency &&
-      !data.jupyterlab.extension &&
-      !data.jupyterlab.mimeExtension
-    ) {
+    coreData.set(data.name, data);
+  });
+
+  coreData.forEach((data, name) => {
+    // Insist on this version in the yarn resolution.
+    const version = `~${data.version}`;
+    corePackage.resolutions[name] = version;
+  });
+
+  coreData.forEach((data, name) => {
+    // Determine if the package wishes to be included in the top-level
+    // dependencies.
+    const meta = data.jupyterlab;
+    const keep = !!(
+      meta &&
+      (meta.coreDependency || meta.extension || meta.mimeExtension)
+    );
+    if (!keep) {
       return;
     }
 
     // Make sure it is included as a dependency.
-    corePackage.dependencies[data.name] = '^' + String(data.version);
-    // Add its dependencies to the core dependencies if they are in the
-    // singleton packages or vendor packages.
+    const version = `~${data.version}`;
+    corePackage.dependencies[data.name] = version;
+
+    // Add its dependencies to the resolutions if they are in the singleton
+    // packages packages. This lets yarn force the singleton status.
     let deps = data.dependencies || {};
     for (let dep in deps) {
       if (singletonPackages.indexOf(dep) !== -1) {
-        corePackage.dependencies[dep] = deps[dep];
-      }
-      if (vendorPackages.indexOf(dep) !== -1) {
-        corePackage.dependencies[dep] = deps[dep];
+        if (!(dep in corePackage.resolutions)) {
+          corePackage.resolutions[dep] = deps[dep];
+        }
       }
     }
 
-    let jlab = data.jupyterlab;
-    if (!jlab) {
-      return;
-    }
-
     // Handle extensions.
     ['extension', 'mimeExtension'].forEach(item => {
-      let ext = jlab[item];
+      let ext = meta[item];
       if (ext === true) {
         ext = '';
       }
       if (typeof ext !== 'string') {
         return;
       }
-      corePackage.jupyterlab[item + 's'][data.name] = ext;
+      corePackage.jupyterlab[`${item}s`][name] = ext;
     });
   });
 

buildutils/src/update-core-mode.ts

@@ -7,6 +7,9 @@ import * as fs from 'fs-extra';
 import * as path from 'path';
 import * as utils from './utils';
 
+// Run integrity to update the dev_mode package.json
+utils.run('jlpm integrity');
+
 // Get the dev mode package.json file.
 let data = utils.readJSONFile('./dev_mode/package.json');
 

buildutils/template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/template",
-  "version": "1.0.0",
+  "version": "1.1.0-alpha.1",
   "description": "JupyterLab - Package Template",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {

buildutils/test-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/template-for-tests",
-  "version": "1.0.0",
+  "version": "1.1.0-alpha.1",
   "private": true,
   "scripts": {
     "build": "tsc",