From f80d27ba5b03385170c3584f91c2e160977c1f35 Mon Sep 17 00:00:00 2001
From: Joe Haddad <timer150@gmail.com>
Date: Mon, 8 Oct 2018 18:35:01 -0400
Subject: [PATCH] Fix checking against non-semver compliant Yarn versions
 (#5362)

---
 packages/create-react-app/createReactApp.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js
index 5d837c60400..a62f88589f0 100755
--- a/packages/create-react-app/createReactApp.js
+++ b/packages/create-react-app/createReactApp.js
@@ -594,7 +594,11 @@ function checkYarnVersion() {
     yarnVersion = execSync('yarnpkg --version')
       .toString()
       .trim();
-    hasMinYarnPnp = semver.gte(yarnVersion, '1.12.0');
+    let trimmedYarnVersion = /^(.+?)[-+].+$/.exec(yarnVersion);
+    if (trimmedYarnVersion) {
+      trimmedYarnVersion = trimmedYarnVersion.pop();
+    }
+    hasMinYarnPnp = semver.gte(trimmedYarnVersion || yarnVersion, '1.12.0');
   } catch (err) {
     // ignore
   }