Skip to content

Commit 66f278b

Browse files
authored
Merge pull request #1028 from DataDog/sbarrio/update-feature-v3-with-develop
[V3] Update feature/v3 branch with changes from develop
2 parents 045e90a + 781b137 commit 66f278b

File tree

111 files changed

+7015
-594
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+7015
-594
lines changed

.github/workflows/publish.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Publish packages on NPM
2+
on:
3+
# release:
4+
# types: [created]
5+
workflow_dispatch:
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest
10+
environment: Production
11+
steps:
12+
- uses: actions/checkout@v4
13+
- uses: actions/setup-node@v4
14+
with:
15+
node-version: '18.x'
16+
- run: yarn config set npmAuthToken $NPM_PUBLISH_TOKEN --home # Uses --home to avoid updating the project's .yarnrc.yml
17+
env:
18+
NPM_PUBLISH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
19+
- run: yarn
20+
- run: yarn run lerna publish from-package

.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,11 @@ example/android/app/src/main/assets/index.android*
100100

101101
# Credentials for example app
102102
datadog-ci.json
103+
104+
105+
# Babel Plugin assets
106+
packages/react-native-babel-plugin/assets/*
107+
packages/react-native-babel-plugin/svg-map.json
108+
109+
# Session Replay assets
110+
packages/react-native-session-replay/assets/*

LICENSE-3rdparty.csv

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,7 @@ dev,react-native-webview,MIT,"Copyright (c) 2015-present, Facebook, Inc."
3232
dev,react-test-renderer,MIT,"Copyright (c) Facebook, Inc. and its affiliates."
3333
dev,typescript,Apache-2.0,"Copyright Microsoft Corporation"
3434
dev,genversion,MIT,"Copyright (c) 2021 Akseli Palén"
35+
prod,chokidar,MIT,"Copyright (c) 2012 Paul Miller (https://paulmillr.com), Elan Shanker"
36+
prod,fast-glob,MIT,"Copyright (c) Denis Malinochkin"
37+
prod,svgo,MIT,"Copyright (c) Kir Belevich"
38+
prod,uuid,MIT,"Copyright (c) 2010-2020 Robert Kieffer and other contributors"

NATIVE_SDK_VERSIONS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
| React Native | iOS Bridge / iOS SDK | Android Bridge / Android SDK |
22
|-------------|---------------------|-----------------------------|
3+
| 2.13.0 | 2.30.2 | 2.26.2 |
4+
| 2.12.4 | 2.30.0 | 2.25.0 |
5+
| 2.12.3 | 2.30.0 | 2.25.0 |
6+
| 2.12.2 | 2.30.0 | 2.25.0 |
37
| 2.12.1 | 2.30.0 | 2.25.0 |
48
| 2.12.0 | 2.30.0 | 2.25.0 |
59
| 2.11.1 | 2.30.0 | 2.25.0 |

benchmarks/README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,19 @@
66
2. From the iOS folder, run `pod install`.
77
3. From the root folder, run `yarn ios` or `yarn android`.
88

9-
## Enable new architecture
9+
## Enable old architecture
10+
11+
The Benchmark app uses React Native's New Architecture by default. However, you may need to switch to the Old Architecture to compare performance between the two systems or reproduce bugs that are specific to legacy environments.
1012

1113
### iOS
1214

1315
```
14-
RCT_NEW_ARCH_ENABLED=1 pod install
16+
RCT_NEW_ARCH_ENABLED=0 pod install
1517
```
1618

1719
### Android
1820

19-
Set `newArchEnabled=true` in `benchmarks/android/gradle.properties`.
21+
Set `newArchEnabled=false` in `benchmarks/android/gradle.properties`.
2022

2123
## ENV config
2224

benchmarks/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,5 +129,5 @@ dependencies {
129129

130130
// Benchmark tools from dd-sdk-android are used for vitals recording
131131
// Remember to bump thid alongside the main dd-sdk-android dependencies
132-
implementation("com.datadoghq:dd-sdk-android-benchmark-internal:3.1.0")
132+
implementation("com.datadoghq:dd-sdk-android-benchmark-internal:3.2.0")
133133
}

benchmarks/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
3232
# your application. You should enable this flag either if you want
3333
# to write custom TurboModules/Fabric components OR use libraries that
3434
# are providing them.
35-
newArchEnabled=false
35+
newArchEnabled=true
3636

3737
# Use this property to enable or disable the Hermes JS engine.
3838
# If set to false, you will be using JSC instead.

benchmarks/ios/Podfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
source 'https://github.com/CocoaPods/Specs.git'
2+
13
# Resolve react_native_pods.rb with node to allow for hoisting
24
require Pod::Executable.execute_command('node', ['-p',
35
'require.resolve(

benchmarks/ios/Podfile.lock

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ PODS:
1010
- DatadogInternal (= 3.1.0)
1111
- DatadogRUM (3.1.0):
1212
- DatadogInternal (= 3.1.0)
13-
- DatadogSDKReactNative (2.12.1):
13+
- DatadogSDKReactNative (2.13.0):
1414
- DatadogCore (= 3.1.0)
1515
- DatadogCrashReporting (= 3.1.0)
1616
- DatadogLogs (= 3.1.0)
@@ -37,7 +37,7 @@ PODS:
3737
- ReactCommon/turbomodule/bridging
3838
- ReactCommon/turbomodule/core
3939
- Yoga
40-
- DatadogSDKReactNativeSessionReplay (2.12.1):
40+
- DatadogSDKReactNativeSessionReplay (2.13.0):
4141
- DatadogSDKReactNative
4242
- DatadogSessionReplay (= 3.1.0)
4343
- DoubleConversion
@@ -60,7 +60,7 @@ PODS:
6060
- ReactCommon/turbomodule/bridging
6161
- ReactCommon/turbomodule/core
6262
- Yoga
63-
- DatadogSDKReactNativeWebView (2.12.1):
63+
- DatadogSDKReactNativeWebView (2.13.0):
6464
- DatadogInternal (= 3.1.0)
6565
- DatadogSDKReactNative
6666
- DatadogWebViewTracking (= 3.1.0)
@@ -1901,7 +1901,7 @@ DEPENDENCIES:
19011901
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
19021902

19031903
SPEC REPOS:
1904-
trunk:
1904+
https://github.com/CocoaPods/Specs.git:
19051905
- DatadogCore
19061906
- DatadogCrashReporting
19071907
- DatadogInternal
@@ -1912,6 +1912,7 @@ SPEC REPOS:
19121912
- DatadogWebViewTracking
19131913
- OpenTelemetrySwiftApi
19141914
- PLCrashReporter
1915+
trunk:
19151916
- SocketRocket
19161917

19171918
EXTERNAL SOURCES:
@@ -2074,9 +2075,9 @@ SPEC CHECKSUMS:
20742075
DatadogInternal: 7837b2ce3d525d429682532eeda697b181299fdc
20752076
DatadogLogs: 250894b5a99da5b924a019049c0d0326823cdbd6
20762077
DatadogRUM: 0d2a60e1abb8aacfb8827ef84f6d5deb4d5026c8
2077-
DatadogSDKReactNative: 8e0f39de38621d4d7ed961a74d8a216fd3a38321
2078-
DatadogSDKReactNativeSessionReplay: f9288c8e981dcc65d1f727b01421ee9a7601e75f
2079-
DatadogSDKReactNativeWebView: 993527f6c5d38e0fcc4804a6a60c334dd199dc5b
2078+
DatadogSDKReactNative: 620018df2896abcfad6b338c633cc8eccd5de406
2079+
DatadogSDKReactNativeSessionReplay: b2ef22431dd0816adea8d65df13180cf40533f9d
2080+
DatadogSDKReactNativeWebView: 299629cf348a5e8f1dabb8289920a00eee625d6a
20802081
DatadogSessionReplay: 6bc71888e2b41dd0de3325f06f0c0b3cee0e6df4
20812082
DatadogTrace: f59e933074cd285ad7e9f5af991f8fe04b095991
20822083
DatadogWebViewTracking: 9bc92b4147aeed47eb1911451f651094aa6dd6c1
@@ -2155,6 +2156,6 @@ SPEC CHECKSUMS:
21552156
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
21562157
Yoga: e14bad835e12b6c7e2260fc320bd00e0f4b45add
21572158

2158-
PODFILE CHECKSUM: 4410ec48cbe9f00cc7dce5aa595affed6a14ea0d
2159+
PODFILE CHECKSUM: d7a3ce8590271749fb5b532390908bc3a583be46
21592160

21602161
COCOAPODS: 1.16.2

benchmarks/scripts/build-ios-benchmark.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function build_ios_app {
3737

3838
echo export NODE_BINARY=$(command -v node) > ${ROOT}/ios/.xcode.env
3939
rm Podfile.lock || true
40-
pod install --repo-update
40+
RCT_NEW_ARCH_ENABLED=1 pod install --repo-update
4141

4242
# Build & Archive
4343
LOG_PATH="${XCODEBUILD_LOG_PATH:-logs/xcodebuild_full_output_benchmark_runner.log}"

0 commit comments

Comments
 (0)