[Gutenberg] Enable build from monorepo #11956

cameronvoell · 2020-05-20T05:30:23Z

Description

This PR adds the necessary changes for building WordPress-Android using the new Gutenberg/Gutenberg-Mobile Monorepo setup.

Related PR's:

Gutenberg Monorepo PR's for fixing WPAndroid build

GB-Mobile: Target gutenberg monorepo branch gutenberg-mobile#2172
Gutenberg: [RNMobile][Monorepo] Make the native app customizable by a parent app WordPress/gutenberg#21332

Background Info on build changes to stop using jitpack for building GB-Mobile

Initial Fix for WPAndroid 14.8 Release: Build gutenberg-mobile locally without JitPack #11833
Incorporating no jitpack into Gutenberg-mobile editor release: Gutenberg/no jitpack updates to gutenberg 1.28 branch #11921
Merging 14.8 release back into master: Merge 14.8 final to develop #11933

To test:

cd libs/gutenberg-mobile
npm install
npm run wpandroid

PR submission checklist:

I have considered adding unit tests where possible.
I have considered adding accessibility improvements for my changes.
I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

peril-wordpress-mobile · 2020-05-20T05:30:28Z

	Warnings
⚠️	PR is missing at least one label.
⚠️	PR is not assigned to a milestone.

Generated by 🚫 dangerJS

peril-wordpress-mobile · 2020-05-20T05:30:29Z

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

mchowning

👋 @cameronvoell ! Lots of great progress here!

Not sure if this has been implemented yet, but building with the wp.BUILD_GUTENBERG_FROM_SOURCE flag set to true fails for me:

Could not determine the dependencies of task ':react-native-video:generateDebugRFile'.
> Could not resolve all task dependencies for configuration ':react-native-video:debugRuntimeClasspath'.
   > Could not find com.facebook.react:react-native:0.61.5.
     Searched in the following locations:
       - file:/Users/matt/.m2/repository/com/facebook/react/react-native/0.61.5/react-native-0.61.5.pom
       - file:/Users/matt/.m2/repository/com/facebook/react/react-native/0.61.5/react-native-0.61.5.jar
       - file:/Users/matt/dev/a8c/WordPress-Android/libs/gutenberg-mobile/gutenberg/node_modules/react-native-video/node_modules/react-native/android/com/facebook/react/react-native/0.61.5/react-native-0.61.5.pom
       - file:/Users/matt/dev/a8c/WordPress-Android/libs/gutenberg-mobile/gutenberg/node_modules/react-native-video/node_modules/react-native/android/com/facebook/react/react-native/0.61.5/react-native-0.61.5.jar
     Required by:
         project :react-native-video

Let me know if you think that might just be a local issue on my machine.

~~Also, if I am not building from source (wp.BUILD_GUTENBERG_FROM_SOURCE=false), I'm getting the error mentioned in this comment when I load the editor.~~ Resolved

mchowning · 2020-06-01T18:28:56Z

settings.gradle

@@ -9,25 +9,27 @@ include ':libs:login:WordPressLoginFlow'
 include ':WordPressMocks'
 project(':WordPressMocks').projectDir = new File(rootProject.projectDir, properties.getOrDefault('wp.wordpress_mocks_path', 'libs/mocks') + '/WordPressMocks')

-include ':react-native-aztec'
-project(':react-native-aztec').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/react-native-aztec/android')
+include ':@wordpress_react-native-aztec'


I'm curious, what is the significance of using an "@" and adding the "wordpress" prefix both here and for @wordPress_react-native-bridge?

It just reflects the npm package name @wordpress/react-native-aztec. When you autolink a react-native dependency, it will keep the @ and replace the / with an _.

peril-wordpress-mobile · 2020-06-05T11:52:28Z

You can test the changes on this Pull Request by downloading the APK here.

hypest · 2020-06-17T11:12:01Z

Went in to try to help with the Could not find com.facebook.react:react-native:0.61.5 issue @mchowning mentioned above and it seems that this diff on the root build.gradle would suffice:

-url "$rootDir/libs/gutenberg-mobile/node_modules/react-native/android"
+url "$rootDir/libs/gutenberg-mobile/gutenberg/node_modules/react-native/android"

essentially just pointing out that the node_modules we're interested in now is nested inside the gutenberg folder.

Similarly like WordPress/gutenberg@aa3d0ef

cameronvoell · 2020-06-19T02:33:05Z

There are two items I could use feedback on this PR @mchowning @marecar3

wp.BUILD_GUTENBERG_FROM_SOURCE = true, could you check to see if editing an unsupported block works for you? It's been working for me, but @hypest was unable to have that work this today
wp.BUILD_GUTENBERG_FROM_SOURCE = 'false':
I'm currently seeing an error running installWasabiDebug related to our patch-react-native script. If I remove the call to the patch script from our post-install in gutenberg-mobile/package.json, the error goes away. Any ideas on if we need this patch in this build flow, or how to apply it correctly are welcome. See error log below:

> [email protected] patch-react-native /Users/cameronvoell/FRESH/WordPress-Android/libs/gutenberg-mobile
> git apply --ignore-whitespace patches/react-native+0.61.5.patch

error: patch failed: gutenberg/node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheetManager.m:66
error: gutenberg/node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheetManager.m: patch does not apply
error: patch failed: gutenberg/node_modules/react-native/React/Views/RCTShadowView.m:156
error: gutenberg/node_modules/react-native/React/Views/RCTShadowView.m: patch does not apply
npm ERR! code ELIFECYCLE
npm ERR! errno 1
npm ERR! [email protected] patch-react-native: `git apply --ignore-whitespace patches/react-native+0.61.5.patch`
npm ERR! Exit status 1

Changes below fix the error, and I'm able to open the editor, but I'm assuming this is here for a reason, and didn't get to dig in yet on whether we need to apply the patch in this specific flow:
gutenberg-mobile/package.json

   "scripts": {
-    "postinstall": "npm install --prefix gutenberg && npm run patch-react-native",
+    "postinstall": "npm install --prefix gutenberg",

hypest · 2020-06-19T07:54:15Z

but @hypest was unable to have that work this today

On 6e234e4 that did my testing, I consistently see the Markdown block not working on the Pixel 2XL Android 10 but works OK on S7Edge Android 8. So, I think this is probably a webview issue between the OS/vendor versions, not a Monorepo issue.

hypest · 2020-06-19T11:30:02Z

I can confirm the error: patch failed situation. The error happens unless we delete the node_modules folders.

marecar3 · 2020-06-22T14:51:07Z

There are two items I could use feedback on this PR @mchowning @marecar3

wp.BUILD_GUTENBERG_FROM_SOURCE = true, could you check to see if editing an unsupported block works for you? It's been working for me, but @hypest was unable to have that work this today

Hey @cameronvoell, I couldn't reproduce the issue that @hypest has experienced while testing an unsupported block on monorepo branches.

Also, could you maybe update this branch with the latest develop branch as it has some fixes which are related to an unsupported block project? thanks.

hypest · 2020-06-23T08:44:22Z

Also, could you maybe update this branch with the latest develop branch as it has some fixes which are related to an unsupported block project? thanks.

What are the fixes @marecar3 ? The plan is to not update the monorepo branches unless really needed. The various projects can then target the post-monorepo branches with any fixes or for releasing features.

marecar3 · 2020-06-23T09:39:00Z

Also, could you maybe update this branch with the latest develop branch as it has some fixes which are related to an unsupported block project? thanks.

What are the fixes @marecar3 ? The plan is to not update the monorepo branches unless really needed. The various projects can then target the post-monorepo branches with any fixes or for releasing features.

Hey @hypest 👋
This is the fix: #12222
I wasn't aware that we can't update WPAndroid PR with the latest develop.

hypest · 2020-06-23T11:03:30Z

Ah, looks like 12222 has already been merged to WPAndroid develop so, the monorepo PR would need to update to that or we might need to revert 12222 and put it on the "after-1.31" branch. cc @cameronvoell , @mchowning

mchowning · 2020-06-23T20:30:20Z

Updated this PR to target the gutenberg release branch and did a very quick smoke test of this with the submodule update in e0c2c8e, and the editor is loading well for me with both from-source builds and builds that generate the bundle. 👍 I think we can go ahead and merge this to the release branch.

Ah, looks like 12222 has already been merged to WPAndroid develop so, the monorepo PR would need to update to that or we might need to revert 12222 and put it on the "after-1.31" branch.

I'm only seeing a pretty very small fix in WPAndroid with #12222 . If that's it, I'm inclined to favor just keeping it in the release. And we can change our mind later, and still revert it if we want.

cameronvoell added 2 commits May 19, 2020 21:15

Updated RN aztec and bridge locations for monorepo

128ce03

Update gb-mobile to monorepo branch

fc90ec5

cameronvoell requested review from Tug and ceyhun May 20, 2020 05:30

cameronvoell and others added 2 commits May 19, 2020 23:57

Update gb ref for updating node version

7eed50b

Update lint baseline and gutenberg-mobile ref

d552343

Tug mentioned this pull request May 27, 2020

Target gutenberg monorepo branch wordpress-mobile/gutenberg-mobile#2172

Merged

22 tasks

Tug added 3 commits June 1, 2020 15:22

Update paths to react-native dependencies in settings.gradle

6d0d444

Update gutenberg-mobile submodule

ecd2327

Update circle-ci config

177d8a3

mchowning reviewed Jun 1, 2020

View reviewed changes

Update gutenberg-mobile ref

104fdba

cameronvoell changed the title ~~Post GB-Mobile Monorepo build fixes~~ [Gutenberg] Enable build from monorepo Jun 4, 2020

cameronvoell and others added 5 commits June 4, 2020 21:37

Update gutenberg ref

509b2ef

Fix npm cache on CI

d0058fe

Fix android js bundle asset folder

512a52b

Fix rn bridge asset folder path

137fe78

Always checkout submodules recursively but shallow

a0b81d6

ceyhun and others added 3 commits June 5, 2020 14:46

Fix lint errors

4edbb24

Update gutenberg ref

b8c5400

Update gutenberg ref

a2dd90b

ceyhun and others added 5 commits June 17, 2020 18:30

Fix build when wp.BUILD_GUTENBERG_FROM_SOURCE=true

7c93c28

Update gutenberg-mobile ref

54904ed

Merge branch 'develop' into gutenberg/enable-build-from-monorepo

b6d79f3

Bump gb-mobile hash

3a75197

Resolve the multiple kotlin_module file error

f8a2ce4

Similarly like WordPress/gutenberg@aa3d0ef

Updating gutenberg ref

91a1e2a

cameronvoell marked this pull request as ready for review June 18, 2020 17:04

hypest and others added 3 commits June 18, 2020 20:25

react-native-recyclerview is not used anymore

7459ed0

Update gutenberg ref

6e234e4

Only mkdir assets if not existing

72f07e7

hypest and others added 3 commits June 19, 2020 15:29

Bump gb-mobile hash

18e12b0

Bump gb-mobile hash

df19ea1

Update gutenberg-mobile ref

d7d57f9

mchowning changed the base branch from develop to gutenberg/integrate_release_1.31.0 June 23, 2020 20:14

mchowning approved these changes Jun 23, 2020

View reviewed changes

Update gutenberg submodule ref

e0c2c8e

mchowning merged commit 576ab90 into gutenberg/integrate_release_1.31.0 Jun 23, 2020

mchowning deleted the gutenberg/enable-build-from-monorepo branch June 23, 2020 21:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Gutenberg] Enable build from monorepo #11956

[Gutenberg] Enable build from monorepo #11956

cameronvoell commented May 20, 2020 •

edited

Loading

peril-wordpress-mobile bot commented May 20, 2020 •

edited

Loading

peril-wordpress-mobile bot commented May 20, 2020 •

edited

Loading

mchowning left a comment •

edited

Loading

mchowning Jun 1, 2020 •

edited

Loading

Tug Jun 3, 2020

peril-wordpress-mobile bot commented Jun 5, 2020 •

edited

Loading

hypest commented Jun 17, 2020 •

edited

Loading

cameronvoell commented Jun 19, 2020

hypest commented Jun 19, 2020 •

edited

Loading

hypest commented Jun 19, 2020

marecar3 commented Jun 22, 2020 •

edited

Loading

hypest commented Jun 23, 2020

marecar3 commented Jun 23, 2020

hypest commented Jun 23, 2020

mchowning commented Jun 23, 2020 •

edited

Loading

[Gutenberg] Enable build from monorepo #11956

[Gutenberg] Enable build from monorepo #11956

Conversation

cameronvoell commented May 20, 2020 • edited Loading

Description

Related PR's:

Gutenberg Monorepo PR's for fixing WPAndroid build

Background Info on build changes to stop using jitpack for building GB-Mobile

peril-wordpress-mobile bot commented May 20, 2020 • edited Loading

peril-wordpress-mobile bot commented May 20, 2020 • edited Loading

mchowning left a comment • edited Loading

Choose a reason for hiding this comment

mchowning Jun 1, 2020 • edited Loading

Choose a reason for hiding this comment

Tug Jun 3, 2020

Choose a reason for hiding this comment

peril-wordpress-mobile bot commented Jun 5, 2020 • edited Loading

hypest commented Jun 17, 2020 • edited Loading

cameronvoell commented Jun 19, 2020

hypest commented Jun 19, 2020 • edited Loading

hypest commented Jun 19, 2020

marecar3 commented Jun 22, 2020 • edited Loading

hypest commented Jun 23, 2020

marecar3 commented Jun 23, 2020

hypest commented Jun 23, 2020

mchowning commented Jun 23, 2020 • edited Loading

cameronvoell commented May 20, 2020 •

edited

Loading

peril-wordpress-mobile bot commented May 20, 2020 •

edited

Loading

peril-wordpress-mobile bot commented May 20, 2020 •

edited

Loading

mchowning left a comment •

edited

Loading

mchowning Jun 1, 2020 •

edited

Loading

peril-wordpress-mobile bot commented Jun 5, 2020 •

edited

Loading

hypest commented Jun 17, 2020 •

edited

Loading

hypest commented Jun 19, 2020 •

edited

Loading

marecar3 commented Jun 22, 2020 •

edited

Loading

mchowning commented Jun 23, 2020 •

edited

Loading