Skip to content

Commit d90b91f

Browse files
joshuaellisjoshuaellis
committed
chore: make vite work
1 parent 6bef59f commit d90b91f

File tree

11 files changed

+217
-168
lines changed

11 files changed

+217
-168
lines changed

‎docs/app/entry.client.tsx‎

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

‎docs/app/entry.server.tsx‎

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

‎docs/app/root.tsx‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,35 @@
1-
import type { MetaFunction, LinksFunction } from "@remix-run/node";
21
import {
32
Links,
4-
LiveReload,
53
Meta,
64
Outlet,
75
Scripts,
86
ScrollRestoration,
9-
} from "@remix-run/react";
10-
import { Analytics } from "@vercel/analytics/react";
11-
import styles from "./styles.css";
7+
} from '@remix-run/react'
8+
import type { LinksFunction } from '@vercel/remix'
9+
import { Analytics } from '@vercel/analytics/react'
10+
import styles from './styles.css'
1211

13-
export const meta: MetaFunction = () => [
14-
{
15-
charset: "utf-8",
16-
title: "Blog | Kitchen Sink",
17-
viewport: "width=device-width,initial-scale=1",
18-
},
19-
];
12+
export const links: LinksFunction = () => [{ rel: 'stylesheet', href: styles }]
2013

21-
export const links: LinksFunction = () => [{ rel: "stylesheet", href: styles }];
22-
23-
export default function App(): JSX.Element {
14+
export function Layout({ children }: { children: React.ReactNode }) {
2415
return (
2516
<html lang="en">
2617
<head>
18+
<meta charSet="utf-8" />
19+
<meta name="viewport" content="width=device-width, initial-scale=1" />
2720
<Meta />
2821
<Links />
2922
</head>
3023
<body>
31-
<Outlet />
24+
{children}
3225
<ScrollRestoration />
3326
<Scripts />
34-
<LiveReload />
3527
<Analytics />
3628
</body>
3729
</html>
38-
);
30+
)
31+
}
32+
33+
export default function App() {
34+
return <Outlet />
3935
}

‎docs/env.d.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/// <reference types="vite/client" />
2+
/// <reference types="@vercel/remix" />

‎docs/package.json‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,30 @@
66
"private": true,
77
"sideEffects": false,
88
"scripts": {
9-
"dev": "remix dev",
10-
"build": "remix build",
9+
"build": "remix vite:build",
10+
"dev": "remix vite:dev",
1111
"lint": "TIMING=1 eslint \"app/**/*.ts*\" \"scripts/**/*.ts*\"",
12+
"start": "remix-serve ./build/server/index.js",
1213
"typecheck": "tsc --noEmit"
1314
},
1415
"dependencies": {
15-
"@remix-run/node": "^2.8.0",
16-
"@remix-run/react": "^2.8.0",
17-
"@remix-run/serve": "^2.8.0",
18-
"@remix-run/server-runtime": "^2.8.0",
16+
"@remix-run/node": "^2.9.2",
17+
"@remix-run/react": "^2.9.2",
18+
"@remix-run/serve": "^2.9.2",
19+
"@remix-run/server-runtime": "^2.9.2",
1920
"@vercel/analytics": "^1.2.2",
20-
"@vercel/remix-entry-server": "^0.1.1",
21+
"@vercel/remix": "^2.9.2-patch.2",
22+
"isbot": "^4",
2123
"react": "^18.2.0",
2224
"react-dom": "^18.2.0"
2325
},
2426
"devDependencies": {
25-
"@remix-run/dev": "^2.8.0",
27+
"@remix-run/dev": "^2.9.2",
2628
"@types/react": "^18.2.62",
2729
"@types/react-dom": "^18.2.19",
28-
"typescript": "^5.3.3"
30+
"typescript": "^5.3.3",
31+
"vite": "^5.1.0",
32+
"vite-tsconfig-paths": "^4.2.1"
2933
},
3034
"engines": {
3135
"node": ">=18"

‎docs/remix.config.js‎

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

‎docs/remix.env.d.ts‎

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

‎docs/server.js‎

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

‎docs/tsconfig.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@
1313
"isolatedModules": true,
1414
"esModuleInterop": true,
1515
"jsx": "react-jsx",
16+
"module": "ESNext",
1617
"moduleResolution": "Bundler",
1718
"resolveJsonModule": true,
1819
"target": "ESNext",
1920
"strict": true,
2021
"paths": {
2122
"~/*": ["./app/*"]
2223
},
24+
"skipLibCheck": true,
2325
"noEmit": true,
2426
"baseUrl": ".",
2527
"allowJs": true,

‎docs/vite.config.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import { vitePlugin as remix } from '@remix-run/dev'
2+
import { installGlobals } from '@remix-run/node'
3+
import { vercelPreset } from '@vercel/remix/vite'
4+
import { defineConfig } from 'vite'
5+
import tsconfigPaths from 'vite-tsconfig-paths'
6+
7+
installGlobals()
8+
9+
export default defineConfig({
10+
server: {
11+
port: 3000,
12+
},
13+
plugins: [
14+
remix({
15+
ignoredRouteFiles: ['**/.*', '**/*.css'],
16+
presets: [vercelPreset()],
17+
serverModuleFormat: 'cjs',
18+
}),
19+
tsconfigPaths(),
20+
],
21+
})

0 commit comments

Comments
 (0)