From e8a7630e8402f4bee3bc432c44b4a39f7b5c1ccb Mon Sep 17 00:00:00 2001 From: mnlfischer Date: Tue, 22 Oct 2024 08:19:25 +0200 Subject: [PATCH] fix: update dependencies and lint --- package-lock.json | 92 ++++++++++--------- package.json | 14 +-- src/components/button-group/button-group.tsx | 4 +- src/components/checkbox/checkbox.tsx | 2 +- .../form-field/form-field-error-message.tsx | 2 +- .../form-field/listbox/listbox-button.tsx | 4 +- src/components/page/page-description.tsx | 2 +- .../sidesheet-panel-header-action-group.tsx | 2 +- .../table-body-placeholder.tsx | 2 +- src/components/toggle/toggle.tsx | 2 +- .../top-bar-nav-links/top-bar-nav-link.tsx | 2 +- 11 files changed, 67 insertions(+), 61 deletions(-) diff --git a/package-lock.json b/package-lock.json index 436aecef..290bb9b3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -59,11 +59,11 @@ "eslint-plugin-storybook": "^0.8.0", "eslint-plugin-tsdoc": "0.2.17", "jsdom": "^24.1.0", - "prettier": "^3.1.0", - "prettier-plugin-tailwindcss": "0.5.9", + "prettier": "^3.3.3", + "prettier-plugin-tailwindcss": "0.6.8", "prop-types": "^15.8.1", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", "rimraf": "^5.0.5", "rollup": "^4.6.1", "rollup-plugin-dts": "^6.1.0", @@ -71,9 +71,9 @@ "rollup-plugin-postcss": "^4.0.2", "semantic-release": "^23.0.5", "storybook": "^8.2.4", - "tailwind-merge": "^2.1.0", - "tailwindcss": "^3.3.6", - "typescript": "^5.5.3", + "tailwind-merge": "^2.5.4", + "tailwindcss": "^3.4.14", + "typescript": "^5.6.3", "vite": "^5.3.4", "vitest": "^1.0.1" }, @@ -13391,9 +13391,9 @@ } }, "node_modules/jiti": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.19.1.tgz", - "integrity": "sha512-oVhqoRDaBXf7sjkll95LHVS6Myyyb1zaunVwk4Z0+WPSW4gjS0pl01zYKHScTuyEhQsFxV5L4DR5r+YqSyqyyg==", + "version": "1.21.6", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz", + "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==", "dev": true, "bin": { "jiti": "bin/jiti.js" @@ -18971,9 +18971,9 @@ "dev": true }, "node_modules/prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -18998,9 +18998,9 @@ } }, "node_modules/prettier-plugin-tailwindcss": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.9.tgz", - "integrity": "sha512-9x3t1s2Cjbut2QiP+O0mDqV3gLXTe2CgRlQDgucopVkUdw26sQi53p/q4qvGxMLBDfk/dcTV57Aa/zYwz9l8Ew==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.8.tgz", + "integrity": "sha512-dGu3kdm7SXPkiW4nzeWKCl3uoImdd5CTZEJGxyypEPL37Wj0HT2pLqjrvSei1nTeuQfO4PUfjeW5cTUNRLZ4sA==", "dev": true, "engines": { "node": ">=14.21.3" @@ -19010,14 +19010,17 @@ "@prettier/plugin-pug": "*", "@shopify/prettier-plugin-liquid": "*", "@trivago/prettier-plugin-sort-imports": "*", + "@zackad/prettier-plugin-twig-melody": "*", "prettier": "^3.0", "prettier-plugin-astro": "*", "prettier-plugin-css-order": "*", "prettier-plugin-import-sort": "*", "prettier-plugin-jsdoc": "*", "prettier-plugin-marko": "*", + "prettier-plugin-multiline-arrays": "*", "prettier-plugin-organize-attributes": "*", "prettier-plugin-organize-imports": "*", + "prettier-plugin-sort-imports": "*", "prettier-plugin-style-order": "*", "prettier-plugin-svelte": "*" }, @@ -19034,6 +19037,9 @@ "@trivago/prettier-plugin-sort-imports": { "optional": true }, + "@zackad/prettier-plugin-twig-melody": { + "optional": true + }, "prettier-plugin-astro": { "optional": true }, @@ -19049,19 +19055,22 @@ "prettier-plugin-marko": { "optional": true }, + "prettier-plugin-multiline-arrays": { + "optional": true + }, "prettier-plugin-organize-attributes": { "optional": true }, "prettier-plugin-organize-imports": { "optional": true }, - "prettier-plugin-style-order": { + "prettier-plugin-sort-imports": { "optional": true }, - "prettier-plugin-svelte": { + "prettier-plugin-style-order": { "optional": true }, - "prettier-plugin-twig-melody": { + "prettier-plugin-svelte": { "optional": true } } @@ -19279,9 +19288,9 @@ } }, "node_modules/react": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", - "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", + "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", "dev": true, "dependencies": { "loose-envify": "^1.1.0" @@ -19389,16 +19398,16 @@ } }, "node_modules/react-dom": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", - "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz", + "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==", "dev": true, "dependencies": { "loose-envify": "^1.1.0", - "scheduler": "^0.23.0" + "scheduler": "^0.23.2" }, "peerDependencies": { - "react": "^18.2.0" + "react": "^18.3.1" } }, "node_modules/react-element-to-jsx-string": { @@ -20206,9 +20215,9 @@ } }, "node_modules/scheduler": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", - "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", + "version": "0.23.2", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", + "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==", "dev": true, "dependencies": { "loose-envify": "^1.1.0" @@ -21620,22 +21629,19 @@ "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==" }, "node_modules/tailwind-merge": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.1.0.tgz", - "integrity": "sha512-l11VvI4nSwW7MtLSLYT4ldidDEUwQAMWuSHk7l4zcXZDgnCRa0V3OdCwFfM7DCzakVXMNRwAeje9maFFXT71dQ==", + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.4.tgz", + "integrity": "sha512-0q8cfZHMu9nuYP/b5Shb7Y7Sh1B7Nnl5GqNr1U+n2p6+mybvRtayrQ+0042Z5byvTA8ihjlP8Odo8/VnHbZu4Q==", "dev": true, - "dependencies": { - "@babel/runtime": "^7.23.5" - }, "funding": { "type": "github", "url": "https://github.com/sponsors/dcastil" } }, "node_modules/tailwindcss": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.6.tgz", - "integrity": "sha512-AKjF7qbbLvLaPieoKeTjG1+FyNZT6KaJMJPFeQyLfIp7l82ggH1fbHJSsYIvnbTFQOlkh+gBYpyby5GT1LIdLw==", + "version": "3.4.14", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.14.tgz", + "integrity": "sha512-IcSvOcTRcUtQQ7ILQL5quRDg7Xs93PdJEk1ZLbhhvJc7uj/OAhYOnruEiwnGgBvUtaUAJ8/mhSw1o8L2jCiENA==", "dev": true, "dependencies": { "@alloc/quick-lru": "^5.2.0", @@ -21646,7 +21652,7 @@ "fast-glob": "^3.3.0", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", - "jiti": "^1.19.1", + "jiti": "^1.21.0", "lilconfig": "^2.1.0", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", @@ -22305,9 +22311,9 @@ } }, "node_modules/typescript": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz", - "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==", + "version": "5.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", + "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/package.json b/package.json index 24f01958..69c002e0 100644 --- a/package.json +++ b/package.json @@ -91,11 +91,11 @@ "eslint-plugin-storybook": "^0.8.0", "eslint-plugin-tsdoc": "0.2.17", "jsdom": "^24.1.0", - "prettier": "^3.1.0", - "prettier-plugin-tailwindcss": "0.5.9", + "prettier": "^3.3.3", + "prettier-plugin-tailwindcss": "0.6.8", "prop-types": "^15.8.1", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", "rimraf": "^5.0.5", "rollup": "^4.6.1", "rollup-plugin-dts": "^6.1.0", @@ -103,9 +103,9 @@ "rollup-plugin-postcss": "^4.0.2", "semantic-release": "^23.0.5", "storybook": "^8.2.4", - "tailwind-merge": "^2.1.0", - "tailwindcss": "^3.3.6", - "typescript": "^5.5.3", + "tailwind-merge": "^2.5.4", + "tailwindcss": "^3.4.14", + "typescript": "^5.6.3", "vite": "^5.3.4", "vitest": "^1.0.1" }, diff --git a/src/components/button-group/button-group.tsx b/src/components/button-group/button-group.tsx index 66e28e46..0a1a4860 100644 --- a/src/components/button-group/button-group.tsx +++ b/src/components/button-group/button-group.tsx @@ -14,7 +14,7 @@ const Button = ({ children, type, isActive, ...props }: ButtonProps) => { // eslint-disable-next-line react/button-has-type type={type} className={classNames( - "relative -ml-px inline-flex bg-neutral-0 px-4 py-2 font-medium text-neutral-700 ring-1 ring-inset ring-neutral-400 hover:bg-neutral-100 hover:text-neutral-800 focus:z-10 focus:outline focus:outline-2 focus:outline-offset-0 focus:outline-primary-200 active:bg-neutral-200 disabled:bg-neutral-0 disabled:text-neutral-500", + "relative -ml-px inline-flex bg-neutral-0 px-4 py-2 font-medium text-neutral-700 ring-1 ring-inset ring-neutral-400 hover:bg-neutral-100 hover:text-neutral-800 focus:z-10 focus:outline focus:outline-2 focus:outline-offset-0 focus:outline-primary-200 active:bg-neutral-200 disabled:bg-neutral-0 disabled:text-neutral-500", isActive && "bg-primary-50 text-primary-500 hover:bg-primary-50 hover:text-primary-500 active:bg-primary-50 disabled:bg-neutral-100 disabled:text-neutral-500" )} @@ -31,7 +31,7 @@ interface ButtonGroupProps { const ButtonGroup = ({ children }: ButtonGroupProps) => { return ( -
+
{children}
); diff --git a/src/components/checkbox/checkbox.tsx b/src/components/checkbox/checkbox.tsx index 1d50efb5..aaadbbcc 100644 --- a/src/components/checkbox/checkbox.tsx +++ b/src/components/checkbox/checkbox.tsx @@ -11,7 +11,7 @@ interface CheckboxProps { export const Checkbox = ({ id, label, checked, onChange, disabled = false }: CheckboxProps) => { return ( -
+
-

{children}

+

{children}

); }; diff --git a/src/components/form-field/listbox/listbox-button.tsx b/src/components/form-field/listbox/listbox-button.tsx index 08486285..9c7717e7 100644 --- a/src/components/form-field/listbox/listbox-button.tsx +++ b/src/components/form-field/listbox/listbox-button.tsx @@ -1,9 +1,9 @@ import { ListboxButton as HeadlessUiListboxButton } from "@headlessui/react"; import React from "react"; import { CaretDownIcon } from "../../../icons"; +import { classNames } from "../../../util/class-names"; import { ListboxButtonBadgeValue } from "./listbox-button-badge-value"; import { ListboxButtonTextValue } from "./listbox-button-text-value"; -import { classNames } from "../../../util/class-names"; export interface ListboxButtonProps { children: React.ReactNode; @@ -23,7 +23,7 @@ const ListboxButton = ({ children, disabled }: ListboxButtonProps) => { {children}
-
+
diff --git a/src/components/page/page-description.tsx b/src/components/page/page-description.tsx index cf882634..28ff0fe9 100644 --- a/src/components/page/page-description.tsx +++ b/src/components/page/page-description.tsx @@ -5,5 +5,5 @@ export interface PageDescriptionProps { } export const PageDescription = ({ children }: PageDescriptionProps) => { - return

{children}

; + return

{children}

; }; diff --git a/src/components/sidesheet/sidesheet-panel-header-action-group.tsx b/src/components/sidesheet/sidesheet-panel-header-action-group.tsx index 9dff653f..dd85e5ad 100644 --- a/src/components/sidesheet/sidesheet-panel-header-action-group.tsx +++ b/src/components/sidesheet/sidesheet-panel-header-action-group.tsx @@ -7,5 +7,5 @@ export interface SidesheetPanelHeaderActionGroupProps { export const SidesheetPanelHeaderActionGroup = ({ children, }: SidesheetPanelHeaderActionGroupProps) => { - return
{children}
; + return
{children}
; }; diff --git a/src/components/table-unvirtualized/table-body/table-body-placeholder/table-body-placeholder.tsx b/src/components/table-unvirtualized/table-body/table-body-placeholder/table-body-placeholder.tsx index 874ea9a7..6932ef65 100644 --- a/src/components/table-unvirtualized/table-body/table-body-placeholder/table-body-placeholder.tsx +++ b/src/components/table-unvirtualized/table-body/table-body-placeholder/table-body-placeholder.tsx @@ -18,7 +18,7 @@ export const TableEmptyPlaceholder = ({ return ( -
+
{title}

{description}

diff --git a/src/components/toggle/toggle.tsx b/src/components/toggle/toggle.tsx index 8aadd1ff..86f887c1 100644 --- a/src/components/toggle/toggle.tsx +++ b/src/components/toggle/toggle.tsx @@ -46,7 +46,7 @@ const Switch = ({ checked = false, onChange, disabled = false, ariaLabel }: Swit className={classNames( "inline-block h-3 w-3 transform rounded-full transition", checked ? "translate-x-3.5" : "translate-x-0.5", - checked && disabled && "bg-neutral-400 ", + checked && disabled && "bg-neutral-400", checked && !disabled && "bg-neutral-0", !checked && disabled && "bg-neutral-400", !checked && !disabled && "bg-neutral-0" diff --git a/src/components/top-bar/top-bar-nav-links/top-bar-nav-link.tsx b/src/components/top-bar/top-bar-nav-links/top-bar-nav-link.tsx index e6a3b38f..10453936 100644 --- a/src/components/top-bar/top-bar-nav-links/top-bar-nav-link.tsx +++ b/src/components/top-bar/top-bar-nav-links/top-bar-nav-link.tsx @@ -12,7 +12,7 @@ export const TopBarNavLink = ({ isActive = false, children }: TopBarNavLinkProps