npm - @shopify/react-native-skia - Versions diffs - 0.1.160 → 0.1.162 - Mend

@shopify/react-native-skia 0.1.160 → 0.1.162

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.

Files changed (39) hide show

package/android/CMakeLists.txt CHANGED Viewed

@@ -9,8 +9,8 @@ set (PACKAGE_NAME "reactskia")
 set (SKIA_LIB "skia")
 set (SKIA_SVG_LIB "svg")
 set (SKIA_SKSHAPER_LIB "skshaper")
-set (SKIA_SKPARAGRAPH_LIB "skparagraph")
-set (SKIA_SKUNICODE_LIB "skunicode")
+#set (SKIA_SKPARAGRAPH_LIB "skparagraph")
+#set (SKIA_SKUNICODE_LIB "skunicode")
 set(build_DIR ${CMAKE_SOURCE_DIR}/build)
 file(GLOB LIBRN_DIR "${PREBUILT_DIR}/${ANDROID_ABI}")
@@ -72,7 +72,7 @@ target_include_directories(
         cpp/skia/include/utils/
         cpp/skia/include/pathops/
         cpp/skia/modules/
-        cpp/skia/modules/skparagraph/include/
+        #cpp/skia/modules/skparagraph/include/
         cpp/skia/include/
         cpp/skia
@@ -103,11 +103,11 @@ set_property(TARGET svg PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libsvg.a")
 add_library(skshaper STATIC IMPORTED)
 set_property(TARGET skshaper PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libskshaper.a")
-add_library(skparagraph STATIC IMPORTED)
-set_property(TARGET skparagraph PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libskparagraph.a")
+#add_library(skparagraph STATIC IMPORTED)
+#set_property(TARGET skparagraph PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libskparagraph.a")
-add_library(skunicode STATIC IMPORTED)
-set_property(TARGET skunicode PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libskunicode.a")
+#add_library(skunicode STATIC IMPORTED)
+#set_property(TARGET skunicode PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libskunicode.a")
 find_library(
@@ -169,8 +169,8 @@ target_link_libraries(
         ${TURBOMODULES_LIB}
         ${SKIA_SVG_LIB}
         ${SKIA_SKSHAPER_LIB}
-        ${SKIA_SKPARAGRAPH_LIB}
-        ${SKIA_SKUNICODE_LIB}
+        #${SKIA_SKPARAGRAPH_LIB}
+        #${SKIA_SKUNICODE_LIB}
         ${SKIA_LIB}
         -ljnigraphics
         -lGLESv2

package/cpp/rnskia/RNSkDomView.cpp CHANGED Viewed

@@ -86,8 +86,7 @@ void RNSkDomRenderer::renderCanvas(SkCanvas *canvas, float scaledWidth,
   if (_drawingContext == nullptr) {
     auto paint = std::make_shared<SkPaint>();
     paint->setAntiAlias(true);
-    _drawingContext =
-        std::make_shared<DrawingContext>(paint, 1.0f);
+    _drawingContext = std::make_shared<DrawingContext>(paint, 1.0f);
     _drawingContext->setRequestRedraw([weakSelf = weak_from_this()]() {
       auto self = weakSelf.lock();

package/cpp/rnskia/dom/nodes/JsiColorFilterNodes.h CHANGED Viewed

@@ -44,7 +44,7 @@ protected:
     if (paint->getColorFilter() != nullptr &&
         paint->getColorFilter() != getCurrent().get()) {
       paint->setColorFilter(
-          SkColorFilters::Compose(paint->refColorFilter(), ColorFilter));
+          SkColorFilters::Compose(ColorFilter, paint->refColorFilter()));
     } else {
       paint->setColorFilter(ColorFilter);
     }

package/libs/android/arm64-v8a/libskottie.a CHANGED Viewed

Binary file

package/libs/android/arm64-v8a/libskshaper.a CHANGED Viewed

Binary file

package/libs/android/armeabi-v7a/libskottie.a CHANGED Viewed

Binary file

package/libs/android/armeabi-v7a/libskshaper.a CHANGED Viewed

Binary file

package/libs/android/x86/libskottie.a CHANGED Viewed

Binary file

package/libs/android/x86/libskshaper.a CHANGED Viewed

Binary file

package/libs/android/x86_64/libskottie.a CHANGED Viewed

Binary file

package/libs/android/x86_64/libskshaper.a CHANGED Viewed

Binary file

package/libs/ios/libskia.xcframework/Info.plist CHANGED Viewed

@@ -6,32 +6,32 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskia.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskia.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/libs/ios/libskia.xcframework/ios-arm64_arm64e/libskia.a CHANGED Viewed

Binary file

package/libs/ios/libskia.xcframework/ios-arm64_arm64e_x86_64-simulator/libskia.a CHANGED Viewed

Binary file

package/libs/ios/libskottie.xcframework/ios-arm64_arm64e/libskottie.a CHANGED Viewed

Binary file

package/libs/ios/libskottie.xcframework/ios-arm64_arm64e_x86_64-simulator/libskottie.a CHANGED Viewed

Binary file

package/libs/ios/libsksg.xcframework/ios-arm64_arm64e/libsksg.a CHANGED Viewed

Binary file

package/libs/ios/libsksg.xcframework/ios-arm64_arm64e_x86_64-simulator/libsksg.a CHANGED Viewed

Binary file

package/libs/ios/libskshaper.xcframework/Info.plist CHANGED Viewed

@@ -6,32 +6,32 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskshaper.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskshaper.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/libs/ios/libskshaper.xcframework/ios-arm64_arm64e/libskshaper.a CHANGED Viewed

Binary file

package/libs/ios/libskshaper.xcframework/ios-arm64_arm64e_x86_64-simulator/libskshaper.a CHANGED Viewed

Binary file

package/libs/ios/libsvg.xcframework/ios-arm64_arm64e/libsvg.a CHANGED Viewed

Binary file

package/libs/ios/libsvg.xcframework/ios-arm64_arm64e_x86_64-simulator/libsvg.a CHANGED Viewed

Binary file

package/package.json CHANGED Viewed

@@ -7,7 +7,7 @@
     "setup-skia-web": "./scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "0.1.160",
+  "version": "0.1.162",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "files": [
@@ -32,8 +32,6 @@
     "libs/ios/libsvg.xcframework",
     "libs/ios/libskottie.xcframework",
     "libs/ios/libsksg.xcframework",
-    "libs/ios/libskparagraph.xcframework",
-    "libs/ios/libskunicode.xcframework",
     "react-native-skia.podspec",
     "scripts/install-npm.js",
     "scripts/setup-canvaskit.js",
@@ -43,6 +41,7 @@
     "tsc": "tsc --noEmit",
     "lint": "eslint . --ext .ts,.tsx  --max-warnings 0 --cache",
     "test": "jest",
+    "e2e": "E2E=true yarn test -i e2e",
     "postinstall": "node scripts/install-npm.js",
     "build": "bob build"
   },
@@ -94,8 +93,14 @@
     "typescript": "4.8.3"
   },
   "dependencies": {
+    "@types/pixelmatch": "^5.2.4",
+    "@types/pngjs": "^6.0.1",
+    "@types/ws": "^8.5.3",
     "canvaskit-wasm": "0.36.1",
-    "react-reconciler": "^0.27.0"
+    "pixelmatch": "^5.3.0",
+    "pngjs": "^6.0.0",
+    "react-reconciler": "^0.27.0",
+    "ws": "^8.11.0"
   },
   "eslintIgnore": [
     "node_modules/",

package/react-native-skia.podspec CHANGED Viewed

@@ -33,8 +33,8 @@ Pod::Spec.new do |s|
     'libs/ios/libskia.xcframework',
     'libs/ios/libsvg.xcframework',
     'libs/ios/libskshaper.xcframework',
-    'libs/ios/libskparagraph.xcframework',
-    'libs/ios/libskunicode.xcframework',
+    #'libs/ios/libskparagraph.xcframework',
+    #'libs/ios/libskunicode.xcframework',
   ]
   # All iOS cpp/h files

package/libs/android/arm64-v8a/libskparagraph.a DELETED Viewed

Binary file

package/libs/android/arm64-v8a/libskunicode.a DELETED Viewed

Binary file

package/libs/android/armeabi-v7a/libskparagraph.a DELETED Viewed

Binary file

package/libs/android/armeabi-v7a/libskunicode.a DELETED Viewed

Binary file

package/libs/android/x86/libskparagraph.a DELETED Viewed

Binary file

package/libs/android/x86/libskunicode.a DELETED Viewed

Binary file

package/libs/android/x86_64/libskparagraph.a DELETED Viewed

Binary file

package/libs/android/x86_64/libskunicode.a DELETED Viewed

Binary file

package/libs/ios/libskparagraph.xcframework/Info.plist DELETED Viewed

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>AvailableLibraries</key>
-	<array>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
-			<key>LibraryPath</key>
-			<string>libskparagraph.a</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-				<string>arm64e</string>
-				<string>x86_64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
-		</dict>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
-			<key>LibraryPath</key>
-			<string>libskparagraph.a</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-				<string>arm64e</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-		</dict>
-	</array>
-	<key>CFBundlePackageType</key>
-	<string>XFWK</string>
-	<key>XCFrameworkFormatVersion</key>
-	<string>1.0</string>
-</dict>
-</plist>

package/libs/ios/libskparagraph.xcframework/ios-arm64_arm64e/libskparagraph.a DELETED Viewed

Binary file

package/libs/ios/libskparagraph.xcframework/ios-arm64_arm64e_x86_64-simulator/libskparagraph.a DELETED Viewed

Binary file

package/libs/ios/libskunicode.xcframework/Info.plist DELETED Viewed

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>AvailableLibraries</key>
-	<array>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
-			<key>LibraryPath</key>
-			<string>libskunicode.a</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-				<string>arm64e</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-		</dict>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
-			<key>LibraryPath</key>
-			<string>libskunicode.a</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-				<string>arm64e</string>
-				<string>x86_64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
-		</dict>
-	</array>
-	<key>CFBundlePackageType</key>
-	<string>XFWK</string>
-	<key>XCFrameworkFormatVersion</key>
-	<string>1.0</string>
-</dict>
-</plist>

package/libs/ios/libskunicode.xcframework/ios-arm64_arm64e/libskunicode.a DELETED Viewed

Binary file

package/libs/ios/libskunicode.xcframework/ios-arm64_arm64e_x86_64-simulator/libskunicode.a DELETED Viewed

Binary file