Skip to content

Commit

Permalink
Merge pull request #48410 from software-mansion-labs/@wolewicki/bump-…
Browse files Browse the repository at this point in the history
…haptic-feedback

[NoQA] feat: bump haptic-feedback, remove old patch and add new one
  • Loading branch information
mountiny authored Sep 16, 2024
2 parents d860f2d + 476daa9 commit 84793c8
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 36 deletions.
4 changes: 2 additions & 2 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2451,7 +2451,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- RNReactNativeHapticFeedback (2.2.0):
- RNReactNativeHapticFeedback (2.3.1):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -3233,7 +3233,7 @@ SPEC CHECKSUMS:
RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81
rnmapbox-maps: 460d6ff97ae49c7d5708c3212c6521697c36a0c4
RNPermissions: 0b1429b55af59d1d08b75a8be2459f65a8ac3f28
RNReactNativeHapticFeedback: a15b431d2903bc2eb3474ff8d9a05d3e67a70199
RNReactNativeHapticFeedback: 31833c3ef341d716dbbd9d64e940f0c230db46f6
RNReanimated: 76901886830e1032f16bbf820153f7dc3f02d51d
RNScreens: de6e57426ba0e6cbc3fb5b4f496e7f08cb2773c2
RNShare: bd4fe9b95d1ee89a200778cc0753ebe650154bb0
Expand Down
10 changes: 7 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
"react-native-fs": "^2.20.0",
"react-native-gesture-handler": "2.18.0",
"react-native-google-places-autocomplete": "2.5.6",
"react-native-haptic-feedback": "^2.2.0",
"react-native-haptic-feedback": "^2.3.1",
"react-native-image-picker": "^7.0.3",
"react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#cb392140db4953a283590d7cf93b4d0461baa2a9",
"react-native-key-command": "^1.0.8",
Expand Down
30 changes: 0 additions & 30 deletions patches/react-native-haptic-feedback+2.2.0.patch

This file was deleted.

56 changes: 56 additions & 0 deletions patches/react-native-haptic-feedback+2.3.1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
diff --git a/node_modules/react-native-haptic-feedback/ios/RNHapticFeedback/RNHapticFeedback.h b/node_modules/react-native-haptic-feedback/ios/RNHapticFeedback/RNHapticFeedback.h
index c1498b9..250df1f 100644
--- a/node_modules/react-native-haptic-feedback/ios/RNHapticFeedback/RNHapticFeedback.h
+++ b/node_modules/react-native-haptic-feedback/ios/RNHapticFeedback/RNHapticFeedback.h
@@ -1,5 +1,5 @@
#ifdef RCT_NEW_ARCH_ENABLED
-#import "RNHapticFeedbackSpec.h"
+#import <RNHapticFeedbackSpec/RNHapticFeedbackSpec.h>

@interface RNHapticFeedback : NSObject <NativeHapticFeedbackSpec>
#else
diff --git a/node_modules/react-native-haptic-feedback/ios/RNHapticFeedback/RNHapticFeedbackSpec.h b/node_modules/react-native-haptic-feedback/ios/RNHapticFeedback/RNHapticFeedbackSpec.h
deleted file mode 100644
index 6f0f81d..0000000
--- a/node_modules/react-native-haptic-feedback/ios/RNHapticFeedback/RNHapticFeedbackSpec.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// RNHapticFeedbackSpec.h
-// RNHapticFeedback
-//
-// Created by Michael Kuczera on 05.08.24.
-// Copyright © 2024 Facebook. All rights reserved.
-//
-#import <Foundation/Foundation.h>
-
-@protocol NativeHapticFeedbackSpec <NSObject>
-
-// Indicates whether the device supports haptic feedback
-- (Boolean)supportsHaptic;
-
-@end
diff --git a/node_modules/react-native-haptic-feedback/package.json b/node_modules/react-native-haptic-feedback/package.json
index 86dfaa4..9cec8e4 100644
--- a/node_modules/react-native-haptic-feedback/package.json
+++ b/node_modules/react-native-haptic-feedback/package.json
@@ -6,18 +6,7 @@
"source": "src/index.ts",
"main": "./lib/commonjs/index.js",
"module": "./lib/module/index.js",
- "exports": {
- ".": {
- "import": {
- "types": "./lib/typescript/module/src/index.d.ts",
- "default": "./lib/module/index.js"
- },
- "require": {
- "types": "./lib/typescript/commonjs/src/index.d.ts",
- "default": "./lib/commonjs/index.js"
- }
- }
- },
+ "types": "./lib/typescript/module/src/index.d.ts",
"scripts": {
"typecheck": "tsc --noEmit --project tsconfig.test.json",
"test": "jest",

0 comments on commit 84793c8

Please sign in to comment.