@jupyterlab/fileeditor 4.0.0-alpha.13 → 4.0.0-alpha.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/fileeditorlspadapter.d.ts +15 -9
- package/lib/fileeditorlspadapter.js +45 -24
- package/lib/fileeditorlspadapter.js.map +1 -1
- package/lib/toc/latex.js +8 -3
- package/lib/toc/latex.js.map +1 -1
- package/lib/toc/markdown.js +5 -3
- package/lib/toc/markdown.js.map +1 -1
- package/lib/toc/python.js +3 -1
- package/lib/toc/python.js.map +1 -1
- package/package.json +15 -15
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import { CodeEditor } from '@jupyterlab/codeeditor';
|
|
2
1
|
import { CodeMirrorEditor } from '@jupyterlab/codemirror';
|
|
3
2
|
import { DocumentRegistry, IDocumentWidget } from '@jupyterlab/docregistry';
|
|
4
|
-
import { IAdapterOptions, IVirtualPosition, VirtualDocument, WidgetLSPAdapter } from '@jupyterlab/lsp';
|
|
3
|
+
import { Document, IAdapterOptions, IVirtualPosition, VirtualDocument, WidgetLSPAdapter } from '@jupyterlab/lsp';
|
|
5
4
|
import { FileEditor } from './widget';
|
|
6
5
|
export interface IFileEditorAdapterOptions extends IAdapterOptions {
|
|
7
6
|
/**
|
|
@@ -15,6 +14,10 @@ export declare class FileEditorAdapter extends WidgetLSPAdapter<IDocumentWidget<
|
|
|
15
14
|
* The wrapped `FileEditor` widget.
|
|
16
15
|
*/
|
|
17
16
|
readonly editor: FileEditor;
|
|
17
|
+
/**
|
|
18
|
+
* Promise that resolves once the adapter is initialized
|
|
19
|
+
*/
|
|
20
|
+
get ready(): Promise<void>;
|
|
18
21
|
/**
|
|
19
22
|
* Get current path of the document.
|
|
20
23
|
*/
|
|
@@ -34,7 +37,7 @@ export declare class FileEditorAdapter extends WidgetLSPAdapter<IDocumentWidget<
|
|
|
34
37
|
/**
|
|
35
38
|
* Get the activated CM editor.
|
|
36
39
|
*/
|
|
37
|
-
get activeEditor():
|
|
40
|
+
get activeEditor(): Document.IEditor;
|
|
38
41
|
/**
|
|
39
42
|
* Get the inner HTMLElement of the document widget.
|
|
40
43
|
*/
|
|
@@ -47,10 +50,11 @@ export declare class FileEditorAdapter extends WidgetLSPAdapter<IDocumentWidget<
|
|
|
47
50
|
* Get the list of CM editors in the document, there is only one editor
|
|
48
51
|
* in the case of file editor.
|
|
49
52
|
*/
|
|
50
|
-
get editors():
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
53
|
+
get editors(): Document.ICodeBlockOptions[];
|
|
54
|
+
/**
|
|
55
|
+
* Dispose the widget.
|
|
56
|
+
*/
|
|
57
|
+
dispose(): void;
|
|
54
58
|
/**
|
|
55
59
|
* Generate the virtual document associated with the document.
|
|
56
60
|
*/
|
|
@@ -69,14 +73,14 @@ export declare class FileEditorAdapter extends WidgetLSPAdapter<IDocumentWidget<
|
|
|
69
73
|
*
|
|
70
74
|
* @param ceEditor - instance of the code editor
|
|
71
75
|
*/
|
|
72
|
-
getEditorIndex(ceEditor:
|
|
76
|
+
getEditorIndex(ceEditor: Document.IEditor): number;
|
|
73
77
|
/**
|
|
74
78
|
* Get the wrapper of input editor.
|
|
75
79
|
*
|
|
76
80
|
* @param ceEditor
|
|
77
81
|
* @return {HTMLElement}
|
|
78
82
|
*/
|
|
79
|
-
getEditorWrapper(ceEditor:
|
|
83
|
+
getEditorWrapper(ceEditor: Document.IEditor): HTMLElement;
|
|
80
84
|
/**
|
|
81
85
|
* Initialization function called once the editor and the LSP connection
|
|
82
86
|
* manager is ready. This function will create the virtual document and
|
|
@@ -87,4 +91,6 @@ export declare class FileEditorAdapter extends WidgetLSPAdapter<IDocumentWidget<
|
|
|
87
91
|
* The document registry instance.
|
|
88
92
|
*/
|
|
89
93
|
private readonly _docRegistry;
|
|
94
|
+
private readonly _virtualEditor;
|
|
95
|
+
private _readyDelegate;
|
|
90
96
|
}
|
|
@@ -1,28 +1,32 @@
|
|
|
1
1
|
// Copyright (c) Jupyter Development Team.
|
|
2
2
|
// Distributed under the terms of the Modified BSD License.
|
|
3
|
-
var __rest = (this && this.__rest) || function (s, e) {
|
|
4
|
-
var t = {};
|
|
5
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
6
|
-
t[p] = s[p];
|
|
7
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
8
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
9
|
-
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
10
|
-
t[p[i]] = s[p[i]];
|
|
11
|
-
}
|
|
12
|
-
return t;
|
|
13
|
-
};
|
|
14
3
|
import { VirtualDocument, WidgetLSPAdapter } from '@jupyterlab/lsp';
|
|
4
|
+
import { PromiseDelegate } from '@lumino/coreutils';
|
|
15
5
|
export class FileEditorAdapter extends WidgetLSPAdapter {
|
|
16
6
|
constructor(editorWidget, options) {
|
|
17
|
-
const { docRegistry
|
|
7
|
+
const { docRegistry, ...others } = options;
|
|
18
8
|
super(editorWidget, others);
|
|
9
|
+
this._readyDelegate = new PromiseDelegate();
|
|
19
10
|
this.editor = editorWidget.content;
|
|
20
11
|
this._docRegistry = docRegistry;
|
|
21
|
-
|
|
22
|
-
|
|
12
|
+
// Ensure editor uniqueness
|
|
13
|
+
this._virtualEditor = Object.freeze({
|
|
14
|
+
getEditor: () => this.editor.editor,
|
|
15
|
+
ready: () => Promise.resolve(this.editor.editor),
|
|
16
|
+
reveal: () => Promise.resolve(this.editor.editor)
|
|
23
17
|
});
|
|
24
|
-
|
|
25
|
-
|
|
18
|
+
Promise.all([this.editor.context.ready, this.connectionManager.ready])
|
|
19
|
+
.then(async () => {
|
|
20
|
+
await this.initOnceReady();
|
|
21
|
+
this._readyDelegate.resolve();
|
|
22
|
+
})
|
|
23
|
+
.catch(console.error);
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* Promise that resolves once the adapter is initialized
|
|
27
|
+
*/
|
|
28
|
+
get ready() {
|
|
29
|
+
return this._readyDelegate.promise;
|
|
26
30
|
}
|
|
27
31
|
/**
|
|
28
32
|
* Get current path of the document.
|
|
@@ -34,7 +38,11 @@ export class FileEditorAdapter extends WidgetLSPAdapter {
|
|
|
34
38
|
* Get the mime type of the document.
|
|
35
39
|
*/
|
|
36
40
|
get mimeType() {
|
|
37
|
-
|
|
41
|
+
var _a;
|
|
42
|
+
const mimeTypeFromModel = this.editor.model.mimeType;
|
|
43
|
+
const codeMirrorMimeType = Array.isArray(mimeTypeFromModel)
|
|
44
|
+
? (_a = mimeTypeFromModel[0]) !== null && _a !== void 0 ? _a : 'text/plain'
|
|
45
|
+
: mimeTypeFromModel;
|
|
38
46
|
const contentsModel = this.editor.context.contentsModel;
|
|
39
47
|
// when MIME type is not known it defaults to 'text/plain',
|
|
40
48
|
// so if it is different we can accept it as it is
|
|
@@ -70,7 +78,7 @@ export class FileEditorAdapter extends WidgetLSPAdapter {
|
|
|
70
78
|
* Get the activated CM editor.
|
|
71
79
|
*/
|
|
72
80
|
get activeEditor() {
|
|
73
|
-
return this.
|
|
81
|
+
return this._virtualEditor;
|
|
74
82
|
}
|
|
75
83
|
/**
|
|
76
84
|
* Get the inner HTMLElement of the document widget.
|
|
@@ -89,7 +97,24 @@ export class FileEditorAdapter extends WidgetLSPAdapter {
|
|
|
89
97
|
* in the case of file editor.
|
|
90
98
|
*/
|
|
91
99
|
get editors() {
|
|
92
|
-
|
|
100
|
+
var _a, _b;
|
|
101
|
+
return [
|
|
102
|
+
{
|
|
103
|
+
ceEditor: this._virtualEditor,
|
|
104
|
+
type: 'code',
|
|
105
|
+
value: (_b = (_a = this.editor) === null || _a === void 0 ? void 0 : _a.model.sharedModel.getSource()) !== null && _b !== void 0 ? _b : ''
|
|
106
|
+
}
|
|
107
|
+
];
|
|
108
|
+
}
|
|
109
|
+
/**
|
|
110
|
+
* Dispose the widget.
|
|
111
|
+
*/
|
|
112
|
+
dispose() {
|
|
113
|
+
if (this.isDisposed) {
|
|
114
|
+
return;
|
|
115
|
+
}
|
|
116
|
+
this.editor.model.mimeTypeChanged.disconnect(this.reloadConnection);
|
|
117
|
+
super.dispose();
|
|
93
118
|
}
|
|
94
119
|
/**
|
|
95
120
|
* Generate the virtual document associated with the document.
|
|
@@ -140,14 +165,10 @@ export class FileEditorAdapter extends WidgetLSPAdapter {
|
|
|
140
165
|
* connect various signals.
|
|
141
166
|
*/
|
|
142
167
|
async initOnceReady() {
|
|
143
|
-
if (!this.editor.context.isReady) {
|
|
144
|
-
await this.editor.context.ready;
|
|
145
|
-
}
|
|
146
|
-
await this.connectionManager.ready;
|
|
147
168
|
this.initVirtual();
|
|
148
169
|
// connect the document, but do not open it as the adapter will handle this
|
|
149
170
|
// after registering all features
|
|
150
|
-
this.connectDocument(this.virtualDocument, false)
|
|
171
|
+
await this.connectDocument(this.virtualDocument, false);
|
|
151
172
|
this.editor.model.mimeTypeChanged.connect(this.reloadConnection, this);
|
|
152
173
|
}
|
|
153
174
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileeditorlspadapter.js","sourceRoot":"","sources":["../src/fileeditorlspadapter.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D
|
|
1
|
+
{"version":3,"file":"fileeditorlspadapter.js","sourceRoot":"","sources":["../src/fileeditorlspadapter.ts"],"names":[],"mappings":"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"}
|
package/lib/toc/latex.js
CHANGED
|
@@ -54,7 +54,9 @@ export class LaTeXTableOfContentsModel extends TableOfContentsModel {
|
|
|
54
54
|
return Promise.resolve(null);
|
|
55
55
|
}
|
|
56
56
|
// Split the text into lines:
|
|
57
|
-
const lines = this.widget.content.model.
|
|
57
|
+
const lines = this.widget.content.model.sharedModel
|
|
58
|
+
.getSource()
|
|
59
|
+
.split('\n');
|
|
58
60
|
const levels = new Array();
|
|
59
61
|
let previousLevel = levels.length;
|
|
60
62
|
const headings = new Array();
|
|
@@ -63,9 +65,12 @@ export class LaTeXTableOfContentsModel extends TableOfContentsModel {
|
|
|
63
65
|
if (match) {
|
|
64
66
|
const level = LATEX_LEVELS[match[1]];
|
|
65
67
|
if (level <= this.configuration.maximalDepth) {
|
|
66
|
-
const prefix = TableOfContentsUtils.getPrefix(level, previousLevel, levels,
|
|
68
|
+
const prefix = TableOfContentsUtils.getPrefix(level, previousLevel, levels, {
|
|
69
|
+
...this.configuration,
|
|
67
70
|
// Force base numbering and numbering first level
|
|
68
|
-
baseNumbering: 1,
|
|
71
|
+
baseNumbering: 1,
|
|
72
|
+
numberingH1: true
|
|
73
|
+
});
|
|
69
74
|
previousLevel = level;
|
|
70
75
|
headings.push({
|
|
71
76
|
text: match[2],
|
package/lib/toc/latex.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"latex.js","sourceRoot":"","sources":["../../src/toc/latex.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAG3D,OAAO,EAEL,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,4BAA4B,EAAkB,MAAM,WAAW,CAAC;AAEzE;;;;;;;;GAQG;AACH,MAAM,YAAY,GAAgC;IAChD,IAAI,EAAE,CAAC;IACP,OAAO,EAAE,CAAC;IACV,OAAO,EAAE,CAAC;IACV,UAAU,EAAE,CAAC;IACb,aAAa,EAAE,CAAC;IAChB,SAAS,EAAE,CAAC;IACZ,YAAY,EAAE,CAAC;CAChB,CAAC;AAEF;;GAEG;AACH,MAAM,QAAQ,GAAG,gDAAgD,CAAC;AAElE;;GAEG;AACH,MAAM,OAAO,yBAA0B,SAAQ,oBAG9C;IACC;;;;;;OAMG;IACH,IAAI,YAAY;QACd,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;OAEG;IACH,IAAI,gBAAgB;QAClB,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;IAC3C,CAAC;IAED;;;;OAIG;IACO,WAAW;QACnB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC9B;QAED,6BAA6B;QAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"latex.js","sourceRoot":"","sources":["../../src/toc/latex.ts"],"names":[],"mappings":"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"}
|
package/lib/toc/markdown.js
CHANGED
|
@@ -25,11 +25,13 @@ export class MarkdownTableOfContentsModel extends TableOfContentsModel {
|
|
|
25
25
|
if (!this.isActive) {
|
|
26
26
|
return Promise.resolve(null);
|
|
27
27
|
}
|
|
28
|
-
const content = this.widget.content.model.
|
|
29
|
-
const headings = TableOfContentsUtils.Markdown.getHeadings(content
|
|
28
|
+
const content = this.widget.content.model.sharedModel.getSource();
|
|
29
|
+
const headings = TableOfContentsUtils.filterHeadings(TableOfContentsUtils.Markdown.getHeadings(content), {
|
|
30
|
+
...this.configuration,
|
|
30
31
|
// Force removing numbering as they cannot be displayed
|
|
31
32
|
// in the document
|
|
32
|
-
numberHeaders: false
|
|
33
|
+
numberHeaders: false
|
|
34
|
+
});
|
|
33
35
|
return Promise.resolve(headings);
|
|
34
36
|
}
|
|
35
37
|
}
|
package/lib/toc/markdown.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"markdown.js","sourceRoot":"","sources":["../../src/toc/markdown.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAG3D,OAAO,EAEL,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,4BAA4B,EAAkB,MAAM,WAAW,CAAC;AAEzE;;GAEG;AACH,MAAM,OAAO,4BAA6B,SAAQ,oBAGjD;IACC;;;;;;OAMG;IACH,IAAI,YAAY;QACd,OAAO,UAAU,CAAC;IACpB,CAAC;IAED;;;;OAIG;IACO,WAAW;QACnB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC9B;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"markdown.js","sourceRoot":"","sources":["../../src/toc/markdown.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAG3D,OAAO,EAEL,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,4BAA4B,EAAkB,MAAM,WAAW,CAAC;AAEzE;;GAEG;AACH,MAAM,OAAO,4BAA6B,SAAQ,oBAGjD;IACC;;;;;;OAMG;IACH,IAAI,YAAY;QACd,OAAO,UAAU,CAAC;IACpB,CAAC;IAED;;;;OAIG;IACO,WAAW;QACnB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC9B;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;QAElE,MAAM,QAAQ,GAAG,oBAAoB,CAAC,cAAc,CAClD,oBAAoB,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,EAClD;YACE,GAAG,IAAI,CAAC,aAAa;YACrB,uDAAuD;YACvD,kBAAkB;YAClB,aAAa,EAAE,KAAK;SACrB,CACF,CAAC;QACF,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,8BAA+B,SAAQ,4BAA4B;IAC9E;;;;;OAKG;IACH,YAAY,CAAC,MAAc;;QACzB,MAAM,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAEhD,IAAI,YAAY,EAAE;YAChB,IAAI,IAAI,GAAG,MAAA,MAAC,MAAc,CAAC,OAAO,0CAAE,KAAK,0CAAE,QAAQ,CAAC;YACpD,OAAO,IAAI,IAAI,oBAAoB,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;SAC/D;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;;OAMG;IACO,UAAU,CAClB,MAA4D,EAC5D,aAAuC;QAEvC,OAAO,IAAI,4BAA4B,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACjE,CAAC;CACF"}
|
package/lib/toc/python.js
CHANGED
|
@@ -39,7 +39,9 @@ export class PythonTableOfContentsModel extends TableOfContentsModel {
|
|
|
39
39
|
return Promise.resolve(null);
|
|
40
40
|
}
|
|
41
41
|
// Split the text into lines:
|
|
42
|
-
const lines = this.widget.content.model.
|
|
42
|
+
const lines = this.widget.content.model.sharedModel
|
|
43
|
+
.getSource()
|
|
44
|
+
.split('\n');
|
|
43
45
|
// Iterate over the lines to get the heading level and text for each line:
|
|
44
46
|
let headings = new Array();
|
|
45
47
|
let processingImports = false;
|
package/lib/toc/python.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"python.js","sourceRoot":"","sources":["../../src/toc/python.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAK3D,OAAO,EAAmB,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAGxE,OAAO,EAAE,4BAA4B,EAAkB,MAAM,WAAW,CAAC;AAEzE;;GAEG;AACH,IAAI,QAAgB,CAAC;AACrB,IAAI;IACF,qEAAqE;IACrE,kFAAkF;IAClF,4EAA4E;IAC5E,QAAQ,GAAG,IAAI,MAAM,CAAC,kCAAkC,EAAE,GAAG,CAAC,CAAC;CAChE;AAAC,WAAM;IACN,QAAQ,GAAG,IAAI,MAAM,CAAC,kCAAkC,CAAC,CAAC;CAC3D;AAED;;GAEG;AACH,MAAM,OAAO,0BAA2B,SAAQ,oBAG/C;IACC;;;;;;OAMG;IACH,IAAI,YAAY;QACd,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;;OAIG;IACO,KAAK,CAAC,WAAW;QACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC9B;QAED,6BAA6B;QAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"python.js","sourceRoot":"","sources":["../../src/toc/python.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jupyterlab/fileeditor",
|
|
3
|
-
"version": "4.0.0-alpha.
|
|
3
|
+
"version": "4.0.0-alpha.15",
|
|
4
4
|
"description": "JupyterLab - Editor Widget",
|
|
5
5
|
"homepage": "https://github.com/jupyterlab/jupyterlab",
|
|
6
6
|
"bugs": {
|
|
@@ -39,24 +39,24 @@
|
|
|
39
39
|
"watch": "tsc -b --watch"
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@jupyterlab/apputils": "^4.0.0-alpha.
|
|
43
|
-
"@jupyterlab/codeeditor": "^4.0.0-alpha.
|
|
44
|
-
"@jupyterlab/codemirror": "^4.0.0-alpha.
|
|
45
|
-
"@jupyterlab/docregistry": "^4.0.0-alpha.
|
|
46
|
-
"@jupyterlab/documentsearch": "^4.0.0-alpha.
|
|
47
|
-
"@jupyterlab/lsp": "^4.0.0-alpha.
|
|
48
|
-
"@jupyterlab/statusbar": "^4.0.0-alpha.
|
|
49
|
-
"@jupyterlab/toc": "^6.0.0-alpha.
|
|
50
|
-
"@jupyterlab/translation": "^4.0.0-alpha.
|
|
51
|
-
"@jupyterlab/ui-components": "^4.0.0-alpha.
|
|
52
|
-
"@lumino/coreutils": "^2.0.0-alpha.
|
|
53
|
-
"@lumino/messaging": "^2.0.0-alpha.
|
|
54
|
-
"@lumino/widgets": "^2.0.0-alpha.
|
|
42
|
+
"@jupyterlab/apputils": "^4.0.0-alpha.15",
|
|
43
|
+
"@jupyterlab/codeeditor": "^4.0.0-alpha.15",
|
|
44
|
+
"@jupyterlab/codemirror": "^4.0.0-alpha.15",
|
|
45
|
+
"@jupyterlab/docregistry": "^4.0.0-alpha.15",
|
|
46
|
+
"@jupyterlab/documentsearch": "^4.0.0-alpha.15",
|
|
47
|
+
"@jupyterlab/lsp": "^4.0.0-alpha.15",
|
|
48
|
+
"@jupyterlab/statusbar": "^4.0.0-alpha.15",
|
|
49
|
+
"@jupyterlab/toc": "^6.0.0-alpha.15",
|
|
50
|
+
"@jupyterlab/translation": "^4.0.0-alpha.15",
|
|
51
|
+
"@jupyterlab/ui-components": "^4.0.0-alpha.30",
|
|
52
|
+
"@lumino/coreutils": "^2.0.0-alpha.6",
|
|
53
|
+
"@lumino/messaging": "^2.0.0-alpha.6",
|
|
54
|
+
"@lumino/widgets": "^2.0.0-alpha.6",
|
|
55
55
|
"react": "^17.0.1",
|
|
56
56
|
"regexp-match-indices": "^1.0.2"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
|
-
"@jupyterlab/testutils": "^4.0.0-alpha.
|
|
59
|
+
"@jupyterlab/testutils": "^4.0.0-alpha.15",
|
|
60
60
|
"@types/jest": "^26.0.10",
|
|
61
61
|
"jest": "^26.4.2",
|
|
62
62
|
"rimraf": "~3.0.0",
|