expo-modules-core 1.6.0 → 1.7.0

package/ios/ReactDelegates/EXReactCompatibleHelpers.m

@@ -4,22 +4,22 @@
 
 #import <React/RCTRootView.h>
 
-#if __has_include(<React/RCTAppSetupUtils.h>)
+#if __has_include(<React-RCTAppDelegate/RCTAppSetupUtils.h>)
+#import <React-RCTAppDelegate/RCTAppSetupUtils.h>
+#elif __has_include(<React_RCTAppDelegate/RCTAppSetupUtils.h>)
+// for importing the header from framework, the dash will be transformed to underscore
+#import <React_RCTAppDelegate/RCTAppSetupUtils.h>
+#else
+// react-native < 0.72
 #import <React/RCTAppSetupUtils.h>
 #endif
 
 UIView *EXAppSetupDefaultRootView(RCTBridge *bridge, NSString *moduleName, NSDictionary *initialProperties, BOOL fabricEnabled)
 {
-#if __has_include(<React/RCTAppSetupUtils.h>)
-
 #if REACT_NATIVE_MINOR_VERSION >= 71
   return RCTAppSetupDefaultRootView(bridge, moduleName, initialProperties, fabricEnabled);
 #else
   return RCTAppSetupDefaultRootView(bridge, moduleName, initialProperties);
 #endif // REACT_NATIVE_MINOR_VERSION >= 71
-
-#else
-  return [[RCTRootView alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
-#endif // __has_include(<React/RCTAppSetupUtils.h>)
 }
 

package/ios/Swift/Views/ViewModuleWrapper.swift

@@ -32,13 +32,15 @@ public final class ViewModuleWrapper: RCTViewManager, DynamicModuleWrapperProtoc
 
   /**
    The designated initializer that is used by React Native to create module instances.
+   https://github.com/facebook/react-native/blob/540c41be9/packages/react-native/React/Views/RCTComponentData.m#L506-L507
+   It doesn't matter to return dummy class here. The wrapper will then to subclass dynamically.
    Must be called on a dynamic class to get access to underlying wrapped module. Throws fatal exception otherwise.
    */
   @objc
   public override init() {
     super.init()
     guard let module = (self as DynamicModuleWrapperProtocol).wrappedModule?() else {
-      fatalError("Something unexpected has happened. Only dynamically created `ViewModuleWrapper` can be initialized without params.")
+      return
     }
     self.wrappedModuleHolder = module.wrappedModuleHolder
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "The core of Expo Modules architecture",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -42,5 +42,5 @@
     "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^3.0.0"
   },
-  "gitHead": "663654577a7068c641b5e9474efbc502e3f334ea"
+  "gitHead": "79607a7325f47aa17c36d266100d09a4ff2cc544"
 }

package/src/errors/UnavailabilityError.ts

@@ -1,5 +1,5 @@
-import Platform from '../Platform';
 import { CodedError } from './CodedError';
+import Platform from '../Platform';
 
 /**
  * A class for errors to be thrown when a property is accessed which is

package/src/sweet/setUpErrorManager.fx.ts

@@ -1,15 +1,20 @@
+import NativeErrorManager from './NativeErrorManager';
 import { EventEmitter } from '../EventEmitter';
 import Platform from '../Platform';
 import { CodedError } from '../errors/CodedError';
-import NativeErrorManager from './NativeErrorManager';
 
 if (__DEV__ && Platform.OS === 'android' && NativeErrorManager) {
   const onNewException = 'ExpoModulesCoreErrorManager.onNewException';
+  const onNewWarning = 'ExpoModulesCoreErrorManager.onNewWarning';
   const eventEmitter = new EventEmitter(NativeErrorManager);
 
   eventEmitter.addListener(onNewException, ({ message }: { message: string }) => {
     console.error(message);
   });
+
+  eventEmitter.addListener(onNewWarning, ({ message }: { message: string }) => {
+    console.warn(message);
+  });
 }
 
 // We have to export `CodedError` via global object to use in later in the C++ code.

package/src/uuid/v4.ts

@@ -22,12 +22,8 @@ export function uuidv4<T extends OutputBuffer>(
 
   options = options || undefined;
 
-  let rnds: number[] = [];
-  if (options && 'random' in options) {
-    rnds = options.random as number[];
-  } else if (options && 'rng' in options) {
-    rnds = (options.rng || rng)() as number[];
-  }
+  // @ts-expect-error
+  const rnds: number[] = options?.random || (options?.rng || rng)();
 
   // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
   rnds[6] = (rnds[6] & 0x0f) | 0x40;

package/tsconfig.json

@@ -5,5 +5,5 @@
     "outDir": "./build"
   },
   "include": ["./src"],
-  "exclude": ["**/__mocks__/*", "**/__tests__/*", "**/__stories__/*"]
+  "exclude": ["**/__mocks__/*", "**/__tests__/*"]
 }

package/android/src/main/cpp/ObjectDeallocator.h

@@ -1,25 +0,0 @@
-// Copyright © 2021-present 650 Industries, Inc. (aka Expo)
-
-#pragma once
-
-#include <jsi/jsi.h>
-
-namespace jsi = facebook::jsi;
-
-namespace expo {
-
-class JSI_EXPORT ObjectDeallocator : public jsi::HostObject {
-public:
-  typedef std::function<void()> ObjectDeallocatorType;
-
-  ObjectDeallocator(ObjectDeallocatorType deallocator) : deallocator(deallocator) {};
-
-  virtual ~ObjectDeallocator() {
-    deallocator();
-  }
-
-  const ObjectDeallocatorType deallocator;
-
-}; // class ObjectDeallocator
-
-}

package/android/src/main/java/expo/modules/adapters/react/views/SimpleViewManagerAdapter.java

@@ -1,62 +0,0 @@
-package expo.modules.adapters.react.views;
-
-import android.view.View;
-
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.SimpleViewManager;
-import com.facebook.react.uimanager.annotations.ReactProp;
-
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import expo.modules.core.ModuleRegistry;
-import expo.modules.core.ViewManager;
-import expo.modules.core.interfaces.RegistryLifecycleListener;
-
-public class SimpleViewManagerAdapter<M extends ViewManager<V>, V extends View> extends SimpleViewManager<V> implements RegistryLifecycleListener {
-  private M mViewManager;
-
-  public SimpleViewManagerAdapter(M viewManager) {
-    mViewManager = viewManager;
-  }
-
-  @Override
-  protected V createViewInstance(ThemedReactContext reactContext) {
-    return mViewManager.createViewInstance(reactContext);
-  }
-
-  @Override
-  public void onDropViewInstance(V view) {
-    mViewManager.onDropViewInstance(view);
-    super.onDropViewInstance(view);
-  }
-
-  @Nullable
-  @Override
-  public Map<String, Object> getConstants() {
-    return ViewManagerAdapterUtils.getConstants(mViewManager);
-  }
-
-  @Override
-  public String getName() {
-    return ViewManagerAdapterUtils.getViewManagerAdapterName(mViewManager);
-  }
-
-  @ReactProp(name = "proxiedProperties")
-  public void setProxiedProperties(V view, ReadableMap proxiedProperties) {
-    ViewManagerAdapterUtils.setProxiedProperties(getName(), mViewManager, view, proxiedProperties);
-  }
-
-  @Nullable
-  @Override
-  public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
-    return ViewManagerAdapterUtils.getExportedCustomDirectEventTypeConstants(mViewManager);
-  }
-
-  @Override
-  public void onCreate(ModuleRegistry moduleRegistry) {
-    mViewManager.onCreate(moduleRegistry);
-  }
-}

package/android/src/main/java/expo/modules/adapters/react/views/ViewGroupManagerAdapter.java

@@ -1,62 +0,0 @@
-package expo.modules.adapters.react.views;
-
-import android.view.ViewGroup;
-
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.uimanager.ViewGroupManager;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.annotations.ReactProp;
-
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import expo.modules.core.ModuleRegistry;
-import expo.modules.core.ViewManager;
-import expo.modules.core.interfaces.RegistryLifecycleListener;
-
-public class ViewGroupManagerAdapter<M extends ViewManager<V>, V extends ViewGroup> extends ViewGroupManager<V> implements RegistryLifecycleListener {
-  private M mViewManager;
-
-  public ViewGroupManagerAdapter(M viewManager) {
-    mViewManager = viewManager;
-  }
-
-  @Override
-  protected V createViewInstance(ThemedReactContext reactContext) {
-    return mViewManager.createViewInstance(reactContext);
-  }
-
-  @Override
-  public void onDropViewInstance(V view) {
-    mViewManager.onDropViewInstance(view);
-    super.onDropViewInstance(view);
-  }
-
-  @Nullable
-  @Override
-  public Map<String, Object> getConstants() {
-    return ViewManagerAdapterUtils.getConstants(mViewManager);
-  }
-
-  @Override
-  public String getName() {
-    return ViewManagerAdapterUtils.getViewManagerAdapterName(mViewManager);
-  }
-
-  @ReactProp(name = "proxiedProperties")
-  public void setProxiedProperties(V view, ReadableMap proxiedProperties) {
-    ViewManagerAdapterUtils.setProxiedProperties(getName(), mViewManager, view, proxiedProperties);
-  }
-
-  @Nullable
-  @Override
-  public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
-    return ViewManagerAdapterUtils.getExportedCustomDirectEventTypeConstants(mViewManager);
-  }
-
-  @Override
-  public void onCreate(ModuleRegistry moduleRegistry) {
-    mViewManager.onCreate(moduleRegistry);
-  }
-}

package/ios/JSI/EXObjectDeallocator.h

@@ -1,27 +0,0 @@
-// Copyright 2022-present 650 Industries. All rights reserved.
-
-#ifdef __cplusplus
-
-#import <jsi/jsi.h>
-
-namespace jsi = facebook::jsi;
-
-namespace expo {
-
-typedef void (^ObjectDeallocatorBlock)();
-
-class JSI_EXPORT ObjectDeallocator : public jsi::HostObject {
-public:
-  ObjectDeallocator(const ObjectDeallocatorBlock deallocator) : deallocator(deallocator) {};
-
-  virtual ~ObjectDeallocator() {
-    deallocator();
-  }
-
-  const ObjectDeallocatorBlock deallocator;
-
-}; // class ObjectDeallocator
-
-} // namespace expo
-
-#endif