Skip to content

Commit ff525b6

Browse files
committed
Merge branch 'main' into feat/deintegrate-otlp-exporter
2 parents 5fe3b17 + 950d7a3 commit ff525b6

35 files changed

+7095
-2806
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Upload docs artifact
2727
uses: actions/upload-pages-artifact@v3
2828
with:
29-
path: docs/build
29+
path: website/build
3030

3131
deploy-docs:
3232
permissions:

docs/biome.json

Lines changed: 0 additions & 30 deletions
This file was deleted.

examples/rn-app/ios/license_plist.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ rename:
123123
"@[email protected]": '@uidotdev/usehooks'
124124
125125
126-
"react@19.1.0": react
126+
"react@19.2.0": react
127127
"[email protected]": react-native
128128
"@[email protected]": '@jest/create-cache-key-function'
129129
"@[email protected]": '@jest/types'
@@ -901,7 +901,7 @@ manual:
901901
902902
version: '0.25.0'
903903
source: https://github.com/facebook/react
904-
file: '../../../node_modules/react-reconciler/node_modules/scheduler/LICENSE'
904+
file: '../../../node_modules/scheduler/LICENSE'
905905
- name: '@[email protected]'
906906
version: '2.4.1'
907907
source: uidotdev/usehooks
@@ -914,8 +914,8 @@ manual:
914914
version: '2.30.1'
915915
source: https://github.com/moment/moment
916916
file: '../../../node_modules/moment/LICENSE'
917-
- name: react@19.1.0
918-
version: '19.1.0'
917+
- name: react@19.2.0
918+
version: '19.2.0'
919919
source: https://github.com/facebook/react
920920
file: '../../../node_modules/react/LICENSE'
921921
@@ -2000,7 +2000,7 @@ manual:
20002000
20012001
version: '0.26.0'
20022002
source: https://github.com/facebook/react
2003-
file: '../../../node_modules/scheduler/LICENSE'
2003+
file: '../../../node_modules/react-native/node_modules/scheduler/LICENSE'
20042004
20052005
version: '0.1.11'
20062006
source: https://github.com/errwischt/stacktrace-parser

examples/rn-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@uidotdev/usehooks": "^2.4.1",
3939
"lodash": "^4.17.21",
4040
"moment": "^2.30.1",
41-
"react": "19.1.0",
41+
"react": "19.2.0",
4242
"react-native": "0.81.0",
4343
"react-native-device-info": "^14.1.1",
4444
"react-native-legal": "^1.6.0",

package.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@
1818
"eslint-plugin-ft-flow": "^3.0.11",
1919
"eslint-plugin-prettier": "^5.5.1",
2020
"jest": "^30.0.4",
21-
"nitro-codegen": "^0.27.2",
2221
"prettier": "^3.6.2",
23-
"react": "19.1.0",
24-
"react-native": "^0.81.0",
25-
"react-native-nitro-modules": "0.30.2",
2622
"react-test-renderer": "19.0.0",
2723
"ts-jest": "^29.4.0",
2824
"turbo": "^1.13.4",
@@ -34,7 +30,7 @@
3430
"scripts": {
3531
"build": "pnpm run -r build",
3632
"build:watch": "pnpm run -r --parallel build:watch",
37-
"build:docs": "pnpm -F @ottrelite/docs run build:docs",
33+
"build:docs": "pnpm -F @ottrelite/docs run build",
3834
"lint": "pnpm run -r lint",
3935
"typecheck": "pnpm run -r typecheck",
4036
"test": "pnpm run -r test",
@@ -45,7 +41,6 @@
4541
"changeset": "npx changeset",
4642
"example:android": "pnpm -F @ottrelite/example run android",
4743
"example:ios": "pnpm -F @ottrelite/example run ios",
48-
"postinstall": "npx lefthook install && (pnpm run build || exit 0;)",
4944
"pod:install": "cd examples/rn-app && pod install",
5045
"publish:npm": "pnpm -r publish:npm",
5146
"publish:yalc": "pnpm -r publish:yalc"

packages/backend-platform/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ pnpm add @ottrelite/backend-platform
5858

5959
And register the backend with Ottrelite Core in your entrypoint file (e.g. `index.js`):
6060

61-
```javascript
61+
```typescript
6262
import { OttreliteBackendPlatform } from '@ottrelite/backend-platform';
6363
import { Ottrelite } from '@ottrelite/core';
6464

packages/backend-wrapper-tracy/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Additionally, for iOS run `pod install` in the `ios` directory.
5757

5858
And register the backend with Ottrelite Core in your entrypoint file (e.g. `index.js`):
5959

60-
```javascript
60+
```typescript
6161
import { OttreliteBackendTracy } from '@ottrelite/backend-wrapper-tracy';
6262
import { Ottrelite } from '@ottrelite/core';
6363

pnpm-lock.yaml

Lines changed: 7011 additions & 2649 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pnpm-workspace.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
packages:
22
- packages/*
33
- examples/*
4-
- docs
4+
- website
55

66
nodeLinker: hoisted
77

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@
2323
"verbatimModuleSyntax": true,
2424
"declaration": true
2525
},
26-
"exclude": ["docs"]
26+
"exclude": ["website"]
2727
}

0 commit comments

Comments
 (0)