Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 18 commits into from
Oct 18, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
29d455d
Fix pretter/prettier-plugin-packagejson location
webpro Oct 9, 2023
043efca
Sync versions across workspaces
webpro Oct 9, 2023
22b53f6
Fix turbo config to include root workspace
webpro Oct 9, 2023
6a11b46
Temp fix for knip + next-translate-plugin issue
webpro Oct 9, 2023
e58e8a3
Upgrade some deps
webpro Oct 9, 2023
f27dcf0
Update changelog
webpro Oct 9, 2023
6ecd6a8
Trial & error: upgrade @microsoft/api-extractor
webpro Oct 10, 2023
5b1f360
Trial & error: abandon root workspace idea in pnpm-workspace.yaml
webpro Oct 10, 2023
b95d861
Add linter + fix issues in root workspace
webpro Oct 10, 2023
71c59f1
Trial & error: abandon root workspace idea in pnpm-workspace.yaml
webpro Oct 10, 2023
ea3d484
Update changelog
webpro Oct 10, 2023
7c31236
Remove changelog item
webpro Oct 10, 2023
7225955
Fix build command in integration-tests.yml
webpro Oct 10, 2023
7b956bd
Sync and fix package versions
webpro Oct 17, 2023
930ff26
New lockfile
webpro Oct 17, 2023
290b890
Downgrade a few md packages
webpro Oct 17, 2023
90b45a2
Upgrade next to 13.5.4
webpro Oct 17, 2023
31ce1df
Upgrade next to 13.5.5
webpro Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .changeset/hungry-radios-chew.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
27 changes: 27 additions & 0 deletions .changeset/twenty-bottles-enjoy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need 2 changesets?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's coming from the fact I branched from another feat branch. I'll keep it in mind. Either way, it's all none so it'll basically end up nowheere.

'@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
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 4 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .pnpmfile.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ const ALLOWED_ROOT_DEPENDENCIES = [
'@kadena-dev/markdown',
'knip',
'only-allow',
'prettier',
'prettier-plugin-packagejson',
'syncpack',
'tsx',
'turbo',
Expand Down
15 changes: 8 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
7 changes: 3 additions & 4 deletions packages/apps/docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if we're allowing prettier at root level dependency, then why are we keeping prettier again here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To keep them as much self-contained/isolated as possible.

"recursive-copy": "^2.0.14",
"start-server-and-test": "~2.0.0",
"storybook": "^7.4.0",
Expand Down
7 changes: 3 additions & 4 deletions packages/apps/graph-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -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"
}
}
3 changes: 1 addition & 2 deletions packages/apps/graph/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
3 changes: 0 additions & 3 deletions packages/apps/immutable-records/next.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ const withVanillaExtract = createVanillaExtractPlugin();
/** @type {import('next').NextConfig} */
const nextConfig = {
transpilePackages: ['@kadena/react-ui'],
experimental: {
appDir: true,
},
images: {
remotePatterns: [
{
Expand Down
8 changes: 3 additions & 5 deletions packages/apps/immutable-records/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
3 changes: 2 additions & 1 deletion packages/apps/tools/next.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
},
Expand Down
11 changes: 5 additions & 6 deletions packages/apps/tools/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tl/dr; that plugin doesn't support custom base path cq monorepos so I fixed it. We'll go back to the original once it's sorted downstream.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a section in the readme or amend this commit to add this PR in the message? It's easier to find why we have this in transition for the future

"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": {
Expand Down
1 change: 0 additions & 1 deletion packages/apps/tools/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@
},
"allowJs": true
},
"include": ["src/**/*.ts", "src/**/*.tsx"],
"exclude": ["node_modules"]
}
5 changes: 2 additions & 3 deletions packages/libs/bootstrap-lib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
5 changes: 2 additions & 3 deletions packages/libs/chainweb-node-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
5 changes: 2 additions & 3 deletions packages/libs/chainweb-stream-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
5 changes: 2 additions & 3 deletions packages/libs/chainwebjs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
3 changes: 1 addition & 2 deletions packages/libs/client-examples/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
5 changes: 2 additions & 3 deletions packages/libs/client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
Loading
Loading