Merge remote-tracking branch 'origin/feat/import-gutenberg-mobile-no-…

…squash' into rnmobile/import-mobile-fix-build-ios

package.json

@@ -208,6 +208,10 @@
 		"lint:md-js": "wp-scripts lint-md-js",
 		"lint:md-docs": "wp-scripts lint-md-docs",
 		"native": "npm run --prefix packages/react-native-editor",
+		"react-native": "react-native --root packages/react-native-editor",
+		"bundle:android": "cd packages/react-native-editor && npm run bundle:android",
+		"android": "npm run react-native run-android",
+		"ios": "npm run native ios",
 		"package-plugin": "./bin/build-plugin-zip.sh",
 		"pot-to-php": "./bin/pot-to-php.js",
 		"publish:check": "lerna updated",

packages/react-native-aztec/package.json

@@ -18,9 +18,6 @@
   "bugs": {
     "url": "https://github.com/WordPress/gutenberg/issues"
   },
-  "dependencies": {
-    "prop-types": "15.6.0"
-  },
   "peerDependencies": {
     "react": "*",
     "react-native": "*"

packages/react-native-aztec/src/AztecView.js

@@ -1,4 +1,3 @@
-import PropTypes from 'prop-types';
 import React from 'react';
 import ReactNative, { requireNativeComponent, TextViewPropTypes, UIManager, ColorPropType, TouchableWithoutFeedback, Platform } from 'react-native';
 import TextInputState from 'react-native/Libraries/Components/TextInput/TextInputState';
@@ -166,32 +165,6 @@ class AztecView extends React.Component {
 	}
 }
 
-AztecView.propTypes = {
-	activeFormats: PropTypes.array,
-	isSelected: PropTypes.bool,
-	disableGutenbergMode: PropTypes.bool,
-	deleteEnter: PropTypes.bool,
-	text: PropTypes.object,
-	placeholder: PropTypes.string,
-	placeholderTextColor: ColorPropType,
-	color: ColorPropType,
-	linkTextColor: ColorPropType,
-	maxImagesWidth: PropTypes.number,
-	minImagesWidth: PropTypes.number,
-	onChange: PropTypes.func,
-	onFocus: PropTypes.func,
-	onBlur: PropTypes.func,
-	onContentSizeChange: PropTypes.func,
-	onEnter: PropTypes.func,
-	onBackspace: PropTypes.func,
-	onScroll: PropTypes.func,
-	onSelectionChange: PropTypes.func,
-	onHTMLContentWithCursor: PropTypes.func,
-	onCaretVerticalPositionChange: PropTypes.func,
-	blockType: PropTypes.object,
-	...TextViewPropTypes, // include the default view properties
-};
-
 const RCTAztecView = requireNativeComponent( 'RCTAztecView', AztecView );
 
 export default AztecView;

packages/react-native-bridge/android/build.gradle

@@ -120,7 +120,7 @@ repositories {
 }
 
 dependencies {
-    implementation project(':react-native-aztec')
+    implementation project(':@wordpress_react-native-aztec')
 
     implementation "org.wordpress:utils:1.22"
 

packages/react-native-bridge/android/settings.gradle

@@ -1,5 +1,4 @@
 rootProject.name = '@wordpress/react-native-bridge'
 
-include ':react-native-aztec'
-project(':react-native-aztec').projectDir = new File(rootProject.projectDir, '../../react-native-aztec/android')
-
+include ':@wordpress_react-native-aztec'
+project(':@wordpress_react-native-aztec').projectDir = new File(rootProject.projectDir, '../../react-native-aztec/android')

packages/react-native-bridge/package.json

@@ -10,6 +10,9 @@
   ],
   "author": "",
   "license": "GPL-2.0-or-later",
+  "dependencies": {
+    "@wordpress/react-native-aztec": "file:../react-native-aztec"
+  },
   "peerDependencies": {
     "react-native": "*"
   }

packages/react-native-editor/.gitignore

@@ -19,6 +19,9 @@ yarn-error.log*
 # OS X
 .DS_Store
 
+# JS Builds
+bundle/
+
 # Android builds
 *.apk
 *.ap_

packages/react-native-editor/android/app/build.gradle

@@ -77,7 +77,7 @@ project.ext.react = [
     enableHermes: true,  // clean and rebuild if changing
 ]
 
-apply from: "../../node_modules/react-native/react.gradle"
+apply from: "../../../../node_modules/react-native/react.gradle"
 
 /**
  * Set this to true to create two separate APKs instead of one:
@@ -155,12 +155,12 @@ repositories {
 
 
 dependencies {
+    implementation project(':@wordpress_react-native-aztec')
+    implementation project(':@wordpress_react-native-bridge')
     implementation project(':react-native-linear-gradient')
     implementation project(':@react-native-community_slider')
     implementation project(':react-native-video')
     implementation project(':react-native-svg')
-    implementation project(':react-native-aztec')
-    implementation project(':react-native-gutenberg-bridge')
     implementation "org.wordpress:utils:$wordpressUtilsVersion"
     implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation "com.facebook.react:react-native:+"  // From node_modules
@@ -172,5 +172,3 @@ task copyDownloadableDepsToLibs(type: Copy) {
     from configurations.compile
     into 'libs'
 }
-
-apply from: file("../../../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

packages/react-native-editor/android/build.gradle

@@ -27,7 +27,7 @@ allprojects {
         mavenLocal()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url("$rootDir/../node_modules/react-native/android")
+            url("$rootDir/../../../node_modules/react-native/android")
         }
 
         google()

packages/react-native-editor/android/settings.gradle

@@ -1,17 +1,15 @@
 rootProject.name = 'gutenberg'
 
-apply from: file("../../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
-
+include ':@wordpress_react-native-bridge'
+project(':@wordpress_react-native-bridge').projectDir = new File(rootProject.projectDir, '../../react-native-bridge/android')
+include ':@wordpress_react-native-aztec'
+project(':@wordpress_react-native-aztec').projectDir = new File(rootProject.projectDir, '../../react-native-aztec/android')
 include ':@react-native-community_slider'
 project(':@react-native-community_slider').projectDir = new File(rootProject.projectDir, '../../../node_modules/@react-native-community/slider/src/android')
 include ':react-native-video'
 project(':react-native-video').projectDir = new File(rootProject.projectDir, '../../../node_modules/react-native-video/android-exoplayer')
 include ':react-native-svg'
 project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../../../node_modules/react-native-svg/android')
-include ':react-native-aztec'
-project(':react-native-aztec').projectDir = new File(rootProject.projectDir, '../../react-native-aztec/android')
-include ':react-native-gutenberg-bridge'
-project(':react-native-gutenberg-bridge').projectDir = new File(rootProject.projectDir, '../../react-native-bridge/android')
 include ':react-native-linear-gradient'
 project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../../../node_modules/react-native-linear-gradient/android')