@datadog/mobile-react-native 1.2.0 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -152,7 +152,7 @@ dependencies {
152
152
  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
153
153
  compileOnly "com.squareup.okhttp3:okhttp:3.12.13"
154
154
 
155
- implementation "com.datadoghq:dd-sdk-android:1.16.+"
155
+ implementation "com.datadoghq:dd-sdk-android:1.16.0"
156
156
  testImplementation "org.junit.platform:junit-platform-launcher:1.6.2"
157
157
  testImplementation "org.junit.jupiter:junit-jupiter-api:5.6.2"
158
158
  testImplementation "org.junit.jupiter:junit-jupiter-engine:5.6.2"
@@ -27,10 +27,10 @@ afterEvaluate {
27
27
  }
28
28
 
29
29
  // locations and names are defined in "../../node_modules/react-native/react.gradle"
30
- def targetName = variant.name.capitalize()
31
- def targetPath = variant.dirName
30
+ def targetName = variant.name.capitalize() // e.g. Release
31
+ def targetPath = variant.dirName // e.g. release
32
32
 
33
- def reactConfig = getReactConfig(buildDir, targetName)
33
+ def reactConfig = getReactConfig(buildDir, targetName, targetPath)
34
34
  def reactRoot = file(reactConfig.root)
35
35
 
36
36
  def bundleTask = tasks.findByName(reactConfig.bundleTaskName)
@@ -117,12 +117,12 @@ private def getBundleFileResolver(String[] jsBundleDirs, String bundleAssetName)
117
117
  /**
118
118
  * From RN 0.71, the following things changed in the RN gradle plugin:
119
119
  * - bundle task name changed from "bundle${targetName}JsAndAssets" to "createBundle${targetName}JsAndAssets"
120
- * - bundle dir changed from "$buildDir/generated/assets/react/${targetPath}" to "$buildDir/ASSETS/createBundle${targetPath}JsAndAssets"
120
+ * - bundle dir changed from "$buildDir/generated/assets/react/${targetPath}" to "$buildDir/ASSETS/createBundle${targetName}JsAndAssets"
121
121
  * (and then "$buildDir/generated/assets/createBundle${targetPath}JsAndAssets" with the release of Android Gradle Plugin 7.4, see https://github.com/facebook/react-native/issues/35439)
122
122
  * - config was in "project.react" and is now in "project.extensions.react"
123
123
  * - accessing parameters values requires calling a getter
124
124
  */
125
- private def getReactConfig(File buildDir, String targetName) {
125
+ private def getReactConfig(File buildDir, String targetName, String targetPath) {
126
126
  def reactConfig = [:]
127
127
 
128
128
  if (project.extensions.findByName("react")) {
@@ -140,14 +140,14 @@ private def getReactConfig(File buildDir, String targetName) {
140
140
  // Legacy way, before RN 0.71
141
141
  def bundleAssetName = project.react.bundleAssetName ?: "index.android.bundle"
142
142
  reactConfig['bundleTaskName'] = "bundle${targetName}JsAndAssets"
143
- reactConfig['bundleFileResolver'] = getBundleFileResolver(["$buildDir/generated/assets/react/${targetName}"] as String[], bundleAssetName)
143
+ reactConfig['bundleFileResolver'] = getBundleFileResolver(["$buildDir/generated/assets/react/${targetPath}"] as String[], bundleAssetName)
144
144
  reactConfig['bundleAssetName'] = bundleAssetName
145
145
  reactConfig['root'] = project.react.root ?: "../../"
146
146
  } else {
147
147
  // We assume this cannot happen with RN >= 0.71, so we use the legacy default values
148
148
  def bundleAssetName = "index.android.bundle"
149
149
  reactConfig['bundleTaskName'] = "bundle${targetName}JsAndAssets"
150
- reactConfig['bundleFileResolver'] = getBundleFileResolver(["$buildDir/generated/assets/react/${targetName}"] as String[], bundleAssetName)
150
+ reactConfig['bundleFileResolver'] = getBundleFileResolver(["$buildDir/generated/assets/react/${targetPath}"] as String[], bundleAssetName)
151
151
  reactConfig['bundleAssetName'] = bundleAssetName
152
152
  reactConfig['root'] = "../../"
153
153
  }
package/jest/mock.js ADDED
@@ -0,0 +1,103 @@
1
+ /*
2
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
3
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
4
+ * Copyright 2016-Present Datadog, Inc.
5
+ */
6
+
7
+ /* eslint-disable react/jsx-filename-extension */
8
+ /* eslint-disable @typescript-eslint/no-var-requires */
9
+ const React = require('react');
10
+
11
+ const actualDatadog = jest.requireActual('@datadog/mobile-react-native');
12
+
13
+ /**
14
+ * Explicitely mocking the provider prevents auto-instrumentation in tests.
15
+ * This prevents errors in tests to be logged in the console, as well as needing
16
+ * to mock XMLHttpRequest.
17
+ */
18
+ const DatadogProviderMock = ({ children }) => {
19
+ return <>{children}</>;
20
+ };
21
+
22
+ module.exports = {
23
+ ...actualDatadog,
24
+ DdSdkReactNative: {
25
+ ...actualDatadog.DdSdkReactNative,
26
+ initialize: jest
27
+ .fn()
28
+ .mockImplementation(() => new Promise(resolve => resolve())),
29
+ setUser: jest
30
+ .fn()
31
+ .mockImplementation(() => new Promise(resolve => resolve())),
32
+ setAttributes: jest
33
+ .fn()
34
+ .mockImplementation(() => new Promise(resolve => resolve())),
35
+ setTrackingConsent: jest
36
+ .fn()
37
+ .mockImplementation(() => new Promise(resolve => resolve())),
38
+ telemetryDebug: jest
39
+ .fn()
40
+ .mockImplementation(() => new Promise(resolve => resolve())),
41
+ telemetryError: jest
42
+ .fn()
43
+ .mockImplementation(() => new Promise(resolve => resolve()))
44
+ },
45
+
46
+ DdLogs: {
47
+ debug: jest
48
+ .fn()
49
+ .mockImplementation(() => new Promise(resolve => resolve())),
50
+ info: jest
51
+ .fn()
52
+ .mockImplementation(() => new Promise(resolve => resolve())),
53
+ warn: jest
54
+ .fn()
55
+ .mockImplementation(() => new Promise(resolve => resolve())),
56
+ error: jest
57
+ .fn()
58
+ .mockImplementation(() => new Promise(resolve => resolve()))
59
+ },
60
+
61
+ DdTrace: {
62
+ startSpan: jest
63
+ .fn()
64
+ .mockImplementation(
65
+ () => new Promise(resolve => resolve('fakeSpanId'))
66
+ ),
67
+ finishSpan: jest
68
+ .fn()
69
+ .mockImplementation(() => new Promise(resolve => resolve()))
70
+ },
71
+
72
+ DdRum: {
73
+ startView: jest
74
+ .fn()
75
+ .mockImplementation(() => new Promise(resolve => resolve())),
76
+ stopView: jest
77
+ .fn()
78
+ .mockImplementation(() => new Promise(resolve => resolve())),
79
+ startAction: jest
80
+ .fn()
81
+ .mockImplementation(() => new Promise(resolve => resolve())),
82
+ stopAction: jest
83
+ .fn()
84
+ .mockImplementation(() => new Promise(resolve => resolve())),
85
+ addAction: jest
86
+ .fn()
87
+ .mockImplementation(() => new Promise(resolve => resolve())),
88
+ startResource: jest
89
+ .fn()
90
+ .mockImplementation(() => new Promise(resolve => resolve())),
91
+ stopResource: jest
92
+ .fn()
93
+ .mockImplementation(() => new Promise(resolve => resolve())),
94
+ addError: jest
95
+ .fn()
96
+ .mockImplementation(() => new Promise(resolve => resolve())),
97
+ addTiming: jest
98
+ .fn()
99
+ .mockImplementation(() => new Promise(resolve => resolve()))
100
+ },
101
+
102
+ DatadogProvider: DatadogProviderMock
103
+ };
@@ -5,6 +5,6 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.version = void 0;
7
7
  // generated by genversion
8
- const version = '1.2.0';
8
+ const version = '1.2.1';
9
9
  exports.version = version;
10
10
  //# sourceMappingURL=version.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["version.ts"],"names":["version"],"mappings":";;;;;;AAAA;AACO,MAAMA,OAAO,GAAG,OAAhB","sourcesContent":["// generated by genversion\nexport const version = '1.2.0';\n"]}
1
+ {"version":3,"sources":["version.ts"],"names":["version"],"mappings":";;;;;;AAAA;AACO,MAAMA,OAAO,GAAG,OAAhB","sourcesContent":["// generated by genversion\nexport const version = '1.2.1';\n"]}
@@ -1,3 +1,3 @@
1
1
  // generated by genversion
2
- export const version = '1.2.0';
2
+ export const version = '1.2.1';
3
3
  //# sourceMappingURL=version.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["version.ts"],"names":["version"],"mappings":"AAAA;AACA,OAAO,MAAMA,OAAO,GAAG,OAAhB","sourcesContent":["// generated by genversion\nexport const version = '1.2.0';\n"]}
1
+ {"version":3,"sources":["version.ts"],"names":["version"],"mappings":"AAAA;AACA,OAAO,MAAMA,OAAO,GAAG,OAAhB","sourcesContent":["// generated by genversion\nexport const version = '1.2.1';\n"]}
@@ -1 +1 @@
1
- export declare const version = "1.2.0";
1
+ export declare const version = "1.2.1";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@datadog/mobile-react-native",
3
- "version": "1.2.0",
3
+ "version": "1.2.1",
4
4
  "description": "A client-side React Native module to interact with Datadog",
5
5
  "keywords": [
6
6
  "datadog",
@@ -28,6 +28,7 @@
28
28
  "ios/DdSdkReactNative.xcodeproj/project.xcworkspace/xcsharedata",
29
29
  "ios/DdSdkReactNative.xcodeproj/project.xcworkspace/*.xcworkspacedata",
30
30
  "ios/DdSdkReactNative.xcodeproj/*.pbxproj",
31
+ "jest",
31
32
  "DatadogSDKReactNative.podspec",
32
33
  "datadog-sourcemaps.gradle"
33
34
  ],
@@ -76,5 +77,5 @@
76
77
  ]
77
78
  ]
78
79
  },
79
- "gitHead": "9208125e28748ba9781e5d22ed49551ee9743285"
80
+ "gitHead": "0b48e62d5d2d0c45c46d4adfa10a3bcd1ab913a4"
80
81
  }
package/src/version.ts CHANGED
@@ -1,2 +1,2 @@
1
1
  // generated by genversion
2
- export const version = '1.2.0';
2
+ export const version = '1.2.1';