Skip to content

Commit 84c950d

Browse files
dennevdennev
authored
Merge branch 'main' into Enhance-route-matching
2 parents 79d710a + 12f3a3d commit 84c950d

33 files changed

Lines changed: 1359 additions & 891 deletions

‎.changeset/sharp-rooms-think.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@solidjs/start": patch
3+
---
4+
5+
Handle multiple exports from the same file in fs-router

‎.changeset/ten-areas-burn.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@solidjs/start": patch
3+
---
4+
5+
Add a test route for multiple exports handling and correct variable typos

‎packages/landing-page/app.config.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { defineConfig } from "@solidjs/start/config";
22

33
export default defineConfig({
4-
// experimental: { islands: true },
54
server: {
65
preset: "netlify"
76
}

‎packages/landing-page/package.json‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
"private": true,
55
"scripts": {
66
"dev": "vinxi dev",
7-
"build": "vinxi build",
7+
"build": "pnpm --filter @solidjs/start build && vinxi build",
88
"start": "vinxi start"
99
},
1010
"devDependencies": {
11-
"@kobalte/core": "^0.13.1",
11+
"@kobalte/core": "^0.13.11",
1212
"@kobalte/utils": "^0.9.0",
1313
"@tailwindcss/typography": "^0.5.16",
14-
"autoprefixer": "^10.4.19",
15-
"postcss": "^8.5.1",
16-
"tailwind-merge": "^2.6.0",
14+
"autoprefixer": "^10.4.21",
15+
"postcss": "^8.5.6",
16+
"tailwind-merge": "^3.3.1",
1717
"tailwindcss": "^3.4.17",
1818
"tailwindcss-animate": "^1.0.7",
19-
"tinyglobby": "^0.2.2",
19+
"tinyglobby": "^0.2.14",
2020
"tippy.js": "^6.3.7",
2121
"vinxi": "^0.5.3"
2222
},
@@ -26,7 +26,8 @@
2626
"@solidjs/start": "workspace:*",
2727
"class-variance-authority": "^0.7.1",
2828
"clsx": "^2.1.1",
29-
"solid-js": "^1.9.4",
30-
"solid-transition-group": "^0.2.3"
29+
"solid-js": "^1.9.9",
30+
"solid-motionone": "^1.0.4",
31+
"solid-transition-group": "^0.3.0"
3132
}
3233
}

‎packages/landing-page/public/anomaly-logo.png‎

9.85 KB
Loading

‎packages/landing-page/src/app.tsx‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
// @refresh reload
2-
import {
3-
ColorModeProvider,
4-
ColorModeScript,
5-
cookieStorageManagerSSR
6-
} from "@kobalte/core/color-mode";
7-
import { isServer } from "solid-js/web";
8-
import { getCookie } from "vinxi/http";
9-
import { Announcement } from "~/components/sections/announcement";
2+
// import {
3+
// ColorModeProvider,
4+
// ColorModeScript,
5+
// cookieStorageManagerSSR
6+
// } from "@kobalte/core/color-mode";
7+
// import { isServer } from "solid-js/web";
8+
// import { getCookie } from "vinxi/http";
109
import { DeployAnywhere } from "~/components/sections/deploy-anywhere";
1110
import { Footer } from "~/components/sections/footer";
1211
import { Hero } from "~/components/sections/hero";
1312
import { MetaFramework } from "~/components/sections/meta-framework";
1413
import { RockSolidDX } from "~/components/sections/rock-solid-dx";
14+
import { SponsoredBy } from "~/components/sections/sponsored-by";
1515
import { TopNav } from "~/components/sections/top-nav";
1616
import "./fonts.css";
1717
import "./root.css";
1818

19-
function getServerCookies() {
20-
"use server";
21-
const colorMode = getCookie("kb-color-mode");
22-
return colorMode ? `kb-color-mode=${colorMode}` : "";
23-
}
19+
// function getServerCookies() {
20+
// "use server";
21+
// const colorMode = getCookie("kb-color-mode");
22+
// return colorMode ? `kb-color-mode=${colorMode}` : "";
23+
// }
2424

2525
export default function App() {
26-
const storageManager = cookieStorageManagerSSR(isServer ? getServerCookies() : document.cookie);
26+
// const storageManager = cookieStorageManagerSSR(isServer ? getServerCookies() : document.cookie);
2727

2828
return (
2929
<>
30-
<ColorModeScript storageType={storageManager.type} />
31-
<ColorModeProvider storageManager={storageManager}>
32-
<main class="min-h-screen h-full grid grid-rows-[auto,1fr,auto] place-items-center relative bg-gradient-to-b dark:from-sky-950 from-sky-800 to-sky-200 dark:to-[#081924]">
33-
<TopNav />
34-
<Hero />
35-
<article class="w-full flex flex-col bg-white dark:bg-gradient-to-b dark:from-[#081924] from-white dark:via-[#081924] via-white dark:to-sky-950 to-sky-300">
36-
<Announcement />
37-
<MetaFramework />
38-
<RockSolidDX />
39-
<DeployAnywhere />
40-
</article>
41-
<Footer />
42-
</main>
43-
</ColorModeProvider>
30+
{/* <ColorModeScript storageType={storageManager.type} /> */}
31+
{/* <ColorModeProvider storageManager={storageManager}> */}
32+
<main class="min-h-screen h-full grid grid-rows-[auto,1fr,auto] place-items-center relative bg-gradient-to-b dark:from-sky-950 from-sky-800 to-sky-200 dark:to-[#081924]">
33+
<TopNav />
34+
<Hero />
35+
<article class="w-full flex flex-col bg-white dark:bg-gradient-to-b dark:from-[#081924] from-white dark:via-[#081924] via-white dark:to-sky-950 to-sky-300">
36+
<MetaFramework />
37+
<RockSolidDX />
38+
<DeployAnywhere />
39+
<SponsoredBy />
40+
</article>
41+
<Footer />
42+
</main>
43+
{/* </ColorModeProvider> */}
4444
</>
4545
);
4646
}

‎packages/landing-page/src/components/sections/announcement.tsx‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎packages/landing-page/src/components/sections/deploy-anywhere.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export function DeployAnywhere() {
5454
<section class="max-w-5xl pt-12 w-full mx-auto relative">
5555
<header>
5656
<SectionTitle>Deploy Anywhere</SectionTitle>
57-
<p class="pt-5 px-2 leading-relaxed max-w-[70ch] mx-auto text-center dark:font-thin text-lg">
57+
<p class="w-full sm:w-3/5 pt-5 px-2 leading-relaxed max-w-[70ch] mx-auto text-center dark:font-thin text-lg transition-all ease-in-out">
5858
On the shoulders of open-source. SolidStart can be deployed to every platform Nitro has a
5959
preset for.
6060
</p>

‎packages/landing-page/src/components/sections/hero.tsx‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,27 @@ import { CodeSnippet } from "../code-snippet";
22
import { GithubIcon } from "../icons/github-icon";
33
import { SolidStartLogo } from "../icons/solidstart-logo";
44
import { buttonVariants } from "../ui/button";
5+
import { AnimatedShinyText } from "../ui/mystic/shine";
6+
57
const buttonOutlineStyles = buttonVariants({
68
variant: "outline"
79
});
10+
811
export function Hero() {
912
return (
10-
<header class="w-full mx-auto pb-24 md:px-10 bg-gradient-to-b from-transparent dark:to-[#081924] via-white dark:via-white/0 to-white">
13+
<header class="w-full mx-auto md:px-10 bg-gradient-to-b from-transparent dark:to-[#081924] via-white dark:via-white/0 to-white">
14+
<div class="flex flex-col items-center justify-center">
15+
<a
16+
href="https://github.com/solidjs/solid-start/discussions/1960"
17+
target="_blank"
18+
rel="noopener"
19+
class="inline-block px-4 py-1 group rounded-full border border-black/5 text-base text-white transition-all ease-in dark:border-white/15 dark:bg-neutral-900/30 dark:hover:bg-neutral-800/20"
20+
>
21+
<AnimatedShinyText>
22+
<span>✨ Public Roadmap - DeVinxi and Beyond</span>
23+
</AnimatedShinyText>
24+
</a>
25+
</div>
1126
<div class="max-w-5xl mx-auto">
1227
<SolidStartLogo class="drop-shadow-[10px_20px_35px_rgb(125,211,252,0.3)] size-52 md:size-[400px] mx-auto" />
1328
<div class="flex flex-col">

‎packages/landing-page/src/components/sections/meta-framework.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export function MetaFramework() {
77
<section class="max-w-5xl w-full mx-auto pt-12 md:pt-28 group">
88
<header>
99
<SectionTitle>Composable Meta-framework</SectionTitle>
10-
<p class="pt-5 px-2 leading-relaxed max-w-[70ch] mx-auto text-center dark:font-thin text-lg">
10+
<p class="pt-5 px-2 leading-relaxed max-w-[70ch] mx-auto text-center dark:font-thin text-lg w-full md:w-3/5">
1111
SolidStart integrates multiple separate packages to provide a complete functionality. Each
1212
of these pieces can be replaced with your own implementation.
1313
</p>

0 commit comments

Comments
 (0)