Fix up some config etc. (attempt 2) (#1018)

* Fix pretter/prettier-plugin-packagejson location * Sync versions across workspaces * Fix turbo config to include root workspace * Temp fix for knip + next-translate-plugin issue * Upgrade some deps * Update changelog * Trial & error: upgrade @microsoft/api-extractor * Trial & error: abandon root workspace idea in pnpm-workspace.yaml * Add linter + fix issues in root workspace * Trial & error: abandon root workspace idea in pnpm-workspace.yaml * Update changelog * Remove changelog item * Fix build command in integration-tests.yml * Sync and fix package versions * New lockfile * Downgrade a few md packages * Upgrade next to 13.5.4 * Upgrade next to 13.5.5
kadena-community · Oct 18, 2023 · a664a95 · a664a95 · vercel · Oct 18, 2023
1 parent ffd0f22
commit a664a95
Show file tree

Hide file tree

Showing 38 changed files with 4,544 additions and 7,111 deletions.
diff --git a/.changeset/hungry-radios-chew.md b/.changeset/hungry-radios-chew.md
@@ -0,0 +1,27 @@
+---
+'@kadena/chainweb-stream-client': none
+'@kadena/chainweb-node-client': none
+'@kadena/cryptography-utils': none
+'@kadena/immutable-records': none
+'@kadena/pactjs-generator': none
+'@kadena/react-components': none
+'@kadena/client-examples': none
+'@kadena-dev/markdown': none
+'@kadena-dev/eslint-config': none
+'@kadena-dev/eslint-plugin': none
+'@kadena-dev/lint-package': none
+'@kadena/graph-client': none
+'@kadena/pactjs-cli': none
+'@kadena/chainwebjs': none
+'kadena.js': none
+'@kadena/cookbook': none
+'@kadena/react-ui': none
+'@kadena/kda-cli': none
+'@kadena/client': none
+'@kadena/pactjs': none
+'@kadena/graph': none
+'@kadena/types': none
+'@kadena/docs': none
+---
+
+Fix up some config and dependencies
diff --git a/.changeset/twenty-bottles-enjoy.md b/.changeset/twenty-bottles-enjoy.md
@@ -0,0 +1,27 @@
+---
+'@kadena/chainweb-stream-client': none
+'@kadena/chainweb-node-client': none
+'@kadena/cryptography-utils': none
+'@kadena/immutable-records': none
+'@kadena/pactjs-generator': none
+'@kadena/react-components': none
+'@kadena/client-examples': none
+'@kadena-dev/markdown': none
+'@kadena-dev/eslint-config': none
+'@kadena-dev/eslint-plugin': none
+'@kadena-dev/lint-package': none
+'@kadena/graph-client': none
+'@kadena/pactjs-cli': none
+'@kadena/chainwebjs': none
+'kadena.js': none
+'@kadena/cookbook': none
+'@kadena/react-ui': none
+'@kadena/kda-cli': none
+'@kadena/client': none
+'@kadena/pactjs': none
+'@kadena/graph': none
+'@kadena/types': none
+'@kadena/docs': none
+---
+
+Fix up some config and dependencies
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,5 +35,8 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
+      - name: Lint monorepo root
+        run: pnpm run lint
+
       - name: Build, lint, test all packages
-        run: pnpm turbo build lint test
+        run: pnpm turbo lint build test
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -37,7 +37,7 @@ jobs:
         run: pnpm install
 
       - name: Build client and dependencies
-        run: pnpm run build --filter @kadena/client
+        run: pnpm turbo build --filter @kadena/client
 
       - name: run integration tests
         run: pnpm run test:integration --filter @kadena/client
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -43,8 +43,11 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
+      - name: Lint monorepo root
+        run: pnpm run lint
+
       - name: Build, lint, test all packages
-        run: pnpm turbo build lint test
+        run: pnpm turbo lint build test
 
       - name: Create Release PR or Publish
         id: changesets

diff --git a/.pnpmfile.cjs b/.pnpmfile.cjs
@@ -3,6 +3,8 @@ const ALLOWED_ROOT_DEPENDENCIES = [
   '@kadena-dev/markdown',
   'knip',
   'only-allow',
+  'prettier',
+  'prettier-plugin-packagejson',
   'syncpack',
   'tsx',
   'turbo',

diff --git a/package.json b/package.json
@@ -5,14 +5,13 @@
   "description": "Kadena JS monorepo",
   "license": "ISC",
   "scripts": {
-    "build": "turbo run build",
-    "format": "pnpm run /^format:.*/ && turbo run format",
+    "format": "pnpm run /^format:.*/",
     "format:md": "remark *.md docs/*.md -o --use @kadena-dev/markdown",
     "format:pkgs": "tsx packages/tools/scripts/generate-packages-json.ts",
     "format:src": "prettier . \"!packages\" --cache --write",
     "preinstall": "npx --no-install only-allow pnpm",
-    "knip": "NEXT_TRANSLATE_PATH=packages/apps/tools knip",
-    "lint": "syncpack list-mismatches && turbo run lint",
+    "knip": "knip",
+    "lint": "syncpack list-mismatches && prettier . \"!packages\" --cache --check",
     "publish": "changeset publish",
     "select": "git checkout .changeset/config.json && tsx --no-warnings ./packages/tools/scripts/publish-set.ts",
     "test": "turbo run test",
@@ -23,11 +22,13 @@
   "devDependencies": {
     "@changesets/cli": "^2.26.2",
     "@kadena-dev/markdown": "workspace:*",
-    "knip": "^2.25.2",
-    "only-allow": "^1.1.1",
+    "knip": "^2.32.4",
+    "only-allow": "^1.2.1",
+    "prettier": "~3.0.3",
+    "prettier-plugin-packagejson": "^2.4.6",
     "syncpack": "^11.2.1",
     "tsx": "^3.12.10",
-    "turbo": "^1.10.14"
+    "turbo": "^1.10.15"
   },
   "engines": {
     "node": ">=18",

diff --git a/packages/apps/docs/package.json b/packages/apps/docs/package.json
@@ -41,7 +41,7 @@
     "@mdx-js/loader": "~2.3.0",
     "@mdx-js/react": "~2.3.0",
     "@next/mdx": "~13.3.4",
-    "@vanilla-extract/css": "1.12.0",
+    "@vanilla-extract/css": "1.13.0",
     "acorn": "~8.8.2",
     "algoliasearch": "^4.20.0",
     "classnames": "^2.3.1",
@@ -51,7 +51,7 @@
     "mdast-util-to-markdown": "~1.5.0",
     "mdast-util-to-string": "~3.2.0",
     "mobx": "~6.9.0",
-    "next": "13.5.3",
+    "next": "13.5.5",
     "next-themes": "~0.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -104,8 +104,7 @@
     "micromark-extension-frontmatter": "~1.1.0",
     "mini-css-extract-plugin": "2.7.6",
     "openapi-types": "~12.1.3",
-    "prettier": "~3.0.0",
-    "prettier-plugin-packagejson": "^2.4.5",
+    "prettier": "~3.0.3",
     "recursive-copy": "^2.0.14",
     "start-server-and-test": "~2.0.0",
     "storybook": "^7.4.0",

diff --git a/packages/apps/graph-client/package.json b/packages/apps/graph-client/package.json
@@ -32,7 +32,7 @@
     "eslint": "^8.45.0",
     "graphql": "~16.8.0",
     "lodash.isequal": "~4.5.0",
-    "next": "13.4.5",
+    "next": "13.5.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
@@ -50,11 +50,10 @@
     "@types/node": "^18.17.14",
     "@types/react": "^18.2.15",
     "@types/react-dom": "18.2.7",
-    "@vanilla-extract/css": "1.12.0",
+    "@vanilla-extract/css": "1.13.0",
     "@vanilla-extract/next-plugin": "2.3.1",
     "concurrently": "^7.2.2",
-    "prettier": "~3.0.0",
-    "prettier-plugin-packagejson": "^2.4.5",
+    "prettier": "~3.0.3",
     "typescript": "5.2.2"
   }
 }
diff --git a/packages/apps/graph/package.json b/packages/apps/graph/package.json
@@ -62,8 +62,7 @@
     "@types/node": "^18.17.14",
     "@types/pg": "~8.10.2",
     "@types/seedrandom": "~3.0.5",
-    "prettier": "~3.0.0",
-    "prettier-plugin-packagejson": "^2.4.5",
+    "prettier": "~3.0.3",
     "ts-node": "~10.8.2",
     "typescript": "5.2.2"
   }

diff --git a/packages/apps/immutable-records/next.config.mjs b/packages/apps/immutable-records/next.config.mjs
@@ -4,9 +4,6 @@ const withVanillaExtract = createVanillaExtractPlugin();
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   transpilePackages: ['@kadena/react-ui'],
-  experimental: {
-    appDir: true,
-  },
   images: {
     remotePatterns: [
       {

diff --git a/packages/apps/immutable-records/package.json b/packages/apps/immutable-records/package.json
@@ -21,13 +21,12 @@
     "@kadena/client": "workspace:*",
     "@kadena/fonts": "~0.0.1",
     "@kadena/react-ui": "workspace:*",
-    "@vanilla-extract/css": "1.12.0",
+    "@vanilla-extract/css": "1.13.0",
     "@walletconnect/modal": "~2.6.1",
     "@walletconnect/sign-client": "~2.8.1",
     "clsx": "^2.0.0",
     "evt": "^2.5.2",
-    "mini-css-extract-plugin": "2.7.6",
-    "next": "13.4.5",
+    "next": "13.5.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-hook-form": "~7.45.0",
@@ -49,8 +48,7 @@
     "eslint-config-next": "13.4.5",
     "lokijs": "^1.5.12",
     "pino-pretty": "^10.2.0",
-    "prettier": "~3.0.0",
-    "prettier-plugin-packagejson": "^2.4.5",
+    "prettier": "~3.0.3",
     "typescript": "5.2.2"
   }
 }
diff --git a/packages/apps/tools/next.config.js b/packages/apps/tools/next.config.js
@@ -1,10 +1,11 @@
 /** @type {import('next').NextConfig} */
-const nextTranslate = require('next-translate-plugin');
+const nextTranslate = require('@webpro/next-translate-plugin');
 const { createVanillaExtractPlugin } = require('@vanilla-extract/next-plugin');
 
 const withVanillaExtract = createVanillaExtractPlugin();
 
 const config = {
+  nextTranslate: { basePath: __dirname },
   eslint: {
     ignoreDuringBuilds: true, // lint is a different task/phase
   },

diff --git a/packages/apps/tools/package.json b/packages/apps/tools/package.json
@@ -33,11 +33,11 @@
     "@walletconnect/modal": "~2.6.1",
     "@walletconnect/sign-client": "~2.8.1",
     "@walletconnect/utils": "~2.9.2",
-    "ace-builds": "~1.22.1",
+    "ace-builds": "~1.30.0",
     "classnames": "^2.3.1",
     "jest-standard-reporter": "~2.0.0",
     "js-cookie": "~3.0.5",
-    "next": "13.4.5",
+    "next": "13.5.5",
     "next-themes": "~0.2.1",
     "next-translate": "~2.0.6",
     "react": "^18.2.0",
@@ -72,20 +72,19 @@
     "@types/testing-library__jest-dom": "~5.14.8",
     "@typescript-eslint/eslint-plugin": "^5.23.0",
     "@typescript-eslint/parser": "^5.23.0",
-    "@vanilla-extract/css": "1.12.0",
+    "@vanilla-extract/css": "1.13.0",
     "@vanilla-extract/jest-transform": "1.1.1",
     "@vanilla-extract/next-plugin": "2.3.1",
     "@walletconnect/types": "~2.8.1",
+    "@webpro/next-translate-plugin": "^2.6.3",
     "debug": "~4.3.4",
     "eslint": "^8.45.0",
     "eslint-config-next": "13.4.5",
     "eslint-plugin-jest": "~27.2.1",
     "ignore-loader": "~0.1.2",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "~29.6.1",
-    "next-translate-plugin": "~2.0.5",
-    "prettier": "~3.0.0",
-    "prettier-plugin-packagejson": "^2.4.5",
+    "prettier": "~3.0.3",
     "typescript": "5.2.2"
   },
   "volta": {

diff --git a/packages/apps/tools/tsconfig.json b/packages/apps/tools/tsconfig.json
@@ -23,6 +23,5 @@
     },
     "allowJs": true
   },
-  "include": ["src/**/*.ts", "src/**/*.tsx"],
   "exclude": ["node_modules"]
 }
diff --git a/packages/libs/bootstrap-lib/package.json b/packages/libs/bootstrap-lib/package.json
@@ -53,15 +53,14 @@
     "@kadena-dev/lint-package": "workspace:*",
     "@kadena-dev/markdown": "workspace:*",
     "@kadena/types": "workspace:*",
-    "@microsoft/api-extractor": "^7.37.0",
+    "@microsoft/api-extractor": "^7.38.0",
     "@rushstack/eslint-config": "~3.3.0",
     "@types/isomorphic-fetch": "~0.0.36",
     "@types/jest": "^29.5.3",
     "@types/node": "^18.17.14",
     "eslint": "^8.45.0",
     "jest": "^29.7.0",
-    "prettier": "~3.0.0",
-    "prettier-plugin-packagejson": "^2.4.5",
+    "prettier": "~3.0.3",
     "typescript": "5.2.2"
   }
 }
diff --git a/packages/libs/chainweb-node-client/package.json b/packages/libs/chainweb-node-client/package.json
@@ -55,15 +55,14 @@
     "@kadena-dev/lint-package": "workspace:*",
     "@kadena-dev/markdown": "workspace:*",
     "@kadena/types": "workspace:*",
-    "@microsoft/api-extractor": "^7.37.0",
+    "@microsoft/api-extractor": "^7.38.0",
     "@rushstack/eslint-config": "~3.3.0",
     "@types/isomorphic-fetch": "~0.0.36",
     "@types/jest": "^29.5.3",
     "@types/node": "^18.17.14",
     "eslint": "^8.45.0",
     "jest": "^29.7.0",
-    "prettier": "~3.0.0",
-    "prettier-plugin-packagejson": "^2.4.5",
+    "prettier": "~3.0.3",
     "typescript": "5.2.2"
   },
   "publishConfig": {

diff --git a/packages/libs/chainweb-stream-client/package.json b/packages/libs/chainweb-stream-client/package.json
@@ -44,15 +44,14 @@
     "@kadena-dev/heft-rig": "workspace:*",
     "@kadena-dev/lint-package": "workspace:*",
     "@kadena-dev/markdown": "workspace:*",
-    "@microsoft/api-extractor": "^7.37.0",
+    "@microsoft/api-extractor": "^7.38.0",
     "@rushstack/eslint-config": "~3.3.0",
     "@types/eventsource": "1.1.11",
     "@types/jest": "^29.5.3",
     "@types/node": "^18.17.14",
     "eslint": "^8.45.0",
     "jest": "^29.7.0",
-    "prettier": "~3.0.0",
-    "prettier-plugin-packagejson": "^2.4.5",
+    "prettier": "~3.0.3",
     "typescript": "5.2.2"
   },
   "publishConfig": {

diff --git a/packages/libs/chainwebjs/package.json b/packages/libs/chainwebjs/package.json
@@ -71,15 +71,14 @@
     "@kadena-dev/heft-rig": "workspace:*",
     "@kadena-dev/lint-package": "workspace:*",
     "@kadena-dev/markdown": "workspace:*",
-    "@microsoft/api-extractor": "^7.37.0",
+    "@microsoft/api-extractor": "^7.38.0",
     "@rushstack/eslint-config": "~3.3.0",
     "@types/eventsource": "1.1.11",
     "@types/jest": "^29.5.3",
     "@types/node": "^18.17.14",
     "eslint": "^8.45.0",
     "jest": "^29.7.0",
-    "prettier": "~3.0.0",
-    "prettier-plugin-packagejson": "^2.4.5",
+    "prettier": "~3.0.3",
     "typescript": "5.2.2"
   },
   "publishConfig": {

diff --git a/packages/libs/client-examples/package.json b/packages/libs/client-examples/package.json
@@ -42,8 +42,7 @@
     "@rushstack/eslint-config": "~3.3.0",
     "@types/node": "^18.17.14",
     "eslint": "^8.45.0",
-    "prettier": "~3.0.0",
-    "prettier-plugin-packagejson": "^2.4.5",
+    "prettier": "~3.0.3",
     "ts-node": "~10.8.2",
     "typescript": "5.2.2"
   }

diff --git a/packages/libs/client/package.json b/packages/libs/client/package.json
@@ -51,16 +51,15 @@
     "@kadena-dev/markdown": "workspace:*",
     "@kadena/pactjs-cli": "workspace:*",
     "@kadena/types": "workspace:*",
-    "@microsoft/api-extractor": "^7.37.0",
+    "@microsoft/api-extractor": "^7.38.0",
     "@rushstack/eslint-config": "~3.3.0",
     "@types/debug": "~4.1.7",
     "@types/jest": "^29.5.3",
     "@types/node": "^18.17.14",
     "@walletconnect/types": "~2.8.1",
     "eslint": "^8.45.0",
     "jest": "^29.7.0",
-    "prettier": "~3.0.0",
-    "prettier-plugin-packagejson": "^2.4.5",
+    "prettier": "~3.0.3",
     "ts-node": "~10.8.2",
     "typescript": "5.2.2"
   },