Merge pull request #169 from agicommies/feat/package-sorter-and-fix-l…

…int-pipeline

Feat: package sorter and fix lint pipeline

apps/commune-page/package.json

@@ -40,7 +40,7 @@
     "@commune-ts/tailwind-config": "workspace:*",
     "@commune-ts/tsconfig": "workspace:*",
     "@next/eslint-plugin-next": "catalog:",
-    "@tailwindcss/typography": "^0.5.15",
+    "@tailwindcss/typography": "catalog:",
     "@types/node": "catalog:",
     "@types/react": "catalog:react18",
     "@types/react-dom": "catalog:react18",

apps/commune-wallet/package.json

@@ -26,7 +26,7 @@
     "@commune-ts/tailwind-config": "workspace:*",
     "@commune-ts/tsconfig": "workspace:*",
     "@next/eslint-plugin-next": "catalog:",
-    "@tailwindcss/typography": "^0.5.10",
+    "@tailwindcss/typography": "catalog:",
     "@types/node": "catalog:",
     "@types/react": "catalog:react18",
     "@types/react-dom": "catalog:react18",

apps/commune-wallet/tailwind.config.ts

@@ -10,6 +10,7 @@ export default {
     ...baseConfig.content,
     "../../packages/ui/src/components/*.{ts,tsx}",
   ],
-  presets: [baseConfig, typography],
+  presets: [baseConfig],
   theme: {},
+  plugins: [typography]
 } satisfies Config;

apps/commune-worker/package.json

@@ -26,17 +26,17 @@
   },
   "devDependencies": {
     "@commune-ts/db": "workspace:*",
-    "@polkadot/api": "^11.1.1",
-    "express": "^4.19.2",
     "@commune-ts/eslint-config": "workspace:*",
     "@commune-ts/prettier-config": "workspace:*",
     "@commune-ts/tsconfig": "workspace:*",
+    "@polkadot/api": "^11.1.1",
     "@polkadot/api-augment": "catalog:",
     "@types/express": "^4.17.21",
     "@types/node": "catalog:",
+    "axios": "^1.7.7",
     "dotenv-cli": "catalog:",
     "eslint": "catalog:",
-    "axios": "^1.7.7",
+    "express": "^4.19.2",
     "nodemon": "^3.1.4",
     "prettier": "catalog:",
     "ts-node": "^10.9.2",

package.json

@@ -1,10 +1,6 @@
 {
   "name": "commune-ts",
   "private": true,
-  "engines": {
-    "node": ">=20.16.0"
-  },
-  "packageManager": "[email protected]",
   "scripts": {
     "build": "turbo run build",
     "clean": "git clean -xdf node_modules",
@@ -29,16 +25,22 @@
     "lint:fix": "turbo run lint --continue -- --fix --cache --cache-location node_modules/.cache/.eslintcache",
     "lint:ws": "pnpm dlx sherif@latest",
     "prepare": "husky",
+    "sort:package": "find . -name \"package.json\" -not -path \"**/node_modules/**\" -type f -print0 | xargs -0 -I {} pnpm sort-package-json \"{}\"",
     "typecheck": "turbo run typecheck",
     "ui-add": "turbo run ui-add"
   },
+  "prettier": "@commune-ts/prettier-config",
   "devDependencies": {
     "@commune-ts/prettier-config": "workspace:*",
     "@turbo/gen": "^2.1.1",
     "husky": "^9.1.4",
     "prettier": "catalog:",
+    "sort-package-json": "^2.10.1",
     "turbo": "^2.1.1",
     "typescript": "catalog:"
   },
-  "prettier": "@commune-ts/prettier-config"
+  "packageManager": "[email protected]",
+  "engines": {
+    "node": ">=20.16.0"
+  }
 }

packages/api/package.json

@@ -20,8 +20,8 @@
   },
   "prettier": "@commune-ts/prettier-config",
   "dependencies": {
-    "@commune-ts/types": "workspace:*",
     "@commune-ts/db": "workspace:*",
+    "@commune-ts/types": "workspace:*",
     "@trpc/server": "catalog:",
     "superjson": "2.2.1",
     "zod": "catalog:"

packages/db/package.json

@@ -34,6 +34,7 @@
     "typecheck": "tsc --noEmit --emitDeclarationOnly false",
     "with-env": "dotenv -e ../../.env --"
   },
+  "prettier": "@commune-ts/prettier-config",
   "dependencies": {
     "drizzle-orm": "^0.33.0",
     "drizzle-zod": "^0.5.1",
@@ -50,6 +51,5 @@
     "eslint": "catalog:",
     "prettier": "catalog:",
     "typescript": "catalog:"
-  },
-  "prettier": "@commune-ts/prettier-config"
+  }
 }

packages/utils/package.json

@@ -9,8 +9,8 @@
   "dependencies": {
     "@commune-ts/types": "workspace:*",
     "multiformats": "catalog:",
-    "tsafe": "catalog:",
-    "rustie": "catalog:"
+    "rustie": "catalog:",
+    "tsafe": "catalog:"
   },
   "devDependencies": {
     "@commune-ts/eslint-config": "workspace:*",

packages/wallet/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@commune-ts/wallet",
-  "type": "module",
   "version": "0.0.0",
   "license": "MIT",
   "sideEffects": [
     "**/*.css"
   ],
+  "type": "module",
   "exports": {
     ".": "./src/index.ts"
   },

pnpm-workspace.yaml

@@ -9,6 +9,7 @@ catalog:
   "@trpc/react-query": ^11.0.0-rc.477
   "@trpc/server": ^11.0.0-rc.477
   "@types/node": ^20.14.15
+  "@tailwindcss/typography": "^0.5.15"
   "@next/eslint-plugin-next": ^14.2.5
   "@heroicons/react": ^2.1.5
   "@t3-oss/env-nextjs": ^0.10.1

tooling/eslint/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@commune-ts/eslint-config",
-  "private": true,
   "version": "0.3.0",
+  "private": true,
   "type": "module",
   "exports": {
     "./base": "./base.js",
@@ -13,6 +13,7 @@
     "format": "prettier --check . --ignore-path ../../.gitignore",
     "typecheck": "tsc --noEmit"
   },
+  "prettier": "@commune-ts/prettier-config",
   "dependencies": {
     "@eslint/compat": "^1.1.1",
     "@next/eslint-plugin-next": "^14.2.5",
@@ -29,6 +30,5 @@
     "eslint": "catalog:",
     "prettier": "catalog:",
     "typescript": "catalog:"
-  },
-  "prettier": "@commune-ts/prettier-config"
+  }
 }