From f4b4416ea52d564bc2dbe543a82084ed98843ccc Mon Sep 17 00:00:00 2001 From: Markus Hatvan Date: Fri, 30 Jul 2021 10:54:54 +0200 Subject: chore: migrate from tslint to @typescript-eslint (#1706) - update .eslintrc to work for .js and .ts - update devDependencies - lint properly both root /src and nested /packages - update webhint recommended setting for tsconfig.json to shrink output - Manage all eslint rules from the repo root - escape single quotes in scripts to please windows build Co-authored-by: Vijay A --- packages/theme/src/index.ts | 12 +++++++----- packages/theme/src/themes/IStyleTypes.ts | 1 - packages/theme/src/themes/dark/index.ts | 30 +++++++++++++++++++++++------- packages/theme/src/themes/default/index.ts | 14 +++++++++++--- packages/theme/tslint.json | 3 --- 5 files changed, 41 insertions(+), 19 deletions(-) delete mode 100644 packages/theme/tslint.json (limited to 'packages/theme') diff --git a/packages/theme/src/index.ts b/packages/theme/src/index.ts index 94df5afd1..5ba225e51 100644 --- a/packages/theme/src/index.ts +++ b/packages/theme/src/index.ts @@ -9,11 +9,13 @@ export enum ThemeType { export const DEFAULT_ACCENT_COLOR = themeBrandPrimary; -export function theme(themeId: ThemeType, - brandColor: string = DEFAULT_ACCENT_COLOR) { - return themeId === ThemeType.dark ? - makeDarkThemeConfig(brandColor) : - makeDefaultThemeConfig(brandColor); +export function theme( + themeId: ThemeType, + brandColor: string = DEFAULT_ACCENT_COLOR, +) { + return themeId === ThemeType.dark + ? makeDarkThemeConfig(brandColor) + : makeDefaultThemeConfig(brandColor); } const defaultThemeConfigWithDefaultAccentColor = diff --git a/packages/theme/src/themes/IStyleTypes.ts b/packages/theme/src/themes/IStyleTypes.ts index df5b51c1d..cf8bdea33 100644 --- a/packages/theme/src/themes/IStyleTypes.ts +++ b/packages/theme/src/themes/IStyleTypes.ts @@ -1,4 +1,3 @@ - export default interface IStyleTypes { [index: string]: { accent: string; diff --git a/packages/theme/src/themes/dark/index.ts b/packages/theme/src/themes/dark/index.ts index c8ad78829..7d7bab399 100644 --- a/packages/theme/src/themes/dark/index.ts +++ b/packages/theme/src/themes/dark/index.ts @@ -18,7 +18,9 @@ export default (brandPrimary: string) => { const inputColor = legacyStyles.darkThemeGrayLightest; const inputBackground = legacyStyles.themeGrayDark; const inputBorder = `1px solid ${legacyStyles.darkThemeGrayLight}`; - const inputPrefixColor = color(legacyStyles.darkThemeGrayLighter).lighten(0.3).hex(); + const inputPrefixColor = color(legacyStyles.darkThemeGrayLighter) + .lighten(0.3) + .hex(); const buttonSecondaryTextColor = legacyStyles.darkThemeTextColor; const selectColor = inputColor; const drawerBg = color(colorBackground).lighten(0.3).hex(); @@ -47,7 +49,10 @@ export default (brandPrimary: string) => { // Loader colorFullscreenLoaderSpinner: '#FFF', - colorWebviewLoaderBackground: color(legacyStyles.darkThemeGrayDarkest).alpha(0.5).rgb().string(), + colorWebviewLoaderBackground: color(legacyStyles.darkThemeGrayDarkest) + .alpha(0.5) + .rgb() + .string(), // Input labelColor: legacyStyles.darkThemeTextColor, @@ -58,8 +63,12 @@ export default (brandPrimary: string) => { inputPrefixBackground: legacyStyles.darkThemeGray, inputDisabledOpacity: 0.5, inputScorePasswordBackground: legacyStyles.darkThemeGrayDark, - inputModifierColor: color(legacyStyles.darkThemeGrayLighter).lighten(0.3).hex(), - inputPlaceholderColor: color(legacyStyles.darkThemeGrayLighter).darken(0.1).hex(), + inputModifierColor: color(legacyStyles.darkThemeGrayLighter) + .lighten(0.3) + .hex(), + inputPlaceholderColor: color(legacyStyles.darkThemeGrayLighter) + .darken(0.1) + .hex(), // Toggle toggleBackground: legacyStyles.darkThemeGray, @@ -91,13 +100,20 @@ export default (brandPrimary: string) => { selectToggleColor: inputPrefixColor, selectPopupBackground: legacyStyles.darkThemeGrayLight, selectOptionColor: '#FFF', - selectOptionBorder: `1px solid ${color(legacyStyles.darkThemeGrayLight).darken(0.2).hex()}`, - selectOptionItemHover: color(legacyStyles.darkThemeGrayLight).darken(0.2).hex(), + selectOptionBorder: `1px solid ${color(legacyStyles.darkThemeGrayLight) + .darken(0.2) + .hex()}`, + selectOptionItemHover: color(legacyStyles.darkThemeGrayLight) + .darken(0.2) + .hex(), selectOptionItemHoverColor: selectColor, selectSearchColor: inputBackground, // Modal - colorModalOverlayBackground: color(legacyStyles.darkThemeBlack).alpha(0.9).rgb().string(), + colorModalOverlayBackground: color(legacyStyles.darkThemeBlack) + .alpha(0.9) + .rgb() + .string(), colorModalBackground: legacyStyles.darkThemeGrayDark, // Services diff --git a/packages/theme/src/themes/default/index.ts b/packages/theme/src/themes/default/index.ts index b8f3e3201..21017bbe0 100644 --- a/packages/theme/src/themes/default/index.ts +++ b/packages/theme/src/themes/default/index.ts @@ -82,7 +82,10 @@ export default (brandPrimary: string) => { colorText, - defaultContentBorder: color(legacyStyles.themeGrayLighter).darken(0.1).rgb().string(), + defaultContentBorder: color(legacyStyles.themeGrayLighter) + .darken(0.1) + .rgb() + .string(), // Subscription Container Component colorSubscriptionContainerBackground: 'none', @@ -94,7 +97,10 @@ export default (brandPrimary: string) => { // Loader colorAppLoaderSpinner: '#FFF', colorFullscreenLoaderSpinner: legacyStyles.themeGrayDark, - colorWebviewLoaderBackground: color(legacyStyles.themeGrayLighter).alpha(0.8).rgb().string(), + colorWebviewLoaderBackground: color(legacyStyles.themeGrayLighter) + .alpha(0.8) + .rgb() + .string(), // Input labelColor: legacyStyles.themeGrayLight, @@ -103,7 +109,9 @@ export default (brandPrimary: string) => { inputBackground, inputBorder, inputModifierColor: legacyStyles.themeGrayLight, - inputPlaceholderColor: color(legacyStyles.themeGrayLight).lighten(0.3).hex(), + inputPlaceholderColor: color(legacyStyles.themeGrayLight) + .lighten(0.3) + .hex(), inputPrefixColor, inputPrefixBackground: legacyStyles.themeGrayLighter, inputDisabledOpacity, diff --git a/packages/theme/tslint.json b/packages/theme/tslint.json deleted file mode 100644 index 0946f2096..000000000 --- a/packages/theme/tslint.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../../tslint.json" -} -- cgit v1.2.3-54-g00ecf