remix 3.0.0-beta.6 → 3.0.0-beta.9

package/dist/static-files-middleware.d.ts

@@ -0,0 +1,2 @@
+export * from '@remix-run/static-files-middleware';
+//# sourceMappingURL=static-files-middleware.d.ts.map

package/dist/static-files-middleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"static-files-middleware.d.ts","sourceRoot":"","sources":["../src/static-files-middleware.ts"],"names":[],"mappings":"AACA,cAAc,oCAAoC,CAAA"}

package/{src/static-middleware.ts → dist/static-files-middleware.js}

@@ -1,2 +1,2 @@
 // IMPORTANT: This file is auto-generated, please do not edit manually.
-export * from '@remix-run/static-middleware'
+export * from '@remix-run/static-files-middleware';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "remix",
-  "version": "3.0.0-beta.6",
+  "version": "3.0.0-beta.9",
   "description": "The Remix web framework",
   "author": "Michael Jackson <mjijackson@gmail.com>",
   "license": "MIT",
@@ -245,8 +245,8 @@
       "default": "./dist/session-middleware.js"
     },
     "./middleware/static": {
-      "types": "./dist/static-middleware.d.ts",
-      "default": "./dist/static-middleware.js"
+      "types": "./dist/static-files-middleware.d.ts",
+      "default": "./dist/static-files-middleware.js"
     },
     "./mime": {
       "types": "./dist/mime.d.ts",
@@ -509,50 +509,50 @@
   "dependencies": {
     "@remix-run/assets": "^0.5.0",
     "@remix-run/async-context-middleware": "^0.3.5",
-    "@remix-run/compression-middleware": "^0.1.13",
+    "@remix-run/auth": "^0.2.7",
     "@remix-run/auth-middleware": "^0.2.5",
-    "@remix-run/ui": "^0.5.0",
+    "@remix-run/ui": "^0.7.0",
+    "@remix-run/compression-middleware": "^0.1.13",
     "@remix-run/cop-middleware": "^0.1.8",
-    "@remix-run/auth": "^0.2.7",
-    "@remix-run/cookie": "^0.6.0",
     "@remix-run/csrf-middleware": "^0.1.8",
-    "@remix-run/cors-middleware": "^0.1.8",
-    "@remix-run/data-table": "^0.4.0",
-    "@remix-run/data-table-postgres": "^0.5.0",
+    "@remix-run/cookie": "^0.6.0",
     "@remix-run/data-schema": "^0.3.0",
     "@remix-run/data-table-mysql": "^0.5.0",
+    "@remix-run/data-table-postgres": "^0.5.0",
+    "@remix-run/data-table": "^0.4.0",
     "@remix-run/data-table-sqlite": "^0.6.0",
+    "@remix-run/cors-middleware": "^0.1.8",
     "@remix-run/fetch-proxy": "^0.8.5",
-    "@remix-run/file-storage": "^0.13.7",
     "@remix-run/fetch-router": "^0.21.0",
+    "@remix-run/file-storage": "^0.13.7",
     "@remix-run/form-data-middleware": "^0.3.5",
-    "@remix-run/form-data-parser": "^0.17.5",
     "@remix-run/file-storage-s3": "^0.1.4",
+    "@remix-run/form-data-parser": "^0.17.5",
     "@remix-run/fs": "^0.4.6",
     "@remix-run/lazy-file": "^5.0.6",
-    "@remix-run/method-override-middleware": "^0.1.13",
     "@remix-run/logger-middleware": "^0.3.5",
+    "@remix-run/html-template": "^0.3.1",
     "@remix-run/headers": "^0.21.1",
-    "@remix-run/multipart-parser": "^0.16.4",
+    "@remix-run/method-override-middleware": "^0.1.13",
     "@remix-run/mime": "^0.4.2",
+    "@remix-run/multipart-parser": "^0.16.4",
     "@remix-run/node-fetch-server": "^0.14.1",
-    "@remix-run/html-template": "^0.3.1",
     "@remix-run/response": "^0.3.8",
     "@remix-run/route-pattern": "^0.24.0",
     "@remix-run/node-tsx": "^0.1.1",
+    "@remix-run/session": "^0.4.2",
     "@remix-run/session-middleware": "^0.4.0",
-    "@remix-run/session-storage-redis": "^0.1.1",
     "@remix-run/session-storage-memcache": "^0.1.2",
-    "@remix-run/static-middleware": "^0.4.13",
+    "@remix-run/session-storage-redis": "^0.1.1",
     "@remix-run/tar-parser": "^0.7.1",
     "@remix-run/assert": "^0.3.0",
-    "@remix-run/session": "^0.4.2",
-    "@remix-run/cli": "^0.4.0",
+    "@remix-run/cli": "^0.5.0",
+    "@remix-run/terminal": "^0.1.1",
+    "@remix-run/render-middleware": "^0.1.5",
+    "@remix-run/test": "^0.6.0",
     "@remix-run/node-hmr": "^0.1.0",
     "@remix-run/ui-hmr": "^0.1.0",
-    "@remix-run/test": "^0.6.0",
-    "@remix-run/terminal": "^0.1.1",
-    "@remix-run/render-middleware": "^0.1.5"
+    "@remix-run/static-files-middleware": "^0.1.0"
   },
   "bin": {
     "remix": "./dist/cli-entry.js"

package/src/{static-middleware → static-files-middleware}/README.md

@@ -1,4 +1,4 @@
-# static-middleware
+# static-files-middleware
 
 Static file serving middleware for Remix. Serves static files from a directory with support for ETags, range requests, and conditional requests.
 
@@ -75,7 +75,7 @@ let router = createRouter({
 
 ## Security
 
-- Prevents path traversal attacks (e.g., `../../../etc/passwd`)
+- Prevents path traversal attacks
 - Only serves files with GET and HEAD requests
 - Respects the configured root directory boundary
 

package/{dist/static-middleware.js → src/static-files-middleware.ts}

@@ -1,2 +1,2 @@
 // IMPORTANT: This file is auto-generated, please do not edit manually.
-export * from '@remix-run/static-middleware';
+export * from '@remix-run/static-files-middleware'

package/src/ui/README.md

@@ -81,10 +81,10 @@ function Actions() {
 
 ## Frame Navigation
 
-Configure `resolveFrame` once to progressively enhance same-origin links and forms. The resolver owns the fetch request and receives native submission metadata for non-GET forms:
+`run()` progressively enhances same-origin links and forms using a default `resolveFrame` that
+fetches the frame source:
 
 ```tsx
-import type { ResolveFrameOptions } from 'remix/ui'
 import { run } from 'remix/ui'
 
 let app = run({
@@ -92,20 +92,44 @@ let app = run({
     let mod = await import(moduleUrl)
     return mod[exportName]
   },
-  async resolveFrame(src, options) {
-    return fetch(src, {
-      headers: { Accept: 'text/html', 'X-Remix-Frame': 'true' },
-      method: options?.method,
-      body: getRequestBody(options),
-      signal: options?.signal,
-    })
-  },
 })
 
-function getRequestBody(options?: ResolveFrameOptions): BodyInit | undefined {
+await app.ready()
+```
+
+The default resolver is equivalent to:
+
+```js
+async function resolveFrame(src, options) {
+  let response = await fetch(src, {
+    body: getRequestBody(options),
+    headers: { Accept: 'text/html' },
+    method: options?.method,
+    signal: options?.signal,
+  })
+
+  if (!response.ok) {
+    throw new Error(`Failed to resolve frame: ${response.status} ${response.statusText}`.trimEnd())
+  }
+
+  return response
+}
+
+function getRequestBody(options) {
   let formData = options?.formData
-  if (!formData) return
-  if (options.encType !== 'application/x-www-form-urlencoded') return formData
+  if (!formData || options?.method?.toLowerCase() === 'get') return
+
+  if (options?.encType === 'text/plain') {
+    let body = ''
+    for (let [name, value] of formData) {
+      name = normalizeLineBreaks(name)
+      value = normalizeLineBreaks(typeof value === 'string' ? value : value.name)
+      body += `${name}=${value}\r\n`
+    }
+    return new Blob([body], { type: 'text/plain' })
+  }
+
+  if (options?.encType !== 'application/x-www-form-urlencoded') return formData
 
   let body = new URLSearchParams()
   for (let [name, value] of formData) {
@@ -114,9 +138,23 @@ function getRequestBody(options?: ResolveFrameOptions): BodyInit | undefined {
   return body
 }
 
-await app.ready()
+function normalizeLineBreaks(value) {
+  return value.replace(/\r\n|\r|\n/g, '\r\n')
+}
 ```
 
+The default resolver requests HTML. GET form values are already encoded in `src`;
+`application/x-www-form-urlencoded` submissions use `URLSearchParams`, `text/plain` submissions use
+CRLF-delimited text, and `multipart/form-data` submissions use `FormData`. Pass a custom
+`resolveFrame` when the server requires additional headers, another body encoding, or a different
+response policy.
+
+Add `rmx-document` to a link or form to leave its navigation to the browser.
+
+The default resolver rejects non-OK responses with an error containing their status and status text.
+A custom `resolveFrame` may return a `Response` with any status when it wants Remix UI to render the
+response body.
+
 Forms remain ordinary HTML forms before the runtime starts. Add `rmx-target` to reload a named frame, or `rmx-document` to require a full-document submission:
 
 ```tsx

package/src/ui/server/README.md

@@ -23,6 +23,7 @@ Renders a component tree to a streaming response. The initial HTML is sent immed
 
 ```tsx
 import { renderToStream } from 'remix/ui/server'
+import { assetServer } from './assets.ts'
 
 let stream = renderToStream(<App />, {
   frameSrc: request.url,
@@ -31,6 +32,17 @@ let stream = renderToStream(<App />, {
     let frameUrl = new URL(src, context?.currentFrameSrc ?? request.url)
     return fetchHtml(frameUrl)
   },
+  async resolveClientEntry(entryId, component) {
+    let [href, preloads] = await Promise.all([
+      assetServer.getHref(entryId),
+      assetServer.getPreloads(entryId),
+    ])
+    return {
+      href,
+      exportName: entryId.split('#')[1] || component.name,
+      preloads,
+    }
+  },
   onError(error) {
     console.error(error)
   },
@@ -47,6 +59,7 @@ return new Response(stream, {
 - **`topFrameSrc`** - Overrides the root frame URL used for `handle.frames.top.src`. This is mainly useful when calling `renderToStream()` from inside `resolveFrame()` for a nested frame render.
 - **`signal`** - Cancels pending server rendering work. Pass `request.signal` so client disconnects can stop unresolved frame work without invoking `onError` for the disconnect itself.
 - **`resolveFrame(src, target, context)`** - Called when a `<Frame>` needs its content. Return a string of HTML, a `ReadableStream<Uint8Array>`, or a promise of either. `context.currentFrameSrc` is the URL for the frame that contains the `<Frame>`, and `context.topFrameSrc` is the outer document URL. Required if your component tree contains `<Frame>` elements.
+- **`resolveClientEntry(entryId, component)`** - Resolves the public module URL, export name, and optional module preload hrefs for a hydrated client entry.
 - **`onError(error)`** - Called when a rendering error occurs. If not provided, the stream rejects with the error.
 
 When you render nested frame responses with `renderToStream()` inside `resolveFrame()`, pass `frameSrc` for the frame being rendered and carry `topFrameSrc` forward from the parent context. That preserves `handle.frames.top.src` across the whole SSR frame tree.

package/dist/static-middleware.d.ts

@@ -1,2 +0,0 @@
-export * from '@remix-run/static-middleware';
-//# sourceMappingURL=static-middleware.d.ts.map

package/dist/static-middleware.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"static-middleware.d.ts","sourceRoot":"","sources":["../src/static-middleware.ts"],"names":[],"mappings":"AACA,cAAc,8BAA8B,CAAA"}