@remix-run/cli 0.3.3 → 0.3.4

package/dist/lib/doctor/fixes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fixes.d.ts","sourceRoot":"","sources":["../../../src/lib/doctor/fixes.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAEjE,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,aAAa,EAAE,GACxB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAmC7B"}
+{"version":3,"file":"fixes.d.ts","sourceRoot":"","sources":["../../../src/lib/doctor/fixes.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAEjE,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,aAAa,EAAE,GACxB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAkC7B"}

package/dist/lib/doctor/fixes.js

@@ -4,7 +4,7 @@ import { resolveContainedPath } from "../contained-path.js";
 export async function applyDoctorFixPlans(appRoot, fixPlans) {
     let appliedFixes = [];
     for (let fixPlan of dedupeDoctorFixPlans(fixPlans)) {
-        let absolutePath = resolveDoctorFixPath(appRoot, fixPlan.path);
+        let absolutePath = await resolveDoctorFixPath(appRoot, fixPlan.path);
         if (fixPlan.kind === 'create-directory') {
             await fs.mkdir(absolutePath, { recursive: true });
             appliedFixes.push(toAppliedDoctorFix(fixPlan));
@@ -20,8 +20,7 @@ export async function applyDoctorFixPlans(appRoot, fixPlans) {
             await fs.writeFile(absolutePath, fixPlan.contents ?? '', { encoding: 'utf8', flag: 'wx' });
         }
         catch (error) {
-            let nodeError = error;
-            if (nodeError.code !== 'EEXIST') {
+            if (!isErrorWithCode(error, 'EEXIST')) {
                 throw error;
             }
             continue;
@@ -52,14 +51,54 @@ function toAppliedDoctorFix(fixPlan) {
         suite: fixPlan.suite,
     };
 }
-function resolveDoctorFixPath(appRoot, fixPath) {
+async function resolveDoctorFixPath(appRoot, fixPath) {
+    let absolutePath;
     try {
-        return resolveContainedPath(appRoot, fixPath);
+        absolutePath = resolveContainedPath(appRoot, fixPath);
     }
     catch (error) {
         if (error instanceof Error && error.message.includes('escapes the allowed root')) {
-            throw new Error(`Doctor fix path resolves outside the app root: ${fixPath}`);
+            throwDoctorFixPathOutsideRoot(fixPath);
         }
         throw error;
     }
+    let rootPath = path.resolve(appRoot);
+    let rootRealPath = await fs.realpath(rootPath);
+    let relativePath = path.relative(rootPath, absolutePath);
+    let pathParts = relativePath === '' ? [] : relativePath.split(path.sep);
+    let currentPath = rootPath;
+    let currentRealPath = rootRealPath;
+    for (let [index, pathPart] of pathParts.entries()) {
+        currentPath = path.join(currentPath, pathPart);
+        let stats = await lstatIfExists(currentPath);
+        if (stats == null) {
+            return path.join(currentRealPath, ...pathParts.slice(index));
+        }
+        currentRealPath = await fs.realpath(currentPath);
+        if (!isPathInsideRoot(rootRealPath, currentRealPath)) {
+            throwDoctorFixPathOutsideRoot(fixPath);
+        }
+    }
+    return currentRealPath;
+}
+async function lstatIfExists(filePath) {
+    try {
+        return await fs.lstat(filePath);
+    }
+    catch (error) {
+        if (isErrorWithCode(error, 'ENOENT')) {
+            return null;
+        }
+        throw error;
+    }
+}
+function isPathInsideRoot(rootPath, filePath) {
+    let relativePath = path.relative(rootPath, filePath);
+    return relativePath === '' || (!relativePath.startsWith('..') && !path.isAbsolute(relativePath));
+}
+function isErrorWithCode(error, code) {
+    return typeof error === 'object' && error !== null && 'code' in error && error.code === code;
+}
+function throwDoctorFixPathOutsideRoot(fixPath) {
+    throw new Error(`Doctor fix path resolves outside the app root: ${fixPath}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cli",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "Command-line interface for Remix",
   "author": "Michael Jackson <mjijackson@gmail.com>",
   "license": "MIT",
@@ -31,8 +31,8 @@
   },
   "dependencies": {
     "semver": "^7.7.4",
-    "@remix-run/terminal": "^0.1.1",
-    "@remix-run/test": "^0.5.0"
+    "@remix-run/test": "^0.5.0",
+    "@remix-run/terminal": "^0.1.1"
   },
   "devDependencies": {
     "@types/node": "^24.6.0",

package/src/lib/doctor/fixes.ts

@@ -11,7 +11,7 @@ export async function applyDoctorFixPlans(
   let appliedFixes: DoctorAppliedFix[] = []
 
   for (let fixPlan of dedupeDoctorFixPlans(fixPlans)) {
-    let absolutePath = resolveDoctorFixPath(appRoot, fixPlan.path)
+    let absolutePath = await resolveDoctorFixPath(appRoot, fixPlan.path)
 
     if (fixPlan.kind === 'create-directory') {
       await fs.mkdir(absolutePath, { recursive: true })
@@ -30,8 +30,7 @@ export async function applyDoctorFixPlans(
     try {
       await fs.writeFile(absolutePath, fixPlan.contents ?? '', { encoding: 'utf8', flag: 'wx' })
     } catch (error) {
-      let nodeError = error as NodeJS.ErrnoException
-      if (nodeError.code !== 'EEXIST') {
+      if (!isErrorWithCode(error, 'EEXIST')) {
         throw error
       }
 
@@ -71,14 +70,64 @@ function toAppliedDoctorFix(fixPlan: DoctorFixPlan): DoctorAppliedFix {
   }
 }
 
-function resolveDoctorFixPath(appRoot: string, fixPath: string): string {
+async function resolveDoctorFixPath(appRoot: string, fixPath: string): Promise<string> {
+  let absolutePath: string
+
   try {
-    return resolveContainedPath(appRoot, fixPath)
+    absolutePath = resolveContainedPath(appRoot, fixPath)
   } catch (error) {
     if (error instanceof Error && error.message.includes('escapes the allowed root')) {
-      throw new Error(`Doctor fix path resolves outside the app root: ${fixPath}`)
+      throwDoctorFixPathOutsideRoot(fixPath)
     }
 
     throw error
   }
+
+  let rootPath = path.resolve(appRoot)
+  let rootRealPath = await fs.realpath(rootPath)
+  let relativePath = path.relative(rootPath, absolutePath)
+  let pathParts = relativePath === '' ? [] : relativePath.split(path.sep)
+  let currentPath = rootPath
+  let currentRealPath = rootRealPath
+
+  for (let [index, pathPart] of pathParts.entries()) {
+    currentPath = path.join(currentPath, pathPart)
+
+    let stats = await lstatIfExists(currentPath)
+    if (stats == null) {
+      return path.join(currentRealPath, ...pathParts.slice(index))
+    }
+
+    currentRealPath = await fs.realpath(currentPath)
+    if (!isPathInsideRoot(rootRealPath, currentRealPath)) {
+      throwDoctorFixPathOutsideRoot(fixPath)
+    }
+  }
+
+  return currentRealPath
+}
+
+async function lstatIfExists(filePath: string) {
+  try {
+    return await fs.lstat(filePath)
+  } catch (error) {
+    if (isErrorWithCode(error, 'ENOENT')) {
+      return null
+    }
+
+    throw error
+  }
+}
+
+function isPathInsideRoot(rootPath: string, filePath: string): boolean {
+  let relativePath = path.relative(rootPath, filePath)
+  return relativePath === '' || (!relativePath.startsWith('..') && !path.isAbsolute(relativePath))
+}
+
+function isErrorWithCode(error: unknown, code: string): boolean {
+  return typeof error === 'object' && error !== null && 'code' in error && error.code === code
+}
+
+function throwDoctorFixPathOutsideRoot(fixPath: string): never {
+  throw new Error(`Doctor fix path resolves outside the app root: ${fixPath}`)
 }

package/template/.agents/skills/remix/SKILL.md

@@ -245,7 +245,7 @@ Use this map to find the right package quickly. Each entry says what the package
 - `remix/ui` — the component runtime: components, core mixins, `clientEntry`, `run`, `<Frame>`, navigation helpers, and `createRoot`. Use for app UI behavior
 - `remix/ui/server` — server rendering: `renderToStream`, `renderToString`. Use in the `app/actions/render.tsx` helper that returns HTML responses
 - `remix/ui/animation` — animation APIs: `animateEntrance`, `animateExit`, `animateLayout`, `spring`, `tween`, and `easings`
-- `remix/ui/<primitive>` — UI primitives, mixins, glyphs, and theme helpers. Current subpaths include `remix/ui/accordion`, `remix/ui/anchor`, `remix/ui/breadcrumbs`, `remix/ui/button`, `remix/ui/combobox`, `remix/ui/glyph`, `remix/ui/listbox`, `remix/ui/menu`, `remix/ui/popover`, `remix/ui/scroll-lock`, `remix/ui/select`, `remix/ui/separator`, and `remix/ui/theme`
+- `remix/ui/<primitive>` — UI primitives, mixins, and component helpers. Current subpaths include `remix/ui/accordion`, `remix/ui/anchor`, `remix/ui/button`, `remix/ui/checkbox`, `remix/ui/combobox`, `remix/ui/input`, `remix/ui/listbox`, `remix/ui/menu`, `remix/ui/popover`, and `remix/ui/select`
 - `remix/ui/test` — component test rendering helpers such as `render`
 - `remix/ui/jsx-runtime` and `remix/ui/jsx-dev-runtime` — JSX transform targets. Configured in `tsconfig.json`, rarely imported directly
 - `remix/html-template` — escaped HTML template literals. Use when generating HTML outside the component system (RSS feeds, email bodies, error pages)

package/template/app/assets/entry.ts

@@ -5,4 +5,13 @@ run({
     let mod = await import(moduleUrl)
     return mod[exportName]
   },
+  async resolveFrame(src, signal) {
+    let response = await fetch(src, { headers: { Accept: 'text/html' }, signal })
+    if (!response.ok) {
+      return `<pre>Frame error: ${response.status} ${response.statusText}</pre>`
+    }
+
+    if (response.body) return response.body
+    return await response.text()
+  },
 })

package/template/app/assets.ts

@@ -1,6 +1,8 @@
 import { createAssetServer } from 'remix/assets'
 
 const rootDir = process.cwd()
+const nodeEnv = process.env.NODE_ENV ?? 'development'
+const isDevelopment = nodeEnv === 'development'
 
 export const assetServer = createAssetServer({
   basePath: '/assets',
@@ -10,11 +12,7 @@ export const assetServer = createAssetServer({
     'node_modules/*path': 'node_modules/*path',
   },
   allow: ['app/assets/**', 'node_modules/**'],
-  deny: ['app/**/*.server.*'],
-  sourceMaps: process.env.NODE_ENV === 'development' ? 'external' : undefined,
-  scripts: {
-    define: {
-      'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV ?? 'development'),
-    },
-  },
+  sourceMaps: isDevelopment ? 'external' : undefined,
+  minify: !isDevelopment,
+  watch: false,
 })

package/template/app/middleware/render.tsx

@@ -1,5 +1,6 @@
 import * as path from 'node:path'
 
+import type { Router } from 'remix/router'
 import { renderWith } from 'remix/middleware/render'
 import { createHtmlResponse } from 'remix/response/html'
 import type { RemixNode } from 'remix/ui'
@@ -9,10 +10,12 @@ import { assetServer } from '../assets.ts'
 
 export function render() {
   return renderWith(
-    ({ request }) =>
+    ({ request, router }) =>
       function render(node: RemixNode, init?: ResponseInit) {
         let stream = renderToStream(node, {
+          frameSrc: request.url,
           signal: request.signal,
+          resolveFrame: (src) => resolveFrame(router, request, src),
           // Server rendering turns client entries into browser module URLs.
           async resolveClientEntry(entryId, component) {
             if (!entryId.startsWith('file://')) {
@@ -33,6 +36,31 @@ export function render() {
   )
 }
 
+async function resolveFrame(router: Router, request: Request, src: string) {
+  let url = new URL(src, request.url)
+
+  let headers = new Headers()
+  headers.set('Accept', 'text/html')
+
+  let cookie = request.headers.get('Cookie')
+  if (cookie) headers.set('Cookie', cookie)
+
+  let response = await router.fetch(
+    new Request(url, {
+      method: 'GET',
+      headers,
+      signal: request.signal,
+    }),
+  )
+
+  if (!response.ok) {
+    return `<pre>Frame error: ${response.status} ${response.statusText}</pre>`
+  }
+
+  if (response.body) return response.body
+  return await response.text()
+}
+
 function titleCaseFileName(fileUrl: string): string {
   let url = new URL(fileUrl)
   let fileName = path.basename(url.pathname, path.extname(url.pathname))

package/template/app/ui/scaffold-home-page.tsx

@@ -197,7 +197,7 @@ function CodingWithAiCard() {
         <PromptButton text="I want to build a simple headless Shopify store, what does Remix have available to help scaffold this?" />
         <PromptButton text="Add a sqlite database with a users table and scaffold a signup flow" />
         <PromptButton text="Make a copy to clipboard component that confirms to the user it was copied then resets after a few seconds" />
-        <PromptButton text="Add RMX-01 theme and a page with a remix/ui/select component and remix/ui/button variants" />
+        <PromptButton text="Add a page with a remix/ui/select component and remix/ui/button variants" />
         <PromptButton text="Add compression middleware" />
       </div>
     </div>

package/template/package.json

@@ -3,9 +3,9 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "dev": "node --watch --import remix/node-tsx server.ts",
-    "start": "node --import remix/node-tsx server.ts",
-    "test": "node --import remix/node-tsx --test",
+    "dev": "NODE_ENV=development node --watch --import remix/node-tsx server.ts",
+    "start": "NODE_ENV=production node --import remix/node-tsx server.ts",
+    "test": "NODE_ENV=test node --import remix/node-tsx --test",
     "typecheck": "tsc --noEmit"
   },
   "engines": {