Skip to content
This repository has been archived by the owner on Aug 28, 2023. It is now read-only.

Remove forked repository source for react-native-linear-gradient #10

Merged
merged 3 commits into from
Jun 28, 2023

Conversation

fluiddot
Copy link

@fluiddot fluiddot commented Jun 28, 2023

Following wordpress-mobile/react-native-libraries-publisher#30, we'll no longer use the forked version of react-native-linear-gradient library. So, we can now use the package version provided by npm.

NOTE: I removed the yarn.lock file as we already use package-lock.json lock file. Seems it's not recommended to have both lock files as it can cause problems when installing dependencies. The original repository doesn't use Yarn, so in order to align with it, we can remove this file. I finally removed package-lock.json file instead yarn.lock to avoid conflicts in the lock files. My rationale is that as we introduced Yarn when creating the fork and we've only updated that lock file in the last changes (example), makes sense to only rely upon it.

"inBundle": true,
"license": "ISC",
"optional": true
},
"node_modules/fsevents/node_modules/are-we-there-yet": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fluiddot, I'm not clear why these fields have been removed, could you help me to understand?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good observation. To be honest, I'm not completely sure why they got removed. It might be related to the node/npm version I used when installing the dependencies (v18.14.0 (npm v9.6.1)). I've just tried using node 16 and seems that those fields are back 🤔. I'll edit the commits and push them again. Thanks!

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that I couldn't use node 14 (v14.21.3 (npm v6.14.18)), as the lockfileVersion of package-lock.json file is 2. This lock version is compatible with npm 7 and above (reference).

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've just tried using node 16 and seems that those fields are back 🤔. I'll edit the commits and push them again. Thanks!

Seems it's not related to this, as I experienced it again when removing node_modules and installing the dependencies. Besides, I also reproduced it using the wp-fork branch, so something is weird with the lock files.

In the PR I mentioned that the original repository doesn't use Yarn. Not sure why we introduced it when creating the fork., but I'm thinking of, instead of removing the yarn.lock file, removing package-lock.json and relying only upon Yarn as it was introduced later in the repo.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SiobhyB I updated the commits and, as mentioned above, now we only rely upon Yarn. Let me know if you could take another look. Thanks!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My best guess is that Yarn was introduced to the forked repo during the period of time mobile Gutenberg relied upon Yarn. I believe that was pre-mono-repo-merge.

I feel are-we-there-yet is quite notorious for changing in an obscure, unexpected manner. The approach of rm -rf node_modules && npm install generally results in the correct outcome, so it could be that an update to the file is accurate. Maybe the update was overlooked previously.

While odd, I think it is fine to retain Yarn for the time being, particularly if the long-term goal is to remove the fork entirely.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My best guess is that Yarn was introduced to the forked repo during the period of time mobile Gutenberg relied upon Yarn. I believe that was pre-mono-repo-merge.

Yep, that makes sense.

I feel are-we-there-yet is quite notorious for changing in an obscure, unexpected manner. The approach of rm -rf node_modules && npm install generally results in the correct outcome, so it could be that an update to the file is accurate. Maybe the update was overlooked previously.

I also thought that might have been overlooked, although not completely sure.

While odd, I think it is fine to retain Yarn for the time being, particularly if the long-term goal is to remove the fork entirely.

Exactly, eventually, we'll remove the fork so probably it's not critical to keep using Yarn. As a side note, I noticed that most of the forked repositories we use in Gutenberg Mobile use Yarn.

It's not recommended to have both `yarn.lock` and `package-lock.json` files as it can cause problems when installing dependencies. We introduced Yarn when creating the fork, so it makes sense to rely only upon it and remove `package-lock.json` file.
@fluiddot fluiddot force-pushed the use-npm-react-native-linear-gradient branch from b1c3799 to a451f9c Compare June 28, 2023 10:44
@fluiddot fluiddot requested a review from SiobhyB June 28, 2023 10:49
fluiddot added a commit to WordPress/gutenberg that referenced this pull request Jun 28, 2023
The integrity checksum of `react-native-hsv-color-picker` changed because the package has been modified (ref: wordpress-mobile/react-native-hsv-color-picker#10 (comment))
Copy link

@SiobhyB SiobhyB left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for updating @fluiddot! 👏 🎉

@fluiddot fluiddot merged commit 5dbd3f0 into wp-fork Jun 28, 2023
fluiddot added a commit to WordPress/gutenberg that referenced this pull request Jul 27, 2023
* Upgrade `react-native` dependency

* Upgrade `@babel/runtime` dependency

* Upgrade `metro-react-native-babel` preset and transformer dependencies

* Upgrade `cocoapods` gem

* Re-apply `react-devtools-core` patch to new version

* Update jest snapshots with new a11y values

* Mock `Linking.addEventListener` function

`Linking.removeEventListener` has been removed in RN `0.71`. The library is mocked by default but doesn't return the `remove` function when calling `addEventListener`.

* Update tests that fail due to use of debounce and link suggestions

* Fix `MediaUpload` component test

* Update `@react-navigation/native` package to version `6.0.14`

* Update `react-native-reanimated` to version `2.17.0`

* Update `react-native-gesture-handler` to version `2.10.2`

* Fix `act` warnings produced during block insertion

* Fix `act` warnings in Columns block tests

* Fix `act` warnings in List block tests

* Upgrade `react-native` dependency to version `0.71.11`

It also upgrades `metro-react-native-babel` dependencies following the upgrade helper.

* Mock return value of Linking `addEventListener`

We only need to mock the return the value, hence we don't need to mock the entire library.

* Remove `waitForModalVisible` usage in Paragraph block tests

* Remove `waitFor` usage in Link settings tests

* test: Fix act warning by awaiting LinkPicker loading indicator removal

The loading indicator is displayed and subsequently removed once the
suggestion fetches resolve. Explicitly awaiting this element's removal
fixes the `act` warnings.

* build: Update react-native-safe-area-context to 4.6.3

* build: Upgrade react-native-screens to 3.22.0

* build: Upgrade react-native-svg to 13.9.0

Based on the release notes breaking changes, we should look out for odd
sizing or display of icons, particularly on Android.

* build: Upgrade @react-native-masked-view/masked-view to 0.2.9

* build: Upgrade @react-native-clipboard/clipboard to 1.11.2

* build: Upgrade react-native-modal to 13.0.1

* test: Update link modal snapshot

This change is a result of applying new props from the RN upgrade to a
newly introduced snapshot in trunk: 71d2dc5

* Update `@react-navigation/stack` to version `6.3.5`

* Upgrade `react-native-linear-gradient` to version `2.7.3`

This commit also updates the `react-native-hsv-color-picker` library to point to the same version of `react-native-linear-gradient`.

* Use `react-native-safe-area-context` mock provided by the library

* Update link modal snapshot

* Update `package-lock.json` file

The integrity checksum of `react-native-hsv-color-picker` changed because the package has been modified (ref: wordpress-mobile/react-native-hsv-color-picker#10 (comment))

* Disable `react-native-screens` in navigators

`react-native-screens` is meant to be used at root level to save memory when having inactive screens. This is not the case of the editor, as the stack navigators are used within the Bottom sheet component.
As a side note, enabling `react-native-screens` here leads to the editor crashing.

* Fix render order of animated view to highlight selected segment

Rendering the animated view before the segments will ensure that is rendered behind them.

* Update source of `react-native-hsv-color-picker` to use tag version

* Revert "Update link modal snapshot"

This reverts commit 7988b0e.

This is needed after disabling `react-native-screens` in navigators (ref: e5838f4).

* [RNMobile] Upgrade React Native `0.71.11` - iOS changes (#51386)

* refactor: Extract bundle version number to var

* refactor: Delete /.ruby-version, no longer needed

* refactor: Update /podfile to align w/RN updates

* refactor: Remove path names as part of RN upgrade

* Update `Podfile` with changes from RN upgrade helper

* Fix React Native path for `react_native_post_install` script

* Update Pods

* Add patch to fix Reanimated podspec

Without this patch, Reanimated tries to use Hermes version of React Native and produced a build failure. Seems there's an issue in the `podspec` file, as the JSC module is not being added.
Reference: software-mansion/react-native-reanimated#4254

* Update pods to reflect 0.71.11 target

* Apply changes to pods following `pod install`

* Update `Podfile.lock` file

---------

Co-authored-by: Siobhan <siobhan@automattic.com>

* [RNMobile] Upgrade React Native `0.71.11` - Android changes (#51289)

* Upgrade Gradle to version 7.5.1

* Upgrade Gradle plugin

* Remove no longer needed files in new version

* Update Flipper initialization

* Update demo project main application

* Remove gradle download task plugin

* Bump ndk version

* Remove no longer need logic related to `newArchEnabled`

* Apply plugin React Native Gradle plugin

* Use React Native and Hermes modules from Maven

We no longer need to publish these binaries because React Native team is publishing React Native binaries to Maven.

* Remove exclude group from Flipper

* Update comments in `build.gradle` to align with new RN version

* Remove deprecated Gradle property

* Add `mavenLocal` repository to allow testing local binaries

* Bump Reanimated and Gesture handler libraries

* Revert "Upgrade Gradle plugin"

This reverts commit 82764a2.

* build: Resolve react-native-gradle-plugin incompatability

Due to host app requirements, we must use AGP 7.2.1. The included patch
disables logic requiring AGP 7.3. The logic appears to not be required
for our use cases in the Demo editor or host apps.

We should remove this patch once we upgrade past AGP 7.3.

* Reduce priority of `mavenLocal` repository in Android build configurations

Maven local is used to provide dependencies located locally, which is mainly used for testing and debugging. Hence, published dependencies should be prioritized over local ones.

* Disable `react-native-screens` in navigators

`react-native-screens` is meant to be used at root level to save memory when having inactive screens. This is not the case of the editor, as the stack navigators are used within the Bottom sheet component.
As a side note, enabling `react-native-screens` here leads to the editor crashing.

* Fix render order of animated view to highlight selected segment

Rendering the animated view before the segments will ensure that is rendered behind them.

* Bump Linear gradient Android library

This library is now published via the `react-native-libraries-publisher` repository.

---------

Co-authored-by: David Calhoun <github@davidcalhoun.me>

* Avoid exception in E2E tests when typing an empty string on Android

* Update a11y id queries for Android E2E tests

Starting in React Native 0.71, the accessibility hint is no longer appended to the accessibility content description. Reference: facebook/react-native@0b70b38

* Update button inline appender query for Android E2E tests

* Unify press keycode function for E2E tests

* Update comments in functions related to pressing a keycode

* Update block drop position using Reanimated's shared value

Seems there's some kind of incompatibility on calling a JS function from a worklet invoked from a gesture handler. For this reason, the logic to set the dropping insertion point has been updated. It now uses a Reanimated's shared value to keep the dragging over position and  `useDerivedValue` hook to listen for changes.

* Remove unneeded `hidden` param in Paragraph block test case

Co-authored-by: David Calhoun <github@davidcalhoun.me>

* Revert removing `.ruby-version` file

* Add inline comment in Reanimated patch

* Use `waitForElementToBeRemoved` in Paragraph block test cases

This way we can avoid waiting for any microtasks of link suggestions.

* Remove `act` statements from Link Settings test cases

* fix: Cover focal point drag handle visibility

The lack of an explicit width or height resulted in a invisible drag
handle. The logic passing the dimensions to the SVG expected a single
style object. The reality is that it (1) referenced only the Sass styles
and (2) the combined reference was actually an array of style objects.

Updating the reference and flattening it ensures the appropriate width
and height are passed to the SVG.

It appears the absence of explicit dimensions was not an issue in
earlier versions of React Native, but it makes sense why it might be
required.

* [RNMobile] Use Reanimated in bottom sheet height animation (#52563)

* Expose max height properties in `BottomSheetProvider`

* Animate bottom sheet's height with Reanimated

Pass `currentHeight` in bottom sheet navigation context

* Use pixel value when setting fullscreen height

We need to pass pixel values in order to animate the height with Reanimated.

* Rename `heightRef` to `maxHeight`

* Re-enable `exhaustive-deps` lint rule in `BottomSheetNavigationContainer`

* Avoid setting height using debounce

* Add test ID to navigation container component

* Mock Reanimated's `now` function

* Update test cases related to bottom sheet height animation

* Update test snapshots

* Update `react-native-editor` changelog

* Drop unsupported `--no-jetifier` from Android cmd

The `--no-jetifier` option no longer appears to be supported and results in an error when attempting to build the Android demo app.

Ref: wordpress-mobile/gutenberg-mobile#5881 (comment)

* Revert accidental change to .ruby-version

* Restore correct dependencies to package-lock.json

* Update `react-native-editor` changelog

* Update `package-lock.json` file to revert previous conflict resolutions

In 4482b9d we had a conflict in `package-lock.json` that was solved using the changes from this branch. However, seems that something went wrong and that although the editor has no issues, some e2e tests are failing due to this.

This has been solved by using the latest version of `package-lock.json` file from `trunk` and updating it with the package updates required in the React Native upgrade.

* Re-apply `react-devtools-core` patch to new version

* Update `Podfile.lock` file

---------

Co-authored-by: David Calhoun <github@davidcalhoun.me>
Co-authored-by: Siobhan <siobhan@automattic.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants