{
await page.type( '.editor-post-title__input', 'My Image Format' );
await clickBlockAppender();
await page.keyboard.press( 'Backspace' );
+ // Wait for the selection to update.
+ await page.evaluate(
+ () => new Promise( window.requestAnimationFrame )
+ );
await page.keyboard.press( 'Backspace' );
await saveDraft();
await page.reload();
await page.waitForSelector( '.edit-post-layout' );
+ // Wait a bit more for getEditedPostContent to be correct
+ await page.waitForSelector(
+ '.block-editor-default-block-appender__content'
+ );
+
expect( await getEditedPostContent() ).toMatchSnapshot();
} );
diff --git a/packages/element/package.json b/packages/element/package.json
index a124978b71b103..c84bd4365a2da2 100644
--- a/packages/element/package.json
+++ b/packages/element/package.json
@@ -33,8 +33,8 @@
"@types/react-dom": "^16.9.0",
"@wordpress/escape-html": "file:../escape-html",
"lodash": "^4.17.21",
- "react": "^16.13.1",
- "react-dom": "^16.13.1"
+ "react": "^17.0.1",
+ "react-dom": "^17.0.1"
},
"publishConfig": {
"access": "public"
diff --git a/packages/jest-preset-default/package.json b/packages/jest-preset-default/package.json
index ae3ac3aaacdeee..935b56c8dfc654 100644
--- a/packages/jest-preset-default/package.json
+++ b/packages/jest-preset-default/package.json
@@ -31,10 +31,10 @@
],
"main": "index.js",
"dependencies": {
+ "@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
"@wordpress/jest-console": "file:../jest-console",
"babel-jest": "^26.6.3",
"enzyme": "^3.11.0",
- "enzyme-adapter-react-16": "^1.15.2",
"enzyme-to-json": "^3.4.4"
},
"peerDependencies": {
diff --git a/packages/jest-preset-default/scripts/setup-test-framework.js b/packages/jest-preset-default/scripts/setup-test-framework.js
index 2ec5d6c3ddebf6..0a243bff801b12 100644
--- a/packages/jest-preset-default/scripts/setup-test-framework.js
+++ b/packages/jest-preset-default/scripts/setup-test-framework.js
@@ -12,7 +12,9 @@ jest.mock( 'enzyme', () => {
mockEnzymeSetup = true;
// configure enzyme 3 for React, from docs: http://airbnb.io/enzyme/docs/installation/index.html
- const Adapter = jest.requireActual( 'enzyme-adapter-react-16' );
+ const Adapter = jest.requireActual(
+ '@wojtekmaj/enzyme-adapter-react-17'
+ );
actualEnzyme.configure( { adapter: new Adapter() } );
}
return actualEnzyme;
diff --git a/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java b/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java
index a8e02bfeb35f5d..b1652093b89807 100644
--- a/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java
+++ b/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java
@@ -559,9 +559,9 @@ public Map getCommandsMap() {
}
@Override
- public void receiveCommand(final ReactAztecText parent, int commandType, @Nullable ReadableArray args) {
+ public void receiveCommand(final ReactAztecText parent, String commandType, @Nullable ReadableArray args) {
Assertions.assertNotNull(parent);
- if (commandType == mFocusTextInputCommandCode) {
+ if (commandType.equals("focus")) {
// schedule a request to focus in the next layout, to fix https://github.com/wordpress-mobile/gutenberg-mobile/issues/1870
new Handler(Looper.getMainLooper()).post(new Runnable() {
@Override
@@ -570,7 +570,7 @@ public void run() {
}
});
return;
- } else if (commandType == mBlurTextInputCommandCode) {
+ } else if (commandType.equals("blur")) {
parent.clearFocusFromJS();
return;
}
diff --git a/packages/react-native-aztec/ios/RNTAztecView/RCTAztecViewManager.m b/packages/react-native-aztec/ios/RNTAztecView/RCTAztecViewManager.m
index e61da29eb13f05..db468a71be0b8f 100644
--- a/packages/react-native-aztec/ios/RNTAztecView/RCTAztecViewManager.m
+++ b/packages/react-native-aztec/ios/RNTAztecView/RCTAztecViewManager.m
@@ -32,5 +32,8 @@ @interface RCT_EXTERN_MODULE(RCTAztecViewManager, NSObject)
RCT_REMAP_VIEW_PROPERTY(textAlign, textAlignment, NSTextAlignment)
RCT_REMAP_VIEW_PROPERTY(selectionColor, tintColor, UIColor)
+RCT_EXTERN_METHOD(focus:(nonnull NSNumber *)viewTag)
+RCT_EXTERN_METHOD(blur:(nonnull NSNumber *)viewTag)
+
@end
diff --git a/packages/react-native-aztec/ios/RNTAztecView/RCTAztecViewManager.swift b/packages/react-native-aztec/ios/RNTAztecView/RCTAztecViewManager.swift
index eacc94225b2661..184d465e5d25cd 100644
--- a/packages/react-native-aztec/ios/RNTAztecView/RCTAztecViewManager.swift
+++ b/packages/react-native-aztec/ios/RNTAztecView/RCTAztecViewManager.swift
@@ -34,9 +34,9 @@ public class RCTAztecViewManager: RCTViewManager {
return view
}
- func executeBlock(_ block: @escaping (RCTAztecView) -> Void, onNode node: NSNumber) {
- self.bridge.uiManager.addUIBlock { (manager, viewRegistry) in
- let view = viewRegistry?[node]
+ func executeBlock(viewTag: NSNumber, block: @escaping (RCTAztecView) -> Void) {
+ self.bridge.uiManager.addUIBlock { (uiManager, viewRegistry) in
+ let view = viewRegistry?[viewTag]
guard let aztecView = view as? RCTAztecView else {
return
}
@@ -66,4 +66,19 @@ public class RCTAztecViewManager: RCTViewManager {
defaultStyle.textListParagraphSpacingBefore = 5
return defaultStyle
}
+
+ @objc
+ func focus(_ viewTag: NSNumber) -> Void {
+ self.executeBlock(viewTag: viewTag) { (aztecView) in
+ aztecView.reactFocus()
+ }
+ }
+
+ @objc
+ func blur(_ viewTag: NSNumber) -> Void {
+ self.executeBlock(viewTag: viewTag) { (aztecView) in
+ aztecView.reactBlur()
+ }
+ }
}
+
diff --git a/packages/react-native-aztec/src/AztecView.js b/packages/react-native-aztec/src/AztecView.js
index 854b26f745f408..f08bb172dd15fb 100644
--- a/packages/react-native-aztec/src/AztecView.js
+++ b/packages/react-native-aztec/src/AztecView.js
@@ -2,7 +2,6 @@
* External dependencies
*/
import {
- findNodeHandle,
requireNativeComponent,
UIManager,
TouchableWithoutFeedback,
@@ -12,7 +11,7 @@ import TextInputState from 'react-native/Libraries/Components/TextInput/TextInpu
/**
* WordPress dependencies
*/
-import { Component } from '@wordpress/element';
+import { Component, createRef } from '@wordpress/element';
import { ENTER, BACKSPACE } from '@wordpress/keycodes';
const AztecManager = UIManager.getViewManagerConfig( 'RCTAztecView' );
@@ -20,6 +19,8 @@ const AztecManager = UIManager.getViewManagerConfig( 'RCTAztecView' );
class AztecView extends Component {
constructor() {
super( ...arguments );
+ this.aztecViewRef = createRef();
+
this._onContentSizeChange = this._onContentSizeChange.bind( this );
this._onEnter = this._onEnter.bind( this );
this._onBackspace = this._onBackspace.bind( this );
@@ -40,7 +41,7 @@ class AztecView extends Component {
dispatch( command, params ) {
params = params || [];
UIManager.dispatchViewManagerCommand(
- findNodeHandle( this ),
+ this.aztecViewRef.current,
command,
params
);
@@ -126,7 +127,7 @@ class AztecView extends Component {
_onBlur( event ) {
this.selectionEndCaretY = null;
- TextInputState.blurTextInput( findNodeHandle( this ) );
+ TextInputState.blurTextInput( this.aztecViewRef.current );
if ( ! this.props.onBlur ) {
return;
@@ -178,16 +179,16 @@ class AztecView extends Component {
}
blur() {
- TextInputState.blurTextInput( findNodeHandle( this ) );
+ TextInputState.blurTextInput( this.aztecViewRef.current );
}
focus() {
- TextInputState.focusTextInput( findNodeHandle( this ) );
+ TextInputState.focusTextInput( this.aztecViewRef.current );
}
isFocused() {
- const focusedField = TextInputState.currentlyFocusedField();
- return focusedField && focusedField === findNodeHandle( this );
+ const focusedField = TextInputState.currentlyFocusedInput();
+ return focusedField && focusedField === this.aztecViewRef.current;
}
_onPress( event ) {
@@ -243,6 +244,7 @@ class AztecView extends Component {
// combination generate an infinite loop as described in https://github.com/wordpress-mobile/gutenberg-mobile/issues/302
onFocus={ this._onAztecFocus }
onBlur={ this._onBlur }
+ ref={ this.aztecViewRef }
/>
);
diff --git a/packages/react-native-bridge/android/react-native-bridge/build.gradle b/packages/react-native-bridge/android/react-native-bridge/build.gradle
index 9e4aeb42401928..cedc75f24a4952 100644
--- a/packages/react-native-bridge/android/react-native-bridge/build.gradle
+++ b/packages/react-native-bridge/android/react-native-bridge/build.gradle
@@ -91,7 +91,8 @@ dependencies {
implementation "com.github.wordpress-mobile:react-native-safe-area-context:${readHashedVersion('../../../react-native-editor/package.json', 'react-native-safe-area-context', 'dependencies')}"
implementation "com.github.wordpress-mobile:react-native-reanimated:${readHashedVersion('../../../react-native-editor/package.json', 'react-native-reanimated', 'dependencies')}"
implementation "com.github.wordpress-mobile:react-native-prompt-android:${readHashedVersion('../../../react-native-editor/package.json', 'react-native-prompt-android', 'dependencies')}"
- runtimeOnly "org.wordpress-mobile:hermes-release-mirror:0.61.5"
+ runtimeOnly "org.wordpress-mobile:hermes-release-mirror:0.64.0"
+
} else {
api 'com.facebook.react:react-native:+'
api project(':@wordpress_react-native-aztec')
@@ -106,8 +107,8 @@ dependencies {
api project(':react-native-safe-area-context')
api project(':react-native-reanimated')
api project(':react-native-prompt-android')
- debugRuntimeOnly "org.wordpress-mobile:hermes-debug-mirror:0.61.5"
- releaseRuntimeOnly "org.wordpress-mobile:hermes-release-mirror:0.61.5"
+ debugRuntimeOnly "org.wordpress-mobile:hermes-debug-mirror:0.64.0"
+ releaseRuntimeOnly "org.wordpress-mobile:hermes-release-mirror:0.64.0"
}
}
diff --git a/packages/react-native-editor/android/app/build.gradle b/packages/react-native-editor/android/app/build.gradle
index a74c55992616ec..36309c1fe8d967 100644
--- a/packages/react-native-editor/android/app/build.gradle
+++ b/packages/react-native-editor/android/app/build.gradle
@@ -15,9 +15,14 @@ import com.android.build.OutputFile
* // the name of the generated asset file containing your JS bundle
* bundleAssetName: "index.android.bundle",
*
- * // the entry file for bundle generation
+ * // the entry file for bundle generation. If none specified and
+ * // "index.android.js" exists, it will be used. Otherwise "index.js" is
+ * // default. Can be overridden with ENTRY_FILE environment variable.
* entryFile: "index.android.js",
*
+ * // https://reactnative.dev/docs/performance#enable-the-ram-format
+ * bundleCommand: "ram-bundle",
+ *
* // whether to bundle JS and assets in debug mode
* bundleInDebug: false,
*
@@ -73,7 +78,6 @@ import com.android.build.OutputFile
*/
project.ext.react = [
- entryFile: "index.js",
enableHermes: true, // clean and rebuild if changing
]
@@ -104,6 +108,7 @@ def enableProguardInReleaseBuilds = false
def enableHermes = project.ext.react.get("enableHermes", false);
android {
+
compileSdkVersion rootProject.ext.compileSdkVersion
compileOptions {
@@ -117,6 +122,10 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
+ ndk {
+ abiFilters "armeabi", "armeabi-v7a", "x86", "mips"
+
+ }
}
splits {
abi {
@@ -166,6 +175,7 @@ dependencies {
})
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation "com.facebook.react:react-native:+" // From node_modules
+ implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
}
// Run this once to be able to run the application with BUCK
diff --git a/packages/react-native-editor/android/build.gradle b/packages/react-native-editor/android/build.gradle
index feb061e73abaa5..05c94da21e04da 100644
--- a/packages/react-native-editor/android/build.gradle
+++ b/packages/react-native-editor/android/build.gradle
@@ -2,12 +2,13 @@ buildscript {
ext {
gradlePluginVersion = '4.0.2'
kotlinVersion = '1.3.61'
- buildToolsVersion = "29.0.2"
+ buildToolsVersion = "29.0.3"
minSdkVersion = 21
compileSdkVersion = 29
targetSdkVersion = 29
supportLibVersion = '28.0.0'
wordpressUtilsVersion = '1.22'
+ ndkVersion = "20.1.5948944"
}
repositories {
google()
diff --git a/packages/react-native-editor/android/gradle.properties b/packages/react-native-editor/android/gradle.properties
index 027ef9db8a3001..440302680cdea1 100644
--- a/packages/react-native-editor/android/gradle.properties
+++ b/packages/react-native-editor/android/gradle.properties
@@ -17,5 +17,11 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
+android.useDeprecatedNdk=true
+FLIPPER_VERSION=0.54.0
\ No newline at end of file
diff --git a/packages/react-native-editor/android/gradlew b/packages/react-native-editor/android/gradlew
index 8e25e6c19d5748..2fe81a7d95e4f9 100755
--- a/packages/react-native-editor/android/gradlew
+++ b/packages/react-native-editor/android/gradlew
@@ -125,8 +125,8 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -154,19 +154,19 @@ if $cygwin ; then
else
eval `echo args$i`="\"$arg\""
fi
- i=$((i+1))
+ i=`expr $i + 1`
done
case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ 0) set -- ;;
+ 1) set -- "$args0" ;;
+ 2) set -- "$args0" "$args1" ;;
+ 3) set -- "$args0" "$args1" "$args2" ;;
+ 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
@@ -175,14 +175,9 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
- cd "$(dirname "$0")"
-fi
-
exec "$JAVACMD" "$@"
diff --git a/packages/react-native-editor/android/gradlew.bat b/packages/react-native-editor/android/gradlew.bat
index 24467a141f7916..9109989e3cbf66 100644
--- a/packages/react-native-editor/android/gradlew.bat
+++ b/packages/react-native-editor/android/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
diff --git a/packages/react-native-editor/ios/Gemfile b/packages/react-native-editor/ios/Gemfile
index 09c4d6ef1eb6f4..a9f19edcd13d55 100644
--- a/packages/react-native-editor/ios/Gemfile
+++ b/packages/react-native-editor/ios/Gemfile
@@ -1,3 +1,3 @@
source 'https://rubygems.org' do
- gem 'cocoapods', '~> 1.8.0'
+ gem 'cocoapods', '~> 1.10.0'
end
diff --git a/packages/react-native-editor/ios/Gemfile.lock b/packages/react-native-editor/ios/Gemfile.lock
index f7f3bf60cddc62..4bc064a3c23134 100644
--- a/packages/react-native-editor/ios/Gemfile.lock
+++ b/packages/react-native-editor/ios/Gemfile.lock
@@ -4,26 +4,27 @@ GEM
GEM
remote: https://rubygems.org/
specs:
- CFPropertyList (3.0.1)
- activesupport (4.2.11.1)
- i18n (~> 0.7)
+ CFPropertyList (3.0.3)
+ activesupport (5.2.5)
+ concurrent-ruby (~> 1.0, >= 1.0.2)
+ i18n (>= 0.7, < 2)
minitest (~> 5.1)
- thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- algoliasearch (1.27.1)
+ addressable (2.7.0)
+ public_suffix (>= 2.0.2, < 5.0)
+ algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
- cocoapods (1.8.4)
- activesupport (>= 4.0.2, < 5)
+ cocoapods (1.10.1)
+ addressable (~> 2.6)
claide (>= 1.0.2, < 2.0)
- cocoapods-core (= 1.8.4)
+ cocoapods-core (= 1.10.1)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
- cocoapods-downloader (>= 1.2.2, < 2.0)
+ cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
- cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.4.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
@@ -33,54 +34,63 @@ GEM
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.4)
- xcodeproj (>= 1.11.1, < 2.0)
- cocoapods-core (1.8.4)
- activesupport (>= 4.0.2, < 6)
+ xcodeproj (>= 1.19.0, < 2.0)
+ cocoapods-core (1.10.1)
+ activesupport (> 5.0, < 6)
+ addressable (~> 2.6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
+ netrc (~> 0.11)
+ public_suffix
+ typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
- cocoapods-downloader (1.3.0)
+ cocoapods-downloader (1.4.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
- cocoapods-stats (1.1.0)
- cocoapods-trunk (1.4.1)
+ cocoapods-trunk (1.5.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
- cocoapods-try (1.1.0)
+ cocoapods-try (1.2.0)
colored2 (3.1.2)
- concurrent-ruby (1.1.5)
+ concurrent-ruby (1.1.8)
escape (0.0.4)
+ ethon (0.14.0)
+ ffi (>= 1.15.0)
+ ffi (1.15.0)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
- i18n (0.9.5)
+ i18n (1.8.10)
concurrent-ruby (~> 1.0)
- json (2.2.0)
- minitest (5.13.0)
+ json (2.5.1)
+ minitest (5.14.4)
molinillo (0.6.6)
- nanaimo (0.2.6)
+ nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
+ public_suffix (4.0.6)
ruby-macho (1.4.0)
thread_safe (0.3.6)
- tzinfo (1.2.5)
+ typhoeus (1.4.0)
+ ethon (>= 0.9.0)
+ tzinfo (1.2.9)
thread_safe (~> 0.1)
- xcodeproj (1.13.0)
+ xcodeproj (1.19.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
- nanaimo (~> 0.2.6)
+ nanaimo (~> 0.3.0)
PLATFORMS
ruby
DEPENDENCIES
- cocoapods (~> 1.8.0)!
+ cocoapods (~> 1.10.0)!
BUNDLED WITH
2.2.15
diff --git a/packages/react-native-editor/ios/GutenbergDemo.xcodeproj/project.pbxproj b/packages/react-native-editor/ios/GutenbergDemo.xcodeproj/project.pbxproj
index 7f63ff0ca85aad..df3f6fadf7a2aa 100644
--- a/packages/react-native-editor/ios/GutenbergDemo.xcodeproj/project.pbxproj
+++ b/packages/react-native-editor/ios/GutenbergDemo.xcodeproj/project.pbxproj
@@ -315,7 +315,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "export NODE_BINARY=node\n../../../node_modules/react-native/scripts/react-native-xcode.sh\n";
+ shellScript = "set -e\nexport NODE_BINARY=node\n../../../node_modules/react-native/scripts/react-native-xcode.sh\n";
};
06CE89E9A162D62B604C3B6C /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
@@ -327,8 +327,8 @@
"${BUILT_PRODUCTS_DIR}/BVLinearGradient/BVLinearGradient.framework",
"${BUILT_PRODUCTS_DIR}/DoubleConversion/DoubleConversion.framework",
"${BUILT_PRODUCTS_DIR}/FBReactNativeSpec/FBReactNativeSpec.framework",
- "${BUILT_PRODUCTS_DIR}/Folly/folly.framework",
"${BUILT_PRODUCTS_DIR}/Gutenberg/Gutenberg.framework",
+ "${BUILT_PRODUCTS_DIR}/RCT-Folly/folly.framework",
"${BUILT_PRODUCTS_DIR}/RCTTypeSafety/RCTTypeSafety.framework",
"${BUILT_PRODUCTS_DIR}/RNCMaskedView/RNCMaskedView.framework",
"${BUILT_PRODUCTS_DIR}/RNGestureHandler/RNGestureHandler.framework",
@@ -338,7 +338,6 @@
"${BUILT_PRODUCTS_DIR}/RNTAztecView/RNTAztecView.framework",
"${BUILT_PRODUCTS_DIR}/React-Core/React.framework",
"${BUILT_PRODUCTS_DIR}/React-CoreModules/CoreModules.framework",
- "${BUILT_PRODUCTS_DIR}/React-RCTActionSheet/RCTActionSheet.framework",
"${BUILT_PRODUCTS_DIR}/React-RCTAnimation/RCTAnimation.framework",
"${BUILT_PRODUCTS_DIR}/React-RCTBlob/RCTBlob.framework",
"${BUILT_PRODUCTS_DIR}/React-RCTImage/RCTImage.framework",
@@ -351,6 +350,7 @@
"${BUILT_PRODUCTS_DIR}/React-jsi/jsi.framework",
"${BUILT_PRODUCTS_DIR}/React-jsiexecutor/jsireact.framework",
"${BUILT_PRODUCTS_DIR}/React-jsinspector/jsinspector.framework",
+ "${BUILT_PRODUCTS_DIR}/React-perflogger/reactperflogger.framework",
"${BUILT_PRODUCTS_DIR}/ReactCommon/ReactCommon.framework",
"${BUILT_PRODUCTS_DIR}/ReactNativeDarkMode/ReactNativeDarkMode.framework",
"${BUILT_PRODUCTS_DIR}/WordPress-Aztec-iOS/Aztec.framework",
@@ -368,8 +368,8 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BVLinearGradient.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DoubleConversion.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBReactNativeSpec.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/folly.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gutenberg.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/folly.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTTypeSafety.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RNCMaskedView.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RNGestureHandler.framework",
@@ -379,7 +379,6 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RNTAztecView.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CoreModules.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTActionSheet.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTAnimation.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTBlob.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTImage.framework",
@@ -392,6 +391,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/jsi.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/jsireact.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/jsinspector.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/reactperflogger.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReactCommon.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReactNativeDarkMode.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Aztec.framework",
@@ -669,6 +669,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
+ "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -712,6 +713,7 @@
COPY_PHASE_STRIP = YES;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
+ "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
diff --git a/packages/react-native-editor/ios/Podfile b/packages/react-native-editor/ios/Podfile
index 71f376ee2c80b4..ecf582c8cd8fae 100644
--- a/packages/react-native-editor/ios/Podfile
+++ b/packages/react-native-editor/ios/Podfile
@@ -2,52 +2,44 @@ project 'GutenbergDemo.xcodeproj'
# Uncomment the next line to define a global platform for your project
platform :ios, '13.0'
+require_relative '../../../node_modules/react-native/scripts/react_native_pods'
require_relative '../../../node_modules/@react-native-community/cli-platform-ios/native_modules'
target 'GutenbergDemo' do
# Comment the next line if you don't want to use dynamic frameworks
use_frameworks!
- # Pods for gutenberg
- pod 'FBLazyVector', :path => "../../../node_modules/react-native/Libraries/FBLazyVector"
- pod 'FBReactNativeSpec', :path => "../../../node_modules/react-native/Libraries/FBReactNativeSpec"
- pod 'RCTRequired', :path => "../../../node_modules/react-native/Libraries/RCTRequired"
- pod 'RCTTypeSafety', :path => "../../../node_modules/react-native/Libraries/TypeSafety"
- pod 'React', :path => '../../../node_modules/react-native/'
- pod 'React-Core', :path => '../../../node_modules/react-native/'
- pod 'React-CoreModules', :path => '../../../node_modules/react-native/React/CoreModules'
- pod 'React-Core/DevSupport', :path => '../../../node_modules/react-native/'
- pod 'React-RCTActionSheet', :path => '../../../node_modules/react-native/Libraries/ActionSheetIOS'
- pod 'React-RCTAnimation', :path => '../../../node_modules/react-native/Libraries/NativeAnimation'
- pod 'React-RCTBlob', :path => '../../../node_modules/react-native/Libraries/Blob'
- pod 'React-RCTImage', :path => '../../../node_modules/react-native/Libraries/Image'
- pod 'React-RCTLinking', :path => '../../../node_modules/react-native/Libraries/LinkingIOS'
- pod 'React-RCTNetwork', :path => '../../../node_modules/react-native/Libraries/Network'
- pod 'React-RCTSettings', :path => '../../../node_modules/react-native/Libraries/Settings'
- pod 'React-RCTText', :path => '../../../node_modules/react-native/Libraries/Text'
- pod 'React-RCTVibration', :path => '../../../node_modules/react-native/Libraries/Vibration'
- pod 'React-Core/RCTWebSocket', :path => '../../../node_modules/react-native/'
- pod 'React-cxxreact', :path => '../../../node_modules/react-native/ReactCommon/cxxreact'
- pod 'React-jsi', :path => '../../../node_modules/react-native/ReactCommon/jsi'
- pod 'React-jsiexecutor', :path => '../../../node_modules/react-native/ReactCommon/jsiexecutor'
- pod 'React-jsinspector', :path => '../../../node_modules/react-native/ReactCommon/jsinspector'
- pod 'ReactCommon/jscallinvoker', :path => "../../../node_modules/react-native/ReactCommon"
- pod 'ReactCommon/turbomodule/core', :path => "../../../node_modules/react-native/ReactCommon"
- pod 'Yoga', :path => '../../../node_modules/react-native/ReactCommon/yoga'
- pod 'DoubleConversion', :podspec => '../../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
- pod 'glog', :podspec => '../../../node_modules/react-native/third-party-podspecs/glog.podspec'
- pod 'Folly', :podspec => '../../../node_modules/react-native/third-party-podspecs/Folly.podspec'
- pod 'RNTAztecView', :path => '../../react-native-aztec/RNTAztecView.podspec'
- #Use for testing non official versions of Aztec
- # pod 'WordPress-Aztec-iOS', :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :commit => '9187001a9c6dc84c211937b1b5a2af2a8b8d54a9'
- pod 'Gutenberg', :path => '../../react-native-bridge/Gutenberg.podspec'
-
-
+ config = use_native_modules!
+ use_react_native!(:path => "../../../node_modules/react-native")
target 'GutenbergDemoTests' do
inherit! :search_paths
# Pods for testing
end
- use_native_modules!
+ ### Begin workaround for https://github.com/facebook/react-native/issues/31034
+ # Can be removed when this issue is resolved.
+ post_install do |installer|
+
+ react_native_post_install(installer)
+
+ installer.pods_project.targets.each do |target|
+ target.build_configurations.each do |config|
+ config.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'YES'
+ end
+
+ if (target.name&.eql?('FBReactNativeSpec'))
+ target.build_phases.each do |build_phase|
+ if (build_phase.respond_to?(:name) && build_phase.name.eql?('[CP-User] Generate Specs'))
+ ## Begin workaround for https://stackoverflow.com/questions/66627590/phasescriptexecution-error-in-react-native-app
+ # Can be removed when this issue is resolved.
+ build_phase.shell_script.prepend("unset npm_config_prefix \n")
+ ## End workaround for https://stackoverflow.com/questions/66627590/phasescriptexecution-error-in-react-native-app
+ target.build_phases.move(build_phase, 0)
+ end
+ end
+ end
+ end
+ end
+ ### End workaround for https://github.com/facebook/react-native/issues/31034
end
diff --git a/packages/react-native-editor/ios/Podfile.lock b/packages/react-native-editor/ios/Podfile.lock
index c75a570aace527..b293ce4cac226e 100644
--- a/packages/react-native-editor/ios/Podfile.lock
+++ b/packages/react-native-editor/ios/Podfile.lock
@@ -3,192 +3,213 @@ PODS:
- BVLinearGradient (2.5.6):
- React-Core
- DoubleConversion (1.1.6)
- - FBLazyVector (0.61.5)
- - FBReactNativeSpec (0.61.5):
- - Folly (= 2018.10.22.00)
- - RCTRequired (= 0.61.5)
- - RCTTypeSafety (= 0.61.5)
- - React-Core (= 0.61.5)
- - React-jsi (= 0.61.5)
- - ReactCommon/turbomodule/core (= 0.61.5)
- - Folly (2018.10.22.00):
+ - FBLazyVector (0.64.0)
+ - FBReactNativeSpec (0.64.0):
+ - RCT-Folly (= 2020.01.13.00)
+ - RCTRequired (= 0.64.0)
+ - RCTTypeSafety (= 0.64.0)
+ - React-Core (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - ReactCommon/turbomodule/core (= 0.64.0)
+ - glog (0.3.5)
+ - Gutenberg (1.55.0):
+ - React-Core (= 0.64.0)
+ - React-CoreModules (= 0.64.0)
+ - React-RCTImage (= 0.64.0)
+ - RNTAztecView
+ - RCT-Folly (2020.01.13.00):
- boost-for-react-native
- DoubleConversion
- - Folly/Default (= 2018.10.22.00)
- glog
- - Folly/Default (2018.10.22.00):
+ - RCT-Folly/Default (= 2020.01.13.00)
+ - RCT-Folly/Default (2020.01.13.00):
- boost-for-react-native
- DoubleConversion
- glog
- - glog (0.3.5)
- - Gutenberg (1.55.0):
- - React-Core (= 0.61.5)
- - React-CoreModules (= 0.61.5)
- - React-RCTImage (= 0.61.5)
- - RNTAztecView
- - RCTRequired (0.61.5)
- - RCTTypeSafety (0.61.5):
- - FBLazyVector (= 0.61.5)
- - Folly (= 2018.10.22.00)
- - RCTRequired (= 0.61.5)
- - React-Core (= 0.61.5)
- - React (0.61.5):
- - React-Core (= 0.61.5)
- - React-Core/DevSupport (= 0.61.5)
- - React-Core/RCTWebSocket (= 0.61.5)
- - React-RCTActionSheet (= 0.61.5)
- - React-RCTAnimation (= 0.61.5)
- - React-RCTBlob (= 0.61.5)
- - React-RCTImage (= 0.61.5)
- - React-RCTLinking (= 0.61.5)
- - React-RCTNetwork (= 0.61.5)
- - React-RCTSettings (= 0.61.5)
- - React-RCTText (= 0.61.5)
- - React-RCTVibration (= 0.61.5)
- - React-Core (0.61.5):
- - Folly (= 2018.10.22.00)
+ - RCTRequired (0.64.0)
+ - RCTTypeSafety (0.64.0):
+ - FBLazyVector (= 0.64.0)
+ - RCT-Folly (= 2020.01.13.00)
+ - RCTRequired (= 0.64.0)
+ - React-Core (= 0.64.0)
+ - React (0.64.0):
+ - React-Core (= 0.64.0)
+ - React-Core/DevSupport (= 0.64.0)
+ - React-Core/RCTWebSocket (= 0.64.0)
+ - React-RCTActionSheet (= 0.64.0)
+ - React-RCTAnimation (= 0.64.0)
+ - React-RCTBlob (= 0.64.0)
+ - React-RCTImage (= 0.64.0)
+ - React-RCTLinking (= 0.64.0)
+ - React-RCTNetwork (= 0.64.0)
+ - React-RCTSettings (= 0.64.0)
+ - React-RCTText (= 0.64.0)
+ - React-RCTVibration (= 0.64.0)
+ - React-callinvoker (0.64.0)
+ - React-Core (0.64.0):
- glog
- - React-Core/Default (= 0.61.5)
- - React-cxxreact (= 0.61.5)
- - React-jsi (= 0.61.5)
- - React-jsiexecutor (= 0.61.5)
+ - RCT-Folly (= 2020.01.13.00)
+ - React-Core/Default (= 0.64.0)
+ - React-cxxreact (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - React-jsiexecutor (= 0.64.0)
+ - React-perflogger (= 0.64.0)
- Yoga
- - React-Core/CoreModulesHeaders (0.61.5):
- - Folly (= 2018.10.22.00)
+ - React-Core/CoreModulesHeaders (0.64.0):
- glog
+ - RCT-Folly (= 2020.01.13.00)
- React-Core/Default
- - React-cxxreact (= 0.61.5)
- - React-jsi (= 0.61.5)
- - React-jsiexecutor (= 0.61.5)
+ - React-cxxreact (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - React-jsiexecutor (= 0.64.0)
+ - React-perflogger (= 0.64.0)
- Yoga
- - React-Core/Default (0.61.5):
- - Folly (= 2018.10.22.00)
+ - React-Core/Default (0.64.0):
- glog
- - React-cxxreact (= 0.61.5)
- - React-jsi (= 0.61.5)
- - React-jsiexecutor (= 0.61.5)
+ - RCT-Folly (= 2020.01.13.00)
+ - React-cxxreact (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - React-jsiexecutor (= 0.64.0)
+ - React-perflogger (= 0.64.0)
- Yoga
- - React-Core/DevSupport (0.61.5):
- - Folly (= 2018.10.22.00)
+ - React-Core/DevSupport (0.64.0):
- glog
- - React-Core/Default (= 0.61.5)
- - React-Core/RCTWebSocket (= 0.61.5)
- - React-cxxreact (= 0.61.5)
- - React-jsi (= 0.61.5)
- - React-jsiexecutor (= 0.61.5)
- - React-jsinspector (= 0.61.5)
+ - RCT-Folly (= 2020.01.13.00)
+ - React-Core/Default (= 0.64.0)
+ - React-Core/RCTWebSocket (= 0.64.0)
+ - React-cxxreact (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - React-jsiexecutor (= 0.64.0)
+ - React-jsinspector (= 0.64.0)
+ - React-perflogger (= 0.64.0)
- Yoga
- - React-Core/RCTActionSheetHeaders (0.61.5):
- - Folly (= 2018.10.22.00)
+ - React-Core/RCTActionSheetHeaders (0.64.0):
- glog
+ - RCT-Folly (= 2020.01.13.00)
- React-Core/Default
- - React-cxxreact (= 0.61.5)
- - React-jsi (= 0.61.5)
- - React-jsiexecutor (= 0.61.5)
+ - React-cxxreact (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - React-jsiexecutor (= 0.64.0)
+ - React-perflogger (= 0.64.0)
- Yoga
- - React-Core/RCTAnimationHeaders (0.61.5):
- - Folly (= 2018.10.22.00)
+ - React-Core/RCTAnimationHeaders (0.64.0):
- glog
+ - RCT-Folly (= 2020.01.13.00)
- React-Core/Default
- - React-cxxreact (= 0.61.5)
- - React-jsi (= 0.61.5)
- - React-jsiexecutor (= 0.61.5)
+ - React-cxxreact (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - React-jsiexecutor (= 0.64.0)
+ - React-perflogger (= 0.64.0)
- Yoga
- - React-Core/RCTBlobHeaders (0.61.5):
- - Folly (= 2018.10.22.00)
+ - React-Core/RCTBlobHeaders (0.64.0):
- glog
+ - RCT-Folly (= 2020.01.13.00)
- React-Core/Default
- - React-cxxreact (= 0.61.5)
- - React-jsi (= 0.61.5)
- - React-jsiexecutor (= 0.61.5)
+ - React-cxxreact (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - React-jsiexecutor (= 0.64.0)
+ - React-perflogger (= 0.64.0)
- Yoga
- - React-Core/RCTImageHeaders (0.61.5):
- - Folly (= 2018.10.22.00)
+ - React-Core/RCTImageHeaders (0.64.0):
- glog
+ - RCT-Folly (= 2020.01.13.00)
- React-Core/Default
- - React-cxxreact (= 0.61.5)
- - React-jsi (= 0.61.5)
- - React-jsiexecutor (= 0.61.5)
+ - React-cxxreact (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - React-jsiexecutor (= 0.64.0)
+ - React-perflogger (= 0.64.0)
- Yoga
- - React-Core/RCTLinkingHeaders (0.61.5):
- - Folly (= 2018.10.22.00)
+ - React-Core/RCTLinkingHeaders (0.64.0):
- glog
+ - RCT-Folly (= 2020.01.13.00)
- React-Core/Default
- - React-cxxreact (= 0.61.5)
- - React-jsi (= 0.61.5)
- - React-jsiexecutor (= 0.61.5)
+ - React-cxxreact (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - React-jsiexecutor (= 0.64.0)
+ - React-perflogger (= 0.64.0)
- Yoga
- - React-Core/RCTNetworkHeaders (0.61.5):
- - Folly (= 2018.10.22.00)
+ - React-Core/RCTNetworkHeaders (0.64.0):
- glog
+ - RCT-Folly (= 2020.01.13.00)
- React-Core/Default
- - React-cxxreact (= 0.61.5)
- - React-jsi (= 0.61.5)
- - React-jsiexecutor (= 0.61.5)
+ - React-cxxreact (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - React-jsiexecutor (= 0.64.0)
+ - React-perflogger (= 0.64.0)
- Yoga
- - React-Core/RCTSettingsHeaders (0.61.5):
- - Folly (= 2018.10.22.00)
+ - React-Core/RCTSettingsHeaders (0.64.0):
- glog
+ - RCT-Folly (= 2020.01.13.00)
- React-Core/Default
- - React-cxxreact (= 0.61.5)
- - React-jsi (= 0.61.5)
- - React-jsiexecutor (= 0.61.5)
+ - React-cxxreact (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - React-jsiexecutor (= 0.64.0)
+ - React-perflogger (= 0.64.0)
- Yoga
- - React-Core/RCTTextHeaders (0.61.5):
- - Folly (= 2018.10.22.00)
+ - React-Core/RCTTextHeaders (0.64.0):
- glog
+ - RCT-Folly (= 2020.01.13.00)
- React-Core/Default
- - React-cxxreact (= 0.61.5)
- - React-jsi (= 0.61.5)
- - React-jsiexecutor (= 0.61.5)
+ - React-cxxreact (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - React-jsiexecutor (= 0.64.0)
+ - React-perflogger (= 0.64.0)
- Yoga
- - React-Core/RCTVibrationHeaders (0.61.5):
- - Folly (= 2018.10.22.00)
+ - React-Core/RCTVibrationHeaders (0.64.0):
- glog
+ - RCT-Folly (= 2020.01.13.00)
- React-Core/Default
- - React-cxxreact (= 0.61.5)
- - React-jsi (= 0.61.5)
- - React-jsiexecutor (= 0.61.5)
+ - React-cxxreact (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - React-jsiexecutor (= 0.64.0)
+ - React-perflogger (= 0.64.0)
- Yoga
- - React-Core/RCTWebSocket (0.61.5):
- - Folly (= 2018.10.22.00)
+ - React-Core/RCTWebSocket (0.64.0):
- glog
- - React-Core/Default (= 0.61.5)
- - React-cxxreact (= 0.61.5)
- - React-jsi (= 0.61.5)
- - React-jsiexecutor (= 0.61.5)
+ - RCT-Folly (= 2020.01.13.00)
+ - React-Core/Default (= 0.64.0)
+ - React-cxxreact (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - React-jsiexecutor (= 0.64.0)
+ - React-perflogger (= 0.64.0)
- Yoga
- - React-CoreModules (0.61.5):
- - FBReactNativeSpec (= 0.61.5)
- - Folly (= 2018.10.22.00)
- - RCTTypeSafety (= 0.61.5)
- - React-Core/CoreModulesHeaders (= 0.61.5)
- - React-RCTImage (= 0.61.5)
- - ReactCommon/turbomodule/core (= 0.61.5)
- - React-cxxreact (0.61.5):
+ - React-CoreModules (0.64.0):
+ - FBReactNativeSpec (= 0.64.0)
+ - RCT-Folly (= 2020.01.13.00)
+ - RCTTypeSafety (= 0.64.0)
+ - React-Core/CoreModulesHeaders (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - React-RCTImage (= 0.64.0)
+ - ReactCommon/turbomodule/core (= 0.64.0)
+ - React-cxxreact (0.64.0):
- boost-for-react-native (= 1.63.0)
- DoubleConversion
- - Folly (= 2018.10.22.00)
- glog
- - React-jsinspector (= 0.61.5)
- - React-jsi (0.61.5):
+ - RCT-Folly (= 2020.01.13.00)
+ - React-callinvoker (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - React-jsinspector (= 0.64.0)
+ - React-perflogger (= 0.64.0)
+ - React-runtimeexecutor (= 0.64.0)
+ - React-jsi (0.64.0):
- boost-for-react-native (= 1.63.0)
- DoubleConversion
- - Folly (= 2018.10.22.00)
- glog
- - React-jsi/Default (= 0.61.5)
- - React-jsi/Default (0.61.5):
+ - RCT-Folly (= 2020.01.13.00)
+ - React-jsi/Default (= 0.64.0)
+ - React-jsi/Default (0.64.0):
- boost-for-react-native (= 1.63.0)
- DoubleConversion
- - Folly (= 2018.10.22.00)
- glog
- - React-jsiexecutor (0.61.5):
+ - RCT-Folly (= 2020.01.13.00)
+ - React-jsiexecutor (0.64.0):
- DoubleConversion
- - Folly (= 2018.10.22.00)
- glog
- - React-cxxreact (= 0.61.5)
- - React-jsi (= 0.61.5)
- - React-jsinspector (0.61.5)
+ - RCT-Folly (= 2020.01.13.00)
+ - React-cxxreact (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - React-perflogger (= 0.64.0)
+ - React-jsinspector (0.64.0)
- react-native-blur (0.8.0):
- React-Core
- react-native-get-random-values (1.4.0):
@@ -197,7 +218,7 @@ PODS:
- React-Core
- react-native-safe-area (0.5.1):
- React-Core
- - react-native-safe-area-context (3.1.1):
+ - react-native-safe-area-context (3.2.0):
- React-Core
- react-native-slider (3.0.2):
- React-Core
@@ -206,46 +227,75 @@ PODS:
- react-native-video/Video (= 5.0.2)
- react-native-video/Video (5.0.2):
- React-Core
- - React-RCTActionSheet (0.61.5):
- - React-Core/RCTActionSheetHeaders (= 0.61.5)
- - React-RCTAnimation (0.61.5):
- - React-Core/RCTAnimationHeaders (= 0.61.5)
- - React-RCTBlob (0.61.5):
- - React-Core/RCTBlobHeaders (= 0.61.5)
- - React-Core/RCTWebSocket (= 0.61.5)
- - React-jsi (= 0.61.5)
- - React-RCTNetwork (= 0.61.5)
- - React-RCTImage (0.61.5):
- - React-Core/RCTImageHeaders (= 0.61.5)
- - React-RCTNetwork (= 0.61.5)
- - React-RCTLinking (0.61.5):
- - React-Core/RCTLinkingHeaders (= 0.61.5)
- - React-RCTNetwork (0.61.5):
- - React-Core/RCTNetworkHeaders (= 0.61.5)
- - React-RCTSettings (0.61.5):
- - React-Core/RCTSettingsHeaders (= 0.61.5)
- - React-RCTText (0.61.5):
- - React-Core/RCTTextHeaders (= 0.61.5)
- - React-RCTVibration (0.61.5):
- - React-Core/RCTVibrationHeaders (= 0.61.5)
- - ReactCommon/jscallinvoker (0.61.5):
- - DoubleConversion
- - Folly (= 2018.10.22.00)
- - glog
- - React-cxxreact (= 0.61.5)
- - ReactCommon/turbomodule/core (0.61.5):
+ - React-perflogger (0.64.0)
+ - React-RCTActionSheet (0.64.0):
+ - React-Core/RCTActionSheetHeaders (= 0.64.0)
+ - React-RCTAnimation (0.64.0):
+ - FBReactNativeSpec (= 0.64.0)
+ - RCT-Folly (= 2020.01.13.00)
+ - RCTTypeSafety (= 0.64.0)
+ - React-Core/RCTAnimationHeaders (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - ReactCommon/turbomodule/core (= 0.64.0)
+ - React-RCTBlob (0.64.0):
+ - FBReactNativeSpec (= 0.64.0)
+ - RCT-Folly (= 2020.01.13.00)
+ - React-Core/RCTBlobHeaders (= 0.64.0)
+ - React-Core/RCTWebSocket (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - React-RCTNetwork (= 0.64.0)
+ - ReactCommon/turbomodule/core (= 0.64.0)
+ - React-RCTImage (0.64.0):
+ - FBReactNativeSpec (= 0.64.0)
+ - RCT-Folly (= 2020.01.13.00)
+ - RCTTypeSafety (= 0.64.0)
+ - React-Core/RCTImageHeaders (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - React-RCTNetwork (= 0.64.0)
+ - ReactCommon/turbomodule/core (= 0.64.0)
+ - React-RCTLinking (0.64.0):
+ - FBReactNativeSpec (= 0.64.0)
+ - React-Core/RCTLinkingHeaders (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - ReactCommon/turbomodule/core (= 0.64.0)
+ - React-RCTNetwork (0.64.0):
+ - FBReactNativeSpec (= 0.64.0)
+ - RCT-Folly (= 2020.01.13.00)
+ - RCTTypeSafety (= 0.64.0)
+ - React-Core/RCTNetworkHeaders (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - ReactCommon/turbomodule/core (= 0.64.0)
+ - React-RCTSettings (0.64.0):
+ - FBReactNativeSpec (= 0.64.0)
+ - RCT-Folly (= 2020.01.13.00)
+ - RCTTypeSafety (= 0.64.0)
+ - React-Core/RCTSettingsHeaders (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - ReactCommon/turbomodule/core (= 0.64.0)
+ - React-RCTText (0.64.0):
+ - React-Core/RCTTextHeaders (= 0.64.0)
+ - React-RCTVibration (0.64.0):
+ - FBReactNativeSpec (= 0.64.0)
+ - RCT-Folly (= 2020.01.13.00)
+ - React-Core/RCTVibrationHeaders (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - ReactCommon/turbomodule/core (= 0.64.0)
+ - React-runtimeexecutor (0.64.0):
+ - React-jsi (= 0.64.0)
+ - ReactCommon/turbomodule/core (0.64.0):
- DoubleConversion
- - Folly (= 2018.10.22.00)
- glog
- - React-Core (= 0.61.5)
- - React-cxxreact (= 0.61.5)
- - React-jsi (= 0.61.5)
- - ReactCommon/jscallinvoker (= 0.61.5)
+ - RCT-Folly (= 2020.01.13.00)
+ - React-callinvoker (= 0.64.0)
+ - React-Core (= 0.64.0)
+ - React-cxxreact (= 0.64.0)
+ - React-jsi (= 0.64.0)
+ - React-perflogger (= 0.64.0)
- ReactNativeDarkMode (0.0.10):
- React-Core
- RNCMaskedView (0.1.10-wp):
- React-Core
- - RNGestureHandler (1.6.0):
+ - RNGestureHandler (1.10.1):
- React-Core
- RNReanimated (1.9.0):
- React-Core
@@ -263,13 +313,14 @@ DEPENDENCIES:
- BVLinearGradient (from `../../../node_modules/react-native-linear-gradient`)
- DoubleConversion (from `../../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- FBLazyVector (from `../../../node_modules/react-native/Libraries/FBLazyVector`)
- - FBReactNativeSpec (from `../../../node_modules/react-native/Libraries/FBReactNativeSpec`)
- - Folly (from `../../../node_modules/react-native/third-party-podspecs/Folly.podspec`)
+ - FBReactNativeSpec (from `../../../node_modules/react-native/React/FBReactNativeSpec`)
- glog (from `../../../node_modules/react-native/third-party-podspecs/glog.podspec`)
- - Gutenberg (from `../../react-native-bridge/Gutenberg.podspec`)
+ - Gutenberg (from `../../react-native-bridge`)
+ - RCT-Folly (from `../../../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
- RCTRequired (from `../../../node_modules/react-native/Libraries/RCTRequired`)
- RCTTypeSafety (from `../../../node_modules/react-native/Libraries/TypeSafety`)
- React (from `../../../node_modules/react-native/`)
+ - React-callinvoker (from `../../../node_modules/react-native/ReactCommon/callinvoker`)
- React-Core (from `../../../node_modules/react-native/`)
- React-Core/DevSupport (from `../../../node_modules/react-native/`)
- React-Core/RCTWebSocket (from `../../../node_modules/react-native/`)
@@ -285,6 +336,7 @@ DEPENDENCIES:
- react-native-safe-area-context (from `../../../node_modules/react-native-safe-area-context`)
- "react-native-slider (from `../../../node_modules/@react-native-community/slider`)"
- react-native-video (from `../../../node_modules/react-native-video`)
+ - React-perflogger (from `../../../node_modules/react-native/ReactCommon/reactperflogger`)
- React-RCTActionSheet (from `../../../node_modules/react-native/Libraries/ActionSheetIOS`)
- React-RCTAnimation (from `../../../node_modules/react-native/Libraries/NativeAnimation`)
- React-RCTBlob (from `../../../node_modules/react-native/Libraries/Blob`)
@@ -294,7 +346,7 @@ DEPENDENCIES:
- React-RCTSettings (from `../../../node_modules/react-native/Libraries/Settings`)
- React-RCTText (from `../../../node_modules/react-native/Libraries/Text`)
- React-RCTVibration (from `../../../node_modules/react-native/Libraries/Vibration`)
- - ReactCommon/jscallinvoker (from `../../../node_modules/react-native/ReactCommon`)
+ - React-runtimeexecutor (from `../../../node_modules/react-native/ReactCommon/runtimeexecutor`)
- ReactCommon/turbomodule/core (from `../../../node_modules/react-native/ReactCommon`)
- ReactNativeDarkMode (from `../../../node_modules/react-native-dark-mode`)
- "RNCMaskedView (from `../../../node_modules/@react-native-community/masked-view`)"
@@ -302,7 +354,7 @@ DEPENDENCIES:
- RNReanimated (from `../../../node_modules/react-native-reanimated`)
- RNScreens (from `../../../node_modules/react-native-screens`)
- RNSVG (from `../../../node_modules/react-native-svg`)
- - RNTAztecView (from `../../react-native-aztec/RNTAztecView.podspec`)
+ - RNTAztecView (from `../../react-native-aztec`)
- Yoga (from `../../../node_modules/react-native/ReactCommon/yoga`)
SPEC REPOS:
@@ -318,19 +370,21 @@ EXTERNAL SOURCES:
FBLazyVector:
:path: "../../../node_modules/react-native/Libraries/FBLazyVector"
FBReactNativeSpec:
- :path: "../../../node_modules/react-native/Libraries/FBReactNativeSpec"
- Folly:
- :podspec: "../../../node_modules/react-native/third-party-podspecs/Folly.podspec"
+ :path: "../../../node_modules/react-native/React/FBReactNativeSpec"
glog:
:podspec: "../../../node_modules/react-native/third-party-podspecs/glog.podspec"
Gutenberg:
- :path: "../../react-native-bridge/Gutenberg.podspec"
+ :path: "../../react-native-bridge"
+ RCT-Folly:
+ :podspec: "../../../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
RCTRequired:
:path: "../../../node_modules/react-native/Libraries/RCTRequired"
RCTTypeSafety:
:path: "../../../node_modules/react-native/Libraries/TypeSafety"
React:
:path: "../../../node_modules/react-native/"
+ React-callinvoker:
+ :path: "../../../node_modules/react-native/ReactCommon/callinvoker"
React-Core:
:path: "../../../node_modules/react-native/"
React-CoreModules:
@@ -357,6 +411,8 @@ EXTERNAL SOURCES:
:path: "../../../node_modules/@react-native-community/slider"
react-native-video:
:path: "../../../node_modules/react-native-video"
+ React-perflogger:
+ :path: "../../../node_modules/react-native/ReactCommon/reactperflogger"
React-RCTActionSheet:
:path: "../../../node_modules/react-native/Libraries/ActionSheetIOS"
React-RCTAnimation:
@@ -375,6 +431,8 @@ EXTERNAL SOURCES:
:path: "../../../node_modules/react-native/Libraries/Text"
React-RCTVibration:
:path: "../../../node_modules/react-native/Libraries/Vibration"
+ React-runtimeexecutor:
+ :path: "../../../node_modules/react-native/ReactCommon/runtimeexecutor"
ReactCommon:
:path: "../../../node_modules/react-native/ReactCommon"
ReactNativeDarkMode:
@@ -390,55 +448,58 @@ EXTERNAL SOURCES:
RNSVG:
:path: "../../../node_modules/react-native-svg"
RNTAztecView:
- :path: "../../react-native-aztec/RNTAztecView.podspec"
+ :path: "../../react-native-aztec"
Yoga:
:path: "../../../node_modules/react-native/ReactCommon/yoga"
SPEC CHECKSUMS:
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
- BVLinearGradient: 48f1964a78bddfae412d1aac5f386c2949fe0306
- DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
- FBLazyVector: aaeaf388755e4f29cd74acbc9e3b8da6d807c37f
- FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75
- Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
- glog: 1f3da668190260b06b429bb211bfbee5cd790c28
- Gutenberg: 6199021f2cf2b2cdab42cbc1249123ec4a189472
- RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1
- RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320
- React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78
- React-Core: 688b451f7d616cc1134ac95295b593d1b5158a04
- React-CoreModules: d04f8494c1a328b69ec11db9d1137d667f916dcb
- React-cxxreact: d0f7bcafa196ae410e5300736b424455e7fb7ba7
- React-jsi: cb2cd74d7ccf4cffb071a46833613edc79cdf8f7
- React-jsiexecutor: d5525f9ed5f782fdbacb64b9b01a43a9323d2386
- React-jsinspector: fa0ecc501688c3c4c34f28834a76302233e29dc0
+ BVLinearGradient: b2d297a15cf094d1947df4f0519779bb3a7f2392
+ DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
+ FBLazyVector: 49cbe4b43e445b06bf29199b6ad2057649e4c8f5
+ FBReactNativeSpec: 420ad7ff87adc491b45199891c72ea531fa4926e
+ glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
+ Gutenberg: 829c1db189c6f47728327bb1503026f42698cdb6
+ RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c
+ RCTRequired: 2f8cb5b7533219bf4218a045f92768129cf7050a
+ RCTTypeSafety: 512728b73549e72ad7330b92f3d42936f2a4de5b
+ React: 98eac01574128a790f0bbbafe2d1a8607291ac24
+ React-callinvoker: def3f7fae16192df68d9b69fd4bbb59092ee36bc
+ React-Core: 70a52aa5dbe9b83befae82038451a7df9fd54c5a
+ React-CoreModules: 052edef46117862e2570eb3a0f06d81c61d2c4b8
+ React-cxxreact: c1dc71b30653cfb4770efdafcbdc0ad6d388baab
+ React-jsi: 74341196d9547cbcbcfa4b3bbbf03af56431d5a1
+ React-jsiexecutor: 06a9c77b56902ae7ffcdd7a4905f664adc5d237b
+ React-jsinspector: 0ae35a37b20d5e031eb020a69cc5afdbd6406301
react-native-blur: ef741a08d020010ba65e411be0ab82d1d325e7ad
react-native-get-random-values: 03edb8dcc2d3f43e55aa67ea13b61b6723bbf047
react-native-keyboard-aware-scroll-view: 6cb84879bf07e4cc1caed18b11fb928e142adac6
react-native-safe-area: c9cf765aa2dd96159476a99633e7d462ce5bb94f
- react-native-safe-area-context: c8da723dcddabe15afe95c9d31c56a0cf2b0141c
+ react-native-safe-area-context: e471852c5ed67eea4b10c5d9d43c1cebae3b231d
react-native-slider: 2e42dc91e7ab8b35a9c7f2eb3532729a41d0dbe2
- react-native-video: b8767f54061e475ddd38c22375f46f4d93e5fdfd
- React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76
- React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360
- React-RCTBlob: d89293cc0236d9cb0933d85e430b0bbe81ad1d72
- React-RCTImage: 6b8e8df449eb7c814c99a92d6b52de6fe39dea4e
- React-RCTLinking: 121bb231c7503cf9094f4d8461b96a130fabf4a5
- React-RCTNetwork: fb353640aafcee84ca8b78957297bd395f065c9a
- React-RCTSettings: 8db258ea2a5efee381fcf7a6d5044e2f8b68b640
- React-RCTText: 9ccc88273e9a3aacff5094d2175a605efa854dbe
- React-RCTVibration: a49a1f42bf8f5acf1c3e297097517c6b3af377ad
- ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd
+ react-native-video: e5dd0649534076cd6d09a0db51c617fa668d534a
+ React-perflogger: 9c547d8f06b9bf00cb447f2b75e8d7f19b7e02af
+ React-RCTActionSheet: 3080b6e12e0e1a5b313c8c0050699b5c794a1b11
+ React-RCTAnimation: 3f96f21a497ae7dabf4d2f150ee43f906aaf516f
+ React-RCTBlob: 283b8e5025e7f954176bc48164f846909002f3ed
+ React-RCTImage: 5088a484faac78f2d877e1b79125d3bb1ea94a16
+ React-RCTLinking: 5e8fbb3e9a8bc2e4e3eb15b1eb8bda5fcac27b8c
+ React-RCTNetwork: 38ec277217b1e841d5e6a1fa78da65b9212ccb28
+ React-RCTSettings: 242d6e692108c3de4f3bb74b7586a8799e9ab070
+ React-RCTText: 8746736ac8eb5a4a74719aa695b7a236a93a83d2
+ React-RCTVibration: 0fd6b21751a33cb72fce1a4a33ab9678416d307a
+ React-runtimeexecutor: cad74a1eaa53ee6e7a3620231939d8fe2c6afcf0
+ ReactCommon: cfe2b7fd20e0dbd2d1185cd7d8f99633fbc5ff05
ReactNativeDarkMode: 6d807bc8373b872472c8541fc3341817d979a6fb
- RNCMaskedView: 66caacf33c86eaa7d22b43178dd998257d5c2e4d
- RNGestureHandler: 7a377d0580c9f07df99e590bbcefd616ee0e2626
+ RNCMaskedView: dfeba59697c44d36abec79c062aeb1ea343d610d
+ RNGestureHandler: 5e58135436aacc1c5d29b75547d3d2b9430d052c
RNReanimated: f05baf4cd76b6eab2e4d7e2b244424960b968918
RNScreens: 953633729a42e23ad0c93574d676b361e3335e8b
RNSVG: 46c4b680fe18237fa01eb7d7b311d77618fde31f
RNTAztecView: b36187f6d434a4f3b0ebdd423ca8651889d8c6cf
WordPress-Aztec-iOS: 870c93297849072aadfc2223e284094e73023e82
- Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
+ Yoga: 8c8436d4171c87504c648ae23b1d81242bdf3bbf
-PODFILE CHECKSUM: 2629b71d4cbcf6e76c50ab316a3dd51fc0515bc7
+PODFILE CHECKSUM: db5f67a29ecba75541dad181ff59246b6da2fb09
-COCOAPODS: 1.8.4
+COCOAPODS: 1.10.1
diff --git a/packages/react-native-editor/metro-patch/metro+0.56.4.patch b/packages/react-native-editor/metro-patch/metro+0.56.4.patch
deleted file mode 100644
index 6332c556dd355b..00000000000000
--- a/packages/react-native-editor/metro-patch/metro+0.56.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/node_modules/metro/src/node-haste/DependencyGraph.js b/node_modules/metro/src/node-haste/DependencyGraph.js
-index cdd1b81..9ac98d1 100644
---- a/node_modules/metro/src/node-haste/DependencyGraph.js
-+++ b/node_modules/metro/src/node-haste/DependencyGraph.js
-@@ -137,7 +137,7 @@ class DependencyGraph extends EventEmitter {
- roots: config.watchFolders,
- throwOnModuleCollision: true,
- useWatchman: config.resolver.useWatchman,
-- watch: true
-+ watch: false
- });
- }
-
diff --git a/packages/react-native-editor/package.json b/packages/react-native-editor/package.json
index 04278129959912..7e37526eb26f92 100644
--- a/packages/react-native-editor/package.json
+++ b/packages/react-native-editor/package.json
@@ -31,8 +31,8 @@
"dependencies": {
"@babel/runtime": "^7.13.10",
"@react-native-community/blur": "3.6.0",
- "@react-native-community/masked-view": "git+https://github.com/wordpress-mobile/react-native-masked-view.git#f65a51a3320e58404d7f38d967bfd1f42b439ca9",
- "@react-native-community/slider": "git+https://github.com/wordpress-mobile/react-native-slider.git#d263ff16cdd9fb7352b354342522ff030f220f42",
+ "@react-native-community/masked-view": "git+https://github.com/wordpress-mobile/react-native-masked-view.git#f3dd843b35e1450dcb6ca7f2d56684aac79cc22e",
+ "@react-native-community/slider": "git+https://github.com/wordpress-mobile/react-native-slider.git#3ef5fc6155ca1b6d94119a7c1a39049e64a5a9d9",
"@react-navigation/core": "5.12.0",
"@react-navigation/native": "5.7.0",
"@react-navigation/routers": "5.4.9",
@@ -52,29 +52,26 @@
"core-js": "^3.12.1",
"fast-average-color": "^4.3.0",
"jed": "^1.1.1",
- "jsc-android": "^241213.1.0",
"jsdom-jscore-rn": "git+https://github.com/iamcco/jsdom-jscore-rn.git#a562f3d57c27c13e5bfc8cf82d496e69a3ba2800",
- "metro-react-native-babel-preset": "0.57.0",
- "metro-react-native-babel-transformer": "0.56.0",
"node-fetch": "^2.6.0",
- "react-native": "0.61.5",
+ "react-native": "0.64.0",
"react-native-dark-mode": "git+https://github.com/wordpress-mobile/react-native-dark-mode.git#f09bf1480e7b34536413ab3300f29e4375edb2c6",
- "react-native-gesture-handler": "git+https://github.com/wordpress-mobile/react-native-gesture-handler.git#b80e959908b383a26d6e35d992d6d529efad0b16",
- "react-native-get-random-values": "git+https://github.com/wordpress-mobile/react-native-get-random-values.git#f03f2c16414aff4ea76064dcd00a9e3c6efc838d",
+ "react-native-gesture-handler": "git+https://github.com/wordpress-mobile/react-native-gesture-handler.git#e7b44cb3717da86c197322a28227468f6d77aecc",
+ "react-native-get-random-values": "git+https://github.com/wordpress-mobile/react-native-get-random-values.git#05b2d9bc16f3376a7e2f765f3ff09af9658fb80f",
"react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3",
- "react-native-hsv-color-picker": "git+https://github.com/wordpress-mobile/react-native-hsv-color-picker",
- "react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.8",
- "react-native-linear-gradient": "git+https://github.com/wordpress-mobile/react-native-linear-gradient.git#52bf43077171cff8714ce3e0155f3ebb7f55bc37",
+ "react-native-hsv-color-picker": "git+https://github.com/wordpress-mobile/react-native-hsv-color-picker#dfe4d06595fefc9b4d48ce0ced029076c80dab74",
+ "react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#6febe4faf7ff51579087bac105f62be8e4c4015d",
+ "react-native-linear-gradient": "git+https://github.com/wordpress-mobile/react-native-linear-gradient.git#deafc7a7b3dcfdc2a2d8327b5727cb393f1cabf7",
"react-native-modal": "^6.5.0",
- "react-native-prompt-android": "git+https://github.com/wordpress-mobile/react-native-prompt-android.git#6c5122664d25b7f1cdeefc119e69329493a077a8",
- "react-native-reanimated": "git+https://github.com/wordpress-mobile/react-native-reanimated.git#ed48f510fba751cd75da7629e92276166766be91",
+ "react-native-prompt-android": "git+https://github.com/wordpress-mobile/react-native-prompt-android.git#6406b77d0162262c868bcbbaa0766bfafbf43742",
+ "react-native-reanimated": "git+https://github.com/wordpress-mobile/react-native-reanimated.git#047ae6064e2bcfdaeb1f25d1d38157359ba96cb6",
"react-native-safe-area": "^0.5.0",
- "react-native-safe-area-context": "git+https://github.com/wordpress-mobile/react-native-safe-area-context.git#1e3c0d34f31b59fb79f71ec0b4c39c513f684871",
+ "react-native-safe-area-context": "git+https://github.com/wordpress-mobile/react-native-safe-area-context.git#d348552cebf914944e76c2dbfcd79cf649744edb",
"react-native-sass-transformer": "^1.1.1",
- "react-native-screens": "git+https://github.com/wordpress-mobile/react-native-screens.git#b3d907bda2695743f35fd874261dcd27e0912eca",
- "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#a628e92990a2404e30a0086f168bd2b5b7b4ce96",
+ "react-native-screens": "git+https://github.com/wordpress-mobile/react-native-screens.git#3e34c75622bb6f142868c19b04f72afbc23554d8",
+ "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#83c4e7c16b704c7706339341b22434b29f0b27d6",
"react-native-url-polyfill": "^1.1.2",
- "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#1b964b107863351ed744fc104d7952bbec3e2d4f"
+ "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#e74bb901f37f86a8842232468b43c9cbaedb6aa4"
},
"publishConfig": {
"access": "public"
@@ -89,12 +86,12 @@
"postrn-bundle": "cd ../.. && patch-package --reverse --patch-dir packages/react-native-editor/metro-patch",
"prebundle": "npm run i18n-cache:force",
"bundle": "npm run bundle:android && npm run bundle:ios",
- "bundle:android": "mkdir -p bundle/android && npm run rn-bundle -- --platform android --dev false --entry-file index.js --assets-dest bundle/android --bundle-output bundle/android/App.text.js --sourcemap-output bundle/android/App.text.js.map && ./gutenberg/node_modules/hermes-engine/`node -e \"const platform=require('os').platform();console.log(platform === 'darwin' ? 'osx-bin' : (platform === 'linux' ? 'linux64-bin' : (platform === 'win32' ? 'win64-bin' : 'unsupported-os')));\"`/hermes -emit-binary -O -out bundle/android/App.js bundle/android/App.text.js -output-source-map",
+ "bundle:android": "mkdir -p bundle/android && npm run rn-bundle -- --platform android --dev false --entry-file index.js --assets-dest bundle/android --bundle-output bundle/android/App.text.js --sourcemap-output bundle/android/App.text.js.map && ./../../node_modules/hermes-engine/`node -e \"const platform=require('os').platform();console.log(platform === 'darwin' ? 'osx-bin' : (platform === 'linux' ? 'linux64-bin' : (platform === 'win32' ? 'win64-bin' : 'unsupported-os')));\"`/hermesc -emit-binary -O -out bundle/android/App.js bundle/android/App.text.js -output-source-map",
"bundle:ios": "mkdir -p bundle/ios && npm run rn-bundle -- --platform ios --dev false --entry-file index.js --assets-dest bundle/ios --bundle-output bundle/ios/App.js --sourcemap-output bundle/ios/App.js.map",
"i18n-cache": "node i18n-cache/index.js",
"i18n-cache:force": "cross-env REFRESH_I18N_CACHE=1 node i18n-cache/index.js",
"postinstall": "npm run i18n-cache",
- "android": "react-native run-android",
+ "android": "react-native run-android --no-packager --no-jetifier",
"prewpandroid": "rm -Rf $TMPDIR/gbmobile-wpandroidfakernroot && mkdir $TMPDIR/gbmobile-wpandroidfakernroot && ln -s $(cd \"$(dirname \"../../../../../\")\"; pwd) $TMPDIR/gbmobile-wpandroidfakernroot/android",
"wpandroid": "npm run android -- --root $TMPDIR/gbmobile-wpandroidfakernroot --variant wasabiDebug --appIdSuffix beta --appFolder WordPress --main-activity=ui.WPLaunchActivity",
"preios": "cd ios && (bundle check --path=vendor/bundle > /dev/null || bundle install) && bundle exec pod install --repo-update",
diff --git a/packages/react-native-editor/sass-transformer.js b/packages/react-native-editor/sass-transformer.js
index 5f3ab6f6953980..b3541f517a12a9 100644
--- a/packages/react-native-editor/sass-transformer.js
+++ b/packages/react-native-editor/sass-transformer.js
@@ -39,7 +39,7 @@ const path = require( 'path' );
const sass = require( 'sass' );
// eslint-disable-next-line import/no-extraneous-dependencies
const css2rn = require( 'css-to-react-native-transform' ).default;
-
+// eslint-disable-next-line import/no-extraneous-dependencies
const upstreamTransformer = require( 'metro-react-native-babel-transformer' );
// TODO: need to find a way to pass the include paths and the default asset files via some config
diff --git a/patches/react-native+0.61.5.patch b/patches/react-native+0.61.5.patch
deleted file mode 100644
index 550653f231b5ea..00000000000000
--- a/patches/react-native+0.61.5.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheetManager.m b/node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheetManager.m
-index 65fa2bb..c5f265b 100644
---- a/node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheetManager.m
-+++ b/node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheetManager.m
-@@ -66,6 +66,7 @@ - (void)presentViewController:(UIViewController *)alertController
- NSArray *buttons = [RCTConvert NSStringArray:options[@"options"]];
- NSInteger cancelButtonIndex = options[@"cancelButtonIndex"] ? [RCTConvert NSInteger:options[@"cancelButtonIndex"]] : -1;
- NSArray *destructiveButtonIndices;
-+ NSArray *disabledButtonIndices = [RCTConvert NSArray:options[@"disabledButtonIndices"]];
- if ([options[@"destructiveButtonIndex"] isKindOfClass:[NSArray class]]) {
- destructiveButtonIndices = [RCTConvert NSArray:options[@"destructiveButtonIndex"]];
- } else {
-@@ -108,6 +109,10 @@ - (void)presentViewController:(UIViewController *)alertController
- callback(@[@(localIndex)]);
- }]];
-
-+ if ([disabledButtonIndices containsObject:@(localIndex)]) {
-+ [alertController.actions[localIndex] setEnabled:false];
-+ }
-+
- index++;
- }
-
-diff --git a/node_modules/react-native/Libraries/Image/RCTUIImageViewAnimated.m b/node_modules/react-native/Libraries/Image/RCTUIImageViewAnimated.m
-index 01aa75f..572572c 100644
---- a/node_modules/react-native/Libraries/Image/RCTUIImageViewAnimated.m
-+++ b/node_modules/react-native/Libraries/Image/RCTUIImageViewAnimated.m
-@@ -266,6 +266,9 @@ - (void)displayDidRefresh:(CADisplayLink *)displayLink
-
- - (void)displayLayer:(CALayer *)layer
- {
-+ if (!_currentFrame) {
-+ _currentFrame = self.image;
-+ }
- if (_currentFrame) {
- layer.contentsScale = self.animatedImageScale;
- layer.contents = (__bridge id)_currentFrame.CGImage;
-diff --git a/node_modules/react-native/React/CxxBridge/RCTCxxBridge.mm b/node_modules/react-native/React/CxxBridge/RCTCxxBridge.mm
-index bd48f44..d243ed0 100644
---- a/node_modules/react-native/React/CxxBridge/RCTCxxBridge.mm
-+++ b/node_modules/react-native/React/CxxBridge/RCTCxxBridge.mm
-@@ -767,7 +767,7 @@ - (void)registerExtraLazyModules
- #endif
- }
-
--- (NSArray *)_initializeModules:(NSArray> *)modules
-+- (NSArray *)_initializeModules:(NSArray *)modules
- withDispatchGroup:(dispatch_group_t)dispatchGroup
- lazilyDiscovered:(BOOL)lazilyDiscovered
- {
-diff --git a/node_modules/react-native/React/Views/RCTShadowView.m b/node_modules/react-native/React/Views/RCTShadowView.m
-index 40c0cda..646f137 100644
---- a/node_modules/react-native/React/Views/RCTShadowView.m
-+++ b/node_modules/react-native/React/Views/RCTShadowView.m
-@@ -156,13 +156,11 @@ static void RCTProcessMetaPropsBorder(const YGValue metaProps[META_PROP_COUNT],
- - (CGRect)measureLayoutRelativeToAncestor:(RCTShadowView *)ancestor
- {
- CGPoint offset = CGPointZero;
-- NSInteger depth = 30; // max depth to search
- RCTShadowView *shadowView = self;
-- while (depth && shadowView && shadowView != ancestor) {
-+ while (shadowView && shadowView != ancestor) {
- offset.x += shadowView.layoutMetrics.frame.origin.x;
- offset.y += shadowView.layoutMetrics.frame.origin.y;
- shadowView = shadowView->_superview;
-- depth--;
- }
- if (ancestor != shadowView) {
- return CGRectNull;
-@@ -172,11 +170,9 @@ - (CGRect)measureLayoutRelativeToAncestor:(RCTShadowView *)ancestor
-
- - (BOOL)viewIsDescendantOf:(RCTShadowView *)ancestor
- {
-- NSInteger depth = 30; // max depth to search
- RCTShadowView *shadowView = self;
-- while (depth && shadowView && shadowView != ancestor) {
-+ while (shadowView && shadowView != ancestor) {
- shadowView = shadowView->_superview;
-- depth--;
- }
- return ancestor == shadowView;
- }
-diff --git a/node_modules/react-native/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm b/node_modules/react-native/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm
-index 3cb73b5..e4a14b4 100644
---- a/node_modules/react-native/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm
-+++ b/node_modules/react-native/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm
-@@ -297,7 +297,7 @@ - (void)notifyAboutTurboModuleSetup:(const char *)name
- @"%@ has no setter or ivar for its bridge, which is not "
- "permitted. You must either @synthesize the bridge property, "
- "or provide your own setter method.",
-- RCTBridgeModuleNameForClass(module));
-+ RCTBridgeModuleNameForClass(Class(module)));
- }
- }
-
diff --git a/phpunit/class-vendor-script-filename-test.php b/phpunit/class-vendor-script-filename-test.php
index df18863ce9e67b..f346c48c73ffbd 100644
--- a/phpunit/class-vendor-script-filename-test.php
+++ b/phpunit/class-vendor-script-filename-test.php
@@ -11,23 +11,23 @@ function vendor_script_filename_cases() {
// Development mode scripts.
array(
'react-handle',
- 'https://unpkg.com/react@16.13.1/umd/react.development.js',
+ 'https://unpkg.com/react@17.0.1/umd/react.development.js',
'react-handle.HASH.js',
),
array(
'react-dom-handle',
- 'https://unpkg.com/react-dom@16.13.1/umd/react-dom.development.js',
+ 'https://unpkg.com/react-dom@17.0.1/umd/react-dom.development.js',
'react-dom-handle.HASH.js',
),
// Production mode scripts.
array(
'react-handle',
- 'https://unpkg.com/react@16.13.1/umd/react.production.min.js',
+ 'https://unpkg.com/react@17.0.1/umd/react.production.min.js',
'react-handle.min.HASH.js',
),
array(
'react-dom-handle',
- 'https://unpkg.com/react-dom@16.13.1/umd/react-dom.production.min.js',
+ 'https://unpkg.com/react-dom@17.0.1/umd/react-dom.production.min.js',
'react-dom-handle.min.HASH.js',
),
// Other cases.
diff --git a/test/native/enzyme.config.js b/test/native/enzyme.config.js
index da4dd944515db6..a2c5643f8794d2 100644
--- a/test/native/enzyme.config.js
+++ b/test/native/enzyme.config.js
@@ -2,5 +2,5 @@
* External dependencies
*/
import { configure } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
configure( { adapter: new Adapter() } );
diff --git a/test/native/jest.config.js b/test/native/jest.config.js
index a2d3e7d047bf37..a06283148c7140 100644
--- a/test/native/jest.config.js
+++ b/test/native/jest.config.js
@@ -69,7 +69,7 @@ module.exports = {
// See: https://github.com/wordpress-mobile/gutenberg-mobile/pull/257#discussion_r234978268
// There is no overloading in jest so we need to rewrite the config from react-native-jest-preset:
// https://github.com/facebook/react-native/blob/HEAD/jest-preset.json#L20
- 'node_modules/(?!(simple-html-tokenizer|(jest-)?react-native|react-clone-referenced-element))',
+ 'node_modules/(?!(simple-html-tokenizer|(jest-)?react-native|@react-native|react-clone-referenced-element))',
],
snapshotSerializers: [ 'enzyme-to-json/serializer', 'jest-emotion' ],
reporters: [ 'default', 'jest-junit' ],
diff --git a/test/native/setup.js b/test/native/setup.js
index deaa3ed964103c..2df7fb1889b293 100644
--- a/test/native/setup.js
+++ b/test/native/setup.js
@@ -1,7 +1,20 @@
/**
* External dependencies
*/
-import 'react-native-gesture-handler/jestSetup';
+import { NativeModules as RNNativeModules } from 'react-native';
+
+RNNativeModules.UIManager = RNNativeModules.UIManager || {};
+RNNativeModules.UIManager.RCTView = RNNativeModules.UIManager.RCTView || {};
+RNNativeModules.RNGestureHandlerModule = RNNativeModules.RNGestureHandlerModule || {
+ State: { BEGAN: 'BEGAN', FAILED: 'FAILED', ACTIVE: 'ACTIVE', END: 'END' },
+ attachGestureHandler: jest.fn(),
+ createGestureHandler: jest.fn(),
+ dropGestureHandler: jest.fn(),
+ updateGestureHandler: jest.fn(),
+};
+RNNativeModules.PlatformConstants = RNNativeModules.PlatformConstants || {
+ forceTouchAvailable: false,
+};
// Mock component to render with props rather than merely a string name so that
// we may assert against it. ...args is used avoid warnings about ignoring
@@ -142,7 +155,7 @@ jest.mock( 'react-native-reanimated', () => {
// Silence the warning: Animated: `useNativeDriver` is not supported because the
// native animated module is missing. This was added per React Navigation docs.
// https://reactnavigation.org/docs/testing/#mocking-native-modules
-jest.mock( 'react-native/Libraries/Animated/src/NativeAnimatedHelper' );
+jest.mock( 'react-native/Libraries/Animated/NativeAnimatedHelper' );
// We currently reference TextStateInput (a private module) within
// react-native-aztec/src/AztecView. Doing so requires that we mock it via its