diff --git a/packages/astro-ghostcms/package.json b/packages/astro-ghostcms/package.json index 6e38ac4d..30d210f9 100644 --- a/packages/astro-ghostcms/package.json +++ b/packages/astro-ghostcms/package.json @@ -45,10 +45,7 @@ "exports": { ".": "./src/index.ts", "./api": "./src/api/index.ts", - "./404.astro": "./src/routes/404.astro", - "./rss-routes/*": "./src/integrations/rssfeed/routes/*", - "./satoriOG": "./src/integrations/satoriog/satori.ts", - "./open-graph/*": "./src/integrations/satoriog/routes/*" + "./satoriOG": "./src/integrations/satoriog/satori.ts" }, "scripts": { "test": "vitest run", diff --git a/packages/astro-ghostcms/src/astro-ghostcms.ts b/packages/astro-ghostcms/src/astro-ghostcms.ts index 0333e22b..21c401ab 100644 --- a/packages/astro-ghostcms/src/astro-ghostcms.ts +++ b/packages/astro-ghostcms/src/astro-ghostcms.ts @@ -96,7 +96,7 @@ export default defineIntegration({ routeLogInfo(c.bold(c.cyan(`Setting up ${routename} route`))); injectRoute({ pattern: pattern, - entrypoint: `${name}${entrypoint}`, + entrypoint: resolve(`./routes${entrypoint}`), prerender: true, }); } else { diff --git a/packages/astro-ghostcms/src/integrations/rssfeed/astro-ghostcms-rss.ts b/packages/astro-ghostcms/src/integrations/rssfeed/astro-ghostcms-rss.ts index e2100c3f..3828f8c6 100644 --- a/packages/astro-ghostcms/src/integrations/rssfeed/astro-ghostcms-rss.ts +++ b/packages/astro-ghostcms/src/integrations/rssfeed/astro-ghostcms-rss.ts @@ -23,16 +23,14 @@ export default defineIntegration({ RSSLogger.info(c.bold(c.magenta("RSS Feed Enabled. Setting up..."))); - const rssRoute = "@matthiesenxyz/astro-ghostcms/rss-routes"; - injectRoute({ pattern: "/rss-style.xsl", - entrypoint: `${rssRoute}/rss-style.xsl.ts`, + entrypoint: resolve("./routes/rss-style.xsl.ts"), }); injectRoute({ pattern: "/rss.xml", - entrypoint: `${rssRoute}/rss.xml.ts`, + entrypoint: resolve("./routes/rss.xml.ts"), }); }, "astro:config:done": ({ logger }) => { diff --git a/packages/astro-ghostcms/src/integrations/satoriog/astro-ghostcms-satoriog.ts b/packages/astro-ghostcms/src/integrations/satoriog/astro-ghostcms-satoriog.ts index d8cc56c3..eba963b3 100644 --- a/packages/astro-ghostcms/src/integrations/satoriog/astro-ghostcms-satoriog.ts +++ b/packages/astro-ghostcms/src/integrations/satoriog/astro-ghostcms-satoriog.ts @@ -31,36 +31,34 @@ export default defineIntegration({ c.bold(c.magenta("OG Image Integration Enabled. Setting up...")), ); - const pkgname = "@matthiesenxyz/astro-ghostcms/open-graph"; - injectRoute({ pattern: "/open-graph/[slug].png", - entrypoint: `${pkgname}/[slug].png.ts`, + entrypoint: resolve("./routes/[slug].png.ts"), }); injectRoute({ pattern: "/open-graph/index.png", - entrypoint: `${pkgname}/index.png.ts`, + entrypoint: resolve("./routes/index.png.ts"), }); injectRoute({ pattern: "/open-graph/authors.png", - entrypoint: `${pkgname}/authors.png.ts`, + entrypoint: resolve("./routes/authors.png.ts"), }); injectRoute({ pattern: "/open-graph/author/[slug].png", - entrypoint: `${pkgname}/author/[slug].png.ts`, + entrypoint: resolve("./routes/author/[slug].png.ts"), }); injectRoute({ pattern: "/open-graph/tags.png", - entrypoint: `${pkgname}/tags.png.ts`, + entrypoint: resolve("./routes/tags.png.ts"), }); injectRoute({ pattern: "/open-graph/tag/[slug].png", - entrypoint: `${pkgname}/tag/[slug].png.ts`, + entrypoint: resolve("./routes/tag/[slug].png.ts"), }); updateConfig({ diff --git a/playgrounds/astro-playground/astro.config.mjs b/playgrounds/astro-playground/astro.config.mjs index 56707f73..a24919e3 100644 --- a/playgrounds/astro-playground/astro.config.mjs +++ b/playgrounds/astro-playground/astro.config.mjs @@ -14,7 +14,7 @@ export default defineConfig({ ThemeProvider: { theme: "@matthiesenxyz/astro-ghostcms-brutalbyelian", }, - verbose: true, + verbose: false, }), ], });