From 5024bdde912dd3e753b10b0884ee65bf245863f1 Mon Sep 17 00:00:00 2001 From: Marc Dumais Date: Fri, 24 Jul 2020 10:25:35 -0400 Subject: [PATCH] Upgraded `vscode-ripgrep`'s yarn.lock entry so we pick-up latest Fixes #8171 This will benefit the developres that build our example application behind a firewall, since now `ripgrep` respects environment proxy settings. Extenders can upgrade their own application's `yarn.lock` since this change will not affect them. Signed-off-by: Marc Dumais --- .travis.yml | 2 +- CHANGELOG.md | 2 ++ yarn.lock | 22 +++++++++++++++++++--- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f97ec90ac8f98..a6749de63001d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ cache: # All directories need to be listed here, because Travis does not support globs. # Auto generated by scripts/prepare-travis # start_cache_directories - - /tmp/vscode-ripgrep-cache-1.5.7 + - /tmp/vscode-ripgrep-cache-1.8.0 - dev-packages/application-manager/node_modules - dev-packages/application-package/node_modules - dev-packages/cli/node_modules diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a36f8bce5752..beee86122cee5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ [Breaking Changes:](#breaking_changes_1.5.0) - [output] `OutputWidget#setInput` has been removed. The _Output_ view automatically shows the channel when calling `OutputChannel#show`. Moved the `OutputCommands` namespace from the `output-contribution` to its dedicated `output-commands` module to overcome a DI cycle. [#8243](https://github.com/eclipse-theia/theia/pull/8243) +- [example app] updated yarn.lock so that the latest version of `vscode-ripgrep` is used (`v1.8.0`). This way we can benefit from the recently added support for it using proxy settings when fetching the platform-specific `ripgrep` executable, after npm package install. This should make it a lot easier to build our example application in corporate settings, behind a firewall. [#8280](https://github.com/eclipse-theia/theia/pull/8280) + - Note to downstream IDE designers: this change will not have an effect beyond this repo's example application. If it's desirable for your product to have the latest `vscode-ripgrep`, you should do similarly in your own `yarn.lock`. ## v1.4.0 diff --git a/yarn.lock b/yarn.lock index eb3dd738af009..72f4b2e0de2d9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1940,6 +1940,11 @@ add-stream@^1.0.0: resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa" integrity sha1-anmQQ3ynNtXhKI25K9MmbV9csqo= +agent-base@5: + version "5.1.1" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c" + integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g== + agent-base@6: version "6.0.0" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.0.tgz#5d0101f19bbfaed39980b22ae866de153b93f09a" @@ -7070,6 +7075,14 @@ https-proxy-agent@^3.0.0: agent-base "^4.3.0" debug "^3.1.0" +https-proxy-agent@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b" + integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg== + dependencies: + agent-base "5" + debug "4" + https-proxy-agent@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" @@ -13339,9 +13352,12 @@ vscode-languageserver-types@^3.15.0-next, vscode-languageserver-types@^3.15.0-ne integrity sha512-s9Psd+0sQVkH4o1U7hwTNJRuXQQgFvGVZIim7Wb44tcq54rZou3kJKCtdFEm0aHUuYxIrMPYrzuh1jlqCbRegw== vscode-ripgrep@^1.2.4: - version "1.5.7" - resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.5.7.tgz#acb6b548af488a4bca5d0f1bb5faf761343289ce" - integrity sha512-/Vsz/+k8kTvui0q3O74pif9FK0nKopgFTiGNVvxicZANxtSA8J8gUE9GQ/4dpi7D/2yI/YVORszwVskFbz46hQ== + version "1.8.0" + resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.8.0.tgz#dfe7c2ae2a2032df8a8108765c2feef73474888a" + integrity sha512-/Q5XtePkTLLi8yplr5ai24pVEymRF62xH9xXrtj35GTaDCJg3zq1s1/L1UqhVbfNDv4OcMBYjyIAt/quEi3d5w== + dependencies: + https-proxy-agent "^4.0.0" + proxy-from-env "^1.1.0" vscode-textmate@^4.0.1: version "4.4.0"