@remix-run/cli 0.4.0 → 0.6.0

package/dist/lib/errors.js

@@ -4,6 +4,11 @@ export const CLI_ERROR_DEFINITIONS = {
         title: 'Could not determine an app name',
         fix: 'Pass --app-name or choose a target directory name that can become an app name.',
     },
+    assetsConfigRequired: {
+        code: 'RMX_ASSETS_CONFIG_REQUIRED',
+        title: 'Asset configuration is required',
+        fix: 'Add an assets configuration to remix.json.',
+    },
     dbConfigRequired: {
         code: 'RMX_DB_CONFIG_REQUIRED',
         title: 'Database configuration is required',
@@ -165,6 +170,11 @@ export function appNameUnavailable(targetDir) {
         message: 'Could not determine an app name from the target directory.',
     });
 }
+export function assetsConfigRequired() {
+    return createCliError(CLI_ERROR_DEFINITIONS.assetsConfigRequired, {
+        message: 'Asset configuration is missing from remix.json.',
+    });
+}
 export function dbConfigRequired(filePath) {
     return createCliError(CLI_ERROR_DEFINITIONS.dbConfigRequired, {
         context: { filePath },

package/dist/lib/remix-config.d.ts

@@ -1,14 +1,28 @@
+import type { AssetServerOptions } from '@remix-run/assets';
 import type { RemixTestPool } from '@remix-run/test/cli';
 declare const reporters: readonly ['spec', 'files', 'tap', 'dot'];
 declare const testTypes: readonly ['server', 'browser', 'e2e'];
 type Reporter = (typeof reporters)[number];
 type TestPool = RemixTestPool;
 type TestType = (typeof testTypes)[number];
+/** Validated configuration loaded from a Remix project config file. */
 export interface RemixConfig {
+    /** Shared asset mapping and browser access configuration. */
+    assets?: RemixAssetsConfig;
+    /** Database command configuration. */
     db?: RemixDbCommandConfig;
+    /** Project health-check configuration. */
     doctor?: RemixDoctorCommandConfig;
+    /** Test runner configuration. */
     test?: RemixTestCommandConfig;
 }
+/** JSON-compatible asset server configuration loaded from `remix.json`. */
+export interface RemixAssetsConfig extends Pick<AssetServerOptions, 'allowFiles' | 'allowPackages' | 'basePath' | 'denyFiles' | 'mounts'> {
+    /** Leaf file asset configuration. */
+    files?: Pick<NonNullable<AssetServerOptions['files']>, 'extensions'>;
+    /** Absolute root directory used to resolve asset file paths. */
+    rootDir: string;
+}
 export type RemixDbString = string | {
     env: string;
     default?: string;
@@ -70,6 +84,14 @@ export interface RemixTestCommandConfig {
     type?: TestType[];
     watch?: boolean;
 }
+/**
+ * Loads the nearest Remix project configuration or an explicitly selected config file.
+ *
+ * @param from A config file or directory from which to search upward for `remix.json`. Defaults to
+ * `process.cwd()`.
+ * @returns The validated Remix project configuration, or an empty object when no config is found.
+ */
+export declare function loadConfig(from?: string | URL): Promise<RemixConfig>;
 export declare function loadRemixConfig(cwd: string, configPath: string | undefined): Promise<RemixConfig>;
 export {};
 //# sourceMappingURL=remix-config.d.ts.map

package/dist/lib/remix-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remix-config.d.ts","sourceRoot":"","sources":["../../src/lib/remix-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"remix-config.d.ts","sourceRoot":"","sources":["../../src/lib/remix-config.ts"],"names":[],"mappings":"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"}

package/dist/lib/remix-config.js

@@ -1,10 +1,40 @@
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
+import * as process from 'node:process';
+import { fileURLToPath } from 'node:url';
 import { findNodeAtLocation, getNodeValue, parseTree, printParseErrorCode, } from 'jsonc-parser';
+import { findAppRoot } from './app-root.js';
 import { invalidRemixConfig, remixConfigNotFound } from './errors.js';
 const reporters = ['spec', 'files', 'tap', 'dot'];
 const testPools = ['forks', 'threads'];
 const testTypes = ['server', 'browser', 'e2e'];
+/**
+ * Loads the nearest Remix project configuration or an explicitly selected config file.
+ *
+ * @param from A config file or directory from which to search upward for `remix.json`. Defaults to
+ * `process.cwd()`.
+ * @returns The validated Remix project configuration, or an empty object when no config is found.
+ */
+export async function loadConfig(from = process.cwd()) {
+    let fromPath = path.resolve(from instanceof URL ? fileURLToPath(from) : from);
+    let stat;
+    try {
+        stat = await fs.stat(fromPath);
+    }
+    catch (error) {
+        if (isNodeError(error) && error.code === 'ENOENT')
+            throw remixConfigNotFound(fromPath);
+        throw error;
+    }
+    if (stat.isFile()) {
+        return loadRemixConfig(path.dirname(fromPath), path.basename(fromPath));
+    }
+    if (!stat.isDirectory()) {
+        throw new TypeError(`Expected a Remix config file or directory: ${fromPath}`);
+    }
+    let configDir = await findAppRoot(fromPath, 'remix.json');
+    return configDir === null ? {} : loadRemixConfig(configDir, undefined);
+}
 export async function loadRemixConfig(cwd, configPath) {
     let filePath = path.resolve(cwd, configPath ?? 'remix.json');
     let text;
@@ -44,11 +74,14 @@ export async function loadRemixConfig(cwd, configPath) {
 }
 function parseConfig(value, source, configDir, cwd) {
     let object = requireObject(value, source, []);
-    requireKnownProperties(object, ['$schema', 'db', 'doctor', 'test'], source, []);
+    requireKnownProperties(object, ['$schema', 'assets', 'db', 'doctor', 'test'], source, []);
     if (object.$schema !== undefined) {
         requireString(object.$schema, source, ['$schema']);
     }
     let config = {};
+    if (object.assets !== undefined) {
+        config.assets = parseAssetsConfig(object.assets, source, configDir);
+    }
     if (object.db !== undefined) {
         config.db = parseDbConfig(object.db, source, configDir);
     }
@@ -60,6 +93,39 @@ function parseConfig(value, source, configDir, cwd) {
     }
     return config;
 }
+function parseAssetsConfig(value, source, configDir) {
+    let objectPath = ['assets'];
+    let object = requireObject(value, source, objectPath);
+    requireKnownProperties(object, ['allowFiles', 'allowPackages', 'basePath', 'denyFiles', 'files', 'mounts', 'rootDir'], source, objectPath);
+    let config = {
+        allowFiles: requireStringArray(object.allowFiles, source, [...objectPath, 'allowFiles']),
+        basePath: requireString(object.basePath, source, [...objectPath, 'basePath']),
+        rootDir: path.resolve(configDir, optionalString(object.rootDir, source, [...objectPath, 'rootDir']) ?? '.'),
+    };
+    let allowPackages = optionalStringArray(object.allowPackages, source, [
+        ...objectPath,
+        'allowPackages',
+    ]);
+    let denyFiles = optionalStringArray(object.denyFiles, source, [...objectPath, 'denyFiles']);
+    let mounts = object.mounts === undefined
+        ? undefined
+        : requireStringRecord(object.mounts, source, [...objectPath, 'mounts']);
+    if (allowPackages !== undefined)
+        config.allowPackages = allowPackages;
+    if (denyFiles !== undefined)
+        config.denyFiles = denyFiles;
+    if (mounts !== undefined)
+        config.mounts = mounts;
+    if (object.files !== undefined) {
+        let filesPath = [...objectPath, 'files'];
+        let files = requireObject(object.files, source, filesPath);
+        requireKnownProperties(files, ['extensions'], source, filesPath);
+        config.files = {
+            extensions: requireStringArray(files.extensions, source, [...filesPath, 'extensions']),
+        };
+    }
+    return config;
+}
 function parseDbConfig(value, source, configDir) {
     let objectPath = ['db'];
     let object = requireObject(value, source, objectPath);
@@ -315,13 +381,23 @@ function requireString(value, source, propertyPath) {
         throwConfigError(source, propertyPath, 'Expected a string');
     return value;
 }
-function optionalStringArray(value, source, propertyPath) {
-    if (value === undefined)
-        return undefined;
+function requireStringArray(value, source, propertyPath) {
     if (!Array.isArray(value))
         throwConfigError(source, propertyPath, 'Expected an array of strings');
     return value.map((item, index) => requireString(item, source, [...propertyPath, index]));
 }
+function requireStringRecord(value, source, propertyPath) {
+    let object = requireObject(value, source, propertyPath);
+    return Object.fromEntries(Object.entries(object).map(([key, item]) => [
+        key,
+        requireString(item, source, [...propertyPath, key]),
+    ]));
+}
+function optionalStringArray(value, source, propertyPath) {
+    if (value === undefined)
+        return undefined;
+    return requireStringArray(value, source, propertyPath);
+}
 function optionalEnum(input, values, source, propertyPath) {
     if (input === undefined)
         return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cli",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "Command-line interface for Remix",
   "author": "Michael Jackson <mjijackson@gmail.com>",
   "license": "MIT",
@@ -33,12 +33,13 @@
   "dependencies": {
     "jsonc-parser": "^3.3.1",
     "semver": "^7.7.4",
-    "@remix-run/data-table": "^0.4.0",
-    "@remix-run/data-table-mysql": "^0.5.0",
-    "@remix-run/data-table-sqlite": "^0.6.0",
-    "@remix-run/terminal": "^0.1.1",
-    "@remix-run/data-table-postgres": "^0.5.0",
-    "@remix-run/test": "^0.6.0"
+    "@remix-run/data-table": "^0.5.0",
+    "@remix-run/data-table-postgres": "^0.5.1",
+    "@remix-run/data-table-mysql": "^0.5.1",
+    "@remix-run/data-table-sqlite": "^0.6.1",
+    "@remix-run/assets": "^0.6.0",
+    "@remix-run/test": "^0.6.0",
+    "@remix-run/terminal": "^0.1.1"
   },
   "devDependencies": {
     "@types/node": "^24.6.0",

package/schema/remix.json

@@ -1,6 +1,5 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://remix.run/schemas/remix.json",
   "title": "Remix CLI configuration",
   "description": "Configuration for the Remix command-line interface.",
   "type": "object",
@@ -10,6 +9,9 @@
       "type": "string",
       "description": "JSON Schema used by editors to validate this file."
     },
+    "assets": {
+      "$ref": "#/$defs/assets"
+    },
     "db": {
       "$ref": "#/$defs/db"
     },
@@ -21,6 +23,52 @@
     }
   },
   "$defs": {
+    "assets": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["allowFiles", "basePath"],
+      "properties": {
+        "allowFiles": {
+          "$ref": "#/$defs/stringArray",
+          "description": "File paths and glob patterns that may be served."
+        },
+        "allowPackages": {
+          "$ref": "#/$defs/stringArray",
+          "description": "Package names whose files and dependencies may be served."
+        },
+        "basePath": {
+          "type": "string",
+          "description": "Public URL prefix for served assets."
+        },
+        "denyFiles": {
+          "$ref": "#/$defs/stringArray",
+          "description": "File paths and glob patterns that must not be served."
+        },
+        "mounts": {
+          "type": "object",
+          "description": "Directories keyed by public URL paths relative to basePath.",
+          "additionalProperties": { "type": "string" }
+        },
+        "files": {
+          "$ref": "#/$defs/assetsFiles"
+        },
+        "rootDir": {
+          "type": "string",
+          "description": "Root directory for asset file paths, relative to this config file."
+        }
+      }
+    },
+    "assetsFiles": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["extensions"],
+      "properties": {
+        "extensions": {
+          "$ref": "#/$defs/stringArray",
+          "description": "Additional file extensions served without script or style compilation."
+        }
+      }
+    },
     "db": {
       "type": "object",
       "additionalProperties": false,

package/src/index.ts

@@ -1 +1,11 @@
 export { runRemix, type RunRemixOptions } from './lib/cli.ts'
+export {
+  loadConfig,
+  type RemixAssetsConfig,
+  type RemixConfig,
+  type RemixDbAdapterConfig,
+  type RemixDbCommandConfig,
+  type RemixDbString,
+  type RemixDoctorCommandConfig,
+  type RemixTestCommandConfig,
+} from './lib/remix-config.ts'

package/src/lib/cli-context.ts

@@ -2,7 +2,11 @@ import * as path from 'node:path'
 import * as process from 'node:process'
 
 import { resolveDefaultRemixVersion } from './remix-version.ts'
-import { loadRemixConfig, type RemixConfig } from './remix-config.ts'
+import {
+  loadConfig as loadProjectConfig,
+  loadRemixConfig,
+  type RemixConfig,
+} from './remix-config.ts'
 
 interface ResolveCliContextOptions {
   configPath?: string
@@ -26,7 +30,11 @@ export async function resolveCliContext(
   let remixVersion = normalizeRemixVersion(options.remixVersion)
 
   let configPromise: Promise<RemixConfig> | undefined
-  let loadConfig = () => (configPromise ??= loadRemixConfig(cwd, options.configPath))
+  let loadConfig = () =>
+    (configPromise ??=
+      options.configPath === undefined
+        ? loadProjectConfig(cwd)
+        : loadRemixConfig(cwd, options.configPath))
 
   // Validate an explicitly selected config file up front so every command
   // fails fast on a bad --config path. The default remix.json is loaded

package/src/lib/cli.ts

@@ -23,7 +23,7 @@ export interface RunRemixOptions {
 
 /**
  * Entry point for the `remix` CLI. Parses `argv`, dispatches to the matching
- * subcommand (`new`, `db`, `doctor`, `routes`, `test`, `version`,
+ * subcommand (`new`, `assets`, `db`, `doctor`, `routes`, `test`, `version`,
  * `completion`, `help`), and resolves with the exit code the process should
  * use.
  *
@@ -103,6 +103,11 @@ async function runCommand(command: string, argv: string[], context: CliContext):
     return runCompletionCommand(argv)
   }
 
+  if (command === 'assets') {
+    let { runAssetsCommand } = await import('./commands/assets.ts')
+    return runAssetsCommand(argv, context)
+  }
+
   if (command === 'doctor') {
     let { runDoctorCommand } = await import('./commands/doctor.ts')
     return runDoctorCommand(argv, context)

package/src/lib/commands/assets.ts

@@ -0,0 +1,109 @@
+import * as fs from 'node:fs'
+import * as path from 'node:path'
+import * as process from 'node:process'
+import { createAssetServer, type AssetDetails } from '@remix-run/assets'
+
+import type { CliContext } from '../cli-context.ts'
+import {
+  assetsConfigRequired,
+  invalidOptionValue,
+  renderCliError,
+  toCliError,
+  unknownCommand,
+} from '../errors.ts'
+import { formatHelpText } from '../help-text.ts'
+import { parseArgs } from '../parse-args.ts'
+
+export async function runAssetsCommand(argv: string[], context: CliContext): Promise<number> {
+  if (argv.includes('-h') || argv.includes('--help')) {
+    process.stdout.write(getAssetsCommandHelpText())
+    return 0
+  }
+
+  try {
+    let invocation = parseAssetsCommandArgs(argv)
+    let config = await context.loadConfig()
+    if (config.assets === undefined) throw assetsConfigRequired()
+
+    let assetServer = createAssetServer({ ...config.assets, watch: false })
+    try {
+      let rootDir = fs.realpathSync(config.assets.rootDir)
+
+      if (invocation.command === 'list') {
+        process.stdout.write(formatAssetList(await assetServer.getAssets(), rootDir))
+      } else {
+        process.stdout.write(
+          formatAssetDetails(await assetServer.getAssetDetails(invocation.input), rootDir),
+        )
+      }
+    } finally {
+      await assetServer.close()
+    }
+
+    return 0
+  } catch (error) {
+    process.stderr.write(
+      renderCliError(toCliError(error), { helpText: getAssetsCommandHelpText(process.stderr) }),
+    )
+    return 1
+  }
+}
+
+export function getAssetsCommandHelpText(target: NodeJS.WriteStream = process.stdout): string {
+  return formatHelpText(
+    {
+      description: 'List or inspect browser-reachable assets.',
+      commands: [{ description: 'Inspect one asset URL or file', label: 'inspect <url-or-file>' }],
+      examples: [
+        'remix assets',
+        'remix assets inspect /assets/app/actions/public/entry.ts',
+        'remix assets inspect app/actions/public/entry.ts',
+      ],
+      usage: ['remix assets', 'remix assets inspect <url-or-file>'],
+    },
+    target,
+  )
+}
+
+type AssetsCommandInvocation = { command: 'list' } | { command: 'inspect'; input: string }
+
+function parseAssetsCommandArgs(argv: string[]): AssetsCommandInvocation {
+  let parsed = parseArgs(argv, {}, { maxPositionals: 2 })
+  let [command, input] = parsed.positionals
+
+  if (command === undefined) return { command: 'list' }
+  if (command !== 'inspect') throw unknownCommand(`assets ${command}`)
+  if (input === undefined) {
+    throw invalidOptionValue('`remix assets inspect` requires a URL or file path.')
+  }
+  return { command, input }
+}
+
+function formatAssetList(assets: readonly AssetDetails[], rootDir: string): string {
+  if (assets.length === 0) return 'No assets.\n'
+  return `${assets
+    .map((asset) => `${asset.url} -> ${formatFilePath(asset.filePath, rootDir)}`)
+    .join('\n')}\n`
+}
+
+function formatAssetDetails(details: AssetDetails, rootDir: string): string {
+  let lines = [`Status: ${details.status}`]
+  if (details.url !== undefined) lines.push(`URL: ${details.url}`)
+  if (details.filePath !== undefined) {
+    lines.push(`File: ${formatFilePath(details.filePath, rootDir)}`)
+  }
+  if (details.access?.deniedBy !== undefined) {
+    lines.push(`Denied by: ${details.access.deniedBy}`)
+  }
+  return `${lines.join('\n')}\n`
+}
+
+function formatFilePath(filePath: string | undefined, rootDir: string): string {
+  if (filePath === undefined) return ''
+  let relativePath = path.relative(rootDir, filePath)
+  return relativePath === '' ||
+    relativePath.startsWith(`..${path.sep}`) ||
+    path.isAbsolute(relativePath)
+    ? filePath
+    : relativePath.split(path.sep).join('/')
+}

package/src/lib/commands/db.ts

@@ -25,7 +25,6 @@ import {
 import { formatHelpText } from '../help-text.ts'
 import { parseArgs } from '../parse-args.ts'
 import {
-  loadRemixConfig,
   type RemixDbAdapterConfig,
   type RemixDbCommandConfig,
   type RemixDbString,
@@ -63,6 +62,8 @@ export function getDbCommandHelpText(target: NodeJS.WriteStream = process.stdout
         'remix db wipe --force',
         'remix db migrate',
         'remix db migrate --to 20260715123000_add_users',
+        'remix db rollback',
+        'remix db rollback --step 2 --dry-run',
         'remix db status',
         'remix db seed',
         'remix db reset --force',
@@ -72,24 +73,35 @@ export function getDbCommandHelpText(target: NodeJS.WriteStream = process.stdout
           description: 'Read the database connection from an environment variable',
           label: '--connection-env <name>',
         },
+        {
+          description: 'Report what would be reverted without running it (rollback only)',
+          label: '--dry-run',
+        },
         { description: 'Confirm a destructive command (wipe and reset only)', label: '--force' },
         {
-          description: 'Use a migration journal table (migrate, status, and reset only)',
+          description: 'Use a migration journal table (migrate, rollback, status, and reset only)',
           label: '--journal-table <name>',
         },
         {
-          description: 'Load migrations from a directory (migrate, status, and reset only)',
+          description:
+            'Load migrations from a directory (migrate, rollback, status, and reset only)',
           label: '--migrations <path>',
         },
         { description: 'Run a SQL seed file (seed and reset only)', label: '--seed <path>' },
         {
-          description: 'Stop after applying the specified migration (migrate only)',
+          description: 'Revert this many migrations, newest first (rollback only)',
+          label: '--step <count>',
+        },
+        {
+          description:
+            'Stop after applying the specified migration, or revert back through it (migrate and rollback only)',
           label: '--to <migration>',
         },
       ],
       usage: [
         'remix db wipe --force [options]',
         'remix db migrate [--to <migration>] [options]',
+        'remix db rollback [--step <count> | --to <migration>] [--dry-run] [options]',
         'remix db status [options]',
         'remix db seed [options]',
         'remix db reset --force [options]',
@@ -120,6 +132,28 @@ function parseDbCommandArgs(argv: string[]): DatabaseCommandInvocation {
     return { command, ...parsed.options }
   }
 
+  if (command === 'rollback') {
+    let parsed = parseArgs(
+      commandArgv,
+      {
+        connectionEnv: connectionOption,
+        dryRun: { flag: '--dry-run', type: 'boolean' },
+        journalTable: journalOption,
+        migrations: migrationsOption,
+        step: { flag: '--step', type: 'string' },
+        to: { flag: '--to', type: 'string' },
+      },
+      { maxPositionals: 0 },
+    )
+
+    if (parsed.options.step !== undefined && parsed.options.to !== undefined) {
+      throw invalidOptionValue('Options --step and --to are mutually exclusive')
+    }
+
+    let { step: rawStep, ...options } = parsed.options
+    return { command, ...options, step: parseStepOption(rawStep) }
+  }
+
   if (command === 'reset') {
     let parsed = parseArgs(
       commandArgv,
@@ -171,6 +205,17 @@ function parseDbCommandArgs(argv: string[]): DatabaseCommandInvocation {
   return { command, ...parsed.options }
 }
 
+function parseStepOption(value: string | undefined): number | undefined {
+  if (value === undefined) return undefined
+
+  let step = Number(value)
+  if (!Number.isInteger(step) || step < 1) {
+    throw invalidOptionValue(`Option --step expects a positive integer, received "${value}"`)
+  }
+
+  return step
+}
+
 async function resolveDbConfig(
   context: CliContext,
 ): Promise<{ config: RemixDbCommandConfig; configDir: string }> {
@@ -184,7 +229,7 @@ async function resolveDbConfig(
     let configDir = await findAppRoot(context.cwd, 'remix.json')
     if (configDir === null) throw remixConfigNotFound(path.join(context.cwd, 'remix.json'))
     configPath = path.join(configDir, 'remix.json')
-    config = await loadRemixConfig(configDir, undefined)
+    config = await context.loadConfig()
   }
 
   if (config.db === undefined) throw dbConfigRequired(configPath)
@@ -206,6 +251,7 @@ function resolveDatabaseCommandPlan(
   if (
     (invocation.command === 'migrate' ||
       invocation.command === 'reset' ||
+      invocation.command === 'rollback' ||
       invocation.command === 'status') &&
     migrations === undefined
   ) {
@@ -221,9 +267,11 @@ function resolveDatabaseCommandPlan(
   return {
     adapter,
     command: invocation.command,
+    dryRun: invocation.dryRun,
     journalTable,
     migrations,
     seed,
+    step: invocation.step,
     to: invocation.to,
   }
 }
@@ -305,6 +353,28 @@ async function executeDatabaseCommand(plan: DatabaseCommandPlan, db: Database):
     })
   }
 
+  if (plan.command === 'rollback') {
+    if (plan.to !== undefined) {
+      return runRemixDb({
+        command: plan.command,
+        db,
+        migrations,
+        to: plan.to,
+        dryRun: plan.dryRun,
+        journalTable: plan.journalTable,
+      })
+    }
+
+    return runRemixDb({
+      command: plan.command,
+      db,
+      migrations,
+      step: plan.step,
+      dryRun: plan.dryRun,
+      journalTable: plan.journalTable,
+    })
+  }
+
   if (plan.command === 'reset') {
     let seed = plan.seed === undefined ? undefined : await loadSeed(plan.seed)
     return runRemixDb({

package/src/lib/commands/help.ts

@@ -24,6 +24,7 @@ export function getCliHelpText(target: NodeJS.WriteStream = process.stdout): str
   return formatHelpText(
     {
       commands: [
+        { description: 'List or inspect browser-reachable assets', label: 'assets [command]' },
         { description: 'Print shell completion scripts for Remix', label: 'completion' },
         { description: 'Show help for Remix commands', label: 'help [command]' },
         { description: 'Create a new Remix project', label: 'new <name>' },
@@ -34,6 +35,7 @@ export function getCliHelpText(target: NodeJS.WriteStream = process.stdout): str
         { description: 'Show the current Remix version', label: 'version' },
       ],
       examples: [
+        'remix assets',
         'remix completion bash',
         'remix help',
         'remix help completion',
@@ -64,6 +66,7 @@ export function getHelpCommandHelpText(target: NodeJS.WriteStream = process.stdo
       description: 'Show help for Remix commands.',
       examples: [
         'remix help',
+        'remix help assets',
         'remix help completion',
         'remix help db',
         'remix help doctor',
@@ -94,6 +97,11 @@ async function getCommandHelpText(argv: string[]): Promise<string> {
     return getNewCommandHelpText()
   }
 
+  if (command === 'assets' && rest.length === 0) {
+    let { getAssetsCommandHelpText } = await import('./assets.ts')
+    return getAssetsCommandHelpText()
+  }
+
   if (command === 'completion' && rest.length === 0) {
     let { getCompletionCommandHelpText } = await import('./completion.ts')
     return getCompletionCommandHelpText()