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

Jump to bottom

Revert packages to use nominal package versions #9269

Merged
merged 7 commits into from
Aug 7, 2024
Merged

Revert packages to use nominal package versions #9269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
84fd489
dont version private packages
dcousens Aug 7, 2024
1cedda3
revert packages to use nominal versions
dcousens Aug 7, 2024
ac5b32b
remove versions from examples/
dcousens Aug 7, 2024
1628d6a
add pnpm overrides for workspace packages
dcousens Aug 7, 2024
dcdc898
prefer workspace:^ to workspace:* for tests/
dcousens Aug 7, 2024
13d8b4b
use version: null for mono-repo
dcousens Aug 7, 2024
a082e0a
use npmrc
dcousens Aug 7, 2024
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
3 changes: 3 additions & 0 deletions .changeset/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
"baseBranch": "main",
"linked": [],
"access": "public",
"privatePackages": {
"version": false
Copy link
Member Author

Choose a reason for hiding this comment

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

This stops examples/ from generating CHANGELOG.md and version bumps

},
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
"onlyUpdatePeerDependentsWhenOutOfRange": true
}
Expand Down
2 changes: 2 additions & 0 deletions .npmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
link-workspace-packages=true
prefer-workspace-packages=true
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Thinkmill Labs Pty Ltd
Copyright (c) 2024 Thinkmill Labs Pty Ltd

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,4 @@ For vulnerability reporting, please refer to our [security policy](/SECURITY.md)

<a href="https://thinkmill.com.au" target="_blank"><img height="48" alt="Thinkmill" src="https://thinkmill.github.io/badge/brandmark.svg"></a>

Copyright (c) 2023 [Thinkmill Labs](https://www.thinkmill.com.au/labs?utm_campaign=keystone-github) Pty Ltd. Licensed under the MIT License.
Copyright (c) 2024 [Thinkmill Labs](https://www.thinkmill.com.au/labs?utm_campaign=keystone-github) Pty Ltd. Licensed under the MIT License.
4 changes: 2 additions & 2 deletions design-system/packages/button/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
"./package.json": "./package.json"
},
"devDependencies": {
"@types/react": "catalog:"
"@types/react": "^18.3.3"
},
"dependencies": {
"@babel/runtime": "^7.24.7",
"@keystone-ui/core": "workspace:^",
"@keystone-ui/icons": "workspace:^",
"@keystone-ui/loading": "workspace:^",
"react": "catalog:"
"react": "^18.3.1"
},
"repository": "https://github.com/keystonejs/keystone/tree/main/design-system/packages/button"
}
10 changes: 5 additions & 5 deletions design-system/packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"./package.json": "./package.json"
},
"devDependencies": {
"@types/react": "catalog:",
"react": "catalog:",
"react-dom": "catalog:"
"@types/react": "^18.3.3",
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"peerDependencies": {
"react": "catalog:",
"react-dom": "catalog:"
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"dependencies": {
"@babel/runtime": "^7.24.7",
Expand Down
6 changes: 3 additions & 3 deletions design-system/packages/fields/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
"./package.json": "./package.json"
},
"devDependencies": {
"@types/react": "catalog:"
"@types/react": "^18.3.3"
},
"dependencies": {
"@babel/runtime": "^7.24.7",
"@keystone-ui/core": "workspace:^",
"@keystone-ui/icons": "workspace:^",
"@keystone-ui/popover": "workspace:^",
"date-fns": "^3.0.0",
"react": "catalog:",
"react": "^18.3.1",
"react-day-picker": "^8.0.4",
"react-dom": "catalog:",
"react-dom": "^18.3.1",
"react-focus-lock": "^2.7.1",
"react-select": "^5.2.1"
},
Expand Down
6 changes: 3 additions & 3 deletions design-system/packages/icons/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1162,18 +1162,18 @@
"@svgr/core": "^8.0.0",
"@svgr/plugin-jsx": "^8.0.0",
"@svgr/plugin-svgo": "^8.0.0",
"@types/react": "catalog:",
"@types/react": "^18.3.3",
"feather-icons": "^4.28.0",
"globby": "^14.0.0",
"react": "catalog:",
"react": "^18.3.1",
"to-pascal-case": "^1.0.0"
},
"dependencies": {
"@babel/runtime": "^7.24.7",
"@keystone-ui/core": "workspace:^"
},
"peerDependencies": {
"react": "catalog:"
"react": "^18.3.1"
},
"preconstruct": {
"entrypoints": [
Expand Down
4 changes: 2 additions & 2 deletions design-system/packages/loading/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
"./package.json": "./package.json"
},
"devDependencies": {
"@types/react": "catalog:"
"@types/react": "^18.3.3"
},
"dependencies": {
"@babel/runtime": "^7.24.7",
"@keystone-ui/core": "workspace:^",
"react": "catalog:"
"react": "^18.3.1"
},
"repository": "https://github.com/keystonejs/keystone/tree/main/design-system/packages/loading"
}
6 changes: 3 additions & 3 deletions design-system/packages/modals/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
"./package.json": "./package.json"
},
"devDependencies": {
"@types/react": "catalog:",
"@types/react": "^18.3.3",
"@types/react-transition-group": "4.4.10"
},
"dependencies": {
"@babel/runtime": "^7.24.7",
"@keystone-ui/button": "workspace:^",
"@keystone-ui/core": "workspace:^",
"react": "catalog:",
"react-dom": "catalog:",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-focus-lock": "^2.7.1",
"react-remove-scroll": "^2.4.3",
"react-transition-group": "^4.4.2"
Expand Down
4 changes: 2 additions & 2 deletions design-system/packages/notice/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
"./package.json": "./package.json"
},
"devDependencies": {
"@types/react": "catalog:"
"@types/react": "^18.3.3"
},
"dependencies": {
"@babel/runtime": "^7.24.7",
"@keystone-ui/button": "workspace:^",
"@keystone-ui/core": "workspace:^",
"@keystone-ui/icons": "workspace:^",
"react": "catalog:"
"react": "^18.3.1"
},
"repository": "https://github.com/keystonejs/keystone/tree/main/design-system/packages/notice"
}
8 changes: 4 additions & 4 deletions design-system/packages/options/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
"./package.json": "./package.json"
},
"peerDependencies": {
"react": "catalog:",
"react-dom": "catalog:"
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"react": "catalog:",
"react-dom": "catalog:"
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"dependencies": {
"@babel/runtime": "^7.24.7",
Expand Down
4 changes: 2 additions & 2 deletions design-system/packages/pill/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"./package.json": "./package.json"
},
"peerDependencies": {
"react": "catalog:"
"react": "^18.3.1"
},
"devDependencies": {
"react": "catalog:"
"react": "^18.3.1"
},
"dependencies": {
"@babel/runtime": "^7.24.7",
Expand Down
8 changes: 4 additions & 4 deletions design-system/packages/popover/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
"./package.json": "./package.json"
},
"peerDependencies": {
"react": "catalog:",
"react-dom": "catalog:"
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"react": "catalog:",
"react-dom": "catalog:"
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"dependencies": {
"@babel/runtime": "^7.24.7",
Expand Down
6 changes: 3 additions & 3 deletions design-system/packages/segmented-control/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
"./package.json": "./package.json"
},
"devDependencies": {
"@types/react": "catalog:",
"react": "catalog:"
"@types/react": "^18.3.3",
"react": "^18.3.1"
},
"dependencies": {
"@babel/runtime": "^7.24.7",
"@keystone-ui/core": "workspace:^"
},
"peerDependencies": {
"react": "catalog:"
"react": "^18.3.1"
},
"repository": "https://github.com/keystonejs/keystone/tree/main/design-system/packages/segmented-control"
}
6 changes: 3 additions & 3 deletions design-system/packages/toast/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
"./package.json": "./package.json"
},
"devDependencies": {
"@types/react": "catalog:",
"react": "catalog:"
"@types/react": "^18.3.3",
"react": "^18.3.1"
},
"dependencies": {
"@babel/runtime": "^7.24.7",
"@keystone-ui/core": "workspace:^",
"@keystone-ui/icons": "workspace:^"
},
"peerDependencies": {
"react": "catalog:"
"react": "^18.3.1"
},
"repository": "https://github.com/keystonejs/keystone/tree/main/design-system/packages/toast"
}
8 changes: 4 additions & 4 deletions design-system/packages/tooltip/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
"./package.json": "./package.json"
},
"peerDependencies": {
"react": "catalog:",
"react-dom": "catalog:"
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"react": "catalog:",
"react-dom": "catalog:"
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"dependencies": {
"@babel/runtime": "^7.24.7",
Expand Down
10 changes: 5 additions & 5 deletions design-system/website/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@
"@keystone-ui/toast": "workspace:^",
"@keystone-ui/tooltip": "workspace:^",
"@preconstruct/next": "^4.0.0",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@types/tinycolor2": "^1.4.3",
"next": "^14.2.0",
"react": "catalog:",
"react-dom": "catalog:",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"tinycolor2": "^1.4.2"
},
"devDependencies": {
"typescript": "catalog:"
"typescript": "^5.5.0"
},
"repository": "https://github.com/keystonejs/keystone/tree/main/design-system/website"
}
14 changes: 7 additions & 7 deletions docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,26 +39,26 @@
"globby": "^14.0.0",
"js-yaml": "^4.1.0",
"lodash.debounce": "^4.0.8",
"next": "catalog:",
"next": "^14.2.0",
"next-compose-plugins": "^2.2.1",
"prism-react-renderer": "^2.0.0",
"react": "catalog:",
"react-dom": "catalog:",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-focus-lock": "^2.7.1",
"rss": "^1.2.2",
"tsx": "catalog:"
"tsx": "^4.0.0"
},
"devDependencies": {
"@types/babel__core": "7.20.5",
"@types/facepaint": "^1.2.2",
"@types/gtag.js": "^0.0.20",
"@types/js-yaml": "^4.0.5",
"@types/lodash.debounce": "^4.0.6",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@types/rss": "^0.0.32",
"next-sitemap": "^4.0.0",
"typescript": "catalog:"
"typescript": "^5.5.0"
},
"repository": "https://github.com/keystonejs/keystone/tree/main/docs"
}
10 changes: 5 additions & 5 deletions examples/assets-local/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keystone-6/example-assets-local",
"version": "0.0.8",
"verison": null,
"private": true,
"license": "MIT",
"scripts": {
Expand All @@ -10,11 +10,11 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/core": "workspace:^",
"@prisma/client": "catalog:"
"@keystone-6/core": "^6.1.0",
"@prisma/client": "5.17.0"
},
"devDependencies": {
"prisma": "catalog:",
"typescript": "catalog:"
"prisma": "5.17.0",
"typescript": "^5.5.0"
}
}
10 changes: 5 additions & 5 deletions examples/assets-s3/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keystone-6/example-assets-s3",
"version": "0.0.7",
"version": null,
"private": true,
"license": "MIT",
"scripts": {
Expand All @@ -10,12 +10,12 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/core": "workspace:^",
"@prisma/client": "catalog:",
"@keystone-6/core": "^6.1.0",
"@prisma/client": "5.17.0",
"dotenv": "^16.0.0"
},
"devDependencies": {
"prisma": "catalog:",
"typescript": "catalog:"
"prisma": "5.17.0",
"typescript": "^5.5.0"
}
}
12 changes: 6 additions & 6 deletions examples/auth/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keystone-6/example-auth",
"version": "0.1.2",
"version": null,
"private": true,
"license": "MIT",
"scripts": {
Expand All @@ -10,12 +10,12 @@
"postinstall": "keystone postinstall"
},
"dependencies": {
"@keystone-6/auth": "workspace:^",
"@keystone-6/core": "workspace:^",
"@prisma/client": "catalog:"
"@keystone-6/auth": "^8.0.0",
"@keystone-6/core": "^6.1.0",
"@prisma/client": "5.17.0"
},
"devDependencies": {
"prisma": "catalog:",
"typescript": "catalog:"
"prisma": "5.17.0",
"typescript": "^5.5.0"
}
}
Loading
Loading