Skip to content

Commit 8654f4e

Browse files
authored
Load static resources in nb renderer for widgets (#13531)
1 parent 8e89c53 commit 8654f4e

File tree

4 files changed

+20
-33
lines changed

4 files changed

+20
-33
lines changed

build/webpack/webpack.datascience-ui.config.builder.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ function getEntry(bundle) {
2727
};
2828
case 'ipywidgetsKernel':
2929
return {
30-
ipywidgetsKernel: [`./src/webviews/webview-side/ipywidgets/kernel/index.ts`],
31-
dummy: [`./src/webviews/webview-side/ipywidgets/dummy.ts`]
30+
ipywidgetsKernel: [`./src/webviews/webview-side/ipywidgets/kernel/index.ts`]
3231
};
3332
case 'ipywidgetsRenderer':
3433
// This is only used in tests (not shipped with extension).

package.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1880,10 +1880,16 @@
18801880
"notebookPreload": [
18811881
{
18821882
"type": "jupyter-notebook",
1883+
"localResourceRoots": [
1884+
"./temp"
1885+
],
18831886
"entrypoint": "./out/webviews/webview-side/ipywidgetsKernel/ipywidgetsKernel.js"
18841887
},
18851888
{
18861889
"type": "interactive",
1890+
"localResourceRoots": [
1891+
"./temp"
1892+
],
18871893
"entrypoint": "./out/webviews/webview-side/ipywidgetsKernel/ipywidgetsKernel.js"
18881894
}
18891895
],

src/notebooks/controllers/vscodeNotebookController.ts

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -514,30 +514,26 @@ export class VSCodeNotebookController implements Disposable, IVSCodeNotebookCont
514514
);
515515
}
516516
private getRendererScripts(): NotebookRendererScript[] {
517-
const scripts: Uri[] = [];
518-
519517
// Only used in tests & while debugging.
520518
if (
521519
this.context.extensionMode === ExtensionMode.Development ||
522520
this.context.extensionMode === ExtensionMode.Test
523521
) {
524-
scripts.push(
525-
Uri.joinPath(
526-
this.context.extensionUri,
527-
'out',
528-
'webviews',
529-
'webview-side',
530-
'widgetTester',
531-
'widgetTester.js'
522+
return [
523+
new NotebookRendererScript(
524+
Uri.joinPath(
525+
this.context.extensionUri,
526+
'out',
527+
'webviews',
528+
'webview-side',
529+
'widgetTester',
530+
'widgetTester.js'
531+
)
532532
)
533-
);
533+
];
534+
} else {
535+
return [];
534536
}
535-
536-
// See comments on dummy.ts for more details.
537-
scripts.push(
538-
Uri.joinPath(this.context.extensionUri, 'out', 'webviews', 'webview-side', 'ipywidgetsKernel', 'dummy.js')
539-
);
540-
return scripts.map((uri) => new NotebookRendererScript(uri));
541537
}
542538

543539
private handleInterrupt(notebook: NotebookDocument) {

src/webviews/webview-side/ipywidgets/dummy.ts

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)