Core blocks: Adjustment after rebase with master

WordPress · Aug 6, 2018 · c72500b · c72500b
1 parent a83ac40
commit c72500b
Show file tree

Hide file tree

Showing 135 changed files with 83 additions and 1,345 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
 		"@wordpress/blocks": "file:packages/blocks",
 		"@wordpress/components": "file:packages/components",
 		"@wordpress/compose": "file:packages/compose",
+		"@wordpress/core-blocks": "file:packages/core-blocks",
 		"@wordpress/core-data": "file:packages/core-data",
 		"@wordpress/data": "file:packages/data",
 		"@wordpress/date": "file:packages/date",

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -39,7 +39,7 @@
 		"memize": "^1.0.5",
 		"moment": "^2.22.1",
 		"mousetrap": "^1.6.2",
-		"prop-types": "^15.6.2",
+		"prop-types": "^15.5.10",
 		"react-click-outside": "^2.3.1",
 		"react-color": "^2.13.4",
 		"react-datepicker": "^1.4.1",

diff --git a/test/integration/full-content/fixtures/core-embed__animoto.html b/test/integration/full-content/fixtures/core-embed__animoto.html
diff --git a/test/integration/full-content/fixtures/core-embed__animoto.json b/test/integration/full-content/fixtures/core-embed__animoto.json
diff --git a/test/integration/full-content/fixtures/core-embed__animoto.parsed.json b/test/integration/full-content/fixtures/core-embed__animoto.parsed.json
diff --git a/test/integration/full-content/fixtures/core-embed__animoto.serialized.html b/test/integration/full-content/fixtures/core-embed__animoto.serialized.html
diff --git a/test/integration/full-content/fixtures/core-embed__cloudup.html b/test/integration/full-content/fixtures/core-embed__cloudup.html