From 5f7b279bfe29a96364eb9fb22e46496732cbe51c Mon Sep 17 00:00:00 2001 From: Pavel Prichodko <14926950+prichodko@users.noreply.github.com> Date: Wed, 18 Jan 2023 16:39:50 +0100 Subject: [PATCH] move Tamagui augmentation to config file --- packages/components/src/global.ts | 11 ----------- packages/components/src/tamagui.config.ts | 7 +++++++ 2 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 packages/components/src/global.ts diff --git a/packages/components/src/global.ts b/packages/components/src/global.ts deleted file mode 100644 index 68d9aaca..00000000 --- a/packages/components/src/global.ts +++ /dev/null @@ -1,11 +0,0 @@ -// eslint-disable-next-line eslint-comments/disable-enable-pair -/* eslint-disable @typescript-eslint/no-empty-interface */ -import { config } from './tamagui.config' - -export type Conf = typeof config - -declare module '@tamagui/core' { - interface TamaguiCustomConfig extends Conf {} -} - -export default config diff --git a/packages/components/src/tamagui.config.ts b/packages/components/src/tamagui.config.ts index 345c6e19..84cc475d 100644 --- a/packages/components/src/tamagui.config.ts +++ b/packages/components/src/tamagui.config.ts @@ -7,6 +7,13 @@ import { animations } from './animations' import { themes } from './themes' import { tokens } from './tokens' +export type Conf = typeof config + +declare module '@tamagui/core' { + // eslint-disable-next-line @typescript-eslint/no-empty-interface + interface TamaguiCustomConfig extends Conf {} +} + const interFont = createInterFont({ size: { 6: 11,