From 39f819e5d36525ad08eb89cc723bbaae995f6b3f Mon Sep 17 00:00:00 2001 From: Sergei Maertens Date: Thu, 6 Mar 2025 21:11:14 +0100 Subject: [PATCH 1/2] :arrow_up: Bump version of design tokens used This version is required for @utrecht/components 7.4 compat. --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7874ac85ee..6807e823b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "UNLICENSED", "dependencies": { "@fortawesome/fontawesome-free": "^6.1.1", - "@open-formulieren/design-tokens": "^0.53.0", + "@open-formulieren/design-tokens": "^0.57.0", "@open-formulieren/formio-builder": "^0.37.0", "@open-formulieren/leaflet-tools": "^1.0.0", "@open-formulieren/monaco-json-editor": "^0.2.0", @@ -4525,9 +4525,9 @@ } }, "node_modules/@open-formulieren/design-tokens": { - "version": "0.53.0", - "resolved": "https://registry.npmjs.org/@open-formulieren/design-tokens/-/design-tokens-0.53.0.tgz", - "integrity": "sha512-3Pv32ULCuFOJZ2GaqcpvB45u6xScr0lmW5ETB9P1Ox9TG5nvMcVSwuwYe/GwxbzmvtZgiMQRMKRFT9lNYLeREQ==" + "version": "0.57.0", + "resolved": "https://registry.npmjs.org/@open-formulieren/design-tokens/-/design-tokens-0.57.0.tgz", + "integrity": "sha512-oUm/NvhE2+N3h0igrqy3YAvXlZQWVmxOWeoVxcxlm8vhYyiZWdHrQRnxTikAa+uh2RaDPR/zZn2BF6SjbXoBjg==" }, "node_modules/@open-formulieren/formio-builder": { "version": "0.37.0", @@ -21639,9 +21639,9 @@ } }, "@open-formulieren/design-tokens": { - "version": "0.53.0", - "resolved": "https://registry.npmjs.org/@open-formulieren/design-tokens/-/design-tokens-0.53.0.tgz", - "integrity": "sha512-3Pv32ULCuFOJZ2GaqcpvB45u6xScr0lmW5ETB9P1Ox9TG5nvMcVSwuwYe/GwxbzmvtZgiMQRMKRFT9lNYLeREQ==" + "version": "0.57.0", + "resolved": "https://registry.npmjs.org/@open-formulieren/design-tokens/-/design-tokens-0.57.0.tgz", + "integrity": "sha512-oUm/NvhE2+N3h0igrqy3YAvXlZQWVmxOWeoVxcxlm8vhYyiZWdHrQRnxTikAa+uh2RaDPR/zZn2BF6SjbXoBjg==" }, "@open-formulieren/formio-builder": { "version": "0.37.0", diff --git a/package.json b/package.json index 4a7e9072a2..1b846c91a7 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "homepage": "https://maykinmedia.nl", "dependencies": { "@fortawesome/fontawesome-free": "^6.1.1", - "@open-formulieren/design-tokens": "^0.53.0", + "@open-formulieren/design-tokens": "^0.57.0", "@open-formulieren/formio-builder": "^0.37.0", "@open-formulieren/leaflet-tools": "^1.0.0", "@open-formulieren/monaco-json-editor": "^0.2.0", From ea227c472f06a0224dc09a890b51b989b03b9366 Mon Sep 17 00:00:00 2001 From: Sergei Maertens Date: Thu, 6 Mar 2025 21:11:55 +0100 Subject: [PATCH 2/2] :arrow_up: Upgrade @utrecht/components to v7 --- package-lock.json | 35 ++++++++++++++++------ package.json | 2 +- src/openforms/ui/static/ui/scss/_nlds.scss | 12 ++++---- 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6807e823b2..6a918b1a3d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -59,7 +59,7 @@ "@storybook/react-webpack5": "^8.6.0", "@storybook/test": "^8.6.0", "@storybook/test-runner": "^0.21.3", - "@utrecht/components": "^1.0.0-alpha.378", + "@utrecht/components": "^7.4.0", "autoprefixer": "^10.2.4", "babel-loader": "^8.2.2", "babel-plugin-formatjs": "^10.5.1", @@ -6357,12 +6357,21 @@ "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==" }, "node_modules/@utrecht/components": { - "version": "1.0.0-alpha.378", - "resolved": "https://registry.npmjs.org/@utrecht/components/-/components-1.0.0-alpha.378.tgz", - "integrity": "sha512-rVNBYKpgnZ76RQ0P8QY0S9PxBAYelm2uy2CIZkbWAEDFIVNA50paQOMqesbjqADp3JZgEKFMJ04MABa5beXP3Q==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@utrecht/components/-/components-7.4.0.tgz", + "integrity": "sha512-LWFJjJ7TF0eaoWq5TGrg7rNYnG+G5yIEJhuiwFlbICwSx2n+gZVbAE1dAW8YG2mGqveXZk38hBC2FWNE1tj1BQ==", "dev": true, "dependencies": { - "clsx": "1.2.1" + "clsx": "2.1.1" + } + }, + "node_modules/@utrecht/components/node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "dev": true, + "engines": { + "node": ">=6" } }, "node_modules/@vitest/expect": { @@ -22882,12 +22891,20 @@ "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==" }, "@utrecht/components": { - "version": "1.0.0-alpha.378", - "resolved": "https://registry.npmjs.org/@utrecht/components/-/components-1.0.0-alpha.378.tgz", - "integrity": "sha512-rVNBYKpgnZ76RQ0P8QY0S9PxBAYelm2uy2CIZkbWAEDFIVNA50paQOMqesbjqADp3JZgEKFMJ04MABa5beXP3Q==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@utrecht/components/-/components-7.4.0.tgz", + "integrity": "sha512-LWFJjJ7TF0eaoWq5TGrg7rNYnG+G5yIEJhuiwFlbICwSx2n+gZVbAE1dAW8YG2mGqveXZk38hBC2FWNE1tj1BQ==", "dev": true, "requires": { - "clsx": "1.2.1" + "clsx": "2.1.1" + }, + "dependencies": { + "clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "dev": true + } } }, "@vitest/expect": { diff --git a/package.json b/package.json index 1b846c91a7..5edb2c4818 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "@storybook/react-webpack5": "^8.6.0", "@storybook/test": "^8.6.0", "@storybook/test-runner": "^0.21.3", - "@utrecht/components": "^1.0.0-alpha.378", + "@utrecht/components": "^7.4.0", "autoprefixer": "^10.2.4", "babel-loader": "^8.2.2", "babel-plugin-formatjs": "^10.5.1", diff --git a/src/openforms/ui/static/ui/scss/_nlds.scss b/src/openforms/ui/static/ui/scss/_nlds.scss index edcef0f7df..788ccecc8c 100644 --- a/src/openforms/ui/static/ui/scss/_nlds.scss +++ b/src/openforms/ui/static/ui/scss/_nlds.scss @@ -1,6 +1,6 @@ -@import '@utrecht/components/heading-2/css/index.scss'; -@import '@utrecht/components/link-list/css/index.scss'; -@import '@utrecht/components/page/css/index.scss'; -@import '@utrecht/components/page-content/css/index.scss'; -@import '@utrecht/components/page-header/css/index.scss'; -@import '@utrecht/components/page-footer/css/index.scss'; +@import '@utrecht/components/heading-2'; +@import '@utrecht/components/link-list'; +@import '@utrecht/components/page'; +@import '@utrecht/components/page-content'; +@import '@utrecht/components/page-header'; +@import '@utrecht/components/page-footer';