Skip to content

Commit

Permalink
Merge branch 'main' into allow-plot-wizard-multi-x-selection
Browse files Browse the repository at this point in the history
  • Loading branch information
julieg18 authored Oct 13, 2023
2 parents 7033ec6 + b907879 commit 402d6a2
Show file tree
Hide file tree
Showing 8 changed files with 159 additions and 134 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,5 @@ package-lock.json
storybook-static

.DS_Store

.turbo
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@

All notable changes to this project will be documented in this file.

## [1.1.6] - 2023-10-12

### 🚀 New Features and Enhancements

- Add Multiple Y Field Selection to Plot Wizard [#4787](https://github.com/iterative/vscode-dvc/pull/4787) by [@julieg18](https://github.com/julieg18)

### 🐛 Bug Fixes

- Fix error when user chooses no Y fields in the Plot Wizard [#4808](https://github.com/iterative/vscode-dvc/pull/4808) by [@julieg18](https://github.com/julieg18)

### 🔨 Maintenance

- Added webdriverio-monorepo to ignored dependencies for Renovate [#4806](https://github.com/iterative/vscode-dvc/pull/4806) by [@sroy3](https://github.com/sroy3)

## [1.1.5] - 2023-10-10

### 🚀 New Features and Enhancements
Expand Down
10 changes: 5 additions & 5 deletions extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"extensionDependencies": [
"vscode.git"
],
"version": "1.1.5",
"version": "1.1.6",
"license": "Apache-2.0",
"readme": "./README.md",
"repository": {
Expand Down Expand Up @@ -1732,7 +1732,7 @@
"yaml": "2.3.2"
},
"devDependencies": {
"@swc/core": "1.3.91",
"@swc/core": "1.3.92",
"@swc/jest": "0.2.29",
"@types/chai": "4.3.6",
"@types/chai-as-promised": "7.1.6",
Expand All @@ -1753,7 +1753,7 @@
"@types/uuid": "9.0.4",
"@types/vega": "3.2.0",
"@types/vscode": "1.64.0",
"@vscode/test-electron": "2.3.4",
"@vscode/test-electron": "2.3.5",
"@vscode/vsce": "2.21.1",
"@wdio/cli": "8.16.7",
"@wdio/local-runner": "8.16.7",
Expand All @@ -1770,10 +1770,10 @@
"mocha": "10.2.0",
"mock-require": "3.0.3",
"shx": "0.3.4",
"sinon": "16.0.0",
"sinon": "16.1.0",
"sinon-chai": "3.7.0",
"ts-loader": "9.4.4",
"vscode-uri": "3.0.7",
"vscode-uri": "3.0.8",
"wdio-vscode-service": "5.2.1",
"webdriverio": "8.16.7",
"webpack": "5.88.2",
Expand Down
4 changes: 2 additions & 2 deletions languageServer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"vscode-languageserver": "9.0.1",
"vscode-languageserver-textdocument": "1.0.11",
"vscode-uri": "3.0.7",
"vscode-uri": "3.0.8",
"yaml": "2.3.2"
},
"scripts": {
Expand All @@ -25,7 +25,7 @@
"test": "jest --collect-coverage"
},
"devDependencies": {
"@swc/core": "1.3.91",
"@swc/core": "1.3.92",
"@swc/jest": "0.2.29",
"@types/jest": "29.5.5",
"clean-webpack-plugin": "4.0.0",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@
"prettier": "3.0.3",
"prettier-config-standard": "7.0.0",
"ts-node": "10.9.1",
"turbo": "1.10.14",
"turbo": "1.10.15",
"typescript": "5.2.2"
},
"resolutions": {
"decode-uri-component": "0.2.2",
"@types/react": "18.2.24",
"@types/react": "18.2.25",
"**/recursive-readdir/minimatch": "6.2.0",
"fastify": "3.29.5",
"json5": "2.2.3",
Expand Down
6 changes: 5 additions & 1 deletion renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@
"ignoreDeps": [
"@types/node",
"@types/vscode",
"@wdio/cli",
"@wdio/local-runner",
"@wdio/mocha-framework",
"@wdio/spec-reporter",
"execa",
"process-exists",
"webdriverio-monorepo"
"webdriverio"
],
"extends": ["config:base"],
"packageRules": [
Expand Down
10 changes: 5 additions & 5 deletions webview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"typescript": "*"
},
"dependencies": {
"@reduxjs/toolkit": "1.9.6",
"@reduxjs/toolkit": "1.9.7",
"@tanstack/react-table": "8.10.3",
"@tippyjs/react": "4.2.6",
"@vscode/webview-ui-toolkit": "1.2.2",
Expand Down Expand Up @@ -51,15 +51,15 @@
"@svgr/core": "^8.0.0",
"@svgr/plugin-jsx": "^8.0.1",
"@svgr/plugin-prettier": "^8.0.1",
"@swc/core": "1.3.91",
"@swc/core": "1.3.92",
"@swc/jest": "0.2.29",
"@testing-library/jest-dom": "6.1.3",
"@testing-library/react": "14.0.0",
"@types/jest": "29.5.5",
"@types/jsdom": "21.1.3",
"@types/node": "16.x",
"@types/react": "18.2.24",
"@types/react-dom": "18.2.9",
"@types/react": "18.2.25",
"@types/react-dom": "18.2.10",
"@types/react-measure": "2.0.9",
"@types/react-virtualized": "9.21.23",
"@types/webpack": "5.28.3",
Expand All @@ -74,7 +74,7 @@
"jest-environment-jsdom": "29.7.0",
"lint-staged": "14.0.1",
"raw-loader": "4.0.2",
"sass": "1.68.0",
"sass": "1.69.0",
"sass-loader": "13.3.2",
"storybook": "7.4.6",
"storybook-addon-themes": "6.1.0",
Expand Down
Loading

0 comments on commit 402d6a2

Please sign in to comment.