@tramvai/test-react 2.22.0 → 2.24.3

package/README.md

@@ -2,7 +2,7 @@
 
 Set of helpers for testing React-components
 
-Helpers are based on libraries [@testing-library/react](https://github.com/testing-library/react-testing-library) [@testing-library/react-hooks](https://github.com/testing-library/react-hooks-testing-library)
+Helpers are based on libraries [@testing-library/react](https://github.com/testing-library/react-testing-library)
 
 If you are using jest for testing, consider to add a library [@testing-library/jest-dom](https://github.com/testing-library/jest-dom)
 
@@ -74,7 +74,7 @@ describe('test', () => {
 
 ### Test React-hooks
 
-Under the hood the [@testing-library/react-hooks](https://github.com/testing-library/react-hooks-testing-library) is used.
+Under the hood the [@testing-library/react](https://github.com/testing-library/react-testing-library) is used.
 
 ```ts
 /**

package/lib/index.es.js

@@ -1,4 +1,4 @@
-import { render, act, fireEvent } from '@testing-library/react';
+import { render, act, fireEvent, renderHook } from '@testing-library/react';
 export * from '@testing-library/react';
 import { jsx } from 'react/jsx-runtime';
 import { Provider } from '@tramvai/state';
@@ -6,7 +6,6 @@ import { DIContext } from '@tramvai/react';
 import { Provider as Provider$1 } from '@tinkoff/router';
 import { createMockContext, createMockRouter } from '@tramvai/test-mocks';
 import { waitRaf } from '@tramvai/test-jsdom';
-import { renderHook, act as act$1 } from '@testing-library/react-hooks';
 
 const testComponent = (element, { providers, initialState, store, stores, di, context = createMockContext({ initialState, providers, di, store, stores }), currentRoute, currentUrl, router = createMockRouter({ currentRoute, currentUrl }), renderOptions, } = {}) => {
     const Wrapper = ({ children }) => (jsx(Provider, Object.assign({ context: context, serverState: initialState }, { children: jsx(DIContext.Provider, Object.assign({ value: context.di }, { children: jsx(Provider$1, Object.assign({ router: router, serverState: initialState === null || initialState === void 0 ? void 0 : initialState.router }, { children: children }), void 0) }), void 0) }), void 0));
@@ -42,7 +41,7 @@ const testHook = (hookCallback, { providers, initialState, store, stores, di, co
     return {
         result,
         rerender,
-        act: act$1,
+        act,
         context,
         router,
     };

package/lib/index.js

@@ -9,7 +9,6 @@ var react$1 = require('@tramvai/react');
 var router = require('@tinkoff/router');
 var testMocks = require('@tramvai/test-mocks');
 var testJsdom = require('@tramvai/test-jsdom');
-var reactHooks = require('@testing-library/react-hooks');
 
 const testComponent = (element, { providers, initialState, store, stores, di, context = testMocks.createMockContext({ initialState, providers, di, store, stores }), currentRoute, currentUrl, router: router$1 = testMocks.createMockRouter({ currentRoute, currentUrl }), renderOptions, } = {}) => {
     const Wrapper = ({ children }) => (jsxRuntime.jsx(state.Provider, Object.assign({ context: context, serverState: initialState }, { children: jsxRuntime.jsx(react$1.DIContext.Provider, Object.assign({ value: context.di }, { children: jsxRuntime.jsx(router.Provider, Object.assign({ router: router$1, serverState: initialState === null || initialState === void 0 ? void 0 : initialState.router }, { children: children }), void 0) }), void 0) }), void 0));
@@ -36,7 +35,7 @@ const testComponent = (element, { providers, initialState, store, stores, di, co
 const testHook = (hookCallback, { providers, initialState, store, stores, di, context = testMocks.createMockContext({ initialState, providers, di, store, stores }), currentRoute, currentUrl, router: router$1 = testMocks.createMockRouter({ currentRoute, currentUrl }), renderOptions, } = {}) => {
     var _a;
     const Wrapper = (_a = renderOptions === null || renderOptions === void 0 ? void 0 : renderOptions.wrapper) !== null && _a !== void 0 ? _a : (({ children }) => children);
-    const { result, rerender } = reactHooks.renderHook(hookCallback, {
+    const { result, rerender } = react.renderHook(hookCallback, {
         ...renderOptions,
         wrapper: ({ children }) => {
             return (jsxRuntime.jsx(state.Provider, Object.assign({ context: context, serverState: initialState }, { children: jsxRuntime.jsx(react$1.DIContext.Provider, Object.assign({ value: context.di }, { children: jsxRuntime.jsx(router.Provider, Object.assign({ router: router$1, serverState: initialState === null || initialState === void 0 ? void 0 : initialState.router }, { children: jsxRuntime.jsx(Wrapper, { children: children }, void 0) }), void 0) }), void 0) }), void 0));
@@ -45,7 +44,7 @@ const testHook = (hookCallback, { providers, initialState, store, stores, di, co
     return {
         result,
         rerender,
-        act: reactHooks.act,
+        act: react.act,
         context,
         router: router$1,
     };

package/lib/testHook.d.ts

@@ -1,4 +1,4 @@
-import type { RenderHookOptions } from '@testing-library/react-hooks';
+import type { RenderHookOptions } from '@testing-library/react';
 import type { CONTEXT_TOKEN } from '@tramvai/tokens-common';
 import type { AbstractRouter } from '@tinkoff/router';
 import type { createMockDi } from '@tramvai/test-mocks';
@@ -12,9 +12,11 @@ declare type Options = OptionsDi & OptionsContext & OptionsRouter & {
     renderOptions?: RenderHookOptions<any>;
 };
 export declare const testHook: <TProps, TResult>(hookCallback: (props: TProps) => TResult, { providers, initialState, store, stores, di, context, currentRoute, currentUrl, router, renderOptions, }?: Options) => {
-    result: import("@testing-library/react-hooks").RenderResult<TResult>;
+    result: {
+        current: TResult;
+    };
     rerender: (props?: TProps | undefined) => void;
-    act: import("@testing-library/react-hooks").Act;
+    act: typeof import("react-dom/test-utils").act;
     context: import("@tinkoff/dippy").BaseTokenInterface<import("@tramvai/tokens-common").ConsumerContext>;
     router: AbstractRouter;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/test-react",
-  "version": "2.22.0",
+  "version": "2.24.3",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -18,14 +18,13 @@
     "build-for-publish": "true"
   },
   "dependencies": {
-    "@testing-library/react": "^12.1.4",
-    "@testing-library/react-hooks": "^7.0.2",
+    "@testing-library/react": "^13.3.0",
     "@tinkoff/router": "0.2.2",
-    "@tramvai/react": "2.22.0",
-    "@tramvai/state": "2.22.0",
-    "@tramvai/test-jsdom": "2.22.0",
-    "@tramvai/test-mocks": "2.22.0",
-    "@tramvai/tokens-common": "2.22.0",
+    "@tramvai/react": "2.24.3",
+    "@tramvai/state": "2.24.3",
+    "@tramvai/test-jsdom": "2.24.3",
+    "@tramvai/test-mocks": "2.24.3",
+    "@tramvai/tokens-common": "2.24.3",
     "tslib": "^2.0.3"
   },
   "peerDependencies": {