Support node@22 (#24)

* support node22

* bump "connectycube": ">=4.2.1" as "peerDependencies"

* updated CHANGELOG.md

* fixed ts issues

* upgraded "connectycube" as "peerDependencies" to v4.2.2

* updated CHANGELOG.md

* added "engines" to package.json

* added @types/node

Author: ccvlad

.gitignore

@@ -128,3 +128,4 @@ dist
 .yarn/build-state.yml
 .yarn/install-state.gz
 .pnp.*
+.DS_Store

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.18.0
+
+### Updates
+
+- Added support for node 22;
+- Upgraded `connectycube` >=4.2.2 to use import types and enums from "connectycube/types".
+
 ## 0.17.0
 
 ### Updates

package-lock.json

@@ -39,23 +39,28 @@
     "react-usestateref": "^1.0.9"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^28.0.2",
-    "@rollup/plugin-node-resolve": "^16.0.0",
+    "@rollup/plugin-commonjs": "^28.0.3",
+    "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.1.2",
     "@types/react": "^19.0.10",
+    "@types/node": "^22.13.10",
     "prettier": "^3.5.3",
-    "rollup": "^4.34.9",
+    "rollup": "^4.36.0",
     "rollup-plugin-peer-deps-external": "^2.2.4",
     "tslib": "^2.8.1",
     "typescript": "^5.8.2"
   },
   "peerDependencies": {
-    "connectycube": ">=4.1.3",
+    "connectycube": ">=4.2.2",
     "react": ">=18.0.0",
     "react-dom": ">=18.0.0"
   },
   "optionalDependencies": {
-    "@rollup/rollup-linux-x64-gnu": "^4.34.9"
+    "@rollup/rollup-linux-x64-gnu": "^4.36.0"
+  },
+  "engines": {
+    "node": ">=18.0.0",
+    "npm": ">=8.0.0"
   }
 }

package.json

@@ -5,7 +5,10 @@ import commonjs from "@rollup/plugin-commonjs";
 import typescript from "@rollup/plugin-typescript";
 import terser from "@rollup/plugin-terser";
 import peerDepsExternal from "rollup-plugin-peer-deps-external";
-import packageJson from './package.json' assert { type: 'json' };
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
+const packageJson = require('./package.json');
 
 const globals = {
   "connectycube": "ConnectyCube",

rollup.config.mjs

@@ -1,6 +1,6 @@
 import { createContext, useContext, useEffect, useRef, useState } from "react";
 import { ChatContextType, ChatProviderType, GroupChatEventType, UnreadMessagesCount } from "./types";
-import { Chat, DateOrTimestamp, Dialogs, Messages, Users } from "connectycube/dist/types/types";
+import { Chat, DateOrTimestamp, Dialogs, Messages, Users } from "connectycube/types";
 import ConnectyCube from "connectycube";
 import useStateRef from "react-usestateref";
 import { formatDistanceToNow } from "date-fns";
@@ -181,7 +181,7 @@ export const ChatProvider = ({ children }: ChatProviderType): React.ReactElement
     }
   };
 
-  const selectDialog = async (dialog: Dialogs.Dialog): Promise<void> => {
+  const selectDialog = async (dialog?: Dialogs.Dialog): Promise<void> => {
     setSelectedDialog(dialog);
     if (!dialog) {
       return;
@@ -641,11 +641,11 @@ export const ChatProvider = ({ children }: ChatProviderType): React.ReactElement
     });
   };
 
-  const processOnMessage = (callbackFn: Chat.OnMessageListener) => {
+  const processOnMessage = (callbackFn: Chat.OnMessageListener | null) => {
     onMessageRef.current = callbackFn;
   };
 
-  const processOnMessageError = (callbackFn: Chat.OnMessageErrorListener) => {
+  const processOnMessageError = (callbackFn: Chat.OnMessageErrorListener | null) => {
     onMessageErrorRef.current = callbackFn;
   };
 

src/ChatContext.tsx

@@ -1,4 +1,5 @@
 import ConnectyCube from "connectycube";
+import { PrivacyListAction } from "connectycube/types";
 import { useEffect, useState, useRef } from "react";
 
 export const BLOCK_LIST_LOG_TAG = "[useChat][useBlockList]";
@@ -11,11 +12,6 @@ export type BlockListHook = {
   blockUser: (userId: number) => Promise<void>;
 };
 
-enum PrivacyListAction {
-  ALLOW = "allow",
-  DENY = "deny",
-}
-
 function useBlockList(isConnected: boolean): BlockListHook {
   const [state, setState] = useState<Set<number>>(new Set<number>());
   const isApplied = useRef<boolean>(false);

src/hooks/useBlockList.ts

@@ -1,4 +1,4 @@
-import { Chat, Dialogs, Messages, Users } from "connectycube/dist/types/types";
+import { Chat, Dialogs, Messages, Users } from "connectycube/types";
 import { ReactNode } from "react";
 import { BlockListHook } from "../hooks/useBlockList";
 
@@ -22,7 +22,7 @@ export interface ChatContextType extends BlockListHook {
   getDialogs: (filters?: Dialogs.ListParams) => Promise<Dialogs.Dialog[]>;
   dialogs: Dialogs.Dialog[];
   selectedDialog?: Dialogs.Dialog;
-  selectDialog: (dialog: Dialogs.Dialog) => Promise<void>;
+  selectDialog: (dialog?: Dialogs.Dialog) => Promise<void>;
   getDialogOpponentId: (dialog?: Dialogs.Dialog) => number | undefined;
   unreadMessagesCount: UnreadMessagesCount;
   users: { [userId: number]: Users.User };
@@ -45,8 +45,8 @@ export interface ChatContextType extends BlockListHook {
   lastActivity: { [userId: number]: string };
   lastMessageSentTimeString: (dialog: Dialogs.Dialog) => string;
   messageSentTimeString: (message: Messages.Message) => string;
-  processOnMessage: (fn: Chat.OnMessageListener) => void;
-  processOnMessageError: (fn: Chat.OnMessageErrorListener) => void;
+  processOnMessage: (fn: Chat.OnMessageListener | null) => void;
+  processOnMessageError: (fn: Chat.OnMessageErrorListener | null) => void;
 }
 
 export enum GroupChatEventType {

src/types/index.ts

@@ -10,14 +10,14 @@
     "forceConsistentCasingInFileNames": true,
     "noFallthroughCasesInSwitch": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "react-jsx",
     "declarationDir": "./dist/types",
     "declaration": true,
-    "declarationMap": true,
+    "declarationMap": true
   },
   "include": ["src"]
-}
+}