address all the feedback.

Author: Artmann

build/fix-telemetry-imports.mjs

@@ -38,14 +38,14 @@ function fixTelemetryImports(content) {
     // Fix: './telemetry/index' -> './telemetry' (top-level telemetry.ts file)
     // Fix: '../telemetry/index' -> '../telemetry'
     // Fix: '../../telemetry/index' -> '../../telemetry' etc.
-    const pattern = /(from\s+['"])((?:\.\.\/?)+)telemetry\/index(['"'])/g;
+    const pattern = /(from\s+['"])((?:\.\.?\/)+)telemetry\/index(['"'])/g;
     modified = modified.replace(pattern, (match, before, dots, after) => {
         changeCount++;
         return `${before}${dots}telemetry${after}`;
     });
 
     // Fix the double path: './platform/telemetry/telemetry/index' -> './platform/telemetry'
-    const doublePath = /(from\s+['"])((?:\.\.\/?)+)platform\/telemetry\/telemetry\/index(['"'])/g;
+    const doublePath = /(from\s+['"])((?:\.\.?\/)+)platform\/telemetry\/telemetry\/index(['"'])/g;
     modified = modified.replace(doublePath, (match, before, dots, after) => {
         changeCount++;
         return `${before}${dots}platform/telemetry${after}`;
@@ -80,7 +80,7 @@ async function main() {
     console.log(`🔗 Fixed ${totalImportsFixed} telemetry import${totalImportsFixed !== 1 ? 's' : ''}`);
 }
 
-main().catch(error => {
+main().catch((error) => {
     console.error('❌ Error:', error);
     process.exit(1);
 });

build/preDebugWebTest.js

@@ -6,10 +6,9 @@ import path from 'node:path';
 import { startJupyter } from './preLaunchWebTest.js';
 import jsonc from 'jsonc-parser';
 import { fileURLToPath } from 'node:url';
-import { dirname } from 'node:path';
 
 const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
+const __dirname = path.dirname(__filename);
 
 const settingsFile = path.join(__dirname, '..', 'src', 'test', 'datascience', '.vscode', 'settings.json');
 

build/preLaunchWebTest.js

@@ -5,10 +5,9 @@ import path from 'node:path';
 import jupyterServer from '../out/test/datascience/jupyterServer.node.js';
 import fs from 'fs-extra';
 import { fileURLToPath } from 'node:url';
-import { dirname } from 'node:path';
 
 const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
+const __dirname = path.dirname(__filename);
 
 export async function startJupyter(detached) {
     const server = jupyterServer.JupyterServer.instance;

build/remove-js-extensions.mjs

@@ -23,7 +23,7 @@ async function getAllTsFiles(dir) {
             if (!['node_modules', 'out', 'dist', '.git', '.vscode', 'resources'].includes(entry.name)) {
                 files.push(...(await getAllTsFiles(fullPath)));
             }
-        } else if (entry.name.endsWith('.ts') || entry.name.endsWith('.tsx')) {
+        } else if ((entry.name.endsWith('.ts') || entry.name.endsWith('.tsx')) && !entry.name.endsWith('.d.ts')) {
             files.push(fullPath);
         }
     }
@@ -42,7 +42,7 @@ function removeJsExtensions(content) {
         // import ... from './path.js' or '../path.js'
         /(\bfrom\s+['"])(\.\/?[^'"]+)\.js(['"])/g,
         // import('./path.js') or import('../path.js')
-        /(\bimport\s*\(\s*['"])(\.\/?[^'"]+)\.js(['"])/g,
+        /(\bimport\s*\(\s*['"])(\.\/?[^'"]+)\.js(['"])/g
     ];
 
     for (const pattern of patterns) {
@@ -81,7 +81,7 @@ async function main() {
     console.log(`🔗 Removed ${totalExtensionsRemoved} .js extension${totalExtensionsRemoved !== 1 ? 's' : ''}`);
 }
 
-main().catch(error => {
+main().catch((error) => {
     console.error('❌ Error:', error);
     process.exit(1);
 });

gulpfile.js

@@ -21,12 +21,11 @@ import { dumpTestSummary } from './build/webTestReporter.js';
 import { Validator } from 'jsonschema';
 import * as common from './build/webpack/common.js';
 import * as jsonc from 'jsonc-parser';
+import { isCI } from './build/constants.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-const isCI = process.env.TF_BUILD !== undefined || process.env.GITHUB_ACTIONS === 'true';
-
 gulp.task('createNycFolder', async (done) => {
     try {
         fs.mkdirSync(path.join(__dirname, '.nyc_output'));

package.json

@@ -2209,7 +2209,7 @@
                 "displayName": "Deepnote Vega Chart Renderer",
                 "entrypoint": "./dist/webviews/webview-side/vegaRenderer/vegaRenderer.js",
                 "mimeTypes": [
-                    "application/vnd.vega.v5+json"
+                    "application/vnd.vega.v6+json"
                 ],
                 "requiresMessaging": "optional"
             },

src/kernels/deepnote/environments/deepnoteEnvironmentsView.unit.test.ts

@@ -360,6 +360,8 @@ suite('DeepnoteEnvironmentsView', () => {
             assert.strictEqual(capturedOptions.description, 'Environment for data science work');
             // Don't assert on pythonInterpreter.id as the helper functions transform it
             assert.ok(capturedOptions.pythonInterpreter, 'Python interpreter should be provided');
+            assert.ok(capturedOptions.pythonInterpreter.uri, 'Python interpreter uri should be present');
+            assert.ok(capturedOptions.pythonInterpreter.id, 'Python interpreter id should be present');
             assert.ok(capturedToken, 'Cancellation token should be provided');
 
             // Verify success message was shown

src/kernels/execution/notebookUpdater.ts

@@ -58,12 +58,15 @@ function clearPendingChainedUpdatesForTestsImpl() {
     }
 }
 
-// Export through a mutable object to allow stubbing in ESM tests
+// Export through a mutable object to allow stubbing in ESM tests.
+// This object is intentionally mutable - tests can replace these functions
+// by reassigning properties on notebookUpdaterUtils, which is necessary
+// because ESM modules are read-only and direct exports cannot be stubbed.
 export const notebookUpdaterUtils = {
     chainWithPendingUpdates: chainWithPendingUpdatesImpl,
     clearPendingChainedUpdatesForTests: clearPendingChainedUpdatesForTestsImpl
 };
 
-// Keep original exports for backwards compatibility
+// Standalone exports for backwards compatibility
 export const chainWithPendingUpdates = notebookUpdaterUtils.chainWithPendingUpdates;
 export const clearPendingChainedUpdatesForTests = notebookUpdaterUtils.clearPendingChainedUpdatesForTests;

src/kernels/kernelDependencyService.node.ts

@@ -114,9 +114,9 @@ export class KernelDependencyService implements IKernelDependencyService {
         let promise = this.installPromises.get(key);
         let cancelTokenSource: CancellationTokenSource | undefined;
         if (!promise) {
-            const cancelTokenSource = new CancellationTokenSource();
+            cancelTokenSource = new CancellationTokenSource();
             const disposable = token.onCancellationRequested(() => {
-                cancelTokenSource.cancel();
+                cancelTokenSource!.cancel();
                 disposable.dispose();
             });
             const install = async () => {
@@ -133,7 +133,7 @@ export class KernelDependencyService implements IKernelDependencyService {
                     resource,
                     kernelConnection.interpreter!,
                     ui,
-                    cancelTokenSource,
+                    cancelTokenSource!,
                     cannotChangeKernels,
                     installWithoutPrompting
                 );
@@ -148,7 +148,7 @@ export class KernelDependencyService implements IKernelDependencyService {
             promise
                 .finally(() => {
                     disposable.dispose();
-                    cancelTokenSource.dispose();
+                    cancelTokenSource!.dispose();
                 })
                 .catch(noop);
             this.installPromises.set(key, promise);

src/kernels/raw/session/rawSessionConnection.node.ts

@@ -45,10 +45,7 @@ export class RawSessionConnection implements Session.ISessionConnection {
         return this._kernel?.connectionStatus || 'disconnected';
     }
     get serverSettings(): ServerConnection.ISettings {
-        // We do not expect anyone to use this. Hence return a setting thats now expected to work, but at least compiles.
-        return ServerConnection.makeSettings({
-            wsUrl: 'RAW'
-        });
+        throw new Error('serverSettings is not implemented for raw kernel connections');
     }
     get model(): Session.IModel {
         return {
@@ -166,16 +163,16 @@ export class RawSessionConnection implements Session.ISessionConnection {
     }
 
     public setPath(_path: string): Promise<void> {
-        throw new Error('Not yet implemented');
+        throw new Error('setPath is not implemented for raw kernel connections');
     }
     public setName(_name: string): Promise<void> {
-        throw new Error('Not yet implemented');
+        throw new Error('setName is not implemented for raw kernel connections');
     }
     public setType(_type: string): Promise<void> {
-        throw new Error('Not yet implemented');
+        throw new Error('setType is not implemented for raw kernel connections');
     }
     public changeKernel(_options: Partial<Kernel.IModel>): Promise<Kernel.IKernelConnection> {
-        throw new Error('Not yet implemented');
+        throw new Error('changeKernel is not implemented for raw kernel connections');
     }
 
     private onIOPubMessage(_sender: Kernel.IKernelConnection, msg: KernelMessage.IIOPubMessage) {