MA-16191: fix RouterLink and refactor pre-commit hook

Author: pasha-nikitin-2003

.eslintrc.js

@@ -11,11 +11,18 @@ module.exports = {
       },
     },
   ],
+  settings: {
+    "import/resolver": {
+      "node": {
+        "extensions": [".js", ".jsx", ".ts", ".tsx"]
+      }
+    }
+  },
   rules: {
     'import/named': 'off',
-    'import/no-unresolved': 'off',
     'no-shadow': 'off',
     'guard-for-in': 'off',
+    'import/no-unresolved': ['error', { ignore: ['^[a-z@]'] }],
     '@typescript-eslint/ban-types': 'off',
     '@typescript-eslint/array-type': 'off',
     '@typescript-eslint/prefer-readonly': 'off',

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn lint-staged && yarn run lint:prettier
+yarn lint-staged

.lintstagedrc.json

@@ -1,4 +1,4 @@
 {
-  "*.ts": "eslint",
-  "*.tsx": "eslint"
+  "*.ts": ["eslint", "prettier --check"],
+  "*.tsx": ["eslint", "prettier --check"]
 }

package.json

@@ -20,8 +20,9 @@
   },
   "scripts": {
     "build": "tsc",
-    "lint:js": "eslint src/ --ext ts,tsx --fix",
-    "lint:prettier": "prettier --check .",
+    "eslint:check": "eslint src/ --ext ts,tsx",
+    "eslint:fix": "eslint src/ --ext ts,tsx",
+    "prettier:check": "prettier --check .",
     "prettier:fix": "prettier --write .",
     "prepare": "husky install",
     "prepublishOnly": "yarn build"

src/components/RouterLink.tsx

@@ -1,5 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-expect-error
 import { Link } from '@vkontakte/vkui';
 import { useHref } from '../hooks/useHref';
 import { RelativeRoutingType, To } from '@remix-run/router';
@@ -20,13 +18,11 @@ export interface LinkProps extends Omit<AnchorHTMLAttributes<HTMLAnchorElement>,
 }
 
 export interface RouterLinkProps extends Omit<LinkProps, 'className' | 'style' | 'children'> {
-  children?: ReactNode | ((props: { isActive: boolean; isPending: boolean }) => ReactNode);
+  children?: ReactNode;
   caseSensitive?: boolean;
-  className?: string | ((props: { isActive: boolean; isPending: boolean }) => string | undefined);
+  className?: string;
   end?: boolean;
-  style?:
-    | CSSProperties
-    | ((props: { isActive: boolean; isPending: boolean }) => CSSProperties | undefined);
+  style?: CSSProperties;
 }
 
 const ABSOLUTE_URL_REGEX = /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i;
@@ -83,7 +79,7 @@ export const RouterLink = forwardRef<HTMLAnchorElement, RouterLinkProps>(functio
       {...rest}
       href={absoluteHref || href}
       onClick={isExternal || reloadDocument ? onClick : handleClick}
-      ref={ref}
+      getRootRef={ref}
       target={target}
     ></Link>
   );

src/hooks/useEnableSwipeBack.ts

@@ -1,22 +1,10 @@
 import { useEffect, useRef } from 'react';
 import { BridgeService } from '../services/BridgeService';
-import {
-  parseURLSearchParamsForGetLaunchParams,
-  EGetLaunchParamsResponsePlatforms,
-} from '@vkontakte/vk-bridge';
 
 export function useEnableSwipeBack() {
-  const { vk_platform } = parseURLSearchParamsForGetLaunchParams(window.location.search);
   const consumerId = useRef<string | null>(null);
 
   useEffect(() => {
-    if (
-      vk_platform !== EGetLaunchParamsResponsePlatforms.MOBILE_IPHONE &&
-      vk_platform !== EGetLaunchParamsResponsePlatforms.MOBILE_IPHONE_MESSENGER &&
-      vk_platform !== EGetLaunchParamsResponsePlatforms.MOBILE_IPAD
-    ) {
-      return;
-    }
     consumerId.current = BridgeService.enableNativeSwipeBack();
 
     return () => {

src/page-types/PanelPage.ts

@@ -14,6 +14,7 @@ type AnySubPage = AnyModalPage | AnyTabPage;
 abstract class BasePanelPage<I extends string> implements RepresentsRoutes<PanelRoutePartial>, HasId<I> {
   protected constructor(public id: I, public path: string, protected modals: AnySubPage[]) {
     modals.forEach((modal) => {
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-expect-error
       this[uniqueKey(this, modal.id)] = modal;
     });

src/page-types/RootConfig.ts

@@ -15,6 +15,7 @@ export class RootConfig<T extends string> implements HasId<T>, HasChildren<ViewC
       throw new Error(`Trying to create root ${id} without views. Root must have at least one view.`);
     }
     views.forEach((views) => {
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-expect-error
       this[uniqueKey(this, views.id)] = views;
     });

src/page-types/RoutesConfig.ts

@@ -50,6 +50,7 @@ export class RoutesConfig implements RepresentsRoutes<RoutePartial> {
     const config = new RoutesConfig();
     config.items = routes;
     routes.forEach((route) => {
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-expect-error
       config[uniqueKey(config, route.id)] = route;
     });

src/page-types/TabPage.ts

@@ -10,6 +10,7 @@ interface TabRoutePartial extends CommonRouteObject {
 abstract class BaseTabPage<I extends string> implements RepresentsRoutes<TabRoutePartial>, HasId<I> {
   protected constructor(public id: I, public path: string, protected modals: AnyModalPage[]) {
     modals.forEach((modal) => {
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-expect-error
       this[uniqueKey(this, modal.id)] = modal;
     });