feat: support configurable deployment basepath

vercel · Nov 21, 2024 · c7a2916 · c7a2916
1 parent 5acf92b
commit c7a2916
Show file tree

Hide file tree

Showing 28 changed files with 2,958 additions and 3,566 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -3,7 +3,6 @@ module.exports = {
   extends: [
     require.resolve('@vercel/style-guide/eslint/browser'),
     require.resolve('@vercel/style-guide/eslint/typescript'),
-    require.resolve('@vercel/style-guide/eslint/jest'),
   ],
   env: {
     node: true,

diff --git a/apps/nextjs/package.json b/apps/nextjs/package.json
@@ -10,11 +10,11 @@
   },
   "dependencies": {
     "@vercel/speed-insights": "workspace:*",
-    "next": "15.0.1",
-    "react": "19.0.0-rc-69d4b800-20241021",
-    "react-dom": "19.0.0-rc-69d4b800-20241021"
+    "next": "latest",
+    "react": "latest",
+    "react-dom": "latest"
   },
   "devDependencies": {
-    "@playwright/test": "1.37.1"
+    "@playwright/test": "1.49.0"
   }
 }
diff --git a/apps/nextjs/playwright.config.ts b/apps/nextjs/playwright.config.ts
diff --git a/apps/remix/.eslintrc.cjs b/apps/remix/.eslintrc.cjs
diff --git a/apps/remix/app/entry.client.tsx b/apps/remix/app/entry.client.tsx
diff --git a/apps/remix/app/entry.server.tsx b/apps/remix/app/entry.server.tsx
diff --git a/apps/remix/app/root.tsx b/apps/remix/app/root.tsx
@@ -1,20 +1,19 @@
-import { cssBundleHref } from '@remix-run/css-bundle';
+// import { cssBundleHref } from '@remix-run/css-bundle';
 import type { LinksFunction } from '@remix-run/node';
 import {
   Links,
-  LiveReload,
   Meta,
   Outlet,
   Scripts,
   ScrollRestoration,
 } from '@remix-run/react';
 import { SpeedInsights } from '@vercel/speed-insights/remix';
 
-export const links: LinksFunction = () => [
-  ...(cssBundleHref ? [{ rel: 'stylesheet', href: cssBundleHref }] : []),
-];
+// export const links: LinksFunction = () => [
+//   ...(cssBundleHref ? [{ rel: 'stylesheet', href: cssBundleHref }] : []),
+// ];
 
-export default function App() {
+export function Layout({ children }: { children: React.ReactNode }) {
   return (
     <html lang="en">
       <head>
@@ -24,12 +23,15 @@ export default function App() {
         <Links />
       </head>
       <body>
-        <Outlet />
+        {children}
         <ScrollRestoration />
         <Scripts />
-        <LiveReload />
         <SpeedInsights />
       </body>
     </html>
   );
 }
+
+export default function App() {
+  return <Outlet />;
+}
diff --git a/apps/remix/app/routes/_index.tsx b/apps/remix/app/routes/_index.tsx
@@ -1,41 +1,12 @@
-import type { MetaFunction } from '@remix-run/node';
+import { Link } from '@remix-run/react';
 
-export const meta: MetaFunction = () => {
-  return [
-    { title: 'New Remix App' },
-    { name: 'description', content: 'Welcome to Remix!' },
-  ];
-};
-
-export default function Index() {
+export default function Home() {
   return (
-    <div style={{ fontFamily: 'system-ui, sans-serif', lineHeight: '1.8' }}>
-      <h1>Welcome to Remix</h1>
-      <ul>
-        <li>
-          <a
-            target="_blank"
-            href="https://remix.run/tutorials/blog"
-            rel="noreferrer"
-          >
-            15m Quickstart Blog Tutorial
-          </a>
-        </li>
-        <li>
-          <a
-            target="_blank"
-            href="https://remix.run/tutorials/jokes"
-            rel="noreferrer"
-          >
-            Deep Dive Jokes App Tutorial
-          </a>
-        </li>
-        <li>
-          <a target="_blank" href="https://remix.run/docs" rel="noreferrer">
-            Remix Docs
-          </a>
-        </li>
-      </ul>
-    </div>
+    <main>
+      <h1>Speed Insights Demo</h1>
+      <Link to="/blog/henri">About Henri</Link>
+      <br />
+      <Link to="/blog/bruno">About Bruno</Link>
+    </main>
   );
 }
diff --git a/apps/remix/app/routes/blog.$slug.tsx b/apps/remix/app/routes/blog.$slug.tsx
@@ -1,12 +1,18 @@
-import { Link } from '@remix-run/react';
+import { json, type LoaderFunctionArgs } from '@remix-run/node';
+import { Link, useLoaderData } from '@remix-run/react';
+
+export const loader = async ({ params }: LoaderFunctionArgs) => {
+  return json({ slug: params.slug });
+};
 
 export default function BlogPage() {
+  const { slug } = useLoaderData<typeof loader>();
   return (
     <div>
       <h1>Blog</h1>
-      <p>Blog content goes here</p>
-      <Link to="/blog/first">First post</Link>
-      <Link to="/blog/second">First second</Link>
+      <p>We don&apos;t talk about {slug}</p>
+      <br />
+      <Link to="/">Back</Link>
     </div>
   );
 }
diff --git a/apps/remix/package.json b/apps/remix/package.json
@@ -4,30 +4,32 @@
   "sideEffects": false,
   "type": "module",
   "scripts": {
-    "build": "remix build",
-    "dev": "remix dev --manual",
-    "start": "remix-serve ./build/index.js",
+    "build": "remix vite:build",
+    "dev": "remix vite:dev",
+    "start": "remix-serve ./build/server/index.js",
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/css-bundle": "^2.5.0",
-    "@remix-run/node": "^2.5.0",
-    "@remix-run/react": "^2.5.0",
-    "@remix-run/serve": "^2.5.0",
+    "@remix-run/node": "latest",
+    "@remix-run/react": "latest",
+    "@remix-run/serve": "latest",
     "@vercel/speed-insights": "workspace:*",
-    "isbot": "^3.6.8",
+    "isbot": "^4.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "^2.5.0",
-    "@remix-run/eslint-config": "^2.5.0",
-    "@types/react": "^18.2.48",
-    "@types/react-dom": "^18.2.18",
-    "eslint": "^8.56.0",
-    "typescript": "^5.3.3"
+    "@remix-run/dev": "latest",
+    "@types/react": "^18.2.20",
+    "@types/react-dom": "^18.2.7",
+    "autoprefixer": "^10.4.19",
+    "postcss": "^8.4.38",
+    "tailwindcss": "^3.4.4",
+    "typescript": "^5.1.6",
+    "vite": "^5.1.0",
+    "vite-tsconfig-paths": "^4.2.1"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   }
 }