Add canonical remix export manifest

demos/bookstore/app/actions/account/controller.tsx

@@ -1,4 +1,4 @@
-import { createController } from 'remix/fetch-router'
+import { createController } from 'remix/router'
 
 import { requireAuth } from '../../middleware/auth.ts'
 import { routes } from '../../routes.ts'

demos/bookstore/app/actions/account/orders/controller.tsx

@@ -1,4 +1,4 @@
-import { createController } from 'remix/fetch-router'
+import { createController } from 'remix/router'
 
 import { orders, orderItemsWithBook } from '../../../data/schema.ts'
 import { requireAuth } from '../../../middleware/auth.ts'

demos/bookstore/app/actions/account/settings/controller.tsx

@@ -1,4 +1,4 @@
-import { createController } from 'remix/fetch-router'
+import { createController } from 'remix/router'
 import * as s from 'remix/data-schema'
 import * as f from 'remix/data-schema/form-data'
 import { minLength } from 'remix/data-schema/checks'

demos/bookstore/app/actions/admin/books/controller.tsx

@@ -1,4 +1,4 @@
-import { createController } from 'remix/fetch-router'
+import { createController } from 'remix/router'
 import * as s from 'remix/data-schema'
 import * as f from 'remix/data-schema/form-data'
 import * as coerce from 'remix/data-schema/coerce'

demos/bookstore/app/actions/admin/controller.tsx

@@ -1,4 +1,4 @@
-import { createController } from 'remix/fetch-router'
+import { createController } from 'remix/router'
 
 import { requireAdmin } from '../../middleware/admin.ts'
 import { requireAuth } from '../../middleware/auth.ts'

demos/bookstore/app/actions/admin/orders/controller.tsx

@@ -1,4 +1,4 @@
-import { createController } from 'remix/fetch-router'
+import { createController } from 'remix/router'
 
 import { orders, orderItemsWithBook } from '../../../data/schema.ts'
 import { requireAdmin } from '../../../middleware/admin.ts'

demos/bookstore/app/actions/admin/users/controller.tsx

@@ -1,4 +1,4 @@
-import { createController } from 'remix/fetch-router'
+import { createController } from 'remix/router'
 import * as s from 'remix/data-schema'
 import * as f from 'remix/data-schema/form-data'
 import { redirect } from 'remix/response/redirect'

demos/bookstore/app/actions/api/controller.tsx

@@ -1,4 +1,4 @@
-import { createController } from 'remix/fetch-router'
+import { createController } from 'remix/router'
 import * as s from 'remix/data-schema'
 import * as f from 'remix/data-schema/form-data'
 

demos/bookstore/app/actions/auth/controller.tsx

@@ -1,4 +1,4 @@
-import { createController } from 'remix/fetch-router'
+import { createController } from 'remix/router'
 import { redirect } from 'remix/response/redirect'
 
 import { routes } from '../../routes.ts'

demos/bookstore/app/actions/auth/forgot-password/controller.tsx

@@ -1,4 +1,4 @@
-import { createController } from 'remix/fetch-router'
+import { createController } from 'remix/router'
 import * as s from 'remix/data-schema'
 
 import { passwordResetTokens, users } from '../../../data/schema.ts'

demos/bookstore/app/actions/auth/login/controller.tsx

@@ -1,4 +1,4 @@
-import { createController } from 'remix/fetch-router'
+import { createController } from 'remix/router'
 import { completeAuth, verifyCredentials } from 'remix/auth'
 import { redirect } from 'remix/response/redirect'
 

demos/bookstore/app/actions/auth/register/controller.tsx

@@ -1,4 +1,4 @@
-import { createController } from 'remix/fetch-router'
+import { createController } from 'remix/router'
 import * as s from 'remix/data-schema'
 import { redirect } from 'remix/response/redirect'
 

demos/bookstore/app/actions/auth/reset-password/controller.tsx

@@ -1,4 +1,4 @@
-import { createController } from 'remix/fetch-router'
+import { createController } from 'remix/router'
 import * as s from 'remix/data-schema'
 import { redirect } from 'remix/response/redirect'
 

demos/bookstore/app/actions/books/controller.tsx

@@ -1,4 +1,4 @@
-import { createController } from 'remix/fetch-router'
+import { createController } from 'remix/router'
 import { ilike } from 'remix/data-table'
 
 import { books } from '../../data/schema.ts'

demos/bookstore/app/actions/cart/api/controller.tsx

@@ -1,4 +1,4 @@
-import { createController } from 'remix/fetch-router'
+import { createController } from 'remix/router'
 import * as s from 'remix/data-schema'
 import * as f from 'remix/data-schema/form-data'
 import { redirect } from 'remix/response/redirect'

demos/bookstore/app/actions/cart/controller.tsx

@@ -1,4 +1,4 @@
-import { createController } from 'remix/fetch-router'
+import { createController } from 'remix/router'
 
 import { routes } from '../../routes.ts'
 import { CartPage } from './page.tsx'

demos/bookstore/app/actions/checkout/controller.tsx

@@ -1,4 +1,4 @@
-import { createController } from 'remix/fetch-router'
+import { createController } from 'remix/router'
 import * as s from 'remix/data-schema'
 import * as f from 'remix/data-schema/form-data'
 import { redirect } from 'remix/response/redirect'

demos/bookstore/app/actions/contact/controller.tsx

@@ -1,4 +1,4 @@
-import { createController } from 'remix/fetch-router'
+import { createController } from 'remix/router'
 
 import { routes } from '../../routes.ts'
 import { ContactPage, ContactSuccessPage } from './page.tsx'

demos/bookstore/app/actions/controller.tsx

@@ -1,4 +1,4 @@
-import { createController } from 'remix/fetch-router'
+import { createController } from 'remix/router'
 import { ilike, inList, or } from 'remix/data-table'
 import { createFileResponse as sendFile } from 'remix/response/file'
 

demos/bookstore/app/actions/fragments/controller.tsx

@@ -1,4 +1,4 @@
-import { createController } from 'remix/fetch-router'
+import { createController } from 'remix/router'
 import { css } from 'remix/ui'
 
 import { CartButton } from '../../assets/cart-button.tsx'

demos/bookstore/app/data/setup.ts

@@ -6,7 +6,7 @@ import { fileURLToPath } from 'node:url'
 import { createDatabase } from 'remix/data-table'
 import { createMigrationRunner } from 'remix/data-table/migrations'
 import { loadMigrations } from 'remix/data-table/migrations/node'
-import { createSqliteDatabaseAdapter } from 'remix/data-table-sqlite'
+import { createSqliteDatabaseAdapter } from 'remix/data-table/sqlite'
 
 import { books, orderItems, orders, users } from './schema.ts'
 import { hashPassword } from '../utils/password-hash.ts'

demos/bookstore/app/middleware/admin.ts

@@ -1,4 +1,4 @@
-import type { Middleware } from 'remix/fetch-router'
+import type { Middleware } from 'remix/router'
 
 import { getCurrentUser } from '../utils/context.ts'
 

demos/bookstore/app/middleware/asset-entry.ts

@@ -1,6 +1,6 @@
 import * as path from 'node:path'
-import { createContextKey, type Middleware } from 'remix/fetch-router'
-import { getContext } from 'remix/async-context-middleware'
+import { createContextKey, type Middleware } from 'remix/router'
+import { getContext } from 'remix/middleware/async-context'
 
 import { assetServer } from '../utils/assets.ts'
 

demos/bookstore/app/middleware/auth.ts

@@ -4,7 +4,7 @@ import {
   auth,
   createSessionAuthScheme,
   requireAuth as requireAuthenticated,
-} from 'remix/auth-middleware'
+} from 'remix/middleware/auth'
 import { Database } from 'remix/data-table'
 import { redirect } from 'remix/response/redirect'
 

demos/bookstore/app/middleware/database.ts

@@ -1,4 +1,4 @@
-import type { Middleware } from 'remix/fetch-router'
+import type { Middleware } from 'remix/router'
 import { Database } from 'remix/data-table'
 
 import { db } from '../data/setup.ts'

demos/bookstore/app/middleware/render.tsx

@@ -1,7 +1,7 @@
 import * as path from 'node:path'
 
-import type { Router } from 'remix/fetch-router'
-import { renderWith } from 'remix/render-middleware'
+import type { Router } from 'remix/router'
+import { renderWith } from 'remix/middleware/render'
 import { createHtmlResponse } from 'remix/response/html'
 import type { RemixNode } from 'remix/ui'
 import { renderToStream } from 'remix/ui/server'

demos/bookstore/app/middleware/session.ts

@@ -3,7 +3,7 @@ import * as path from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { createCookie } from 'remix/cookie'
 import { Session } from 'remix/session'
-import { createFsSessionStorage } from 'remix/session/fs-storage'
+import { createFsSessionStorage } from 'remix/session-storage/fs'
 
 const demoRootPath = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..', '..')
 const sessionDirectoryPath = path.join(demoRootPath, 'tmp', 'sessions')

demos/bookstore/app/router.ts

@@ -1,13 +1,13 @@
-import { createRouter, type MiddlewareContext } from 'remix/fetch-router'
-import { asyncContext } from 'remix/async-context-middleware'
-import { compression } from 'remix/compression-middleware'
-import { formData } from 'remix/form-data-middleware'
+import { createRouter, type MiddlewareContext } from 'remix/router'
+import { asyncContext } from 'remix/middleware/async-context'
+import { compression } from 'remix/middleware/compression'
+import { formData } from 'remix/middleware/form-data'
 import type { Cookie } from 'remix/cookie'
-import { logger } from 'remix/logger-middleware'
-import { methodOverride } from 'remix/method-override-middleware'
+import { logger } from 'remix/middleware/logger'
+import { methodOverride } from 'remix/middleware/method-override'
 import type { SessionStorage } from 'remix/session'
-import { session } from 'remix/session-middleware'
-import { staticFiles } from 'remix/static-middleware'
+import { session } from 'remix/middleware/session'
+import { staticFiles } from 'remix/middleware/static'
 
 import apiController from './actions/api/controller.tsx'
 import accountController from './actions/account/controller.tsx'
@@ -48,7 +48,7 @@ type AppContext = MiddlewareContext<
   ]
 >
 
-declare module 'remix/fetch-router' {
+declare module 'remix/router' {
   interface RouterTypes {
     context: AppContext
   }

demos/bookstore/app/utils/context.ts

@@ -1,5 +1,5 @@
-import { getContext } from 'remix/async-context-middleware'
-import type { AuthState } from 'remix/auth-middleware'
+import { getContext } from 'remix/middleware/async-context'
+import type { AuthState } from 'remix/middleware/auth'
 import type { Session } from 'remix/session'
 
 import type { User } from '../data/schema.ts'

demos/bookstore/test/helpers.ts

@@ -1,6 +1,6 @@
 import { createCookie } from 'remix/cookie'
 import { SetCookie, Cookie } from 'remix/headers'
-import { createMemorySessionStorage } from 'remix/session/memory-storage'
+import { createMemorySessionStorage } from 'remix/session-storage/memory'
 
 import { createBookstoreRouter } from '../app/router.ts'
 import { initializeBookstoreDatabase } from '../app/data/setup.ts'

docs/src/generate/documented-api.ts

@@ -1,4 +1,5 @@
 import * as typedoc from 'typedoc'
+import { hasRemixPackage, mapToRemixPackage } from './manifest.ts'
 import { getApiNameFromFullName, invariant, unimplemented, warn } from './utils.ts'
 import { MDN_SYMBOLS } from './symbols.ts'
 
@@ -549,11 +550,24 @@ function getApiFilePath(
 ): string {
   let nameParts = fullName.split('.').filter((part) => part !== '')
   invariant(nameParts.length >= 2, `Invalid full name for API: ${fullName}`)
-  // Rewrite `@remix-run/<pkg>` to `remix/<pkg>` so docs render under the
-  // umbrella's import path. The doc generator skips the actual `remix`
-  // umbrella package and documents `@remix-run/*` source reflections directly
-  // (see `createLookupMaps` in typedoc.ts).
-  let pkg = nameParts.shift()?.replace(/^@remix-run\//g, 'remix/')
+  // Resolve `@remix-run/<pkg>` to its canonical `remix/*` path via the
+  // manifest so docs render under the umbrella's import path. The doc
+  // generator skips the actual `remix` umbrella package and documents
+  // `@remix-run/*` source reflections directly (see `createLookupMaps` in
+  // typedoc.ts).
+  let rawPkg = nameParts.shift() ?? ''
+  // If the first remaining segment combined with the package name is a more
+  // specific manifest entry (e.g. @remix-run/fetch-router + routes →
+  // @remix-run/fetch-router/routes → remix/routes), consume that segment so
+  // APIs from sub-exports land under the right canonical path.
+  if (rawPkg.startsWith('@remix-run/') && nameParts.length > 0) {
+    let withSub = `${rawPkg}/${nameParts[0]}`
+    if (hasRemixPackage(withSub)) {
+      rawPkg = withSub
+      nameParts.shift()
+    }
+  }
+  let pkg = rawPkg.startsWith('@remix-run/') ? mapToRemixPackage(rawPkg) : rawPkg
   let name = nameParts.pop()
   return [pkg, ...nameParts, type, `${name}.md`].filter(Boolean).join('/')
 }

docs/src/generate/manifest.ts

@@ -0,0 +1,24 @@
+import * as path from 'node:path'
+import * as url from 'node:url'
+import { buildSpecifierToRemixPath } from '../../../scripts/utils/manifest.ts'
+
+const __dirname = path.dirname(url.fileURLToPath(import.meta.url))
+const packagesDir = path.resolve(__dirname, '../../../packages')
+
+const specifierMap = buildSpecifierToRemixPath(packagesDir)
+
+/**
+ * Maps a full npm specifier (e.g. `@remix-run/fetch-router` or
+ * `@remix-run/session/cookie-storage`) to its canonical `remix/*` import path
+ * (e.g. `remix/router` or `remix/session-storage/cookie`).
+ *
+ * Falls back to the mechanical `remix/<short-name>` path when no manifest
+ * entry covers the specifier.
+ */
+export function mapToRemixPackage(specifier: string): string {
+  return specifierMap.get(specifier) ?? specifier.replace(/^@remix-run\//, 'remix/')
+}
+
+export function hasRemixPackage(specifier: string): boolean {
+  return specifierMap.has(specifier)
+}

docs/src/generate/packages.ts

@@ -1,6 +1,7 @@
 import * as fs from 'node:fs/promises'
 import * as path from 'node:path'
 import * as s from 'remix/data-schema'
+import { mapToRemixPackage } from './manifest.ts'
 import { info, invariant, warn } from './utils.ts'
 
 type PackageOverview = {
@@ -200,10 +201,8 @@ function getDocsPackageName(packageName: string): string {
     return 'remix'
   }
 
-  let match = packageName.match(/^@remix-run\/(.+)$/)
-  invariant(match, `Unexpected package name: ${packageName}`)
-
-  return `remix/${match[1]}`
+  invariant(packageName.startsWith('@remix-run/'), `Unexpected package name: ${packageName}`)
+  return mapToRemixPackage(packageName)
 }
 
 function frontmatter(overview: PackageOverview): string {

packages/remix/.changes/minor.domain-exports.md

@@ -0,0 +1,29 @@
+Updated the `remix` package to use domain-oriented exports, no longer always mapping
+1:1 to underlying `@remix-run/*` packages.  1:1 package exports are left to ease migrations,
+but are marked deprecated and will be removed before a Remix 3.0.0 stable release.
+
+Changed package mappings:
+
+- `remix/async-context-middleware` → `remix/middleware/async-context`
+- `remix/auth-middleware` → `remix/middleware/auth`
+- `remix/compression-middleware` → `remix/middleware/compression`
+- `remix/cop-middleware` → `remix/middleware/cop`
+- `remix/cors-middleware` → `remix/middleware/cors`
+- `remix/csrf-middleware` → `remix/middleware/csrf`
+- `remix/data-table-mysql` → `remix/data-table/mysql`
+- `remix/data-table-postgres` → `remix/data-table/postgres`
+- `remix/data-table-sqlite` → `remix/data-table/sqlite`
+- `remix/fetch-router` → `remix/router`
+- `remix/fetch-router/routes` → `remix/routes`
+- `remix/file-storage-s3` → `remix/file-storage/s3`
+- `remix/form-data-middleware` → `remix/middleware/form-data`
+- `remix/logger-middleware` → `remix/middleware/logger`
+- `remix/method-override-middleware` → `remix/middleware/method-override`
+- `remix/render-middleware` → `remix/middleware/render`
+- `remix/session-middleware` → `remix/middleware/session`
+- `remix/session-storage-memcache` → `remix/session-storage/memcache`
+- `remix/session-storage-redis` → `remix/session-storage/redis`
+- `remix/session/cookie-storage` → `remix/session-storage/cookie`
+- `remix/session/fs-storage` → `remix/session-storage/fs`
+- `remix/session/memory-storage` → `remix/session-storage/memory`
+- `remix/static-middleware` → `remix/middleware/static`

packages/remix/manifest.json

@@ -0,0 +1,12 @@
+{
+  "remix/data-table/$1": "@remix-run/data-table-([a-z0-9-]+)",
+  "remix/file-storage/$1": "@remix-run/file-storage-([a-z0-9-]+)",
+  "remix/middleware/$1": "@remix-run/([a-z0-9-]+)-middleware",
+  "remix/router": "@remix-run/fetch-router",
+  "remix/routes": "@remix-run/fetch-router/routes",
+  "remix/session": "@remix-run/session",
+  "remix/session-storage/$1": "@remix-run/session-storage-([a-z0-9-]+)",
+  "remix/session-storage/cookie": "@remix-run/session/cookie-storage",
+  "remix/session-storage/fs": "@remix-run/session/fs-storage",
+  "remix/session-storage/memory": "@remix-run/session/memory-storage"
+}