From b3a27cdacc39fb915e3c03dda0b0aead70c724fb Mon Sep 17 00:00:00 2001
From: dreamwasp <cass.spain@skillsoft.com>
Date: Tue, 20 Oct 2026 09:51:13 -0400
Subject: [PATCH 1/3] feat(gamut-codemods): move Video imports and add Markdown
 video overrides

moved-exports moves Video and VideoProps from the root to
@codecademy/gamut/Video (scope-rename then swaps the scope).
markdown-video-overrides adds explicit iframeOverride/videoOverride to
each <Markdown>, since it no longer renders video through Video by
default, and drops the removed skipDefaultOverrides keys. tsconfig-dom
warns about tsconfigs without "dom", which Video used to supply.

On the Gamut side, a Video/package.json stub makes the subpath resolve
under node10, MarkdownVideo no longer passes NaN sizes, and a one-line
<video> is no longer wrapped in a <p>.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 ...gamut-codemods-markdown-video-overrides.md |   5 +
 .changeset/gamut-codemods-video.md            |   5 +
 .changeset/gamut-markdown-video-fixes.md      |   5 +
 .changeset/gamut-video-node10.md              |   5 +
 packages/gamut-codemods/README.md             |  17 +-
 .../end-to-end-video.input.tsx                |   3 +
 .../end-to-end-video.output.tsx               |  11 +
 .../gamut-codemods/src/__tests__/cli.test.ts  |  25 ++
 .../gamut-codemods/src/__tests__/lib.test.ts  |  39 +++
 .../gamut-codemods/src/lib/package-ranges.ts  |  52 ++++
 .../__testfixtures__/clash.input.tsx          |   4 +
 .../__testfixtures__/clash.output.tsx         |   4 +
 .../__testfixtures__/clash.warnings.json      |   3 +
 .../__testfixtures__/default.input.tsx        |   3 +
 .../__testfixtures__/default.output.tsx       |  11 +
 .../__testfixtures__/merge-existing.input.tsx |   5 +
 .../merge-existing.output.tsx                 |  12 +
 .../__testfixtures__/skip-flags.input.tsx     |   5 +
 .../__testfixtures__/skip-flags.output.tsx    |  16 +
 .../__testfixtures__/unreadable.input.tsx     |   5 +
 .../__testfixtures__/unreadable.output.tsx    |  11 +
 .../__testfixtures__/unreadable.warnings.json |   4 +
 .../markdown-video-overrides/index.ts         | 288 ++++++++++++++++++
 .../__testfixtures__/merge-existing.input.tsx |   5 +
 .../merge-existing.output.tsx                 |   5 +
 .../__testfixtures__/mixed-import.input.tsx   |   7 +
 .../__testfixtures__/mixed-import.output.tsx  |   8 +
 .../__testfixtures__/namespace.input.tsx      |   4 +
 .../__testfixtures__/namespace.output.tsx     |   4 +
 .../__testfixtures__/namespace.warnings.json  |   3 +
 .../__testfixtures__/re-export.input.ts       |   1 +
 .../__testfixtures__/re-export.output.ts      |   2 +
 .../__testfixtures__/unsafe-shapes.input.tsx  |  10 +
 .../__testfixtures__/unsafe-shapes.output.tsx |  10 +
 .../unsafe-shapes.warnings.json               |   1 +
 .../__testfixtures__/video-only.input.tsx     |   6 +
 .../__testfixtures__/video-only.output.tsx    |   6 +
 .../src/migrations/moved-exports/index.ts     | 249 +++++++++++++++
 .../__testfixtures__/has-dom.input.json       |   1 +
 .../__testfixtures__/has-dom.output.json      |   1 +
 .../__testfixtures__/no-dom.input.json        |   4 +
 .../__testfixtures__/no-dom.output.json       |   4 +
 .../__testfixtures__/no-dom.warnings.json     |   1 +
 .../src/migrations/tsconfig-dom/index.ts      |  30 ++
 .../src/presets/scope-swap/index.ts           |  10 +
 .../src/presets/scope-swap/manifest.ts        |  10 +-
 .../components/media-and-assets/video.mdx     |   6 +
 packages/gamut/Video/package.json             |   5 +
 packages/gamut/package.json                   |   3 +-
 packages/gamut/project.json                   |   5 +-
 .../src/Markdown/__tests__/Markdown.test.tsx  |  21 ++
 packages/gamut/src/Markdown/index.tsx         |  16 +-
 .../Markdown/libs/overrides/Video/index.tsx   |   4 +-
 53 files changed, 964 insertions(+), 16 deletions(-)
 create mode 100644 .changeset/gamut-codemods-markdown-video-overrides.md
 create mode 100644 .changeset/gamut-codemods-video.md
 create mode 100644 .changeset/gamut-markdown-video-fixes.md
 create mode 100644 .changeset/gamut-video-node10.md
 create mode 100644 packages/gamut-codemods/src/__tests__/__testfixtures__/end-to-end-video.input.tsx
 create mode 100644 packages/gamut-codemods/src/__tests__/__testfixtures__/end-to-end-video.output.tsx
 create mode 100644 packages/gamut-codemods/src/lib/package-ranges.ts
 create mode 100644 packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/clash.input.tsx
 create mode 100644 packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/clash.output.tsx
 create mode 100644 packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/clash.warnings.json
 create mode 100644 packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/default.input.tsx
 create mode 100644 packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/default.output.tsx
 create mode 100644 packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/merge-existing.input.tsx
 create mode 100644 packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/merge-existing.output.tsx
 create mode 100644 packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/skip-flags.input.tsx
 create mode 100644 packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/skip-flags.output.tsx
 create mode 100644 packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/unreadable.input.tsx
 create mode 100644 packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/unreadable.output.tsx
 create mode 100644 packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/unreadable.warnings.json
 create mode 100644 packages/gamut-codemods/src/migrations/markdown-video-overrides/index.ts
 create mode 100644 packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/merge-existing.input.tsx
 create mode 100644 packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/merge-existing.output.tsx
 create mode 100644 packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/mixed-import.input.tsx
 create mode 100644 packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/mixed-import.output.tsx
 create mode 100644 packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/namespace.input.tsx
 create mode 100644 packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/namespace.output.tsx
 create mode 100644 packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/namespace.warnings.json
 create mode 100644 packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/re-export.input.ts
 create mode 100644 packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/re-export.output.ts
 create mode 100644 packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/unsafe-shapes.input.tsx
 create mode 100644 packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/unsafe-shapes.output.tsx
 create mode 100644 packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/unsafe-shapes.warnings.json
 create mode 100644 packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/video-only.input.tsx
 create mode 100644 packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/video-only.output.tsx
 create mode 100644 packages/gamut-codemods/src/migrations/moved-exports/index.ts
 create mode 100644 packages/gamut-codemods/src/migrations/tsconfig-dom/__testfixtures__/has-dom.input.json
 create mode 100644 packages/gamut-codemods/src/migrations/tsconfig-dom/__testfixtures__/has-dom.output.json
 create mode 100644 packages/gamut-codemods/src/migrations/tsconfig-dom/__testfixtures__/no-dom.input.json
 create mode 100644 packages/gamut-codemods/src/migrations/tsconfig-dom/__testfixtures__/no-dom.output.json
 create mode 100644 packages/gamut-codemods/src/migrations/tsconfig-dom/__testfixtures__/no-dom.warnings.json
 create mode 100644 packages/gamut-codemods/src/migrations/tsconfig-dom/index.ts
 create mode 100644 packages/gamut/Video/package.json

diff --git a/.changeset/gamut-codemods-markdown-video-overrides.md b/.changeset/gamut-codemods-markdown-video-overrides.md
new file mode 100644
index 0000000000..3583e418f8
--- /dev/null
+++ b/.changeset/gamut-codemods-markdown-video-overrides.md
@@ -0,0 +1,5 @@
+---
+'@skillsoft/gamut-codemods': minor
+---
+
+`scope-swap` now covers the Markdown video changes. `<Markdown>` no longer renders `<iframe>` and `<video>` through `Video` by default, and `skipDefaultOverrides.iframe` / `.video` are gone. The new `markdown-video-overrides` migration adds `iframeOverride` / `videoOverride` (with `Iframe` and `MarkdownVideo` imported from `/Video`) to each `<Markdown>` that didn't opt out, so rendering is unchanged. Where a skip was `true`, it writes `iframeOverride={undefined}` so a second run stays a no-op. Video moves also print a checklist item for the `@vidstack/react` and `react-player` peer dependencies.
diff --git a/.changeset/gamut-codemods-video.md b/.changeset/gamut-codemods-video.md
new file mode 100644
index 0000000000..b8ea8d65b8
--- /dev/null
+++ b/.changeset/gamut-codemods-video.md
@@ -0,0 +1,5 @@
+---
+'@skillsoft/gamut-codemods': minor
+---
+
+`scope-swap` now moves `Video` and `VideoProps` imports off the root onto `@skillsoft/gamut/Video`, splitting mixed imports and merging into an existing `/Video` import. Namespace imports, `export *`, and mocks that stub `Video` get a warning instead. A new report-only `tsconfig-dom` migration warns about tsconfig files whose `lib` has no `"dom"`, since Video used to supply the DOM types through the root import.
diff --git a/.changeset/gamut-markdown-video-fixes.md b/.changeset/gamut-markdown-video-fixes.md
new file mode 100644
index 0000000000..c602c78a51
--- /dev/null
+++ b/.changeset/gamut-markdown-video-fixes.md
@@ -0,0 +1,5 @@
+---
+'@skillsoft/gamut': patch
+---
+
+Fix two `Markdown` video bugs. A `<video>` without `width` or `height` no longer passes `NaN` sizes to `Video`, and a `<video>...</video>` written on one line is no longer wrapped in a `<p>`.
diff --git a/.changeset/gamut-video-node10.md b/.changeset/gamut-video-node10.md
new file mode 100644
index 0000000000..060e9ba220
--- /dev/null
+++ b/.changeset/gamut-video-node10.md
@@ -0,0 +1,5 @@
+---
+'@skillsoft/gamut': patch
+---
+
+`@skillsoft/gamut/Video` now resolves under TypeScript's `moduleResolution: "node"` (node10) and in bundlers that ignore `package.json#exports`, through a `Video/package.json` stub.
diff --git a/packages/gamut-codemods/README.md b/packages/gamut-codemods/README.md
index fb4ab06c5e..ae82fc5d75 100644
--- a/packages/gamut-codemods/README.md
+++ b/packages/gamut-codemods/README.md
@@ -54,13 +54,16 @@ Every skillsoft-gamut pull request publishes installable previews through pkg.pr
 
 ### What scope-swap changes
 
-| Migration      | What it does                                                                                                                                                                                                                                                                                                                                                                |
-| -------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `mf-shared`    | Replaces `@codecademy/gamut-kit` in Module Federation `shared` config with the packages it bundled. Gamut becomes a real singleton, so test the host and remotes together.                                                                                                                                                                                                  |
-| `scope-rename` | Every `@codecademy/gamut*` module string becomes `@skillsoft/gamut*`: imports, exports, `require`, `import()`, `jest.mock`/`vi.mock`, `declare module`, and `import('x').T`. Also exact package-name strings elsewhere, like `transpilePackages`, with one warning per file, and package names in comments (`/dist` paths and removed packages are left for the leftovers). |
-| `package-json` | Renames dependencies and sets their versions. A new package that's already listed keeps its value (a preview URL, say), and a `*` peer range stays `*`. Replaces `@codecademy/gamut-kit` with the individual packages.                                                                                                                                                      |
-| `mdx-imports`  | Runs the migrations above over `import`/`export` statements in `.mdx` files. Fenced code blocks are left alone.                                                                                                                                                                                                                                                             |
-| `yarnrc`       | `.yarnrc.yml` list items, like `npmPreapprovedPackages`: renames old package names, or drops them if a glob like `'@skillsoft/*'` already covers the new one.                                                                                                                                                                                                               |
+| Migration                  | What it does                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `moved-exports`            | Moves `Video` and `VideoProps` off the root import onto `/Video`. Warns on namespace imports, `export *`, and mocks that stub `Video`.                                                                                                                                                                                                                                                                                                                                                                                                     |
+| `markdown-video-overrides` | Markdown no longer renders `<iframe>` and `<video>` through `Video` by default. Adds `iframeOverride` / `videoOverride` to each `<Markdown>` that didn't skip them, importing `Iframe` and `MarkdownVideo` from `/Video`. Drops the removed `skipDefaultOverrides.iframe` / `.video` keys, writing `iframeOverride={undefined}` where they were `true`. Warns on a `skipDefaultOverrides` it can't read. Skipped when every `@codecademy/gamut` range in the repo is already 74.0.0 or newer, since that release made the change upstream. |
+| `mf-shared`                | Replaces `@codecademy/gamut-kit` in Module Federation `shared` config with the packages it bundled. Gamut becomes a real singleton, so test the host and remotes together.                                                                                                                                                                                                                                                                                                                                                                 |
+| `scope-rename`             | Every `@codecademy/gamut*` module string becomes `@skillsoft/gamut*`: imports, exports, `require`, `import()`, `jest.mock`/`vi.mock`, `declare module`, and `import('x').T`. Also exact package-name strings elsewhere, like `transpilePackages`, with one warning per file, and package names in comments (`/dist` paths and removed packages are left for the leftovers).                                                                                                                                                                |
+| `package-json`             | Renames dependencies and sets their versions. A new package that's already listed keeps its value (a preview URL, say), and a `*` peer range stays `*`. Replaces `@codecademy/gamut-kit` with the individual packages.                                                                                                                                                                                                                                                                                                                     |
+| `mdx-imports`              | Runs the migrations above over `import`/`export` statements in `.mdx` files. Fenced code blocks are left alone.                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| `yarnrc`                   | `.yarnrc.yml` list items, like `npmPreapprovedPackages`: renames old package names, or drops them if a glob like `'@skillsoft/*'` already covers the new one.                                                                                                                                                                                                                                                                                                                                                                              |
+| `tsconfig-dom`             | Report only. Warns about `tsconfig` files whose `lib` has no `"dom"`, since Video used to supply the DOM types through the root import.                                                                                                                                                                                                                                                                                                                                                                                                    |
 
 ### Known limits
 
diff --git a/packages/gamut-codemods/src/__tests__/__testfixtures__/end-to-end-video.input.tsx b/packages/gamut-codemods/src/__tests__/__testfixtures__/end-to-end-video.input.tsx
new file mode 100644
index 0000000000..1237d85cfa
--- /dev/null
+++ b/packages/gamut-codemods/src/__tests__/__testfixtures__/end-to-end-video.input.tsx
@@ -0,0 +1,3 @@
+import { Box, Markdown, Video } from '@codecademy/gamut';
+
+export const Post = ({ text }: { text: string }) => <Box><Markdown text={text} /><Video videoUrl="x" /></Box>;
diff --git a/packages/gamut-codemods/src/__tests__/__testfixtures__/end-to-end-video.output.tsx b/packages/gamut-codemods/src/__tests__/__testfixtures__/end-to-end-video.output.tsx
new file mode 100644
index 0000000000..93384731d5
--- /dev/null
+++ b/packages/gamut-codemods/src/__tests__/__testfixtures__/end-to-end-video.output.tsx
@@ -0,0 +1,11 @@
+import { Box, Markdown } from '@skillsoft/gamut';
+import { Video, Iframe, MarkdownVideo } from '@skillsoft/gamut/Video';
+
+export const Post = ({ text }: { text: string }) => <Box><Markdown
+  text={text}
+  iframeOverride={{
+    component: Iframe
+  }}
+  videoOverride={{
+    component: MarkdownVideo
+  }} /><Video videoUrl="x" /></Box>;
diff --git a/packages/gamut-codemods/src/__tests__/cli.test.ts b/packages/gamut-codemods/src/__tests__/cli.test.ts
index d17bc79f16..26df548fc7 100644
--- a/packages/gamut-codemods/src/__tests__/cli.test.ts
+++ b/packages/gamut-codemods/src/__tests__/cli.test.ts
@@ -173,6 +173,31 @@ describe('main: full run', () => {
     expect(out).toMatch(/Reinstall \(yarn\)/);
   });
 
+  it('moves Video, adds Markdown overrides, and flags tsconfig lib', async () => {
+    const dir = project({
+      'src/Post.tsx': POST,
+      'src/index.ts': "export * from '@codecademy/gamut';\n",
+      'docs/reexport.mdx': "export * from '@codecademy/gamut';\n",
+      'tsconfig.json': JSON.stringify({ compilerOptions: { lib: ['es2020'] } }),
+    });
+
+    expect(await main(['scope-swap', dir, '--force'])).toBe(0);
+
+    const post = read(dir, 'src/Post.tsx');
+    expect(post).toContain("from '@skillsoft/gamut/Video'");
+    expect(post).toContain('iframeOverride');
+
+    const out = output();
+    expect(out).toMatch(/Video needs two peer dependencies/);
+    expect(out).toMatch(/Some tsconfig files set "lib"/);
+    expect(out).toMatch(
+      /\[moved-exports\] .*src\/index\.ts:1 .*no longer re-exports Video/
+    );
+    expect(out).toMatch(
+      /\[moved-exports\] .*reexport\.mdx .*no longer re-exports Video/
+    );
+  });
+
   it('writes nothing under --dry and skips the checklist and leftovers', async () => {
     const pkg = JSON.stringify({
       dependencies: { '@codecademy/gamut': '^73.0.0' },
diff --git a/packages/gamut-codemods/src/__tests__/lib.test.ts b/packages/gamut-codemods/src/__tests__/lib.test.ts
index f4d9cd1b6e..dcc9326533 100644
--- a/packages/gamut-codemods/src/__tests__/lib.test.ts
+++ b/packages/gamut-codemods/src/__tests__/lib.test.ts
@@ -9,6 +9,7 @@ import { dirtyTreeReason } from '../lib/git';
 import { findLeftovers } from '../lib/leftovers';
 import { isAtLeast, isNewerThan, minVersion } from '../lib/manifest';
 import type { Migration } from '../lib/types';
+import { markdownVideoOverrides } from '../migrations/markdown-video-overrides';
 import { validatePreset } from '../presets';
 import { scopeSwap } from '../presets/scope-swap';
 import { manifest } from '../presets/scope-swap/manifest';
@@ -219,6 +220,44 @@ describe('isAtLeast', () => {
   });
 });
 
+describe('markdown-video-overrides skipReason', () => {
+  const repo = (deps: Record<string, string>[]) => {
+    const dir = tmp();
+    deps.forEach((dependencies, i) => {
+      const pkgDir = i === 0 ? dir : path.join(dir, 'libs', String(i));
+      fs.mkdirSync(pkgDir, { recursive: true });
+      fs.writeFileSync(
+        path.join(pkgDir, 'package.json'),
+        JSON.stringify({ dependencies })
+      );
+    });
+    return dir;
+  };
+
+  it('skips when every pinned @codecademy/gamut is 74.0.0 or newer', () => {
+    const dir = repo([
+      { '@codecademy/gamut': '74.0.0' },
+      { '@codecademy/gamut': '*' },
+    ]);
+    expect(markdownVideoOverrides.skipReason?.([dir], manifest)).toMatch(
+      /already at 74\.0\.0/
+    );
+  });
+
+  it('runs when any package is older than 74.0.0', () => {
+    const dir = repo([
+      { '@codecademy/gamut': '74.0.0' },
+      { '@codecademy/gamut': '^73.6.1' },
+    ]);
+    expect(markdownVideoOverrides.skipReason?.([dir], manifest)).toBeNull();
+  });
+
+  it('runs when no version can be read', () => {
+    const dir = repo([{ '@codecademy/gamut': '*' }]);
+    expect(markdownVideoOverrides.skipReason?.([dir], manifest)).toBeNull();
+  });
+});
+
 describe('findLeftovers: scoped directives under a flat config', () => {
   const directive =
     '// eslint-disable-next-line @skillsoft/gamut/no-inline-style';
diff --git a/packages/gamut-codemods/src/lib/package-ranges.ts b/packages/gamut-codemods/src/lib/package-ranges.ts
new file mode 100644
index 0000000000..77a9ba1fff
--- /dev/null
+++ b/packages/gamut-codemods/src/lib/package-ranges.ts
@@ -0,0 +1,52 @@
+import fs from 'node:fs';
+import path from 'node:path';
+
+import { walk } from './leftovers';
+
+const FIELDS = [
+  'dependencies',
+  'devDependencies',
+  'peerDependencies',
+  'optionalDependencies',
+];
+
+const rangesIn = (file: string, pkg: string) => {
+  try {
+    const json = JSON.parse(fs.readFileSync(file, 'utf8')) as Record<
+      string,
+      Record<string, string> | undefined
+    >;
+    return FIELDS.flatMap((field) => json[field]?.[pkg] ?? []);
+  } catch {
+    return [];
+  }
+};
+
+/*
+  Every range `pkg` is listed at in the package.json files under the roots,
+  plus the nearest one above each root up to the git root (running on a
+  subfolder of a monorepo still depends on the root package.json).
+*/
+export const findPackageRanges = (roots: string[], pkg: string) => {
+  const files = new Set<string>();
+  for (const root of roots) {
+    const isDir = fs.statSync(root).isDirectory();
+    for (
+      let dir = isDir ? root : path.dirname(root);
+      dir !== path.dirname(dir);
+      dir = path.dirname(dir)
+    ) {
+      const file = path.join(dir, 'package.json');
+      if (fs.existsSync(file)) {
+        files.add(file);
+        break;
+      }
+      if (fs.existsSync(path.join(dir, '.git'))) break;
+    }
+    if (!isDir) continue;
+    for (const file of walk(root)) {
+      if (path.basename(file) === 'package.json') files.add(file);
+    }
+  }
+  return [...files].flatMap((file) => rangesIn(file, pkg));
+};
diff --git a/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/clash.input.tsx b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/clash.input.tsx
new file mode 100644
index 0000000000..07823f1b32
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/clash.input.tsx
@@ -0,0 +1,4 @@
+import { Markdown } from '@codecademy/gamut';
+import { Iframe } from './local/Iframe';
+
+export const Post = ({ text }: { text: string }) => <Markdown text={text} />;
diff --git a/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/clash.output.tsx b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/clash.output.tsx
new file mode 100644
index 0000000000..07823f1b32
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/clash.output.tsx
@@ -0,0 +1,4 @@
+import { Markdown } from '@codecademy/gamut';
+import { Iframe } from './local/Iframe';
+
+export const Post = ({ text }: { text: string }) => <Markdown text={text} />;
diff --git a/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/clash.warnings.json b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/clash.warnings.json
new file mode 100644
index 0000000000..eddb29a154
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/clash.warnings.json
@@ -0,0 +1,3 @@
+[
+  "a different import already uses the name Iframe or MarkdownVideo"
+]
diff --git a/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/default.input.tsx b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/default.input.tsx
new file mode 100644
index 0000000000..5e6f484ce0
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/default.input.tsx
@@ -0,0 +1,3 @@
+import { Markdown } from '@codecademy/gamut';
+
+export const Post = ({ text }: { text: string }) => <Markdown text={text} />;
diff --git a/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/default.output.tsx b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/default.output.tsx
new file mode 100644
index 0000000000..22a1ab06d4
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/default.output.tsx
@@ -0,0 +1,11 @@
+import { Markdown } from '@codecademy/gamut';
+import { Iframe, MarkdownVideo } from '@codecademy/gamut/Video';
+
+export const Post = ({ text }: { text: string }) => <Markdown
+  text={text}
+  iframeOverride={{
+    component: Iframe
+  }}
+  videoOverride={{
+    component: MarkdownVideo
+  }} />;
diff --git a/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/merge-existing.input.tsx b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/merge-existing.input.tsx
new file mode 100644
index 0000000000..8f754cdafc
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/merge-existing.input.tsx
@@ -0,0 +1,5 @@
+import { Markdown } from '@codecademy/gamut';
+import { Video } from '@codecademy/gamut/Video';
+
+export const Player = () => <Video videoUrl={url} />;
+export const Post = ({ text }: { text: string }) => <Markdown text={text} />;
diff --git a/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/merge-existing.output.tsx b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/merge-existing.output.tsx
new file mode 100644
index 0000000000..ef63b215ae
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/merge-existing.output.tsx
@@ -0,0 +1,12 @@
+import { Markdown } from '@codecademy/gamut';
+import { Video, Iframe, MarkdownVideo } from '@codecademy/gamut/Video';
+
+export const Player = () => <Video videoUrl={url} />;
+export const Post = ({ text }: { text: string }) => <Markdown
+  text={text}
+  iframeOverride={{
+    component: Iframe
+  }}
+  videoOverride={{
+    component: MarkdownVideo
+  }} />;
diff --git a/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/skip-flags.input.tsx b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/skip-flags.input.tsx
new file mode 100644
index 0000000000..161e37c53c
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/skip-flags.input.tsx
@@ -0,0 +1,5 @@
+import { Markdown } from '@codecademy/gamut';
+
+export const Off = <Markdown text={t} skipDefaultOverrides={{ iframe: true, video: true }} />;
+
+export const Partial = <Markdown text={t} skipDefaultOverrides={{ a: true, iframe: false }} />;
diff --git a/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/skip-flags.output.tsx b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/skip-flags.output.tsx
new file mode 100644
index 0000000000..91f36e3a13
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/skip-flags.output.tsx
@@ -0,0 +1,16 @@
+import { Markdown } from '@codecademy/gamut';
+import { Iframe, MarkdownVideo } from '@codecademy/gamut/Video';
+
+export const Off = <Markdown text={t} iframeOverride={undefined} videoOverride={undefined} />;
+
+export const Partial = <Markdown
+  text={t}
+  skipDefaultOverrides={{
+    a: true
+  }}
+  iframeOverride={{
+    component: Iframe
+  }}
+  videoOverride={{
+    component: MarkdownVideo
+  }} />;
diff --git a/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/unreadable.input.tsx b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/unreadable.input.tsx
new file mode 100644
index 0000000000..3f5c516c50
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/unreadable.input.tsx
@@ -0,0 +1,5 @@
+import { Markdown } from '@codecademy/gamut';
+
+export const Dynamic = <Markdown text={t} skipDefaultOverrides={options} />;
+
+export const Flagged = <Markdown text={t} skipDefaultOverrides={{ iframe: flag }} />;
diff --git a/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/unreadable.output.tsx b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/unreadable.output.tsx
new file mode 100644
index 0000000000..0c31ca12d1
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/unreadable.output.tsx
@@ -0,0 +1,11 @@
+import { Markdown } from '@codecademy/gamut';
+import { MarkdownVideo } from '@codecademy/gamut/Video';
+
+export const Dynamic = <Markdown text={t} skipDefaultOverrides={options} />;
+
+export const Flagged = <Markdown
+  text={t}
+  skipDefaultOverrides={{ iframe: flag }}
+  videoOverride={{
+    component: MarkdownVideo
+  }} />;
diff --git a/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/unreadable.warnings.json b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/unreadable.warnings.json
new file mode 100644
index 0000000000..677c75c3e5
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/markdown-video-overrides/__testfixtures__/unreadable.warnings.json
@@ -0,0 +1,4 @@
+[
+  "skipDefaultOverrides is not an object literal",
+  "skipDefaultOverrides.iframe is not a boolean literal"
+]
diff --git a/packages/gamut-codemods/src/migrations/markdown-video-overrides/index.ts b/packages/gamut-codemods/src/migrations/markdown-video-overrides/index.ts
new file mode 100644
index 0000000000..ec39e76ad3
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/markdown-video-overrides/index.ts
@@ -0,0 +1,288 @@
+import type { ASTPath, JSXAttribute, JSXOpeningElement } from 'jscodeshift';
+
+import { isAtLeast, minVersion } from '../../lib/manifest';
+import { nameOf } from '../../lib/module-strings';
+import { findPackageRanges } from '../../lib/package-ranges';
+import type { AstMigration, Warn } from '../../lib/types';
+
+/*
+  Markdown used to render <iframe> and <video> tags through Video by default.
+  Now they render as plain tags unless the override is passed. So each
+  <Markdown> that didn't opt out gets iframeOverride / videoOverride added,
+  with Iframe and MarkdownVideo imported from the Video subpath. That keeps
+  what it rendered before.
+
+  skipDefaultOverrides.iframe and .video were removed, so those keys go. A
+  skip of `true` turned the override off, so it becomes `iframeOverride={undefined}`.
+  That's the same as the new default, but written out. Without it a second
+  run would read the bare element as a legacy one and turn the override back
+  on, and the migration has to be safe to run twice.
+
+  Anything it can't follow (a skipDefaultOverrides that isn't an object
+  literal, or a non-literal iframe / video value) is left alone with a
+  warning.
+
+  Written against the old @codecademy names, like the rest of the presets:
+  scope-rename runs last and moves the Video import to @skillsoft.
+*/
+
+const MARKDOWN_MODULE = '@codecademy/gamut';
+/*
+  The upstream release that made this change. A repo already on it has
+  either passed the overrides or left them out on purpose, so adding them
+  would turn iframes and videos back on where they were meant to be off.
+*/
+const UPSTREAM_SINCE = '74.0.0';
+const VIDEO_MODULE = '@codecademy/gamut/Video';
+
+const OVERRIDES = [
+  { skip: 'iframe', prop: 'iframeOverride', component: 'Iframe' },
+  { skip: 'video', prop: 'videoOverride', component: 'MarkdownVideo' },
+] as const;
+
+type Override = (typeof OVERRIDES)[number];
+
+type Add = Override & { off: boolean };
+
+type Plan = { path: ASTPath<JSXOpeningElement>; adds: Add[] };
+
+/* Reads an object key as a string, whether it's `iframe` or `'iframe'`. */
+const keyOf = (key: { type: string; name?: string; value?: unknown }) =>
+  typeof key.value === 'string' ? key.value : nameOf(key);
+
+/* Reads a `true` / `false` literal, or undefined for anything else. */
+const boolOf = (value: { type: string; value?: unknown }) =>
+  typeof value.value === 'boolean' ? value.value : undefined;
+
+/*
+  Strips the skip keys this migration owns out of the skipDefaultOverrides
+  object. Returns what they were set to, and the keys it couldn't read.
+*/
+const readSkips = (
+  el: JSXOpeningElement,
+  skipAttr: JSXAttribute,
+  warn: Warn
+) => {
+  const skips = new Map<string, boolean>();
+  const unreadable = new Set<string>();
+  const value = skipAttr.value;
+
+  if (
+    value?.type !== 'JSXExpressionContainer' ||
+    value.expression.type !== 'ObjectExpression'
+  ) {
+    warn(
+      el,
+      'skipDefaultOverrides is not an object literal, so iframe and video were not checked. Add iframeOverride / videoOverride by hand.'
+    );
+    return { skips, unreadable: new Set(['iframe', 'video']), removed: false };
+  }
+
+  const object = value.expression;
+  const before = object.properties.length;
+  object.properties = object.properties.filter((prop) => {
+    if (prop.type !== 'ObjectProperty' && prop.type !== 'Property') return true;
+    const key = keyOf(prop.key as { type: string; name?: string });
+    if (key !== 'iframe' && key !== 'video') return true;
+
+    const literal = boolOf(prop.value as { type: string; value?: unknown });
+    if (literal === undefined) {
+      warn(
+        el,
+        `skipDefaultOverrides.${key} is not a boolean literal, so the ${key} override was not added. Check it by hand.`
+      );
+      unreadable.add(key);
+      return true;
+    }
+    skips.set(key, literal);
+    return false;
+  });
+
+  return {
+    skips,
+    unreadable,
+    removed: object.properties.length !== before,
+  };
+};
+
+export const markdownVideoOverrides: AstMigration = {
+  name: 'markdown-video-overrides',
+  kind: 'ast',
+  description:
+    'Pass iframeOverride / videoOverride to <Markdown> so iframes and videos still render through Video, and drop the removed skipDefaultOverrides.iframe / .video keys.',
+  skipReason(roots) {
+    /* `*` peers, URLs, and workspace: ranges say nothing about the version. */
+    const ranges = findPackageRanges(roots, MARKDOWN_MODULE).filter(
+      (range) => minVersion(range) !== null
+    );
+    return ranges.length > 0 &&
+      ranges.every((range) => isAtLeast(range, UPSTREAM_SINCE))
+      ? `${MARKDOWN_MODULE} is already at ${UPSTREAM_SINCE} or newer, which made this change upstream.`
+      : null;
+  },
+  run({ j, root, warn, note }) {
+    const markdownImports = root.find(j.ImportDeclaration, {
+      source: { value: MARKDOWN_MODULE },
+    });
+    const markdownLocals = new Set<string>();
+    markdownImports.forEach((p) => {
+      for (const spec of p.node.specifiers ?? []) {
+        if (
+          spec.type === 'ImportSpecifier' &&
+          nameOf(spec.imported) === 'Markdown'
+        ) {
+          markdownLocals.add(nameOf(spec.local ?? spec.imported));
+        }
+      }
+    });
+    if (markdownLocals.size === 0) return false;
+
+    const elements = root
+      .find(j.JSXOpeningElement)
+      .filter((p) => markdownLocals.has(nameOf(p.node.name)));
+    if (elements.size() === 0) return false;
+
+    /* Video imports the file already has, by exported name -> local name. */
+    const bound = new Map<string, string>();
+    root
+      .find(j.ImportDeclaration, { source: { value: VIDEO_MODULE } })
+      .forEach((p) => {
+        for (const spec of p.node.specifiers ?? []) {
+          if (spec.type !== 'ImportSpecifier') continue;
+          bound.set(nameOf(spec.imported), nameOf(spec.local ?? spec.imported));
+        }
+      });
+
+    /*
+      A different import already called Iframe or MarkdownVideo. Adding ours
+      would shadow it, so stop and leave the file for a hand rewrite.
+    */
+    const clash = root.find(j.ImportSpecifier).filter((p) => {
+      const local = nameOf(p.node.local ?? p.node.imported);
+      return OVERRIDES.some(
+        ({ component }) => local === component && bound.get(component) !== local
+      );
+    });
+    if (clash.size() > 0) {
+      warn(
+        clash.nodes()[0],
+        'a different import already uses the name Iframe or MarkdownVideo, so the <Markdown> overrides were not added. Rewrite them by hand.'
+      );
+      return false;
+    }
+
+    let changed = false;
+    const plans: Plan[] = [];
+    elements.forEach((path) => {
+      const el = path.node;
+      const attrs = el.attributes ?? [];
+      const skipAttr = attrs.find(
+        (a): a is JSXAttribute =>
+          a.type === 'JSXAttribute' && nameOf(a.name) === 'skipDefaultOverrides'
+      );
+
+      let skips = new Map<string, boolean>();
+      let unreadable = new Set<string>();
+      if (skipAttr) {
+        const read = readSkips(el, skipAttr, warn);
+        ({ skips, unreadable } = read);
+        if (read.removed) changed = true;
+
+        const value = skipAttr.value;
+        if (
+          value?.type === 'JSXExpressionContainer' &&
+          value.expression.type === 'ObjectExpression' &&
+          value.expression.properties.length === 0
+        ) {
+          el.attributes = attrs.filter((a) => a !== skipAttr);
+          changed = true;
+        }
+      }
+
+      const present = new Set(
+        (el.attributes ?? []).map((a) =>
+          a.type === 'JSXAttribute' ? nameOf(a.name) : ''
+        )
+      );
+      const adds = OVERRIDES.filter(
+        ({ skip, prop }) => !unreadable.has(skip) && !present.has(prop)
+      ).map((o) => ({ ...o, off: skips.get(o.skip) === true }));
+      if (adds.length > 0) plans.push({ path, adds });
+    });
+
+    if (plans.length > 0) {
+      const names = new Set(
+        plans.flatMap((p) =>
+          p.adds.filter((o) => !o.off).map((o) => o.component)
+        )
+      );
+      const local = new Map<string, string>();
+      const missing: string[] = [];
+      for (const name of names) {
+        if (bound.has(name)) local.set(name, bound.get(name) as string);
+        else {
+          local.set(name, name);
+          missing.push(name);
+        }
+      }
+
+      if (missing.length > 0) {
+        const specifiers = missing.map((name) =>
+          j.importSpecifier(j.identifier(name))
+        );
+        const existing = root
+          .find(j.ImportDeclaration, { source: { value: VIDEO_MODULE } })
+          .nodes()
+          .find(
+            (n) =>
+              (n.importKind ?? 'value') === 'value' &&
+              (n.specifiers ?? []).every((s) => s.type === 'ImportSpecifier')
+          );
+        if (existing) {
+          (existing.specifiers as unknown[]).push(...specifiers);
+        } else {
+          markdownImports
+            .paths()[0]
+            .insertAfter(
+              j.importDeclaration(specifiers, j.stringLiteral(VIDEO_MODULE))
+            );
+        }
+      }
+
+      for (const { path, adds } of plans) {
+        for (const { prop, component, off } of adds) {
+          const value = off
+            ? j.identifier('undefined')
+            : j.objectExpression([
+                j.property(
+                  'init',
+                  j.identifier('component'),
+                  j.identifier(local.get(component) as string)
+                ),
+              ]);
+          path.node.attributes = [
+            ...(path.node.attributes ?? []),
+            j.jsxAttribute(
+              j.jsxIdentifier(prop),
+              j.jsxExpressionContainer(value)
+            ),
+          ];
+        }
+      }
+      if (names.size > 0) note('video-peers');
+      changed = true;
+    }
+
+    return changed;
+  },
+  /*
+    Same recast gap as moved-exports: the blank line after the Markdown import
+    gets copied onto the new Video import. Close only that gap.
+  */
+  postPrint(source) {
+    return source.replace(
+      /(from '@codecademy\/gamut';?)\n\n(import [^\n]*from '@codecademy\/gamut\/Video';?)/g,
+      '$1\n$2'
+    );
+  },
+};
diff --git a/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/merge-existing.input.tsx b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/merge-existing.input.tsx
new file mode 100644
index 0000000000..811c580c56
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/merge-existing.input.tsx
@@ -0,0 +1,5 @@
+import { Text, Video } from '@codecademy/gamut';
+import { VideoProps } from '@codecademy/gamut/Video';
+
+export const x: VideoProps = { videoUrl: '' };
+export const y = [Text, Video];
diff --git a/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/merge-existing.output.tsx b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/merge-existing.output.tsx
new file mode 100644
index 0000000000..2342b88e7d
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/merge-existing.output.tsx
@@ -0,0 +1,5 @@
+import { Text } from '@codecademy/gamut';
+import { VideoProps, Video } from '@codecademy/gamut/Video';
+
+export const x: VideoProps = { videoUrl: '' };
+export const y = [Text, Video];
diff --git a/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/mixed-import.input.tsx b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/mixed-import.input.tsx
new file mode 100644
index 0000000000..98db12ff86
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/mixed-import.input.tsx
@@ -0,0 +1,7 @@
+import { Box, Video, type VideoProps } from '@codecademy/gamut';
+
+export const Player = (props: VideoProps) => (
+  <Box>
+    <Video {...props} />
+  </Box>
+);
diff --git a/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/mixed-import.output.tsx b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/mixed-import.output.tsx
new file mode 100644
index 0000000000..a2058bdebb
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/mixed-import.output.tsx
@@ -0,0 +1,8 @@
+import { Box } from '@codecademy/gamut';
+import { Video, type VideoProps } from '@codecademy/gamut/Video';
+
+export const Player = (props: VideoProps) => (
+  <Box>
+    <Video {...props} />
+  </Box>
+);
diff --git a/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/namespace.input.tsx b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/namespace.input.tsx
new file mode 100644
index 0000000000..e30f43e305
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/namespace.input.tsx
@@ -0,0 +1,4 @@
+import * as Gamut from '@codecademy/gamut';
+
+export const Player = Gamut.Video;
+export type Props = Gamut.VideoProps;
diff --git a/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/namespace.output.tsx b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/namespace.output.tsx
new file mode 100644
index 0000000000..e30f43e305
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/namespace.output.tsx
@@ -0,0 +1,4 @@
+import * as Gamut from '@codecademy/gamut';
+
+export const Player = Gamut.Video;
+export type Props = Gamut.VideoProps;
diff --git a/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/namespace.warnings.json b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/namespace.warnings.json
new file mode 100644
index 0000000000..82426731c6
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/namespace.warnings.json
@@ -0,0 +1,3 @@
+[
+  "namespace import uses Video/VideoProps, which moved to '@codecademy/gamut/Video'"
+]
diff --git a/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/re-export.input.ts b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/re-export.input.ts
new file mode 100644
index 0000000000..d12c1f8c44
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/re-export.input.ts
@@ -0,0 +1 @@
+export { Box, Video } from '@codecademy/gamut';
diff --git a/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/re-export.output.ts b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/re-export.output.ts
new file mode 100644
index 0000000000..efcc9aafd3
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/re-export.output.ts
@@ -0,0 +1,2 @@
+export { Box } from '@codecademy/gamut';
+export { Video } from '@codecademy/gamut/Video';
diff --git a/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/unsafe-shapes.input.tsx b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/unsafe-shapes.input.tsx
new file mode 100644
index 0000000000..1d2a688be7
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/unsafe-shapes.input.tsx
@@ -0,0 +1,10 @@
+import * as Gamut from '@codecademy/gamut';
+
+export * from '@codecademy/gamut';
+
+jest.mock('@codecademy/gamut', () => ({
+  ...jest.requireActual('@codecademy/gamut'),
+  Video: () => null,
+}));
+
+export const V = Gamut.Video;
diff --git a/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/unsafe-shapes.output.tsx b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/unsafe-shapes.output.tsx
new file mode 100644
index 0000000000..1d2a688be7
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/unsafe-shapes.output.tsx
@@ -0,0 +1,10 @@
+import * as Gamut from '@codecademy/gamut';
+
+export * from '@codecademy/gamut';
+
+jest.mock('@codecademy/gamut', () => ({
+  ...jest.requireActual('@codecademy/gamut'),
+  Video: () => null,
+}));
+
+export const V = Gamut.Video;
diff --git a/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/unsafe-shapes.warnings.json b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/unsafe-shapes.warnings.json
new file mode 100644
index 0000000000..ba02d37ffd
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/unsafe-shapes.warnings.json
@@ -0,0 +1 @@
+["namespace import uses Video", "'export *' from '@codecademy/gamut'", "mock of '@codecademy/gamut' stubs Video"]
diff --git a/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/video-only.input.tsx b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/video-only.input.tsx
new file mode 100644
index 0000000000..690bc76dad
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/video-only.input.tsx
@@ -0,0 +1,6 @@
+// the player
+import { Video } from '@codecademy/gamut';
+import type { VideoProps } from '@codecademy/gamut';
+
+export type P = VideoProps;
+export const V = Video;
diff --git a/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/video-only.output.tsx b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/video-only.output.tsx
new file mode 100644
index 0000000000..968c84aef1
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/moved-exports/__testfixtures__/video-only.output.tsx
@@ -0,0 +1,6 @@
+// the player
+import { Video } from '@codecademy/gamut/Video';
+import type { VideoProps } from '@codecademy/gamut/Video';
+
+export type P = VideoProps;
+export const V = Video;
diff --git a/packages/gamut-codemods/src/migrations/moved-exports/index.ts b/packages/gamut-codemods/src/migrations/moved-exports/index.ts
new file mode 100644
index 0000000000..3837375b5d
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/moved-exports/index.ts
@@ -0,0 +1,249 @@
+import type {
+  ASTPath,
+  Collection,
+  ExportNamedDeclaration,
+  ExportSpecifier,
+  ImportDeclaration,
+  ImportSpecifier,
+  JSCodeshift,
+} from 'jscodeshift';
+
+import type { Manifest, MovedExport } from '../../lib/manifest';
+import { nameOf } from '../../lib/module-strings';
+import type { AstMigration, Warn } from '../../lib/types';
+
+/*
+  Moves named exports that left a package root onto their new subpath, per
+  manifest.movedExports. For scope-swap that's Video and VideoProps:
+
+    import { Box, Video } from '@codecademy/gamut';
+  becomes
+    import { Box } from '@codecademy/gamut';
+    import { Video } from '@codecademy/gamut/Video';
+
+  Shapes it can't rewrite safely (namespace imports, `export *`, mock
+  factories) get a warning instead.
+*/
+
+type Declaration = ImportDeclaration | ExportNamedDeclaration;
+type NamedSpecifier = ImportSpecifier | ExportSpecifier;
+
+const isNamed = (spec: { type: string }): spec is NamedSpecifier =>
+  spec.type === 'ImportSpecifier' || spec.type === 'ExportSpecifier';
+
+const specName = (spec: NamedSpecifier) =>
+  nameOf(spec.type === 'ImportSpecifier' ? spec.imported : spec.local);
+
+const kindOf = (node: Declaration) =>
+  (node as { importKind?: string; exportKind?: string }).importKind ??
+  (node as { exportKind?: string }).exportKind ??
+  'value';
+
+/*
+  Fresh copies, not the original nodes. Reparenting nodes that still carry
+  their source location trips recast's patcher when the file has other edits.
+*/
+const cloneSpecifier = (j: JSCodeshift, spec: NamedSpecifier) => {
+  if (spec.type === 'ExportSpecifier') {
+    return j.exportSpecifier.from({
+      local: j.identifier(nameOf(spec.local)),
+      exported: j.identifier(nameOf(spec.exported ?? spec.local)),
+    });
+  }
+  const copy = j.importSpecifier(
+    j.identifier(nameOf(spec.imported)),
+    j.identifier(nameOf(spec.local ?? spec.imported))
+  );
+  Object.assign(copy, {
+    importKind: (spec as { importKind?: string }).importKind,
+  });
+  return copy;
+};
+
+/* An existing all-named declaration of the same kind we can merge into. */
+const findTarget = (
+  j: JSCodeshift,
+  root: Collection,
+  node: Declaration,
+  to: string,
+  kind: string
+): Declaration | undefined => {
+  const matches = (candidate: Declaration) =>
+    kindOf(candidate) === kind &&
+    (candidate.specifiers ?? []).every((s) => isNamed(s));
+  return node.type === 'ImportDeclaration'
+    ? root
+        .find(j.ImportDeclaration, { source: { value: to } })
+        .nodes()
+        .find(matches)
+    : root
+        .find(j.ExportNamedDeclaration, { source: { value: to } })
+        .nodes()
+        .find(matches);
+};
+
+const moveSpecifiers = (
+  j: JSCodeshift,
+  root: Collection,
+  path: ASTPath<Declaration>,
+  rule: MovedExport
+) => {
+  const { node } = path;
+  const names = new Set(rule.names);
+  const specifiers = (node.specifiers ?? []) as { type: string }[];
+  const matched = specifiers.filter(
+    (s): s is NamedSpecifier => isNamed(s) && names.has(specName(s))
+  );
+  if (matched.length === 0) return false;
+
+  const moving = matched.map((s) => cloneSpecifier(j, s));
+  const staying = specifiers.filter(
+    (s) => !matched.includes(s as NamedSpecifier)
+  );
+  const kind = kindOf(node);
+  const existing = findTarget(j, root, node, rule.to, kind);
+
+  if (existing) {
+    (existing.specifiers as unknown[]).push(...moving);
+    if (staying.length === 0) path.prune();
+    else node.specifiers = staying as typeof node.specifiers;
+    return true;
+  }
+
+  if (staying.length === 0) {
+    /* Whole declaration moves. Keep the node so its comments stay put. */
+    node.source = j.stringLiteral(rule.to);
+    return true;
+  }
+
+  const created =
+    node.type === 'ImportDeclaration'
+      ? j.importDeclaration(
+          moving as ImportSpecifier[],
+          j.stringLiteral(rule.to)
+        )
+      : j.exportNamedDeclaration(
+          null,
+          moving as ExportSpecifier[],
+          j.stringLiteral(rule.to)
+        );
+  Object.assign(
+    created,
+    node.type === 'ImportDeclaration'
+      ? { importKind: kind }
+      : { exportKind: kind }
+  );
+  node.specifiers = staying as typeof node.specifiers;
+  path.replace(node, created);
+  return true;
+};
+
+const warnAboutUnsafeShapes = (
+  j: JSCodeshift,
+  root: Collection,
+  rule: MovedExport,
+  warn: Warn
+) => {
+  const list = rule.names.join('/');
+
+  root
+    .find(j.ImportDeclaration, { source: { value: rule.from } })
+    .forEach((p) => {
+      for (const spec of p.node.specifiers ?? []) {
+        if (spec.type !== 'ImportNamespaceSpecifier') continue;
+        const ns = nameOf(spec.local);
+        const member = root
+          .find(j.MemberExpression, { object: { name: ns } })
+          .filter((m) => rule.names.includes(nameOf(m.node.property)));
+        const qualified = root
+          .find(j.TSQualifiedName, { left: { name: ns } })
+          .filter((q) => rule.names.includes(nameOf(q.node.right)));
+        if (member.size() + qualified.size() > 0) {
+          warn(
+            p.node,
+            `namespace import uses ${list}, which moved to '${rule.to}'. Rewrite by hand.`
+          );
+        }
+      }
+    });
+
+  root
+    .find(j.ExportAllDeclaration, { source: { value: rule.from } })
+    .forEach((p) => {
+      warn(
+        p.node,
+        `'export *' from '${rule.from}' no longer re-exports ${list}. Add an export from '${rule.to}' if you need them.`
+      );
+    });
+
+  root
+    .find(j.CallExpression, { arguments: [{ value: rule.from }] })
+    .filter((p) => p.node.arguments.length > 1)
+    .forEach((p) => {
+      const mentions = j(p.get('arguments', 1))
+        .find(j.Identifier)
+        .filter((id) => rule.names.includes(id.node.name));
+      if (mentions.size() > 0) {
+        warn(
+          p.node,
+          `mock of '${rule.from}' stubs ${list}. Mock '${rule.to}' instead.`
+        );
+      }
+    });
+};
+
+const escape = (s: string) => s.replace(/[.*+?^${}()|[\]\\/]/g, '\\$&');
+
+/* An old specifier and its renamed form, since scope-rename may have run. */
+const bothScopes = (manifest: Manifest, spec: string) => {
+  const pkg = Object.keys(manifest.packages).find(
+    (p) => spec === p || spec.startsWith(`${p}/`)
+  );
+  return pkg
+    ? [spec, manifest.packages[pkg].to + spec.slice(pkg.length)]
+    : [spec];
+};
+
+export const movedExports: AstMigration = {
+  name: 'moved-exports',
+  kind: 'ast',
+  description:
+    'Move exports that left a package root (e.g. Video) to their new subpath.',
+  run({ j, root, manifest, warn, note }) {
+    let changed = false;
+    for (const rule of manifest.movedExports) {
+      const paths = [
+        ...root
+          .find(j.ImportDeclaration, { source: { value: rule.from } })
+          .paths(),
+        ...root
+          .find(j.ExportNamedDeclaration, { source: { value: rule.from } })
+          .paths(),
+      ] as ASTPath<Declaration>[];
+      let moved = false;
+      for (const p of paths) {
+        moved = moveSpecifiers(j, root, p, rule) || moved;
+      }
+      if (moved && rule.checklist) note(rule.checklist);
+      changed = moved || changed;
+      warnAboutUnsafeShapes(j, root, rule, warn);
+    }
+    return changed;
+  },
+  /*
+    recast copies the gap that followed the original declaration onto the
+    new one, so a split can leave a blank line between the two halves.
+    Close exactly that gap and nothing else.
+  */
+  postPrint(source, { manifest }) {
+    return manifest.movedExports.reduce((out, rule) => {
+      const from = bothScopes(manifest, rule.from).map(escape).join('|');
+      const to = bothScopes(manifest, rule.to).map(escape).join('|');
+      const split = new RegExp(
+        `(from '(?:${from})';?)\\n\\n((?:import|export)[^\\n]*from '(?:${to})';?)`,
+        'g'
+      );
+      return out.replace(split, '$1\n$2');
+    }, source);
+  },
+};
diff --git a/packages/gamut-codemods/src/migrations/tsconfig-dom/__testfixtures__/has-dom.input.json b/packages/gamut-codemods/src/migrations/tsconfig-dom/__testfixtures__/has-dom.input.json
new file mode 100644
index 0000000000..38cca72cc6
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/tsconfig-dom/__testfixtures__/has-dom.input.json
@@ -0,0 +1 @@
+{ "compilerOptions": { "lib": ["es2022", "DOM", "dom.iterable"] } }
diff --git a/packages/gamut-codemods/src/migrations/tsconfig-dom/__testfixtures__/has-dom.output.json b/packages/gamut-codemods/src/migrations/tsconfig-dom/__testfixtures__/has-dom.output.json
new file mode 100644
index 0000000000..38cca72cc6
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/tsconfig-dom/__testfixtures__/has-dom.output.json
@@ -0,0 +1 @@
+{ "compilerOptions": { "lib": ["es2022", "DOM", "dom.iterable"] } }
diff --git a/packages/gamut-codemods/src/migrations/tsconfig-dom/__testfixtures__/no-dom.input.json b/packages/gamut-codemods/src/migrations/tsconfig-dom/__testfixtures__/no-dom.input.json
new file mode 100644
index 0000000000..3a90a0ce69
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/tsconfig-dom/__testfixtures__/no-dom.input.json
@@ -0,0 +1,4 @@
+{
+  // server code
+  "compilerOptions": { "lib": ["es2022"] }
+}
diff --git a/packages/gamut-codemods/src/migrations/tsconfig-dom/__testfixtures__/no-dom.output.json b/packages/gamut-codemods/src/migrations/tsconfig-dom/__testfixtures__/no-dom.output.json
new file mode 100644
index 0000000000..3a90a0ce69
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/tsconfig-dom/__testfixtures__/no-dom.output.json
@@ -0,0 +1,4 @@
+{
+  // server code
+  "compilerOptions": { "lib": ["es2022"] }
+}
diff --git a/packages/gamut-codemods/src/migrations/tsconfig-dom/__testfixtures__/no-dom.warnings.json b/packages/gamut-codemods/src/migrations/tsconfig-dom/__testfixtures__/no-dom.warnings.json
new file mode 100644
index 0000000000..f83a4ee348
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/tsconfig-dom/__testfixtures__/no-dom.warnings.json
@@ -0,0 +1 @@
+["\"lib\" has no \"dom\""]
diff --git a/packages/gamut-codemods/src/migrations/tsconfig-dom/index.ts b/packages/gamut-codemods/src/migrations/tsconfig-dom/index.ts
new file mode 100644
index 0000000000..86e7f69b7d
--- /dev/null
+++ b/packages/gamut-codemods/src/migrations/tsconfig-dom/index.ts
@@ -0,0 +1,30 @@
+import type { FileMigration } from '../../lib/types';
+
+/*
+  Report-only. Before scope-swap, the gamut root re-exported Video, which
+  pulled @vidstack/react's DOM types into every program that imported
+  gamut. A tsconfig with an explicit `lib` and no "dom" got DOM globals
+  anyway. Once Video moves to its subpath they're gone, and `document`,
+  `HTMLInputElement`, `ResizeObserver` and friends stop type-checking.
+  Adding "dom" is the owner's call, so this warns rather than rewriting.
+*/
+
+const LIB = /"lib"\s*:\s*\[([^\]]*)\]/;
+
+export const tsconfigDom: FileMigration = {
+  name: 'tsconfig-dom',
+  kind: 'file',
+  description:
+    'Warn about tsconfig `lib` settings without "dom", which Video used to supply.',
+  match: (file) => /(^|\/)tsconfig[\w.-]*\.json$/.test(file),
+  run({ source, warn, note }) {
+    const lib = LIB.exec(source);
+    if (lib && !/["']dom["']/i.test(lib[1])) {
+      warn(
+        `"lib" has no "dom". Gamut's root import used to bring DOM types in through Video; add "dom" if type-checking now fails on document, HTMLElement, and so on.`
+      );
+      note('tsconfig-no-dom');
+    }
+    return null;
+  },
+};
diff --git a/packages/gamut-codemods/src/presets/scope-swap/index.ts b/packages/gamut-codemods/src/presets/scope-swap/index.ts
index 3f5d5d99ba..cc6ad2e9ac 100644
--- a/packages/gamut-codemods/src/presets/scope-swap/index.ts
+++ b/packages/gamut-codemods/src/presets/scope-swap/index.ts
@@ -1,8 +1,11 @@
 import type { Preset } from '../../lib/types';
+import { markdownVideoOverrides } from '../../migrations/markdown-video-overrides';
 import { mdxImports } from '../../migrations/mdx-imports';
 import { mfShared } from '../../migrations/mf-shared';
+import { movedExports } from '../../migrations/moved-exports';
 import { packageJson } from '../../migrations/package-json';
 import { scopeRename } from '../../migrations/scope-rename';
+import { tsconfigDom } from '../../migrations/tsconfig-dom';
 import { yarnrc } from '../../migrations/yarnrc';
 import { manifest } from './manifest';
 
@@ -11,12 +14,15 @@ export const scopeSwap: Preset = {
   description: 'Move from @codecademy/gamut* to @skillsoft/gamut*.',
   manifest,
   migrations: [
+    movedExports,
+    markdownVideoOverrides,
     mfShared,
     /* Last: everything above matches on @codecademy names. */
     scopeRename,
     packageJson,
     mdxImports,
     yarnrc,
+    tsconfigDom,
   ],
   checklist: [
     'Run your formatter and lint autofix (prettier --write, then eslint --fix). Split imports come out in recast style, `@skillsoft` sorts differently from `@codecademy` for import-order rules like simple-import-sort, and the shorter scope lets some wrapped imports fit on one line.',
@@ -26,6 +32,10 @@ export const scopeSwap: Preset = {
   conditionalChecklist: {
     'removed:@codecademy/gamut-kit':
       "gamut-kit is gone. Delete anything that reads it for versions, such as a sync-gamut-deps script. @skillsoft/gamut-styles has @emotion/cache and stylis peer dependencies, so add them if yarn warns that they aren't provided.",
+    'video-peers':
+      'Video needs two peer dependencies that Gamut no longer installs for you: `@vidstack/react` and `react-player`. Gamut supports @vidstack/react 1.12.x only (its npm `latest` tag is 0.6.x). Install them: `yarn add @vidstack/react@~1.12.12 react-player@^3.4.0`.',
+    'tsconfig-no-dom':
+      'Some tsconfig files set "lib" without "dom" (see the tsconfig-dom warnings). Video no longer loads with the root import, and it was supplying the DOM types. Add "dom" to those files if type-checking fails on document, HTMLElement, ResizeObserver, and so on.',
     'newer-than-source':
       'Some @codecademy packages were on a newer release than @skillsoft has caught up to (see the package-json warnings). Expect type errors wherever the code uses what that release added, and check the upstream CHANGELOG for it.',
     'mf-shared':
diff --git a/packages/gamut-codemods/src/presets/scope-swap/manifest.ts b/packages/gamut-codemods/src/presets/scope-swap/manifest.ts
index 6605d88983..f8702a6c42 100644
--- a/packages/gamut-codemods/src/presets/scope-swap/manifest.ts
+++ b/packages/gamut-codemods/src/presets/scope-swap/manifest.ts
@@ -89,7 +89,15 @@ export const manifest: Manifest = {
     'eslint-plugin-gamut': '3.1.0',
   },
 
-  movedExports: [],
+  movedExports: [
+    {
+      from: '@codecademy/gamut',
+      to: '@codecademy/gamut/Video',
+      names: ['Video', 'VideoProps'],
+      note: 'Video is no longer on the root barrel. See packages/gamut/src/index.tsx.',
+      checklist: 'video-peers',
+    },
+  ],
 
   deepImports: [],
 
diff --git a/packages/gamut-docs/src/content/docs/components/media-and-assets/video.mdx b/packages/gamut-docs/src/content/docs/components/media-and-assets/video.mdx
index a6cc99cee1..3fdadb5f7f 100644
--- a/packages/gamut-docs/src/content/docs/components/media-and-assets/video.mdx
+++ b/packages/gamut-docs/src/content/docs/components/media-and-assets/video.mdx
@@ -23,6 +23,12 @@ Use `Video` to play a direct video file or stream (MP4, HLS, DASH) or embed a Yo
 
 - **Markdown content that already links to a video** — [Markdown](/components/data-display/markdown/)'s own `<video>` and YouTube/Vimeo `<iframe>` overrides render into `Video` automatically; don't wrap it a second time.
 
+## Requirements
+
+`Video` imports a stylesheet (`vidstack-styles.css`) directly, so it needs a bundler that can handle CSS imports, such as webpack, Vite, or Next.js. It won't load with native ESM in Node or in a browser with no bundler, and fails with `Unknown file extension ".css"`.
+
+Video is imported from `@skillsoft/gamut/Video`, not the root package. Apps that don't use Video don't load the stylesheet.
+
 ## Usage examples
 
 ### Embedding YouTube or Vimeo
diff --git a/packages/gamut/Video/package.json b/packages/gamut/Video/package.json
new file mode 100644
index 0000000000..9a1490663a
--- /dev/null
+++ b/packages/gamut/Video/package.json
@@ -0,0 +1,5 @@
+{
+  "main": "../dist/Video/index.js",
+  "module": "../dist/Video/index.mjs",
+  "types": "../dist/Video/index.d.ts"
+}
diff --git a/packages/gamut/package.json b/packages/gamut/package.json
index 4ac900d4cf..21d00d4bd3 100644
--- a/packages/gamut/package.json
+++ b/packages/gamut/package.json
@@ -47,7 +47,8 @@
   },
   "files": [
     "dist",
-    "bin"
+    "bin",
+    "Video"
   ],
   "license": "MIT",
   "main": "./dist/index.js",
diff --git a/packages/gamut/project.json b/packages/gamut/project.json
index 5a12ae3d78..ce38f314a7 100644
--- a/packages/gamut/project.json
+++ b/packages/gamut/project.json
@@ -42,10 +42,7 @@
       "dependsOn": ["build"],
       "options": {
         "cwd": "{projectRoot}",
-        "commands": [
-          "publint .",
-          "attw --pack . --ignore-rules false-cjs no-resolution"
-        ],
+        "commands": ["publint .", "attw --pack . --ignore-rules false-cjs"],
         "parallel": false
       }
     },
diff --git a/packages/gamut/src/Markdown/__tests__/Markdown.test.tsx b/packages/gamut/src/Markdown/__tests__/Markdown.test.tsx
index 38cbf343fb..ef6609c453 100644
--- a/packages/gamut/src/Markdown/__tests__/Markdown.test.tsx
+++ b/packages/gamut/src/Markdown/__tests__/Markdown.test.tsx
@@ -163,6 +163,27 @@ describe('<Markdown />', () => {
     expect(document.querySelectorAll('video').length).toEqual(1);
     expect(screen.queryByTitle(mockTitle)).not.toBeInTheDocument();
   });
+
+  it('Does not wrap a single-line video override in a paragraph', () => {
+    renderView({
+      text: `<video src="https://example.com/clip.mp4" controls></video>`,
+      videoOverride: { component: MarkdownVideo },
+    });
+    expect(document.querySelector('p div')).toBeNull();
+  });
+
+  it('Passes undefined width and height to Video when the video has none', () => {
+    // React only warns about NaN styles once per value, so check the props directly
+    const element = MarkdownVideo({
+      src: 'https://example.com/clip.mp4',
+    } as Parameters<typeof MarkdownVideo>[0]) as React.ReactElement<{
+      width?: number;
+      height?: number;
+    }>;
+    expect(element.props.width).toBeUndefined();
+    expect(element.props.height).toBeUndefined();
+  });
+
   it('Wraps the markdown in a div by default (block)', () => {
     renderView({ text: basicMarkdown });
     expect(
diff --git a/packages/gamut/src/Markdown/index.tsx b/packages/gamut/src/Markdown/index.tsx
index 544bc6bc5e..1ef44e3e30 100644
--- a/packages/gamut/src/Markdown/index.tsx
+++ b/packages/gamut/src/Markdown/index.tsx
@@ -34,6 +34,20 @@ const preprocessingInstructions = createPreprocessingInstructions();
 
 const isValidNode = () => true;
 
+/**
+ * Puts each <video> block on its own lines so marked emits an HTML block.
+ * A single-line <video>...</video> is parsed as paragraph text, which wraps
+ * the video's block-level output in a <p>.
+ */
+const normalizeVideoBlocks = (text: string) =>
+  text.replace(
+    /(<video\b[^>]*>)([\s\S]*?)(<\/video>)/gi,
+    (_match, open: string, inner: string, close: string) => {
+      const body = inner.trim();
+      return `\n\n${open}\n${body ? `${body}\n` : ''}${close}\n\n`;
+    }
+  );
+
 const MarkdownWrapper = styled.div<{ spacing: 'loose' | 'tight' | 'none' }>`
   ${({ theme, spacing }) => {
     const spacingStyleFunction = markdownStyles[spacing];
@@ -152,7 +166,7 @@ export class Markdown extends PureComponent<MarkdownProps> {
     // Render markdown to html
     const rawHtml = inline
       ? marked.parseInline(text, markedOptions)
-      : marked(text, markedOptions);
+      : marked(normalizeVideoBlocks(text), markedOptions);
 
     const sanitizationConfig = {
       ...defaultSanitizationConfig,
diff --git a/packages/gamut/src/Markdown/libs/overrides/Video/index.tsx b/packages/gamut/src/Markdown/libs/overrides/Video/index.tsx
index 75cf568422..dee1221d9c 100644
--- a/packages/gamut/src/Markdown/libs/overrides/Video/index.tsx
+++ b/packages/gamut/src/Markdown/libs/overrides/Video/index.tsx
@@ -19,12 +19,12 @@ export const MarkdownVideo: React.FC<MarkdownVideoProps> = (props) => {
     const videoProps = {
       autoplay: props?.autoPlay,
       controls: props?.controls,
-      height: Number(props?.height),
+      height: props?.height ? Number(props.height) : undefined,
       loop: props?.loop,
       muted: props?.muted,
       videoTitle: props?.title,
       videoUrl: props?.src,
-      width: Number(props?.width),
+      width: props?.width ? Number(props.width) : undefined,
       textTracks: props?.textTracks,
       showPlayerEmbed: props?.showPlayerEmbed,
     };

From 34ad6a1816039f6438035e0689bb73f4768d6031 Mon Sep 17 00:00:00 2001
From: dreamwasp <cass.spain@skillsoft.com>
Date: Tue, 20 Oct 2026 11:10:48 -0400
Subject: [PATCH 2/3] fix(gamut-codemods): rename match to appliesTo in this
 branch's file migrations

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 packages/gamut-codemods/src/migrations/tsconfig-dom/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/gamut-codemods/src/migrations/tsconfig-dom/index.ts b/packages/gamut-codemods/src/migrations/tsconfig-dom/index.ts
index 86e7f69b7d..5221702476 100644
--- a/packages/gamut-codemods/src/migrations/tsconfig-dom/index.ts
+++ b/packages/gamut-codemods/src/migrations/tsconfig-dom/index.ts
@@ -16,7 +16,7 @@ export const tsconfigDom: FileMigration = {
   kind: 'file',
   description:
     'Warn about tsconfig `lib` settings without "dom", which Video used to supply.',
-  match: (file) => /(^|\/)tsconfig[\w.-]*\.json$/.test(file),
+  appliesTo: (file) => /(^|\/)tsconfig[\w.-]*\.json$/.test(file),
   run({ source, warn, note }) {
     const lib = LIB.exec(source);
     if (lib && !/["']dom["']/i.test(lib[1])) {

From 8c0b958074d50f0211bd3aece985374aa44eb903 Mon Sep 17 00:00:00 2001
From: dreamwasp <cass.spain@skillsoft.com>
Date: Tue, 20 Oct 2026 11:40:32 -0400
Subject: [PATCH 3/3] chore(changeset): one changeset per package for Video and
 Markdown

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .changeset/gamut-codemods-markdown-video-overrides.md |  5 -----
 .changeset/gamut-codemods-video-markdown.md           | 10 ++++++++++
 .changeset/gamut-codemods-video.md                    |  5 -----
 .changeset/gamut-markdown-video-fixes.md              |  5 -----
 .changeset/gamut-video-markdown.md                    |  9 +++++++++
 .changeset/gamut-video-node10.md                      |  5 -----
 6 files changed, 19 insertions(+), 20 deletions(-)
 delete mode 100644 .changeset/gamut-codemods-markdown-video-overrides.md
 create mode 100644 .changeset/gamut-codemods-video-markdown.md
 delete mode 100644 .changeset/gamut-codemods-video.md
 delete mode 100644 .changeset/gamut-markdown-video-fixes.md
 create mode 100644 .changeset/gamut-video-markdown.md
 delete mode 100644 .changeset/gamut-video-node10.md

diff --git a/.changeset/gamut-codemods-markdown-video-overrides.md b/.changeset/gamut-codemods-markdown-video-overrides.md
deleted file mode 100644
index 3583e418f8..0000000000
--- a/.changeset/gamut-codemods-markdown-video-overrides.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@skillsoft/gamut-codemods': minor
----
-
-`scope-swap` now covers the Markdown video changes. `<Markdown>` no longer renders `<iframe>` and `<video>` through `Video` by default, and `skipDefaultOverrides.iframe` / `.video` are gone. The new `markdown-video-overrides` migration adds `iframeOverride` / `videoOverride` (with `Iframe` and `MarkdownVideo` imported from `/Video`) to each `<Markdown>` that didn't opt out, so rendering is unchanged. Where a skip was `true`, it writes `iframeOverride={undefined}` so a second run stays a no-op. Video moves also print a checklist item for the `@vidstack/react` and `react-player` peer dependencies.
diff --git a/.changeset/gamut-codemods-video-markdown.md b/.changeset/gamut-codemods-video-markdown.md
new file mode 100644
index 0000000000..0953cfba50
--- /dev/null
+++ b/.changeset/gamut-codemods-video-markdown.md
@@ -0,0 +1,10 @@
+---
+'@skillsoft/gamut-codemods': minor
+---
+
+`scope-swap` now covers the Video and Markdown changes.
+
+- `moved-exports` moves `Video` and `VideoProps` imports off the root onto `@skillsoft/gamut/Video`, splitting mixed imports and merging into an existing `/Video` import. Namespace imports, `export *`, and mocks that stub `Video` get a warning instead.
+- `markdown-video-overrides` adds `iframeOverride` / `videoOverride` (with `Iframe` and `MarkdownVideo` imported from `/Video`) to each `<Markdown>` that didn't opt out, since `<Markdown>` no longer renders `<iframe>` and `<video>` through `Video` by default. It replaces the removed `skipDefaultOverrides.iframe` / `.video`, writing `iframeOverride={undefined}` where a skip was `true`, so a second run stays a no-op.
+- `tsconfig-dom` (report only) warns about tsconfig files whose `lib` has no `"dom"`, since Video used to supply the DOM types through the root import.
+- When a run moves Video, the next steps list the `@vidstack/react` and `react-player` peer dependencies.
diff --git a/.changeset/gamut-codemods-video.md b/.changeset/gamut-codemods-video.md
deleted file mode 100644
index b8ea8d65b8..0000000000
--- a/.changeset/gamut-codemods-video.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@skillsoft/gamut-codemods': minor
----
-
-`scope-swap` now moves `Video` and `VideoProps` imports off the root onto `@skillsoft/gamut/Video`, splitting mixed imports and merging into an existing `/Video` import. Namespace imports, `export *`, and mocks that stub `Video` get a warning instead. A new report-only `tsconfig-dom` migration warns about tsconfig files whose `lib` has no `"dom"`, since Video used to supply the DOM types through the root import.
diff --git a/.changeset/gamut-markdown-video-fixes.md b/.changeset/gamut-markdown-video-fixes.md
deleted file mode 100644
index c602c78a51..0000000000
--- a/.changeset/gamut-markdown-video-fixes.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@skillsoft/gamut': patch
----
-
-Fix two `Markdown` video bugs. A `<video>` without `width` or `height` no longer passes `NaN` sizes to `Video`, and a `<video>...</video>` written on one line is no longer wrapped in a `<p>`.
diff --git a/.changeset/gamut-video-markdown.md b/.changeset/gamut-video-markdown.md
new file mode 100644
index 0000000000..dcfdb02659
--- /dev/null
+++ b/.changeset/gamut-video-markdown.md
@@ -0,0 +1,9 @@
+---
+'@skillsoft/gamut': patch
+---
+
+Video and Markdown fixes.
+
+- `@skillsoft/gamut/Video` now resolves under TypeScript's `moduleResolution: "node"` (node10) and in bundlers that ignore `package.json#exports`, through a `Video/package.json` stub.
+- A Markdown `<video>` without `width` or `height` no longer passes `NaN` sizes to `Video`.
+- A `<video>...</video>` written on one line is no longer wrapped in a `<p>`.
diff --git a/.changeset/gamut-video-node10.md b/.changeset/gamut-video-node10.md
deleted file mode 100644
index 060e9ba220..0000000000
--- a/.changeset/gamut-video-node10.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@skillsoft/gamut': patch
----
-
-`@skillsoft/gamut/Video` now resolves under TypeScript's `moduleResolution: "node"` (node10) and in bundlers that ignore `package.json#exports`, through a `Video/package.json` stub.