Skip to content

Commit 9622d06

Browse files
bang9bang9
authored
Merge pull request #201 from sendbird/chore/date-fns
[CLNP-5362] chore: update date-fns version range and set as peer dependency
2 parents bac7abf + 4fa4ef3 commit 9622d06

File tree

9 files changed

+23
-22
lines changed

9 files changed

+23
-22
lines changed

‎docs-validation/7_resources/StringResource.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ const Navigations = () => <></>;
77
* {@link https://sendbird.com/docs/chat/uikit/v3/react-native/resources/string-resource#2-customize-the-stringset}
88
* */
99
import { View } from 'react-native';
10-
import dateLocale from 'date-fns/locale/ko';
10+
import { ko } from 'date-fns/locale';
1111
import { StringSetEn, createBaseStringSet, SendbirdUIKitContainer, useLocalization } from '@sendbird/uikit-react-native';
1212
import { Text, Button } from '@sendbird/uikit-react-native-foundation';
1313

1414
const StringSetKo = createBaseStringSet({
15-
dateLocale,
15+
dateLocale: ko,
1616
overrides: {
1717
LABELS: {
1818
USER_NO_NAME: '(이름없음)',

‎docs-validation/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"@react-navigation/native": "^6.1.17",
1616
"@react-navigation/native-stack": "^6.10.0",
1717
"@sendbird/chat": "^4.12.9",
18+
"date-fns": "^4.1.0",
1819
"react": "18.2.0",
1920
"react-native": "0.74.3",
2021
"react-native-audio-recorder-player": "^3.6.10",

‎packages/uikit-react-native/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"@react-native-firebase/messaging": "^14.4.0",
7676
"@types/react": "*",
7777
"@types/react-native": "*",
78-
"date-fns": "^2.28.0",
78+
"date-fns": ">=2.28.0",
7979
"expo-av": "^13.2.1",
8080
"expo-clipboard": "^4.1.2",
8181
"expo-document-picker": "^11.5.3",

‎packages/uikit-react-native/src/components/GroupChannelMessageRenderer/GroupChannelMessageDateSeparator.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import isSameDay from 'date-fns/isSameDay';
1+
import { isSameDay } from 'date-fns';
22
import React from 'react';
33
import { View } from 'react-native';
44

‎packages/uikit-react-native/src/components/OpenChannelMessageRenderer/OpenChannelMessageDateSeparator.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import isSameDay from 'date-fns/isSameDay';
1+
import { isSameDay } from 'date-fns';
22
import React from 'react';
33
import { View } from 'react-native';
44

‎packages/uikit-react-native/src/localization/StringSet.en.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import dateLocale from 'date-fns/locale/en-US';
1+
import { enUS } from 'date-fns/locale';
22

33
import { createBaseStringSet } from './createBaseStringSet';
44

5-
const StringSetEn = createBaseStringSet({ dateLocale });
5+
const StringSetEn = createBaseStringSet({ dateLocale: enUS });
66

77
export default StringSetEn;

‎packages/uikit-utils/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,20 @@
4444
"access": "public"
4545
},
4646
"dependencies": {
47-
"date-fns": "^2.28.0",
4847
"string.prototype.matchall": "^4.0.7"
4948
},
5049
"devDependencies": {
5150
"@types/react": "*",
5251
"@types/react-native": "*",
52+
"date-fns": ">=2.28.0",
5353
"react": "18.2.0",
5454
"react-native": "0.74.3",
5555
"react-native-builder-bob": "^0.18.0",
5656
"typescript": "5.2.2"
5757
},
5858
"peerDependencies": {
5959
"@sendbird/chat": "^4.12.9",
60+
"date-fns": ">=2.28.0",
6061
"react": ">=17.0.2",
6162
"react-native": ">=0.65.0"
6263
},

‎sample/ios/SendbirdUIKitSample.xcodeproj/project.pbxproj

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = SendbirdUIKitSample/LaunchScreen.storyboard; sourceTree = "<group>"; };
6969
99F6612C1CBBA4F925D06403 /* libPods-NotificationService.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NotificationService.a"; sourceTree = BUILT_PRODUCTS_DIR; };
7070
B137B26F6ADBE924087F9E53 /* Pods-NotificationService.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NotificationService.debug.xcconfig"; path = "Target Support Files/Pods-NotificationService/Pods-NotificationService.debug.xcconfig"; sourceTree = "<group>"; };
71-
D888258B4DD68B1E5DB9EF9D /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = SendbirdUIKitSample/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
71+
D888258B4DD68B1E5DB9EF9D /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = SendbirdUIKitSample/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
7272
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
7373
ED357B4D27F6C32700060120 /* NotificationService.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = NotificationService.appex; sourceTree = BUILT_PRODUCTS_DIR; };
7474
ED357B4F27F6C32700060120 /* NotificationService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NotificationService.h; sourceTree = "<group>"; };
@@ -589,7 +589,7 @@
589589
PRODUCT_BUNDLE_IDENTIFIER = com.sendbird.uikit.reactnative.sample;
590590
PRODUCT_NAME = SendbirdUIKitSample;
591591
PROVISIONING_PROFILE_SPECIFIER = "match Development com.sendbird.uikit.reactnative.sample";
592-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.sendbird.uikit.reactnative.sample";
592+
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.sendbird.uikit.reactnative.sample 1728706970";
593593
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
594594
SWIFT_VERSION = 5.0;
595595
VERSIONING_SYSTEM = "apple-generic";
@@ -701,10 +701,7 @@
701701
"-DFOLLY_CFG_NO_COROUTINES=1",
702702
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
703703
);
704-
OTHER_LDFLAGS = (
705-
"$(inherited)",
706-
" ",
707-
);
704+
OTHER_LDFLAGS = "$(inherited) ";
708705
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../node_modules/react-native";
709706
SDKROOT = iphoneos;
710707
USE_HERMES = true;
@@ -776,10 +773,7 @@
776773
"-DFOLLY_CFG_NO_COROUTINES=1",
777774
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
778775
);
779-
OTHER_LDFLAGS = (
780-
"$(inherited)",
781-
" ",
782-
);
776+
OTHER_LDFLAGS = "$(inherited) ";
783777
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../node_modules/react-native";
784778
SDKROOT = iphoneos;
785779
USE_HERMES = true;

‎yarn.lock

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5429,9 +5429,9 @@
54295429
"@types/react" "*"
54305430

54315431
"@types/react@*", "@types/react@>=16.0.0", "@types/react@^17", "@types/react@^18", "@types/react@^18.2.6":
5432-
version "18.3.3"
5433-
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.3.tgz#9679020895318b0915d7a3ab004d92d33375c45f"
5434-
integrity sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==
5432+
version "18.3.11"
5433+
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.11.tgz#9d530601ff843ee0d7030d4227ea4360236bd537"
5434+
integrity sha512-r6QZ069rFTjrEYgFdOck1gK7FLVsgJE7tTz0pQBczlBNUhBNk0MQH4UbnFSwjpQLMkLzgqvBBa+qGpLje16eTQ==
54355435
dependencies:
54365436
"@types/prop-types" "*"
54375437
csstype "^3.0.2"
@@ -8124,7 +8124,12 @@ data-view-byte-offset@^1.0.0:
81248124
es-errors "^1.3.0"
81258125
is-data-view "^1.0.1"
81268126

8127-
date-fns@^2.28.0, date-fns@^2.29.3:
8127+
date-fns@>=2.28.0, date-fns@^4.1.0:
8128+
version "4.1.0"
8129+
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-4.1.0.tgz#64b3d83fff5aa80438f5b1a633c2e83b8a1c2d14"
8130+
integrity sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==
8131+
8132+
date-fns@^2.29.3:
81288133
version "2.29.3"
81298134
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
81308135
integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==

0 commit comments

Comments
 (0)