From e5fe41efed4f10dc3181edb389b156ed9fee6a28 Mon Sep 17 00:00:00 2001 From: Marco Saia Date: Thu, 13 Jun 2024 15:04:31 +0200 Subject: [PATCH 1/2] Added missing copyright headers --- packages/core/src/trace/__tests__/DdTrace.test.ts | 7 +++++++ packages/core/src/utils/__tests__/argsUtils.test.ts | 7 +++++++ packages/core/src/utils/argsUtils.ts | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/packages/core/src/trace/__tests__/DdTrace.test.ts b/packages/core/src/trace/__tests__/DdTrace.test.ts index 566d9908d..a1567afef 100644 --- a/packages/core/src/trace/__tests__/DdTrace.test.ts +++ b/packages/core/src/trace/__tests__/DdTrace.test.ts @@ -1,3 +1,10 @@ +/* eslint-disable @typescript-eslint/ban-ts-comment */ +/* + * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0. + * This product includes software developed at Datadog (https://www.datadoghq.com/). + * Copyright 2016-Present Datadog, Inc. + */ + import { NativeModules } from 'react-native'; import { InternalLog } from '../../InternalLog'; diff --git a/packages/core/src/utils/__tests__/argsUtils.test.ts b/packages/core/src/utils/__tests__/argsUtils.test.ts index db3cc24da..1a2f4eacb 100644 --- a/packages/core/src/utils/__tests__/argsUtils.test.ts +++ b/packages/core/src/utils/__tests__/argsUtils.test.ts @@ -1,3 +1,10 @@ +/* eslint-disable @typescript-eslint/ban-ts-comment */ +/* + * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0. + * This product includes software developed at Datadog (https://www.datadoghq.com/). + * Copyright 2016-Present Datadog, Inc. + */ + import { InternalLog } from '../../InternalLog'; import { SdkVerbosity } from '../../SdkVerbosity'; import { validateContext } from '../argsUtils'; diff --git a/packages/core/src/utils/argsUtils.ts b/packages/core/src/utils/argsUtils.ts index 8fe70502b..d7a07255f 100644 --- a/packages/core/src/utils/argsUtils.ts +++ b/packages/core/src/utils/argsUtils.ts @@ -1,3 +1,10 @@ +/* eslint-disable @typescript-eslint/ban-ts-comment */ +/* + * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0. + * This product includes software developed at Datadog (https://www.datadoghq.com/). + * Copyright 2016-Present Datadog, Inc. + */ + import { InternalLog } from '../InternalLog'; import { SdkVerbosity } from '../SdkVerbosity'; From e836d725111d49ba008cb066b493911230c4461b Mon Sep 17 00:00:00 2001 From: Marco Saia Date: Thu, 13 Jun 2024 15:26:23 +0200 Subject: [PATCH 2/2] Bump to version 2.3.6 --- example-new-architecture/ios/Podfile.lock | 4 ++-- example/ios/Podfile.lock | 12 ++++++------ lerna.json | 2 +- packages/codepush/package.json | 4 ++-- .../kotlin/com/datadog/reactnative/SdkVersion.kt | 2 +- packages/core/ios/Sources/SdkVersion.swift | 2 +- packages/core/package.json | 2 +- packages/core/release-content.txt | 8 ++++++++ packages/core/src/version.ts | 2 +- packages/internal-testing-tools/package.json | 2 +- packages/react-native-apollo-client/package.json | 2 +- packages/react-native-navigation/package.json | 4 ++-- packages/react-native-navigation/release-content.txt | 1 + packages/react-native-session-replay/package.json | 2 +- packages/react-native-webview/package.json | 2 +- packages/react-navigation/package.json | 4 ++-- packages/react-navigation/release-content.txt | 1 + yarn.lock | 8 ++++---- 18 files changed, 37 insertions(+), 27 deletions(-) diff --git a/example-new-architecture/ios/Podfile.lock b/example-new-architecture/ios/Podfile.lock index 1ba050bb4..0979e727b 100644 --- a/example-new-architecture/ios/Podfile.lock +++ b/example-new-architecture/ios/Podfile.lock @@ -11,7 +11,7 @@ PODS: - DatadogInternal (= 2.7.1) - DatadogRUM (2.7.1): - DatadogInternal (= 2.7.1) - - DatadogSDKReactNative (2.3.5): + - DatadogSDKReactNative (2.3.6): - DatadogCore (~> 2.7.1) - DatadogCrashReporting (~> 2.7.1) - DatadogLogs (~> 2.7.1) @@ -1413,7 +1413,7 @@ SPEC CHECKSUMS: DatadogInternal: b9217da25018284c087a2ed4b9bb3b0f26c767c0 DatadogLogs: 3b4132eefa67f196bb3ab2d603c1a2acd1292615 DatadogRUM: 8845815ba89f5ab8ceee765ee268f7de36f3e35d - DatadogSDKReactNative: 793b352304a2e746a8a4f91ca714de810be5e459 + DatadogSDKReactNative: 65a87cf33b9dde71b730ccb98713fa8709dbaf67 DatadogTrace: a63da746c609bd4c683bca61a94429889e33b11e DatadogWebViewTracking: 713f862ddd89173e0a3f5342cefa23def40f0f48 DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953 diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 1f609c0af..20835aa01 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -10,7 +10,7 @@ PODS: - DatadogInternal (= 2.7.1) - DatadogRUM (2.7.1): - DatadogInternal (= 2.7.1) - - DatadogSDKReactNative (2.3.5): + - DatadogSDKReactNative (2.3.6): - DatadogCore (~> 2.7.1) - DatadogCrashReporting (~> 2.7.1) - DatadogLogs (~> 2.7.1) @@ -18,7 +18,7 @@ PODS: - DatadogTrace (~> 2.7.1) - DatadogWebViewTracking (~> 2.7.1) - React-Core - - DatadogSDKReactNative/Tests (2.3.5): + - DatadogSDKReactNative/Tests (2.3.6): - DatadogCore (~> 2.7.1) - DatadogCrashReporting (~> 2.7.1) - DatadogLogs (~> 2.7.1) @@ -26,11 +26,11 @@ PODS: - DatadogTrace (~> 2.7.1) - DatadogWebViewTracking (~> 2.7.1) - React-Core - - DatadogSDKReactNativeSessionReplay (2.3.5-alpha.0): + - DatadogSDKReactNativeSessionReplay (2.3.6-alpha.0): - DatadogSDKReactNative - DatadogSessionReplay (~> 2.7.1) - React-Core - - DatadogSDKReactNativeSessionReplay/Tests (2.3.5-alpha.0): + - DatadogSDKReactNativeSessionReplay/Tests (2.3.6-alpha.0): - DatadogSDKReactNative - DatadogSessionReplay (~> 2.7.1) - React-Core @@ -1328,8 +1328,8 @@ SPEC CHECKSUMS: DatadogInternal: b9217da25018284c087a2ed4b9bb3b0f26c767c0 DatadogLogs: 3b4132eefa67f196bb3ab2d603c1a2acd1292615 DatadogRUM: 8845815ba89f5ab8ceee765ee268f7de36f3e35d - DatadogSDKReactNative: 1182b908fb9a13e4268abb439f26bed6ba105959 - DatadogSDKReactNativeSessionReplay: 1d073c6607b5f516a8366d659cceac5c7fdcd66d + DatadogSDKReactNative: 2abe05ac536daaf462cc801db9c9ad8b36eb2f8d + DatadogSDKReactNativeSessionReplay: 8709d75b13290d95a793de50d107ca869522a650 DatadogSessionReplay: f189054bd2fc2d14c487fd614f04b2b8041dd81f DatadogTrace: a63da746c609bd4c683bca61a94429889e33b11e DatadogWebViewTracking: 713f862ddd89173e0a3f5342cefa23def40f0f48 diff --git a/lerna.json b/lerna.json index c689a986d..9c6ad958b 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "npmClient": "yarn", - "version": "2.3.5", + "version": "2.3.6", "packages": [ "packages/*" ], diff --git a/packages/codepush/package.json b/packages/codepush/package.json index 47827f029..64697b55d 100644 --- a/packages/codepush/package.json +++ b/packages/codepush/package.json @@ -1,6 +1,6 @@ { "name": "@datadog/mobile-react-native-code-push", - "version": "2.3.5", + "version": "2.3.6", "description": "A client-side React Native module to interact with Appcenter Codepush and Datadog", "keywords": [ "datadog", @@ -38,7 +38,7 @@ "prepare": "rm -rf lib && yarn bob build" }, "devDependencies": { - "@datadog/mobile-react-native": "^2.3.5", + "@datadog/mobile-react-native": "^2.3.6", "@testing-library/react-native": "7.0.2", "react-native-builder-bob": "0.17.1", "react-native-code-push": "7.0.5" diff --git a/packages/core/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt b/packages/core/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt index 2a4cd2682..418a61824 100644 --- a/packages/core/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt +++ b/packages/core/android/src/main/kotlin/com/datadog/reactnative/SdkVersion.kt @@ -7,4 +7,4 @@ package com.datadog.reactnative // This is automatically updated by the update-version.sh script -internal const val SDK_VERSION = "2.3.5" +internal const val SDK_VERSION = "2.3.6" diff --git a/packages/core/ios/Sources/SdkVersion.swift b/packages/core/ios/Sources/SdkVersion.swift index df1b94d4e..d9618ce39 100644 --- a/packages/core/ios/Sources/SdkVersion.swift +++ b/packages/core/ios/Sources/SdkVersion.swift @@ -7,4 +7,4 @@ import Foundation // This is automatically updated by the update-version.sh script -let SdkVersion = "2.3.5" +let SdkVersion = "2.3.6" diff --git a/packages/core/package.json b/packages/core/package.json index 9595b0c92..56c5a089a 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@datadog/mobile-react-native", - "version": "2.3.5", + "version": "2.3.6", "description": "A client-side React Native module to interact with Datadog", "keywords": [ "datadog", diff --git a/packages/core/release-content.txt b/packages/core/release-content.txt index 2d6ca64f1..a6ba22422 100644 --- a/packages/core/release-content.txt +++ b/packages/core/release-content.txt @@ -201,6 +201,8 @@ package/lib/commonjs/types.js package/lib/commonjs/types.js.map package/lib/commonjs/utils/Timer.js package/lib/commonjs/utils/Timer.js.map +package/lib/commonjs/utils/argsUtils.js +package/lib/commonjs/utils/argsUtils.js.map package/lib/commonjs/utils/errorUtils.js package/lib/commonjs/utils/errorUtils.js.map package/lib/commonjs/utils/jsUtils.js @@ -327,6 +329,8 @@ package/lib/module/types.js package/lib/module/types.js.map package/lib/module/utils/Timer.js package/lib/module/utils/Timer.js.map +package/lib/module/utils/argsUtils.js +package/lib/module/utils/argsUtils.js.map package/lib/module/utils/errorUtils.js package/lib/module/utils/errorUtils.js.map package/lib/module/utils/jsUtils.js @@ -396,6 +400,7 @@ package/lib/typescript/specs/NativeDdTrace.d.ts package/lib/typescript/trace/DdTrace.d.ts package/lib/typescript/types.d.ts package/lib/typescript/utils/Timer.d.ts +package/lib/typescript/utils/argsUtils.d.ts package/lib/typescript/utils/errorUtils.d.ts package/lib/typescript/utils/jsUtils.d.ts package/lib/typescript/utils/longTasksUtils.d.ts @@ -495,13 +500,16 @@ package/src/specs/NativeDdRum.ts package/src/specs/NativeDdSdk.ts package/src/specs/NativeDdTrace.ts package/src/trace/DdTrace.ts +package/src/trace/__tests__/DdTrace.test.ts package/src/types.tsx package/src/utils/Timer.ts package/src/utils/__mocks__/jsUtils.ts package/src/utils/__tests__/TimeProvider.test.tsx package/src/utils/__tests__/Timer.test.ts +package/src/utils/__tests__/argsUtils.test.ts package/src/utils/__tests__/errorUtils.test.ts package/src/utils/__tests__/longTasksUtils.test.ts +package/src/utils/argsUtils.ts package/src/utils/errorUtils.ts package/src/utils/jsUtils.ts package/src/utils/longTasksUtils.ts diff --git a/packages/core/src/version.ts b/packages/core/src/version.ts index 007ddea19..686e6dac8 100644 --- a/packages/core/src/version.ts +++ b/packages/core/src/version.ts @@ -1,2 +1,2 @@ // generated by genversion -export const version = '2.3.5'; +export const version = '2.3.6'; diff --git a/packages/internal-testing-tools/package.json b/packages/internal-testing-tools/package.json index aaec7751a..e7dcce6e7 100644 --- a/packages/internal-testing-tools/package.json +++ b/packages/internal-testing-tools/package.json @@ -1,6 +1,6 @@ { "name": "@datadog/react-native-internal-testing-tools", - "version": "2.3.5", + "version": "2.3.6", "description": "Internal tools for testing the Datadog React Native SDK.", "keywords": [ "datadog", diff --git a/packages/react-native-apollo-client/package.json b/packages/react-native-apollo-client/package.json index cca2eb5aa..f155e4356 100644 --- a/packages/react-native-apollo-client/package.json +++ b/packages/react-native-apollo-client/package.json @@ -1,6 +1,6 @@ { "name": "@datadog/mobile-react-native-apollo-client", - "version": "2.3.5", + "version": "2.3.6", "description": "A client-side React Native module to interact with Apollo Client and Datadog", "keywords": [ "datadog", diff --git a/packages/react-native-navigation/package.json b/packages/react-native-navigation/package.json index 193e997cb..fb2533e9e 100644 --- a/packages/react-native-navigation/package.json +++ b/packages/react-native-navigation/package.json @@ -1,6 +1,6 @@ { "name": "@datadog/mobile-react-native-navigation", - "version": "2.3.5", + "version": "2.3.6", "description": "A client-side React Native module to interact with Datadog", "keywords": [ "datadog", @@ -36,7 +36,7 @@ "prepare": "rm -rf lib && yarn bob build" }, "devDependencies": { - "@datadog/mobile-react-native": "^2.3.5", + "@datadog/mobile-react-native": "^2.3.6", "@testing-library/react-native": "7.0.2", "react-native-builder-bob": "0.17.1", "react-native-gesture-handler": "1.10.3", diff --git a/packages/react-native-navigation/release-content.txt b/packages/react-native-navigation/release-content.txt index 4ebd8496a..a7404a6ba 100644 --- a/packages/react-native-navigation/release-content.txt +++ b/packages/react-native-navigation/release-content.txt @@ -64,6 +64,7 @@ package/lib/typescript/core/src/specs/NativeDdTrace.d.ts package/lib/typescript/core/src/trace/DdTrace.d.ts package/lib/typescript/core/src/types.d.ts package/lib/typescript/core/src/utils/Timer.d.ts +package/lib/typescript/core/src/utils/argsUtils.d.ts package/lib/typescript/core/src/utils/errorUtils.d.ts package/lib/typescript/core/src/utils/jsUtils.d.ts package/lib/typescript/core/src/utils/longTasksUtils.d.ts diff --git a/packages/react-native-session-replay/package.json b/packages/react-native-session-replay/package.json index e7a06eb68..5c3578610 100644 --- a/packages/react-native-session-replay/package.json +++ b/packages/react-native-session-replay/package.json @@ -1,6 +1,6 @@ { "name": "@datadog/mobile-react-native-session-replay", - "version": "2.3.5-alpha.0", + "version": "2.3.6-alpha.0", "description": "A client-side React Native module to enable session replay with Datadog", "keywords": [ "datadog", diff --git a/packages/react-native-webview/package.json b/packages/react-native-webview/package.json index f2c38e09e..8120127c0 100644 --- a/packages/react-native-webview/package.json +++ b/packages/react-native-webview/package.json @@ -1,6 +1,6 @@ { "name": "@datadog/mobile-react-native-webview", - "version": "2.3.5", + "version": "2.3.6", "description": "A client-side React Native module to interact with react-native-webview and Datadog", "keywords": [ "datadog", diff --git a/packages/react-navigation/package.json b/packages/react-navigation/package.json index ff8af6804..0fd4fbf94 100644 --- a/packages/react-navigation/package.json +++ b/packages/react-navigation/package.json @@ -1,6 +1,6 @@ { "name": "@datadog/mobile-react-navigation", - "version": "2.3.5", + "version": "2.3.6", "description": "A client-side React Native module to interact with Datadog", "keywords": [ "datadog", @@ -36,7 +36,7 @@ "prepare": "rm -rf lib && yarn bob build" }, "devDependencies": { - "@datadog/mobile-react-native": "^2.3.5", + "@datadog/mobile-react-native": "^2.3.6", "@react-navigation/native-v5": "npm:@react-navigation/native@5.9.8", "@react-navigation/native-v6": "npm:@react-navigation/native@6.1.2", "@react-navigation/stack-v5": "npm:@react-navigation/stack@5.14.2", diff --git a/packages/react-navigation/release-content.txt b/packages/react-navigation/release-content.txt index c9a86a3d3..566c24d09 100644 --- a/packages/react-navigation/release-content.txt +++ b/packages/react-navigation/release-content.txt @@ -68,6 +68,7 @@ package/lib/typescript/core/src/specs/NativeDdTrace.d.ts package/lib/typescript/core/src/trace/DdTrace.d.ts package/lib/typescript/core/src/types.d.ts package/lib/typescript/core/src/utils/Timer.d.ts +package/lib/typescript/core/src/utils/argsUtils.d.ts package/lib/typescript/core/src/utils/errorUtils.d.ts package/lib/typescript/core/src/utils/jsUtils.d.ts package/lib/typescript/core/src/utils/longTasksUtils.d.ts diff --git a/yarn.lock b/yarn.lock index 526cfa04d..b6b70aa09 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3911,7 +3911,7 @@ __metadata: version: 0.0.0-use.local resolution: "@datadog/mobile-react-native-code-push@workspace:packages/codepush" dependencies: - "@datadog/mobile-react-native": ^2.3.5 + "@datadog/mobile-react-native": ^2.3.6 "@testing-library/react-native": 7.0.2 react-native-builder-bob: 0.17.1 react-native-code-push: 7.0.5 @@ -3927,7 +3927,7 @@ __metadata: version: 0.0.0-use.local resolution: "@datadog/mobile-react-native-navigation@workspace:packages/react-native-navigation" dependencies: - "@datadog/mobile-react-native": ^2.3.5 + "@datadog/mobile-react-native": ^2.3.6 "@testing-library/react-native": 7.0.2 react-native-builder-bob: 0.17.1 react-native-gesture-handler: 1.10.3 @@ -3967,7 +3967,7 @@ __metadata: languageName: unknown linkType: soft -"@datadog/mobile-react-native@^2.3.5, @datadog/mobile-react-native@workspace:packages/core": +"@datadog/mobile-react-native@^2.3.6, @datadog/mobile-react-native@workspace:packages/core": version: 0.0.0-use.local resolution: "@datadog/mobile-react-native@workspace:packages/core" dependencies: @@ -3983,7 +3983,7 @@ __metadata: version: 0.0.0-use.local resolution: "@datadog/mobile-react-navigation@workspace:packages/react-navigation" dependencies: - "@datadog/mobile-react-native": ^2.3.5 + "@datadog/mobile-react-native": ^2.3.6 "@react-navigation/native-v5": "npm:@react-navigation/native@5.9.8" "@react-navigation/native-v6": "npm:@react-navigation/native@6.1.2" "@react-navigation/stack-v5": "npm:@react-navigation/stack@5.14.2"