Skip to content

Commit 0980c41

Browse files
authored
chore(🐙): publish graphite @next (#3811)
1 parent 8fabe1e commit 0980c41

3 files changed

Lines changed: 68 additions & 28 deletions

File tree

packages/skia/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@
129129
},
130130
"dependencies": {
131131
"canvaskit-wasm": "0.41.0",
132-
"react-native-skia-android": "147.1.0",
133-
"react-native-skia-apple-ios": "147.1.0",
134-
"react-native-skia-apple-macos": "147.1.0",
135-
"react-native-skia-apple-tvos": "147.1.0",
132+
"react-native-skia-graphite-android": "147.1.1",
133+
"react-native-skia-graphite-apple-ios": "147.1.1",
134+
"react-native-skia-graphite-apple-macos": "147.1.1",
135+
"react-native-skia-graphite-headers": "147.1.1",
136136
"react-reconciler": "0.31.0"
137137
},
138138
"eslintIgnore": [

packages/skia/scripts/install-libs.js

Lines changed: 44 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
const path = require("path");
55
const fs = require("fs");
66

7-
const useGraphite =
8-
process.env.SK_GRAPHITE === "1" ||
9-
(process.env.SK_GRAPHITE || "").toLowerCase() === "true";
10-
const prefix = useGraphite ? "react-native-skia-graphite" : "react-native-skia";
7+
const useGraphite = true;
8+
const prefix = "react-native-skia-graphite";
119
const libsDir = path.join(__dirname, "..", "libs");
10+
const packageRoot = path.join(__dirname, "..");
1211

1312
function copySync(src, dest, options) {
1413
if (!src.includes("*")) {
@@ -131,3 +130,44 @@ fs.rmSync(androidDest, { recursive: true, force: true });
131130
copySync(androidSrcLibs, androidDest, { recursive: true });
132131

133132
console.log("-- Copied Android libs to libs/android/");
133+
134+
// --- Graphite: headers and marker file ---
135+
136+
if (useGraphite) {
137+
// Copy Dawn/WebGPU headers from the headers package
138+
let headersPackage;
139+
try {
140+
headersPackage = path.dirname(
141+
require.resolve("react-native-skia-graphite-headers/package.json")
142+
);
143+
} catch (e) {
144+
console.error("ERROR: Could not find react-native-skia-graphite-headers");
145+
console.error("Make sure you have run yarn install or npm install");
146+
process.exit(1);
147+
}
148+
149+
console.log("-- Skia Graphite headers package: " + headersPackage);
150+
151+
const headersSrcBase = path.join(headersPackage, "libs/skia/cpp");
152+
153+
// Copy Dawn/WebGPU headers
154+
const dawnSrc = path.join(headersSrcBase, "dawn");
155+
const dawnDest = path.join(packageRoot, "cpp/dawn");
156+
fs.rmSync(dawnDest, { recursive: true, force: true });
157+
fs.cpSync(dawnSrc, dawnDest, { recursive: true });
158+
console.log("-- Copied Dawn/WebGPU headers to cpp/dawn/");
159+
160+
// Copy Graphite source headers
161+
const graphiteSrc = path.join(headersSrcBase, "skia/src/gpu/graphite");
162+
const graphiteDest = path.join(packageRoot, "cpp/skia/src/gpu/graphite");
163+
fs.rmSync(graphiteDest, { recursive: true, force: true });
164+
fs.mkdirSync(graphiteDest, { recursive: true });
165+
fs.cpSync(graphiteSrc, graphiteDest, { recursive: true });
166+
console.log("-- Copied Graphite source headers to cpp/skia/src/gpu/graphite/");
167+
168+
// Write .graphite marker file
169+
const markerFile = path.join(libsDir, ".graphite");
170+
const version = "m147a";
171+
fs.writeFileSync(markerFile, version, "utf-8");
172+
console.log("-- Wrote Graphite marker file: " + markerFile);
173+
}

yarn.lock

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8488,10 +8488,10 @@ __metadata:
84888488
react-native: 0.83.1
84898489
react-native-builder-bob: 0.18.2
84908490
react-native-reanimated: ^4.2.1
8491-
react-native-skia-android: 147.1.0
8492-
react-native-skia-apple-ios: 147.1.0
8493-
react-native-skia-apple-macos: 147.1.0
8494-
react-native-skia-apple-tvos: 147.1.0
8491+
react-native-skia-graphite-android: 147.1.1
8492+
react-native-skia-graphite-apple-ios: 147.1.1
8493+
react-native-skia-graphite-apple-macos: 147.1.1
8494+
react-native-skia-graphite-headers: 147.1.1
84958495
react-native-worklets: ^0.7.0
84968496
react-reconciler: 0.31.0
84978497
rimraf: 3.0.2
@@ -29570,31 +29570,31 @@ __metadata:
2957029570
languageName: node
2957129571
linkType: hard
2957229572

29573-
"react-native-skia-android@npm:147.1.0":
29574-
version: 147.1.0
29575-
resolution: "react-native-skia-android@npm:147.1.0"
29576-
checksum: 1aca3e311db852a7cc3adce31169cf8dda3e68b3812453b86296d0c27e577438ac4344cd26d25c09329faff470bcdd04c16da547904164677e435ac770c00bc3
29573+
"react-native-skia-graphite-android@npm:147.1.1":
29574+
version: 147.1.1
29575+
resolution: "react-native-skia-graphite-android@npm:147.1.1"
29576+
checksum: 7b343e6a94616c8feb539722f5deab81ae7750bab7e5feb58515ee1238967496cda7f60b09d5ddc5d4771a08f302ecad4a38092224bb66a52ebcbe46d8f2f6c7
2957729577
languageName: node
2957829578
linkType: hard
2957929579

29580-
"react-native-skia-apple-ios@npm:147.1.0":
29581-
version: 147.1.0
29582-
resolution: "react-native-skia-apple-ios@npm:147.1.0"
29583-
checksum: 704d86ebb038b472cc294267893bee1cc733695515dbe87d43edddbc89ccbef9f6a49d0dfe374849230637af304746f341ddce1c5c85e95f3d6d6b6d3520ce6e
29580+
"react-native-skia-graphite-apple-ios@npm:147.1.1":
29581+
version: 147.1.1
29582+
resolution: "react-native-skia-graphite-apple-ios@npm:147.1.1"
29583+
checksum: 52e922c1be7188a279a906d97995093551fe2ba195c73af29725b4fd75c88a19388fa54e02763e991f3c4c073c6a77a209ccacdedba3de2fba0cb5e990005ea4
2958429584
languageName: node
2958529585
linkType: hard
2958629586

29587-
"react-native-skia-apple-macos@npm:147.1.0":
29588-
version: 147.1.0
29589-
resolution: "react-native-skia-apple-macos@npm:147.1.0"
29590-
checksum: 4a6f3e1bcae8950de0cd94f9b5958f91c61e2ac41c178d66df2a933451be16bd4aa06191d70317dd07a4e095b775341532d2f7aefa424a8b4f01bf6fed88a503
29587+
"react-native-skia-graphite-apple-macos@npm:147.1.1":
29588+
version: 147.1.1
29589+
resolution: "react-native-skia-graphite-apple-macos@npm:147.1.1"
29590+
checksum: 56b6a70a7d146fb40b179726b1a0618fa89a9e8907111ca5e3bee6f6822294ac40a791cfc090278b09d0ee334b2baafe2c5d69af146a21210ea410941a865be9
2959129591
languageName: node
2959229592
linkType: hard
2959329593

29594-
"react-native-skia-apple-tvos@npm:147.1.0":
29595-
version: 147.1.0
29596-
resolution: "react-native-skia-apple-tvos@npm:147.1.0"
29597-
checksum: 5af05fe914e641f2488ac719aa1763ae2850efaea785b12febdf67ee7594c7b340d2d2cd36870ceb056a249d72b40d34500c5da11dba9fdef26a5652c4ff04f8
29594+
"react-native-skia-graphite-headers@npm:147.1.1":
29595+
version: 147.1.1
29596+
resolution: "react-native-skia-graphite-headers@npm:147.1.1"
29597+
checksum: cb64710b74c8ea44e426e14266a2e4319639f142d9dcaf1fbbb76e2810c3777a66b7c0619066670b26babdee2287abe50b51370174267b19f1b1bd86ebdb79b8
2959829598
languageName: node
2959929599
linkType: hard
2960029600

0 commit comments

Comments
 (0)