Merge branch 'main' into DST-633_add-dependency-track

marigold-ui · Dec 24, 2024 · d8ab086 · d8ab086
2 parents 5c21ac9 + baf871e
commit d8ab086
Show file tree

Hide file tree

Showing 7 changed files with 1,252 additions and 1,555 deletions.
diff --git a/config/storybook/package.json b/config/storybook/package.json
@@ -28,8 +28,8 @@
     "@storybook/source-loader": "^8.1.11",
     "@storybook/test": "^8.1.11",
     "@types/react": "18.3.16",
-    "@vitejs/plugin-react": "4.3.3",
-    "vite-tsconfig-paths": "5.0.1"
+    "@vitejs/plugin-react": "4.3.4",
+    "vite-tsconfig-paths": "5.1.4"
   },
   "devDependencies": {
     "@storybook/addon-storysource": "^8.1.11",
@@ -46,10 +46,10 @@
     "storybook": "^8.1.11",
     "tailwindcss": "3.4.16",
     "typescript": "5.6.3",
-    "vite": "5.4.10"
+    "vite": "6.0.4"
   },
   "peerDependencies": {
-    "@storybook/react": "8.0.x || 8.1.x || 8.2.x || 8.3.x",
+    "@storybook/react": "8.0.x || 8.1.x || 8.2.x || 8.3.x || 8.4.x",
     "react": "18.x",
     "react-dom": "18.x",
     "typescript": "5.3.x || 5.5.x || 5.6.x"

diff --git a/docs/app/[...slug]/page.tsx b/docs/app/[...slug]/page.tsx
@@ -8,13 +8,11 @@ import { TocContainer } from '@/ui/Toc';
 import { Mdx } from '@/ui/mdx';
 
 interface ContentPageProps {
-  params: {
-    slug: string[];
-  };
+  params: Promise<{ slug: string[] }>;
 }
 
 async function getPageFromParams(params: ContentPageProps['params']) {
-  const slug = params?.slug?.join('/');
+  const slug = (await params)?.slug?.join('/');
   const page = allContentPages.find(page => page.slug === slug);
 
   return page || null;
@@ -49,9 +47,7 @@ export async function generateMetadata({
     : {};
 }
 
-export async function generateStaticParams(): Promise<
-  ContentPageProps['params'][]
-> {
+export async function generateStaticParams(): Promise<{ slug: string[] }[]> {
   return allContentPages.map(page => ({
     slug: page.slug.split('/'),
   }));

diff --git a/docs/app/releases/blog/[...slug]/page.tsx b/docs/app/releases/blog/[...slug]/page.tsx
@@ -7,12 +7,11 @@ import { TocContainer } from '@/ui/Toc';
 import { Mdx } from '@/ui/mdx';
 
 interface BlogPostProps {
-  params: {
-    slug: string[];
-  };
+  params: Promise<{ slug: string[] }>;
 }
 async function getPostFromParams(params: BlogPostProps['params']) {
-  const fullPath = `releases/blog/${params.slug}`;
+  const { slug } = await params;
+  const fullPath = `releases/blog/${slug}`;
   const currentPost = allBlogs.find(post => post.slug === fullPath);
 
   return currentPost || null;

diff --git a/docs/next.config.js b/docs/next.config.js
@@ -4,7 +4,6 @@ const pkg = require('./package.json');
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   reactStrictMode: false,
-  swcMinify: true,
   distDir: '.next',
   eslint: {
     ignoreDuringBuilds: true,

diff --git a/docs/package.json b/docs/package.json
@@ -32,11 +32,11 @@
     "dayjs": "1.11.13",
     "dotenv": "16.4.7",
     "eslint": "9.13.0",
-    "eslint-config-next": "14.2.20",
+    "eslint-config-next": "15.1.2",
     "framer-motion": "11.11.17",
     "github-slugger": "2.0.0",
     "mdast-util-toc": "7.1.0",
-    "next": "14.2.20",
+    "next": "15.1.2",
     "next-contentlayer2": "0.5.3",
     "postcss": "8.4.49",
     "react": "18.3.1",

diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "husky": "9.1.7",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
-    "next": "14.2.20",
+    "next": "15.1.2",
     "postcss-import": "16.1.0",
     "postcss-loader": "8.1.1",
     "prettier": "3.3.3",