Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

React 19 upgrade #2993

Merged
merged 18 commits into from
Mar 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
pull_request:
branches:
- main
- next
merge_group:
types:
- checks_requested
Expand Down Expand Up @@ -190,15 +191,14 @@ jobs:
- name: Install Android SDK
run: |
echo "sdk.dir=$ANDROID_HOME" > $GITHUB_WORKSPACE/apps/paper/android/local.properties
echo "sdk.dir=$ANDROID_HOME" > $GITHUB_WORKSPACE/apps/fabric/android/local.properties

- name: Cache Gradle
uses: actions/cache@v3
with:
path: |
~/.gradle/wrapper
~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('./apps/paper/android/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('./apps/fabric/android/gradle/wrapper/gradle-wrapper.properties') }}
key: ${{ runner.os }}-gradle-${{ hashFiles('./apps/paper/android/gradle/wrapper/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-

Expand Down Expand Up @@ -272,7 +272,7 @@ jobs:
# run: echo "PACKAGE_NAME=${{ env.PACKAGE_NAME }}" >> $GITHUB_ENV
- name: Launch APK
env:
PACKAGE_NAME: ${{ matrix.working-directory == 'fabricexample' && 'com.fabricexample' || 'com.paper' }}
PACKAGE_NAME: 'com.paper'
run: adb shell monkey -p ${{ env.PACKAGE_NAME }} 1

# On fabric, the system fonts are slightly different
Expand Down
4 changes: 2 additions & 2 deletions apps/docs/docs/shapes/atlas.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ rsxForm = Skia.RSXformFromRadians(1, r, 100, 0, 125, 25);
In the example below, we draw in simple rectangle as an image.
Then we display that rectangle 150 times with a simple transformation applied to each rectangle.

```tsx twoslash
```tsx
import {Skia, drawAsImage, Group, Rect, Canvas, Atlas, rect} from "@shopify/react-native-skia";

const size = { width: 25, height: 11.25 };
Expand All @@ -56,7 +56,7 @@ const imageSize = {
width: size.width + strokeWidth,
height: size.height + strokeWidth,
};
const image = drawAsImage(
const image = await drawAsImage(
<Group>
<Rect
rect={rect(strokeWidth / 2, strokeWidth / 2, size.width, size.height)}
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/docs/snapshot-views.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ If the view is optimized away, `makeImageFromView` will crash or return the wron



```tsx twoslash
```tsx
import { useState, useRef } from "react";
import { View, Text, PixelRatio, StyleSheet, Pressable } from "react-native";
import type { SkImage } from "@shopify/react-native-skia";
Expand Down
10 changes: 5 additions & 5 deletions apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
"file-loader": "^6.2.0",
"its-fine": "^1.0.8",
"prism-react-renderer": "^1.2.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-native": "0.75.2",
"react-native-gesture-handler": "^2.18.1",
"react-native-reanimated": "^3.15.1",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-native": "0.78.0",
"react-native-gesture-handler": "^2.24.0",
"react-native-reanimated": "3.17.1",
"url-loader": "^4.1.1"
},
"devDependencies": {
Expand Down
2 changes: 0 additions & 2 deletions apps/fabric/.bundle/config

This file was deleted.

24 changes: 0 additions & 24 deletions apps/fabric/.eslintrc

This file was deleted.

73 changes: 0 additions & 73 deletions apps/fabric/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion apps/fabric/.watchmanconfig

This file was deleted.

9 changes: 0 additions & 9 deletions apps/fabric/Gemfile

This file was deleted.

79 changes: 0 additions & 79 deletions apps/fabric/README.md

This file was deleted.

12 changes: 0 additions & 12 deletions apps/fabric/__tests__/App.test.tsx

This file was deleted.

Loading
Loading