From 40443a3e8b3d82421ebdd9d7ce2ba65e35f9306f Mon Sep 17 00:00:00 2001 From: MGREMY Date: Wed, 8 Jan 2025 18:29:11 +0100 Subject: [PATCH 01/10] chore: fix vercel deploy servless function compiled to commonJS --- commitlint.config.js => commitlint.config.cjs | 0 package.json | 1 + 2 files changed, 1 insertion(+) rename commitlint.config.js => commitlint.config.cjs (100%) diff --git a/commitlint.config.js b/commitlint.config.cjs similarity index 100% rename from commitlint.config.js rename to commitlint.config.cjs diff --git a/package.json b/package.json index dbf05cde..b6475b41 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "url": "git+https://github.com/themesberg/flowbite-angular.git" }, "license": "MIT", + "type": "module", "scripts": { "all:build": "nx run-many --target build --all", "all:lint": "nx run-many --target lint --all", From 4590a39e79be8a21152e8417c8df7528bbf84576 Mon Sep 17 00:00:00 2001 From: MGREMY Date: Mon, 30 Dec 2024 15:22:12 +0100 Subject: [PATCH 02/10] docs: add standard configuration doc section and update indicator style --- apps/docs/docs/customize/standard-configuration/ng-doc.page.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/docs/docs/customize/standard-configuration/ng-doc.page.ts b/apps/docs/docs/customize/standard-configuration/ng-doc.page.ts index baf54c9e..2100bf46 100644 --- a/apps/docs/docs/customize/standard-configuration/ng-doc.page.ts +++ b/apps/docs/docs/customize/standard-configuration/ng-doc.page.ts @@ -5,7 +5,7 @@ import type { NgDocPage } from '@ng-doc/core'; /** * Defining a standardized way to create themes across all components of flowbite-angular. * - * @status:alert NEW + * @status:info NEW */ const StandardConfiguration: NgDocPage = { title: 'Standard configuration', From f050ccb2f508dd07757920ca3b4a961c64db7cc5 Mon Sep 17 00:00:00 2001 From: MGREMY Date: Mon, 30 Dec 2024 17:08:19 +0100 Subject: [PATCH 03/10] docs: update page tags --- apps/docs/docs/components/alert/ng-doc.page.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/docs/docs/components/alert/ng-doc.page.ts b/apps/docs/docs/components/alert/ng-doc.page.ts index 6609b894..527e2dbb 100644 --- a/apps/docs/docs/components/alert/ng-doc.page.ts +++ b/apps/docs/docs/components/alert/ng-doc.page.ts @@ -10,8 +10,6 @@ import type { NgDocPage } from '@ng-doc/core'; /** * Show contextual information to your users using alert elements based on Tailwind CSS - * - * @status:info UPDATE */ const Accordion: NgDocPage = { title: 'Alert', From f70496382d770a395b5146a48bf72cf7ffa843d9 Mon Sep 17 00:00:00 2001 From: MGREMY Date: Tue, 7 Jan 2025 17:38:11 +0100 Subject: [PATCH 04/10] docs: update standard configuration & badges --- apps/docs/docs/components/alert/ng-doc.page.ts | 2 ++ apps/docs/docs/customize/standard-configuration/ng-doc.page.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/docs/docs/components/alert/ng-doc.page.ts b/apps/docs/docs/components/alert/ng-doc.page.ts index 527e2dbb..6609b894 100644 --- a/apps/docs/docs/components/alert/ng-doc.page.ts +++ b/apps/docs/docs/components/alert/ng-doc.page.ts @@ -10,6 +10,8 @@ import type { NgDocPage } from '@ng-doc/core'; /** * Show contextual information to your users using alert elements based on Tailwind CSS + * + * @status:info UPDATE */ const Accordion: NgDocPage = { title: 'Alert', diff --git a/apps/docs/docs/customize/standard-configuration/ng-doc.page.ts b/apps/docs/docs/customize/standard-configuration/ng-doc.page.ts index 2100bf46..baf54c9e 100644 --- a/apps/docs/docs/customize/standard-configuration/ng-doc.page.ts +++ b/apps/docs/docs/customize/standard-configuration/ng-doc.page.ts @@ -5,7 +5,7 @@ import type { NgDocPage } from '@ng-doc/core'; /** * Defining a standardized way to create themes across all components of flowbite-angular. * - * @status:info NEW + * @status:alert NEW */ const StandardConfiguration: NgDocPage = { title: 'Standard configuration', From 71425958668a413081baa060b099c09584d828f2 Mon Sep 17 00:00:00 2001 From: MGREMY Date: Mon, 30 Dec 2024 17:08:19 +0100 Subject: [PATCH 05/10] docs: update page tags --- apps/docs/docs/components/alert/ng-doc.page.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/docs/docs/components/alert/ng-doc.page.ts b/apps/docs/docs/components/alert/ng-doc.page.ts index 6609b894..527e2dbb 100644 --- a/apps/docs/docs/components/alert/ng-doc.page.ts +++ b/apps/docs/docs/components/alert/ng-doc.page.ts @@ -10,8 +10,6 @@ import type { NgDocPage } from '@ng-doc/core'; /** * Show contextual information to your users using alert elements based on Tailwind CSS - * - * @status:info UPDATE */ const Accordion: NgDocPage = { title: 'Alert', From 10e2af497730cef7b669d3314c974931ae8ce019 Mon Sep 17 00:00:00 2001 From: MGREMY Date: Tue, 7 Jan 2025 20:41:14 +0100 Subject: [PATCH 06/10] feat(badge): implement standard configuration --- .../flowbite-angular/badge/badge.component.ts | 17 +- .../badge/badge.theme.service.ts | 12 +- libs/flowbite-angular/badge/badge.theme.ts | 213 +++++++++++++++--- 3 files changed, 211 insertions(+), 31 deletions(-) diff --git a/libs/flowbite-angular/badge/badge.component.ts b/libs/flowbite-angular/badge/badge.component.ts index 375d0cfb..2307c586 100644 --- a/libs/flowbite-angular/badge/badge.component.ts +++ b/libs/flowbite-angular/badge/badge.component.ts @@ -1,7 +1,7 @@ import type { BadgeClass, BadgeColors, BadgeSizes, BadgeTheme } from './badge.theme'; import { BadgeThemeService } from './badge.theme.service'; -import type { DeepPartial } from 'flowbite-angular'; +import type { DeepPartial, StandardThemeInput } from 'flowbite-angular'; import { BaseComponent, booleanToFlowbiteBoolean } from 'flowbite-angular'; import { IconComponent, IconRegistry } from 'flowbite-angular/icon'; import { FlowbiteRouterLinkDirective } from 'flowbite-angular/router-link'; @@ -38,6 +38,9 @@ export const FLOWBITE_BADGE_IS_PILL_DEFAULT_VALUE = new InjectionToken( 'FLOWBITE_BADGE_IS_PILL_DEFAULT_VALUE' ); +export const FLOWBITE_BADGE_STANDARD_THEME_CONFIG_DEFAULT_VALUE = + new InjectionToken('FLOWBITE_BADGE_STANDARD_THEME_CONFIG_DEFAULT_VALUE'); + export const FLOWBITE_BADGE_CUSTOM_STYLE_DEFAULT_VALUE = new InjectionToken< DeepPartial >('FLOWBITE_BADGE_CUSTOM_STYLE_DEFAULT_VALUE'); @@ -71,6 +74,10 @@ export const badgeDefaultValueProvider = makeEnvironmentProviders([ provide: FLOWBITE_BADGE_IS_PILL_DEFAULT_VALUE, useValue: false, }, + { + provide: FLOWBITE_BADGE_STANDARD_THEME_CONFIG_DEFAULT_VALUE, + useValue: { hasDark: true, hasHover: true, hasFocus: false, hasDisabled: false }, + }, { provide: FLOWBITE_BADGE_CUSTOM_STYLE_DEFAULT_VALUE, useValue: {}, @@ -159,6 +166,13 @@ export class BadgeComponent extends BaseComponent { * @default false */ public isPill = model(inject(FLOWBITE_BADGE_IS_PILL_DEFAULT_VALUE)); + /** + * Set the standard theme configuration for this badge + * + * @default + * { hasDark: true, hasHover: true, hasFocus: false, hasDisabled: false } + */ + public standardThemeConfig = model(inject(FLOWBITE_BADGE_STANDARD_THEME_CONFIG_DEFAULT_VALUE)); /** * Set the custom style for this badge */ @@ -186,6 +200,7 @@ export class BadgeComponent extends BaseComponent { isIconOnly: booleanToFlowbiteBoolean(this.isIconOnly()), isPill: booleanToFlowbiteBoolean(this.isPill()), link: this.flowbiteRouterLink?.routerLink.urlTree ?? null, + standardThemeConfig: this.standardThemeConfig(), customStyle: this.customStyle(), }); } diff --git a/libs/flowbite-angular/badge/badge.theme.service.ts b/libs/flowbite-angular/badge/badge.theme.service.ts index 092244a9..752a0a60 100644 --- a/libs/flowbite-angular/badge/badge.theme.service.ts +++ b/libs/flowbite-angular/badge/badge.theme.service.ts @@ -1,7 +1,7 @@ import type { BadgeClass, BadgeProperties, BadgeTheme } from './badge.theme'; import type { FlowbiteThemeService } from 'flowbite-angular'; -import { mergeTheme } from 'flowbite-angular/utils'; +import { fetchStandardTheme, mergeTheme } from 'flowbite-angular/utils'; import { inject, Injectable, InjectionToken } from '@angular/core'; import { twMerge } from 'tailwind-merge'; @@ -30,7 +30,7 @@ export class BadgeThemeService implements FlowbiteThemeService const output: BadgeClass = { rootClass: twMerge( theme.root.base, - theme.root.color[properties.color], + fetchStandardTheme(properties.standardThemeConfig, theme.root.color[properties.color]), theme.root.hasBorder[properties.hasBorder], theme.root.size[properties.size], theme.root.isPill[ @@ -41,7 +41,13 @@ export class BadgeThemeService implements FlowbiteThemeService theme.root.isIconOnly[properties.isIconOnly], theme.root.link[properties.link ? 'enabled' : 'disabled'] ), - closeButtonClass: twMerge(theme.closeButton.base, theme.closeButton.color[properties.color]), + closeButtonClass: twMerge( + theme.closeButton.base, + fetchStandardTheme( + properties.standardThemeConfig, + theme.closeButton.color[properties.color] + ) + ), }; return output; diff --git a/libs/flowbite-angular/badge/badge.theme.ts b/libs/flowbite-angular/badge/badge.theme.ts index bb4babbb..da5f701c 100644 --- a/libs/flowbite-angular/badge/badge.theme.ts +++ b/libs/flowbite-angular/badge/badge.theme.ts @@ -2,9 +2,11 @@ import type { DeepPartial, FlowbiteBoolean, FlowbiteClass, - FlowbiteColors, FlowbiteSizes, + FlowbiteStandardColors, RouterLinkParameter, + StandardThemeConfiguration, + StandardThemeInput, } from 'flowbite-angular'; import { createTheme } from 'flowbite-angular/utils'; @@ -14,10 +16,10 @@ import { createTheme } from 'flowbite-angular/utils'; */ export interface BadgeColors extends Pick< - FlowbiteColors, + FlowbiteStandardColors, 'primary' | 'dark' | 'blue' | 'red' | 'green' | 'yellow' | 'indigo' | 'purple' | 'pink' > { - [key: string]: string; + [key: string]: StandardThemeConfiguration; } /** @@ -38,6 +40,7 @@ export interface BadgeProperties { isIconOnly: keyof FlowbiteBoolean; isPill: keyof FlowbiteBoolean; link: RouterLinkParameter; + standardThemeConfig: StandardThemeInput; customStyle: DeepPartial; } @@ -67,20 +70,96 @@ export const badgeTheme: BadgeTheme = createTheme({ root: { base: 'flex h-fit items-center gap-1 font-semibold', color: { - primary: - 'bg-primary-100 dark:bg-primary-700 text-primary-800 dark:text-primary-300 group-hover:bg-primary-200 dark:group-hover:bg-primary-600 border-primary-300 dark:border-primary-800', - dark: 'bg-gray-100 dark:bg-gray-700 text-gray-800 dark:text-gray-300 group-hover:bg-gray-200 dark:group-hover:bg-gray-600 border-gray-300 dark:border-gray-600', - blue: 'bg-blue-100 dark:bg-blue-200 text-blue-800 dark:text-blue-800 group-hover:bg-blue-200 dark:group-hover:bg-blue-300 border-blue-300 dark:border-blue-800', - red: 'bg-red-100 dark:bg-red-200 text-red-800 dark:text-red-900 group-hover:bg-red-200 dark:group-hover:bg-red-300 border-red-300 dark:border-red-800', - green: - 'bg-green-100 dark:bg-green-200 text-green-800 dark:text-green-900 group-hover:bg-green-200 dark:group-hover:bg-green-300 border-green-300 dark:border-green-800', - yellow: - 'bg-yellow-100 dark:bg-yellow-200 text-yellow-800 dark:text-yellow-900 group-hover:bg-yellow-200 dark:group-hover:bg-yellow-300 border-yellow-300 dark:border-yellow-800', - indigo: - 'bg-indigo-100 dark:bg-indigo-200 text-indigo-800 dark:text-indigo-900 group-hover:bg-indigo-200 dark:group-hover:bg-indigo-300 border-indigo-300 dark:border-indigo-800', - purple: - 'bg-purple-100 dark:bg-purple-200 text-purple-800 dark:text-purple-900 group-hover:bg-purple-200 dark:group-hover:bg-purple-300 border-purple-300 dark:border-purple-800', - pink: 'bg-pink-100 dark:bg-pink-200 text-pink-800 dark:text-pink-900 group-hover:bg-pink-200 dark:group-hover:bg-pink-300 border-pink-300 dark:border-pink-800', + primary: { + base: { + light: 'bg-primary-100 text-primary-800 border-primary-300', + dark: 'dark:bg-primary-700 dark:text-primary-300 dark:border-primary-800', + }, + hover: { + light: 'group-hover:bg-primary-200', + dark: 'dark:group-hover:bg-primary-600', + }, + }, + dark: { + base: { + light: 'bg-gray-100 text-gray-800 border-gray-300', + dark: 'dark:bg-gray-700 dark:text-gray-300 dark:border-gray-600', + }, + hover: { + light: 'group-hover:bg-gray-200', + dark: 'dark:group-hover:bg-gray-600', + }, + }, + blue: { + base: { + light: 'bg-blue-100 text-blue-800 border-blue-300', + dark: 'dark:bg-blue-200 dark:text-blue-800 dark:border-blue-800', + }, + hover: { + light: 'group-hover:bg-blue-200', + dark: 'dark:group-hover:bg-blue-300', + }, + }, + red: { + base: { + light: 'bg-red-100 text-red-800 border-red-300', + dark: 'dark:bg-red-200 dark:text-red-900 dark:border-red-800', + }, + hover: { + light: 'group-hover:bg-red-200', + dark: 'dark:group-hover:bg-red-300', + }, + }, + green: { + base: { + light: 'bg-green-100 text-green-800 border-green-300', + dark: 'dark:bg-green-200 dark:text-green-900 dark:border-green-800', + }, + hover: { + light: 'group-hover:bg-green-200', + dark: 'dark:group-hover:bg-green-300', + }, + }, + yellow: { + base: { + light: 'bg-yellow-100 text-yellow-800 border-yellow-300', + dark: 'dark:bg-yellow-200 dark:text-yellow-900 dark:border-yellow-800', + }, + hover: { + light: 'group-hover:bg-yellow-200', + dark: 'dark:group-hover:bg-yellow-300', + }, + }, + indigo: { + base: { + light: 'bg-indigo-100 text-indigo-800 border-indigo-300', + dark: 'dark:bg-indigo-200 dark:text-indigo-900 dark:border-indigo-800', + }, + hover: { + light: 'group-hover:bg-indigo-200', + dark: 'dark:group-hover:bg-indigo-300', + }, + }, + purple: { + base: { + light: 'bg-purple-100 text-purple-800 border-purple-300', + dark: 'dark:bg-purple-200 dark:text-purple-900 dark:border-purple-800', + }, + hover: { + light: 'group-hover:bg-purple-200', + dark: 'dark:group-hover:bg-purple-300', + }, + }, + pink: { + base: { + light: 'bg-pink-100 text-pink-800 border-pink-300', + dark: 'dark:bg-pink-200 dark:text-pink-900 dark:border-pink-800', + }, + hover: { + light: 'group-hover:bg-pink-200', + dark: 'dark:group-hover:bg-pink-300', + }, + }, }, hasBorder: { enabled: 'border', @@ -106,16 +185,96 @@ export const badgeTheme: BadgeTheme = createTheme({ closeButton: { base: 'ms-1 inline-flex items-center rounded-sm p-1 focus:ring-2', color: { - primary: - 'text-primary-500 dark:text-primary-600 hover:bg-primary-200 dark:hover:bg-primary-300', - dark: 'text-gray-500 dark:text-gray-600 hover:bg-gray-200 dark:hover:bg-gray-300', - blue: 'text-blue-500 dark:text-blue-600 hover:bg-blue-200 dark:hover:bg-blue-300', - red: 'text-red-500 dark:text-red-600 hover:bg-red-200 dark:hover:bg-red-300', - green: 'text-green-500 dark:text-green-600 hover:bg-green-200 dark:hover:bg-green-300', - yellow: 'text-yellow-500 dark:text-yellow-600 hover:bg-yellow-200 dark:hover:bg-yellow-300', - indigo: 'text-indigo-500 dark:text-indigo-600 hover:bg-indigo-200 dark:hover:bg-indigo-300', - purple: 'text-purple-500 dark:text-purple-600 hover:bg-purple-200 dark:hover:bg-purple-300', - pink: 'text-pink-500 dark:text-pink-600 hover:bg-pink-200 dark:hover:bg-pink-300', + primary: { + base: { + light: 'text-primary-500', + dark: 'dark:text-primary-600', + }, + hover: { + light: 'hover:bg-primary-200', + dark: 'dark:hover:bg-primary-300', + }, + }, + dark: { + base: { + light: 'text-gray-500', + dark: 'dark:text-gray-600', + }, + hover: { + light: 'hover:bg-gray-200', + dark: 'dark:hover:bg-gray-300', + }, + }, + blue: { + base: { + light: 'text-blue-500', + dark: 'dark:text-blue-600', + }, + hover: { + light: 'hover:bg-blue-200', + dark: 'dark:hover:bg-blue-300', + }, + }, + red: { + base: { + light: 'text-red-500', + dark: 'dark:text-red-600', + }, + hover: { + light: 'hover:bg-red-200', + dark: 'dark:hover:bg-red-300', + }, + }, + green: { + base: { + light: 'text-green-500', + dark: 'dark:text-green-600', + }, + hover: { + light: 'hover:bg-green-200', + dark: 'dark:hover:bg-green-300', + }, + }, + yellow: { + base: { + light: 'text-yellow-500', + dark: 'dark:text-yellow-600', + }, + hover: { + light: 'hover:bg-yellow-200', + dark: 'dark:hover:bg-yellow-300', + }, + }, + indigo: { + base: { + light: 'text-indigo-500', + dark: 'dark:text-indigo-600', + }, + hover: { + light: 'hover:bg-indigo-200', + dark: 'dark:hover:bg-indigo-300', + }, + }, + purple: { + base: { + light: 'text-purple-500', + dark: 'dark:text-purple-600', + }, + hover: { + light: 'hover:bg-purple-200', + dark: 'dark:hover:bg-purple-300', + }, + }, + pink: { + base: { + light: 'text-pink-500', + dark: 'dark:text-pink-600', + }, + hover: { + light: 'hover:bg-pink-200', + dark: 'dark:hover:bg-pink-300', + }, + }, }, }, }); From 3ad40898441795303df41a77819a771a343a8015 Mon Sep 17 00:00:00 2001 From: MGREMY Date: Tue, 7 Jan 2025 20:44:01 +0100 Subject: [PATCH 07/10] docs(badge): update documentation --- apps/docs/docs/components/badge/index.md | 2 +- apps/docs/docs/components/badge/ng-doc.page.ts | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/docs/docs/components/badge/index.md b/apps/docs/docs/components/badge/index.md index d080999b..0aafbad9 100644 --- a/apps/docs/docs/components/badge/index.md +++ b/apps/docs/docs/components/badge/index.md @@ -4,7 +4,7 @@ keyword: BadgePage {% import "../../shared/configuration-standard.md" as confStd %} -{{ confStd.not_implements() }} +{{ confStd.implements() }} ## Default badge diff --git a/apps/docs/docs/components/badge/ng-doc.page.ts b/apps/docs/docs/components/badge/ng-doc.page.ts index 9db95a7e..a1f963c6 100644 --- a/apps/docs/docs/components/badge/ng-doc.page.ts +++ b/apps/docs/docs/components/badge/ng-doc.page.ts @@ -11,6 +11,8 @@ import type { NgDocPage } from '@ng-doc/core'; /** * Use Tailwind CSS badges as elements to show counts or labels separately or inside other components + * + * @status:info UPDATE */ const badge: NgDocPage = { title: 'Badge', From 7e002912532eecc885869c034186b0f6314a3e00 Mon Sep 17 00:00:00 2001 From: MGREMY Date: Tue, 7 Jan 2025 21:58:52 +0100 Subject: [PATCH 08/10] chore: fix build error and export miss when refacto flowbite.id --- libs/flowbite-angular/badge/index.ts | 4 ++++ libs/flowbite-angular/common/type-definitions/index.ts | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/flowbite-angular/badge/index.ts b/libs/flowbite-angular/badge/index.ts index 74c2f2e0..6d8f03ad 100644 --- a/libs/flowbite-angular/badge/index.ts +++ b/libs/flowbite-angular/badge/index.ts @@ -1,6 +1,10 @@ export { BadgeComponent, FLOWBITE_BADGE_COLOR_DEFAULT_VALUE, + FLOWBITE_BADGE_HAS_BORDER_DEFAULT_VALUE, + FLOWBITE_BADGE_IS_DISMISSABLE_DEFAULT_VALUE, + FLOWBITE_BADGE_ON_DISMISS_DEFAULT_VALUE, + FLOWBITE_BADGE_STANDARD_THEME_CONFIG_DEFAULT_VALUE, FLOWBITE_BADGE_CUSTOM_STYLE_DEFAULT_VALUE, FLOWBITE_BADGE_IS_ICON_ONLY_DEFAULT_VALUE, FLOWBITE_BADGE_IS_PILL_DEFAULT_VALUE, diff --git a/libs/flowbite-angular/common/type-definitions/index.ts b/libs/flowbite-angular/common/type-definitions/index.ts index 25243b02..6fedfdcb 100644 --- a/libs/flowbite-angular/common/type-definitions/index.ts +++ b/libs/flowbite-angular/common/type-definitions/index.ts @@ -15,6 +15,5 @@ export { allFalseStandardThemeInput, allTrueStandardThemeInput, } from './flowbite.standard-theme-input'; -export type { Guid } from './flowbite.id'; -export { generateId } from './flowbite.id'; +export { Guid, generateId } from './flowbite.id'; export * from './colors'; From 0b3058b868f69a827b6109525571e2dab9875ea7 Mon Sep 17 00:00:00 2001 From: MGREMY Date: Wed, 8 Jan 2025 19:05:37 +0100 Subject: [PATCH 09/10] chore: lint project --- apps/docs/docs/getting-started/quickstart/ng-doc.page.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/docs/docs/getting-started/quickstart/ng-doc.page.ts b/apps/docs/docs/getting-started/quickstart/ng-doc.page.ts index ed74ec97..9f4c8166 100644 --- a/apps/docs/docs/getting-started/quickstart/ng-doc.page.ts +++ b/apps/docs/docs/getting-started/quickstart/ng-doc.page.ts @@ -13,4 +13,3 @@ const Quickstart: NgDocPage = { }; export default Quickstart; - From 1b228ac51e08c5fe6a18e79370f0c5c0e68d8e4a Mon Sep 17 00:00:00 2001 From: MGREMY Date: Wed, 8 Jan 2025 19:07:42 +0100 Subject: [PATCH 10/10] chore: fix test files --- apps/docs/jest.config.ts | 2 +- jest.preset.js => jest.preset.cjs | 0 libs/flowbite-angular/jest.config.ts | 2 +- tsconfig.base.json | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) rename jest.preset.js => jest.preset.cjs (100%) diff --git a/apps/docs/jest.config.ts b/apps/docs/jest.config.ts index 618ffad2..d281334a 100644 --- a/apps/docs/jest.config.ts +++ b/apps/docs/jest.config.ts @@ -1,7 +1,7 @@ /* eslint-disable */ export default { displayName: 'docs', - preset: '../../jest.preset.js', + preset: '../../jest.preset.cjs', setupFilesAfterEnv: ['/src/test-setup.ts'], globals: {}, coverageDirectory: '../../coverage/apps/docs', diff --git a/jest.preset.js b/jest.preset.cjs similarity index 100% rename from jest.preset.js rename to jest.preset.cjs diff --git a/libs/flowbite-angular/jest.config.ts b/libs/flowbite-angular/jest.config.ts index 0aacaea2..7ab4de6d 100644 --- a/libs/flowbite-angular/jest.config.ts +++ b/libs/flowbite-angular/jest.config.ts @@ -1,7 +1,7 @@ /* eslint-disable */ export default { displayName: 'flowbite-angular', - preset: '../../jest.preset.js', + preset: '../../jest.preset.cjs', setupFilesAfterEnv: ['/test-setup.ts'], globals: {}, coverageDirectory: '../../coverage/libs/flowbite-angular', diff --git a/tsconfig.base.json b/tsconfig.base.json index 077a38e6..e2306f3e 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -44,4 +44,3 @@ }, "exclude": ["node_modules", "tmp"] } -