From b17f6b56c95f5e9dbc5e4ba9cfc7e2d02711daf2 Mon Sep 17 00:00:00 2001 From: Jordan Shatford Date: Thu, 28 Mar 2024 10:27:55 +1100 Subject: [PATCH] chore(deps): update project dependencies Signed-off-by: Jordan Shatford --- apps/extension/package.json | 4 +- apps/web/package.json | 4 +- packages/client/package.json | 2 +- packages/client/src/generated/core/OpenAPI.ts | 45 +++-- packages/client/src/generated/core/request.ts | 13 +- packages/config/package.json | 4 +- packages/ui/package.json | 4 +- pnpm-lock.yaml | 179 +++++++++--------- 8 files changed, 139 insertions(+), 116 deletions(-) diff --git a/apps/extension/package.json b/apps/extension/package.json index 978f7064..f0fd2260 100644 --- a/apps/extension/package.json +++ b/apps/extension/package.json @@ -27,14 +27,14 @@ }, "devDependencies": { "@sveltejs/vite-plugin-svelte": "^3.0.2", - "@tsconfig/svelte": "^5.0.3", + "@tsconfig/svelte": "^5.0.4", "@types/webextension-polyfill": "^0.10.7", "@yd/config": "workspace:*", "autoprefixer": "^10.4.19", "postcss": "^8.4.38", "svelte": "^4.2.12", "svelte-check": "^3.6.8", - "tailwindcss": "^3.4.1", + "tailwindcss": "^3.4.3", "tslib": "^2.6.2", "typescript": "^5.4.3", "wxt": "^0.17.9" diff --git a/apps/web/package.json b/apps/web/package.json index 87b50ce0..5863f055 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -19,7 +19,7 @@ "@yd/ui": "workspace:*" }, "devDependencies": { - "@sveltejs/adapter-auto": "^3.1.1", + "@sveltejs/adapter-auto": "^3.2.0", "@sveltejs/kit": "^2.5.4", "@sveltejs/vite-plugin-svelte": "^3.0.2", "@yd/config": "workspace:*", @@ -27,7 +27,7 @@ "postcss": "^8.4.38", "svelte": "^4.2.12", "svelte-check": "^3.6.8", - "tailwindcss": "^3.4.1", + "tailwindcss": "^3.4.3", "tslib": "^2.6.2", "typescript": "^5.4.3", "vite": "^5.2.6" diff --git a/packages/client/package.json b/packages/client/package.json index d0331417..c40d1f0c 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -12,7 +12,7 @@ "format": "prettier --write ." }, "devDependencies": { - "@hey-api/openapi-ts": "^0.29.0", + "@hey-api/openapi-ts": "^0.30.0", "@yd/api": "workspace:*", "@yd/config": "workspace:*", "prettier": "^3.2.5", diff --git a/packages/client/src/generated/core/OpenAPI.ts b/packages/client/src/generated/core/OpenAPI.ts index 251be03f..39bac05e 100644 --- a/packages/client/src/generated/core/OpenAPI.ts +++ b/packages/client/src/generated/core/OpenAPI.ts @@ -1,8 +1,28 @@ import type { ApiRequestOptions } from './ApiRequestOptions'; -import type { TConfig, TResult } from './types'; +import type { TResult } from './types'; -type Resolver = (options: ApiRequestOptions) => Promise; type Headers = Record; +type Middleware = (value: T) => T | Promise; +type Resolver = (options: ApiRequestOptions) => Promise; + +export class Interceptors { + _fns: Middleware[]; + + constructor() { + this._fns = []; + } + + eject(fn: Middleware) { + const index = this._fns.indexOf(fn); + if (index !== -1) { + this._fns = [...this._fns.slice(0, index), ...this._fns.slice(index + 1)]; + } + } + + use(fn: Middleware) { + this._fns = [...this._fns, fn]; + } +} export type OpenAPIConfig = { BASE: string; @@ -15,6 +35,7 @@ export type OpenAPIConfig = { USERNAME?: string | Resolver | undefined; VERSION: string; WITH_CREDENTIALS: boolean; + interceptors: { request: Interceptors; response: Interceptors }; }; export const OpenAPI: OpenAPIConfig = { @@ -27,22 +48,6 @@ export const OpenAPI: OpenAPIConfig = { TOKEN: undefined, USERNAME: undefined, VERSION: '1.0.0', - WITH_CREDENTIALS: false -}; - -export const mergeOpenApiConfig = ( - config: OpenAPIConfig, - overrides: TConfig -) => { - const merged = { ...config }; - Object.entries(overrides) - .filter(([key]) => key.startsWith('_')) - .forEach(([key, value]) => { - const k = key.slice(1).toLocaleUpperCase() as keyof typeof merged; - if (merged.hasOwnProperty(k)) { - // @ts-ignore - merged[k] = value; - } - }); - return merged; + WITH_CREDENTIALS: false, + interceptors: { request: new Interceptors(), response: new Interceptors() } }; diff --git a/packages/client/src/generated/core/request.ts b/packages/client/src/generated/core/request.ts index 7d3995a5..49b63b65 100644 --- a/packages/client/src/generated/core/request.ts +++ b/packages/client/src/generated/core/request.ts @@ -195,7 +195,7 @@ export const sendRequest = async ( ): Promise => { const controller = new AbortController(); - const request: RequestInit = { + let request: RequestInit = { headers, body: body ?? formData, method: options.method, @@ -206,6 +206,10 @@ export const sendRequest = async ( request.credentials = config.CREDENTIALS; } + for (const fn of config.interceptors.request._fns) { + request = await fn(request); + } + onCancel(() => controller.abort()); return await fetch(url, request); @@ -303,7 +307,12 @@ export const request = ( const headers = await getHeaders(config, options); if (!onCancel.isCancelled) { - const response = await sendRequest(config, options, url, body, formData, headers, onCancel); + let response = await sendRequest(config, options, url, body, formData, headers, onCancel); + + for (const fn of config.interceptors.response._fns) { + response = await fn(response); + } + const responseBody = await getResponseBody(response); const responseHeader = getResponseHeader(response, options.responseHeader); diff --git a/packages/config/package.json b/packages/config/package.json index 4156cfdd..074cde2a 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -25,7 +25,7 @@ "eslint-plugin-svelte": "^2.35.1", "prettier": "^3.2.5", "prettier-plugin-svelte": "^3.2.2", - "prettier-plugin-tailwindcss": "^0.5.12", - "tailwindcss": "^3.4.1" + "prettier-plugin-tailwindcss": "^0.5.13", + "tailwindcss": "^3.4.3" } } diff --git a/packages/ui/package.json b/packages/ui/package.json index ec17fdd7..44606c18 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -34,7 +34,7 @@ "svelte": "^4.0.0" }, "devDependencies": { - "@sveltejs/adapter-auto": "^3.1.1", + "@sveltejs/adapter-auto": "^3.2.0", "@sveltejs/kit": "^2.5.4", "@sveltejs/package": "^2.3.0", "@sveltejs/vite-plugin-svelte": "^3.0.2", @@ -44,7 +44,7 @@ "publint": "^0.2.7", "svelte": "^4.2.12", "svelte-check": "^3.6.8", - "tailwindcss": "^3.4.1", + "tailwindcss": "^3.4.3", "tslib": "^2.6.2", "typescript": "^5.4.3", "vite": "^5.2.6" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index db84759f..7cfe7aec 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -48,8 +48,8 @@ importers: specifier: ^3.0.2 version: 3.0.2(svelte@4.2.12)(vite@5.2.6) '@tsconfig/svelte': - specifier: ^5.0.3 - version: 5.0.3 + specifier: ^5.0.4 + version: 5.0.4 '@types/webextension-polyfill': specifier: ^0.10.7 version: 0.10.7 @@ -69,8 +69,8 @@ importers: specifier: ^3.6.8 version: 3.6.8(postcss@8.4.38)(svelte@4.2.12) tailwindcss: - specifier: ^3.4.1 - version: 3.4.1 + specifier: ^3.4.3 + version: 3.4.3 tslib: specifier: ^2.6.2 version: 2.6.2 @@ -91,8 +91,8 @@ importers: version: link:../../packages/ui devDependencies: '@sveltejs/adapter-auto': - specifier: ^3.1.1 - version: 3.1.1(@sveltejs/kit@2.5.4) + specifier: ^3.2.0 + version: 3.2.0(@sveltejs/kit@2.5.4) '@sveltejs/kit': specifier: ^2.5.4 version: 2.5.4(@sveltejs/vite-plugin-svelte@3.0.2)(svelte@4.2.12)(vite@5.2.6) @@ -115,8 +115,8 @@ importers: specifier: ^3.6.8 version: 3.6.8(postcss@8.4.38)(svelte@4.2.12) tailwindcss: - specifier: ^3.4.1 - version: 3.4.1 + specifier: ^3.4.3 + version: 3.4.3 tslib: specifier: ^2.6.2 version: 2.6.2 @@ -130,8 +130,8 @@ importers: packages/client: devDependencies: '@hey-api/openapi-ts': - specifier: ^0.29.0 - version: 0.29.0 + specifier: ^0.30.0 + version: 0.30.0 '@yd/api': specifier: workspace:* version: link:../../apps/api @@ -149,7 +149,7 @@ importers: devDependencies: '@tailwindcss/forms': specifier: ^0.5.7 - version: 0.5.7(tailwindcss@3.4.1) + version: 0.5.7(tailwindcss@3.4.3) '@typescript-eslint/eslint-plugin': specifier: ^7.4.0 version: 7.4.0(@typescript-eslint/parser@7.4.0)(eslint@8.57.0)(typescript@5.4.3) @@ -172,11 +172,11 @@ importers: specifier: ^3.2.2 version: 3.2.2(prettier@3.2.5)(svelte@4.2.12) prettier-plugin-tailwindcss: - specifier: ^0.5.12 - version: 0.5.12(prettier-plugin-svelte@3.2.2)(prettier@3.2.5) + specifier: ^0.5.13 + version: 0.5.13(prettier-plugin-svelte@3.2.2)(prettier@3.2.5) tailwindcss: - specifier: ^3.4.1 - version: 3.4.1 + specifier: ^3.4.3 + version: 3.4.3 packages/ui: dependencies: @@ -191,11 +191,11 @@ importers: version: 1.5.0(svelte@4.2.12) tailwind-variants: specifier: ^0.2.1 - version: 0.2.1(tailwindcss@3.4.1) + version: 0.2.1(tailwindcss@3.4.3) devDependencies: '@sveltejs/adapter-auto': - specifier: ^3.1.1 - version: 3.1.1(@sveltejs/kit@2.5.4) + specifier: ^3.2.0 + version: 3.2.0(@sveltejs/kit@2.5.4) '@sveltejs/kit': specifier: ^2.5.4 version: 2.5.4(@sveltejs/vite-plugin-svelte@3.0.2)(svelte@4.2.12)(vite@5.2.6) @@ -224,8 +224,8 @@ importers: specifier: ^3.6.8 version: 3.6.8(postcss@8.4.38)(svelte@4.2.12) tailwindcss: - specifier: ^3.4.1 - version: 3.4.1 + specifier: ^3.4.3 + version: 3.4.3 tslib: specifier: ^2.6.2 version: 2.6.2 @@ -1147,8 +1147,8 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@hey-api/openapi-ts@0.29.0: - resolution: {integrity: sha512-jIaVGaspEULrCZdQb+JfmAB4Bsopoi/8RySmC/dhgD59iEjZVIzuyGRlCJA6TWmIj+lRLmuTTn5wWQITn/TkDw==} + /@hey-api/openapi-ts@0.30.0: + resolution: {integrity: sha512-zkY0MAQrNC7g7QttBCq5bkd0upxRdq0PVBgZjCp4LGbOZVVe7efddrh+lnyvX0NSkCbCMXNRreKSv2ZmyXI3qA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true dependencies: @@ -1301,104 +1301,112 @@ packages: picomatch: 2.3.1 dev: true - /@rollup/rollup-android-arm-eabi@4.13.0: - resolution: {integrity: sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==} + /@rollup/rollup-android-arm-eabi@4.13.1: + resolution: {integrity: sha512-4C4UERETjXpC4WpBXDbkgNVgHyWfG3B/NKY46e7w5H134UDOFqUJKpsLm0UYmuupW+aJmRgeScrDNfvZ5WV80A==} cpu: [arm] os: [android] requiresBuild: true dev: true optional: true - /@rollup/rollup-android-arm64@4.13.0: - resolution: {integrity: sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==} + /@rollup/rollup-android-arm64@4.13.1: + resolution: {integrity: sha512-TrTaFJ9pXgfXEiJKQ3yQRelpQFqgRzVR9it8DbeRzG0RX7mKUy0bqhCFsgevwXLJepQKTnLl95TnPGf9T9AMOA==} cpu: [arm64] os: [android] requiresBuild: true dev: true optional: true - /@rollup/rollup-darwin-arm64@4.13.0: - resolution: {integrity: sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==} + /@rollup/rollup-darwin-arm64@4.13.1: + resolution: {integrity: sha512-fz7jN6ahTI3cKzDO2otQuybts5cyu0feymg0bjvYCBrZQ8tSgE8pc0sSNEuGvifrQJWiwx9F05BowihmLxeQKw==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /@rollup/rollup-darwin-x64@4.13.0: - resolution: {integrity: sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==} + /@rollup/rollup-darwin-x64@4.13.1: + resolution: {integrity: sha512-WTvdz7SLMlJpektdrnWRUN9C0N2qNHwNbWpNo0a3Tod3gb9leX+yrYdCeB7VV36OtoyiPAivl7/xZ3G1z5h20g==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-arm-gnueabihf@4.13.0: - resolution: {integrity: sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==} + /@rollup/rollup-linux-arm-gnueabihf@4.13.1: + resolution: {integrity: sha512-dBHQl+7wZzBYcIF6o4k2XkAfwP2ks1mYW2q/Gzv9n39uDcDiAGDqEyml08OdY0BIct0yLSPkDTqn4i6czpBLLw==} cpu: [arm] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-arm64-gnu@4.13.0: - resolution: {integrity: sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==} + /@rollup/rollup-linux-arm64-gnu@4.13.1: + resolution: {integrity: sha512-bur4JOxvYxfrAmocRJIW0SADs3QdEYK6TQ7dTNz6Z4/lySeu3Z1H/+tl0a4qDYv0bCdBpUYM0sYa/X+9ZqgfSQ==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-arm64-musl@4.13.0: - resolution: {integrity: sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==} + /@rollup/rollup-linux-arm64-musl@4.13.1: + resolution: {integrity: sha512-ssp77SjcDIUSoUyj7DU7/5iwM4ZEluY+N8umtCT9nBRs3u045t0KkW02LTyHouHDomnMXaXSZcCSr2bdMK63kA==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-riscv64-gnu@4.13.0: - resolution: {integrity: sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==} + /@rollup/rollup-linux-riscv64-gnu@4.13.1: + resolution: {integrity: sha512-Jv1DkIvwEPAb+v25/Unrnnq9BO3F5cbFPT821n3S5litkz+O5NuXuNhqtPx5KtcwOTtaqkTsO+IVzJOsxd11aQ==} cpu: [riscv64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-x64-gnu@4.13.0: - resolution: {integrity: sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==} + /@rollup/rollup-linux-s390x-gnu@4.13.1: + resolution: {integrity: sha512-U564BrhEfaNChdATQaEODtquCC7Ez+8Hxz1h5MAdMYj0AqD0GA9rHCpElajb/sQcaFL6NXmHc5O+7FXpWMa73Q==} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-x64-gnu@4.13.1: + resolution: {integrity: sha512-zGRDulLTeDemR8DFYyFIQ8kMP02xpUsX4IBikc7lwL9PrwR3gWmX2NopqiGlI2ZVWMl15qZeUjumTwpv18N7sQ==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-x64-musl@4.13.0: - resolution: {integrity: sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==} + /@rollup/rollup-linux-x64-musl@4.13.1: + resolution: {integrity: sha512-VTk/MveyPdMFkYJJPCkYBw07KcTkGU2hLEyqYMsU4NjiOfzoaDTW9PWGRsNwiOA3qI0k/JQPjkl/4FCK1smskQ==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-win32-arm64-msvc@4.13.0: - resolution: {integrity: sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==} + /@rollup/rollup-win32-arm64-msvc@4.13.1: + resolution: {integrity: sha512-L+hX8Dtibb02r/OYCsp4sQQIi3ldZkFI0EUkMTDwRfFykXBPptoz/tuuGqEd3bThBSLRWPR6wsixDSgOx/U3Zw==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /@rollup/rollup-win32-ia32-msvc@4.13.0: - resolution: {integrity: sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==} + /@rollup/rollup-win32-ia32-msvc@4.13.1: + resolution: {integrity: sha512-+dI2jVPfM5A8zme8riEoNC7UKk0Lzc7jCj/U89cQIrOjrZTCWZl/+IXUeRT2rEZ5j25lnSA9G9H1Ob9azaF/KQ==} cpu: [ia32] os: [win32] requiresBuild: true dev: true optional: true - /@rollup/rollup-win32-x64-msvc@4.13.0: - resolution: {integrity: sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==} + /@rollup/rollup-win32-x64-msvc@4.13.1: + resolution: {integrity: sha512-YY1Exxo2viZ/O2dMHuwQvimJ0SqvL+OAWQLLY6rvXavgQKjhQUzn7nc1Dd29gjB5Fqi00nrBWctJBOyfVMIVxw==} cpu: [x64] os: [win32] requiresBuild: true @@ -1426,8 +1434,8 @@ packages: svelte: 4.2.12 dev: false - /@sveltejs/adapter-auto@3.1.1(@sveltejs/kit@2.5.4): - resolution: {integrity: sha512-6LeZft2Fo/4HfmLBi5CucMYmgRxgcETweQl/yQoZo/895K3S9YWYN4Sfm/IhwlIpbJp3QNvhKmwCHbsqQNYQpw==} + /@sveltejs/adapter-auto@3.2.0(@sveltejs/kit@2.5.4): + resolution: {integrity: sha512-She5nKT47kwHE18v9NMe6pbJcvULr82u0V3yZ0ej3n1laWKGgkgdEABE9/ak5iDPs93LqsBkuIo51kkwCLBjJA==} peerDependencies: '@sveltejs/kit': ^2.0.0 dependencies: @@ -1532,17 +1540,17 @@ packages: defer-to-connect: 2.0.1 dev: true - /@tailwindcss/forms@0.5.7(tailwindcss@3.4.1): + /@tailwindcss/forms@0.5.7(tailwindcss@3.4.3): resolution: {integrity: sha512-QE7X69iQI+ZXwldE+rzasvbJiyV/ju1FGHH0Qn2W3FKbuYtqp8LKcy6iSw79fVUT5/Vvf+0XgLCeYVG+UV6hOw==} peerDependencies: tailwindcss: '>=3.0.0 || >= 3.0.0-alpha.1' dependencies: mini-svg-data-uri: 1.4.4 - tailwindcss: 3.4.1 + tailwindcss: 3.4.3 dev: true - /@tsconfig/svelte@5.0.3: - resolution: {integrity: sha512-Ms0t9K0oxioSb0lrZ5NRysx0nE/KsojYOG+db9v6wSaU/+P37vc0WRmh1QE1c8IAtTniD4yEhffGQuTKF8uaPw==} + /@tsconfig/svelte@5.0.4: + resolution: {integrity: sha512-BV9NplVgLmSi4mwKzD8BD/NQ8erOY/nUE/GpgWe2ckx+wIQF5RyRirn/QsSSCPeulVpc3RA/iJt6DpfTIZps0Q==} dev: true /@types/conventional-commits-parser@5.0.0: @@ -2078,7 +2086,7 @@ packages: hasBin: true dependencies: caniuse-lite: 1.0.30001600 - electron-to-chromium: 1.4.717 + electron-to-chromium: 1.4.719 node-releases: 2.0.14 update-browserslist-db: 1.0.13(browserslist@4.23.0) dev: true @@ -2864,8 +2872,8 @@ packages: /eastasianwidth@0.2.0: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} - /electron-to-chromium@1.4.717: - resolution: {integrity: sha512-6Fmg8QkkumNOwuZ/5mIbMU9WI3H2fmn5ajcVya64I5Yr5CcNmO7vcLt0Y7c96DCiMO5/9G+4sI2r6eEvdg1F7A==} + /electron-to-chromium@1.4.719: + resolution: {integrity: sha512-FbWy2Q2YgdFzkFUW/W5jBjE9dj+804+98E4Pup78JBPnbdb3pv6IneY2JCPKdeKLh3AOKHQeYf+KwLr7mxGh6Q==} dev: true /emoji-regex@10.3.0: @@ -4491,8 +4499,8 @@ packages: uhyphen: 0.2.0 dev: true - /listr2@8.0.2: - resolution: {integrity: sha512-v5jEMOeEJUpRjSXSB4U3w5A3YPmURYMUO/86f1PA4GGYcdbUQYpkbvKYT7Xaq1iu4Zjn51Rv1UeD1zsBXRijiQ==} + /listr2@8.1.1: + resolution: {integrity: sha512-w//D3d/sogqVYtz3EXRJAAiblnSoklftUbIlvWMN7AwJlqVEqjrJ9X2LM4NWOtfPWPxxPop2jS+vU1+kpA01bg==} engines: {node: '>=18.0.0'} dependencies: cli-truncate: 4.0.0 @@ -5497,14 +5505,15 @@ packages: svelte: 4.2.12 dev: true - /prettier-plugin-tailwindcss@0.5.12(prettier-plugin-svelte@3.2.2)(prettier@3.2.5): - resolution: {integrity: sha512-o74kiDBVE73oHW+pdkFSluHBL3cYEvru5YgEqNkBMFF7Cjv+w1vI565lTlfoJT4VLWDe0FMtZ7FkE/7a4pMXSQ==} + /prettier-plugin-tailwindcss@0.5.13(prettier-plugin-svelte@3.2.2)(prettier@3.2.5): + resolution: {integrity: sha512-2tPWHCFNC+WRjAC4SIWQNSOdcL1NNkydXim8w7TDqlZi+/ulZYz2OouAI6qMtkggnPt7lGamboj6LcTMwcCvoQ==} engines: {node: '>=14.21.3'} peerDependencies: '@ianvs/prettier-plugin-sort-imports': '*' '@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: '*' @@ -5516,7 +5525,6 @@ packages: prettier-plugin-sort-imports: '*' prettier-plugin-style-order: '*' prettier-plugin-svelte: '*' - prettier-plugin-twig-melody: '*' peerDependenciesMeta: '@ianvs/prettier-plugin-sort-imports': optional: true @@ -5526,6 +5534,8 @@ packages: optional: true '@trivago/prettier-plugin-sort-imports': optional: true + '@zackad/prettier-plugin-twig-melody': + optional: true prettier-plugin-astro: optional: true prettier-plugin-css-order: @@ -5546,8 +5556,6 @@ packages: optional: true prettier-plugin-svelte: optional: true - prettier-plugin-twig-melody: - optional: true dependencies: prettier: 3.2.5 prettier-plugin-svelte: 3.2.2(prettier@3.2.5)(svelte@4.2.12) @@ -5613,7 +5621,7 @@ packages: dotenv: 16.4.5 extract-zip: 2.0.1 formdata-node: 6.0.3 - listr2: 8.0.2 + listr2: 8.1.1 lodash.camelcase: 4.3.0 lodash.kebabcase: 4.1.1 lodash.snakecase: 4.1.1 @@ -5854,26 +5862,27 @@ packages: glob: 7.2.3 dev: true - /rollup@4.13.0: - resolution: {integrity: sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==} + /rollup@4.13.1: + resolution: {integrity: sha512-hFi+fU132IvJ2ZuihN56dwgpltpmLZHZWsx27rMCTZ2sYwrqlgL5sECGy1eeV2lAihD8EzChBVVhsXci0wD4Tg==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true dependencies: '@types/estree': 1.0.5 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.13.0 - '@rollup/rollup-android-arm64': 4.13.0 - '@rollup/rollup-darwin-arm64': 4.13.0 - '@rollup/rollup-darwin-x64': 4.13.0 - '@rollup/rollup-linux-arm-gnueabihf': 4.13.0 - '@rollup/rollup-linux-arm64-gnu': 4.13.0 - '@rollup/rollup-linux-arm64-musl': 4.13.0 - '@rollup/rollup-linux-riscv64-gnu': 4.13.0 - '@rollup/rollup-linux-x64-gnu': 4.13.0 - '@rollup/rollup-linux-x64-musl': 4.13.0 - '@rollup/rollup-win32-arm64-msvc': 4.13.0 - '@rollup/rollup-win32-ia32-msvc': 4.13.0 - '@rollup/rollup-win32-x64-msvc': 4.13.0 + '@rollup/rollup-android-arm-eabi': 4.13.1 + '@rollup/rollup-android-arm64': 4.13.1 + '@rollup/rollup-darwin-arm64': 4.13.1 + '@rollup/rollup-darwin-x64': 4.13.1 + '@rollup/rollup-linux-arm-gnueabihf': 4.13.1 + '@rollup/rollup-linux-arm64-gnu': 4.13.1 + '@rollup/rollup-linux-arm64-musl': 4.13.1 + '@rollup/rollup-linux-riscv64-gnu': 4.13.1 + '@rollup/rollup-linux-s390x-gnu': 4.13.1 + '@rollup/rollup-linux-x64-gnu': 4.13.1 + '@rollup/rollup-linux-x64-musl': 4.13.1 + '@rollup/rollup-win32-arm64-msvc': 4.13.1 + '@rollup/rollup-win32-ia32-msvc': 4.13.1 + '@rollup/rollup-win32-x64-msvc': 4.13.1 fsevents: 2.3.3 dev: true @@ -6518,18 +6527,18 @@ packages: '@babel/runtime': 7.24.1 dev: false - /tailwind-variants@0.2.1(tailwindcss@3.4.1): + /tailwind-variants@0.2.1(tailwindcss@3.4.3): resolution: {integrity: sha512-2xmhAf4UIc3PijOUcJPA1LP4AbxhpcHuHM2C26xM0k81r0maAO6uoUSHl3APmvHZcY5cZCY/bYuJdfFa4eGoaw==} engines: {node: '>=16.x', pnpm: '>=7.x'} peerDependencies: tailwindcss: '*' dependencies: tailwind-merge: 2.2.2 - tailwindcss: 3.4.1 + tailwindcss: 3.4.3 dev: false - /tailwindcss@3.4.1: - resolution: {integrity: sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA==} + /tailwindcss@3.4.3: + resolution: {integrity: sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==} engines: {node: '>=14.0.0'} hasBin: true dependencies: @@ -6951,7 +6960,7 @@ packages: '@types/node': 20.11.30 esbuild: 0.20.2 postcss: 8.4.38 - rollup: 4.13.0 + rollup: 4.13.1 optionalDependencies: fsevents: 2.3.3 dev: true