From 1cf0249d248fb174a6a649677d9bd088dfba95ae Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com> Date: Fri, 28 Aug 2026 00:09:16 +0530 Subject: [PATCH] chore: wire @makeplane/propel into web (#9699) * chore: wire @makeplane/propel into web * style: fix comboButton indentation in dropdowns --- apps/web/package.json | 1 + packages/tailwind-config/index.css | 13 +++---------- packages/tailwind-config/package.json | 2 +- pnpm-lock.yaml | 8 +++++++- pnpm-workspace.yaml | 1 + 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/apps/web/package.json b/apps/web/package.json index 273a7a8769..8394394e10 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -25,6 +25,7 @@ "@fontsource/ibm-plex-mono": "catalog:", "@fontsource/material-symbols-rounded": "catalog:", "@headlessui/react": "catalog:", + "@makeplane/propel": "catalog:", "@plane/constants": "workspace:*", "@plane/editor": "workspace:*", "@plane/hooks": "workspace:*", diff --git a/packages/tailwind-config/index.css b/packages/tailwind-config/index.css index dae708c017..716e36687d 100644 --- a/packages/tailwind-config/index.css +++ b/packages/tailwind-config/index.css @@ -10,17 +10,10 @@ * Token *values* are propel's, not ours: many differ from what this package * shipped. See the migration notes for the drift that needs a visual pass. * - * Imported as the two leaf files rather than the "@makeplane/propel/styles" - * barrel. The barrel is those same two files plus `@source "../"`, which points - * Tailwind at propel's dist and emits utilities for its components — dead CSS - * here, since we consume propel for tokens only and import none of its JS. - * Re-add the barrel if propel components are adopted. - * - * propel's CSS deliberately does not import tailwindcss itself, so that stays - * above. + * Styles barrel (tokens + animations + `@source` of propel dist) so component + * utilities emit. propel's CSS does not import tailwindcss itself. */ -@import "@makeplane/propel/styles/variables"; -@import "@makeplane/propel/styles/animations"; +@import "@makeplane/propel/styles"; @source "../**/*.{ts,tsx}"; * { diff --git a/packages/tailwind-config/package.json b/packages/tailwind-config/package.json index f0acfc0166..6b365e5cb4 100644 --- a/packages/tailwind-config/package.json +++ b/packages/tailwind-config/package.json @@ -13,7 +13,7 @@ "./postcss.config.js": "./postcss.config.js" }, "dependencies": { - "@makeplane/propel": "0.2.0", + "@makeplane/propel": "catalog:", "@tailwindcss/postcss": "catalog:", "postcss": "catalog:" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8e1aa58fb4..4c4c53fd61 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -72,6 +72,9 @@ catalogs: '@hypermod/utils': specifier: ^0.7.1 version: 0.7.1 + '@makeplane/propel': + specifier: 0.2.0 + version: 0.2.0 '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -1024,6 +1027,9 @@ importers: '@headlessui/react': specifier: 'catalog:' version: 2.2.10(react-dom@19.2.8(react@19.2.8))(react@19.2.8) + '@makeplane/propel': + specifier: 'catalog:' + version: 0.2.0(@date-fns/tz@1.4.1)(@types/react@19.2.17)(date-fns@4.1.0)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(tailwindcss@4.1.17) '@plane/constants': specifier: workspace:* version: link:../../packages/constants @@ -1697,7 +1703,7 @@ importers: packages/tailwind-config: dependencies: '@makeplane/propel': - specifier: 0.2.0 + specifier: 'catalog:' version: 0.2.0(@date-fns/tz@1.4.1)(@types/react@19.2.17)(date-fns@4.1.0)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(tailwindcss@4.1.17) '@tailwindcss/postcss': specifier: 'catalog:' diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index a7b50dabb1..5fc94c639b 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -27,6 +27,7 @@ catalog: "@hocuspocus/server": "2.15.2" "@hocuspocus/transformer": "2.15.2" "@hypermod/utils": "^0.7.1" + "@makeplane/propel": "0.2.0" "@popperjs/core": "^2.11.8" "@radix-ui/react-scroll-area": "^1.2.3" "@react-pdf/renderer": "^4.8.1"