Merge branch 'main' into integrate-exp-show

iterative · Apr 19, 2023 · 932951b · 932951b
2 parents a9f5ee5 + a28fad7
commit 932951b
Show file tree

Hide file tree

Showing 7 changed files with 195 additions and 156 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.7.9] - 2023-04-18
+
+### 🔨 Maintenance
+
+- Update demo project [#3704](https://github.com/iterative/vscode-dvc/pull/3704) by [@mattseddon](https://github.com/mattseddon)
+
+## [0.7.8] - 2023-04-17
+
+### 🐛 Bug Fixes
+
+- Turn off add/remove branches feature flag [#3702](https://github.com/iterative/vscode-dvc/pull/3702) by [@mattseddon](https://github.com/mattseddon)
+
 ## [0.7.7] - 2023-04-17
 
 ### 🚀 New Features and Enhancements

diff --git a/extension/package.json b/extension/package.json
@@ -9,7 +9,7 @@
   "extensionDependencies": [
     "vscode.git"
   ],
-  "version": "0.7.7",
+  "version": "0.7.9",
   "license": "Apache-2.0",
   "readme": "./README.md",
   "repository": {
@@ -1677,10 +1677,10 @@
     "@types/vscode": "1.64.0",
     "@vscode/test-electron": "2.3.0",
     "@vscode/vsce": "2.18.0",
-    "@wdio/cli": "8.7.0",
-    "@wdio/local-runner": "8.7.0",
-    "@wdio/mocha-framework": "8.7.0",
-    "@wdio/spec-reporter": "8.7.0",
+    "@wdio/cli": "8.8.0",
+    "@wdio/local-runner": "8.8.0",
+    "@wdio/mocha-framework": "8.8.0",
+    "@wdio/spec-reporter": "8.8.0",
     "chai": "4.3.7",
     "chai-as-promised": "7.1.1",
     "clean-webpack-plugin": "4.0.0",
@@ -1698,7 +1698,7 @@
     "ts-loader": "9.4.2",
     "vscode-uri": "3.0.7",
     "wdio-vscode-service": "5.0.0",
-    "webdriverio": "8.7.0",
+    "webdriverio": "8.8.0",
     "webpack": "5.78.0",
     "webpack-cli": "5.0.1"
   },

diff --git a/extension/src/cli/dvc/contract.ts b/extension/src/cli/dvc/contract.ts
@@ -1,7 +1,7 @@
 import { Plot } from '../../plots/webview/contract'
 
 export const MIN_CLI_VERSION = '2.52.0'
-export const LATEST_TESTED_CLI_VERSION = '2.53.0'
+export const LATEST_TESTED_CLI_VERSION = '2.54.0'
 export const MAX_CLI_VERSION = '3'
 
 type ErrorContents = { type: string; msg: string }

diff --git a/package.json b/package.json
@@ -64,7 +64,7 @@
     "prettier": "2.8.7",
     "prettier-config-standard": "5.0.0",
     "ts-node": "10.9.1",
-    "turbo": "1.8.8",
+    "turbo": "1.9.0",
     "typescript": "5.0.4"
   },
   "resolutions": {

diff --git a/webview/package.json b/webview/package.json
@@ -70,7 +70,7 @@
     "jest-environment-jsdom": "29.5.0",
     "lint-staged": "13.2.1",
     "raw-loader": "4.0.2",
-    "sass": "1.61.0",
+    "sass": "1.62.0",
     "sass-loader": "13.2.2",
     "storybook-addon-designs": "6.3.1",
     "storybook-addon-themes": "6.1.0",

diff --git a/webview/src/util/flags.ts b/webview/src/util/flags.ts
@@ -1,3 +1,3 @@
 export const featureFlag = {
-  ADD_REMOVE_BRANCHES: true
+  ADD_REMOVE_BRANCHES: false
 }