feat: make Tailwind compile correctly for UI package

prax-wallet · Jun 20, 2024 · 655809e · 655809e
1 parent 31db831
commit 655809e
Show file tree

Hide file tree

Showing 8 changed files with 205 additions and 433 deletions.
diff --git a/apps/extension/package.json b/apps/extension/package.json
@@ -20,6 +20,7 @@
     "@connectrpc/connect": "^1.4.0",
     "@connectrpc/connect-web": "^1.4.0",
     "@penumbra-labs/registry": "8.0.1",
+    "@penumbra-zone/ui": "file:../../../web/packages/ui/penumbra-zone-ui-5.0.0.tgz",
     "@repo/context": "workspace:*",
     "@tanstack/react-query": "4.36.1",
     "buffer": "^6.0.3",
@@ -39,6 +40,9 @@
   },
   "devDependencies": {
     "@radix-ui/react-icons": "^1.3.0",
+    "@repo/eslint-config": "workspace:*",
+    "@repo/tailwind-config": "workspace:*",
+    "@repo/tsconfig": "workspace:*",
     "@types/chrome": "0.0.268",
     "@types/firefox-webext-browser": "^120.0.3",
     "@types/lodash": "^4.17.4",

diff --git a/apps/prax-marketing-site/package.json b/apps/prax-marketing-site/package.json
@@ -10,12 +10,16 @@
     "lint": "eslint ."
   },
   "dependencies": {
+    "@penumbra-zone/ui": "file:../../../web/packages/ui/penumbra-zone-ui-5.0.0.tgz",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router-dom": "^6.23.1",
     "tailwindcss": "^3.4.4"
   },
   "devDependencies": {
+    "@repo/eslint-config": "workspace:*",
+    "@repo/tailwind-config": "workspace:*",
+    "@repo/tsconfig": "workspace:*",
     "@types/react": "^18.3.2",
     "@types/react-dom": "^18.3.0",
     "autoprefixer": "^10.4.19",

diff --git a/package.json b/package.json
@@ -34,30 +34,26 @@
     "@bufbuild/protobuf": "^1.10.0",
     "@connectrpc/connect": "^1.4.0",
     "@connectrpc/connect-web": "^1.4.0",
-    "@penumbra-zone/bech32m": "file:/Users/margulus/desktop/Programming/Repository/penumbra/web/packages/bech32m/penumbra-zone-bech32m-6.1.0.tgz",
-    "@penumbra-zone/client": "file:/Users/margulus/desktop/Programming/Repository/penumbra/web/packages/client/penumbra-zone-client-8.0.0.tgz",
-    "@penumbra-zone/crypto-web": "file:/Users/margulus/desktop/Programming/Repository/penumbra/web/packages/crypto/penumbra-zone-crypto-web-5.0.0.tgz",
-    "@penumbra-zone/getters": "file:/Users/margulus/desktop/Programming/Repository/penumbra/web/packages/getters/penumbra-zone-getters-8.0.0.tgz",
-    "@penumbra-zone/keys": "file:/Users/margulus/desktop/Programming/Repository/penumbra/web/packages/keys/penumbra-zone-keys-4.1.0.tgz",
-    "@penumbra-zone/perspective": "file:/Users/margulus/desktop/Programming/Repository/penumbra/web/packages/perspective/penumbra-zone-perspective-6.0.0.tgz",
-    "@penumbra-zone/protobuf": "file:/Users/margulus/desktop/Programming/Repository/penumbra/web/packages/protobuf/penumbra-zone-protobuf-5.1.0.tgz",
-    "@penumbra-zone/query": "file:/Users/margulus/desktop/Programming/Repository/penumbra/web/packages/query/penumbra-zone-query-6.0.0.tgz",
-    "@penumbra-zone/services": "file:/Users/margulus/desktop/Programming/Repository/penumbra/web/packages/services/penumbra-zone-services-6.0.0.tgz",
-    "@penumbra-zone/storage": "file:/Users/margulus/desktop/Programming/Repository/penumbra/web/packages/storage/penumbra-zone-storage-4.0.1.tgz",
-    "@penumbra-zone/transport-chrome": "file:/Users/margulus/desktop/Programming/Repository/penumbra/web/packages/transport-chrome/penumbra-zone-transport-chrome-2.2.2.tgz",
-    "@penumbra-zone/transport-dom": "file:/Users/margulus/desktop/Programming/Repository/penumbra/web/packages/transport-dom/penumbra-zone-transport-dom-7.1.0.tgz",
-    "@penumbra-zone/types": "file:/Users/margulus/desktop/Programming/Repository/penumbra/web/packages/types/penumbra-zone-types-9.0.0.tgz",
-    "@penumbra-zone/ui": "file:/Users/margulus/desktop/Programming/Repository/penumbra/web/packages/ui/penumbra-zone-ui-5.0.0.tgz",
-    "@penumbra-zone/wasm": "file:/Users/margulus/desktop/Programming/Repository/penumbra/web/packages/wasm/penumbra-zone-wasm-9.0.0.tgz",
-    "@penumbra-zone/zquery": "file:/Users/margulus/desktop/Programming/Repository/penumbra/web/packages/zquery/penumbra-zone-zquery-1.0.1.tgz"
+    "@penumbra-zone/bech32m": "^6.1.0",
+    "@penumbra-zone/client": "^8.0.0",
+    "@penumbra-zone/crypto-web": "^5.0.0",
+    "@penumbra-zone/getters": "^8.0.0",
+    "@penumbra-zone/keys": "^4.1.0",
+    "@penumbra-zone/perspective": "^6.0.0",
+    "@penumbra-zone/protobuf": "^5.1.0",
+    "@penumbra-zone/query": "^6.0.0",
+    "@penumbra-zone/services": "^6.0.0",
+    "@penumbra-zone/storage": "^6.0.0",
+    "@penumbra-zone/transport-chrome": "^4.0.0",
+    "@penumbra-zone/transport-dom": "^7.1.0",
+    "@penumbra-zone/types": "^9.0.0",
+    "@penumbra-zone/wasm": "^9.0.0",
+    "@penumbra-zone/zquery": "file:../web/packages/zquery/penumbra-zone-zquery-2.0.0.tgz"
   },
   "devDependencies": {
     "@buf/connectrpc_eliza.bufbuild_es": "1.10.0-20230913231627-233fca715f49.1",
     "@buf/connectrpc_eliza.connectrpc_es": "1.4.0-20230913231627-233fca715f49.3",
     "@changesets/cli": "^2.27.5",
-    "@repo/eslint-config": "workspace:^",
-    "@repo/tailwind-config": "workspace:^",
-    "@repo/tsconfig": "workspace:^",
     "@storybook/react-vite": "^8.1.1",
     "@turbo/gen": "^1.13.4",
     "@types/chrome": "0.0.268",

diff --git a/packages/context/package.json b/packages/context/package.json
@@ -14,20 +14,15 @@
   "exports": {
     ".": "./src/index.ts"
   },
-  "dependencies": {
-    "@penumbra-zone/bech32m": "^6.1.0",
-    "@penumbra-zone/protobuf": "^5.1.0"
+  "devDependencies": {
+    "@repo/eslint-config": "workspace:*",
+    "@repo/tsconfig": "workspace:*"
   },
   "peerDependencies": {
     "@buf/cosmos_ibc.bufbuild_es": "1.10.0-20240606104028-442292b00c16.1",
     "@buf/penumbra-zone_penumbra.bufbuild_es": "1.10.0-20240616005217-ca45ca80333e.1",
     "@bufbuild/protobuf": "^1.10.0",
     "@penumbra-labs/registry": "8.0.1",
-    "@penumbra-zone/crypto-web": "^5.0.0",
-    "@penumbra-zone/query": "^6.0.0",
-    "@penumbra-zone/storage": "^6.0.0",
-    "@penumbra-zone/types": "^9.0.0",
-    "@penumbra-zone/wasm": "^9.0.0",
     "exponential-backoff": "^3.1.1"
   }
 }
diff --git a/packages/tailwind-config/index.ts b/packages/tailwind-config/index.ts
@@ -8,8 +8,8 @@ export default {
     './components/**/*.{ts,tsx}',
     './app/**/*.{ts,tsx}',
     './src/**/*.{ts,tsx}',
-    '../../packages/ui/components/**/*.{ts,tsx}',
     './shared/**/*.{ts,tsx}',
+    './node_modules/@penumbra-zone/ui/**/*.js'
   ],
   theme: {
     container: {

diff --git a/packages/tailwind-config/package.json b/packages/tailwind-config/package.json
@@ -7,5 +7,8 @@
   "dependencies": {
     "tailwindcss": "^3.4.4",
     "tailwindcss-animate": "^1.0.7"
+  },
+  "devDependencies": {
+    "@repo/tsconfig": "workspace:*"
   }
 }
diff --git a/packages/tailwind-config/tsconfig.json b/packages/tailwind-config/tsconfig.json
@@ -0,0 +1,5 @@
+{
+  "extends": "@repo/tsconfig/base.json",
+  "include": ["."],
+  "exclude": ["node_modules"]
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml