Skip to content

Commit b99718f

Browse files
authored
Add missing singleton packages for RTC (#6816)
* Add missing singleton packages for RTC * Add RTC screencast to the docs * try fix package check
1 parent 0c888ae commit b99718f

File tree

3 files changed

+22
-3
lines changed

3 files changed

+22
-3
lines changed

app/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
"watch": "webpack --config ./webpack.config.watch.js"
1111
},
1212
"resolutions": {
13+
"@codemirror/state": "~6.2.0",
14+
"@codemirror/view": "~6.9.3",
1315
"@jupyter-notebook/application": "~7.0.0-alpha.18",
1416
"@jupyter-notebook/application-extension": "~7.0.0-alpha.18",
1517
"@jupyter-notebook/console-extension": "~7.0.0-alpha.18",
@@ -90,6 +92,8 @@
9092
"@jupyterlab/ui-components": "~4.0.0-beta.0",
9193
"@jupyterlab/ui-components-extension": "~4.0.0-beta.0",
9294
"@jupyterlab/vega5-extension": "~4.0.0-beta.0",
95+
"@lezer/common": "~1.0.2",
96+
"@lezer/highlight": "~1.1.4",
9397
"@lumino/algorithm": "~2.0.0",
9498
"@lumino/application": "~2.0.1",
9599
"@lumino/commands": "~2.0.1",
@@ -318,6 +322,8 @@
318322
}
319323
},
320324
"singletonPackages": [
325+
"@codemirror/state",
326+
"@codemirror/view",
321327
"@jupyter-notebook/tree",
322328
"@jupyter/ydoc",
323329
"@jupyterlab/application",
@@ -352,6 +358,8 @@
352358
"@jupyterlab/tooltip",
353359
"@jupyterlab/translation",
354360
"@jupyterlab/ui-components",
361+
"@lezer/common",
362+
"@lezer/highlight",
355363
"@lumino/algorithm",
356364
"@lumino/application",
357365
"@lumino/commands",

buildutils/src/ensure-repo.ts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,19 @@ function ensureResolutions(): string[] {
1818
corePackage.jupyterlab.singletonPackages
1919
);
2020

21-
packages.forEach((name) => {
22-
const data = require(`${name}/package.json`);
21+
packages.forEach(async (name) => {
22+
let version = '';
23+
try {
24+
const data = require(`${name}/package.json`);
25+
version = data.version;
26+
} catch {
27+
const modulePath = require.resolve(name);
28+
const parentDir = path.dirname(path.dirname(modulePath));
29+
const data = require(path.join(parentDir, 'package.json'));
30+
version = data.version;
31+
}
2332
// Insist on a restricted version in the yarn resolution.
24-
corePackage.resolutions[name] = `~${data.version}`;
33+
corePackage.resolutions[name] = `~${version}`;
2534
});
2635

2736
// Write the package.json back to disk.

docs/source/notebook_7_features.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ After installing the extension, restart the Jupyter Server so the extension can
3535
It is possible for two users to work on the same notebook using Notebook 7 or JupyterLab.
3636
```
3737

38+
![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)
39+
3840
## Table of Contents
3941

4042
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.

0 commit comments

Comments
 (0)