Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/libs/settings/__tests__/settings-update.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {ChartKitPlugin} from 'src/types';

import type {ChartKitPlugin} from '../../../types';
import {settings} from '../settings';

const resetSettings = () => settings.set({lang: 'en'});
Expand Down
2 changes: 1 addition & 1 deletion src/libs/settings/mergeSettingStrategy.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import isObject from 'lodash/isObject';
import mergeWith from 'lodash/mergeWith';

import {ChartKitPlugin} from 'src/types';
import type {ChartKitPlugin} from '../../types';

// @ts-ignore
export function mergeSettingStrategy(objValue: any, srcValue: any, key: string): any {

Check warning on line 7 in src/libs/settings/mergeSettingStrategy.ts

View workflow job for this annotation

GitHub Actions / Verify Files

Unexpected any. Specify a different type

Check warning on line 7 in src/libs/settings/mergeSettingStrategy.ts

View workflow job for this annotation

GitHub Actions / Verify Files

Unexpected any. Specify a different type

Check warning on line 7 in src/libs/settings/mergeSettingStrategy.ts

View workflow job for this annotation

GitHub Actions / Verify Files

Unexpected any. Specify a different type
if (key === 'plugins') {
const currentPlugins: ChartKitPlugin[] = [...objValue];
const newPlugins: ChartKitPlugin[] = [...srcValue];
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/yagr/types.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type {MinimalValidConfig, RawSerieData, YagrConfig} from '@gravity-ui/yagr';
import type Yagr from '@gravity-ui/yagr';

import {ChartKitProps} from 'src/types';
import type {ChartKitProps} from '../../types';

export type {default as Yagr} from '@gravity-ui/yagr';
export type {YagrReactRef} from '@gravity-ui/yagr/react';
Expand Down
1 change: 0 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"outDir": "build/esm",
"module": "esnext",
"jsx": "react",
"baseUrl": ".",
"importHelpers": true,
"moduleResolution": "bundler",
"resolveJsonModule": true
Expand Down
Loading