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

Upgrade to Astro v3 #610

Merged
merged 4 commits into from
Aug 31, 2023
+875 −558
Merged

Upgrade to Astro v3 #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c98b9db
Upgrade Astro versions
simonswiss Aug 30, 2023
b56f2fe
changeset
simonswiss Aug 30, 2023
9095b3f
upgrade more projects in monorepo
simonswiss Aug 30, 2023
759d748
Fix things
emmatown Aug 31, 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
5 changes: 5 additions & 0 deletions .changeset/purple-seahorses-pump.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@keystatic/astro': patch
---

Allow `astro@3` in `peerDependencies`
5 changes: 5 additions & 0 deletions .changeset/yellow-pets-work.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@keystatic/templates-astro': patch
---

Upgrading template to Astro v3
16 changes: 8 additions & 8 deletions dev-projects/astro-content/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@example/astro",
"name": "@example/astro-content",
"type": "module",
"version": "0.0.3",
"private": true,
Expand All @@ -11,17 +11,17 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/markdoc": "^0.4.4",
"@astrojs/node": "^5.3.2",
"@astrojs/react": "^2.2.1",
"@astrojs/sitemap": "^2.0.1",
"@astrojs/tailwind": "^4.0.0",
"@astrojs/markdoc": "^0.5.0",
"@astrojs/node": "^6.0.0",
"@astrojs/react": "^3.0.0",
"@astrojs/sitemap": "^3.0.0",
"@astrojs/tailwind": "^5.0.0",
"@keystatic/astro": "^1.0.0",
"@keystatic/core": "^0.1.0",
"@keystatic/core": "^0.1.2",
"@tailwindcss/typography": "^0.5.9",
"@types/react": "^18.2.8",
"@types/react-dom": "^18.0.11",
"astro": "^2.10.5",
"astro": "^3.0.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"tailwindcss": "^3.3.3"
Expand Down
10 changes: 5 additions & 5 deletions dev-projects/astro/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"preview": "astro preview"
},
"dependencies": {
"@astrojs/node": "^5.3.2",
"@astrojs/react": "^2.2.1",
"@astrojs/node": "^6.0.0",
"@astrojs/react": "^3.0.0",
"@braintree/sanitize-url": "^6.0.2",
"@hapi/iron": "^7.0.0",
"@keystatic/astro": "^0.0.9",
"@keystatic/core": "^0.0.116",
"@keystatic/astro": "^1.0.0",
"@keystatic/core": "^0.1.2",
"@types/react": "^18.2.8",
"@types/react-dom": "^18.0.11",
"astro": "^2.10.5",
"astro": "^3.0.3",
"cookie": "^0.5.0",
"direction": "^2.0.1",
"is-hotkey": "^0.2.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/astro/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,16 @@
"set-cookie-parser": "^2.5.1"
},
"devDependencies": {
"@keystatic/core": "^0.1.0",
"@keystatic/core": "^0.1.2",
"@types/cookie": "^0.5.1",
"@types/set-cookie-parser": "^2.4.2",
"astro": "^2.10.5",
"astro": "^3.0.3",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"peerDependencies": {
"@keystatic/core": "*",
"astro": "2",
"astro": "2 || 3",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
3 changes: 2 additions & 1 deletion packages/keystatic/src/component-blocks/cloud-image-preview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {
ButtonGroup,
ClearButton,
} from '@keystar/ui/button';
import { NotEditable, ObjectField, PreviewProps } from '@keystatic/core';
import { Dialog, DialogContainer, DialogTrigger } from '@keystar/ui/dialog';
import { Icon } from '@keystar/ui/icon';
import { imageIcon } from '@keystar/ui/icon/icons/imageIcon';
Expand All @@ -30,6 +29,8 @@ import { useId } from '@keystar/ui/utils';
import { useConfig } from '../app/shell/context';
import { focusWithPreviousSelection } from '../form/fields/document/DocumentEditor/ui-utils';
import { getSplitCloudProject, isCloudConfig } from '../app/utils';
import { NotEditable } from '../form/fields/document/DocumentEditor/primitives';
import { PreviewProps, ObjectField } from '..';

export type CloudImageProps = {
src: string;
Expand Down
Loading
Loading