Fix ci

.github/workflows/continuous-integration.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v6
         with:
-          node-version: '20'
+          node-version: '22'
           cache: 'yarn'
 
       - name: Turbo cache

.github/workflows/cross-platform-test.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v6
         with:
-          node-version: '20'
+          node-version: '22'
           cache: yarn
 
       - name: Turbo cache

.github/workflows/dvc-cli-output-test.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v6
         with:
-          node-version: '20'
+          node-version: '22'
           cache: yarn
 
       - run: yarn install

.github/workflows/end-to-end-test.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v6
         with:
-          node-version: '20'
+          node-version: '22'
           cache: 'yarn'
 
       - name: Clean Up Disk Space

.github/workflows/publish.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v6
         with:
-          node-version: '20'
+          node-version: '22'
           cache: 'yarn'
 
       - run: yarn install

extension/package.json

@@ -39,8 +39,8 @@
     "theme": "dark"
   },
   "engines": {
-    "vscode": "^1.90.0",
-    "node": ">=20"
+    "vscode": "^1.101.0",
+    "node": ">=22"
   },
   "activationEvents": [
     "onStartupFinished",
@@ -1645,11 +1645,11 @@
     "@types/lodash.omit": "4.5.9",
     "@types/mocha": "10.0.10",
     "@types/mock-require": "3.0.0",
-    "@types/node": "20.x",
+    "@types/node": "22.x",
     "@types/sinon-chai": "4.0.0",
     "@types/uuid": "10.0.0",
     "@types/vega": "3.2.0",
-    "@types/vscode": "1.90.0",
+    "@types/vscode": "1.101.0",
     "@vscode/test-electron": "2.5.2",
     "@vscode/vsce": "3.7.1",
     "@wdio/cli": "8.46.0",

extension/src/repository/model/index.test.ts

@@ -63,14 +63,20 @@ describe('RepositoryModel', () => {
           untracked: new Set()
         })
 
-      expect(scmDecorationState).toStrictEqual({
-        committedAdded: emptySet,
-        committedDeleted: makeAbsPathSet(dvcDemoPath, deleted),
-        committedModified: makeAbsPathSet(dvcDemoPath, output),
-        committedRenamed: makeAbsPathSet(dvcDemoPath, renamed),
-        committedUnknown: emptySet,
-        notInCache: emptySet,
-        tracked: makeAbsPathSet(
+      expect(scmDecorationState.committedAdded).toStrictEqual(new Set())
+      expect(scmDecorationState.committedDeleted).toStrictEqual(
+        makeAbsPathSet(dvcDemoPath, deleted)
+      )
+      expect(scmDecorationState.committedModified).toStrictEqual(
+        makeAbsPathSet(dvcDemoPath, output)
+      )
+      expect(scmDecorationState.committedRenamed).toStrictEqual(
+        makeAbsPathSet(dvcDemoPath, renamed)
+      )
+      expect(scmDecorationState.committedUnknown).toStrictEqual(new Set())
+      expect(scmDecorationState.notInCache).toStrictEqual(new Set())
+      expect(scmDecorationState.tracked).toStrictEqual(
+        makeAbsPathSet(
           dvcDemoPath,
           predictions,
           deleted,
@@ -81,20 +87,22 @@ describe('RepositoryModel', () => {
           scalarDir,
           logAcc,
           logLoss
-        ),
-        uncommittedAdded: emptySet,
-        uncommittedDeleted: emptySet,
-        uncommittedModified: makeAbsPathSet(
+        )
+      )
+      expect(scmDecorationState.uncommittedAdded).toStrictEqual(new Set())
+      expect(scmDecorationState.uncommittedDeleted).toStrictEqual(new Set())
+      expect(scmDecorationState.uncommittedModified).toStrictEqual(
+        makeAbsPathSet(
           dvcDemoPath,
           rawDataDir,
           logDir,
           scalarDir,
           logAcc,
           logLoss
-        ),
-        uncommittedRenamed: emptySet,
-        uncommittedUnknown: emptySet
-      })
+        )
+      )
+      expect(scmDecorationState.uncommittedRenamed).toStrictEqual(new Set())
+      expect(scmDecorationState.uncommittedUnknown).toStrictEqual(new Set())
 
       expect(sourceControlManagementState).toStrictEqual({
         committed: [
@@ -160,20 +168,16 @@ describe('RepositoryModel', () => {
 
       const absNotInCache = makeAbsPathSet(dvcDemoPath, ...notInCache)
 
-      expect(scmDecorationState).toStrictEqual({
-        committedAdded: emptySet,
-        committedDeleted: emptySet,
-        committedModified: emptySet,
-        committedRenamed: emptySet,
-        committedUnknown: emptySet,
-        notInCache: absNotInCache,
-        tracked: absNotInCache,
-        uncommittedAdded: emptySet,
-        uncommittedDeleted: absNotInCache,
-        uncommittedModified: emptySet,
-        uncommittedRenamed: emptySet,
-        uncommittedUnknown: emptySet
-      })
+      for (const [key, value] of Object.entries(scmDecorationState)) {
+        if (!(key in ['notInCache', 'tracked', 'notInCache'])) {
+          continue
+        }
+        expect(value).toStrictEqual(emptySet)
+      }
+
+      expect(scmDecorationState.tracked).toStrictEqual(absNotInCache)
+      expect(scmDecorationState.notInCache).toStrictEqual(absNotInCache)
+      expect(scmDecorationState.uncommittedDeleted).toStrictEqual(absNotInCache)
 
       const notInCacheScm = notInCache.map(path => ({
         contextValue: SourceControlDataStatus.NOT_IN_CACHE,
@@ -206,20 +210,15 @@ describe('RepositoryModel', () => {
           untracked: new Set()
         })
 
-      expect(scmDecorationState).toStrictEqual({
-        committedAdded: emptySet,
-        committedDeleted: emptySet,
-        committedModified: emptySet,
-        committedRenamed: emptySet,
-        committedUnknown: emptySet,
-        notInCache: emptySet,
-        tracked: makeAbsPathSet(dvcDemoPath, rawDataDir, data),
-        uncommittedAdded: emptySet,
-        uncommittedDeleted: emptySet,
-        uncommittedModified: emptySet,
-        uncommittedRenamed: emptySet,
-        uncommittedUnknown: emptySet
-      })
+      for (const [key, value] of Object.entries(scmDecorationState)) {
+        if (key === 'tracked') {
+          continue
+        }
+        expect(value).toStrictEqual(emptySet)
+      }
+      expect(scmDecorationState.tracked).toStrictEqual(
+        makeAbsPathSet(dvcDemoPath, rawDataDir, data)
+      )
 
       expect(sourceControlManagementState).toStrictEqual({
         committed: [],

extension/src/test/suite/experiments/data/index.test.ts

@@ -349,7 +349,7 @@ suite('Experiments Data Test Suite', () => {
             expect(data).to.deep.equal({
               live: [],
               pushed: [],
-              view_url: mockBaseStudioUrl
+              viewUrl: mockBaseStudioUrl
             })
           }
         })
@@ -393,7 +393,7 @@ suite('Experiments Data Test Suite', () => {
             expect(data).to.deep.equal({
               live: [],
               pushed: [],
-              view_url: mockBaseStudioUrl
+              viewUrl: mockBaseStudioUrl
             })
           }
         })

extension/src/test/suite/pipeline/index.test.ts

@@ -25,7 +25,8 @@ suite('Pipeline Test Suite', () => {
     restore()
   })
 
-  afterEach(() => {
+  afterEach(function () {
+    disposable.dispose()
     return closeAllEditors()
   })
 

extension/src/test/suite/plots/index.test.ts

@@ -5,7 +5,6 @@ import { restore, spy, stub } from 'sinon'
 import { commands, TextDocument, Uri, window } from 'vscode'
 import isEqual from 'lodash.isequal'
 import { buildPlots, buildPlotsWebview } from '../plots/util'
-import { Disposable } from '../../../extension'
 import expShowFixtureWithoutErrors from '../../fixtures/expShow/base/noErrors'
 import gitLogFixture from '../../fixtures/expShow/base/gitLog'
 import rowOrderFixture from '../../fixtures/expShow/base/rowOrder'
@@ -19,6 +18,7 @@ import {
   closeAllEditors,
   getFirstArgOfLastCall,
   getMockNow,
+  getTimeSafeDisposer,
   waitForSpyCall
 } from '../util'
 import { dvcDemoPath } from '../../util'
@@ -57,15 +57,15 @@ import * as External from '../../../vscode/external'
 import { PlotPath } from '../../../plots/paths/collect'
 
 suite('Plots Test Suite', () => {
-  const disposable = Disposable.fn()
+  const disposable = getTimeSafeDisposer()
 
   beforeEach(() => {
     restore()
   })
 
-  afterEach(function () {
+  afterEach(async function () {
     this.timeout(6000)
-    disposable.dispose()
+    await disposable.disposeAndFlush()
     return closeAllEditors()
   })
 
@@ -559,7 +559,7 @@ suite('Plots Test Suite', () => {
       expect(messageSpy).to.be.calledWithExactly({
         custom: customPlotsFixture
       })
-    }).timeout(WEBVIEW_TEST_TIMEOUT)
+    }).timeout(30000)
 
     it('should handle refresh plots message from the webview for the comparison table', async () => {
       const { mockMessageReceived, messageSpy } = await buildPlotsWebview({

extension/src/test/suite/timeouts.ts

@@ -1,3 +1,3 @@
-export const WEBVIEW_TEST_TIMEOUT = 16000
+export const WEBVIEW_TEST_TIMEOUT = 20000
 
 export const WATCHER_TEST_TIMEOUT = 20000

extension/src/test/suite/util.ts

@@ -212,9 +212,8 @@ export const buildInternalCommands = (disposer: Disposer) => {
   const gitReader = disposer.track(new GitReader())
   const gitExecutor = disposer.track(new GitExecutor())
 
-  const outputChannel = disposer.track(
-    new OutputChannel([dvcReader], '1', 'test output')
-  )
+  // not tracked due to https://github.com/microsoft/vscode/issues/232559
+  const outputChannel = new OutputChannel([dvcReader], '1', 'test output')
 
   const internalCommands = disposer.track(
     new InternalCommands(

package.json

@@ -68,6 +68,7 @@
   },
   "resolutions": {
     "@types/react": "18.3.27",
+    "@vscode/test-electron": "3.1.0",
     "**/recursive-readdir/minimatch": "9.0.7",
     "decode-uri-component": "0.2.2",
     "express": "5.2.0",
@@ -77,7 +78,6 @@
     "loader-utils": "2.0.4",
     "postcss": "^8.4.31",
     "terser": "5.37.0",
-    "trim-newlines": "5.0.0",
     "trim": "1.0.1",
     "undici": "5.29.0"
   },

webview/src/shared/components/icons/Add.tsx

@@ -9,7 +9,7 @@ const Add = (props: SVGProps<SVGSVGElement>) => (
     fill="currentColor"
     {...props}
   >
-    <path d="M14 7v1H8v6H7V8H1V7h6V1h1v6h6z" />
+    <path d="M8 1.5C8 1.22386 7.77614 1 7.5 1C7.22386 1 7 1.22386 7 1.5V7H1.5C1.22386 7 1 7.22386 1 7.5C1 7.77614 1.22386 8 1.5 8H7V13.5C7 13.7761 7.22386 14 7.5 14C7.77614 14 8 13.7761 8 13.5V8H13.5C13.7761 8 14 7.77614 14 7.5C14 7.22386 13.7761 7 13.5 7H8V1.5Z" />
   </svg>
 )
 export default Add

webview/src/shared/components/icons/ArrowDown.tsx

@@ -9,11 +9,7 @@ const ArrowDown = (props: SVGProps<SVGSVGElement>) => (
     fill="currentColor"
     {...props}
   >
-    <path
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M3.147 9l5 5h.707l5-5-.707-.707L9 12.439V2H8v10.44L3.854 8.292 3.147 9z"
-    />
+    <path d="M8.5 2.5C8.5 2.22386 8.27615 2 8 2C7.72386 2 7.5 2.22386 7.5 2.5V12.197L3.87165 8.16552C3.68692 7.96026 3.37078 7.94362 3.16552 8.12835C2.96027 8.31308 2.94363 8.62923 3.12836 8.83448L7.62836 13.8345C7.72318 13.9398 7.85826 14 8 14C8.14175 14 8.27683 13.9398 8.37165 13.8345L12.8717 8.83448C13.0564 8.62923 13.0397 8.31308 12.8345 8.12835C12.6292 7.94362 12.3131 7.96026 12.1284 8.16552L8.5 12.197V2.5Z" />
   </svg>
 )
 export default ArrowDown

webview/src/shared/components/icons/ArrowUp.tsx

@@ -9,11 +9,7 @@ const ArrowUp = (props: SVGProps<SVGSVGElement>) => (
     fill="currentColor"
     {...props}
   >
-    <path
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M13.854 7l-5-5h-.707l-5 5 .707.707L8 3.561V14h1V3.56l4.146 4.147.708-.707z"
-    />
+    <path d="M7.5 13.5C7.5 13.7761 7.72386 14 8 14C8.27614 14 8.5 13.7761 8.5 13.5V3.80298L12.1284 7.83448C12.3131 8.03974 12.6292 8.05638 12.8345 7.87165C13.0397 7.68692 13.0564 7.37077 12.8716 7.16552L8.37165 2.16552C8.27683 2.06016 8.14174 2 8 2C7.85826 2 7.72317 2.06016 7.62835 2.16552L3.12836 7.16552C2.94363 7.37077 2.96027 7.68692 3.16552 7.87165C3.37078 8.05638 3.68692 8.03974 3.87165 7.83448L7.5 3.80298V13.5Z" />
   </svg>
 )
 export default ArrowUp

webview/src/shared/components/icons/Beaker.tsx

@@ -9,7 +9,7 @@ const Beaker = (props: SVGProps<SVGSVGElement>) => (
     fill="currentColor"
     {...props}
   >
-    <path d="M13.893 13.558L10 6.006v-4h1v-1H9.994V1l-.456.005H5V2h1v3.952l-3.894 7.609A1 1 0 0 0 3 15.006h10a1 1 0 0 0 .893-1.448zm-7-7.15L7 6.193V2.036l2-.024v4.237l.11.215 1.827 3.542H5.049l1.844-3.598zM3 14.017l1.54-3.011h6.916l1.547 3L3 14.017z" />
+    <path d="M12 0.998993C12.276 0.998993 12.5 1.22299 12.5 1.49899C12.5 1.77499 12.276 1.99899 12 1.99899H11.004V6.68299C11.004 7.26299 11.148 7.83299 11.423 8.34299L13.819 12.789C14.358 13.788 13.634 15.001 12.499 15.001H3.50101C2.36501 15.001 1.64301 13.788 2.18101 12.789L4.57501 8.34499C4.85001 7.83499 4.99401 7.26399 4.99401 6.68499V1.99899H4.00001C3.72401 1.99899 3.50001 1.77499 3.50001 1.49899C3.50001 1.22299 3.72401 0.998993 4.00001 0.998993H12ZM5.99401 1.99899V6.68599C5.99401 7.43099 5.80901 8.16399 5.45601 8.81999L4.82101 9.99899H11.18L10.543 8.81699C10.19 8.16099 10.005 7.42799 10.005 6.68199V1.99899H5.99401ZM11.718 10.999H4.28201L3.06201 13.263C2.88201 13.597 3.12401 14 3.50201 14H12.499C12.877 14 13.119 13.596 12.939 13.263L11.718 10.999Z" />
   </svg>
 )
 export default Beaker

webview/src/shared/components/icons/Check.tsx

@@ -9,11 +9,7 @@ const Check = (props: SVGProps<SVGSVGElement>) => (
     fill="currentColor"
     {...props}
   >
-    <path
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M14.431 3.323l-8.47 10-.79-.036-3.35-4.77.818-.574 2.978 4.24 8.051-9.506.764.646z"
-    />
+    <path d="M13.6572 3.13573C13.8583 2.9465 14.175 2.95614 14.3643 3.15722C14.5535 3.35831 14.5438 3.675 14.3428 3.86425L5.84277 11.8642C5.64597 12.0494 5.33756 12.0446 5.14648 11.8535L1.64648 8.35351C1.45121 8.15824 1.45121 7.84174 1.64648 7.64647C1.84174 7.45121 2.15825 7.45121 2.35351 7.64647L5.50976 10.8027L13.6572 3.13573Z" />
   </svg>
 )
 export default Check

webview/src/shared/components/icons/ChevronDown.tsx

@@ -9,11 +9,7 @@ const ChevronDown = (props: SVGProps<SVGSVGElement>) => (
     fill="currentColor"
     {...props}
   >
-    <path
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M7.976 10.072l4.357-4.357.62.618L8.284 11h-.618L3 6.333l.619-.618 4.357 4.357z"
-    />
+    <path d="M3.14645 5.64645C3.34171 5.45118 3.65829 5.45118 3.85355 5.64645L8 9.79289L12.1464 5.64645C12.3417 5.45118 12.6583 5.45118 12.8536 5.64645C13.0488 5.84171 13.0488 6.15829 12.8536 6.35355L8.35355 10.8536C8.15829 11.0488 7.84171 11.0488 7.64645 10.8536L3.14645 6.35355C2.95118 6.15829 2.95118 5.84171 3.14645 5.64645Z" />
   </svg>
 )
 export default ChevronDown

webview/src/shared/components/icons/ChevronRight.tsx

@@ -9,11 +9,7 @@ const ChevronRight = (props: SVGProps<SVGSVGElement>) => (
     fill="currentColor"
     {...props}
   >
-    <path
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M10.072 8.024L5.715 3.667l.618-.62L11 7.716v.618L6.333 13l-.618-.619 4.357-4.357z"
-    />
+    <path d="M5.64645 3.14645C5.45118 3.34171 5.45118 3.65829 5.64645 3.85355L9.79289 8L5.64645 12.1464C5.45118 12.3417 5.45118 12.6583 5.64645 12.8536C5.84171 13.0488 6.15829 13.0488 6.35355 12.8536L10.8536 8.35355C11.0488 8.15829 11.0488 7.84171 10.8536 7.64645L6.35355 3.14645C6.15829 2.95118 5.84171 2.95118 5.64645 3.14645Z" />
   </svg>
 )
 export default ChevronRight

webview/src/shared/components/icons/Close.tsx

@@ -9,11 +9,7 @@ const Close = (props: SVGProps<SVGSVGElement>) => (
     fill="currentColor"
     {...props}
   >
-    <path
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M8 8.707l3.646 3.647.708-.707L8.707 8l3.647-3.646-.707-.708L8 7.293 4.354 3.646l-.707.708L7.293 8l-3.646 3.646.707.708L8 8.707z"
-    />
+    <path d="M8.70701 8.00001L12.353 4.35401C12.548 4.15901 12.548 3.84201 12.353 3.64701C12.158 3.45201 11.841 3.45201 11.646 3.64701L8.00001 7.29301L4.35401 3.64701C4.15901 3.45201 3.84201 3.45201 3.64701 3.64701C3.45201 3.84201 3.45201 4.15901 3.64701 4.35401L7.29301 8.00001L3.64701 11.646C3.45201 11.841 3.45201 12.158 3.64701 12.353C3.74501 12.451 3.87301 12.499 4.00101 12.499C4.12901 12.499 4.25701 12.45 4.35501 12.353L8.00101 8.70701L11.647 12.353C11.745 12.451 11.873 12.499 12.001 12.499C12.129 12.499 12.257 12.45 12.355 12.353C12.55 12.158 12.55 11.841 12.355 11.646L8.70901 8.00001H8.70701Z" />
   </svg>
 )
 export default Close