From 747f72515148a07324b7a96b86f7811584aaa67d Mon Sep 17 00:00:00 2001 From: Niels Roozemond Date: Tue, 14 Nov 2023 14:38:05 +0100 Subject: [PATCH] Assets in react workspace --- packages/react/package.json | 1 + packages/react/src/Logo/Logo.tsx | 10 +++++----- pnpm-lock.yaml | 3 +++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/react/package.json b/packages/react/package.json index beb7927407..b9fcdd0c00 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -32,6 +32,7 @@ "dist/" ], "dependencies": { + "@amsterdam/design-system-assets": "workspace:*", "@amsterdam/design-system-react-icons": "workspace:*", "@utrecht/component-library-react": "1.0.1", "clsx": "2.0.0", diff --git a/packages/react/src/Logo/Logo.tsx b/packages/react/src/Logo/Logo.tsx index 6cd0ded882..21db0c4ed1 100644 --- a/packages/react/src/Logo/Logo.tsx +++ b/packages/react/src/Logo/Logo.tsx @@ -3,13 +3,13 @@ * Copyright (c) 2023 Gemeente Amsterdam */ +import LogoAmsterdam from '@amsterdam/design-system-assets/logo/amsterdam.svg' +import LogoGGD from '@amsterdam/design-system-assets/logo/ggd-amsterdam.svg' +import LogoStadsarchief from '@amsterdam/design-system-assets/logo/stadsarchief.svg' +import LogoStadsbankLening from '@amsterdam/design-system-assets/logo/stadsbank-lening.svg' +import LogoVGA from '@amsterdam/design-system-assets/logo/vga-verzekeringen.svg' import clsx from 'clsx' import { ForwardedRef, forwardRef, HTMLAttributes } from 'react' -import LogoAmsterdam from '../../../../proprietary/assets/logo/amsterdam.svg' -import LogoGGD from '../../../../proprietary/assets/logo/ggd-amsterdam.svg' -import LogoStadsarchief from '../../../../proprietary/assets/logo/stadsarchief.svg' -import LogoStadsbankLening from '../../../../proprietary/assets/logo/stadsbank-lening.svg' -import LogoVGA from '../../../../proprietary/assets/logo/vga-verzekeringen.svg' export interface LogoProps extends HTMLAttributes { variant?: 'amsterdam' | 'ggd-amsterdam' | 'stadsarchief' | 'stadsbank-lening' | 'vga-verzekeringen' diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dc42662231..efd184dc40 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -118,6 +118,9 @@ importers: packages/react: dependencies: + '@amsterdam/design-system-assets': + specifier: workspace:* + version: link:../../proprietary/assets '@amsterdam/design-system-react-icons': specifier: workspace:* version: link:../../proprietary/react-icons