Merge pull request #61 from wordpress-mobile/feature/use-latest-gb-ma…

…ster-june292018

Use latest gb master as per July 2nd, 2018

.babelrc

@@ -12,7 +12,6 @@
           "react-native-aztec": "./react-native-aztec",
           "@wordpress/blocks": "./blocks",
           "@wordpress/editor": "./editor",
-          "@wordpress/element": "./element",
           "@gutenberg": "./gutenberg"
         },
         "extensions": [

.flowconfig

@@ -59,6 +59,9 @@
 <PROJECT_ROOT>/node_modules/metro/.*
 <PROJECT_ROOT>/node_modules/react-native/.*
 
+; Ignore the node_modules folders in GB packages
+<PROJECT_ROOT>/gutenberg/packages/element/node_modules/.*
+
 [include]
 
 [libs]
@@ -82,7 +85,9 @@ 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/data' -> '<PROJECT_ROOT>/gutenberg/packages/data'
+module.name_mapper='@wordpress/element' -> '<PROJECT_ROOT>/gutenberg/packages/element'
+module.name_mapper='@wordpress/deprecated' -> '<PROJECT_ROOT>/gutenberg/packages/deprecated'
 
 ; mock/ignore style files
 module.name_mapper='.*\(.scss\)' -> 'empty/object'

.travis/travis-checks-js.sh

@@ -19,6 +19,11 @@ if [ "$CHECK_CORRECTNESS" = true ] ; then
 fi
 
 if [ "$CHECK_TESTS" = true ] ; then
+  # build the Gutenberg packages
+  pushd gutenberg
+  npm i || pFail
+  popd
+
   # we'll run the tests twich (once for each platform) if the platform env var is not set
   if [[ -z "${TEST_RN_PLATFORM}" ]] ; then
     TEST_RN_PLATFORM=android npm test || pFail

README.md

@@ -28,6 +28,14 @@ Before running the demo app, you need to download and install the project depend
 npm install
 ```
 
+The Gutenberg packages need to be installed and built. This is done via the following commands:
+
+```
+pushd gutenberg
+npm install
+popd
+```
+
 ## Run
 
 Note: the most recent and complete version of this guide is available [here](https://github.com/react-community/create-react-native-app/blob/master/react-native-scripts/template/README.md).

jest.config.js

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

package.json

@@ -36,18 +36,23 @@
     "sprintf-js": "^1.1.1"
   },
   "scripts": {
-    "check-gb-unused-babelrc": "cd gutenberg/; git ls-files --error-unmatch .babelrc 2>/dev/null; ss=$?; cd ..; (if [[ $ss -gt 0 ]]; then (exit 0); else (echo \"'.babelrc' is tracked in Gutenberg, cannot overwrite!\"; exit 1); fi)",
+    "check-gb-unused-babelrc": "cd gutenberg/; git ls-files --error-unmatch .babelrc 2>/dev/null; tracked=$?; cd ..; (if [ \"$tracked\" -gt 0 ]; then (exit 0); else (echo \"'.babelrc' is tracked in Gutenberg, cannot overwrite!\"; exit 1); fi)",
     "bypass-gb-babel": "echo '{}' > gutenberg/.babelrc",
+    "test:bypass-gb-babel": "echo '{\"presets\": [\"@wordpress/default\"]}' > gutenberg/.babelrc",
     "pre-build": "yarn check-gb-unused-babelrc && yarn bypass-gb-babel",
+    "test:pre-build": "yarn check-gb-unused-babelrc && yarn test:bypass-gb-babel",
     "start": "yarn pre-build && yarn react-native start",
+    "start:reset": "yarn clean:runtime && yarn start --reset-cache",
     "start:debug": "yarn pre-build && node --inspect-brk node_modules/.bin/react-native start",
     "android": "react-native run-android",
     "ios": "react-native run-ios",
-    "test": "cross-env NODE_ENV=test node node_modules/jest/bin/jest.js --verbose --config jest.config.js",
-    "test:debug": "cross-env NODE_ENV=test node --inspect-brk node_modules/jest/bin/jest.js --runInBand --verbose --config jest.config.js",
+    "test": "yarn test:pre-build && cross-env NODE_ENV=test node node_modules/jest/bin/jest.js --verbose --config jest.config.js",
+    "test:debug": "yarn pre-build && cross-env NODE_ENV=test node --inspect-brk node_modules/jest/bin/jest.js --runInBand --verbose --config jest.config.js",
     "flow": "flow",
     "prettier": "prettier-eslint --write $npm_package_config_jsfiles $npm_package_config_scssfiles",
-    "clean": "yarn cache clean; yarn test --clearCache; watchman watch-del-all; rm -rf node_modules; rm -f yarn.lock; rm -rf $TMPDIR/react-*; rm -rf $TMPDIR/metro-cache-*; rm -rf $TMPDIR/jest_*",
+    "clean": "yarn clean:setup; yarn clean:runtime",
+    "clean:runtime": "yarn cache clean; yarn test --clearCache; watchman watch-del-all; rm -rf $TMPDIR/react-*; rm -rf $TMPDIR/metro-cache-*; rm -rf $TMPDIR/jest_*",
+    "clean:setup": "rm -rf node_modules; rm -f yarn.lock",
     "clean:install": "yarn clean; yarn",
     "lint": "eslint $npm_package_config_jsfiles",
     "lint:fix": "eslint $npm_package_config_jsfiles --fix"
@@ -76,7 +81,9 @@
     "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#bfccbaab6b5954e18f8b0ed441ba38275853b79c",
     "react-redux": "^5.0.7",
     "redux": "^3.7.2",
+    "rememo": "^3.0.0",
     "shallowequal": "^1.0.2",
-    "simple-html-tokenizer": "^0.5.1"
+    "simple-html-tokenizer": "^0.5.1",
+    "tinycolor2": "^1.4.1"
   }
 }

sass-transformer.js

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

src/globals.js

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

yarn.lock

@@ -6547,6 +6547,10 @@ remark-parse@4.0.0:
     vfile-location "^2.0.0"
     xtend "^4.0.1"
 
+rememo@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/rememo/-/rememo-3.0.0.tgz#06e8e76e108865cc1e9b73329db49f844eaf8392"
+
 remote-redux-devtools@^0.5.12:
   version "0.5.12"
   resolved "https://registry.yarnpkg.com/remote-redux-devtools/-/remote-redux-devtools-0.5.12.tgz#42cb95dfa9e54c1d9671317c5e7bba41e68caec2"
@@ -7409,6 +7413,10 @@ timers-browserify@^2.0.2:
   dependencies:
     setimmediate "^1.0.4"
 
+tinycolor2@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"
+
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"