{page?.content?.filter(isTruthy).map((block, index) => {
diff --git a/packages/ui/src/components/Routes/Menu.tsx b/packages/ui/src/components/Routes/Menu.tsx
index ea867bbd8..17c733fc2 100644
--- a/packages/ui/src/components/Routes/Menu.tsx
+++ b/packages/ui/src/components/Routes/Menu.tsx
@@ -10,7 +10,6 @@ export function useMenus() {
const locale = intl.locale;
const settings = useOperation(FrameQuery).data;
- console.log('settings:', settings);
return {
main: settings?.mainNavigation
?.filter((nav) => nav?.locale === locale)
@@ -90,6 +89,5 @@ export function useMenuAncestors(path: string, menuName: MenuNameType) {
export const useBreadcrumbs = (menuName?: MenuNameType, path?: string) => {
const currentPath = useCurrentPath();
- console.log('currentPath', currentPath);
return useMenuAncestors(path || currentPath || '', menuName || 'main');
};
diff --git a/packages/ui/src/iframe.css b/packages/ui/src/iframe.css
index 8633ffd05..302b70921 100644
--- a/packages/ui/src/iframe.css
+++ b/packages/ui/src/iframe.css
@@ -12,7 +12,8 @@ h1 {
@apply sr-only;
}
-.visually-hidden.focusable:active, .visually-hidden.focusable:focus {
+.visually-hidden.focusable:active,
+.visually-hidden.focusable:focus {
@apply not-sr-only ml-1;
}
@@ -21,25 +22,40 @@ h1 {
@apply px-1 text-gray-900;
}
+/* add style to visually-hidden class globally */
+.webform-submission-form .visually-hidden {
+ @apply sr-only;
+}
+
/* Vertical spacing */
+.webform-submission-form .webform-flexbox {
+ @apply md:my-0 gap-y-4 md:gap-y-0 flex flex-col md:flex-row;
+}
+
.webform-submission-form > *:not(:last-child) {
- @apply mb-10;
+ @apply mb-4 md:mb-6;
}
.fieldset-wrapper > *:not(:last-child) {
@apply mb-5;
}
+.webform-address {
+ @apply flex flex-col gap-y-4 md:gap-y-6;
+}
+
/* Label */
.form-item label {
- @apply block mb-2;
+ @apply block mb-2 text-sm;
}
-.form-item input[type="checkbox"] + label, .form-item input[type="radio"] + label {
+.form-item input[type='checkbox'] + label,
+.form-item input[type='radio'] + label {
@apply inline;
}
-.form-item input[type="checkbox"], .form-item input[type="radio"] {
+.form-item input[type='checkbox'],
+.form-item input[type='radio'] {
@apply mr-1;
}
@@ -52,52 +68,54 @@ h1 {
@apply mt-2;
}
-.form-item input[type="checkbox"] + label + .description,
-.form-item input[type="radio"] + label + .description {
+.form-item input[type='checkbox'] + label + .description,
+.form-item input[type='radio'] + label + .description {
@apply mt-0;
}
-
/* field */
-.form-item input[type="email"],
-.form-item input[type="password"],
-.form-item input[type="date"],
-.form-item input[type="text"],
-.form-item input[type="number"],
-.form-item input[type="datetime-local"],
-.form-item input[type="time"],
-.form-item input[type="url"],
-.form-item input[type="tel"],
-.form-item input[type="search"],
-.form-item input[type="color"],
+.form-item input[type='email'],
+.form-item input[type='password'],
+.form-item input[type='date'],
+.form-item input[type='text'],
+.form-item input[type='number'],
+.form-item input[type='datetime-local'],
+.form-item input[type='time'],
+.form-item input[type='url'],
+.form-item input[type='tel'],
+.form-item input[type='search'],
+.form-item input[type='color'],
.form-item textarea,
.form-item select {
- @apply bg-gray-50 border border-gray-300 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5;
+ @apply bg-gray-50 border border-gray-300 text-base rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5;
}
/* checkbox */
-.form-item input[type="checkbox"] {
+.form-item input[type='checkbox'] {
@apply rounded -mt-1;
}
-.form-item input[type="checkbox"]:not(:checked), .form-item input[type="radio"]:not(:checked) {
+.form-item input[type='checkbox']:not(:checked),
+.form-item input[type='radio']:not(:checked) {
@apply bg-gray-50 border-gray-300;
}
-.form-item input[type="file"] {
+.form-item input[type='file'] {
@apply block cursor-pointer bg-gray-50 border border-gray-300 rounded-lg block text-sm w-full;
}
-.form-item input[type="file"]::file-selector-button {
+.form-item input[type='file']::file-selector-button {
@apply text-white bg-blue-700 hover:bg-blue-800 rounded-l-lg text-sm w-full sm:w-auto px-6 py-2.5 text-center shadow-none border-0 font-medium mr-4;
}
-
-.form-actions input[type="submit"] {
+.form-actions input[type='submit'] {
@apply text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm w-full sm:w-auto px-5 py-2.5 text-center;
}
-.form-item input.error, .form-item textarea.error, .form-item select.error, .form-item input[type="checkbox"].error {
+.form-item input.error,
+.form-item textarea.error,
+.form-item select.error,
+.form-item input[type='checkbox'].error {
@apply border-red-500;
}
@@ -105,12 +123,11 @@ h1 {
@apply content-['*'] text-gray-900 pl-1;
}
-
.fieldset-legend {
@apply font-bold mb-2 block;
}
-[data-drupal-messages] [role="alert"] {
+[data-drupal-messages] [role='alert'] {
@apply text-red-500;
}
@@ -148,7 +165,8 @@ h1 {
@apply right-5;
}
-.ui-dialog .ui-button .ui-icon-closethick, .ui-dialog .ui-button:hover .ui-icon-closethick {
+.ui-dialog .ui-button .ui-icon-closethick,
+.ui-dialog .ui-button:hover .ui-icon-closethick {
background-image: url("data:image/svg+xml;utf8,
");
@apply bg-no-repeat bg-center h-10 w-10 -left-0.5 -top-0.5 rounded-lg;
}
@@ -164,5 +182,5 @@ h1 {
/* terms of service field - Dropdown */
.webform-terms-of-service-details {
- @apply text-gray-900 border-gray-300 border rounded-lg p-5 leading-relaxed;
+ @apply text-gray-900 border-gray-300 border rounded-lg p-5 leading-relaxed hidden;
}
diff --git a/packages/ui/src/tailwind.config.cjs b/packages/ui/src/tailwind.config.cjs
index bbdaea5bf..e66fff3a7 100644
--- a/packages/ui/src/tailwind.config.cjs
+++ b/packages/ui/src/tailwind.config.cjs
@@ -1,9 +1,61 @@
/** @type {import('tailwindcss').Config} */
-const theme = require('./stylingAssets.json');
+const stylingAssets = require('./stylingAssets.json');
module.exports = {
content: ['./src/**/*.{tsx, mdx}'],
- ...theme,
+ theme: {
+ extend: {
+ typography: ({ theme }) => ({
+ DEFAULT: {
+ css: [
+ {
+ 'a, p a': {},
+ 'ul, ol': {
+ fontSize: '1.125rem',
+ lineHeight: '1.688rem',
+ paddingLeft: '2.5rem',
+ },
+ 'ul>li::marker, ol>li::marker': {},
+ strong: {
+ color: theme('colors.gray.900'),
+ fontWeight: '700',
+ },
+ '.prose p': {
+ color: theme('colors.gray.500'),
+ fontSize: '1.125rem',
+ lineHeight: '1.688rem',
+ },
+ '.prose a, .prose p a': {
+ color: theme('colors.blue.600'),
+ fontWeight: '400',
+ },
+ '.prose em': {
+ color: theme('colors.gray.900'),
+ },
+ 'prose marker': {
+ fontWeight: '700',
+ },
+ blockquote: {},
+ '.prose blockquote p': {
+ fontWeight: '700',
+ color: '#111928',
+ },
+ cite: {},
+ 'h1, h2, h3, h4, h5, h6': {},
+ '.prose h1': {},
+ '.prose h2': {
+ fontWeight: '700',
+ color: theme('colors.gray.900'),
+ },
+ '.prose h3': {},
+ '.prose h4': {},
+ },
+ ],
+ },
+ }),
+ },
+ ...stylingAssets.theme,
+ },
plugins: [
require('@tailwindcss/forms'),
require('@tailwindcss/aspect-ratio'),
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 05006d49f..cf1905123 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -16,7 +16,7 @@ importers:
devDependencies:
'@commitlint/cli':
specifier: ^18.4.3
- version: 18.4.3(@types/node@18.19.31)(typescript@5.3.3)
+ version: 18.4.3(@types/node@20.11.17)(typescript@5.3.3)
'@commitlint/config-conventional':
specifier: ^18.4.3
version: 18.4.3
@@ -54,8 +54,8 @@ importers:
specifier: ^8.0.3
version: 8.0.3
prettier:
- specifier: ^3.1.1
- version: 3.1.1
+ specifier: ^3.2.5
+ version: 3.2.5
turbo:
specifier: ^1.11.2
version: 1.11.2
@@ -64,13 +64,13 @@ importers:
version: 5.3.3
vitest:
specifier: ^1.1.1
- version: 1.1.1(@types/node@18.19.31)
+ version: 1.1.1(@types/node@20.11.17)
apps/cms:
dependencies:
'@amazeelabs/gatsby-source-silverback':
specifier: '*'
- version: 1.14.0(@types/node@18.19.31)(gatsby-plugin-sharp@5.13.1)(gatsby@5.13.3)(typescript@5.4.4)
+ version: 1.14.0(@types/node@20.11.17)(gatsby-plugin-sharp@5.13.1)(gatsby@5.13.3)(typescript@5.4.4)
'@custom/custom':
specifier: workspace:*
version: link:../../packages/drupal/custom
@@ -279,7 +279,7 @@ importers:
version: 1.0.1
'@amazeelabs/gatsby-source-silverback':
specifier: ^1.14.0
- version: 1.14.0(@types/node@18.19.31)(gatsby-plugin-sharp@5.13.1)(gatsby@5.13.1)(typescript@4.9.5)
+ version: 1.14.0(@types/node@20.11.17)(gatsby-plugin-sharp@5.13.1)(gatsby@5.13.1)(typescript@4.9.5)
'@amazeelabs/publisher':
specifier: ^2.4.17
version: 2.4.17(@types/react@18.2.46)(react@18.2.0)(typescript@4.9.5)
@@ -339,7 +339,7 @@ importers:
version: 2.1.35
netlify-cli:
specifier: ^17.21.1
- version: 17.21.1(@types/node@18.19.31)
+ version: 17.21.1(@types/node@20.11.17)
react:
specifier: ^18.2.0
version: 18.2.0
@@ -373,7 +373,7 @@ importers:
version: 2.0.3
vitest:
specifier: ^1.1.1
- version: 1.1.1(@types/node@18.19.31)(happy-dom@12.10.3)
+ version: 1.1.1(@types/node@20.11.17)(happy-dom@12.10.3)
packages/drupal/custom: {}
@@ -601,7 +601,7 @@ importers:
version: 8.0.0-alpha.14(jest@29.7.0)(vitest@1.1.1)
'@storybook/test-runner':
specifier: ^0.16.0
- version: 0.16.0(@types/node@18.19.31)
+ version: 0.16.0(@types/node@20.11.17)
'@swc/cli':
specifier: ^0.1.63
version: 0.1.63(@swc/core@1.3.102)
@@ -694,7 +694,7 @@ importers:
version: 5.3.3
vite:
specifier: ^5.0.10
- version: 5.0.10(@types/node@18.19.31)
+ version: 5.0.10(@types/node@20.11.17)
vite-imagetools:
specifier: ^6.2.9
version: 6.2.9
@@ -703,7 +703,7 @@ importers:
version: 1.0.3
vitest:
specifier: ^1.1.1
- version: 1.1.1(@types/node@18.19.31)(happy-dom@12.10.3)
+ version: 1.1.1(@types/node@20.11.17)(happy-dom@12.10.3)
tests/e2e:
devDependencies:
@@ -996,7 +996,7 @@ packages:
- utf-8-validate
dev: false
- /@amazeelabs/gatsby-source-silverback@1.14.0(@types/node@18.19.31)(gatsby-plugin-sharp@5.13.1)(gatsby@5.13.1)(typescript@4.9.5):
+ /@amazeelabs/gatsby-source-silverback@1.14.0(@types/node@20.11.17)(gatsby-plugin-sharp@5.13.1)(gatsby@5.13.1)(typescript@4.9.5):
resolution: {integrity: sha512-tIL4lPx7mQDBH5XiouXgTEhOIXF/oKDss0OYbHJEbxXVofv4IDifZcZZO1Hw9oWmrTSaJhYoC2Bdm+2kdvxf6g==}
peerDependencies:
gatsby-plugin-sharp: ^5.13.1
@@ -1006,7 +1006,7 @@ packages:
gatsby-graphql-source-toolkit: 2.0.4(gatsby@5.13.1)
gatsby-plugin-sharp: 5.13.1(gatsby@5.13.1)(graphql@16.8.1)
graphql: 16.8.1
- graphql-config: 5.0.3(@types/node@18.19.31)(graphql@16.8.1)(typescript@4.9.5)
+ graphql-config: 5.0.3(@types/node@20.11.17)(graphql@16.8.1)(typescript@4.9.5)
isomorphic-fetch: 3.0.0
lodash-es: 4.17.21
node-fetch: 3.3.2
@@ -1021,7 +1021,7 @@ packages:
- utf-8-validate
dev: false
- /@amazeelabs/gatsby-source-silverback@1.14.0(@types/node@18.19.31)(gatsby-plugin-sharp@5.13.1)(gatsby@5.13.3)(typescript@5.4.4):
+ /@amazeelabs/gatsby-source-silverback@1.14.0(@types/node@20.11.17)(gatsby-plugin-sharp@5.13.1)(gatsby@5.13.3)(typescript@5.4.4):
resolution: {integrity: sha512-tIL4lPx7mQDBH5XiouXgTEhOIXF/oKDss0OYbHJEbxXVofv4IDifZcZZO1Hw9oWmrTSaJhYoC2Bdm+2kdvxf6g==}
peerDependencies:
gatsby-plugin-sharp: ^5.13.1
@@ -1031,7 +1031,7 @@ packages:
gatsby-graphql-source-toolkit: 2.0.4(gatsby@5.13.3)
gatsby-plugin-sharp: 5.13.1(gatsby@5.13.3)(graphql@16.8.1)
graphql: 16.8.1
- graphql-config: 5.0.3(@types/node@18.19.31)(graphql@16.8.1)(typescript@5.4.4)
+ graphql-config: 5.0.3(@types/node@20.11.17)(graphql@16.8.1)(typescript@5.4.4)
isomorphic-fetch: 3.0.0
lodash-es: 4.17.21
node-fetch: 3.3.2
@@ -2687,14 +2687,14 @@ packages:
resolution: {integrity: sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==}
engines: {node: '>=0.1.90'}
- /@commitlint/cli@18.4.3(@types/node@18.19.31)(typescript@5.3.3):
+ /@commitlint/cli@18.4.3(@types/node@20.11.17)(typescript@5.3.3):
resolution: {integrity: sha512-zop98yfB3A6NveYAZ3P1Mb6bIXuCeWgnUfVNkH4yhIMQpQfzFwseadazOuSn0OOfTt0lWuFauehpm9GcqM5lww==}
engines: {node: '>=v18'}
hasBin: true
dependencies:
'@commitlint/format': 18.6.1
'@commitlint/lint': 18.6.1
- '@commitlint/load': 18.6.1(@types/node@18.19.31)(typescript@5.3.3)
+ '@commitlint/load': 18.6.1(@types/node@20.11.17)(typescript@5.3.3)
'@commitlint/read': 18.6.1
'@commitlint/types': 18.6.1
execa: 5.1.1
@@ -2765,7 +2765,7 @@ packages:
'@commitlint/types': 18.6.1
dev: true
- /@commitlint/load@18.6.1(@types/node@18.19.31)(typescript@5.3.3):
+ /@commitlint/load@18.6.1(@types/node@20.11.17)(typescript@5.3.3):
resolution: {integrity: sha512-p26x8734tSXUHoAw0ERIiHyW4RaI4Bj99D8YgUlVV9SedLf8hlWAfyIFhHRIhfPngLlCe0QYOdRKYFt8gy56TA==}
engines: {node: '>=v18'}
dependencies:
@@ -2775,7 +2775,7 @@ packages:
'@commitlint/types': 18.6.1
chalk: 4.1.2
cosmiconfig: 8.3.6(typescript@5.3.3)
- cosmiconfig-typescript-loader: 5.0.0(@types/node@18.19.31)(cosmiconfig@8.3.6)(typescript@5.3.3)
+ cosmiconfig-typescript-loader: 5.0.0(@types/node@20.11.17)(cosmiconfig@8.3.6)(typescript@5.3.3)
lodash.isplainobject: 4.0.6
lodash.merge: 4.6.2
lodash.uniq: 4.5.0
@@ -4720,7 +4720,7 @@ packages:
transitivePeerDependencies:
- '@types/node'
- /@graphql-tools/executor-http@1.0.9(@types/node@18.19.31)(graphql@16.8.1):
+ /@graphql-tools/executor-http@1.0.9(@types/node@20.11.17)(graphql@16.8.1):
resolution: {integrity: sha512-+NXaZd2MWbbrWHqU4EhXcrDbogeiCDmEbrAN+rMn4Nu2okDjn2MTFDbTIab87oEubQCH4Te1wDkWPKrzXup7+Q==}
engines: {node: '>=16.0.0'}
peerDependencies:
@@ -4731,7 +4731,7 @@ packages:
'@whatwg-node/fetch': 0.9.17
extract-files: 11.0.0
graphql: 16.8.1
- meros: 1.3.0(@types/node@18.19.31)
+ meros: 1.3.0(@types/node@20.11.17)
tslib: 2.6.2
value-or-promise: 1.0.12
transitivePeerDependencies:
@@ -5044,7 +5044,7 @@ packages:
- encoding
- utf-8-validate
- /@graphql-tools/url-loader@8.0.2(@types/node@18.19.31)(graphql@16.8.1):
+ /@graphql-tools/url-loader@8.0.2(@types/node@20.11.17)(graphql@16.8.1):
resolution: {integrity: sha512-1dKp2K8UuFn7DFo1qX5c1cyazQv2h2ICwA9esHblEqCYrgf69Nk8N7SODmsfWg94OEaI74IqMoM12t7eIGwFzQ==}
engines: {node: '>=16.0.0'}
peerDependencies:
@@ -5053,7 +5053,7 @@ packages:
'@ardatan/sync-fetch': 0.0.1
'@graphql-tools/delegate': 10.0.4(graphql@16.8.1)
'@graphql-tools/executor-graphql-ws': 1.1.2(graphql@16.8.1)
- '@graphql-tools/executor-http': 1.0.9(@types/node@18.19.31)(graphql@16.8.1)
+ '@graphql-tools/executor-http': 1.0.9(@types/node@20.11.17)(graphql@16.8.1)
'@graphql-tools/executor-legacy-ws': 1.0.6(graphql@16.8.1)
'@graphql-tools/utils': 10.1.2(graphql@16.8.1)
'@graphql-tools/wrap': 10.0.5(graphql@16.8.1)
@@ -5683,7 +5683,7 @@ packages:
magic-string: 0.27.0
react-docgen-typescript: 2.2.2(typescript@5.3.3)
typescript: 5.3.3
- vite: 5.0.10(@types/node@18.19.31)
+ vite: 5.0.10(@types/node@20.11.17)
dev: true
/@jridgewell/gen-mapping@0.3.5:
@@ -6032,7 +6032,7 @@ packages:
yargs: 17.7.2
dev: false
- /@netlify/build@29.36.6(@opentelemetry/api@1.8.0)(@types/node@18.19.31):
+ /@netlify/build@29.36.6(@opentelemetry/api@1.8.0)(@types/node@20.11.17):
resolution: {integrity: sha512-crNoY5Vr7tAodBfYdz8weM+NTw5q6W6ArkowNw6QhKXa4iRXT5MY6H0c2ztsge9o5gAYs55bDhBpKiPcZlzDlA==}
engines: {node: ^14.16.0 || >=16.0.0}
hasBin: true
@@ -6097,7 +6097,7 @@ packages:
strip-ansi: 7.1.0
supports-color: 9.4.0
terminal-link: 3.0.0
- ts-node: 10.9.2(@types/node@18.19.31)(typescript@5.4.4)
+ ts-node: 10.9.2(@types/node@20.11.17)(typescript@5.4.4)
typescript: 5.4.4
uuid: 9.0.0
yargs: 17.7.2
@@ -8352,7 +8352,7 @@ packages:
magic-string: 0.30.9
rollup: 3.29.4
typescript: 5.3.3
- vite: 5.0.10(@types/node@18.19.31)
+ vite: 5.0.10(@types/node@20.11.17)
transitivePeerDependencies:
- encoding
- supports-color
@@ -8861,7 +8861,7 @@ packages:
react: 18.2.0
react-docgen: 7.0.3
react-dom: 18.2.0(react@18.2.0)
- vite: 5.0.10(@types/node@18.19.31)
+ vite: 5.0.10(@types/node@20.11.17)
transitivePeerDependencies:
- '@preact/preset-vite'
- encoding
@@ -8935,7 +8935,7 @@ packages:
- supports-color
dev: true
- /@storybook/test-runner@0.16.0(@types/node@18.19.31):
+ /@storybook/test-runner@0.16.0(@types/node@20.11.17):
resolution: {integrity: sha512-LDmNbKFoEDW/VS9o6KR8e1r5MnbCc5ZojUfi5yqLdq80gFD7BvilgKgV0lUh/xWHryzoy+Ids5LYgrPJZmU2dQ==}
engines: {node: ^16.10.0 || ^18.0.0 || >=20.0.0}
hasBin: true
@@ -8955,7 +8955,7 @@ packages:
commander: 9.5.0
expect-playwright: 0.8.0
glob: 10.3.12
- jest: 29.7.0(@types/node@18.19.31)
+ jest: 29.7.0(@types/node@20.11.17)
jest-circus: 29.7.0
jest-environment-node: 29.7.0
jest-junit: 16.0.0
@@ -9413,10 +9413,10 @@ packages:
chalk: 3.0.0
css.escape: 1.5.1
dom-accessibility-api: 0.6.3
- jest: 29.7.0(@types/node@18.19.31)
+ jest: 29.7.0(@types/node@20.11.17)
lodash: 4.17.21
redent: 3.0.0
- vitest: 1.1.1(@types/node@18.19.31)(happy-dom@12.10.3)
+ vitest: 1.1.1(@types/node@20.11.17)(happy-dom@12.10.3)
dev: true
/@testing-library/react@14.1.2(react-dom@18.2.0)(react@18.2.0):
@@ -11044,7 +11044,7 @@ packages:
'@babel/plugin-transform-react-jsx-source': 7.24.1(@babel/core@7.24.4)
magic-string: 0.27.0
react-refresh: 0.14.0
- vite: 5.0.10(@types/node@18.19.31)
+ vite: 5.0.10(@types/node@20.11.17)
transitivePeerDependencies:
- supports-color
dev: true
@@ -14425,7 +14425,7 @@ packages:
object-assign: 4.1.1
vary: 1.1.2
- /cosmiconfig-typescript-loader@5.0.0(@types/node@18.19.31)(cosmiconfig@8.3.6)(typescript@5.3.3):
+ /cosmiconfig-typescript-loader@5.0.0(@types/node@20.11.17)(cosmiconfig@8.3.6)(typescript@5.3.3):
resolution: {integrity: sha512-+8cK7jRAReYkMwMiG+bxhcNKiHJDM6bR9FD/nGBXOWdMLuYawjF5cGrtLilJ+LGd3ZjCXnJjR5DkfWPoIVlqJA==}
engines: {node: '>=v16'}
peerDependencies:
@@ -14433,7 +14433,7 @@ packages:
cosmiconfig: '>=8.2'
typescript: '>=4'
dependencies:
- '@types/node': 18.19.31
+ '@types/node': 20.11.17
cosmiconfig: 8.3.6(typescript@5.3.3)
jiti: 1.21.0
typescript: 5.3.3
@@ -14559,7 +14559,7 @@ packages:
dependencies:
'@babel/runtime': 7.24.4
- /create-jest@29.7.0(@types/node@18.19.31):
+ /create-jest@29.7.0(@types/node@20.11.17):
resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==}
engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
hasBin: true
@@ -14568,7 +14568,7 @@ packages:
chalk: 4.1.2
exit: 0.1.2
graceful-fs: 4.2.11
- jest-config: 29.7.0(@types/node@18.19.31)
+ jest-config: 29.7.0(@types/node@20.11.17)
jest-util: 29.7.0
prompts: 2.4.2
transitivePeerDependencies:
@@ -20576,7 +20576,7 @@ packages:
- typescript
- utf-8-validate
- /graphql-config@5.0.3(@types/node@18.19.31)(graphql@16.8.1)(typescript@4.9.5):
+ /graphql-config@5.0.3(@types/node@20.11.17)(graphql@16.8.1)(typescript@4.9.5):
resolution: {integrity: sha512-BNGZaoxIBkv9yy6Y7omvsaBUHOzfFcII3UN++tpH8MGOKFPFkCPZuwx09ggANMt8FgyWP1Od8SWPmrUEZca4NQ==}
engines: {node: '>= 16.0.0'}
peerDependencies:
@@ -20590,7 +20590,7 @@ packages:
'@graphql-tools/json-file-loader': 8.0.1(graphql@16.8.1)
'@graphql-tools/load': 8.0.2(graphql@16.8.1)
'@graphql-tools/merge': 9.0.3(graphql@16.8.1)
- '@graphql-tools/url-loader': 8.0.2(@types/node@18.19.31)(graphql@16.8.1)
+ '@graphql-tools/url-loader': 8.0.2(@types/node@20.11.17)(graphql@16.8.1)
'@graphql-tools/utils': 10.1.2(graphql@16.8.1)
cosmiconfig: 8.3.6(typescript@4.9.5)
graphql: 16.8.1
@@ -20606,7 +20606,7 @@ packages:
- utf-8-validate
dev: false
- /graphql-config@5.0.3(@types/node@18.19.31)(graphql@16.8.1)(typescript@5.4.4):
+ /graphql-config@5.0.3(@types/node@20.11.17)(graphql@16.8.1)(typescript@5.4.4):
resolution: {integrity: sha512-BNGZaoxIBkv9yy6Y7omvsaBUHOzfFcII3UN++tpH8MGOKFPFkCPZuwx09ggANMt8FgyWP1Od8SWPmrUEZca4NQ==}
engines: {node: '>= 16.0.0'}
peerDependencies:
@@ -20620,7 +20620,7 @@ packages:
'@graphql-tools/json-file-loader': 8.0.1(graphql@16.8.1)
'@graphql-tools/load': 8.0.2(graphql@16.8.1)
'@graphql-tools/merge': 9.0.3(graphql@16.8.1)
- '@graphql-tools/url-loader': 8.0.2(@types/node@18.19.31)(graphql@16.8.1)
+ '@graphql-tools/url-loader': 8.0.2(@types/node@20.11.17)(graphql@16.8.1)
'@graphql-tools/utils': 10.1.2(graphql@16.8.1)
cosmiconfig: 8.3.6(typescript@5.4.4)
graphql: 16.8.1
@@ -22480,7 +22480,7 @@ packages:
- supports-color
dev: true
- /jest-cli@29.7.0(@types/node@18.19.31):
+ /jest-cli@29.7.0(@types/node@20.11.17):
resolution: {integrity: sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==}
engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
hasBin: true
@@ -22494,10 +22494,10 @@ packages:
'@jest/test-result': 29.7.0
'@jest/types': 29.6.3
chalk: 4.1.2
- create-jest: 29.7.0(@types/node@18.19.31)
+ create-jest: 29.7.0(@types/node@20.11.17)
exit: 0.1.2
import-local: 3.1.0
- jest-config: 29.7.0(@types/node@18.19.31)
+ jest-config: 29.7.0(@types/node@20.11.17)
jest-util: 29.7.0
jest-validate: 29.7.0
yargs: 17.7.2
@@ -22548,6 +22548,46 @@ packages:
- supports-color
dev: true
+ /jest-config@29.7.0(@types/node@20.11.17):
+ resolution: {integrity: sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==}
+ engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+ peerDependencies:
+ '@types/node': '*'
+ ts-node: '>=9.0.0'
+ peerDependenciesMeta:
+ '@types/node':
+ optional: true
+ ts-node:
+ optional: true
+ dependencies:
+ '@babel/core': 7.24.4
+ '@jest/test-sequencer': 29.7.0
+ '@jest/types': 29.6.3
+ '@types/node': 20.11.17
+ babel-jest: 29.7.0(@babel/core@7.24.4)
+ chalk: 4.1.2
+ ci-info: 3.9.0
+ deepmerge: 4.3.1
+ glob: 7.2.3
+ graceful-fs: 4.2.11
+ jest-circus: 29.7.0
+ jest-environment-node: 29.7.0
+ jest-get-type: 29.6.3
+ jest-regex-util: 29.6.3
+ jest-resolve: 29.7.0
+ jest-runner: 29.7.0
+ jest-util: 29.7.0
+ jest-validate: 29.7.0
+ micromatch: 4.0.5
+ parse-json: 5.2.0
+ pretty-format: 29.7.0
+ slash: 3.0.0
+ strip-json-comments: 3.1.1
+ transitivePeerDependencies:
+ - babel-plugin-macros
+ - supports-color
+ dev: true
+
/jest-diff@29.7.0:
resolution: {integrity: sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==}
engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -22686,7 +22726,7 @@ packages:
jest-runner: ^29.3.1
dependencies:
expect-playwright: 0.8.0
- jest: 29.7.0(@types/node@18.19.31)
+ jest: 29.7.0(@types/node@20.11.17)
jest-circus: 29.7.0
jest-environment-node: 29.7.0
jest-process-manager: 0.4.0
@@ -22897,7 +22937,7 @@ packages:
dependencies:
ansi-escapes: 6.2.1
chalk: 5.3.0
- jest: 29.7.0(@types/node@18.19.31)
+ jest: 29.7.0(@types/node@20.11.17)
jest-regex-util: 29.6.3
jest-watcher: 29.7.0
slash: 5.1.0
@@ -22945,7 +22985,7 @@ packages:
supports-color: 8.1.1
dev: true
- /jest@29.7.0(@types/node@18.19.31):
+ /jest@29.7.0(@types/node@20.11.17):
resolution: {integrity: sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==}
engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
hasBin: true
@@ -22958,7 +22998,7 @@ packages:
'@jest/core': 29.7.0
'@jest/types': 29.6.3
import-local: 3.1.0
- jest-cli: 29.7.0(@types/node@18.19.31)
+ jest-cli: 29.7.0(@types/node@20.11.17)
transitivePeerDependencies:
- '@types/node'
- babel-plugin-macros
@@ -24285,7 +24325,7 @@ packages:
dependencies:
'@types/node': 18.0.0
- /meros@1.3.0(@types/node@18.19.31):
+ /meros@1.3.0(@types/node@20.11.17):
resolution: {integrity: sha512-2BNGOimxEz5hmjUG2FwoxCt5HN7BXdaWyFqEwxPTrJzVdABtrL4TiHTcsWSFAxPQ/tOnEaQEJh3qWq71QRMY+w==}
engines: {node: '>=13'}
peerDependencies:
@@ -24294,7 +24334,7 @@ packages:
'@types/node':
optional: true
dependencies:
- '@types/node': 18.19.31
+ '@types/node': 20.11.17
dev: false
/methods@1.1.2:
@@ -25009,7 +25049,7 @@ packages:
resolution: {integrity: sha512-9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw==}
dev: false
- /netlify-cli@17.21.1(@types/node@18.19.31):
+ /netlify-cli@17.21.1(@types/node@20.11.17):
resolution: {integrity: sha512-B8QveV55h2dFCTnk5LInVW1MiXPINTQ61IkEtih15CVYpvVSQy+he8M6hdpucq83VqaF/phaJkb3Si2ligOxxw==}
engines: {node: '>=18.14.0'}
hasBin: true
@@ -25018,7 +25058,7 @@ packages:
'@bugsnag/js': 7.20.2
'@fastify/static': 6.10.2
'@netlify/blobs': 7.0.1
- '@netlify/build': 29.36.6(@opentelemetry/api@1.8.0)(@types/node@18.19.31)
+ '@netlify/build': 29.36.6(@opentelemetry/api@1.8.0)(@types/node@20.11.17)
'@netlify/build-info': 7.13.2
'@netlify/config': 20.12.1
'@netlify/edge-bundler': 11.3.0
@@ -27374,19 +27414,11 @@ packages:
hasBin: true
dev: true
- /prettier@3.1.1:
- resolution: {integrity: sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==}
- engines: {node: '>=14'}
- hasBin: true
- dev: true
-
/prettier@3.2.5:
resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==}
engines: {node: '>=14'}
hasBin: true
requiresBuild: true
- dev: false
- optional: true
/pretty-bytes@5.6.0:
resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==}
@@ -31507,7 +31539,7 @@ packages:
resolution: {integrity: sha512-PGcnJoTBnVGy6yYNFxWVNkdcAuAMstvutN9MgDJIV6L0oG8fB+ZNNy1T+wJzah8RPGor1mZuPQkVfXNDpy9eHA==}
dev: true
- /ts-node@10.9.2(@types/node@18.19.31)(typescript@5.4.4):
+ /ts-node@10.9.2(@types/node@20.11.17)(typescript@5.4.4):
resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==}
hasBin: true
peerDependencies:
@@ -31526,7 +31558,7 @@ packages:
'@tsconfig/node12': 1.0.11
'@tsconfig/node14': 1.0.3
'@tsconfig/node16': 1.0.4
- '@types/node': 18.19.31
+ '@types/node': 20.11.17
acorn: 8.11.3
acorn-walk: 8.3.2
arg: 4.1.3
@@ -32619,7 +32651,7 @@ packages:
- terser
dev: true
- /vite-node@1.1.1(@types/node@18.19.31):
+ /vite-node@1.1.1(@types/node@20.11.17):
resolution: {integrity: sha512-2bGE5w4jvym5v8llF6Gu1oBrmImoNSs4WmRVcavnG2me6+8UQntTqLiAMFyiAobp+ZXhj5ZFhI7SmLiFr/jrow==}
engines: {node: ^18.0.0 || >=20.0.0}
hasBin: true
@@ -32628,7 +32660,7 @@ packages:
debug: 4.3.4
pathe: 1.1.2
picocolors: 1.0.0
- vite: 5.2.8(@types/node@18.19.31)
+ vite: 5.2.8(@types/node@20.11.17)
transitivePeerDependencies:
- '@types/node'
- less
@@ -32691,7 +32723,7 @@ packages:
fsevents: 2.3.3
dev: true
- /vite@5.0.10(@types/node@18.19.31):
+ /vite@5.0.10(@types/node@20.11.17):
resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==}
engines: {node: ^18.0.0 || >=20.0.0}
hasBin: true
@@ -32719,7 +32751,7 @@ packages:
terser:
optional: true
dependencies:
- '@types/node': 18.19.31
+ '@types/node': 20.11.17
esbuild: 0.19.12
postcss: 8.4.32
rollup: 4.14.1
@@ -32797,6 +32829,7 @@ packages:
rollup: 4.14.1
optionalDependencies:
fsevents: 2.3.3
+ optional: true
/vite@5.2.8(@types/node@20.11.17):
resolution: {integrity: sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==}
@@ -33026,7 +33059,7 @@ packages:
- terser
dev: true
- /vitest@1.1.1(@types/node@18.19.31):
+ /vitest@1.1.1(@types/node@20.11.17):
resolution: {integrity: sha512-Ry2qs4UOu/KjpXVfOCfQkTnwSXYGrqTbBZxw6reIYEFjSy1QUARRg5pxiI5BEXy+kBVntxUYNMlq4Co+2vD3fQ==}
engines: {node: ^18.0.0 || >=20.0.0}
hasBin: true
@@ -33051,7 +33084,7 @@ packages:
jsdom:
optional: true
dependencies:
- '@types/node': 18.19.31
+ '@types/node': 20.11.17
'@vitest/expect': 1.1.1
'@vitest/runner': 1.1.1
'@vitest/snapshot': 1.1.1
@@ -33070,8 +33103,8 @@ packages:
strip-literal: 1.3.0
tinybench: 2.6.0
tinypool: 0.8.3
- vite: 5.2.8(@types/node@18.19.31)
- vite-node: 1.1.1(@types/node@18.19.31)
+ vite: 5.2.8(@types/node@20.11.17)
+ vite-node: 1.1.1(@types/node@20.11.17)
why-is-node-running: 2.2.2
transitivePeerDependencies:
- less
@@ -33083,7 +33116,7 @@ packages:
- terser
dev: true
- /vitest@1.1.1(@types/node@18.19.31)(happy-dom@12.10.3):
+ /vitest@1.1.1(@types/node@20.11.17)(happy-dom@12.10.3):
resolution: {integrity: sha512-Ry2qs4UOu/KjpXVfOCfQkTnwSXYGrqTbBZxw6reIYEFjSy1QUARRg5pxiI5BEXy+kBVntxUYNMlq4Co+2vD3fQ==}
engines: {node: ^18.0.0 || >=20.0.0}
hasBin: true
@@ -33108,7 +33141,7 @@ packages:
jsdom:
optional: true
dependencies:
- '@types/node': 18.19.31
+ '@types/node': 20.11.17
'@vitest/expect': 1.1.1
'@vitest/runner': 1.1.1
'@vitest/snapshot': 1.1.1
@@ -33128,8 +33161,8 @@ packages:
strip-literal: 1.3.0
tinybench: 2.6.0
tinypool: 0.8.3
- vite: 5.2.8(@types/node@18.19.31)
- vite-node: 1.1.1(@types/node@18.19.31)
+ vite: 5.2.8(@types/node@20.11.17)
+ vite-node: 1.1.1(@types/node@20.11.17)
why-is-node-running: 2.2.2
transitivePeerDependencies:
- less
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 75af705aa..1069ced0c 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,5 +1,5 @@
packages:
- - "apps/*"
- - "packages/*"
- - "packages/drupal/*"
- - "tests/*"
+ - 'apps/*'
+ - 'packages/*'
+ - 'packages/drupal/*'
+ - 'tests/*'