Skip to content

Commit

Permalink
Merge pull request #203 from WestpacGEL/develop
Browse files Browse the repository at this point in the history
Develop to main
  • Loading branch information
samithaf authored Oct 25, 2023
2 parents 671a3d6 + c615169 commit 8853417
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 118 deletions.
4 changes: 2 additions & 2 deletions apps/site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
"check-types": "tsc --noemit --emitDeclarationOnly false"
},
"dependencies": {
"@keystatic/core": "^0.1.4",
"@keystatic/core": "^0.1.7",
"@keystatic/next": "^1.0.1",
"@westpac/ui": "workspace:~",
"clipboard-copy": "~4.0.1",
"clsx": "^1.2.1",
"framer-motion": "~10.12.16",
"lodash.throttle": "~4.1.1",
"next": "^13.5.2",
"next": "^13.5.6",
"prism-react-renderer": "~2.0.6",
"prismjs": "~1.29.0",
"react": "^18.2.0",
Expand Down
5 changes: 2 additions & 3 deletions apps/site/src/app/articles/[...article]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ export function generateMetadata({ params }: { params: { article: string } }) {
return { title: formatComponentSlug(article[article.length - 1]) };
}

export default async function ArticleServerPage({ params }: { params: { article: string[] } }) {
export default async function ArticleServerPage({ params }: { params: { article: string } }) {
const { article: articleParam } = params;
console.log(`articleParam.join('/')`, articleParam.join('/'));
const article = await reader.collections.articles.readOrThrow(articleParam.join('/'));
const article = await reader.collections.articles.readOrThrow(articleParam);

const [articleContent, author] = await Promise.all([
article.content(),
Expand Down
Loading

1 comment on commit 8853417

@vercel
Copy link

@vercel vercel bot commented on 8853417 Oct 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

gel-next-site – ./apps/site

gel-next-site.vercel.app
gel-next-site-westpacgel.vercel.app
gel-next-site-git-main-westpacgel.vercel.app

Please sign in to comment.