Merge branch 'master' into feature/upgrade-to-rn-0553

.babelrc

@@ -7,12 +7,11 @@
     [
       "module-resolver",
       {
+        "cwd": "babelrc",
         "alias": {
-          "@wordpress/blocks": "./gutenberg/blocks",
-          "@wordpress/editor": "./gutenberg/editor",
-          "@wordpress/element": "./gutenberg/element",
-          "@wordpress/hooks": "./wordpress/hooks",
-          "@wordpress/utils": "./gutenberg/utils",
+          "@wordpress/blocks": "./blocks",
+          "@wordpress/editor": "./editor",
+          "@wordpress/element": "./element",
           "@gutenberg": "./gutenberg"
         },
         "extensions": [

.flowconfig

@@ -83,7 +83,6 @@ munge_underscores=true
 module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
 module.name_mapper='@gutenberg' -> '<PROJECT_ROOT>/gutenberg'
 module.name_mapper='@wordpress/element' -> '<PROJECT_ROOT>/gutenberg/element'
-module.name_mapper='@wordpress/utils' -> '<PROJECT_ROOT>/gutenberg/utils'
 
 ; mock/ignore style files
 module.name_mapper='.*\(.scss\)' -> 'empty/object'

jest.config.js

@@ -30,11 +30,7 @@ module.exports = {
 		'node',
 	],
 	moduleNameMapper: {
-		'@wordpress/blocks': '<rootDir>/gutenberg/blocks',
-		'@wordpress/editor': '<rootDir>/gutenberg/editor',
-		'@wordpress/element': '<rootDir>/gutenberg/element',
-		'@wordpress/hooks': '<rootDir>/wordpress/hooks',
-		'@wordpress/utils': '<rootDir>/gutenberg/utils',
+		'@wordpress\\/(blocks|editor|element)$': '<rootDir>/gutenberg/$1',
 		'@gutenberg': '<rootDir>/gutenberg',
 
 		// Mock the CSS modules. See https://facebook.github.io/jest/docs/en/webpack.html#handling-static-assets

package.json

@@ -52,6 +52,7 @@
     "lint:fix": "eslint $npm_package_config_jsfiles --fix"
   },
   "dependencies": {
+    "@wordpress/hooks": "^1.2.0",
     "@wordpress/i18n": "^1.1.0",
     "@wordpress/is-shallow-equal": "^1.0.1",
     "babel-plugin-module-resolver": "^3.1.0",

sass-transformer.js

@@ -60,7 +60,7 @@ if ( reactNativeMinorVersion >= 52 ) {
 }
 
 // TODO: need to find a way to pass the include paths and the default asset files via some config
-const autoImportIncludePaths = [ 'gutenberg/edit-post/assets/stylesheets' ];
+const autoImportIncludePaths = [ path.join( path.dirname( __filename ), 'gutenberg/edit-post/assets/stylesheets' ) ];
 const autoImportAssets = [
 	'_colors.scss',
 	'_admin-schemes.scss',

src/app/globals.js

@@ -1,6 +1,6 @@
 /** @format */
 
-import { createElement } from '@wordpress/element';
+import { createElement } from '@gutenberg/element';
 
 global.wp = {
 	element: {

yarn.lock

@@ -529,6 +529,10 @@
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/@wordpress/browserslist-config/-/browserslist-config-2.1.4.tgz#2297713d53424dec835eed4895abd4ceb3cac297"
 
+"@wordpress/hooks@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@wordpress/hooks/-/hooks-1.2.0.tgz#258196ca9c59a08b28faf759706ab409b12674c9"
+
 "@wordpress/i18n@^1.1.0":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@wordpress/i18n/-/i18n-1.1.1.tgz#e97c31879e1f76878cfdd14eb7d7a0ec99a234c3"