From af25f80ad07038f313b68478c847006b9180de5d Mon Sep 17 00:00:00 2001 From: Alexander Brown <448862+DrJKL@users.noreply.github.com> Date: Mon, 19 Jan 2026 16:10:23 -0800 Subject: [PATCH] chore: remove prettier and related plugins, use oxfmt for formatting Amp-Thread-ID: https://ampcode.com/threads/T-019bd8bb-e897-7758-91af-aed88d3dd47a Co-authored-by: Amp --- package.json | 173 +++++++++++----------- pnpm-lock.yaml | 339 +++++++++++++------------------------------- pnpm-workspace.yaml | 9 +- 3 files changed, 188 insertions(+), 333 deletions(-) diff --git a/package.json b/package.json index d0e8b7f85..c8dcc5d51 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "name": "@comfyorg/comfyui-frontend", - "private": true, "version": "1.38.6", - "type": "module", - "repository": "https://github.com/Comfy-Org/ComfyUI_frontend", - "homepage": "https://comfy.org", + "private": true, "description": "Official front-end implementation of ComfyUI", + "homepage": "https://comfy.org", "license": "GPL-3.0-only", + "repository": "https://github.com/Comfy-Org/ComfyUI_frontend", + "type": "module", "scripts": { "build:desktop": "nx build @comfyorg/desktop-ui", "build-storybook": "storybook build", @@ -22,10 +22,10 @@ "dev:no-vue": "cross-env DISABLE_VUE_PLUGINS=true nx serve", "dev": "nx serve", "devtools:pycheck": "python3 -m compileall -q tools/devtools", - "format:check:no-cache": "prettier --check './**/*.{js,ts,tsx,vue,mts}'", - "format:check": "prettier --check './**/*.{js,ts,tsx,vue,mts}' --cache", - "format:no-cache": "prettier --write './**/*.{js,ts,tsx,vue,mts}' --list-different", - "format": "prettier --write './**/*.{js,ts,tsx,vue,mts}' --cache --list-different", + "format:check:no-cache": "oxfmt './**/*.{js,ts,tsx,vue,mts}' --check", + "format:check": "oxfmt './**/*.{js,ts,tsx,vue,mts}' --check", + "format:no-cache": "oxfmt './**/*.{js,ts,tsx,vue,mts}'", + "format": "oxfmt './**/*.{js,ts,tsx,vue,mts}'", "json-schema": "tsx scripts/generate-json-schema.ts", "knip:no-cache": "knip", "knip": "knip --cache", @@ -53,84 +53,6 @@ "zipdist": "node scripts/zipdist.js", "clean": "nx reset" }, - "devDependencies": { - "@eslint/js": "catalog:", - "@intlify/eslint-plugin-vue-i18n": "catalog:", - "@lobehub/i18n-cli": "catalog:", - "@nx/eslint": "catalog:", - "@nx/playwright": "catalog:", - "@nx/storybook": "catalog:", - "@nx/vite": "catalog:", - "@pinia/testing": "catalog:", - "@playwright/test": "catalog:", - "@prettier/plugin-oxc": "catalog:", - "@sentry/vite-plugin": "catalog:", - "@storybook/addon-docs": "catalog:", - "@storybook/addon-mcp": "catalog:", - "@storybook/vue3": "catalog:", - "@storybook/vue3-vite": "catalog:", - "@tailwindcss/vite": "catalog:", - "@trivago/prettier-plugin-sort-imports": "catalog:", - "@types/fs-extra": "catalog:", - "@types/jsdom": "catalog:", - "@types/node": "catalog:", - "@types/semver": "catalog:", - "@types/three": "catalog:", - "@vitejs/plugin-vue": "catalog:", - "@vitest/coverage-v8": "catalog:", - "@vitest/ui": "catalog:", - "@vue/test-utils": "catalog:", - "@webgpu/types": "catalog:", - "cross-env": "catalog:", - "eslint": "catalog:", - "eslint-config-prettier": "catalog:", - "eslint-import-resolver-typescript": "catalog:", - "eslint-plugin-import-x": "catalog:", - "eslint-plugin-oxlint": "catalog:", - "eslint-plugin-storybook": "catalog:", - "eslint-plugin-unused-imports": "catalog:", - "eslint-plugin-vue": "catalog:", - "fs-extra": "^11.2.0", - "globals": "catalog:", - "happy-dom": "catalog:", - "husky": "catalog:", - "jiti": "catalog:", - "jsdom": "catalog:", - "knip": "catalog:", - "lint-staged": "catalog:", - "markdown-table": "catalog:", - "mixpanel-browser": "catalog:", - "nx": "catalog:", - "oxlint": "catalog:", - "oxlint-tsgolint": "catalog:", - "picocolors": "catalog:", - "postcss-html": "catalog:", - "prettier": "catalog:", - "pretty-bytes": "catalog:", - "rollup-plugin-visualizer": "catalog:", - "storybook": "catalog:", - "stylelint": "catalog:", - "tailwindcss": "catalog:", - "tailwindcss-primeui": "catalog:", - "tsx": "catalog:", - "tw-animate-css": "catalog:", - "typescript": "catalog:", - "typescript-eslint": "catalog:", - "unplugin-icons": "catalog:", - "unplugin-typegpu": "catalog:", - "unplugin-vue-components": "catalog:", - "uuid": "^11.1.0", - "vite": "catalog:", - "vite-plugin-dts": "catalog:", - "vite-plugin-html": "catalog:", - "vite-plugin-vue-devtools": "catalog:", - "vitest": "catalog:", - "vue-component-type-helpers": "catalog:", - "vue-eslint-parser": "catalog:", - "vue-tsc": "catalog:", - "zip-dir": "^2.0.0", - "zod-to-json-schema": "catalog:" - }, "dependencies": { "@alloc/quick-lru": "catalog:", "@atlaskit/pragmatic-drag-and-drop": "^1.3.1", @@ -193,6 +115,85 @@ "zod": "catalog:", "zod-validation-error": "catalog:" }, + "devDependencies": { + "@eslint/js": "catalog:", + "@intlify/eslint-plugin-vue-i18n": "catalog:", + "@lobehub/i18n-cli": "catalog:", + "@nx/eslint": "catalog:", + "@nx/playwright": "catalog:", + "@nx/storybook": "catalog:", + "@nx/vite": "catalog:", + "@pinia/testing": "catalog:", + "@playwright/test": "catalog:", + + "@sentry/vite-plugin": "catalog:", + "@storybook/addon-docs": "catalog:", + "@storybook/addon-mcp": "catalog:", + "@storybook/vue3": "catalog:", + "@storybook/vue3-vite": "catalog:", + "@tailwindcss/vite": "catalog:", + + "@types/fs-extra": "catalog:", + "@types/jsdom": "catalog:", + "@types/node": "catalog:", + "@types/semver": "catalog:", + "@types/three": "catalog:", + "@vitejs/plugin-vue": "catalog:", + "@vitest/coverage-v8": "catalog:", + "@vitest/ui": "catalog:", + "@vue/test-utils": "catalog:", + "@webgpu/types": "catalog:", + "cross-env": "catalog:", + "eslint": "catalog:", + + "eslint-import-resolver-typescript": "catalog:", + "eslint-plugin-import-x": "catalog:", + "eslint-plugin-oxlint": "catalog:", + "eslint-plugin-storybook": "catalog:", + "eslint-plugin-unused-imports": "catalog:", + "eslint-plugin-vue": "catalog:", + "fs-extra": "^11.2.0", + "globals": "catalog:", + "happy-dom": "catalog:", + "husky": "catalog:", + "jiti": "catalog:", + "jsdom": "catalog:", + "knip": "catalog:", + "lint-staged": "catalog:", + "markdown-table": "catalog:", + "mixpanel-browser": "catalog:", + "nx": "catalog:", + "oxfmt": "catalog:", + "oxlint": "catalog:", + "oxlint-tsgolint": "catalog:", + "picocolors": "catalog:", + "postcss-html": "catalog:", + + "pretty-bytes": "catalog:", + "rollup-plugin-visualizer": "catalog:", + "storybook": "catalog:", + "stylelint": "catalog:", + "tailwindcss": "catalog:", + "tailwindcss-primeui": "catalog:", + "tsx": "catalog:", + "tw-animate-css": "catalog:", + "typescript": "catalog:", + "typescript-eslint": "catalog:", + "unplugin-icons": "catalog:", + "unplugin-typegpu": "catalog:", + "unplugin-vue-components": "catalog:", + "uuid": "^11.1.0", + "vite": "catalog:", + "vite-plugin-dts": "catalog:", + "vite-plugin-html": "catalog:", + "vite-plugin-vue-devtools": "catalog:", + "vitest": "catalog:", + "vue-component-type-helpers": "catalog:", + "vue-eslint-parser": "catalog:", + "vue-tsc": "catalog:", + "zip-dir": "^2.0.0", + "zod-to-json-schema": "catalog:" + }, "pnpm": { "overrides": { "vite": "^8.0.0-beta.8" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8011e1c10..c83ac1a38 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -48,9 +48,6 @@ catalogs: '@playwright/test': specifier: ^1.57.0 version: 1.57.0 - '@prettier/plugin-oxc': - specifier: ^0.1.3 - version: 0.1.3 '@primeuix/forms': specifier: 0.0.2 version: 0.0.2 @@ -96,9 +93,6 @@ catalogs: '@tailwindcss/vite': specifier: ^4.1.12 version: 4.1.12 - '@trivago/prettier-plugin-sort-imports': - specifier: ^5.2.0 - version: 5.2.2 '@types/fs-extra': specifier: ^11.0.4 version: 11.0.4 @@ -153,9 +147,6 @@ catalogs: eslint: specifier: ^9.39.1 version: 9.39.1 - eslint-config-prettier: - specifier: ^10.1.8 - version: 10.1.8 eslint-import-resolver-typescript: specifier: ^4.4.4 version: 4.4.4 @@ -207,6 +198,9 @@ catalogs: nx: specifier: 22.2.6 version: 22.2.6 + oxfmt: + specifier: ^0.26.0 + version: 0.26.0 oxlint: specifier: ^1.33.0 version: 1.33.0 @@ -222,9 +216,6 @@ catalogs: postcss-html: specifier: ^1.8.0 version: 1.8.0 - prettier: - specifier: ^3.7.4 - version: 3.7.4 pretty-bytes: specifier: ^7.1.0 version: 7.1.0 @@ -540,9 +531,6 @@ importers: '@playwright/test': specifier: 'catalog:' version: 1.57.0 - '@prettier/plugin-oxc': - specifier: 'catalog:' - version: 0.1.3 '@sentry/vite-plugin': specifier: 'catalog:' version: 4.6.0 @@ -561,9 +549,6 @@ importers: '@tailwindcss/vite': specifier: 'catalog:' version: 4.1.12(vite@8.0.0-beta.8(@types/node@24.10.4)(esbuild@0.27.1)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)) - '@trivago/prettier-plugin-sort-imports': - specifier: 'catalog:' - version: 5.2.2(@vue/compiler-sfc@3.5.25)(prettier@3.7.4) '@types/fs-extra': specifier: 'catalog:' version: 11.0.4 @@ -600,9 +585,6 @@ importers: eslint: specifier: 'catalog:' version: 9.39.1(jiti@2.6.1) - eslint-config-prettier: - specifier: 'catalog:' - version: 10.1.8(eslint@9.39.1(jiti@2.6.1)) eslint-import-resolver-typescript: specifier: 'catalog:' version: 4.4.4(eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.50.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.1(jiti@2.6.1)))(eslint-plugin-import@2.32.0)(eslint@9.39.1(jiti@2.6.1)) @@ -654,6 +636,9 @@ importers: nx: specifier: 'catalog:' version: 22.2.6 + oxfmt: + specifier: 'catalog:' + version: 0.26.0 oxlint: specifier: 'catalog:' version: 1.33.0(oxlint-tsgolint@0.9.1) @@ -666,9 +651,6 @@ importers: postcss-html: specifier: 'catalog:' version: 1.8.0 - prettier: - specifier: 'catalog:' - version: 3.7.4 pretty-bytes: specifier: 'catalog:' version: 7.1.0 @@ -2517,95 +2499,6 @@ packages: '@one-ini/wasm@0.1.1': resolution: {integrity: sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==} - '@oxc-parser/binding-android-arm64@0.99.0': - resolution: {integrity: sha512-V4jhmKXgQQdRnm73F+r3ZY4pUEsijQeSraFeaCGng7abSNJGs76X6l82wHnmjLGFAeY00LWtjcELs7ZmbJ9+lA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [android] - - '@oxc-parser/binding-darwin-arm64@0.99.0': - resolution: {integrity: sha512-Rp41nf9zD5FyLZciS9l1GfK8PhYqrD5kEGxyTOA2esTLeAy37rZxetG2E3xteEolAkeb2WDkVrlxPtibeAncMg==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [darwin] - - '@oxc-parser/binding-darwin-x64@0.99.0': - resolution: {integrity: sha512-WVonp40fPPxo5Gs0POTI57iEFv485TvNKOHMwZRhigwZRhZY2accEAkYIhei9eswF4HN5B44Wybkz7Gd1Qr/5Q==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [darwin] - - '@oxc-parser/binding-freebsd-x64@0.99.0': - resolution: {integrity: sha512-H30bjOOttPmG54gAqu6+HzbLEzuNOYO2jZYrIq4At+NtLJwvNhXz28Hf5iEAFZIH/4hMpLkM4VN7uc+5UlNW3Q==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [freebsd] - - '@oxc-parser/binding-linux-arm-gnueabihf@0.99.0': - resolution: {integrity: sha512-0Z/Th0SYqzSRDPs6tk5lQdW0i73UCupnim3dgq2oW0//UdLonV/5wIZCArfKGC7w9y4h8TxgXpgtIyD1kKzzlQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm] - os: [linux] - - '@oxc-parser/binding-linux-arm-musleabihf@0.99.0': - resolution: {integrity: sha512-xo0wqNd5bpbzQVNpAIFbHk1xa+SaS/FGBABCd942SRTnrpxl6GeDj/s1BFaGcTl8MlwlKVMwOcyKrw/2Kdfquw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm] - os: [linux] - - '@oxc-parser/binding-linux-arm64-gnu@0.99.0': - resolution: {integrity: sha512-u26I6LKoLTPTd4Fcpr0aoAtjnGf5/ulMllo+QUiBhupgbVCAlaj4RyXH/mvcjcsl2bVBv9E/gYJZz2JjxQWXBA==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [linux] - - '@oxc-parser/binding-linux-arm64-musl@0.99.0': - resolution: {integrity: sha512-qhftDo2D37SqCEl3ZTa367NqWSZNb1Ddp34CTmShLKFrnKdNiUn55RdokLnHtf1AL5ssaQlYDwBECX7XiBWOhw==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [linux] - - '@oxc-parser/binding-linux-riscv64-gnu@0.99.0': - resolution: {integrity: sha512-zxn/xkf519f12FKkpL5XwJipsylfSSnm36h6c1zBDTz4fbIDMGyIhHfWfwM7uUmHo9Aqw1pLxFpY39Etv398+Q==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [riscv64] - os: [linux] - - '@oxc-parser/binding-linux-s390x-gnu@0.99.0': - resolution: {integrity: sha512-Y1eSDKDS5E4IVC7Oxw+NbYAKRmJPMJTIjW+9xOWwteDHkFqpocKe0USxog+Q1uhzalD9M0p9eXWEWdGQCMDBMQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [s390x] - os: [linux] - - '@oxc-parser/binding-linux-x64-gnu@0.99.0': - resolution: {integrity: sha512-YVJMfk5cFWB8i2/nIrbk6n15bFkMHqWnMIWkVx7r2KwpTxHyFMfu2IpeVKo1ITDSmt5nBrGdLHD36QRlu2nDLg==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [linux] - - '@oxc-parser/binding-linux-x64-musl@0.99.0': - resolution: {integrity: sha512-2+SDPrie5f90A1b9EirtVggOgsqtsYU5raZwkDYKyS1uvJzjqHCDhG/f4TwQxHmIc5YkczdQfwvN91lwmjsKYQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [linux] - - '@oxc-parser/binding-wasm32-wasi@0.99.0': - resolution: {integrity: sha512-DKA4j0QerUWSMADziLM5sAyM7V53Fj95CV9SjP77bPfEfT7MnvFKnneaRMqPK1cpzjAGiQF52OBUIKyk0dwOQA==} - engines: {node: '>=14.0.0'} - cpu: [wasm32] - - '@oxc-parser/binding-win32-arm64-msvc@0.99.0': - resolution: {integrity: sha512-EaB3AvsxqdNUhh9FOoAxRZ2L4PCRwDlDb//QXItwyOJrX7XS+uGK9B1KEUV4FZ/7rDhHsWieLt5e07wl2Ti5AQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [arm64] - os: [win32] - - '@oxc-parser/binding-win32-x64-msvc@0.99.0': - resolution: {integrity: sha512-sJN1Q8h7ggFOyDn0zsHaXbP/MklAVUvhrbq0LA46Qum686P3SZQHjbATqJn9yaVEvaSKXCshgl0vQ1gWkGgpcQ==} - engines: {node: ^20.19.0 || >=22.12.0} - cpu: [x64] - os: [win32] - '@oxc-project/runtime@0.108.0': resolution: {integrity: sha512-J1cESY4anMO4i9KtCPmCfQAzAR00Uw4SWsDPFP10CIwDMugkh34UrTKByuYKuPaHy0XAk8LlJiZJq2OLMfbuIQ==} engines: {node: ^20.19.0 || >=22.12.0} @@ -2613,9 +2506,6 @@ packages: '@oxc-project/types@0.108.0': resolution: {integrity: sha512-7lf13b2IA/kZO6xgnIZA88sq3vwrxWk+2vxf6cc+omwYCRTiA5e63Beqf3fz/v8jEviChWWmFYBwzfSeyrsj7Q==} - '@oxc-project/types@0.99.0': - resolution: {integrity: sha512-LLDEhXB7g1m5J+woRSgfKsFPS3LhR9xRhTeIoEBm5WrkwMxn6eZ0Ld0c0K5eHB57ChZX6I3uSmmLjZ8pcjlRcw==} - '@oxc-resolver/binding-android-arm-eabi@11.15.0': resolution: {integrity: sha512-Q+lWuFfq7whNelNJIP1dhXaVz4zO9Tu77GcQHyxDWh3MaCoO2Bisphgzmsh4ZoUe2zIchQh6OvQL99GlWHg9Tw==} cpu: [arm] @@ -2716,6 +2606,46 @@ packages: cpu: [x64] os: [win32] + '@oxfmt/darwin-arm64@0.26.0': + resolution: {integrity: sha512-AAGc+8CffkiWeVgtWf4dPfQwHEE5c/j/8NWH7VGVxxJRCZFdmWcqCXprvL2H6qZFewvDLrFbuSPRCqYCpYGaTQ==} + cpu: [arm64] + os: [darwin] + + '@oxfmt/darwin-x64@0.26.0': + resolution: {integrity: sha512-xFx5ijCTjw577wJvFlZEMmKDnp3HSCcbYdCsLRmC5i3TZZiDe9DEYh3P46uqhzj8BkEw1Vm1ZCWdl48aEYAzvQ==} + cpu: [x64] + os: [darwin] + + '@oxfmt/linux-arm64-gnu@0.26.0': + resolution: {integrity: sha512-GubkQeQT5d3B/Jx/IiR7NMkSmXrCZcVI0BPh1i7mpFi8HgD1hQ/LbhiBKAMsMqs5bbugdQOgBEl8bOhe8JhW1g==} + cpu: [arm64] + os: [linux] + + '@oxfmt/linux-arm64-musl@0.26.0': + resolution: {integrity: sha512-OEypUwK69bFPj+aa3/LYCnlIUPgoOLu//WNcriwpnWNmt47808Ht7RJSg+MNK8a7pSZHpXJ5/E6CRK/OTwFdaQ==} + cpu: [arm64] + os: [linux] + + '@oxfmt/linux-x64-gnu@0.26.0': + resolution: {integrity: sha512-xO6iEW2bC6ZHyOTPmPWrg/nM6xgzyRPaS84rATy6F8d79wz69LdRdJ3l/PXlkqhi7XoxhvX4ExysA0Nf10ZZEQ==} + cpu: [x64] + os: [linux] + + '@oxfmt/linux-x64-musl@0.26.0': + resolution: {integrity: sha512-Z3KuZFC+MIuAyFCXBHY71kCsdRq1ulbsbzTe71v+hrEv7zVBn6yzql+/AZcgfIaKzWO9OXNuz5WWLWDmVALwow==} + cpu: [x64] + os: [linux] + + '@oxfmt/win32-arm64@0.26.0': + resolution: {integrity: sha512-3zRbqwVWK1mDhRhTknlQFpRFL9GhEB5GfU6U7wawnuEwpvi39q91kJ+SRJvJnhyPCARkjZBd1V8XnweN5IFd1g==} + cpu: [arm64] + os: [win32] + + '@oxfmt/win32-x64@0.26.0': + resolution: {integrity: sha512-m8TfIljU22i9UEIkD+slGPifTFeaCwIUfxszN3E6ABWP1KQbtwSw9Ak0TdoikibvukF/dtbeyG3WW63jv9DnEg==} + cpu: [x64] + os: [win32] + '@oxlint-tsgolint/darwin-arm64@0.9.1': resolution: {integrity: sha512-vk+8kChWqN+F+QUOvp4/6jDTlDCzXPgYGkxdi6EOUSOmCP1ix0uYOlIi/ytH2imXmC8YfPgLR/1BhqbsuDKuew==} cpu: [arm64] @@ -2824,10 +2754,6 @@ packages: '@polka/url@1.0.0-next.29': resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==} - '@prettier/plugin-oxc@0.1.3': - resolution: {integrity: sha512-aABz3zIRilpWMekbt1FL1JVBQrQLR8L4Td2SRctECrWSsXGTNn/G1BqNSKCdbvQS1LWstAXfqcXzDki7GAAJyg==} - engines: {node: '>=14'} - '@primeuix/forms@0.0.2': resolution: {integrity: sha512-DpecPQd/Qf/kav4LKCaIeGuT3AkwhJzuHCkLANTVlN/zBvo8KIj3OZHsCkm0zlIMVVnaJdtx1ULNlRQdudef+A==} engines: {node: '>=12.11.0'} @@ -3571,22 +3497,6 @@ packages: '@tmcp/auth': optional: true - '@trivago/prettier-plugin-sort-imports@5.2.2': - resolution: {integrity: sha512-fYDQA9e6yTNmA13TLVSA+WMQRc5Bn/c0EUBditUHNfMMxN7M82c38b1kEggVE3pLpZ0FwkwJkUEKMiOi52JXFA==} - engines: {node: '>18.12'} - peerDependencies: - '@vue/compiler-sfc': 3.x - prettier: 2.x - 3.x - prettier-plugin-svelte: 3.x - svelte: 4.x || 5.x - peerDependenciesMeta: - '@vue/compiler-sfc': - optional: true - prettier-plugin-svelte: - optional: true - svelte: - optional: true - '@tweenjs/tween.js@23.1.3': resolution: {integrity: sha512-vJmvvwFxYuGnF2axRtPYocag6Clbb5YS7kLL+SO/TeVFzHqDIWrNKYtcsPMibjDx9O+bu+psAy9NKfWklassUA==} @@ -5164,12 +5074,6 @@ packages: peerDependencies: eslint: '>=6.0.0' - eslint-config-prettier@10.1.8: - resolution: {integrity: sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==} - hasBin: true - peerDependencies: - eslint: '>=7.0.0' - eslint-import-context@0.1.9: resolution: {integrity: sha512-K9Hb+yRaGAGUbwjhFNHvSmmkZs9+zbuoe3kFQ4V1wYjrepUFYM2dZAfNtjbbj3qsPfUfsA68Bx/ICWQMi+C8Eg==} engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} @@ -6039,9 +5943,6 @@ packages: engines: {node: '>=10'} hasBin: true - javascript-natural-sort@0.7.1: - resolution: {integrity: sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==} - jest-diff@30.2.0: resolution: {integrity: sha512-dQHFo3Pt4/NLlG5z4PxZ/3yZTZ1C7s9hveiOj+GCN+uT109NC2QgsoVZsVOAvbJ3RgKkvyLGXZV9+piDpWbm6A==} engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0} @@ -6889,13 +6790,14 @@ packages: resolution: {integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==} engines: {node: '>= 0.4'} - oxc-parser@0.99.0: - resolution: {integrity: sha512-MpS1lbd2vR0NZn1v0drpgu7RUFu3x9Rd0kxExObZc2+F+DIrV0BOMval/RO3BYGwssIOerII6iS8EbbpCCZQpQ==} - engines: {node: ^20.19.0 || >=22.12.0} - oxc-resolver@11.15.0: resolution: {integrity: sha512-Hk2J8QMYwmIO9XTCUiOH00+Xk2/+aBxRUnhrSlANDyCnLYc32R1WSIq1sU2yEdlqd53FfMpPEpnBYIKQMzliJw==} + oxfmt@0.26.0: + resolution: {integrity: sha512-UDD1wFNwfeorMm2ZY0xy1KRAAvJ5NjKBfbDmiMwGP7baEHTq65cYpC0aPP+BGHc8weXUbSZaK8MdGyvuRUvS4Q==} + engines: {node: ^20.19.0 || >=22.12.0} + hasBin: true + oxlint-tsgolint@0.9.1: resolution: {integrity: sha512-w1lIvUDkkiAPFyo268SFGrdh1LQ3Lcs1XShES7I4X75TliQA0os5XJ5hNZ4lYsSevqcofgEtq4xq7rBumv69iQ==} hasBin: true @@ -7796,6 +7698,10 @@ packages: resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==} engines: {node: '>=12.0.0'} + tinypool@2.0.0: + resolution: {integrity: sha512-/RX9RzeH2xU5ADE7n2Ykvmi9ED3FBGPAjw9u3zucrNNaEBIO0HPSYgL0NT7+3p147ojeSdaVu08F6hjpv31HJg==} + engines: {node: ^20.0.0 || >=22.0.0} + tinyrainbow@2.0.0: resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==} engines: {node: '>=14.0.0'} @@ -10677,59 +10583,10 @@ snapshots: '@one-ini/wasm@0.1.1': {} - '@oxc-parser/binding-android-arm64@0.99.0': - optional: true - - '@oxc-parser/binding-darwin-arm64@0.99.0': - optional: true - - '@oxc-parser/binding-darwin-x64@0.99.0': - optional: true - - '@oxc-parser/binding-freebsd-x64@0.99.0': - optional: true - - '@oxc-parser/binding-linux-arm-gnueabihf@0.99.0': - optional: true - - '@oxc-parser/binding-linux-arm-musleabihf@0.99.0': - optional: true - - '@oxc-parser/binding-linux-arm64-gnu@0.99.0': - optional: true - - '@oxc-parser/binding-linux-arm64-musl@0.99.0': - optional: true - - '@oxc-parser/binding-linux-riscv64-gnu@0.99.0': - optional: true - - '@oxc-parser/binding-linux-s390x-gnu@0.99.0': - optional: true - - '@oxc-parser/binding-linux-x64-gnu@0.99.0': - optional: true - - '@oxc-parser/binding-linux-x64-musl@0.99.0': - optional: true - - '@oxc-parser/binding-wasm32-wasi@0.99.0': - dependencies: - '@napi-rs/wasm-runtime': 1.1.1 - optional: true - - '@oxc-parser/binding-win32-arm64-msvc@0.99.0': - optional: true - - '@oxc-parser/binding-win32-x64-msvc@0.99.0': - optional: true - '@oxc-project/runtime@0.108.0': {} '@oxc-project/types@0.108.0': {} - '@oxc-project/types@0.99.0': {} - '@oxc-resolver/binding-android-arm-eabi@11.15.0': optional: true @@ -10792,6 +10649,30 @@ snapshots: '@oxc-resolver/binding-win32-x64-msvc@11.15.0': optional: true + '@oxfmt/darwin-arm64@0.26.0': + optional: true + + '@oxfmt/darwin-x64@0.26.0': + optional: true + + '@oxfmt/linux-arm64-gnu@0.26.0': + optional: true + + '@oxfmt/linux-arm64-musl@0.26.0': + optional: true + + '@oxfmt/linux-x64-gnu@0.26.0': + optional: true + + '@oxfmt/linux-x64-musl@0.26.0': + optional: true + + '@oxfmt/win32-arm64@0.26.0': + optional: true + + '@oxfmt/win32-x64@0.26.0': + optional: true + '@oxlint-tsgolint/darwin-arm64@0.9.1': optional: true @@ -10866,10 +10747,6 @@ snapshots: '@polka/url@1.0.0-next.29': {} - '@prettier/plugin-oxc@0.1.3': - dependencies: - oxc-parser: 0.99.0 - '@primeuix/forms@0.0.2': dependencies: '@primeuix/utils': 0.3.2 @@ -11585,20 +11462,6 @@ snapshots: esm-env: 1.2.2 tmcp: 1.19.0(typescript@5.9.3) - '@trivago/prettier-plugin-sort-imports@5.2.2(@vue/compiler-sfc@3.5.25)(prettier@3.7.4)': - dependencies: - '@babel/generator': 7.28.5 - '@babel/parser': 7.28.5 - '@babel/traverse': 7.28.5 - '@babel/types': 7.28.5 - javascript-natural-sort: 0.7.1 - lodash: 4.17.21 - prettier: 3.7.4 - optionalDependencies: - '@vue/compiler-sfc': 3.5.25 - transitivePeerDependencies: - - supports-color - '@tweenjs/tween.js@23.1.3': {} '@tybys/wasm-util@0.10.1': @@ -13439,10 +13302,6 @@ snapshots: eslint: 9.39.1(jiti@2.6.1) semver: 7.7.3 - eslint-config-prettier@10.1.8(eslint@9.39.1(jiti@2.6.1)): - dependencies: - eslint: 9.39.1(jiti@2.6.1) - eslint-import-context@0.1.9(unrs-resolver@1.11.1): dependencies: get-tsconfig: 4.10.1 @@ -14431,8 +14290,6 @@ snapshots: filelist: 1.0.4 minimatch: 3.1.2 - javascript-natural-sort@0.7.1: {} - jest-diff@30.2.0: dependencies: '@jest/diff-sequences': 30.0.1 @@ -15531,26 +15388,6 @@ snapshots: safe-push-apply: 1.0.0 optional: true - oxc-parser@0.99.0: - dependencies: - '@oxc-project/types': 0.99.0 - optionalDependencies: - '@oxc-parser/binding-android-arm64': 0.99.0 - '@oxc-parser/binding-darwin-arm64': 0.99.0 - '@oxc-parser/binding-darwin-x64': 0.99.0 - '@oxc-parser/binding-freebsd-x64': 0.99.0 - '@oxc-parser/binding-linux-arm-gnueabihf': 0.99.0 - '@oxc-parser/binding-linux-arm-musleabihf': 0.99.0 - '@oxc-parser/binding-linux-arm64-gnu': 0.99.0 - '@oxc-parser/binding-linux-arm64-musl': 0.99.0 - '@oxc-parser/binding-linux-riscv64-gnu': 0.99.0 - '@oxc-parser/binding-linux-s390x-gnu': 0.99.0 - '@oxc-parser/binding-linux-x64-gnu': 0.99.0 - '@oxc-parser/binding-linux-x64-musl': 0.99.0 - '@oxc-parser/binding-wasm32-wasi': 0.99.0 - '@oxc-parser/binding-win32-arm64-msvc': 0.99.0 - '@oxc-parser/binding-win32-x64-msvc': 0.99.0 - oxc-resolver@11.15.0: optionalDependencies: '@oxc-resolver/binding-android-arm-eabi': 11.15.0 @@ -15574,6 +15411,19 @@ snapshots: '@oxc-resolver/binding-win32-ia32-msvc': 11.15.0 '@oxc-resolver/binding-win32-x64-msvc': 11.15.0 + oxfmt@0.26.0: + dependencies: + tinypool: 2.0.0 + optionalDependencies: + '@oxfmt/darwin-arm64': 0.26.0 + '@oxfmt/darwin-x64': 0.26.0 + '@oxfmt/linux-arm64-gnu': 0.26.0 + '@oxfmt/linux-arm64-musl': 0.26.0 + '@oxfmt/linux-x64-gnu': 0.26.0 + '@oxfmt/linux-x64-musl': 0.26.0 + '@oxfmt/win32-arm64': 0.26.0 + '@oxfmt/win32-x64': 0.26.0 + oxlint-tsgolint@0.9.1: optionalDependencies: '@oxlint-tsgolint/darwin-arm64': 0.9.1 @@ -15754,7 +15604,8 @@ snapshots: prelude-ls@1.2.1: {} - prettier@3.7.4: {} + prettier@3.7.4: + optional: true pretty-bytes@7.1.0: {} @@ -16717,6 +16568,8 @@ snapshots: fdir: 6.5.0(picomatch@4.0.3) picomatch: 4.0.3 + tinypool@2.0.0: {} + tinyrainbow@2.0.0: {} tinyrainbow@3.0.3: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 76c515b7d..161715a3e 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -17,7 +17,7 @@ catalog: '@nx/vite': 22.2.6 '@pinia/testing': ^1.0.3 '@playwright/test': ^1.57.0 - '@prettier/plugin-oxc': ^0.1.3 + '@primeuix/forms': 0.0.2 '@primeuix/styled': 0.3.2 '@primeuix/utils': ^0.3.2 @@ -33,7 +33,7 @@ catalog: '@storybook/vue3': ^10.1.9 '@storybook/vue3-vite': ^10.1.9 '@tailwindcss/vite': ^4.1.12 - '@trivago/prettier-plugin-sort-imports': ^5.2.0 + '@types/fs-extra': ^11.0.4 '@types/jsdom': ^21.1.7 '@types/node': ^24.1.0 @@ -52,7 +52,7 @@ catalog: cva: 1.0.0-beta.4 dotenv: ^16.4.5 eslint: ^9.39.1 - eslint-config-prettier: ^10.1.8 + eslint-import-resolver-typescript: ^4.4.4 eslint-plugin-import-x: ^4.16.1 eslint-plugin-oxlint: 1.25.0 @@ -70,12 +70,13 @@ catalog: markdown-table: ^3.0.4 mixpanel-browser: ^2.71.0 nx: 22.2.6 + oxfmt: ^0.26.0 oxlint: ^1.33.0 oxlint-tsgolint: ^0.9.1 picocolors: ^1.1.1 pinia: ^3.0.4 postcss-html: ^1.8.0 - prettier: ^3.7.4 + pretty-bytes: ^7.1.0 primeicons: ^7.0.0 primevue: ^4.2.5