Compare commits

..

2 Commits

Author SHA1 Message Date
Adam Matthiesen f870a73727 change config 2024-03-13 06:43:08 -07:00
Adam Matthiesen 2cbc4b49d0 Update Theme Handling... Start to a huge project 2024-03-13 04:48:49 -07:00
28 changed files with 567 additions and 1006 deletions

View File

@ -26,7 +26,7 @@ jobs:
- name: Setup npmrc
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
- name: install dependencies
run: pnpm install --no-frozen-lockfile
run: pnpm install
- name: create and publish versions
uses: matthiesenxyz/changeset@v1
with:

View File

@ -22,10 +22,10 @@
"test:starlight:coverage": "pnpm --filter starlight-ghostcms test:coverage"
},
"devDependencies": {
"@biomejs/biome": "1.6.1",
"@biomejs/biome": "1.6.0",
"@changesets/cli": "^2.27.1",
"@vitest/ui": "^1.4.0",
"vitest": "^1.4.0",
"@vitest/ui": "^1.3.1",
"vitest": "^1.3.1",
"vitest-fetch-mock": "^0.2.2"
}
}

View File

@ -1,24 +1,5 @@
# @matthiesenxyz/astro-ghostcms-brutalbyelian
## 0.0.18
### Patch Changes
- f82035b: Bump dependencies:
- astro-integration-kit from to
- @unocss/astro from to
- @unocss/reset from to
- astro-font from to
- unocss from to
- sass from to
- @matthiesenxyz/astro-gists from to
- vite-tsconfig-paths from to
- astro from to
- Updated dependencies [f82035b]
- @matthiesenxyz/astro-ghostcms@3.3.5
## 0.0.17
### Patch Changes

View File

@ -1,25 +0,0 @@
import {
definePreset,
presetIcons,
presetTypography,
presetWind,
} from "unocss";
export default definePreset(() => {
return {
name: "brutalTheme",
presets: [
presetWind(),
presetIcons({
collections: {
//@ts-expect-error
logos: () =>
import("@iconify-json/logos/icons.json").then((i) => i.default),
uil: () =>
import("@iconify-json/uil/icons.json").then((l) => l.default),
},
}),
presetTypography(),
],
};
});

View File

@ -1,7 +1,7 @@
{
"name": "@matthiesenxyz/astro-ghostcms-brutalbyelian",
"description": "ElianCodes Brutal theme modified to work with Astro-GhostCMS",
"version": "0.0.18",
"version": "0.0.17",
"homepage": "https://astro-ghostcms.xyz/",
"type": "module",
"license": "MIT",
@ -25,13 +25,11 @@
"url": "https://github.com/MatthiesenXYZ/astro-ghostcms/issues",
"email": "issues@astro-ghostcms.xyz"
},
"main": "./brutalunocss-preset.ts",
"files": [
"src",
"brutalunocss-preset.ts"
],
"exports": {
".": "./brutalunocss-preset.ts",
"./index.astro": "./src/routes/index.astro",
"./[slug].astro": "./src/routes/[slug].astro",
"./tags.astro": "./src/routes/tags.astro",
@ -42,11 +40,11 @@
},
"scripts": {},
"peerDependencies": {
"@matthiesenxyz/astro-ghostcms": ">=3.3.5",
"@matthiesenxyz/astro-ghostcms": ">=3.3.4",
"astro": ">=4.4.1"
},
"devDependencies": {
"@typescript-eslint/parser": "^7.2.0",
"@typescript-eslint/parser": "^7.1.1",
"eslint": "^8.57.0",
"eslint-plugin-astro": "^0.31.4",
"eslint-plugin-jsx-a11y": "^6.8.0",
@ -57,12 +55,12 @@
"@eliancodes/brutal-ui": "^0.2.6",
"@iconify-json/logos": "^1.1.41",
"@iconify-json/uil": "^1.1.8",
"@unocss/astro": "^0.58.6",
"@unocss/reset": "^0.58.6",
"astro-font": "^0.0.78",
"@unocss/astro": "^0.58.5",
"@unocss/reset": "^0.58.5",
"astro-font": "^0.0.77",
"astro-remote": "0.3.2",
"typescript": "^5.4.2",
"ultrahtml": "^1.5.3",
"unocss": "^0.58.6"
"unocss": "^0.58.5"
}
}

View File

@ -1,19 +0,0 @@
/** @type {import('tailwindcss').Config} */
import { fontFamily as _fontFamily } from "tailwindcss/defaultTheme";
export const content = [
"./node_modules/@matthiesenxyz/astro-ghostcms-catppuccin/src/**/*.{astro,js,css,ts}",
];
export const theme = {
extend: {
fontFamily: {
sans: ["Inter Variable", "Inter", ..._fontFamily.sans],
},
},
};
export const plugins = [
require("@tailwindcss/typography"),
require("@catppuccin/tailwindcss")({
prefix: "ctp",
defaultFlavour: "frappe",
}),
];

View File

@ -1,19 +0,0 @@
/** @type {import('tailwindcss').Config} */
import { fontFamily as _fontFamily } from "tailwindcss/defaultTheme";
export const content = [
"./node_modules/@matthiesenxyz/astro-ghostcms-catppuccin/src/**/*.{astro,js,css,ts}",
];
export const theme = {
extend: {
fontFamily: {
sans: ["Inter Variable", "Inter", ..._fontFamily.sans],
},
},
};
export const plugins = [
require("@tailwindcss/typography"),
require("@catppuccin/tailwindcss")({
prefix: "ctp",
defaultFlavour: "latte",
}),
];

View File

@ -1,19 +0,0 @@
/** @type {import('tailwindcss').Config} */
import { fontFamily as _fontFamily } from "tailwindcss/defaultTheme";
export const content = [
"./node_modules/@matthiesenxyz/astro-ghostcms-catppuccin/src/**/*.{astro,js,css,ts}",
];
export const theme = {
extend: {
fontFamily: {
sans: ["Inter Variable", "Inter", ..._fontFamily.sans],
},
},
};
export const plugins = [
require("@tailwindcss/typography"),
require("@catppuccin/tailwindcss")({
prefix: "ctp",
defaultFlavour: "macchiato",
}),
];

View File

@ -1,19 +0,0 @@
/** @type {import('tailwindcss').Config} */
import { fontFamily as _fontFamily } from "tailwindcss/defaultTheme";
export const content = [
"./node_modules/@matthiesenxyz/astro-ghostcms-catppuccin/src/**/*.{astro,js,css,ts}",
];
export const theme = {
extend: {
fontFamily: {
sans: ["Inter Variable", "Inter", ..._fontFamily.sans],
},
},
};
export const plugins = [
require("@tailwindcss/typography"),
require("@catppuccin/tailwindcss")({
prefix: "ctp",
defaultFlavour: "mocha",
}),
];

View File

@ -25,21 +25,10 @@
"url": "https://github.com/MatthiesenXYZ/astro-ghostcms/issues",
"email": "issues@astro-ghostcms.xyz"
},
"main": "./cat-macchiato.js",
"files": [
"src",
"cat-frappe.js",
"cat-latte.js",
"cat-macchiato.js",
"cat-mocha.js",
"index.js"
"src"
],
"exports": {
".": "./cat-macchiato.js",
"./frappe": "./cat-frappe.js",
"./latte": "./cat-latte.js",
"./macchiato": "./cat-macchiato.js",
"./mocha": "./cat-mocha.js",
"./index.astro": "./src/routes/index.astro",
"./[slug].astro": "./src/routes/[slug].astro",
"./tags.astro": "./src/routes/tags.astro",
@ -50,7 +39,7 @@
},
"scripts": {},
"peerDependencies": {
"@matthiesenxyz/astro-ghostcms": ">=3.3.5",
"@matthiesenxyz/astro-ghostcms": ">=3.3.4",
"astro": ">=4.4.0"
},
"devDependencies": {
@ -60,7 +49,7 @@
"@astrojs/tailwind": "^5.1.0",
"@catppuccin/tailwindcss": "0.1.6",
"@fontsource-variable/inter": "^5.0.17",
"@matthiesenxyz/astro-ghostcms": "^3.3.5",
"@matthiesenxyz/astro-ghostcms": "^3.3.4",
"@tailwindcss/typography": "^0.5.10",
"astro-navbar": "^2.3.1",
"astro-remote": "^0.3.2",

View File

@ -63,9 +63,8 @@ const latestFeatured = posts[0]
</section>
</div>
<div class="divider my-4"/>
<section id="ghostimport" class="text-ctp-subtext1">
<section class="text-ctp-text">
{useRemote ? (latestFeatured && <Markup
content={latestFeatured.html}
sanitize={{

View File

@ -31,7 +31,7 @@ invariant(settings, "Settings not found");
---
<PostHero post={post} settings={settings} />
<div id="ghostimport" class="mt-4 text-ctp-subtext1">
<div id="ghostimport" class="mt-4 text-ctp-text">
{useRemote ? (
<Markup
content={post.html}

View File

@ -1,24 +1,5 @@
# @matthiesenxyz/astro-ghostcms-theme-default
## 0.1.20
### Patch Changes
- f82035b: Bump dependencies:
- astro-integration-kit from to
- @unocss/astro from to
- @unocss/reset from to
- astro-font from to
- unocss from to
- sass from to
- @matthiesenxyz/astro-gists from to
- vite-tsconfig-paths from to
- astro from to
- Updated dependencies [f82035b]
- @matthiesenxyz/astro-ghostcms@3.3.5
## 0.1.19
### Patch Changes

View File

@ -1,7 +1,7 @@
{
"name": "@matthiesenxyz/astro-ghostcms-theme-default",
"description": "Default Theme for astro-ghostcms",
"version": "0.1.20",
"version": "0.1.19",
"homepage": "https://astro-ghostcms.xyz/",
"type": "module",
"license": "MIT",
@ -43,17 +43,17 @@
"scripts": {},
"devDependencies": {
"@matthiesenxyz/astro-ghostcms": "*",
"@astrojs/check": "^0.5.9",
"@astrojs/check": "^0.5.7",
"typescript": "^5.4.2"
},
"peerDependencies": {
"@matthiesenxyz/astro-ghostcms": ">=3.3.5",
"@matthiesenxyz/astro-ghostcms": ">=3.3.4",
"astro": ">=4.4.0"
},
"dependencies": {
"astro-font": "^0.0.78",
"astro-font": "^0.0.77",
"astro-remote": "^0.3.2",
"sass": "^1.72.0",
"sass": "^1.71.1",
"ultrahtml": "^1.5.3"
}
}

View File

@ -1,24 +1,5 @@
# @matthiesenxyz/astro-ghostcms
## 3.3.5
### Patch Changes
- f82035b: Bump dependencies:
- astro-integration-kit from to
- @unocss/astro from to
- @unocss/reset from to
- astro-font from to
- unocss from to
- sass from to
- @matthiesenxyz/astro-gists from to
- vite-tsconfig-paths from to
- astro from to
- Updated dependencies [f82035b]
- @matthiesenxyz/astro-ghostcms-theme-default@0.1.20
## 3.3.4
### Patch Changes

View File

@ -1,7 +1,7 @@
{
"name": "@matthiesenxyz/astro-ghostcms",
"description": "Astro GhostCMS integration to allow easier importing of GhostCMS Content",
"version": "3.3.5",
"version": "3.3.4",
"homepage": "https://astro-ghostcms.xyz/",
"type": "module",
"license": "MIT",
@ -61,24 +61,31 @@
},
"devDependencies": {
"@types/fs-extra": "^11.0.4",
"@types/node": "^20.11.28",
"vitest": "^1.4.0",
"@types/node": "^20.11.25",
"@unocss/transformer-directives": "0.58.5",
"vitest": "^1.3.1",
"vitest-fetch-mock": "^0.2.2"
},
"dependencies": {
"@astrojs/rss": "^4.0.5",
"@astrojs/sitemap": "^3.1.1",
"@matthiesenxyz/astro-ghostcms-theme-default": "^0.1.20",
"@iconify-json/logos": "^1.1.41",
"@iconify-json/uil": "^1.1.8",
"@matthiesenxyz/astro-ghostcms-theme-default": "^0.1.19",
"@resvg/resvg-js": "^2.6.0",
"@ts-ghost/core-api": "^6.0.0",
"@ts-ghost/content-api": "^4.0.12",
"astro-integration-kit": "^0.6.0",
"@unocss/astro": "^0.58.5",
"@unocss/reset": "^0.58.5",
"astro-integration-kit": "^0.5.1",
"astro-robots-txt": "^1.0.0",
"fs-extra": "^11.2.0",
"package-json": "^10.0.0",
"picocolors": "^1.0.0",
"satori": "^0.10.13",
"satori-html": "^0.3.2",
"unocss": "^0.58.5",
"unocss-preset-catppuccin": "0.1.0",
"vite": "^5.1.6"
}
}

View File

@ -173,6 +173,7 @@ export default defineIntegration({
"Theme Provider",
ghostThemeProvider({
theme: options.ThemeProvider.theme,
catppuccinThemeOptions: options.ThemeProvider.catppuccinThemeOptions,
verbose,
})
);

View File

@ -2,11 +2,19 @@ import { createResolver, defineIntegration } from "astro-integration-kit";
import { corePlugins } from "astro-integration-kit/plugins";
import { z } from "astro/zod";
import c from "picocolors";
import UnoCSS from "@unocss/astro";
import { presetIcons, presetTypography, presetWind, presetUno, transformerDirectives } from "unocss";
import presetCatppuccin from 'unocss-preset-catppuccin';
type CATPPUCCINFLAVOURS = "latte" | "frappe" | "macchiato" | "mocha";
export default defineIntegration({
name: "@matthiesenxyz/astro-ghostcms-themeprovider",
optionsSchema: z.object({
theme: z.string(),
catppuccinThemeOptions: z.object({
defaultFlavor: z.custom<CATPPUCCINFLAVOURS>(),
}),
verbose: z.coerce.boolean().optional(),
}),
plugins: [...corePlugins],
@ -16,7 +24,12 @@ export default defineIntegration({
const DEFAULT_THEME = "@matthiesenxyz/astro-ghostcms-theme-default";
return {
"astro:config:setup": ({ watchIntegration, injectRoute, logger }) => {
"astro:config:setup": ({
watchIntegration,
injectRoute,
logger,
addIntegration,
}) => {
watchIntegration(resolve());
const themeLogger = logger.fork(
@ -44,7 +57,40 @@ export default defineIntegration({
verboseLogsInfo(`${c.bold(c.cyan("Injecting Theme:"))} ${c.bold(c.underline(c.magenta(options.theme)))}`);
}
const checkTheme = () => {
if (options.theme === "@matthiesenxyz/astro-ghostcms-catppuccin") {
return {defaultFlavour: options.catppuccinThemeOptions.defaultFlavor}
}
return {defaultFlavor: undefined};
}
// Add the UnoCSS integration
addIntegration(
UnoCSS({
configFile: false,
injectReset: true,
presets: [
presetUno(),
presetWind({
variablePrefix: ""
}),
presetIcons({
collections: {
uil: () =>
import("@iconify-json/uil/icons.json")
.then((l) => l.default),
},
}),
presetTypography(),
presetCatppuccin(checkTheme()),
],
transformers: [
transformerDirectives(),
],
})
)
// Inject Routes
injectRoute({
pattern: "/",
entrypoint: `${options.theme}/index.astro`,

View File

@ -2,6 +2,8 @@ import type { SitemapOptions } from "@astrojs/sitemap";
import type { RobotsTxtOptions } from "astro-robots-txt";
import { z } from "astro/zod";
type CATPPUCCINFLAVOURS = "latte" | "frappe" | "macchiato" | "mocha";
export const GhostUserConfigSchema = z.object({
/** OPTIONAL - Either set the URL in your .env or put it here
* @example
@ -26,7 +28,23 @@ export const GhostUserConfigSchema = z.object({
* @default "@matthiesenxyz/astro-ghostcms-theme-default"
*/
theme: z.string().default("@matthiesenxyz/astro-ghostcms-theme-default"),
/**
* OPTIONAL - Catppuccin Theme Options
*/
catppuccinThemeOptions: z.object({
/** OPTIONAL - Set the default flavor for the catppuccino theme
* @default "macchiato"
*/
defaultFlavor: z.custom<CATPPUCCINFLAVOURS>().optional().default("macchiato"),
}).optional().default({}),
/**
* OPTIONAL - Astro Remote Configuration
*/
astroRemote: z.object({
/**
* OPTIONAL - Enable or Disable the Astro Remote
* @default true
*/
enable: z.boolean().default(true),
}).optional().default({}),
}).optional().default({}),

View File

@ -44,7 +44,7 @@
"devDependencies": {
"@types/fs-extra": "^11.0.1",
"@types/gunzip-maybe": "^1.4.0",
"@types/node": "^20.11.28",
"@types/node": "^20.11.25",
"@types/tar-fs": "^2.0.1",
"typescript": "^5.4.2"
},

View File

@ -1,21 +1,5 @@
# @matthiesenxyz/starlight-ghostcms
## 0.1.9
### Patch Changes
- f82035b: Bump dependencies:
- astro-integration-kit from to
- @unocss/astro from to
- @unocss/reset from to
- astro-font from to
- unocss from to
- sass from to
- @matthiesenxyz/astro-gists from to
- vite-tsconfig-paths from to
- astro from to
## 0.1.8
### Patch Changes

View File

@ -1,7 +1,7 @@
{
"name": "@matthiesenxyz/starlight-ghostcms",
"description": "Starlight GhostCMS plugin to allow easier importing of GhostCMS Content into your starlight website",
"version": "0.1.9",
"version": "0.1.8",
"homepage": "https://astro-ghostcms.xyz/",
"type": "module",
"license": "MIT",
@ -54,19 +54,19 @@
},
"devDependencies": {
"@astrojs/starlight": "^0.21.1",
"vitest": "^1.4.0",
"vitest": "^1.3.1",
"vitest-fetch-mock": "^0.2.2"
},
"dependencies": {
"@astrojs/rss": "^4.0.5",
"@matthiesenxyz/astro-gists": "^0.2.11",
"@matthiesenxyz/astro-gists": "^0.2.7",
"@ts-ghost/core-api": "^6.0.0",
"@ts-ghost/content-api": "^4.0.12",
"astro-integration-kit": "^0.6.0",
"astro-integration-kit": "^0.5.1",
"astro-remote": "^0.3.2",
"ultrahtml": "^1.5.3",
"vite": "^5.1.6",
"vite-tsconfig-paths": "^4.3.2"
"vite-tsconfig-paths": "^4.3.1"
},
"peerDependencies": {
"@astrojs/starlight": ">=0.19.0",

View File

@ -1,18 +1,14 @@
import ghostcms from "@matthiesenxyz/astro-ghostcms";
import { defineConfig } from "astro/config";
// import tailwind from "@astrojs/tailwind";
// import UnoCSS from "unocss/astro";
// https://astro.build/config
export default defineConfig({
site: "https://demo.astro-ghostcms.xyz/",
integrations: [
//tailwind(),
// UnoCSS({ injectReset: true }),
ghostcms({
ghostURL: 'https://ghostdemo.matthiesen.xyz',
ThemeProvider: {
theme: "@matthiesenxyz/astro-ghostcms-theme-default",
theme: "@matthiesenxyz/astro-ghostcms-catppuccin",
astroRemote: {
enable: true,
},

View File

@ -11,18 +11,18 @@
"astro": "astro"
},
"dependencies": {
"astro": "^4.5.6",
"astro": "^4.4.13",
"@matthiesenxyz/astro-ghostcms": "workspace:*",
"@matthiesenxyz/astro-ghostcms-theme-default": "workspace:*",
"@matthiesenxyz/astro-ghostcms-catppuccin": "workspace:*",
"@matthiesenxyz/astro-ghostcms-brutalbyelian": "workspace:*",
"@astrojs/tailwind": "^5.1.0",
"@unocss/astro": "^0.58.6",
"@unocss/astro": "^0.58.5",
"tailwindcss": "^3.3.5"
},
"devDependencies": {
"@unocss/reset": "^0.58.6",
"@unocss/reset": "^0.58.5",
"typescript": "^5.4.2",
"unocss": "^0.58.6"
"unocss": "^0.58.5"
}
}

View File

@ -1,4 +0,0 @@
/** @type {import('tailwindcss').Config} */
module.exports = {
presets: [require("@matthiesenxyz/astro-ghostcms-catppuccin/macchiato")],
};

View File

@ -1,6 +0,0 @@
import brutalTheme from "@matthiesenxyz/astro-ghostcms-brutalbyelian";
import { defineConfig } from "unocss";
export default defineConfig({
presets: [brutalTheme()],
});

View File

@ -12,13 +12,13 @@
"astro": "astro"
},
"devDependencies": {
"@types/node": "^20.11.28"
"@types/node": "^20.11.25"
},
"dependencies": {
"@astrojs/starlight": "^0.21.1",
"@matthiesenxyz/starlight-ghostcms": "workspace:*",
"@matthiesenxyz/astro-gists": "^0.2.11",
"astro": "^4.5.6",
"@matthiesenxyz/astro-gists": "^0.2.7",
"astro": "^4.4.13",
"sharp": "^0.33.2"
}
}

File diff suppressed because it is too large Load Diff