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.

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

Fixes for Version Packages #8522

Merged
merged 4 commits into from
Apr 27, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/cool-cycles-exist.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@keystone-6/core': minor
---

Adds support for Prisma Data Proxy client generation, automatically enabled for `db.url`'s with a `prisma:` prefix
5 changes: 5 additions & 0 deletions .changeset/early-garlics-double.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@keystone-6/core': patch
---

Fixes the `.keystone/types` import paths when using `db.prismaSchemaPath` on Windows
5 changes: 5 additions & 0 deletions .changeset/late-birds-clean.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@keystone-ui/fields': minor
---

Adds newline compatibility to description text in admin ui
2 changes: 1 addition & 1 deletion .changeset/tough-moles-heal.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
'@keystone-6/core': minor
---

Update Prisma version to `4.12.0`
Updates Prisma version to `4.12.0`
5 changes: 5 additions & 0 deletions .changeset/types-can-upgrade.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@keystone-6/core': patch
---

Fixes the printed output when using `keystone telemetry reset`
5 changes: 5 additions & 0 deletions .changeset/types-can-walk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@keystone-6/core': minor
---

Adds a new `.types.path` configuration option, for specifying where your Keystone types are built
1 change: 0 additions & 1 deletion .github/workflows/version_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ jobs:
steps:
- uses: actions/checkout@main
with:
fetch-depth: 0
persist-credentials: false

- uses: ./.github/actions/ci-setup
Expand Down
6 changes: 0 additions & 6 deletions design-system/packages/fields/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
# @keystone-ui/fields

## 7.2.0

### Minor Changes

- [#8369](https://github.com/keystonejs/keystone/pull/8369) [`1af39b913`](https://github.com/keystonejs/keystone/commit/1af39b9133ef6a8d48c55f09c79a7d2f853346ad) Thanks [@DiesIrae](https://github.com/DiesIrae)! - Add newline compatibility to description text in admin ui

## 7.1.2

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion design-system/packages/fields/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keystone-ui/fields",
"version": "7.2.0",
"version": "7.1.2",
"license": "MIT",
"main": "dist/keystone-ui-fields.cjs.js",
"module": "dist/keystone-ui-fields.esm.js",
Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
"@babel/preset-typescript": "^7.21.0",
"@changesets/changelog-github": "^0.4.1",
"@changesets/cli": "^2.18.0",
"@changesets/get-github-info": "^0.5.2",
"@changesets/get-release-plan": "^3.0.16",
"@manypkg/cli": "^0.20.0",
"@preconstruct/cli": "2.5.0",
"@types/jest": "^29.0.0",
Expand Down
17 changes: 0 additions & 17 deletions packages/core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,5 @@
# @keystone-6/core

## 5.2.0

### Minor Changes

- [#8370](https://github.com/keystonejs/keystone/pull/8370) [`730ee7948`](https://github.com/keystonejs/keystone/commit/730ee79489cd5c7cf74553a86d5de8433d32ebeb) Thanks [@borisno2](https://github.com/borisno2)! - Adds support for Prisma Data Proxy client generation, automatically enabled for `db.url`'s with a `prisma:` prefix

- [#8381](https://github.com/keystonejs/keystone/pull/8381) [`6b338c46a`](https://github.com/keystonejs/keystone/commit/6b338c46a5f9c4ab71939f3632dfccae27ffb56e) Thanks [@dcousens](https://github.com/dcousens)! - Adds a new `.types.path` configuration option, for specifying where your Keystone types are built

### Patch Changes

- [#8373](https://github.com/keystonejs/keystone/pull/8373) [`c6c9078d5`](https://github.com/keystonejs/keystone/commit/c6c9078d5cdeab968d563c340904717ebc36b1a3) Thanks [@borisno2](https://github.com/borisno2)! - Fixes the `.keystone/types` import paths when using `db.prismaSchemaPath` on Windows

- [#8400](https://github.com/keystonejs/keystone/pull/8400) [`7cfe118bb`](https://github.com/keystonejs/keystone/commit/7cfe118bb68b0a2420a82fe78849ee9f7b9f6fb2) Thanks [@renovate](https://github.com/apps/renovate)! - Fixes the printed output when using `keystone telemetry reset`

- Updated dependencies [[`1af39b913`](https://github.com/keystonejs/keystone/commit/1af39b9133ef6a8d48c55f09c79a7d2f853346ad)]:
- @keystone-ui/fields@7.2.0

## 5.1.0

### Minor Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keystone-6/core",
"version": "5.2.0",
"version": "5.1.0",
"repository": "https://github.com/keystonejs/keystone/tree/main/packages/core",
"license": "MIT",
"main": "dist/keystone-6-core.cjs.js",
Expand Down Expand Up @@ -204,7 +204,7 @@
"@hapi/iron": "^7.0.0",
"@keystone-ui/button": "^7.0.2",
"@keystone-ui/core": "^5.0.2",
"@keystone-ui/fields": "^7.2.0",
"@keystone-ui/fields": "^7.1.2",
"@keystone-ui/icons": "^6.0.2",
"@keystone-ui/loading": "^6.0.2",
"@keystone-ui/modals": "^6.0.3",
Expand Down
31 changes: 19 additions & 12 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 9 additions & 28 deletions scripts/changelog.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,37 +15,18 @@ const publicPackages = [
'@keystone-6/core',
'@keystone-6/document-renderer',
'@keystone-6/fields-document',
'@keystone-6/session-store-redis',
];

const cves = [
{
id: 'CVE-2022-36313',
href: 'https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-36313',
upstream: true,
description: `
An upstream transitive dependency \`file-type\` is vulnerable to a ReDoS.
We have upgraded to a version of \`file-type\` that is fixed.
`,
},
{
id: 'CVE-2023-23936',
href: 'https://github.com/advisories/GHSA-5r9g-qh6m-jxff',
upstream: true,
description: `
An upstream transitive dependency \`undici\` is vulnerable to a HTTP header CRLF injection vulnerability.
We have upgraded to a version of \`@prisma/core\` that uses a fixed \`undici\`.
`,
},
{
id: 'CVE-2023-24807',
href: 'https://github.com/advisories/GHSA-r6ch-mqf9-qc9w',
upstream: true,
description: `
An upstream transitive dependency \`undici\` is vulnerable to a ReDoS.
We have upgraded to a version of \`@prisma/core\` that uses a fixed \`undici\`.
`,
},
// {
// id: 'CVE-2023-23936',
// href: 'https://github.com/advisories/GHSA-5r9g-qh6m-jxff',
// upstream: true,
// description: `
// An upstream transitive dependency \`undici\` is vulnerable to a HTTP header CRLF injection vulnerability.
// We have upgraded to a version of \`@prisma/core\` that uses a fixed \`undici\`.
// `,
// },
];

function gitCommitsSince(tag) {
Expand Down