Skip to content

Commit 5539fa2

Browse files
pfeiglarcanis
authored andcommitted
Fixes potential freeze on win+node10 interactive upgrades (#5949) (#6635)
* Fixes potential freeze on win+node10 interactive upgrades (#5949) There is a potential freeze when running interactive upgrades after selecting the options. This boiles down to a problem in the `inquirer` library which is used internally to provide the possible options. Updating `inquirer`to the latest version fixes the problem. * Update CHANGELOG.md
1 parent 7977c42 commit 5539fa2

File tree

3 files changed

+58
-2
lines changed

3 files changed

+58
-2
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ Please add one entry in this file for each change in Yarn's behavior. Use the sa
2727
- Fixes an issue with how symlinks are setup into the cache on Windows
2828

2929
[#6621](https://github.com/yarnpkg/yarn/pull/6621) - [**Yoad Snapir**](https://github.com/yoadsn)
30+
31+
- Upgrades `enquirer`, fixing `upgrade-interactive` for users using both Node 10 and Windows
32+
33+
[#6635](https://github.com/yarnpkg/yarn/pull/6635) - [**Philipp Feigl**](https://github.com/pfeigl)
3034

3135
## 1.12.1
3236

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"hash-for-dep": "^1.2.3",
2424
"imports-loader": "^0.8.0",
2525
"ini": "^1.3.4",
26-
"inquirer": "^3.0.1",
26+
"inquirer": "^6.2.0",
2727
"invariant": "^2.2.0",
2828
"is-builtin-module": "^2.0.0",
2929
"is-ci": "^1.0.10",

yarn.lock

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1699,6 +1699,11 @@ chardet@^0.4.0:
16991699
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
17001700
integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=
17011701

1702+
chardet@^0.7.0:
1703+
version "0.7.0"
1704+
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
1705+
integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
1706+
17021707
chokidar@^2.0.0, chokidar@^2.0.2:
17031708
version "2.0.4"
17041709
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
@@ -2879,6 +2884,15 @@ external-editor@^2.0.1, external-editor@^2.0.4:
28792884
iconv-lite "^0.4.17"
28802885
tmp "^0.0.33"
28812886

2887+
external-editor@^3.0.0:
2888+
version "3.0.3"
2889+
resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
2890+
integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
2891+
dependencies:
2892+
chardet "^0.7.0"
2893+
iconv-lite "^0.4.24"
2894+
tmp "^0.0.33"
2895+
28822896
extglob@^0.3.1:
28832897
version "0.3.2"
28842898
resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
@@ -3744,6 +3758,13 @@ iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
37443758
dependencies:
37453759
safer-buffer ">= 2.1.2 < 3"
37463760

3761+
iconv-lite@^0.4.24:
3762+
version "0.4.24"
3763+
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
3764+
integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
3765+
dependencies:
3766+
safer-buffer ">= 2.1.2 < 3"
3767+
37473768
ieee754@^1.1.4:
37483769
version "1.1.12"
37493770
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
@@ -3849,7 +3870,7 @@ [email protected]:
38493870
strip-ansi "^3.0.0"
38503871
through "^2.3.6"
38513872

3852-
inquirer@^3.0.1, inquirer@^3.0.6:
3873+
inquirer@^3.0.6:
38533874
version "3.3.0"
38543875
resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
38553876
integrity sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==
@@ -3869,6 +3890,25 @@ inquirer@^3.0.1, inquirer@^3.0.6:
38693890
strip-ansi "^4.0.0"
38703891
through "^2.3.6"
38713892

3893+
inquirer@^6.2.0:
3894+
version "6.2.0"
3895+
resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
3896+
integrity sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==
3897+
dependencies:
3898+
ansi-escapes "^3.0.0"
3899+
chalk "^2.0.0"
3900+
cli-cursor "^2.1.0"
3901+
cli-width "^2.0.0"
3902+
external-editor "^3.0.0"
3903+
figures "^2.0.0"
3904+
lodash "^4.17.10"
3905+
mute-stream "0.0.7"
3906+
run-async "^2.2.0"
3907+
rxjs "^6.1.0"
3908+
string-width "^2.1.0"
3909+
strip-ansi "^4.0.0"
3910+
through "^2.3.6"
3911+
38723912
interpret@^1.0.0, interpret@^1.1.0:
38733913
version "1.1.0"
38743914
resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
@@ -6529,6 +6569,13 @@ rx@^4.1.0:
65296569
resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
65306570
integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
65316571

6572+
rxjs@^6.1.0:
6573+
version "6.3.3"
6574+
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
6575+
integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
6576+
dependencies:
6577+
tslib "^1.9.0"
6578+
65326579
safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
65336580
version "5.1.2"
65346581
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -7263,6 +7310,11 @@ trim-right@^1.0.1:
72637310
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
72647311
integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
72657312

7313+
tslib@^1.9.0:
7314+
version "1.9.3"
7315+
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
7316+
integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
7317+
72667318
72677319
version "0.0.0"
72687320
resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"

0 commit comments

Comments
 (0)