Merge pull request #541 from DataDog/louiszawadzki/rum-1815/create-sr…

…-module-without-native-implementation Create SR module without native implementation
DataDog · Oct 27, 2023 · 62c2833 · 62c2833
2 parents 06c8e60 + 5c58db4
commit 62c2833
Show file tree

Hide file tree

Showing 54 changed files with 2,853 additions and 341 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,6 +28,8 @@ build/
 .gradle
 local.properties
 *.iml
+.project
+.settings/
 
 # VS Code
 *.save

diff --git a/package.json b/package.json
@@ -1,84 +1,69 @@
 {
-  "name": "dd-sdk-reactnative",
-  "description": "A client-side React Native module to interact with Datadog",
-  "keywords": [
-    "datadog",
-    "react-native",
-    "ios",
-    "android"
-  ],
-  "author": "Datadog (https://github.com/DataDog)",
-  "homepage": "https://github.com/DataDog/dd-sdk-reactnative#readme",
-  "repository": "https://github.com/DataDog/dd-sdk-reactnative",
-  "bugs": {
-    "url": "https://github.com/DataDog/dd-sdk-reactnative/issues"
-  },
-  "license": "Apache-2.0",
-  "private": true,
-  "workspaces": {
-    "packages": [
-      "packages/*",
-      "example",
-      "example-new-architecture"
-    ]
-  },
-  "scripts": {
-    "prepare": "genversion --es6 --semi packages/core/src/version.ts && lerna run prepare",
-    "test": "genversion --es6 --semi packages/core/src/version.ts && jest",
-    "lint": "genversion --es6 --semi packages/core/src/version.ts && eslint .",
-    "example": "yarn --cwd example",
-    "postinstall": "./packages/react-navigation/fix-react-navigation-import-in-dependencies.sh"
-  },
-  "devDependencies": {
-    "@babel/plugin-transform-runtime": "7.12.15",
-    "@testing-library/react-native": "7.0.2",
-    "@types/jest": "^29.2.1",
-    "@types/react": "^18.0.24",
-    "@types/react-native": "0.71.0",
-    "@types/react-test-renderer": "18.0.0",
-    "@typescript-eslint/eslint-plugin": "5.20.0",
-    "@typescript-eslint/parser": "5.20.0",
-    "dd-trace": "^3.3.1",
-    "eslint": "8.10.0",
-    "eslint-config-prettier": "6.0.0",
-    "eslint-plugin-arca": "0.15.0",
-    "eslint-plugin-import": "2.25.4",
-    "eslint-plugin-prettier": "4.0.0",
-    "eslint-plugin-react": "7.22.0",
-    "eslint-plugin-react-hooks": "4.3.0",
-    "eslint-plugin-react-native": "3.10.0",
-    "genversion": "3.0.2",
-    "jest": "29.2.1",
-    "lerna": "7.1.0",
-    "metro-react-native-babel-preset": "0.73.9",
-    "pod-install": "0.1.14",
-    "prettier": "2.2.0",
-    "react": "18.2.0",
-    "react-native": "0.71.10",
-    "react-native-builder-bob": "0.17.1",
-    "react-native-webview": "11.26.1",
-    "react-test-renderer": "18.1.0",
-    "typescript": "4.8.4"
-  },
-  "jest": {
-    "preset": "react-native",
-    "moduleNameMapper": {
-      "@datadog/mobile-react-native": "<rootDir>/packages/core/src"
-    },
-    "modulePathIgnorePatterns": [
-      "<rootDir>/example/node_modules",
-      "<rootDir>/packages/.*/lib/"
-    ],
-    "setupFiles": [
-      "./node_modules/react-native-gesture-handler/jestSetup.js",
-      "./jest.setup.js"
+    "name": "dd-sdk-reactnative",
+    "description": "A client-side React Native module to interact with Datadog",
+    "keywords": [
+        "datadog",
+        "react-native",
+        "ios",
+        "android"
     ],
-    "testPathIgnorePatterns": [
-      "/__utils__/"
-    ],
-    "transformIgnorePatterns": [
-      "jest-runner"
-    ]
-  },
-  "packageManager": "[email protected]"
+    "author": "Datadog (https://github.com/DataDog)",
+    "homepage": "https://github.com/DataDog/dd-sdk-reactnative#readme",
+    "repository": "https://github.com/DataDog/dd-sdk-reactnative",
+    "bugs": {
+        "url": "https://github.com/DataDog/dd-sdk-reactnative/issues"
+    },
+    "license": "Apache-2.0",
+    "private": true,
+    "workspaces": {
+        "packages": [
+            "packages/*",
+            "example",
+            "example-new-architecture"
+        ]
+    },
+    "scripts": {
+        "prepare": "genversion --es6 --semi packages/core/src/version.ts && lerna run prepare",
+        "test": "genversion --es6 --semi packages/core/src/version.ts && jest",
+        "lint": "genversion --es6 --semi packages/core/src/version.ts && eslint .",
+        "example": "yarn --cwd example",
+        "postinstall": "./packages/react-navigation/fix-react-navigation-import-in-dependencies.sh"
+    },
+    "devDependencies": {
+        "@babel/plugin-transform-runtime": "7.12.15",
+        "@testing-library/react-native": "7.0.2",
+        "@types/jest": "^29.2.1",
+        "@types/react": "^18.0.24",
+        "@types/react-native": "0.71.0",
+        "@types/react-test-renderer": "18.0.0",
+        "@typescript-eslint/eslint-plugin": "5.20.0",
+        "@typescript-eslint/parser": "5.20.0",
+        "dd-trace": "^3.3.1",
+        "eslint": "8.10.0",
+        "eslint-config-prettier": "6.0.0",
+        "eslint-plugin-arca": "0.15.0",
+        "eslint-plugin-import": "2.25.4",
+        "eslint-plugin-prettier": "4.0.0",
+        "eslint-plugin-react": "7.22.0",
+        "eslint-plugin-react-hooks": "4.3.0",
+        "eslint-plugin-react-native": "3.10.0",
+        "genversion": "3.0.2",
+        "jest": "29.2.1",
+        "lerna": "7.1.0",
+        "metro-react-native-babel-preset": "0.73.9",
+        "pod-install": "0.1.14",
+        "prettier": "2.2.0",
+        "react": "18.2.0",
+        "react-native": "0.71.10",
+        "react-native-builder-bob": "0.17.1",
+        "react-native-webview": "11.26.1",
+        "react-test-renderer": "18.1.0",
+        "typescript": "4.8.4"
+    },
+    "jest": {
+        "projects": [
+            "<rootDir>/packages/*"
+        ]
+    },
+    "packageManager": "[email protected]"
 }
diff --git a/packages/codepush/package.json b/packages/codepush/package.json
@@ -1,76 +1,81 @@
 {
-  "name": "@datadog/mobile-react-native-code-push",
-  "version": "1.8.5",
-  "description": "A client-side React Native module to interact with Appcenter Codepush and Datadog",
-  "keywords": [
-    "datadog",
-    "react-native",
-    "ios",
-    "android",
-    "codepush",
-    "appcenter"
-  ],
-  "author": "Datadog (https://github.com/DataDog)",
-  "homepage": "https://github.com/DataDog/dd-sdk-reactnative#readme",
-  "repository": {
-    "url": "https://github.com/DataDog/dd-sdk-reactnative",
-    "directory": "packages/codepush"
-  },
-  "bugs": {
-    "url": "https://github.com/DataDog/dd-sdk-reactnative/issues"
-  },
-  "license": "Apache-2.0",
-  "main": "lib/commonjs/index",
-  "files": [
-    "src/**",
-    "lib/**"
-  ],
-  "types": "lib/typescript/codepush/src/index.d.ts",
-  "react-native": "src/index",
-  "source": "src/index",
-  "module": "lib/module/index",
-  "publishConfig": {
-    "access": "public"
-  },
-  "scripts": {
-    "test": "jest",
-    "lint": "eslint .",
-    "prepare": "rm -rf lib && yarn bob build"
-  },
-  "devDependencies": {
-    "@datadog/mobile-react-native": "^1.8.5",
-    "@testing-library/react-native": "7.0.2",
-    "react-native-builder-bob": "0.17.1",
-    "react-native-code-push": "7.0.5"
-  },
-  "peerDependencies": {
-    "@datadog/mobile-react-native": "^1.0.0-beta4",
-    "react": ">=16.13.1",
-    "react-native": ">=0.63.4 <1.0",
-    "react-native-code-push": ">=2.0.0"
-  },
-  "jest": {
-    "preset": "react-native",
-    "modulePathIgnorePatterns": [
-      "<rootDir>/lib/"
+    "name": "@datadog/mobile-react-native-code-push",
+    "version": "1.8.5",
+    "description": "A client-side React Native module to interact with Appcenter Codepush and Datadog",
+    "keywords": [
+        "datadog",
+        "react-native",
+        "ios",
+        "android",
+        "codepush",
+        "appcenter"
     ],
-    "testPathIgnorePatterns": [
-      "/__utils__/"
+    "author": "Datadog (https://github.com/DataDog)",
+    "homepage": "https://github.com/DataDog/dd-sdk-reactnative#readme",
+    "repository": {
+        "url": "https://github.com/DataDog/dd-sdk-reactnative",
+        "directory": "packages/codepush"
+    },
+    "bugs": {
+        "url": "https://github.com/DataDog/dd-sdk-reactnative/issues"
+    },
+    "license": "Apache-2.0",
+    "main": "lib/commonjs/index",
+    "files": [
+        "src/**",
+        "lib/**"
     ],
-    "transformIgnorePatterns": []
-  },
-  "react-native-builder-bob": {
-    "source": "src",
-    "output": "lib",
-    "targets": [
-      "commonjs",
-      "module",
-      [
-        "typescript",
-        {
-          "tsc": "./../../node_modules/.bin/tsc"
-        }
-      ]
-    ]
-  }
+    "types": "lib/typescript/codepush/src/index.d.ts",
+    "react-native": "src/index",
+    "source": "src/index",
+    "module": "lib/module/index",
+    "publishConfig": {
+        "access": "public"
+    },
+    "scripts": {
+        "test": "jest",
+        "lint": "eslint .",
+        "prepare": "rm -rf lib && yarn bob build"
+    },
+    "devDependencies": {
+        "@datadog/mobile-react-native": "^1.8.5",
+        "@testing-library/react-native": "7.0.2",
+        "react-native-builder-bob": "0.17.1",
+        "react-native-code-push": "7.0.5"
+    },
+    "peerDependencies": {
+        "@datadog/mobile-react-native": "^1.0.0-beta4",
+        "react": ">=16.13.1",
+        "react-native": ">=0.63.4 <1.0",
+        "react-native-code-push": ">=2.0.0"
+    },
+    "jest": {
+        "preset": "react-native",
+        "moduleNameMapper": {
+            "@datadog/mobile-react-native": "<rootDir>../core/src"
+        },
+        "modulePathIgnorePatterns": [
+            "<rootDir>/lib/"
+        ],
+        "testPathIgnorePatterns": [
+            "/__utils__/"
+        ],
+        "transformIgnorePatterns": [
+            "jest-runner"
+        ]
+    },
+    "react-native-builder-bob": {
+        "source": "src",
+        "output": "lib",
+        "targets": [
+            "commonjs",
+            "module",
+            [
+                "typescript",
+                {
+                    "tsc": "./../../node_modules/.bin/tsc"
+                }
+            ]
+        ]
+    }
 }
diff --git a/packages/core/android/.project b/packages/core/android/.project
diff --git a/packages/core/android/.settings/org.eclipse.buildship.core.prefs b/packages/core/android/.settings/org.eclipse.buildship.core.prefs
diff --git a/packages/core/android/build.gradle b/packages/core/android/build.gradle
@@ -130,8 +130,8 @@ android {
     disable 'GradleCompatible'
   }
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
   }
 }
 

diff --git a/packages/core/android/gradle.properties b/packages/core/android/gradle.properties
@@ -1,5 +1,5 @@
 DdSdkReactNative_kotlinVersion=1.7.21
-DdSdkReactNative_compileSdkVersion=31
-DdSdkReactNative_buildToolsVersion=31.0.0
-DdSdkReactNative_targetSdkVersion=31
+DdSdkReactNative_compileSdkVersion=33
+DdSdkReactNative_buildToolsVersion=33.0.0
+DdSdkReactNative_targetSdkVersion=33
 android.useAndroidX=true
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -55,14 +55,22 @@
     },
     "jest": {
         "preset": "react-native",
+        "moduleNameMapper": {
+            "@datadog/mobile-react-native": "<rootDir>../core/src"
+        },
         "modulePathIgnorePatterns": [
             "<rootDir>/lib/"
         ],
+        "testPathIgnorePatterns": [
+            "/__utils__/"
+        ],
         "setupFiles": [
             "./../../node_modules/react-native-gesture-handler/jestSetup.js",
             "./../../jest.setup.js"
         ],
-        "transformIgnorePatterns": []
+        "transformIgnorePatterns": [
+            "jest-runner"
+        ]
     },
     "react-native-builder-bob": {
         "source": "src",