Merge pull request webpack#7881 from oygen87/patch-8

sokra · web-flow · commit 34ff480a92c1 · 2018-08-13T07:53:23.000+02:00
refactor
diff --git a/setup/setup.js b/setup/setup.js
@@ -47,7 +47,7 @@ function checkSymlinkExistsAsync() {
 }
 
 function ensureYarnInstalledAsync() {
-	var semverPattern = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$/;
+	const semverPattern = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$/;
 	return execGetOutput("yarn", ["-v"], "Check yarn version")
 		.then(stdout => semverPattern.test(stdout), () => false)
 		.then(hasYarn => hasYarn || installYarnAsync());

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ function checkSymlinkExistsAsync() {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`function ensureYarnInstalledAsync() {`
`50`		`- var semverPattern = /^(0\|[1-9]\d)\.(0\|[1-9]\d)\.(0\|[1-9]\d)(-(0\|[1-9]\d\|\d[a-zA-Z-][0-9a-zA-Z-])(\.(0\|[1-9]\d\|\d[a-zA-Z-][0-9a-zA-Z-])))?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$/;`
	`50`	`+ const semverPattern = /^(0\|[1-9]\d)\.(0\|[1-9]\d)\.(0\|[1-9]\d)(-(0\|[1-9]\d\|\d[a-zA-Z-][0-9a-zA-Z-])(\.(0\|[1-9]\d\|\d[a-zA-Z-][0-9a-zA-Z-])))?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$/;`
`51`	`51`	`return execGetOutput("yarn", ["-v"], "Check yarn version")`
`52`	`52`	`.then(stdout => semverPattern.test(stdout), () => false)`
`53`	`53`	`.then(hasYarn => hasYarn \|\| installYarnAsync());`