Recovery release for fixing ipywidgets (#16018)

* Restore widget files storage dir to extension dir (#16012)

* Restore widget files storage dir to extension dir

* update comments

* Fix tests

* Fix tests

* Bump version

Author: DonJayamanne

package-lock.json

@@ -1,7 +1,7 @@
 {
     "name": "jupyter",
     "displayName": "Jupyter",
-    "version": "2024.8.0",
+    "version": "2024.8.1",
     "description": "Jupyter notebook support, interactive programming and computing that supports Intellisense, debugging and more.",
     "publisher": "ms-toolsai",
     "author": {

package.json

@@ -13,7 +13,6 @@ import { BaseIPyWidgetScriptManager } from './baseIPyWidgetScriptManager';
 import { IIPyWidgetScriptManager, INbExtensionsPathProvider } from '../types';
 import { JupyterPaths } from '../../../../kernels/raw/finder/jupyterPaths.node';
 import { logger } from '../../../../platform/logging';
-import { getExtensionTempDir } from '../../../../platform/common/temp';
 
 type KernelConnectionId = string;
 /**
@@ -75,7 +74,7 @@ export class LocalIPyWidgetScriptManager extends BaseIPyWidgetScriptManager impl
                 return;
             }
             const kernelHash = await getTelemetrySafeHashedString(this.kernel.kernelConnectionMetadata.id);
-            const baseUrl = Uri.joinPath(getExtensionTempDir(this.context), 'scripts', kernelHash, 'jupyter');
+            const baseUrl = Uri.joinPath(this.context.extensionUri, 'temp', 'scripts', kernelHash, 'jupyter');
 
             const targetNbExtensions = Uri.joinPath(baseUrl, 'nbextensions');
             const [jupyterDataDirectories] = await Promise.all([

src/notebooks/controllers/ipywidgets/scriptSourceProvider/localIPyWidgetScriptManager.node.ts

@@ -6,8 +6,8 @@ import { Uri, ViewColumn, WebviewOptions, WebviewPanel as vscodeWebviewPanel, wi
 import { IWebviewPanel, IWebviewPanelOptions, IWebviewPanelProvider } from '../common/application/types';
 import { IFileSystem } from '../common/platform/types';
 import { IDisposableRegistry, IExtensionContext } from '../common/types';
+import * as path from '../vscode-path/path';
 import { Webview } from './webview';
-import { getExtensionTempDir } from '../common/temp';
 
 class WebviewPanel extends Webview implements IWebviewPanel {
     private get panel(): vscodeWebviewPanel | undefined {
@@ -120,9 +120,9 @@ export class WebviewPanelProvider implements IWebviewPanelProvider {
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     public async create(options: IWebviewPanelOptions): Promise<IWebviewPanel> {
-        // Allow loading resources from the `<extension global storage folder>/<version>` folder when in webiviews.
+        // Allow loading resources from the `<extension folder>/temp` folder when in webiviews.
         // Used by widgets to place files that are not otherwise accessible.
-        const additionalRootPaths = [getExtensionTempDir(this.context)];
+        const additionalRootPaths = [Uri.file(path.join(this.context.extensionPath, 'temp'))];
         if (Array.isArray(options.additionalPaths)) {
             additionalRootPaths.push(...options.additionalPaths);
         }

src/platform/webviews/webviewPanelProvider.ts

@@ -31,7 +31,6 @@ import { createActiveInterpreterController } from '../notebook/helpers';
 import { IInterpreterService } from '../../../platform/interpreter/contracts';
 import { IControllerRegistration } from '../../../notebooks/controllers/types';
 import { HttpClient } from '../../../platform/common/net/httpClient';
-import { getExtensionTempDir } from '../../../platform/common/temp';
 
 suite('IPyWidget Script Manager @widgets', function () {
     this.timeout(120_000);
@@ -121,7 +120,8 @@ suite('IPyWidget Script Manager @widgets', function () {
                 assert.fail('We should have started a Python kernel');
             } else {
                 const expectedDir = Uri.joinPath(
-                    getExtensionTempDir(context),
+                    context.extensionUri,
+                    'temp',
                     'scripts',
                     await getTelemetrySafeHashedString(kernel.kernelConnectionMetadata.id),
                     'jupyter'
@@ -140,7 +140,8 @@ suite('IPyWidget Script Manager @widgets', function () {
             return this.skip();
         }
         const expectedDir = Uri.joinPath(
-            getExtensionTempDir(context),
+            context.extensionUri,
+            'temp',
             'scripts',
             await getTelemetrySafeHashedString(kernel.kernelConnectionMetadata.id),
             'jupyter'
@@ -156,7 +157,7 @@ suite('IPyWidget Script Manager @widgets', function () {
         // await del([nbExtensionsFolder]);
         const fsNode = api.serviceContainer.get<IFileSystemNode>(IFileSystemNode);
         // eslint-disable-next-line local-rules/dont-use-fspath
-        await fsNode.delete(Uri.file(nbExtensionsFolder.fsPath));
+        await fsNode.delete(nbExtensionsFolder);
         assert.isFalse(await fs.exists(nbExtensionsFolder), `Directory '${nbExtensionsFolder}'does not exist`);
 
         await kernel.restart();