diff --git a/app/package.json b/app/package.json index 83cff05ec0..1b1990ff98 100644 --- a/app/package.json +++ b/app/package.json @@ -10,6 +10,8 @@ "watch": "webpack --config ./webpack.config.watch.js" }, "resolutions": { + "@codemirror/state": "~6.2.0", + "@codemirror/view": "~6.9.3", "@jupyter-notebook/application": "~7.0.0-alpha.18", "@jupyter-notebook/application-extension": "~7.0.0-alpha.18", "@jupyter-notebook/console-extension": "~7.0.0-alpha.18", @@ -90,6 +92,8 @@ "@jupyterlab/ui-components": "~4.0.0-beta.0", "@jupyterlab/ui-components-extension": "~4.0.0-beta.0", "@jupyterlab/vega5-extension": "~4.0.0-beta.0", + "@lezer/common": "~1.0.2", + "@lezer/highlight": "~1.1.4", "@lumino/algorithm": "~2.0.0", "@lumino/application": "~2.0.1", "@lumino/commands": "~2.0.1", @@ -318,6 +322,8 @@ } }, "singletonPackages": [ + "@codemirror/state", + "@codemirror/view", "@jupyter-notebook/tree", "@jupyter/ydoc", "@jupyterlab/application", @@ -352,6 +358,8 @@ "@jupyterlab/tooltip", "@jupyterlab/translation", "@jupyterlab/ui-components", + "@lezer/common", + "@lezer/highlight", "@lumino/algorithm", "@lumino/application", "@lumino/commands", diff --git a/buildutils/src/ensure-repo.ts b/buildutils/src/ensure-repo.ts index c758ce353d..041dcef7fd 100644 --- a/buildutils/src/ensure-repo.ts +++ b/buildutils/src/ensure-repo.ts @@ -18,10 +18,19 @@ function ensureResolutions(): string[] { corePackage.jupyterlab.singletonPackages ); - packages.forEach((name) => { - const data = require(`${name}/package.json`); + packages.forEach(async (name) => { + let version = ''; + try { + const data = require(`${name}/package.json`); + version = data.version; + } catch { + const modulePath = require.resolve(name); + const parentDir = path.dirname(path.dirname(modulePath)); + const data = require(path.join(parentDir, 'package.json')); + version = data.version; + } // Insist on a restricted version in the yarn resolution. - corePackage.resolutions[name] = `~${data.version}`; + corePackage.resolutions[name] = `~${version}`; }); // Write the package.json back to disk. diff --git a/docs/source/notebook_7_features.md b/docs/source/notebook_7_features.md index dbb4d5eef3..d93f7b8cf5 100644 --- a/docs/source/notebook_7_features.md +++ b/docs/source/notebook_7_features.md @@ -35,6 +35,8 @@ After installing the extension, restart the Jupyter Server so the extension can It is possible for two users to work on the same notebook using Notebook 7 or JupyterLab. ``` +![a screencast showing how users can collaborate on the same document with both Notebook 7 and JupyterLab](https://user-images.githubusercontent.com/591645/229854102-6eed73f4-587f-406e-8ed1-347b788da9ee.gif) + ## Table of Contents Notebook 7 includes a new table of contents extension that allows you to navigate through your notebook using a sidebar. The Table of Contents is built-in and enabled by default, just like in JupyterLab.