From fad9345c855ebf0de21ba96dce89de88c9ab9b47 Mon Sep 17 00:00:00 2001
From: Logan Smyth <loganfsmyth@gmail.com>
Date: Fri, 1 Sep 2017 12:21:29 -0700
Subject: [PATCH] Revert Yarn workspace changes from #6056 for now.

Yarn currently fails to add the correct symlinks in some cases. See https://github.com/yarnpkg/yarn/issues/4289
---
 .yarnrc      | 1 -
 lerna.json   | 7 +------
 package.json | 5 +----
 3 files changed, 2 insertions(+), 11 deletions(-)
 delete mode 100644 .yarnrc

diff --git a/.yarnrc b/.yarnrc
deleted file mode 100644
index 19daacaa08..0000000000
--- a/.yarnrc
+++ /dev/null
@@ -1 +0,0 @@
-workspaces-experimental true
diff --git a/lerna.json b/lerna.json
index a7f0bb5bff..c4157f3d66 100644
--- a/lerna.json
+++ b/lerna.json
@@ -21,10 +21,5 @@
         "test/**"
       ]
     }
-  },
-  "packages": [
-    "packages/*"
-  ],
-  "npmClient": "yarn",
-  "useWorkspaces": true
+  }
 }
diff --git a/package.json b/package.json
index fe09cb3716..e5dbce6507 100644
--- a/package.json
+++ b/package.json
@@ -70,8 +70,5 @@
       "eslint --format=codeframe --fix --rulesdir='./eslint_rules'",
       "git add"
     ]
-  },
-  "workspaces": [
-    "packages/*"
-  ]
+  }
 }