From 03a8ddaabb987d7d91607b7b24983fd120449ce1 Mon Sep 17 00:00:00 2001 From: Borai van Uden Date: Wed, 8 Nov 2023 11:50:41 +0100 Subject: [PATCH 1/7] feat: removed BaseProps --- components/Alert/package.json | 1 - components/Alert/src/index.tsx | 11 ++- components/BaseDataDisplayProps/package.json | 4 +- components/BaseDataDisplayProps/src/index.tsx | 39 +++++++++-- components/BaseProps/src/index.tsx | 66 ------------------ components/BaseProps/tsconfig.json | 11 --- components/Breadcrumb/src/index.tsx | 3 +- components/Button/package.json | 3 - components/Divider/package.json | 5 +- components/Divider/src/index.tsx | 2 +- components/DotIndicator/package.json | 3 - components/DotIndicator/src/index.tsx | 15 ++++- components/Footer/package.json | 3 - components/Footer/src/index.tsx | 8 +-- components/FormGroup/src/index.tsx | 10 +-- components/Header/package.json | 1 - components/Link/package.json | 1 - components/Link/src/index.tsx | 34 +++++++++- components/Menu/package.json | 1 - components/Menu/src/MenuButton.tsx | 15 ++++- components/Menu/src/index.tsx | 19 +++++- components/ProcessSteps/package.json | 5 +- components/ResponsiveContent/package.json | 6 +- components/ResponsiveContent/src/index.tsx | 14 +++- package.json | 1 - packages/components-react/package.json | 1 - packages/components-react/src/index.tsx | 1 - pnpm-lock.yaml | 67 +++---------------- 28 files changed, 154 insertions(+), 196 deletions(-) delete mode 100644 components/BaseProps/src/index.tsx delete mode 100644 components/BaseProps/tsconfig.json diff --git a/components/Alert/package.json b/components/Alert/package.json index b9c8bf441e..8dd1657e6d 100644 --- a/components/Alert/package.json +++ b/components/Alert/package.json @@ -29,7 +29,6 @@ "clean": "rimraf dist tsconfig.tsbuildinfo" }, "dependencies": { - "@gemeente-denhaag/baseprops": "workspace:*", "@gemeente-denhaag/button": "workspace:*", "@gemeente-denhaag/iconbutton": "workspace:*", "@gemeente-denhaag/icons": "workspace:*", diff --git a/components/Alert/src/index.tsx b/components/Alert/src/index.tsx index 8ba7a58a25..9559906958 100644 --- a/components/Alert/src/index.tsx +++ b/components/Alert/src/index.tsx @@ -1,5 +1,4 @@ import React from 'react'; -import BaseProps from '@gemeente-denhaag/baseprops'; import Button from '@gemeente-denhaag/button'; import { Heading4, Paragraph } from '@gemeente-denhaag/typography'; import { AlertTriangleIcon, CheckCircleIcon, CircleInformationIcon, CloseIcon } from '@gemeente-denhaag/icons'; @@ -8,7 +7,15 @@ import IconButton from '@gemeente-denhaag/iconbutton'; import './index.scss'; import clsx from 'clsx'; -export interface AlertProps extends Omit { +export interface AlertProps { + /** + * The id attribute is used to specify a unique id for an HTML element. + */ + id?: string; + /** + * Extend the styles of the component by adding new classes. + */ + className?: string; /** * The title of the alert. */ diff --git a/components/BaseDataDisplayProps/package.json b/components/BaseDataDisplayProps/package.json index 98cc848bb8..e7d4d70361 100644 --- a/components/BaseDataDisplayProps/package.json +++ b/components/BaseDataDisplayProps/package.json @@ -27,9 +27,7 @@ "build": "rollup -c ../../rollup.config.mjs", "clean": "rimraf dist tsconfig.tsbuildinfo" }, - "dependencies": { - "@gemeente-denhaag/baseprops": "workspace:*" - }, + "dependencies": {}, "peerDependencies": { "react": "^17.0.0 || ^18.0.0" }, diff --git a/components/BaseDataDisplayProps/src/index.tsx b/components/BaseDataDisplayProps/src/index.tsx index e0bc208c98..1b87ca85f4 100644 --- a/components/BaseDataDisplayProps/src/index.tsx +++ b/components/BaseDataDisplayProps/src/index.tsx @@ -1,7 +1,30 @@ import React from 'react'; -import BaseProps, { BaseChildrenProps, BaseClassesProps } from '@gemeente-denhaag/baseprops'; -export default interface BaseDataDisplayProps extends BaseProps { +export default interface BaseDataDisplayProps { + /** + * The contents of the component. + */ + children?: React.ReactNode; + + /** + * Override or extend the styles applied to the component. + */ + classes?: Record; + + /** + * The tab-index applied to the root element of the component. + */ + tabIndex?: number; + + /** + * The id attribute is used to specify a unique id for an HTML element. + */ + id?: string; + + /** + * Extend the styles of the component by adding new classes. + */ + className?: string; /** * The component used for the root node. * Either a string to use a HTML element or a component. @@ -10,7 +33,11 @@ export default interface BaseDataDisplayProps extends BaseProps { component?: React.ElementType; } -export interface BaseDataDisplayChildrenProps extends BaseChildrenProps { +export interface BaseDataDisplayChildrenProps { + /** + * The contents of the component. + */ + children?: React.ReactNode; /** * The component used for the root node. * Either a string to use a HTML element or a component. @@ -19,7 +46,11 @@ export interface BaseDataDisplayChildrenProps extends BaseChildrenProps { component?: React.ElementType; } -export interface BaseDataDisplayClassesProps extends BaseClassesProps { +export interface BaseDataDisplayClassesProps { + /** + * Override or extend the styles applied to the component. + */ + classes?: Record; /** * The component used for the root node. * Either a string to use a HTML element or a component. diff --git a/components/BaseProps/src/index.tsx b/components/BaseProps/src/index.tsx deleted file mode 100644 index 484fba7668..0000000000 --- a/components/BaseProps/src/index.tsx +++ /dev/null @@ -1,66 +0,0 @@ -import React from 'react'; - -/** - * An interface which supplies the most standard properties of each component. - */ -export default interface BaseProps { - /** - * The contents of the component. - */ - children?: React.ReactNode; - - /** - * Override or extend the styles applied to the component. - */ - classes?: Record; - - /** - * The tab-index applied to the root element of the component. - */ - tabIndex?: number; - - /** - * The id attribute is used to specify a unique id for an HTML element. - */ - id?: string; - - /** - * Extend the styles of the component by adding new classes. - */ - className?: string; -} - -/** - * An interface which supplies only the 'children' property. - */ -export interface BaseChildrenProps { - /** - * The contents of the component. - */ - children?: React.ReactNode; -} - -/** - * An interface which supplies only the 'classes' property. - */ -export interface BaseClassesProps { - /** - * Override or extend the styles applied to the component. - */ - classes?: Record; -} - -type OverrideProps = M & Omit, keyof M>; - -export interface OverridableComponent { - ( - props: { - /** - * The component used for the root node. - * Either a string to use a HTML element or a component. - */ - component: C; - } & OverrideProps, - ): JSX.Element; - (props: BaseProps & M): JSX.Element; -} diff --git a/components/BaseProps/tsconfig.json b/components/BaseProps/tsconfig.json deleted file mode 100644 index 1990c90373..0000000000 --- a/components/BaseProps/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.build.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "dist", - "composite": true - }, - "include": ["src/**/*"], - "exclude": ["dist", "src/**/*.stories.tsx"], - "references": [] -} diff --git a/components/Breadcrumb/src/index.tsx b/components/Breadcrumb/src/index.tsx index 42308ab5ed..d4e7847bed 100644 --- a/components/Breadcrumb/src/index.tsx +++ b/components/Breadcrumb/src/index.tsx @@ -1,5 +1,4 @@ import React from 'react'; -import BaseProps from '@gemeente-denhaag/baseprops'; import ResponsiveContent from '@gemeente-denhaag/responsive-content'; import { ChevronRightIcon, HouseIcon } from '@gemeente-denhaag/icons'; import { CustomLink } from '@gemeente-denhaag/link'; @@ -16,7 +15,7 @@ export interface BreadcrumbItemData { href?: string; } -export interface BreadcrumbProps extends Omit { +export interface BreadcrumbProps { /** * The navigation path array of JSON object, which includes a label and url. */ diff --git a/components/Button/package.json b/components/Button/package.json index 501d3590c7..25b7a01426 100644 --- a/components/Button/package.json +++ b/components/Button/package.json @@ -29,9 +29,6 @@ }, "bugs": "https://github.com/nl-design-system/denhaag/issues", "dependencies": { - "@gemeente-denhaag/baseprops": "workspace:*" - }, - "devDependencies": { "@gemeente-denhaag/icons": "workspace:*" }, "peerDependencies": { diff --git a/components/Divider/package.json b/components/Divider/package.json index 8ad4257544..b2111da178 100644 --- a/components/Divider/package.json +++ b/components/Divider/package.json @@ -30,13 +30,10 @@ }, "dependencies": { "@gemeente-denhaag/basedatadisplayprops": "workspace:*", - "@gemeente-denhaag/baseprops": "workspace:*" + "@gemeente-denhaag/icons": "workspace:*" }, "peerDependencies": { "react": "^17.0.0 || ^18.0.0" }, - "devDependencies": { - "@gemeente-denhaag/icons": "workspace:*" - }, "gitHead": "dcf72a9b79266c1ebede35aff4a02dd9121a980f" } diff --git a/components/Divider/src/index.tsx b/components/Divider/src/index.tsx index f0f771af5b..36ccae38eb 100644 --- a/components/Divider/src/index.tsx +++ b/components/Divider/src/index.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import './index.scss'; import clsx from 'clsx'; +import './index.scss'; export interface DividerProps extends React.HTMLAttributes { /** diff --git a/components/DotIndicator/package.json b/components/DotIndicator/package.json index d57f84a46a..199a84e8d6 100644 --- a/components/DotIndicator/package.json +++ b/components/DotIndicator/package.json @@ -29,9 +29,6 @@ "clean": "rimraf dist tsconfig.tsbuildinfo" }, "dependencies": { - "@gemeente-denhaag/baseprops": "workspace:*" - }, - "devDependencies": { "@gemeente-denhaag/button": "workspace:*" }, "peerDependencies": { diff --git a/components/DotIndicator/src/index.tsx b/components/DotIndicator/src/index.tsx index 471970adb3..f1e39b8250 100644 --- a/components/DotIndicator/src/index.tsx +++ b/components/DotIndicator/src/index.tsx @@ -1,9 +1,20 @@ import React from 'react'; import './index.scss'; import clsx from 'clsx'; -import BaseProps from '@gemeente-denhaag/baseprops'; -export interface DotIndicatorProps extends Omit { +export interface DotIndicatorProps { + /** + * The id attribute is used to specify a unique id for an HTML element. + */ + id?: string; + /** + * The contents of the component. + */ + children?: React.ReactNode; + /** + * Extend the styles of the component by adding new classes. + */ + className?: string; /** * The shape which the dot indicator has to overlap. */ diff --git a/components/Footer/package.json b/components/Footer/package.json index 9a313ec69f..b290b68e46 100644 --- a/components/Footer/package.json +++ b/components/Footer/package.json @@ -32,8 +32,5 @@ "@gemeente-denhaag/responsive-content": "workspace:*", "@utrecht/component-library-css": "1.0.0-alpha.602", "@utrecht/component-library-react": "1.0.0-alpha.411" - }, - "devDependencies": { - "@gemeente-denhaag/baseprops": "0.2.3-alpha.355" } } diff --git a/components/Footer/src/index.tsx b/components/Footer/src/index.tsx index 66f77232dc..36a26db3cd 100644 --- a/components/Footer/src/index.tsx +++ b/components/Footer/src/index.tsx @@ -1,5 +1,4 @@ import React from 'react'; -import BaseProps from '@gemeente-denhaag/baseprops'; import { ButtonLink } from '@utrecht/component-library-react'; import ResponsiveContent from '@gemeente-denhaag/responsive-content'; import clsx from 'clsx'; @@ -10,7 +9,7 @@ export interface FooterListItemData { href: string; } -export interface FooterLegalProps extends Omit { +export interface FooterLegalProps { legalData?: Array; copyrightLabel?: string; } @@ -40,13 +39,14 @@ export interface ContactData { href?: string; } -export interface FooterContactProps extends Omit { +export interface FooterContactProps { socialData?: FooterSocialData; newsletterData?: NewsLetterData; contactData?: ContactData; } -export interface FooterProps extends Omit { +export interface FooterProps { + className?: string; legalData?: Array; copyrightLabel?: string; socialData?: FooterSocialData; diff --git a/components/FormGroup/src/index.tsx b/components/FormGroup/src/index.tsx index 3242f7e013..abf067bbee 100644 --- a/components/FormGroup/src/index.tsx +++ b/components/FormGroup/src/index.tsx @@ -1,11 +1,14 @@ import React from 'react'; import clsx from 'clsx'; -import BaseProps from '@gemeente-denhaag/baseprops'; import { Heading5, Paragraph } from '@gemeente-denhaag/typography'; import './index.scss'; -export interface FormGroupProps extends BaseProps { +export interface FormGroupProps { + /** + * The contents of the component. + */ + children?: React.ReactNode; /** * The formgroup label shown at the top */ @@ -40,7 +43,4 @@ export const FormGroup: React.FC = (props: FormGroupProps) => { ); }; -/** - * Default export for FormGroup - */ export default FormGroup; diff --git a/components/Header/package.json b/components/Header/package.json index e26ff4c7c6..0d9ae8502e 100644 --- a/components/Header/package.json +++ b/components/Header/package.json @@ -29,7 +29,6 @@ "clean": "rimraf dist tsconfig.tsbuildinfo" }, "dependencies": { - "@gemeente-denhaag/baseprops": "workspace:*", "@gemeente-denhaag/breadcrumb": "workspace:*", "@gemeente-denhaag/button": "workspace:*", "@gemeente-denhaag/header-logo": "workspace:*", diff --git a/components/Link/package.json b/components/Link/package.json index ffd099498a..755fb8fa01 100644 --- a/components/Link/package.json +++ b/components/Link/package.json @@ -29,7 +29,6 @@ "clean": "rimraf dist tsconfig.tsbuildinfo" }, "dependencies": { - "@gemeente-denhaag/baseprops": "workspace:*", "@gemeente-denhaag/icons": "workspace:*" }, "peerDependencies": { diff --git a/components/Link/src/index.tsx b/components/Link/src/index.tsx index 599bbe5d1a..81caaafcad 100644 --- a/components/Link/src/index.tsx +++ b/components/Link/src/index.tsx @@ -1,11 +1,41 @@ import React from 'react'; -import BaseProps, { OverridableComponent } from '@gemeente-denhaag/baseprops'; import { SvgIconProps } from '@gemeente-denhaag/icons'; import clsx from 'clsx'; import './index.scss'; -export interface LinkProps extends Omit { +type OverrideProps = M & Omit, keyof M>; + +interface OverridableComponent { + ( + props: { + /** + * The component used for the root node. + * Either a string to use a HTML element or a component. + */ + component: C; + } & OverrideProps, + ): JSX.Element; + (props: M): JSX.Element; +} + +export interface LinkProps { + /** + * The id attribute is used to specify a unique id for an HTML element. + */ + id?: string; + /** + * The contents of the component. + */ + children?: React.ReactNode; + /** + * Extend the styles of the component by adding new classes. + */ + className?: string; + /** + * The tab-index applied to the root element of the component. + */ + tabIndex?: number; /** * The URL that the hyperlink points to. Links are not restricted to HTTP-based * URLs — they can use any URL scheme supported by browsers. diff --git a/components/Menu/package.json b/components/Menu/package.json index 8224b9693d..6995770223 100644 --- a/components/Menu/package.json +++ b/components/Menu/package.json @@ -29,7 +29,6 @@ "clean": "rimraf dist tsconfig.tsbuildinfo" }, "dependencies": { - "@gemeente-denhaag/baseprops": "workspace:*", "@gemeente-denhaag/button": "workspace:*", "@gemeente-denhaag/icons": "workspace:*", "@gemeente-denhaag/language-switcher": "workspace:*", diff --git a/components/Menu/src/MenuButton.tsx b/components/Menu/src/MenuButton.tsx index 5b990a0fa8..bbefc314c5 100644 --- a/components/Menu/src/MenuButton.tsx +++ b/components/Menu/src/MenuButton.tsx @@ -1,5 +1,4 @@ import React, { ButtonHTMLAttributes } from 'react'; -import BaseProps from '@gemeente-denhaag/baseprops'; import { ChevronDownIcon } from '@gemeente-denhaag/icons'; import clsx from 'clsx'; @@ -8,7 +7,19 @@ import './index.scss'; /** * The properties of the normal variant of the Menu Button */ -export interface MenuButtonProps extends Omit { +export interface MenuButtonProps { + /** + * The id attribute is used to specify a unique id for an HTML element. + */ + id?: string; + /** + * The contents of the component. + */ + children?: React.ReactNode; + /** + * Extend the styles of the component by adding new classes. + */ + className?: string; /** * If the element is active or not. You an use this property to mark the menu * item of the current active page. diff --git a/components/Menu/src/index.tsx b/components/Menu/src/index.tsx index a7aca38cb4..0a55dd6615 100644 --- a/components/Menu/src/index.tsx +++ b/components/Menu/src/index.tsx @@ -1,9 +1,23 @@ import React from 'react'; -import BaseProps from '@gemeente-denhaag/baseprops'; import clsx from 'clsx'; import './_menu.scss'; -export const Menu: React.FC = (props: Omit) => { +interface Props { + /** + * The id attribute is used to specify a unique id for an HTML element. + */ + id?: string; + /** + * The contents of the component. + */ + children?: React.ReactNode; + /** + * Extend the styles of the component by adding new classes. + */ + className?: string; +} + +export const Menu = (props: Props) => { const rootClassNames = clsx('denhaag-menu', props.className); return (
@@ -15,7 +29,6 @@ export const Menu: React.FC = (props: Omit) => export default Menu; export * from './MenuButton'; export * from './mobile/MobileMenu'; - export * from './mobile/MobileMenuList'; export * from './mobile/MobileMenuListItem'; export * from './mobile/MobileSubMenu'; diff --git a/components/ProcessSteps/package.json b/components/ProcessSteps/package.json index 64eaa00635..92f51eb646 100644 --- a/components/ProcessSteps/package.json +++ b/components/ProcessSteps/package.json @@ -29,15 +29,12 @@ "clean": "rimraf dist tsconfig.tsbuildinfo" }, "dependencies": { - "@gemeente-denhaag/baseprops": "workspace:*", + "@gemeente-denhaag/button": "workspace:*", "@gemeente-denhaag/icons": "workspace:*", "@gemeente-denhaag/step-marker": "workspace:*", "@gemeente-denhaag/typography": "workspace:*" }, "peerDependencies": { "react": "^17.0.0 || ^18.0.0" - }, - "devDependencies": { - "@gemeente-denhaag/button": "workspace:*" } } diff --git a/components/ResponsiveContent/package.json b/components/ResponsiveContent/package.json index 91dd460618..39d8914694 100644 --- a/components/ResponsiveContent/package.json +++ b/components/ResponsiveContent/package.json @@ -24,11 +24,9 @@ "files": [ "dist" ], - "dependencies": { - "@gemeente-denhaag/baseprops": "workspace:*" - }, "scripts": { "build": "rollup -c ../../rollup.config.mjs", "clean": "rimraf dist tsconfig.tsbuildinfo" - } + }, + "dependencies": {} } diff --git a/components/ResponsiveContent/src/index.tsx b/components/ResponsiveContent/src/index.tsx index 74be249f48..db85453a84 100644 --- a/components/ResponsiveContent/src/index.tsx +++ b/components/ResponsiveContent/src/index.tsx @@ -1,11 +1,19 @@ import React from 'react'; -import BaseProps from '@gemeente-denhaag/baseprops'; import clsx from 'clsx'; import './index.scss'; -export interface ResponsiveContentProps extends Omit {} +export interface ResponsiveContentProps { + /** + * The contents of the component. + */ + children?: React.ReactNode; + /** + * Extend the styles of the component by adding new classes. + */ + className?: string; +} -export const ResponsiveContent: React.FC = (props: ResponsiveContentProps) => { +export const ResponsiveContent = (props: ResponsiveContentProps) => { const classNames = clsx('denhaag-responsive-content', props.className); return
{props.children}
; }; diff --git a/package.json b/package.json index 8a023c2856..2fb3fed490 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,6 @@ "@etchteam/storybook-addon-status": "4.2.4", "@gemeente-denhaag/alert": "workspace:*", "@gemeente-denhaag/badge-counter": "workspace:*", - "@gemeente-denhaag/baseprops": "workspace:*", "@gemeente-denhaag/button": "workspace:*", "@gemeente-denhaag/card": "workspace:*", "@gemeente-denhaag/checkbox": "workspace:*", diff --git a/packages/components-react/package.json b/packages/components-react/package.json index 59c90bc8fe..faf96ad4bd 100644 --- a/packages/components-react/package.json +++ b/packages/components-react/package.json @@ -31,7 +31,6 @@ "@gemeente-denhaag/action": "workspace:*", "@gemeente-denhaag/alert": "workspace:*", "@gemeente-denhaag/badge-counter": "workspace:*", - "@gemeente-denhaag/baseprops": "workspace:*", "@gemeente-denhaag/button": "workspace:*", "@gemeente-denhaag/card": "workspace:*", "@gemeente-denhaag/checkbox": "workspace:*", diff --git a/packages/components-react/src/index.tsx b/packages/components-react/src/index.tsx index 98a58e037f..450218f92b 100644 --- a/packages/components-react/src/index.tsx +++ b/packages/components-react/src/index.tsx @@ -1,7 +1,6 @@ export * from '@gemeente-denhaag/action'; export * from '@gemeente-denhaag/alert'; export * from '@gemeente-denhaag/badge-counter'; -export * from '@gemeente-denhaag/baseprops'; export * from '@gemeente-denhaag/button'; export * from '@gemeente-denhaag/card'; export * from '@gemeente-denhaag/checkbox'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index aa9b4bbab0..e4cbb6e153 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -41,9 +41,6 @@ importers: '@gemeente-denhaag/badge-counter': specifier: workspace:* version: link:components/BadgeCounter - '@gemeente-denhaag/baseprops': - specifier: workspace:* - version: link:components/BaseProps '@gemeente-denhaag/button': specifier: workspace:* version: link:components/Button @@ -352,9 +349,6 @@ importers: components/Alert: dependencies: - '@gemeente-denhaag/baseprops': - specifier: workspace:* - version: link:../BaseProps '@gemeente-denhaag/button': specifier: workspace:* version: link:../Button @@ -394,9 +388,6 @@ importers: components/BaseDataDisplayProps: dependencies: - '@gemeente-denhaag/baseprops': - specifier: workspace:* - version: link:../BaseProps react: specifier: ^17.0.0 || ^18.0.0 version: 17.0.2 @@ -430,16 +421,12 @@ importers: components/Button: dependencies: - '@gemeente-denhaag/baseprops': + '@gemeente-denhaag/icons': specifier: workspace:* - version: link:../BaseProps + version: link:../Icons react: specifier: ^17.0.0 || ^18.0.0 version: 17.0.2 - devDependencies: - '@gemeente-denhaag/icons': - specifier: workspace:* - version: link:../Icons components/ButtonGroup: {} @@ -528,29 +515,21 @@ importers: '@gemeente-denhaag/basedatadisplayprops': specifier: workspace:* version: link:../BaseDataDisplayProps - '@gemeente-denhaag/baseprops': + '@gemeente-denhaag/icons': specifier: workspace:* - version: link:../BaseProps + version: link:../Icons react: specifier: ^17.0.0 || ^18.0.0 version: 17.0.2 - devDependencies: - '@gemeente-denhaag/icons': - specifier: workspace:* - version: link:../Icons components/DotIndicator: dependencies: - '@gemeente-denhaag/baseprops': + '@gemeente-denhaag/button': specifier: workspace:* - version: link:../BaseProps + version: link:../Button react: specifier: ^17.0.0 || ^18.0.0 version: 17.0.2 - devDependencies: - '@gemeente-denhaag/button': - specifier: workspace:* - version: link:../Button components/DynamicContent: devDependencies: @@ -588,10 +567,6 @@ importers: '@utrecht/component-library-react': specifier: 1.0.0-alpha.411 version: 1.0.0-alpha.411(react-dom@18.2.0)(react@18.2.0) - devDependencies: - '@gemeente-denhaag/baseprops': - specifier: 0.2.3-alpha.355 - version: link:../BaseProps components/FormControlLabel: dependencies: @@ -639,9 +614,6 @@ importers: components/Header: dependencies: - '@gemeente-denhaag/baseprops': - specifier: workspace:* - version: link:../BaseProps '@gemeente-denhaag/breadcrumb': specifier: workspace:* version: link:../Breadcrumb @@ -731,9 +703,6 @@ importers: components/Link: dependencies: - '@gemeente-denhaag/baseprops': - specifier: workspace:* - version: link:../BaseProps '@gemeente-denhaag/icons': specifier: workspace:* version: link:../Icons @@ -761,9 +730,6 @@ importers: components/Menu: dependencies: - '@gemeente-denhaag/baseprops': - specifier: workspace:* - version: link:../BaseProps '@gemeente-denhaag/button': specifier: workspace:* version: link:../Button @@ -815,9 +781,9 @@ importers: components/ProcessSteps: dependencies: - '@gemeente-denhaag/baseprops': + '@gemeente-denhaag/button': specifier: workspace:* - version: link:../BaseProps + version: link:../Button '@gemeente-denhaag/icons': specifier: workspace:* version: link:../Icons @@ -830,10 +796,6 @@ importers: react: specifier: ^17.0.0 || ^18.0.0 version: 17.0.2 - devDependencies: - '@gemeente-denhaag/button': - specifier: workspace:* - version: link:../Button components/Radio: dependencies: @@ -848,11 +810,7 @@ importers: specifier: workspace:* version: link:../FormControlLabel - components/ResponsiveContent: - dependencies: - '@gemeente-denhaag/baseprops': - specifier: workspace:* - version: link:../BaseProps + components/ResponsiveContent: {} components/Sheet: dependencies: @@ -1140,9 +1098,6 @@ importers: '@gemeente-denhaag/badge-counter': specifier: workspace:* version: link:../../components/BadgeCounter - '@gemeente-denhaag/baseprops': - specifier: workspace:* - version: link:../../components/BaseProps '@gemeente-denhaag/button': specifier: workspace:* version: link:../../components/Button @@ -27535,7 +27490,3 @@ packages: /zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} dev: true - -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false From 1e0a55ccb3bca8aa16ce5a2751d3eeb31b1ad5dc Mon Sep 17 00:00:00 2001 From: Borai van Uden Date: Wed, 8 Nov 2023 12:24:57 +0100 Subject: [PATCH 2/7] feat: removed BaseDataDisplay --- components/BaseDataDisplayProps/src/index.tsx | 60 ------------------- components/BaseDataDisplayProps/tsconfig.json | 15 ----- components/Divider/package.json | 1 - components/Typography/package.json | 3 - components/Typography/src/Heading1.tsx | 6 +- components/Typography/src/Heading2.tsx | 6 +- components/Typography/src/Heading3.tsx | 6 +- components/Typography/src/Heading4.tsx | 6 +- components/Typography/src/Heading5.tsx | 6 +- components/Typography/src/LeadParagraph.tsx | 6 +- components/Typography/src/Paragraph.tsx | 6 +- components/Typography/src/index.tsx | 1 - .../src/stories/Heading1.react.stories.tsx | 3 - pnpm-lock.yaml | 13 +--- 14 files changed, 31 insertions(+), 107 deletions(-) delete mode 100644 components/BaseDataDisplayProps/src/index.tsx delete mode 100644 components/BaseDataDisplayProps/tsconfig.json diff --git a/components/BaseDataDisplayProps/src/index.tsx b/components/BaseDataDisplayProps/src/index.tsx deleted file mode 100644 index 1b87ca85f4..0000000000 --- a/components/BaseDataDisplayProps/src/index.tsx +++ /dev/null @@ -1,60 +0,0 @@ -import React from 'react'; - -export default interface BaseDataDisplayProps { - /** - * The contents of the component. - */ - children?: React.ReactNode; - - /** - * Override or extend the styles applied to the component. - */ - classes?: Record; - - /** - * The tab-index applied to the root element of the component. - */ - tabIndex?: number; - - /** - * The id attribute is used to specify a unique id for an HTML element. - */ - id?: string; - - /** - * Extend the styles of the component by adding new classes. - */ - className?: string; - /** - * The component used for the root node. - * Either a string to use a HTML element or a component. - * Overrides the behavior of the variantMapping prop. - */ - component?: React.ElementType; -} - -export interface BaseDataDisplayChildrenProps { - /** - * The contents of the component. - */ - children?: React.ReactNode; - /** - * The component used for the root node. - * Either a string to use a HTML element or a component. - * Overrides the behavior of the variantMapping prop. - */ - component?: React.ElementType; -} - -export interface BaseDataDisplayClassesProps { - /** - * Override or extend the styles applied to the component. - */ - classes?: Record; - /** - * The component used for the root node. - * Either a string to use a HTML element or a component. - * Overrides the behavior of the variantMapping prop. - */ - component?: React.ElementType; -} diff --git a/components/BaseDataDisplayProps/tsconfig.json b/components/BaseDataDisplayProps/tsconfig.json deleted file mode 100644 index 958e292b5c..0000000000 --- a/components/BaseDataDisplayProps/tsconfig.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "extends": "../../tsconfig.build.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "dist", - "composite": true - }, - "include": ["src/**/*"], - "exclude": ["dist", "src/**/*.stories.tsx"], - "references": [ - { - "path": "../BaseProps" - } - ] -} diff --git a/components/Divider/package.json b/components/Divider/package.json index b2111da178..a0c77b51bd 100644 --- a/components/Divider/package.json +++ b/components/Divider/package.json @@ -29,7 +29,6 @@ "clean": "rimraf dist tsconfig.tsbuildinfo" }, "dependencies": { - "@gemeente-denhaag/basedatadisplayprops": "workspace:*", "@gemeente-denhaag/icons": "workspace:*" }, "peerDependencies": { diff --git a/components/Typography/package.json b/components/Typography/package.json index 3dd2b82703..fa6aece0fe 100644 --- a/components/Typography/package.json +++ b/components/Typography/package.json @@ -29,9 +29,6 @@ "clean": "rimraf dist tsconfig.tsbuildinfo" }, "dependencies": { - "@gemeente-denhaag/basedatadisplayprops": "workspace:*" - }, - "devDependencies": { "@gemeente-denhaag/design-tokens-common": "workspace:*", "@gemeente-denhaag/design-tokens-components": "workspace:*", "@utrecht/components": "1.0.0-alpha.563" diff --git a/components/Typography/src/Heading1.tsx b/components/Typography/src/Heading1.tsx index 3f78f318d6..5f8b26faa6 100644 --- a/components/Typography/src/Heading1.tsx +++ b/components/Typography/src/Heading1.tsx @@ -1,10 +1,12 @@ import React from 'react'; -import BaseDataDisplayProps from '@gemeente-denhaag/basedatadisplayprops'; import './heading.scss'; import './space.scss'; import clsx from 'clsx'; -export type Heading1Props = Omit; +export interface Heading1Props { + className?: string; + children?: React.ReactNode; +} export const Heading1: React.FC = (props: Heading1Props) => { const rootClassNames = clsx('utrecht-heading-1', props.className); diff --git a/components/Typography/src/Heading2.tsx b/components/Typography/src/Heading2.tsx index bbebf0df44..079cb52d50 100644 --- a/components/Typography/src/Heading2.tsx +++ b/components/Typography/src/Heading2.tsx @@ -1,10 +1,12 @@ import React from 'react'; -import BaseDataDisplayProps from '@gemeente-denhaag/basedatadisplayprops'; import './heading.scss'; import './space.scss'; import clsx from 'clsx'; -export type Heading2Props = Omit; +export interface Heading2Props { + className?: string; + children?: React.ReactNode; +} export const Heading2: React.FC = (props: Heading2Props) => { const rootClassNames = clsx('utrecht-heading-2', props.className); diff --git a/components/Typography/src/Heading3.tsx b/components/Typography/src/Heading3.tsx index 57ceb9aec3..4faa12b6a2 100644 --- a/components/Typography/src/Heading3.tsx +++ b/components/Typography/src/Heading3.tsx @@ -1,10 +1,12 @@ import React from 'react'; -import BaseDataDisplayProps from '@gemeente-denhaag/basedatadisplayprops'; import './heading.scss'; import './space.scss'; import clsx from 'clsx'; -export type Heading3Props = Omit; +export interface Heading3Props { + className?: string; + children?: React.ReactNode; +} export const Heading3: React.FC = (props: Heading3Props) => { const rootClassNames = clsx('utrecht-heading-3', props.className); diff --git a/components/Typography/src/Heading4.tsx b/components/Typography/src/Heading4.tsx index 37e741c24d..a7f76ae48c 100644 --- a/components/Typography/src/Heading4.tsx +++ b/components/Typography/src/Heading4.tsx @@ -1,10 +1,12 @@ import React from 'react'; -import BaseDataDisplayProps from '@gemeente-denhaag/basedatadisplayprops'; import './heading.scss'; import './space.scss'; import clsx from 'clsx'; -export type Heading4Props = Omit; +export interface Heading4Props { + className?: string; + children?: React.ReactNode; +} export const Heading4: React.FC = (props: Heading4Props) => { const rootClassNames = clsx('utrecht-heading-4', props.className); diff --git a/components/Typography/src/Heading5.tsx b/components/Typography/src/Heading5.tsx index 0410d09415..47a14d7385 100644 --- a/components/Typography/src/Heading5.tsx +++ b/components/Typography/src/Heading5.tsx @@ -1,10 +1,12 @@ import React from 'react'; -import BaseDataDisplayProps from '@gemeente-denhaag/basedatadisplayprops'; import './heading.scss'; import './space.scss'; import clsx from 'clsx'; -export type Heading5Props = Omit; +export interface Heading5Props { + className?: string; + children?: React.ReactNode; +} export const Heading5: React.FC = (props: Heading5Props) => { const rootClassNames = clsx('utrecht-heading-5', props.className); diff --git a/components/Typography/src/LeadParagraph.tsx b/components/Typography/src/LeadParagraph.tsx index aad3c4632f..7db76b0554 100644 --- a/components/Typography/src/LeadParagraph.tsx +++ b/components/Typography/src/LeadParagraph.tsx @@ -1,10 +1,12 @@ import React from 'react'; -import BaseDataDisplayProps from '@gemeente-denhaag/basedatadisplayprops'; import './paragraph.scss'; import './space.scss'; import clsx from 'clsx'; -export type LeadParagraphProps = Omit; +export interface LeadParagraphProps { + className?: string; + children?: React.ReactNode; +} export const LeadParagraph: React.FC = (props: LeadParagraphProps) => { const rootClassNames = clsx('utrecht-paragraph', 'utrecht-paragraph--lead', props.className); diff --git a/components/Typography/src/Paragraph.tsx b/components/Typography/src/Paragraph.tsx index 0ef6da7c3c..e3094d09a0 100644 --- a/components/Typography/src/Paragraph.tsx +++ b/components/Typography/src/Paragraph.tsx @@ -1,10 +1,12 @@ import React from 'react'; -import BaseDataDisplayProps from '@gemeente-denhaag/basedatadisplayprops'; import './paragraph.scss'; import './space.scss'; import clsx from 'clsx'; -export type ParagraphProps = Omit; +export interface ParagraphProps { + className?: string; + children?: React.ReactNode; +} export const Paragraph: React.FC = (props: ParagraphProps) => { const rootClassNames = clsx('utrecht-paragraph', props.className); diff --git a/components/Typography/src/index.tsx b/components/Typography/src/index.tsx index bc5360576f..5c0ca33ca8 100644 --- a/components/Typography/src/index.tsx +++ b/components/Typography/src/index.tsx @@ -3,6 +3,5 @@ export * from './Heading2'; export * from './Heading3'; export * from './Heading4'; export * from './Heading5'; - export * from './Paragraph'; export * from './LeadParagraph'; diff --git a/components/Typography/src/stories/Heading1.react.stories.tsx b/components/Typography/src/stories/Heading1.react.stories.tsx index 05c456e6de..70368b0ec2 100644 --- a/components/Typography/src/stories/Heading1.react.stories.tsx +++ b/components/Typography/src/stories/Heading1.react.stories.tsx @@ -23,7 +23,4 @@ const Template: Story = (args: Heading1Props) => ( This is a bit of text inside a Header1 component. ); -/** - * Default implementation of Heading1 - */ export const Default = Template.bind({}); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e4cbb6e153..b90b1d696c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -512,9 +512,6 @@ importers: components/Divider: dependencies: - '@gemeente-denhaag/basedatadisplayprops': - specifier: workspace:* - version: link:../BaseDataDisplayProps '@gemeente-denhaag/icons': specifier: workspace:* version: link:../Icons @@ -884,13 +881,6 @@ importers: components/Typography: dependencies: - '@gemeente-denhaag/basedatadisplayprops': - specifier: workspace:* - version: link:../BaseDataDisplayProps - react: - specifier: ^17.0.0 || ^18.0.0 - version: 17.0.2 - devDependencies: '@gemeente-denhaag/design-tokens-common': specifier: workspace:* version: link:../../proprietary/Common @@ -900,6 +890,9 @@ importers: '@utrecht/components': specifier: 1.0.0-alpha.563 version: 1.0.0-alpha.563 + react: + specifier: ^17.0.0 || ^18.0.0 + version: 17.0.2 components/UnorderedList: devDependencies: From 4f7563c4bfcb9eceb067d6f4ed90a87790050fff Mon Sep 17 00:00:00 2001 From: Borai van Uden Date: Wed, 8 Nov 2023 12:47:11 +0100 Subject: [PATCH 3/7] fix: build --- components/Accordion/tsconfig.json | 3 --- components/Action/tsconfig.json | 3 --- components/Alert/tsconfig.json | 3 --- components/BadgeCounter/tsconfig.json | 3 --- components/Breadcrumb/tsconfig.json | 3 --- components/Button/tsconfig.json | 3 --- components/ButtonGroup/tsconfig.json | 3 --- components/Card/tsconfig.json | 3 --- components/Checkbox/tsconfig.json | 3 --- components/CtaEvent/tsconfig.json | 6 +----- components/Divider/tsconfig.json | 3 --- components/DynamicContent/tsconfig.json | 3 --- components/FormControlLabel/tsconfig.json | 6 +----- components/FormGroup/tsconfig.json | 3 --- components/IconButton/tsconfig.json | 3 --- components/Link/tsconfig.json | 6 +----- components/Menu/tsconfig.json | 3 --- components/Modal/tsconfig.json | 6 +----- components/ProcessSteps/tsconfig.json | 3 --- components/StepMarker/tsconfig.json | 3 --- components/Tab/tsconfig.json | 6 +----- components/TextField/tsconfig.json | 6 +----- components/Typography/tsconfig.json | 3 --- packages/components-react/tsconfig.json | 6 ------ tsconfig.json | 6 ------ tsconfig.storybook.json | 6 ------ 26 files changed, 6 insertions(+), 99 deletions(-) diff --git a/components/Accordion/tsconfig.json b/components/Accordion/tsconfig.json index d19a2a8b4e..a27dcd4f19 100644 --- a/components/Accordion/tsconfig.json +++ b/components/Accordion/tsconfig.json @@ -13,9 +13,6 @@ }, { "path": "../Typography" - }, - { - "path": "../BaseProps" } ] } diff --git a/components/Action/tsconfig.json b/components/Action/tsconfig.json index 40a43afaf3..52aa11fd9d 100644 --- a/components/Action/tsconfig.json +++ b/components/Action/tsconfig.json @@ -11,9 +11,6 @@ { "path": "../Icons" }, - { - "path": "../BaseProps" - }, { "path": "../../proprietary/Common" }, diff --git a/components/Alert/tsconfig.json b/components/Alert/tsconfig.json index c8d4207875..409f189938 100644 --- a/components/Alert/tsconfig.json +++ b/components/Alert/tsconfig.json @@ -8,9 +8,6 @@ "include": ["src/**/*"], "exclude": ["dist", "src/**/*.stories.tsx"], "references": [ - { - "path": "../BaseProps" - }, { "path": "../Icons" }, diff --git a/components/BadgeCounter/tsconfig.json b/components/BadgeCounter/tsconfig.json index c715a055bb..6242c4e83e 100644 --- a/components/BadgeCounter/tsconfig.json +++ b/components/BadgeCounter/tsconfig.json @@ -10,9 +10,6 @@ "references": [ { "path": "../DotIndicator" - }, - { - "path": "../BaseDataDisplayProps" } ] } diff --git a/components/Breadcrumb/tsconfig.json b/components/Breadcrumb/tsconfig.json index 40a43afaf3..52aa11fd9d 100644 --- a/components/Breadcrumb/tsconfig.json +++ b/components/Breadcrumb/tsconfig.json @@ -11,9 +11,6 @@ { "path": "../Icons" }, - { - "path": "../BaseProps" - }, { "path": "../../proprietary/Common" }, diff --git a/components/Button/tsconfig.json b/components/Button/tsconfig.json index 40a43afaf3..52aa11fd9d 100644 --- a/components/Button/tsconfig.json +++ b/components/Button/tsconfig.json @@ -11,9 +11,6 @@ { "path": "../Icons" }, - { - "path": "../BaseProps" - }, { "path": "../../proprietary/Common" }, diff --git a/components/ButtonGroup/tsconfig.json b/components/ButtonGroup/tsconfig.json index 40a43afaf3..52aa11fd9d 100644 --- a/components/ButtonGroup/tsconfig.json +++ b/components/ButtonGroup/tsconfig.json @@ -11,9 +11,6 @@ { "path": "../Icons" }, - { - "path": "../BaseProps" - }, { "path": "../../proprietary/Common" }, diff --git a/components/Card/tsconfig.json b/components/Card/tsconfig.json index c5b2438236..d642b3f995 100644 --- a/components/Card/tsconfig.json +++ b/components/Card/tsconfig.json @@ -10,9 +10,6 @@ "references": [ { "path": "../Icons" - }, - { - "path": "../BaseProps" } ] } diff --git a/components/Checkbox/tsconfig.json b/components/Checkbox/tsconfig.json index 4ee409c6ed..ff66d37344 100644 --- a/components/Checkbox/tsconfig.json +++ b/components/Checkbox/tsconfig.json @@ -8,9 +8,6 @@ "include": ["src/**/*"], "exclude": ["dist", "src/**/*.stories.tsx"], "references": [ - { - "path": "../BaseProps" - }, { "path": "../FormControlLabel" }, diff --git a/components/CtaEvent/tsconfig.json b/components/CtaEvent/tsconfig.json index 958e292b5c..1990c90373 100644 --- a/components/CtaEvent/tsconfig.json +++ b/components/CtaEvent/tsconfig.json @@ -7,9 +7,5 @@ }, "include": ["src/**/*"], "exclude": ["dist", "src/**/*.stories.tsx"], - "references": [ - { - "path": "../BaseProps" - } - ] + "references": [] } diff --git a/components/Divider/tsconfig.json b/components/Divider/tsconfig.json index e14a54f0a2..cd758515ba 100644 --- a/components/Divider/tsconfig.json +++ b/components/Divider/tsconfig.json @@ -11,9 +11,6 @@ { "path": "../Icons" }, - { - "path": "../BaseDataDisplayProps" - }, { "path": "../../proprietary/Components" }, diff --git a/components/DynamicContent/tsconfig.json b/components/DynamicContent/tsconfig.json index 40a43afaf3..52aa11fd9d 100644 --- a/components/DynamicContent/tsconfig.json +++ b/components/DynamicContent/tsconfig.json @@ -11,9 +11,6 @@ { "path": "../Icons" }, - { - "path": "../BaseProps" - }, { "path": "../../proprietary/Common" }, diff --git a/components/FormControlLabel/tsconfig.json b/components/FormControlLabel/tsconfig.json index 958e292b5c..1990c90373 100644 --- a/components/FormControlLabel/tsconfig.json +++ b/components/FormControlLabel/tsconfig.json @@ -7,9 +7,5 @@ }, "include": ["src/**/*"], "exclude": ["dist", "src/**/*.stories.tsx"], - "references": [ - { - "path": "../BaseProps" - } - ] + "references": [] } diff --git a/components/FormGroup/tsconfig.json b/components/FormGroup/tsconfig.json index 3ef34c0a43..926de905eb 100644 --- a/components/FormGroup/tsconfig.json +++ b/components/FormGroup/tsconfig.json @@ -8,9 +8,6 @@ "include": ["src/**/*"], "exclude": ["dist", "src/**/*.stories.tsx"], "references": [ - { - "path": "../BaseProps" - }, { "path": "../Typography" } diff --git a/components/IconButton/tsconfig.json b/components/IconButton/tsconfig.json index c5b2438236..d642b3f995 100644 --- a/components/IconButton/tsconfig.json +++ b/components/IconButton/tsconfig.json @@ -10,9 +10,6 @@ "references": [ { "path": "../Icons" - }, - { - "path": "../BaseProps" } ] } diff --git a/components/Link/tsconfig.json b/components/Link/tsconfig.json index 958e292b5c..1990c90373 100644 --- a/components/Link/tsconfig.json +++ b/components/Link/tsconfig.json @@ -7,9 +7,5 @@ }, "include": ["src/**/*"], "exclude": ["dist", "src/**/*.stories.tsx"], - "references": [ - { - "path": "../BaseProps" - } - ] + "references": [] } diff --git a/components/Menu/tsconfig.json b/components/Menu/tsconfig.json index a4e6cac418..698ffa80f2 100644 --- a/components/Menu/tsconfig.json +++ b/components/Menu/tsconfig.json @@ -8,9 +8,6 @@ "include": ["src/**/*"], "exclude": ["dist", "src/**/*.stories.mdx"], "references": [ - { - "path": "../BaseProps" - }, { "path": "../Icons" } diff --git a/components/Modal/tsconfig.json b/components/Modal/tsconfig.json index 958e292b5c..1990c90373 100644 --- a/components/Modal/tsconfig.json +++ b/components/Modal/tsconfig.json @@ -7,9 +7,5 @@ }, "include": ["src/**/*"], "exclude": ["dist", "src/**/*.stories.tsx"], - "references": [ - { - "path": "../BaseProps" - } - ] + "references": [] } diff --git a/components/ProcessSteps/tsconfig.json b/components/ProcessSteps/tsconfig.json index e3860ebf9c..2db44ab12d 100644 --- a/components/ProcessSteps/tsconfig.json +++ b/components/ProcessSteps/tsconfig.json @@ -11,9 +11,6 @@ { "path": "../Button" }, - { - "path": "../BaseProps" - }, { "path": "../Icons" }, diff --git a/components/StepMarker/tsconfig.json b/components/StepMarker/tsconfig.json index c5b2438236..d642b3f995 100644 --- a/components/StepMarker/tsconfig.json +++ b/components/StepMarker/tsconfig.json @@ -10,9 +10,6 @@ "references": [ { "path": "../Icons" - }, - { - "path": "../BaseProps" } ] } diff --git a/components/Tab/tsconfig.json b/components/Tab/tsconfig.json index 958e292b5c..1990c90373 100644 --- a/components/Tab/tsconfig.json +++ b/components/Tab/tsconfig.json @@ -7,9 +7,5 @@ }, "include": ["src/**/*"], "exclude": ["dist", "src/**/*.stories.tsx"], - "references": [ - { - "path": "../BaseProps" - } - ] + "references": [] } diff --git a/components/TextField/tsconfig.json b/components/TextField/tsconfig.json index 958e292b5c..1990c90373 100644 --- a/components/TextField/tsconfig.json +++ b/components/TextField/tsconfig.json @@ -7,9 +7,5 @@ }, "include": ["src/**/*"], "exclude": ["dist", "src/**/*.stories.tsx"], - "references": [ - { - "path": "../BaseProps" - } - ] + "references": [] } diff --git a/components/Typography/tsconfig.json b/components/Typography/tsconfig.json index bcc78bdb14..a6c2813ae5 100644 --- a/components/Typography/tsconfig.json +++ b/components/Typography/tsconfig.json @@ -13,9 +13,6 @@ }, { "path": "../../proprietary/Components" - }, - { - "path": "../BaseDataDisplayProps" } ] } diff --git a/packages/components-react/tsconfig.json b/packages/components-react/tsconfig.json index ea4fcb8267..5cfa7fd42a 100644 --- a/packages/components-react/tsconfig.json +++ b/packages/components-react/tsconfig.json @@ -8,18 +8,12 @@ "include": ["src/**/*"], "exclude": ["dist", "src/**/*.stories.tsx"], "references": [ - { - "path": "../../components/BaseProps" - }, { "path": "../../components/Alert" }, { "path": "../../components/BadgeCounter" }, - { - "path": "../../components/BaseProps" - }, { "path": "../../components/Divider" }, diff --git a/tsconfig.json b/tsconfig.json index 4b467b6b36..344a3fdfc7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -13,12 +13,6 @@ { "path": "components/BadgeCounter" }, - { - "path": "components/BaseDataDisplayProps" - }, - { - "path": "components/BaseProps" - }, { "path": "components/Button" }, diff --git a/tsconfig.storybook.json b/tsconfig.storybook.json index 44f5686d15..284a17993f 100644 --- a/tsconfig.storybook.json +++ b/tsconfig.storybook.json @@ -9,12 +9,6 @@ { "path": "components/BadgeCounter" }, - { - "path": "components/BaseDataDisplayProps" - }, - { - "path": "components/BaseProps" - }, { "path": "components/Button" }, From bfb6a3badd4abc0baf36080f47657ccd84a0d47d Mon Sep 17 00:00:00 2001 From: YourivHDenHaag Date: Thu, 9 Nov 2023 10:04:16 +0100 Subject: [PATCH 4/7] fix: build issues --- components/FormGroup/package.json | 1 - pnpm-lock.yaml | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/components/FormGroup/package.json b/components/FormGroup/package.json index d28303cbd9..25b944ad1e 100644 --- a/components/FormGroup/package.json +++ b/components/FormGroup/package.json @@ -29,7 +29,6 @@ "clean": "rimraf dist tsconfig.tsbuildinfo" }, "dependencies": { - "@gemeente-denhaag/baseprops": "workspace:*", "@gemeente-denhaag/typography": "workspace:*" }, "peerDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b90b1d696c..bd180f4ed5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -27483,3 +27483,7 @@ packages: /zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} dev: true + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false From dc7228ce8f19b23c60ee82eca23e5694ca68ada6 Mon Sep 17 00:00:00 2001 From: YourivHDenHaag Date: Thu, 9 Nov 2023 10:21:12 +0100 Subject: [PATCH 5/7] fix: build --- pnpm-lock.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bd180f4ed5..599fd2c813 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -587,9 +587,6 @@ importers: components/FormGroup: dependencies: - '@gemeente-denhaag/baseprops': - specifier: workspace:* - version: link:../BaseProps '@gemeente-denhaag/typography': specifier: workspace:* version: link:../Typography From d301be3d8a5f199e586cd5eb73191f981954078c Mon Sep 17 00:00:00 2001 From: YourivHDenHaag Date: Thu, 9 Nov 2023 10:28:03 +0100 Subject: [PATCH 6/7] fix: build --- components/BaseDataDisplayProps/package.json | 35 -------------------- pnpm-lock.yaml | 6 ---- 2 files changed, 41 deletions(-) delete mode 100644 components/BaseDataDisplayProps/package.json diff --git a/components/BaseDataDisplayProps/package.json b/components/BaseDataDisplayProps/package.json deleted file mode 100644 index e7d4d70361..0000000000 --- a/components/BaseDataDisplayProps/package.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "@gemeente-denhaag/basedatadisplayprops", - "version": "0.2.3-alpha.355", - "description": "A package containing properties used in DataDisplay", - "bugs": "https://github.com/nl-design-system/denhaag/issues", - "repository": { - "type": "git", - "url": "https://github.com/nl-design-system/denhaag.git", - "directory": "components/BaseDataDisplayProps" - }, - "license": "EUPL-1.2", - "author": "Municipality of The Hague", - "exports": { - ".": { - "types": "./dist/cjs/index.d.ts", - "import": "./dist/mjs/index.js", - "default": "./dist/cjs/index.js" - } - }, - "main": "dist/cjs/index.js", - "module": "dist/mjs/index.js", - "types": "dist/cjs/index.d.ts", - "files": [ - "dist" - ], - "scripts": { - "build": "rollup -c ../../rollup.config.mjs", - "clean": "rimraf dist tsconfig.tsbuildinfo" - }, - "dependencies": {}, - "peerDependencies": { - "react": "^17.0.0 || ^18.0.0" - }, - "gitHead": "dcf72a9b79266c1ebede35aff4a02dd9121a980f" -} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 599fd2c813..1b293f6449 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -386,12 +386,6 @@ importers: specifier: 1.0.0-alpha.563 version: 1.0.0-alpha.563 - components/BaseDataDisplayProps: - dependencies: - react: - specifier: ^17.0.0 || ^18.0.0 - version: 17.0.2 - components/BaseProps: dependencies: react: From a6d72c4c4fba2ff14e76fe3c8d9376814f725add Mon Sep 17 00:00:00 2001 From: YourivHDenHaag Date: Thu, 9 Nov 2023 10:30:08 +0100 Subject: [PATCH 7/7] fix: build --- components/BaseProps/package.json | 34 ------------------------------- pnpm-lock.yaml | 6 ------ 2 files changed, 40 deletions(-) delete mode 100644 components/BaseProps/package.json diff --git a/components/BaseProps/package.json b/components/BaseProps/package.json deleted file mode 100644 index 1c2233fd06..0000000000 --- a/components/BaseProps/package.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "name": "@gemeente-denhaag/baseprops", - "version": "0.2.3-alpha.355", - "description": "A package containing properties used in other components", - "bugs": "https://github.com/nl-design-system/denhaag/issues", - "repository": { - "type": "git", - "url": "https://github.com/nl-design-system/denhaag.git", - "directory": "components/BaseProps" - }, - "license": "EUPL-1.2", - "author": "Municipality of The Hague", - "exports": { - ".": { - "types": "./dist/cjs/index.d.ts", - "import": "./dist/mjs/index.js", - "default": "./dist/cjs/index.js" - } - }, - "main": "dist/cjs/index.js", - "module": "dist/mjs/index.js", - "types": "dist/cjs/index.d.ts", - "files": [ - "dist" - ], - "scripts": { - "build": "rollup -c ../../rollup.config.mjs", - "clean": "rimraf dist tsconfig.tsbuildinfo" - }, - "peerDependencies": { - "react": "^17.0.0 || ^18.0.0" - }, - "gitHead": "dcf72a9b79266c1ebede35aff4a02dd9121a980f" -} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1b293f6449..263304816d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -386,12 +386,6 @@ importers: specifier: 1.0.0-alpha.563 version: 1.0.0-alpha.563 - components/BaseProps: - dependencies: - react: - specifier: ^17.0.0 || ^18.0.0 - version: 17.0.2 - components/Blockquote: dependencies: react: