From 27565b5aa7150167656612e702995421aa8b003a Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 3 Sep 2019 22:48:31 -0400 Subject: [PATCH] Upgrades dependencies --- package.json | 20 +++++++++++++++++--- yarn.lock | 20 ++++++++++---------- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 61ad8e9..fa7e961 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "gitlens", "displayName": "GitLens — Git supercharged", "description": "Supercharge the Git capabilities built into Visual Studio Code — Visualize code authorship at a glance via Git blame annotations and code lens, seamlessly navigate and explore Git repositories, gain valuable insights via powerful comparison commands, and so much more", - "version": "9.9.3", + "version": "10.0.0-alpha", "author": { "name": "Eric Amodio", "email": "eamodio@gmail.com" @@ -2168,6 +2168,11 @@ "category": "GitLens" }, { + "command": "gitlens.showFolderHistory", + "title": "Show Folder History", + "category": "GitLens" + }, + { "command": "gitlens.showQuickCommitDetails", "title": "Show Commit Details", "category": "GitLens" @@ -3324,6 +3329,10 @@ "when": "gitlens:activeFileStatus =~ /tracked/" }, { + "command": "gitlens.showFolderHistory", + "when": "gitlens:enabled" + }, + { "command": "gitlens.showQuickCommitDetails", "when": "gitlens:activeFileStatus =~ /blameable/" }, @@ -4077,6 +4086,11 @@ "group": "4_gitlens_1@1" }, { + "command": "gitlens.showFolderHistory", + "when": "explorerResourceIsFolder && gitlens:enabled && config.gitlens.menus.explorer.history", + "group": "4_gitlens_1@1" + }, + { "command": "gitlens.showFileHistoryInView", "when": "!explorerResourceIsRoot && !explorerResourceIsFolder && gitlens:enabled && config.gitlens.menus.explorer.history", "group": "4_gitlens_1@2" @@ -5511,7 +5525,7 @@ "webviews:optimize": "webpack --config-name webviews --env.optimizeImages", "webviews:watch": "webpack --watch --config-name webviews --env.development --info-verbosity verbose", "update:emoji": "pushd emoji && node ./shortcodeToEmoji.js && popd", - "vscode:prepublish": "yarn run reset && yarn run bundle" + "vscode:prepublish": "yarn run bundle" }, "dependencies": { "dayjs": "1.8.16", @@ -5531,7 +5545,7 @@ "css-loader": "3.2.0", "eslint": "6.3.0", "eslint-cli": "1.1.1", - "eslint-config-prettier": "6.1.0", + "eslint-config-prettier": "6.2.0", "eslint-plugin-import": "2.18.2", "fork-ts-checker-webpack-plugin": "1.5.0", "html-webpack-exclude-assets-plugin": "0.0.7", diff --git a/yarn.lock b/yarn.lock index 5a7721b..c0dee21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -119,9 +119,9 @@ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== "@types/node@*": - version "12.7.3" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.3.tgz#27b3f40addaf2f580459fdb405222685542f907a" - integrity sha512-3SiLAIBkDWDg6vFo0+5YJyHPWU9uwu40Qe+v+0MH8wRKYBimHvvAOyk3EzMrD/TrIlLYfXrqDqrg913PynrMJQ== + version "12.7.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.4.tgz#64db61e0359eb5a8d99b55e05c729f130a678b04" + integrity sha512-W0+n1Y+gK/8G2P/piTkBBN38Qc5Q1ZSO6B5H3QmPCUewaiXOo2GCAWZ4ElZCcNhjJuBSUSLGFUJnmlCn5+nxOQ== "@types/node@10.14.17": version "10.14.17" @@ -2070,10 +2070,10 @@ eslint-cli@1.1.1: debug "^2.6.8" resolve "^1.3.3" -eslint-config-prettier@6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.1.0.tgz#e6f678ba367fbd1273998d5510f76f004e9dce7b" - integrity sha512-k9fny9sPjIBQ2ftFTesJV21Rg4R/7a7t7LCtZVrYQiHEp8Nnuk3EGaDmsKSAnsPj0BYcgB2zxzHa2NTkIxcOLg== +eslint-config-prettier@6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.2.0.tgz#80e0b8714e3f6868c4ac2a25fbf39c02e73527a7" + integrity sha512-VLsgK/D+S/FEsda7Um1+N8FThec6LqE3vhcMyp8mlmto97y3fGf3DX7byJexGuOb1QY0Z/zz222U5t+xSfcZDQ== dependencies: get-stdin "^6.0.0" @@ -5673,9 +5673,9 @@ run-queue@^1.0.0, run-queue@^1.0.3: aproba "^1.1.1" rxjs@^6.4.0: - version "6.5.2" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7" - integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg== + version "6.5.3" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a" + integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA== dependencies: tslib "^1.9.0"