Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing singleton packages for RTC #6816

Merged
merged 3 commits into from
Apr 4, 2023
Merged

Add missing singleton packages for RTC #6816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
264a909
Add missing singleton packages for RTC
jtpio Apr 4, 2023
8a6ca21
Add RTC screencast to the docs
jtpio Apr 4, 2023
c2cd92a
try fix package check
jtpio Apr 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -318,6 +322,8 @@
}
},
"singletonPackages": [
"@codemirror/state",
"@codemirror/view",
"@jupyter-notebook/tree",
"@jupyter/ydoc",
"@jupyterlab/application",
Expand Down Expand Up @@ -352,6 +358,8 @@
"@jupyterlab/tooltip",
"@jupyterlab/translation",
"@jupyterlab/ui-components",
"@lezer/common",
"@lezer/highlight",
"@lumino/algorithm",
"@lumino/application",
"@lumino/commands",
Expand Down
15 changes: 12 additions & 3 deletions buildutils/src/ensure-repo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions docs/source/notebook_7_features.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down