From 7625d2eb96507c63453a5eff7378f9b0c2cd1e50 Mon Sep 17 00:00:00 2001 From: JoeriRoijenga Date: Thu, 9 Jan 2025 10:05:54 +0100 Subject: [PATCH 1/2] UPDATE: version update Utrecht packages --- apps/rvs.rivm.nl/package.json | 2 +- packages/storybook/package.json | 6 +-- pnpm-lock.yaml | 94 ++++++++++++++++++++++++++++----- 3 files changed, 84 insertions(+), 18 deletions(-) diff --git a/apps/rvs.rivm.nl/package.json b/apps/rvs.rivm.nl/package.json index 2e9fda8db..8c548c410 100644 --- a/apps/rvs.rivm.nl/package.json +++ b/apps/rvs.rivm.nl/package.json @@ -40,7 +40,7 @@ "@types/react": "19.0.1", "@types/react-dom": "19.0.1", "@utrecht/component-library-css": "7.0.0", - "@utrecht/component-library-react": "7.3.7", + "@utrecht/component-library-react": "8.0.4", "eslint": "9.15.0", "eslint-config-next": "15.0.4", "typescript": "5.7.2" diff --git a/packages/storybook/package.json b/packages/storybook/package.json index cbf037096..29ca8c8d3 100644 --- a/packages/storybook/package.json +++ b/packages/storybook/package.json @@ -63,10 +63,10 @@ "@types/react": "19.0.1", "@types/react-dom": "19.0.1", "@types/twig": "1.12.16", - "@utrecht/component-library-react": "7.3.8", + "@utrecht/component-library-react": "8.0.4", "@utrecht/components": "7.4.0", - "@utrecht/web-component-library-react": "3.0.0", - "@utrecht/web-component-library-stencil": "2.2.0", + "@utrecht/web-component-library-react": "3.0.2", + "@utrecht/web-component-library-stencil": "3.0.1", "@whitespace/storybook-addon-html": "6.1.1", "axe-playwright": "2.0.3", "chromatic": "11.19.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 65de269cf..71ab4ebf5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -216,8 +216,8 @@ importers: specifier: 7.0.0 version: 7.0.0 '@utrecht/component-library-react': - specifier: 7.3.7 - version: 7.3.7(@babel/runtime@7.26.0)(date-fns@2.30.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: 8.0.4 + version: 8.0.4(@babel/runtime@7.26.0)(date-fns@2.30.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) eslint: specifier: 9.15.0 version: 9.15.0 @@ -488,17 +488,17 @@ importers: specifier: 1.12.16 version: 1.12.16 '@utrecht/component-library-react': - specifier: 7.3.8 - version: 7.3.8(@babel/runtime@7.26.0)(date-fns@2.30.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: 8.0.4 + version: 8.0.4(@babel/runtime@7.26.0)(date-fns@2.30.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@utrecht/components': specifier: 7.4.0 version: 7.4.0 '@utrecht/web-component-library-react': - specifier: 3.0.0 - version: 3.0.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: 3.0.2 + version: 3.0.2(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@utrecht/web-component-library-stencil': - specifier: 2.2.0 - version: 2.2.0 + specifier: 3.0.1 + version: 3.0.1 '@whitespace/storybook-addon-html': specifier: 6.1.1 version: 6.1.1(prettier@3.4.1)(react-syntax-highlighter@15.6.1(react@19.0.0)) @@ -3122,6 +3122,13 @@ packages: react: '18' react-dom: '18' + '@utrecht/checkbox-react@1.0.5': + resolution: {integrity: sha512-LfQw2mGUvS7qH1aohHYKsndcwiH9JyxygvS9A1iA+I9VIDZQRO6G1gC9yOd9j8wdl6A5/I+XfJGx3usN5EnDOQ==} + peerDependencies: + '@babel/runtime': '*' + react: '18' + react-dom: '18' + '@utrecht/combobox-react@0.0.3': resolution: {integrity: sha512-l543Y0iaw68ZT0SuETjvzGp37pLtw72sfzh/QzkNGyr9kk9twUmo+gYEp1QedAsOGaK9ETjcAoeKL2lgreiUKQ==} peerDependencies: @@ -3173,8 +3180,8 @@ packages: vega: optional: true - '@utrecht/component-library-react@7.3.8': - resolution: {integrity: sha512-L1T92WH/wljRgnc7Tg9A/Arj8Nr9tm5y1XXjOHB8xHKsjimFGZXXDwBPZeWqcTYcn4DMSg2NFmr2o6R9Zu6FTg==} + '@utrecht/component-library-react@8.0.4': + resolution: {integrity: sha512-Xflfm5KMyMRTH3veaw6C/2RZvN4KZIUPQCJOGF08MXyA05JRtgEZzFDgZ7KA2Wi/w5KnYA/gQwYSNr6VLRAcsw==} peerDependencies: '@babel/runtime': ^7.23.6 date-fns: ^2.30.0 @@ -3221,6 +3228,13 @@ packages: react: '18' react-dom: '18' + '@utrecht/form-field-checkbox-react@1.0.7': + resolution: {integrity: sha512-MAvd2GV8kwuN1b8Up72LrKI7b/wG5ueNjMFw0bLCgX6tfgWy9TCKCymupfzSgs5W2VSZRoqFD1FB10BBFHwZOg==} + peerDependencies: + '@babel/runtime': '*' + react: '18' + react-dom: '18' + '@utrecht/form-field-description-react@1.0.2': resolution: {integrity: sha512-trki74s07AAMp59SO/VpR4RguvepaMGZ89xp54mbzYeJMqEspCCyEzKJSL/UdM0Kv8IVc3YpDv8grDV4hpT4Kw==} peerDependencies: @@ -3305,6 +3319,13 @@ packages: react: '18' react-dom: '18' + '@utrecht/listbox-react@1.0.7': + resolution: {integrity: sha512-NGZlw2x+QqpuJDznV4oNWGXuuCNMgKRTdBAF5XjwrzJt8JLHM8gfbiDmIR5AXTmk4+emMfsmBmaPKFJMfxooWw==} + peerDependencies: + '@babel/runtime': '*' + react: '18' + react-dom: '18' + '@utrecht/radio-button-react@1.0.2': resolution: {integrity: sha512-y4r3913L0PxIZqVQbjs1bV8cuiez6X4Oaqhjo7d8tdeOtnMjIjvv2s8tyRzDuyU8PioGXcMjtfavY+bDdrfc7g==} peerDependencies: @@ -3339,9 +3360,18 @@ packages: react: 16 - 18 react-dom: 16 - 18 + '@utrecht/web-component-library-react@3.0.2': + resolution: {integrity: sha512-KwrE0Lt6H6mx4jXhnDh6WX3SGkqnS0pM/FFKyPnwiaQ3XmNGDPWnabpnEbW22YUkGTup/YUYrSjrzN2TvPr3bg==} + peerDependencies: + react: 16 - 18 + react-dom: 16 - 18 + '@utrecht/web-component-library-stencil@2.2.0': resolution: {integrity: sha512-2ny336xp8dVcUaey0bWe65V+zqooyeApyMW8Vi44IxKJTcqNvKdOawT/mI1t1lTTsGoUhxxi0QQYT4AfXMU0aQ==} + '@utrecht/web-component-library-stencil@3.0.1': + resolution: {integrity: sha512-LRviT6RAV7ULxbuF3yxpO41XAlgL6UmPnDWL+ltj9lZm6FmKbprQ03u3mt02RN3Zk9Fr/sTwiJ9ydrHn+aagpQ==} + '@vitejs/plugin-react@4.3.4': resolution: {integrity: sha512-SCCPBJtYLdE8PX/7ZQAs1QAZ8Jqwih+0VBLum1EGqmCCQal+MIUqLCzj3ZUy8ufbC0cAM4LRlSTm7IQJwWT4ug==} engines: {node: ^14.18.0 || >=16.0.0} @@ -12147,6 +12177,13 @@ snapshots: react: 19.0.0 react-dom: 19.0.0(react@19.0.0) + '@utrecht/checkbox-react@1.0.5(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': + dependencies: + '@babel/runtime': 7.26.0 + clsx: 2.1.1 + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + '@utrecht/combobox-react@0.0.3(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': dependencies: '@babel/runtime': 7.26.0 @@ -12211,21 +12248,21 @@ snapshots: optionalDependencies: date-fns: 2.30.0 - '@utrecht/component-library-react@7.3.8(@babel/runtime@7.26.0)(date-fns@2.30.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': + '@utrecht/component-library-react@8.0.4(@babel/runtime@7.26.0)(date-fns@2.30.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': dependencies: '@babel/runtime': 7.26.0 '@utrecht/button-react': 2.0.4(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@utrecht/calendar-react': 1.0.8(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) - '@utrecht/checkbox-react': 1.0.4(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + '@utrecht/checkbox-react': 1.0.5(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@utrecht/combobox-react': 0.0.5(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@utrecht/fieldset-react': 1.0.4(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) - '@utrecht/form-field-checkbox-react': 1.0.6(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + '@utrecht/form-field-checkbox-react': 1.0.7(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@utrecht/form-field-description-react': 1.0.4(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@utrecht/form-field-error-message-react': 1.0.4(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@utrecht/form-field-react': 1.0.4(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@utrecht/form-label-react': 1.0.4(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@utrecht/link-react': 1.0.4(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) - '@utrecht/listbox-react': 1.0.5(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + '@utrecht/listbox-react': 1.0.7(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@utrecht/radio-button-react': 1.0.4(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@utrecht/textbox-react': 1.0.4(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) clsx: 2.1.1 @@ -12277,6 +12314,18 @@ snapshots: react: 19.0.0 react-dom: 19.0.0(react@19.0.0) + '@utrecht/form-field-checkbox-react@1.0.7(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': + dependencies: + '@babel/runtime': 7.26.0 + '@utrecht/checkbox-react': 1.0.5(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + '@utrecht/form-field-description-react': 1.0.4(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + '@utrecht/form-field-error-message-react': 1.0.4(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + '@utrecht/form-field-react': 1.0.4(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + '@utrecht/form-label-react': 1.0.4(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + clsx: 2.1.1 + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + '@utrecht/form-field-description-react@1.0.2(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': dependencies: '@babel/runtime': 7.26.0 @@ -12361,6 +12410,13 @@ snapshots: react: 19.0.0 react-dom: 19.0.0(react@19.0.0) + '@utrecht/listbox-react@1.0.7(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': + dependencies: + '@babel/runtime': 7.26.0 + clsx: 2.1.1 + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + '@utrecht/radio-button-react@1.0.2(@babel/runtime@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': dependencies: '@babel/runtime': 7.26.0 @@ -12395,10 +12451,20 @@ snapshots: react: 19.0.0 react-dom: 19.0.0(react@19.0.0) + '@utrecht/web-component-library-react@3.0.2(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': + dependencies: + '@utrecht/web-component-library-stencil': 3.0.1 + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + '@utrecht/web-component-library-stencil@2.2.0': dependencies: '@stencil/core': 4.18.3 + '@utrecht/web-component-library-stencil@3.0.1': + dependencies: + '@stencil/core': 4.18.3 + '@vitejs/plugin-react@4.3.4(vite@6.0.2(@types/node@20.17.6)(sass@1.81.0)(terser@5.36.0)(yaml@2.6.0))': dependencies: '@babel/core': 7.26.0 From 926b037d89fed94c67d2e5a179f5ccd8ba672c9f Mon Sep 17 00:00:00 2001 From: JoeriRoijenga Date: Thu, 9 Jan 2025 10:38:42 +0100 Subject: [PATCH 2/2] FIX: deprecated Paragrah props replaced with 'appearance' --- packages/storybook/src/templates/collage/index.tsx | 4 ++-- packages/storybook/src/templates/details/index.tsx | 2 +- packages/storybook/src/templates/rich-text/index.tsx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/storybook/src/templates/collage/index.tsx b/packages/storybook/src/templates/collage/index.tsx index 3e187e97f..fe8f1617e 100644 --- a/packages/storybook/src/templates/collage/index.tsx +++ b/packages/storybook/src/templates/collage/index.tsx @@ -71,7 +71,7 @@ export default function Collage() { src="https://raw.githubusercontent.com/nl-design-system/rijkshuisstijl-community/0bfd32af3f34ff7ce62f4769fbec8895720dde75/proprietary/assets/src/placeholder.jpg" width="640" > - + In het NL Design System verzamelen we principes, handvatten, elementen, patronen en richtlijnen. @@ -103,7 +103,7 @@ export default function Collage() { Maak gebruik van opsommingstekens waar dat mogelijk is. - + In het NL Design System verzamelen we principes, handvatten, elementen, patronen en richtlijnen.
diff --git a/packages/storybook/src/templates/details/index.tsx b/packages/storybook/src/templates/details/index.tsx index 926d0ca77..4e306464c 100644 --- a/packages/storybook/src/templates/details/index.tsx +++ b/packages/storybook/src/templates/details/index.tsx @@ -80,7 +80,7 @@ export default function Details() {
- + De Arbeidstijdenwet geeft regels voor werktijden, pauzes en rusttijden van werknemers. Met deze regels wil de Rijksoverheid werknemers beschermen tegen te lange werkdagen. Maar ook de combinatie van werk, privé en zorgtaken gemakkelijker maken. diff --git a/packages/storybook/src/templates/rich-text/index.tsx b/packages/storybook/src/templates/rich-text/index.tsx index 133e9d287..e1e99f161 100644 --- a/packages/storybook/src/templates/rich-text/index.tsx +++ b/packages/storybook/src/templates/rich-text/index.tsx @@ -59,7 +59,7 @@ export default function Page() {
Titel van de pagina - Hier zou een korte introductie van de pagina kunnen staan. + Hier zou een korte introductie van de pagina kunnen staan.