react-native-reanimated 2.12.0 → 2.13.0

package/Common/cpp/NativeModules/NativeReanimatedModule.cpp

@@ -3,6 +3,7 @@
 #include <memory>
 #include <thread>
 #include <unordered_map>
+#include <utility>
 
 #include "EventHandlerRegistry.h"
 #include "FeaturesConfig.h"

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Thu Oct 27 10:05:12 UTC 2022
+#Fri Nov 11 10:24:13 UTC 2022
 gradle.version=7.5.1

package/android/CMakeLists.txt

@@ -318,4 +318,4 @@ endif()
 set (ignoreMe "${CLIENT_SIDE_BUILD}")
 set (ignoreMe "${JS_RUNTIME_DIR}")
 set (ignoreMe "${PLAYGROUND_APP_NAME}")
-set (ignoreMe "${HERMES_ENABLE_DEBUGGER}")
+set (ignoreMe "${REANIMATED_PACKAGE_BUILD}")

package/android/build.gradle

@@ -1,5 +1,6 @@
 import com.android.Version
 import org.apache.tools.ant.filters.ReplaceTokens
+import org.apache.tools.ant.taskdefs.condition.Os
 import groovy.json.JsonSlurper
 import java.nio.file.Paths
 
@@ -183,6 +184,13 @@ def getReanimatedVersion() {
     return major.toInteger()
 }
 
+def toPlatformFileString(String path) {
+  if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+      path = path.replace(File.separatorChar, '/' as char)
+  }
+  return path
+}
+
 boolean CLIENT_SIDE_BUILD = resolveClientSideBuild()
 if (CLIENT_SIDE_BUILD) {
     configurations.maybeCreate("default")
@@ -447,7 +455,7 @@ android {
                         "-DREACT_NATIVE_MINOR_VERSION=${REACT_NATIVE_MINOR_VERSION}",
                         "-DANDROID_TOOLCHAIN=clang",
                         "-DBOOST_VERSION=${BOOST_VERSION}",
-                        "-DREACT_NATIVE_DIR=${reactNativeRootDir.path}",
+                        "-DREACT_NATIVE_DIR=${toPlatformFileString(reactNativeRootDir.path)}",
                         "-DJS_RUNTIME=${JS_RUNTIME}",
                         "-DJS_RUNTIME_DIR=${jsRuntimeDir}",
                         "-DCLIENT_SIDE_BUILD=${CLIENT_SIDE_BUILD}",

package/ios/REAModule.mm

@@ -195,19 +195,21 @@ RCT_EXPORT_METHOD(triggerRender)
   [_nodesManager dispatchEvent:event];
 }
 
-- (void)startObserving {
-    hasListeners = YES;
+- (void)startObserving
+{
+  hasListeners = YES;
 }
 
-- (void)stopObserving {
-    hasListeners = NO;
+- (void)stopObserving
+{
+  hasListeners = NO;
 }
 
 - (void)sendEventWithName:(NSString *)eventName body:(id)body
 {
-    if (hasListeners) {
-        [super sendEventWithName:eventName body:body];
-    }
+  if (hasListeners) {
+    [super sendEventWithName:eventName body:body];
+  }
 }
 
 @end

package/lib/reanimated2/jestUtils.js

@@ -145,14 +145,21 @@ export const advanceAnimationByFrame = (count) => {
     jest.advanceTimersByTime(frameTime);
 };
 export const setUpTests = (userConfig = {}) => {
-    let expect;
-    try {
-        expect = require('expect');
-    }
-    catch (_) {
-        // for Jest in version 28+
-        const { expect: expectModule } = require('@jest/globals');
+    let expect = global.expect;
+    if (expect === undefined) {
+        const expectModule = require('expect');
         expect = expectModule;
+        // Starting from Jest 28, "expect" package uses named exports instead of default export.
+        // So, requiring "expect" package doesn't give direct access to "expect" function anymore.
+        // It gives access to the module object instead.
+        // We use this info to detect if the project uses Jest 28 or higher.
+        if (typeof expect === 'object') {
+            const jestGlobals = require('@jest/globals');
+            expect = jestGlobals.expect;
+        }
+        if (expect === undefined || expect.extend === undefined) {
+            expect = expectModule.default;
+        }
     }
     require('setimmediate');
     frameTime = Math.round(1000 / config.fps);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-reanimated",
-  "version": "2.12.0",
+  "version": "2.13.0",
   "description": "More powerful alternative to Animated library for React Native.",
   "scripts": {
     "test": "yarn run format:js && yarn run lint:js && yarn run test:unit",
@@ -9,11 +9,11 @@
     "lint:js": "eslint --ext '.js,.ts,.tsx' src/ && yarn prettier --check src/",
     "lint:java": "./android/gradlew -p android spotlessCheck -q",
     "lint:cpp": "./scripts/cpplint.sh",
-    "lint:ios": "./scripts/validate-ios.sh",
+    "lint:ios": "./scripts/validate-ios.sh && yarn format:ios --dry-run",
     "format": "yarn format:js && yarn format:java && yarn format:ios && yarn format:android && yarn format:common",
     "format:js": "prettier --write --list-different './src/'",
     "format:java": "node ./scripts/format-java.js",
-    "format:ios": "find ios/ -iname *.h -o -iname *.m -o -iname *.mm -o -iname *.cpp | xargs clang-format -i",
+    "format:ios": "find ios/ -iname *.h -o -iname *.m -o -iname *.mm -o -iname *.cpp | xargs clang-format -i --Werror",
     "format:android": "find android/src/ -iname *.h -o -iname *.cpp | xargs clang-format -i",
     "format:common": "find Common/ -iname *.h -o -iname *.cpp | xargs clang-format -i",
     "release": "npm login && release-it",
@@ -123,7 +123,7 @@
     "madge": "^5.0.1",
     "prettier": "^2.5.1",
     "react": "17.0.2",
-    "react-native": "0.70.3",
+    "react-native": "0.70",
     "react-native-builder-bob": "^0.18.3",
     "react-native-codegen": "^0.0.7",
     "react-native-gesture-handler": "^1.6.1",

package/src/reanimated2/jestUtils.ts

@@ -188,13 +188,21 @@ export const advanceAnimationByFrame = (count) => {
 };
 
 export const setUpTests = (userConfig = {}) => {
-  let expect;
-  try {
-    expect = require('expect');
-  } catch (_) {
-    // for Jest in version 28+
-    const { expect: expectModule } = require('@jest/globals');
+  let expect = global.expect;
+  if (expect === undefined) {
+    const expectModule = require('expect');
     expect = expectModule;
+    // Starting from Jest 28, "expect" package uses named exports instead of default export.
+    // So, requiring "expect" package doesn't give direct access to "expect" function anymore.
+    // It gives access to the module object instead.
+    // We use this info to detect if the project uses Jest 28 or higher.
+    if (typeof expect === 'object') {
+      const jestGlobals = require('@jest/globals');
+      expect = jestGlobals.expect;
+    }
+    if (expect === undefined || expect.extend === undefined) {
+      expect = expectModule.default;
+    }
   }
 
   require('setimmediate');