Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: Upgrade to React Native 0.73 #6590

Merged
Merged
Changes from 47 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
c9bd938
Update gutenberg submodule hash to b7429a9eb0d3b19037467fc75deee1ae0f…
wpmobilebot Jan 30, 2024
827feca
build: Capture result of @rnx-kit/align-deps
dcalhoun Jan 30, 2024
dfdec77
build: Revert incompatible `@rnx-kit/align-deps` changes
dcalhoun Jan 30, 2024
e442547
build: Capture package lock file changes
dcalhoun Jan 30, 2024
d12e0e6
Update gutenberg submodule hash to 5c867d3facfb48f72b117f79dc1edf7368…
wpmobilebot Jan 31, 2024
dafd92f
Update gutenberg submodule hash to 3b8a46bb3896ff6e983de2f93f6c034c04…
wpmobilebot Jan 31, 2024
1e36bb8
Update gutenberg submodule hash to df5ff72674a6cb02c2f75dfb0d2c3858f7…
wpmobilebot Jan 31, 2024
3fd0929
build: Replace Metro packages with @react-native namespace equivalents
dcalhoun Jan 31, 2024
5150e84
build: Correct lock file changes
dcalhoun Jan 31, 2024
a880b08
Update gutenberg submodule hash to 69835ba98f4cd1b01e2900f3f1cde7986f…
wpmobilebot Jan 31, 2024
91904ee
Update gutenberg submodule hash to 86db7ed2d302bc01bfffbbd2a2fbfbd4a1…
wpmobilebot Jan 31, 2024
5e631a0
Add jetpack config mock config
Feb 8, 2024
b57cc56
Update metro config
Feb 8, 2024
0355793
Update Gutenberg ref
Feb 8, 2024
609eaf3
Update Gutenberg ref
Feb 8, 2024
095129b
build: Update Gutenberg ref
dcalhoun Feb 8, 2024
a73d6ac
Merge pull request #6618 from wordpress-mobile/build/upgrade-to-react…
dcalhoun Feb 8, 2024
3bcc7d9
build: Update Gutenberg ref
dcalhoun Feb 1, 2024
a8e505a
build: Generate third-party podspecs
dcalhoun Feb 1, 2024
d294534
build: Update react-native-reanimated to 3.6.2
dcalhoun Feb 6, 2024
4dcbbd4
fix: Remove unsupported Xcode 12 workaround
dcalhoun Feb 6, 2024
8ed869b
build: Capture results of building the XCFramework
dcalhoun Feb 6, 2024
c1a18cf
build: Update Gutenberg ref
dcalhoun Feb 6, 2024
f263d76
test: Wrap timer run that results in re-render in act call
dcalhoun Feb 6, 2024
a92f5dc
build: Add react-native dev dependency
dcalhoun Feb 7, 2024
dd8d983
Revert "build: Add react-native dev dependency"
dcalhoun Feb 8, 2024
a6597d2
build: Update Gutenberg ref
dcalhoun Feb 8, 2024
35e5401
build: Update Gutenberg ref
dcalhoun Feb 8, 2024
1445b57
Update gutenberg submodule hash to 532436df5bcb254b644daf5a95221cd3bd…
wpmobilebot Feb 8, 2024
98acc57
Merge pull request #6612 from wordpress-mobile/build/upgrade-to-react…
dcalhoun Feb 8, 2024
e2e5429
Update metro config for bundles
Feb 9, 2024
f5f11fa
Merge pull request #6624 from wordpress-mobile/build/upgrade-to-react…
dcalhoun Feb 9, 2024
7e76703
Merge branch 'trunk' of github.com:wordpress-mobile/gutenberg-mobile …
dcalhoun Feb 9, 2024
9e30e5a
Update gutenberg submodule hash to 719843ccec0131cb18d6eb29b43c0902a0…
wpmobilebot Feb 9, 2024
f42f1c0
build: Capture Pod changes
dcalhoun Feb 9, 2024
fa0ea94
build: Fix iOS XCFramework failure
dcalhoun Feb 9, 2024
6f10881
build: Capture latest Pod changes
dcalhoun Feb 9, 2024
741a265
Merge pull request #6627 from wordpress-mobile/build/fix-ios-xcframew…
dcalhoun Feb 10, 2024
9a019f6
build: Update Gutenberg ref
dcalhoun Feb 12, 2024
f44c0cc
build: Generate third-party podspecs
dcalhoun Feb 12, 2024
b5e4d30
Update gutenberg submodule hash to aa4de3ec4810578a9929fbe1ecdab82acd…
wpmobilebot Feb 12, 2024
bc8b1f5
Update gutenberg submodule hash to 59ae088a30aeb5ea0a4937d040371c8221…
wpmobilebot Feb 13, 2024
3288e2e
Update gutenberg submodule hash to 08228eb7a9bf1e51975cb3b123f6ad99d5…
wpmobilebot Feb 15, 2024
0d981c0
Update gutenberg submodule hash to 1ac08b2744954f1276d929f585f8696540…
wpmobilebot Feb 15, 2024
1cecf7e
build: Capture package changes from Gutenberg core
dcalhoun Feb 15, 2024
5f88be1
Update Gutenberg ref
Feb 16, 2024
99125de
Update gutenberg submodule hash to d4dfaa8dd2e730817fe71ca1672db94e6d…
wpmobilebot Feb 16, 2024
4fcb506
Update gutenberg submodule hash to 2a09562fbeaa1b7f2d39abdbe4b7a36527…
wpmobilebot Mar 5, 2024
48529b3
Merge branch 'trunk' into version-toolkit/gutenberg/build/upgrade-to-…
Mar 5, 2024
7bce862
Merge branch 'trunk' into version-toolkit/gutenberg/build/upgrade-to-…
Mar 5, 2024
ef2ce79
Update ios-xcframework/Podfile.lock
Mar 5, 2024
e03dbd8
Update Gutenberg ref
Mar 5, 2024
1edb52f
Update Release Notes
Mar 5, 2024
c3c6e55
build: Update Gutenberg ref
dcalhoun Mar 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gutenberg
Submodule gutenberg updated 1008 files
8 changes: 1 addition & 7 deletions ios-xcframework/Podfile
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ def setup_rnreanimated_pod_from_fork
puts "[Gutenberg] Set REACT_NATIVE_NODE_MODULES_DIR env var for RNReanimated to #{rn_node_modules}"

# Use a custom RNReanimated version while we coordinate a fix upstream
pod 'RNReanimated', git: 'https://github.com/wordpress-mobile/react-native-reanimated', branch: 'wp-fork-2.17.0'
pod 'RNReanimated', git: 'https://github.com/wordpress-mobile/react-native-reanimated', branch: 'wp-fork-3.6.2'
end

def gutenberg_dependencies
@@ -78,12 +78,6 @@ end
post_install do |installer|
react_native_post_install(installer, REACT_NATIVE_PATH)

# The following workaround is needed to avoid the error `typedef redefinition with different types ('uint8_t' (aka 'unsigned char') vs 'enum clockid_t')`.
# This solution is referenced in https://github.com/facebook/react-native/issues/39568#issuecomment-1762890606.
# It will be needed until RCT-Folly version is bumped in React Native to version v2022.08.29.00 or above.
# Referece: https://github.com/facebook/folly/commit/4a2410fae65afb85e1fec6d922005054b05de59f
__apply_Xcode_12_5_M1_post_install_workaround(installer)

installer.pods_project.targets.each do |target|
# Work around issue with embedding the Hermes XCFramework
#
1,374 changes: 1,056 additions & 318 deletions ios-xcframework/Podfile.lock

Large diffs are not rendered by default.

40 changes: 28 additions & 12 deletions ios-xcframework/XCFrameworkScaffold.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -27,7 +27,6 @@
3F12365029F6B23300AF54A4 /* supported-blocks.json in Resources */ = {isa = PBXBuildFile; fileRef = 3F12364F29F6B23300AF54A4 /* supported-blocks.json */; };
3F8D0D482A8CB297008A5891 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0D472A8CB297008A5891 /* assets */; };
3FA0C5812A1C8C9700600A9A /* App.js in Resources */ = {isa = PBXBuildFile; fileRef = 3FA0C5802A1C8C9700600A9A /* App.js */; };
3FC7862B2A53047D00A0DDAF /* hermes.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FC7862A2A53047D00A0DDAF /* hermes.xcframework */; };
3FE06AC329F3F61300F752AD /* Gutenberg.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FE06AC229F3F61300F752AD /* Gutenberg.h */; settings = {ATTRIBUTES = (Public, ); }; };
3FE06ACE29F3F6DA00F752AD /* Gutenberg-Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 3FE06AC829F3F6DA00F752AD /* Gutenberg-Debug.xcconfig */; };
3FE06ACF29F3F6DA00F752AD /* Gutenberg-Shared.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 3FE06AC929F3F6DA00F752AD /* Gutenberg-Shared.xcconfig */; };
@@ -59,7 +58,6 @@
3F12364F29F6B23300AF54A4 /* supported-blocks.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = "supported-blocks.json"; path = "../../../src/block-support/supported-blocks.json"; sourceTree = "<group>"; };
3F8D0D472A8CB297008A5891 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = assets; path = Gutenberg/Resources/assets; sourceTree = "<group>"; };
3FA0C5802A1C8C9700600A9A /* App.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = App.js; path = ../../../bundle/ios/App.js; sourceTree = "<group>"; };
3FC7862A2A53047D00A0DDAF /* hermes.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = hermes.xcframework; path = "Pods/hermes-engine/destroot/Library/Frameworks/universal/hermes.xcframework"; sourceTree = "<group>"; };
3FE06ABF29F3F61300F752AD /* Gutenberg.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Gutenberg.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3FE06AC229F3F61300F752AD /* Gutenberg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Gutenberg.h; sourceTree = "<group>"; };
3FE06AC829F3F6DA00F752AD /* Gutenberg-Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Gutenberg-Debug.xcconfig"; sourceTree = "<group>"; };
@@ -79,7 +77,6 @@
buildActionMask = 2147483647;
files = (
612F325D13E652BF476ED672 /* Pods_Gutenberg.framework in Frameworks */,
3FC7862B2A53047D00A0DDAF /* hermes.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -157,7 +154,6 @@
4FCF797BAE1CB2036BB60C7B /* Frameworks */ = {
isa = PBXGroup;
children = (
3FC7862A2A53047D00A0DDAF /* hermes.xcframework */,
432C8665181F3EC336B71D6C /* Pods_Gutenberg.framework */,
);
name = Frameworks;
@@ -352,37 +348,57 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 3FE06ACD29F3F6DA00F752AD /* Project-Debug.xcconfig */;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
);
OTHER_LDFLAGS = (
HEADER_SEARCH_PATHS = (
"$(inherited)",
"-Wl",
"-ld_classic",
"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core",
"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers",
"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers/platform/ios",
"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
"${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers",
"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios",
);
OTHER_CFLAGS = "$(inherited)";
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
OTHER_LDFLAGS = "$(inherited)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../gutenberg/node_modules/react-native";
USE_HERMES = true;
};
name = Debug;
};
3FE06AB929F3F46B00F752AD /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 3FE06ACA29F3F6DA00F752AD /* Project-Release.xcconfig */;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
);
OTHER_LDFLAGS = (
HEADER_SEARCH_PATHS = (
"$(inherited)",
"-Wl",
"-ld_classic",
"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core",
"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers",
"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers/platform/ios",
"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
"${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers",
"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios",
);
OTHER_CFLAGS = "$(inherited)";
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
OTHER_LDFLAGS = "$(inherited)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../gutenberg/node_modules/react-native";
USE_HERMES = true;
};
name = Release;
};
24 changes: 16 additions & 8 deletions metro.config.js
Original file line number Diff line number Diff line change
@@ -2,33 +2,41 @@ const path = require( 'path' );
const fs = require( 'fs' );
const metroResolver = require( 'metro-resolver' );

const nodeModulePaths = [
'../../node_modules',
'../../../jetpack/projects/plugins/jetpack/node_modules',
];

const gutenbergMetroConfig = require( './gutenberg/packages/react-native-editor/metro.config.js' );
const extraNodeModules = {};
const gutenbergMetroConfigCopy = {
...gutenbergMetroConfig,
projectRoot: path.resolve( __dirname ),
resolver: {
...gutenbergMetroConfig.resolver,
unstable_enableSymlinks: false,
sourceExts: [ 'js', 'cjs', 'jsx', 'json', 'scss', 'sass', 'ts', 'tsx' ],
extraNodeModules,
// Exclude `ios-xcframework` folder to avoid conflicts with packages contained in Pods.
blockList: [ /ios-xcframework\/.*/ ],
},
};

const nodeModulePaths = [
'gutenberg/node_modules',
'jetpack/projects/plugins/jetpack/node_modules',
];

const possibleModulePaths = ( name ) =>
nodeModulePaths.map( ( dir ) => path.join( process.cwd(), dir, name ) );

// Exclude `ios-xcframework` folder to avoid conflicts with packages contained in Pods.
gutenbergMetroConfigCopy.resolver.blockList = [ /ios-xcframework\/.*/ ];

gutenbergMetroConfigCopy.resolver.resolveRequest = (
context,
moduleName,
platform
) => {
// This handles part of the Jetpack Config setup typically handled by Webpack's externals.
if ( moduleName.startsWith( '@automattic/jetpack-config' ) ) {
return {
filePath: path.resolve( __dirname + '/src/jetpack-config.js' ),
type: 'sourceFile',
};
}
// Add the module to the extra node modules object if the module is not on a local path.
if ( ! ( moduleName.startsWith( '.' ) || moduleName.startsWith( '/' ) ) ) {
const [ namespace, module = '' ] = moduleName.split( '/' );
10,870 changes: 3,386 additions & 7,484 deletions package-lock.json

Large diffs are not rendered by default.

20 changes: 9 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -13,7 +13,8 @@
"devDependencies": {
"@babel/core": "^7.20.0",
"@babel/runtime": "^7.20.0",
"@react-native-community/cli": "^10.0.0",
"@react-native/babel-preset": "0.73.10",
"@react-native-community/cli": "^12.1.1",
"@typescript-eslint/eslint-plugin": "^6.4.1",
"@wordpress/babel-preset-default": "file:gutenberg/packages/babel-preset-default",
"@wordpress/eslint-plugin": "file:gutenberg/packages/eslint-plugin",
@@ -39,14 +40,13 @@
"gettext-parser": "^4.0.3",
"husky": "^3.0.2",
"identity-obj-proxy": "^3.0.0",
"jest": "29.5.0",
"jest": "29.6.2",
"jest-image-snapshot": "^6.1.0",
"jest-jasmine2": "29.5.0",
"jest-junit": "^13.0.0",
"jest-watch-typeahead": "2.2.2",
"jimp": "^0.22.1",
"metro-react-native-babel-preset": "^0.73.10",
"metro-resolver": "^0.73.10",
"metro-resolver": "^0.80.0",
"node-fetch": "^2.3.0",
"patch-package": "^6.2.2",
"prettier": "npm:wp-prettier@3.0.3-beta-3",
@@ -62,22 +62,20 @@
"postinstall": "patch-package && npm run clean:gutenberg:distclean && npm ci --prefix gutenberg && npm run i18n:check-cache && ./bin/run-jetpack-command.sh \"install --ignore-scripts\"",
"start": "echo \"\\x1b[33mThe start command is not available in this project. It is strongly recommended to use \\x1b[1:33mstart:reset\\x1b[0m\\x1b[33m to perform some cleanup when starting the metro bundler.\nOr you may use \\x1b[1:33mstart:quick\\x1b[0m\\x1b[33m for a quicker startup, but this may lead to unexpected javascript errors when running the app.\\x1b[0m\"",
"start:reset": "npm run core clean:runtime && npm run start:quick -- --reset-cache",
"start:quick": "react-native start --config ./metro.config.js",
"start:quick": "npm run core start:quick -- -- -- --config ../../../metro.config.js",
"core": "cd gutenberg && npm run native",
"prern-bundle": "patch-package --patch-dir gutenberg/packages/react-native-editor/metro-patch",
"rn-bundle": "react-native bundle",
"postrn-bundle": "patch-package --reverse --patch-dir gutenberg/packages/react-native-editor/metro-patch",
"rn-bundle": "npm run core rn-bundle",
"i18n:check-cache": "./bin/i18n-check-cache.sh jetpack wp-plugins/jetpack layout-grid wp-plugins/layout-grid jetpack-videopress-pkg wp-plugins/jetpack",
"i18n:update": "./bin/i18n-update.sh jetpack wp-plugins/jetpack ./jetpack/projects/plugins/jetpack/extensions layout-grid wp-plugins/layout-grid ./block-experiments/blocks/layout-grid jetpack-videopress-pkg wp-plugins/jetpack ./jetpack/projects/packages/videopress",
"i18n:update:test": "./bin/i18n-update.sh --path i18n-test jetpack wp-plugins/jetpack ./jetpack/projects/plugins/jetpack/extensions layout-grid wp-plugins/layout-grid ./block-experiments/blocks/layout-grid jetpack-videopress-pkg wp-plugins/jetpack ./jetpack/projects/packages/videopress",
"bundle": "npm run clean && npm run bundle:js",
"prebundle:js": "npm run i18n:update",
"bundle:js": "npm run bundle:android && npm run bundle:ios",
"bundle:android": "npm run bundle:android:text && npm run bundle:android:bytecode",
"bundle:android:text": "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",
"bundle:android:text": "mkdir -p bundle/android && npm run rn-bundle -- -- -- -- --config ../../../metro.config.js --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",
"bundle:android:bytecode": "./gutenberg/node_modules/react-native/sdks/hermesc/`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": "npm run bundle:ios:text && npm run bundle:ios:bytecode",
"bundle:ios:text": "mkdir -p bundle/ios && npm run rn-bundle -- --platform ios --dev false --entry-file ./index.js --assets-dest ./ios-xcframework/Gutenberg/Resources --bundle-output ./bundle/ios/App.text.js --sourcemap-output ./bundle/ios/App.text.js.map",
"bundle:ios:text": "mkdir -p bundle/ios && npm run rn-bundle -- -- -- -- --config ../../../metro.config.js --platform ios --dev false --entry-file ./index.js --assets-dest ../../../ios-xcframework/Gutenberg/Resources --bundle-output ../../../bundle/ios/App.text.js --sourcemap-output ../../../bundle/ios/App.text.js.map",
"bundle:ios:bytecode": "./gutenberg/node_modules/react-native/sdks/hermesc/`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/ios/App.js bundle/ios/App.text.js -output-source-map",
"prewpandroid": "rm -Rf $TMPDIR/gbmobile-wpandroidfakernroot && mkdir $TMPDIR/gbmobile-wpandroidfakernroot && ln -s $(cd \"$(dirname \"../../../\")\"; pwd) $TMPDIR/gbmobile-wpandroidfakernroot/android",
"wpandroid": "cd gutenberg && react-native run-android --root $TMPDIR/gbmobile-wpandroidfakernroot --variant wasabiDebug --appIdSuffix beta --appFolder WordPress --main-activity=ui.WPLaunchActivity",
@@ -90,7 +88,7 @@
"device-tests:local": "APPIUM_HOME=~/.appium IOS_APP_PATH='./gutenberg/packages/react-native-editor/ios/build/GutenbergDemo/Build/Products/Release-iphonesimulator/GutenbergDemo.app' WDA_PATH='./gutenberg/packages/react-native-editor/ios/build/WDA' ANDROID_APP_PATH='./gutenberg/packages/react-native-editor/android/app/build/outputs/apk/debug/app-debug.apk' NODE_ENV=test jest --maxWorkers=2 --detectOpenHandles --config jest_ui.config.js",
"device-tests:debug": "IOS_APP_PATH='./gutenberg/packages/react-native-editor/ios/build/GutenbergDemo/Build/Products/Release-iphonesimulator/GutenbergDemo.app' WDA_PATH='./gutenberg/packages/react-native-editor/ios/build/WDA' ANDROID_APP_PATH='./gutenberg/packages/react-native-editor/android/app/build/outputs/apk/debug/app-debug.apk' cross-env NODE_ENV=test node $NODE_DEBUG_OPTION --inspect-brk node_modules/jest/bin/jest --runInBand --detectOpenHandles --verbose --config jest_ui.config.js",
"test:e2e:bundle:android": "npm run test:e2e:bundle:android:text && npm run test:e2e:bundle:android:bytecode",
"test:e2e:bundle:android:text": "mkdir -p gutenberg/packages/react-native-editor/android/app/src/main/assets && npm run rn-bundle -- --reset-cache --platform android --dev false --minify false --entry-file index.js --bundle-output gutenberg/packages/react-native-editor/android/app/src/main/assets/index.android.text.bundle --assets-dest gutenberg/packages/react-native-editor/android/app/src/main/res",
"test:e2e:bundle:android:text": "mkdir -p gutenberg/packages/react-native-editor/android/app/src/main/assets && npm run rn-bundle -- -- -- -- --config ../../../metro.config.js --reset-cache --platform android --dev false --minify false --entry-file index.js --bundle-output ./android/app/src/main/assets/index.android.text.bundle --assets-dest ./android/app/src/main/res",
"test:e2e:bundle:android:bytecode": "./gutenberg/node_modules/react-native/sdks/hermesc/`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 gutenberg/packages/react-native-editor/android/app/src/main/assets/index.android.bundle gutenberg/packages/react-native-editor/android/app/src/main/assets/index.android.text.bundle -output-source-map",
"test:e2e:android:local": "npm run test:e2e:bundle:android && npm run core test:e2e:build-app:android && TEST_RN_PLATFORM=android npm run device-tests:local",
"test:e2e:bundle:ios": "mkdir -p gutenberg/packages/react-native-editor/ios/build/GutenbergDemo/Build/Products/Release-iphonesimulator/GutenbergDemo.app && npm run bundle:ios && cp bundle/ios/App.js ./gutenberg/packages/react-native-editor/ios/build/GutenbergDemo/Build/Products/Release-iphonesimulator/GutenbergDemo.app/main.jsbundle && cp -r bundle/ios/assets ./gutenberg/packages/react-native-editor/ios/build/GutenbergDemo/Build/Products/Release-iphonesimulator/GutenbergDemo.app/",
5 changes: 5 additions & 0 deletions src/jetpack-config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const jetpackConfig = {
consumer_slug: 'gutenberg-mobile',
};

export default jetpackConfig;
2 changes: 1 addition & 1 deletion src/test/videopress/edit.js
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ describe( 'VideoPress block', () => {
// When the block is inserted, it automatically opens the media picker.
// On iOS, this picker is displayed using a timer, so we need to run it
// to allow any DOM update.
await withFakeTimers( () => jest.runOnlyPendingTimers() );
await act( () => withFakeTimers( () => jest.runOnlyPendingTimers() ) );

// Get block
const videoPressBlock = await getBlock( screen, 'VideoPress' );
4 changes: 2 additions & 2 deletions third-party-podspecs/RNCMaskedView.podspec.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "RNCMaskedView",
"version": "0.2.9",
"version": "0.3.0",
"summary": "React Native MaskedView component",
"license": "MIT",
"authors": "Mike Nedosekin <crespo8800@gmail.com>",
@@ -11,7 +11,7 @@
},
"source": {
"git": "https://github.com/react-native-masked-view/masked-view.git",
"tag": "v0.2.9"
"tag": "v0.3.0"
},
"source_files": "ios/**/*.{h,m}",
"dependencies": {
4 changes: 2 additions & 2 deletions third-party-podspecs/RNGestureHandler.podspec.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "RNGestureHandler",
"version": "2.10.2",
"version": "2.14.1",
"summary": "Experimental implementation of a new declarative API for gesture handling in react-native",
"homepage": "https://github.com/software-mansion/react-native-gesture-handler",
"license": "MIT",
@@ -9,7 +9,7 @@
},
"source": {
"git": "https://github.com/software-mansion/react-native-gesture-handler",
"tag": "2.10.2"
"tag": "2.14.1"
},
"source_files": "ios/**/*.{h,m,mm}",
"requires_arc": true,
33 changes: 20 additions & 13 deletions third-party-podspecs/RNReanimated.podspec.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "RNReanimated",
"version": "2.17.0",
"version": "3.6.2",
"summary": "More powerful alternative to Animated library for React Native.",
"description": "RNReanimated",
"homepage": "https://github.com/software-mansion/react-native-reanimated",
@@ -9,39 +9,43 @@
"author": "author@domain.cn"
},
"platforms": {
"ios": "9.0",
"tvos": "9.0"
"ios": "13.4",
"tvos": "9.0",
"osx": "10.14"
},
"source": {
"git": "https://github.com/software-mansion/react-native-reanimated.git",
"tag": "2.17.0"
"tag": "3.6.2"
},
"source_files": [
"ios/**/*.{mm,h,m}",
"apple/**/*.{mm,h,m}",
"Common/cpp/**/*.{cpp,h}"
],
"preserve_paths": [
"Common/cpp/hidden_headers/**"
],
"pod_target_xcconfig": {
"USE_HEADERMAP": "YES",
"HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\" ",
"FRAMEWORK_SEARCH_PATHS": "\"${PODS_CONFIGURATION_BUILD_DIR}/React-hermes\""
"DEFINES_MODULE": "YES",
"HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Private/Yoga\"",
"FRAMEWORK_SEARCH_PATHS": "\"${PODS_CONFIGURATION_BUILD_DIR}/React-hermes\"",
"CLANG_CXX_LANGUAGE_STANDARD": "c++17",
"GCC_PREPROCESSOR_DEFINITIONS[config=Debug]": "$(inherited) HERMES_ENABLE_DEBUGGER=1",
"GCC_PREPROCESSOR_DEFINITIONS[config=Release]": "$(inherited) NDEBUG=1"
},
"compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DREACT_NATIVE_MINOR_VERSION=71 -Wno-comma -Wno-shorten-64-to-32 -Wno-documentation",
"compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DREACT_NATIVE_MINOR_VERSION=73 -Wno-comma -Wno-shorten-64-to-32 -Wno-documentation",
"xcconfig": {
"HEADER_SEARCH_PATHS": "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-hermes\" \"${PODS_ROOT}/Headers/Public/hermes-engine\" \"$(PODS_ROOT)/../../react-native/ReactCommon\"",
"OTHER_CFLAGS": "$(inherited) -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DREACT_NATIVE_MINOR_VERSION=71 -DREANIMATED_VERSION=2.17.0"
"HEADER_SEARCH_PATHS": "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Public/React-hermes\" \"$(PODS_ROOT)/Headers/Public/hermes-engine\" \"$(PODS_ROOT)/../../react-native/ReactCommon\"",
"OTHER_CFLAGS": "$(inherited) -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DREACT_NATIVE_MINOR_VERSION=73 -DREANIMATED_VERSION=3.6.2 "
},
"requires_arc": true,
"dependencies": {
"ReactCommon/turbomodule/core": [],
"React-Core": [],
"RCT-Folly": [],
"RCTRequired": [],
"RCTTypeSafety": [],
"ReactCommon/turbomodule/core": [],
"FBLazyVector": [],
"FBReactNativeSpec": [],
"React-CoreModules": [],
"React-Core/DevSupport": [],
"React-RCTActionSheet": [],
@@ -60,7 +64,10 @@
"Yoga": [],
"DoubleConversion": [],
"glog": [],
"React-callinvoker": []
"React-hermes": [],
"hermes-engine": [],
"React-callinvoker": [],
"React-RCTAppDelegate": []
},
"__WARNING!__": "This file is autogenerated by generate-podspecs.sh script. Do not modify manually. Re-run the script if necessary."
}
16 changes: 8 additions & 8 deletions third-party-podspecs/RNSVG.podspec.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
{
"name": "RNSVG",
"version": "13.9.0",
"version": "14.0.0",
"summary": "SVG library for react-native",
"license": "MIT",
"homepage": "https://github.com/react-native-community/react-native-svg",
"authors": "Horcrux Chen",
"platforms": {
"osx": "10.14",
"ios": "9.0",
"tvos": "9.2"
},
"source": {
"git": "https://github.com/react-native-community/react-native-svg.git",
"tag": "v13.9.0"
"tag": "v14.0.0"
},
"source_files": "apple/**/*.{h,m,mm}",
"exclude_files": "apple/Utils/RNSVGFabricConversions.h",
"ios": {
"exclude_files": "**/*.macos.{h,m,mm}"
},
@@ -26,6 +20,12 @@
"exclude_files": "**/*.ios.{h,m,mm}"
},
"requires_arc": true,
"platforms": {
"osx": "10.14",
"ios": "10.0",
"tvos": "9.2"
},
"exclude_files": "apple/Utils/RNSVGFabricConversions.h",
"dependencies": {
"React-Core": []
},
4 changes: 2 additions & 2 deletions third-party-podspecs/RNScreens.podspec.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "RNScreens",
"version": "3.22.0",
"version": "3.29.0",
"summary": "Native navigation primitives for your React Native app.",
"description": "RNScreens - first incomplete navigation solution for your React Native app",
"homepage": "https://github.com/software-mansion/react-native-screens",
@@ -14,7 +14,7 @@
},
"source": {
"git": "https://github.com/software-mansion/react-native-screens.git",
"tag": "3.22.0"
"tag": "3.29.0"
},
"source_files": "ios/**/*.{h,m,mm}",
"requires_arc": true,
33 changes: 0 additions & 33 deletions third-party-podspecs/React-jsc.podspec.json

This file was deleted.

17 changes: 4 additions & 13 deletions third-party-podspecs/react-native-safe-area-context.podspec.json
Original file line number Diff line number Diff line change
@@ -1,31 +1,22 @@
{
"name": "react-native-safe-area-context",
"version": "4.6.3",
"version": "4.8.2",
"summary": "A flexible way to handle safe area, also works on Android and web.",
"license": "MIT",
"authors": "Janic Duplessis <janicduplessis@gmail.com>",
"homepage": "https://github.com/th3rdwave/react-native-safe-area-context#readme",
"platforms": {
"ios": "12.4",
"tvos": "11.0"
"tvos": "12.4"
},
"source": {
"git": "https://github.com/th3rdwave/react-native-safe-area-context.git",
"tag": "v4.6.3"
"tag": "v4.8.2"
},
"source_files": "ios/**/*.{h,m,mm}",
"exclude_files": "ios/Fabric",
"compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32",
"pod_target_xcconfig": {
"HEADER_SEARCH_PATHS": "\"$(PODS_ROOT)/boost\"",
"CLANG_CXX_LANGUAGE_STANDARD": "c++17"
},
"dependencies": {
"React-Core": [],
"RCT-Folly": [],
"RCTRequired": [],
"RCTTypeSafety": [],
"ReactCommon/turbomodule/core": []
"React-Core": []
},
"__WARNING!__": "This file is autogenerated by generate-podspecs.sh script. Do not modify manually. Re-run the script if necessary."
}
6 changes: 3 additions & 3 deletions third-party-podspecs/react-native-webview.podspec.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-webview",
"version": "11.26.1",
"version": "13.6.1",
"summary": "React Native WebView component for iOS, Android, macOS, and Windows",
"license": "MIT",
"authors": "Jamon Holmgren <jamon@infinite.red>",
@@ -11,9 +11,9 @@
},
"source": {
"git": "https://github.com/react-native-webview/react-native-webview.git",
"tag": "v11.26.1"
"tag": "v13.6.1"
},
"source_files": "apple/**/*.{h,m}",
"source_files": "apple/**/*.{h,m,mm,swift}",
"dependencies": {
"React-Core": []
},