Merge pull request #1799 from wordpress-mobile/update-master-20200122

Update to gutenberg master
wordpress-mobile · Jan 22, 2020 · e33cd1f · e33cd1f
2 parents 5276ed2 + 94f43cc
commit e33cd1f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/gutenberg b/gutenberg
diff --git a/package.json b/package.json
@@ -186,7 +186,8 @@
     "tinycolor2": "^1.4.1",
     "traverse": "^0.6.6",
     "turbo-combine-reducers": "^1.0.2",
-    "underscore": "^1.9.1"
+    "underscore": "^1.9.1",
+    "use-memo-one": "^1.1.1"
   },
   "resolutions": {
     "@react-native-community/cli": "^1.5.2"

diff --git a/symlinked-packages/@wordpress/icons b/symlinked-packages/@wordpress/icons
@@ -0,0 +1 @@
+../../gutenberg/packages/icons/src/
diff --git a/symlinked-packages/@wordpress/primitives b/symlinked-packages/@wordpress/primitives
@@ -0,0 +1 @@
+../../gutenberg/packages/primitives/src/
diff --git a/yarn.lock b/yarn.lock
@@ -13414,6 +13414,11 @@ url@^0.11.0:
     punycode "1.3.2"
     querystring "0.2.0"
 
+use-memo-one@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.1.tgz#39e6f08fe27e422a7d7b234b5f9056af313bd22c"
+  integrity sha512-oFfsyun+bP7RX8X2AskHNTxu+R3QdE/RC5IefMbqptmACAA/gfol1KDD5KRzPsGMa62sWxGZw+Ui43u6x4ddoQ==
+
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"