From d2fd139f30272d1cd56abdc26b0badbfe01560cc Mon Sep 17 00:00:00 2001 From: Adam Matthiesen Date: Thu, 7 Mar 2024 22:53:20 -0800 Subject: [PATCH] Update dependencies and components to astro remote --- .changeset/wise-peaches-argue.md | 5 +++++ .../astro-ghostcms-brutalbyelian/package.json | 16 +++++++--------- .../src/components/blog/FeatureImage.astro | 3 ++- .../src/routes/[slug].astro | 8 ++++++-- .../starlight-ghostcms/src/routes/[slug].astro | 2 +- pnpm-lock.yaml | 12 ++++++------ 6 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 .changeset/wise-peaches-argue.md diff --git a/.changeset/wise-peaches-argue.md b/.changeset/wise-peaches-argue.md new file mode 100644 index 00000000..6aca9b36 --- /dev/null +++ b/.changeset/wise-peaches-argue.md @@ -0,0 +1,5 @@ +--- +"@matthiesenxyz/astro-ghostcms-brutalbyelian": patch +--- + +Migrate from `astro-ghostcms-rendercontent` to `astro-remote` for internal processing of GhostCMS HTML. no user changes required. diff --git a/packages/astro-ghostcms-brutalbyelian/package.json b/packages/astro-ghostcms-brutalbyelian/package.json index 79a00441..01b90a5f 100644 --- a/packages/astro-ghostcms-brutalbyelian/package.json +++ b/packages/astro-ghostcms-brutalbyelian/package.json @@ -42,7 +42,8 @@ }, "scripts": {}, "peerDependencies": { - "astro": "^4.2.0" + "@matthiesenxyz/astro-ghostcms": ">=3.3.1", + "astro": ">=4.4.1" }, "devDependencies": { "@typescript-eslint/parser": "^7.1.1", @@ -50,21 +51,18 @@ "eslint-plugin-astro": "^0.31.4", "eslint-plugin-jsx-a11y": "^6.8.0", "prettier-plugin-astro": "^0.13.0", - "prettier": "^3.2.5", - "@matthiesenxyz/astro-ghostcms": "workspace:*", - "@matthiesenxyz/astro-ghostcms-rendercontent": "workspace:*" + "prettier": "^3.2.5" }, "dependencies": { + "@eliancodes/brutal-ui": "^0.2.6", "@iconify-json/logos": "^1.1.41", "@iconify-json/uil": "^1.1.8", - "@matthiesenxyz/astro-ghostcms": "^3.3.1", - "@matthiesenxyz/astro-ghostcms-rendercontent": "^0.0.8", "@unocss/astro": "^0.58.5", "@unocss/reset": "^0.58.5", - "unocss": "^0.58.5", - "@eliancodes/brutal-ui": "^0.2.6", "astro-font": "^0.0.77", + "astro-remote": "0.3.2", "typescript": "^5.4.2", - "ultrahtml": "^1.5.3" + "ultrahtml": "^1.5.3", + "unocss": "^0.58.5" } } diff --git a/packages/astro-ghostcms-brutalbyelian/src/components/blog/FeatureImage.astro b/packages/astro-ghostcms-brutalbyelian/src/components/blog/FeatureImage.astro index ecd68b6c..7639c489 100644 --- a/packages/astro-ghostcms-brutalbyelian/src/components/blog/FeatureImage.astro +++ b/packages/astro-ghostcms-brutalbyelian/src/components/blog/FeatureImage.astro @@ -1,6 +1,7 @@ --- import { getGhostImgPath } from "../../utils"; import type { Settings } from "@matthiesenxyz/astro-ghostcms/api"; +import { Markup } from 'astro-remote'; export type Props = { image: string; alt?: string; @@ -22,5 +23,5 @@ const { image, alt, caption = "", settings, transitionName } = Astro.props as Pr alt={alt} transition:name={transitionName} /> - {caption &&
} + {caption &&
} diff --git a/packages/astro-ghostcms-brutalbyelian/src/routes/[slug].astro b/packages/astro-ghostcms-brutalbyelian/src/routes/[slug].astro index 73aae438..1451e85c 100644 --- a/packages/astro-ghostcms-brutalbyelian/src/routes/[slug].astro +++ b/packages/astro-ghostcms-brutalbyelian/src/routes/[slug].astro @@ -4,7 +4,7 @@ import { getAllPosts, getAllPages, getSettings, invariant } from "@matthiesenxyz import type { InferGetStaticPropsType } from "astro"; import RecentBlogPosts from "../components/generic/RecentBlogPosts.astro"; import BlogPostHeader from "../components/blog/BlogPostHeader.astro"; -import { GhostRender } from "@matthiesenxyz/astro-ghostcms-rendercontent"; +import { Markup } from 'astro-remote'; import * as C from "../components/ghostrender"; import { Card } from "@eliancodes/brutal-ui"; @@ -30,8 +30,12 @@ invariant(settings, "Settings are required");
- =3.3.1' version: link:../astro-ghostcms - '@matthiesenxyz/astro-ghostcms-rendercontent': - specifier: ^0.0.8 - version: link:../astro-ghostcms-rendercontent '@unocss/astro': specifier: ^0.58.5 version: 0.58.5(vite@5.1.5) @@ -109,11 +106,14 @@ importers: specifier: ^0.58.5 version: 0.58.5 astro: - specifier: ^4.2.0 - version: 4.3.7(sass@1.71.1)(typescript@5.4.2) + specifier: '>=4.4.1' + version: 4.4.13(typescript@5.4.2) astro-font: specifier: ^0.0.77 version: 0.0.77 + astro-remote: + specifier: 0.3.2 + version: 0.3.2 typescript: specifier: ^5.4.2 version: 5.4.2