Skip to content

Commit 9ea4ef1

Browse files
committed
Merge branch 'dev' into deploy-stage
2 parents abc0620 + 0febc09 commit 9ea4ef1

3 files changed

Lines changed: 11 additions & 1 deletion

File tree

src/pages/Articles/introducing-solidstart.mdx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
<Notice>
2+
SolidStart has been through some major changes since this announcement. On May 21, 2024 SolidStart
3+
1.0 was officially released with breaking changes. Hence the code examples and APIs shown in this
4+
post may be outdated. Visit start.solidjs.com for the most up to date SolidStart docs.
5+
</Notice>
6+
17
We've been working on SolidJS for a while. The first couple of years were just for me to prove something. The next couple was about spreading the knowledge of what I'd learned.
28

39
The last 2 years have been a lot of: "Solid looks really great, I look forward to trying it when you get `_____________`". Let me tell you, that blank is an always moving target. But it has seemed to settle on a "Next.js"-like framework as of late. And finally, we've got an answer for you.

src/pages/Blog.data.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export type MDXComponent = Component<{
88
Twitch?: Component<TwitchProps>;
99
YouTube?: Component<YouTubeProps>;
1010
Spotify?: Component<SpotifyProps>;
11+
Notice?: Component<any>
1112
};
1213
}>;
1314

src/pages/BlogArticle.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { YouTube, Tweet, Twitch, Spotify } from 'solid-social';
77
import type { BlogArticleData } from './BlogArticle.data';
88
import { Title } from '@solidjs/meta';
99

10-
export const BlogArticle: Component<{data:BlogArticleData}> = (props) => {
10+
export const BlogArticle: Component<{ data: BlogArticleData }> = (props) => {
1111
const data = props.data;
1212
const ctx = useAppState();
1313

@@ -46,6 +46,9 @@ export const BlogArticle: Component<{data:BlogArticleData}> = (props) => {
4646
Tweet: (props) => (
4747
<Tweet {...props} theme={ctx.isDark ? 'dark' : 'light'} align="center" />
4848
),
49+
Notice: (props) => (
50+
<div class="rounded-md bg-amber-400 px-6 py-1">{props.children}</div>
51+
),
4952
YouTube,
5053
Twitch: (props) => <Twitch {...props} parent={location.hostname} />,
5154
Spotify: (props) => (

0 commit comments

Comments
 (0)