diff --git a/.github/workflows/publish-vscode-extension.yml b/.github/workflows/publish-vscode-extension.yml
new file mode 100644
index 000000000000..46412eea22ce
--- /dev/null
+++ b/.github/workflows/publish-vscode-extension.yml
@@ -0,0 +1,52 @@
+name: Publish VSCE/OVX
+
+on:
+  workflow_dispatch:
+
+env:
+  CI: 1
+  PRINT_GITHUB_ANNOTATIONS: 1
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  publish:
+    name: Publish VSCE/OVX
+    environment: vsce publish
+    timeout-minutes: 15
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    concurrency: vscode-extension-publish
+
+    steps:
+      - name: Generate GH token
+        id: generate_token
+        uses: actions/create-github-app-token@v2
+        with:
+          app-id: ${{ secrets.HUPPY_APP_ID }}
+          private-key: ${{ secrets.HUPPY_APP_PRIVATE_KEY }}
+
+      - name: Check out code
+        uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+          submodules: true
+          token: ${{ steps.generate_token.outputs.token }}
+
+      - name: Configure git credentials
+        run: git config --global url."https://x-access-token:${{ steps.generate_token.outputs.token }}@github.com/".insteadOf "https://github.com/"
+
+      - uses: ./.github/actions/setup
+
+      - name: Build types
+        run: yarn build-types
+
+      - name: Publish extension
+        run: yarn tsx ./internal/scripts/publish-editor-extensions.ts
+        env:
+          VSCE_PAT: ${{ secrets.VSCE_PAT }}
+          OVSX_PAT: ${{ secrets.OVSX_PAT }}
+          TLDRAW_ENV: production
+          GH_TOKEN: ${{ steps.generate_token.outputs.token }}
diff --git a/.oxlintrc.json b/.oxlintrc.json
index 187ee8c16316..a10cdde89036 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -124,7 +124,11 @@
 			{
 				"argsIgnorePattern": "^_",
 				"varsIgnorePattern": "^_",
-				"caughtErrorsIgnorePattern": "^_"
+				"caughtErrorsIgnorePattern": "^_",
+				"fix": {
+					"imports": "safe-fix",
+					"variables": "off"
+				}
 			}
 		],
 		"no-useless-backreference": "error",
diff --git a/apps/docs/content/releases/next.mdx b/apps/docs/content/releases/next.mdx
index 1d7baf7183bb..c7cf4f2f1335 100644
--- a/apps/docs/content/releases/next.mdx
+++ b/apps/docs/content/releases/next.mdx
@@ -5,10 +5,10 @@ author: tldraw
 date: 03/18/2026
 order: 0
 status: published
-last_version: v4.5.6
+last_version: v4.5.7
 ---
 
-This release adds a first-class theme system with display values for customizing default shapes, shape attribution with a new `TLUserStore` provider and extensible user records, clipboard hooks for intercepting copy, cut, and paste, custom record types to the store, a new `@tldraw/mermaid` package for converting Mermaid diagrams to native shapes, WebSocket hibernation support for tlsync, a new `@tldraw/editor-controller` package for scripting and automation, RTL language support in the UI, cross-window embedding support, arbitrary iframe embed pasting, and smarter export trimming. It also includes various other improvements and bug fixes.
+This release adds a first-class theme system with display values for customizing default shapes, extensible asset types via a new `AssetUtil` system, shape attribution with a new `TLUserStore` provider and extensible user records, clipboard hooks for intercepting copy, cut, and paste, custom record types to the store, a new `@tldraw/mermaid` package for converting Mermaid diagrams to native shapes, WebSocket hibernation support for tlsync, a new `@tldraw/editor-controller` package for scripting and automation, RTL language support in the UI, cross-window embedding support, arbitrary iframe embed pasting, a paste-as-plain-text keyboard shortcut, and smarter export trimming. It also includes various other improvements and bug fixes.
 
 ## What's new
 
@@ -19,10 +19,7 @@ A new first-class theme system replaces the previous approach where colors were
 Register custom themes via `TLThemes` module augmentation for type-safe IDs, add or remove palette colors via `TLThemeDefaultColors` and `TLRemovedDefaultThemeColors`, and pass themes to the editor via the `themes` and `initialTheme` props:
 
 ```tsx
-<Tldraw
-	themes={{ corporate: myCorporateTheme }}
-	initialTheme="corporate"
-/>
+<Tldraw themes={{ corporate: myCorporateTheme }} initialTheme="corporate" />
 ```
 
 Each default shape util defines `getDefaultDisplayValues` to resolve visual properties (colors, stroke widths, font sizes) from the current theme and color mode. Override display values for a default shape with `getCustomDisplayValues`:
@@ -191,6 +188,47 @@ Note shapes now track and display a "first edited by" attribution label in the b
 
 Paste any `<iframe>` embed code onto the canvas to create an embed shape. Previously only URLs matching known providers (YouTube, Google Maps, etc.) worked. Now any valid iframe with an HTTP(S) source creates an embed directly, supporting services like OpenStreetMap, SoundCloud, Loom, and more.
 
+### 💥 Extensible asset types ([#8031](https://github.com/tldraw/tldraw/pull/8031))
+
+A new `AssetUtil` base class follows the `ShapeUtil` / `BindingUtil` pattern, making the asset system extensible. Previously, assets were a hardcoded union of image, video, and bookmark types. Now you can register custom asset types with their own MIME type handling, file-to-asset conversion, and shape creation logic.
+
+```tsx
+import { AssetUtil } from '@tldraw/editor'
+
+class AudioAssetUtil extends AssetUtil<TLAudioAsset> {
+	static override type = 'audio' as const
+	override getSupportedMimeTypes() {
+		return ['audio/mpeg', 'audio/wav']
+	}
+	override async getAssetFromFile(editor, file) {
+		/* ... */
+	}
+}
+
+;<Tldraw assetUtils={[AudioAssetUtil]} />
+```
+
+`TLAssetStore` keeps `upload`/`resolve`/`remove` as cross-cutting concerns, while `AssetUtil` handles type-specific behavior: MIME types, file-to-asset metadata, and asset-to-shape creation.
+
+<details>
+<summary>Migration guide</summary>
+
+`assetValidator` has been removed. Use `imageAssetValidator`, `videoAssetValidator`, or `bookmarkAssetValidator` instead.
+
+`getMediaAssetInfoPartial` has been removed. Use `AssetUtil.getAssetFromFile` instead.
+
+`notifyIfFileNotAllowed` signature changed from `(file, options)` to `(editor, file, options)`.
+
+`getAssetInfo` signature changed from `(file, options, assetId?)` to `(editor, file, assetId?)` and now returns `TLAsset | null` instead of throwing.
+
+</details>
+
+### Paste as plain text ([#8347](https://github.com/tldraw/tldraw/pull/8347))
+
+A new `Cmd+Shift+V` / `Ctrl+Shift+V` shortcut pastes clipboard content as plain text, stripping HTML and rich formatting. This is the standard shortcut in most apps.
+
+Note: `Cmd+Shift+V` previously toggled paste-at-cursor positioning. Since the "Paste at cursor" preference now covers that use case, this shortcut has been repurposed for plain text paste. Users who relied on `Cmd+Shift+V` for paste-at-cursor should use the preference toggle instead.
+
 ### Cross-window embedding support ([#8196](https://github.com/tldraw/tldraw/pull/8196))
 
 Tldraw now works correctly when embedded in iframes, Electron pop-out windows, and Obsidian plugins where the global `document` and `window` differ from the ones tldraw is mounted in. All bare `document` and `window` references have been replaced with container-aware alternatives.
@@ -205,6 +243,10 @@ New helpers `getOwnerDocument()` and `getOwnerWindow()` are exported from `@tldr
 - 💥 Rename `SvgExportContext.themeId` to `SvgExportContext.colorMode` (`string` → `'light' | 'dark'`). ([#8410](https://github.com/tldraw/tldraw/pull/8410))
 - 💥 Change `getColorValue()` first argument from `TLDefaultColorTheme` to `TLThemeColors`. ([#8410](https://github.com/tldraw/tldraw/pull/8410))
 - 💥 Change `PlainTextLabelProps` and `RichTextLabelProps`: `font` → `fontFamily`, `align` → `textAlign`, `fill` removed. ([#8410](https://github.com/tldraw/tldraw/pull/8410))
+- 💥 Remove `assetValidator`. Use `imageAssetValidator`, `videoAssetValidator`, or `bookmarkAssetValidator` instead. ([#8031](https://github.com/tldraw/tldraw/pull/8031))
+- 💥 Remove `getMediaAssetInfoPartial`. Use `AssetUtil.getAssetFromFile` instead. ([#8031](https://github.com/tldraw/tldraw/pull/8031))
+- 💥 Change `notifyIfFileNotAllowed` signature from `(file, options)` to `(editor, file, options)`. ([#8031](https://github.com/tldraw/tldraw/pull/8031))
+- 💥 Change `getAssetInfo` signature from `(file, options, assetId?)` to `(editor, file, assetId?)` and return `TLAsset | null` instead of throwing. ([#8031](https://github.com/tldraw/tldraw/pull/8031))
 - Add `TLTheme`, `TLThemeId`, `TLThemes`, `TLThemeDefaultColors`, `TLThemeColors`, `TLRemovedDefaultThemeColors`, `ThemeManager`, `getDisplayValues()`, `getColorValue()`, and `DEFAULT_THEME` for the new theme system. ([#8410](https://github.com/tldraw/tldraw/pull/8410))
 - Add `themes` and `initialTheme` props to `<Tldraw>` and `<TldrawEditor>`. ([#8410](https://github.com/tldraw/tldraw/pull/8410))
 - Add `getCurrentTheme()`, `setCurrentTheme()`, `getThemes()`, `getTheme()`, `updateTheme()`, `updateThemes()`, and `getColorMode()` to the editor. ([#8410](https://github.com/tldraw/tldraw/pull/8410))
@@ -218,12 +260,13 @@ New helpers `getOwnerDocument()` and `getOwnerWindow()` are exported from `@tldr
 - Add `useDirection()` hook for RTL support. ([#8033](https://github.com/tldraw/tldraw/pull/8033))
 - Add `'json'` to `TLCopyType` for copying shapes as JSON in debug mode. ([#8206](https://github.com/tldraw/tldraw/pull/8206))
 - Change `TLSvgExportOptions.padding` to accept `number | 'auto'`. The `'auto'` mode (now default) renders with padding then trims to visual content bounds. ([#8202](https://github.com/tldraw/tldraw/pull/8202))
-- Add `Vec.IsFinite()` static method. ([#8176](https://github.com/tldraw/tldraw/pull/8176))
 - Change `Vec.PointsBetween()` to accept an optional `ease` parameter. ([#7977](https://github.com/tldraw/tldraw/pull/7977))
 - Add `@tldraw/mermaid` package with `createMermaidDiagram()`, `renderBlueprint()`, and `MermaidDiagramError` for converting Mermaid syntax to tldraw shapes. ([#8194](https://github.com/tldraw/tldraw/pull/8194))
 - Add `mapNodeToRenderSpec` per-diagram-type option and `createShape` override to `@tldraw/mermaid` for customizing how diagram nodes are rendered as shapes. ([#8322](https://github.com/tldraw/tldraw/pull/8322))
 - Add `TextManager.measureHtmlBatch()` for batched DOM text measurement. ([#7949](https://github.com/tldraw/tldraw/pull/7949))
 - Add `TLUserStore` interface with `getCurrentUser()` and `resolve()` for connecting tldraw to auth systems. Add unified `TLUser` record type, `UserRecordType`, `createUserId`, `isUserId`, `userIdValidator`, and `createUserRecordType()` for extensible user schemas. Add `user` parameter to `createTLSchema()`. Add `Editor.getAttributionUser()`, `Editor.getAttributionUserId()`, and `Editor.getAttributionDisplayName()`. Add `textFirstEditedBy` prop to `TLNoteShapeProps`. ([#8147](https://github.com/tldraw/tldraw/pull/8147))
+- Add `AssetUtil` base class with `configure()`, `getDefaultProps()`, `getSupportedMimeTypes()`, `getAssetFromFile()`, and `createShape()`. Add `assetUtils` prop to `<Tldraw>`. Add `Editor.getAssetUtil()`, `Editor.hasAssetUtil()`, and `Editor.getAssetUtilForMimeType()`. Add `TLGlobalAssetPropsMap` for type-safe custom asset registration. Add `createAssetRecordType()`, `defaultAssetSchemas`, and `assets` parameter to `createTLSchema()`. ([#8031](https://github.com/tldraw/tldraw/pull/8031))
+- Add `Cmd+Shift+V` / `Ctrl+Shift+V` shortcut to paste clipboard content as plain text. `Cmd+Shift+V` no longer toggles paste-at-cursor positioning. ([#8347](https://github.com/tldraw/tldraw/pull/8347))
 
 ## Improvements
 
@@ -233,20 +276,21 @@ New helpers `getOwnerDocument()` and `getOwnerWindow()` are exported from `@tldr
 - Replace `@use-gesture/react` dependency with custom gesture handling, reducing bundle size and eliminating a stale dependency. ([#8392](https://github.com/tldraw/tldraw/pull/8392))
 - Tighten iframe referrer policy for embeds to send only the origin instead of the full URL to third-party embed providers. ([#8412](https://github.com/tldraw/tldraw/pull/8412))
 - Move the debug mode toggle into the preferences submenu. ([#8259](https://github.com/tldraw/tldraw/pull/8259))
+- Update hotkeys-js keyboard shortcut library from v3 to v4, picking up TypeScript rewrite and keyboard layout handling improvements. ([#8372](https://github.com/tldraw/tldraw/pull/8372))
 
 ## Bug fixes
 
 - Fix `bailToMark` silently discarding pending history changes when the target mark doesn't exist. ([#8260](https://github.com/tldraw/tldraw/pull/8260))
 - Fix `FocusManager.dispose()` not actually removing document event listeners due to `.bind()` creating new function references. ([#8232](https://github.com/tldraw/tldraw/pull/8232))
 - Fix pasting into editable text shapes when the clipboard contains tldraw data. ([#8192](https://github.com/tldraw/tldraw/pull/8192))
-- Fix crash when isolating curved arrows with degenerate binding geometry. ([#8176](https://github.com/tldraw/tldraw/pull/8176))
 - Fix eraser not erasing shapes when starting a drag from inside a group's bounds. ([#8054](https://github.com/tldraw/tldraw/pull/8054))
 - Fix over-softened corners and end artifacts when shift-clicking to draw straight line segments. ([#7977](https://github.com/tldraw/tldraw/pull/7977))
 - Fix draw-shape loop-closing sensitivity so closing works more consistently across zoom levels. ([#8293](https://github.com/tldraw/tldraw/pull/8293))
-- Fix all shapes disappearing when a labeled arrow has zero length due to NaN propagation through the spatial index. ([#8329](https://github.com/tldraw/tldraw/pull/8329))
 - Fix "back to content" button flickering when both it and the "move focus to canvas" button are visible. ([#8334](https://github.com/tldraw/tldraw/pull/8334)) (contributed by [@kaneel](https://github.com/kaneel))
 - Fix slight positioning drift when pasting text onto the canvas. ([#8345](https://github.com/tldraw/tldraw/pull/8345))
-- Fix camera state getting permanently stuck at 'moving' when the editor is disposed mid-camera-transition, blocking all shape interactions. ([#8396](https://github.com/tldraw/tldraw/pull/8396))
 - Fix missing sandbox attribute on GitHub Gist embeds. ([#8403](https://github.com/tldraw/tldraw/pull/8403))
 - Restrict sandbox permissions for unknown/arbitrary embeds to mitigate security risks from untrusted content. ([#8404](https://github.com/tldraw/tldraw/pull/8404))
 - Fix leaked camera animations, following subscriptions, and stale menu state when the editor is disposed during active operations. ([#8422](https://github.com/tldraw/tldraw/pull/8422))
+- Fix right-clicking inside a multi-selection over a filled background shape changing the selection. ([#8434](https://github.com/tldraw/tldraw/pull/8434))
+- Fix memory leak where the Editor was retained after unmount via a shared throttled `updateHoveredShapeId` closure. ([#8439](https://github.com/tldraw/tldraw/pull/8439))
+- Fix pattern fill not scaling correctly with dynamic size mode. ([#8441](https://github.com/tldraw/tldraw/pull/8441))
diff --git a/apps/vscode/editor/tsconfig.json b/apps/vscode/editor/tsconfig.json
index e2229f6a503b..347a89f41f81 100644
--- a/apps/vscode/editor/tsconfig.json
+++ b/apps/vscode/editor/tsconfig.json
@@ -11,7 +11,7 @@
 		"strict": true,
 		"forceConsistentCasingInFileNames": true,
 		"module": "ESNext",
-		"moduleResolution": "Node",
+		"moduleResolution": "bundler",
 		"resolveJsonModule": true,
 		"noEmit": true,
 		"jsx": "react-jsx",
diff --git a/apps/vscode/extension/CHANGELOG.md b/apps/vscode/extension/CHANGELOG.md
index d25f6757cc44..958116716bd9 100644
--- a/apps/vscode/extension/CHANGELOG.md
+++ b/apps/vscode/extension/CHANGELOG.md
@@ -1,208 +1 @@
-### See [our blog](https://tldraw.substack.com/) for release notes
-
-## 2.0.35
-
-- Fix for pen pressure.
-
-## 2.0.34
-
-- Improved exporting of cropped images.
-- Bug fixes and performance improvements.
-
-## 2.0.33
-
-- Improves minimap rendering.
-
-## 2.0.32
-
-- Performance improvements.
-- Improves resizing of text.
-- Fixes a few issues with the minimap.
-- Fixes a few issues with editing text.
-
-## 2.0.31
-
-- Improved minimap.
-- Improved "Back to content" button.
-- Improved handles on the note shape.
-
-## 2.0.30
-
-- Fixes a bug that prevented opening some files.
-
-## 2.0.29
-
-- Improved note shapes.
-- Color improvements for both light and dark mode.
-- Bug fixes and performance improvements.
-
-## 2.0.28
-
-- Fix an issue with panning the canvas.
-
-## 2.0.27
-
-- Bug fixes and performance improvements.
-
-## 2.0.26
-
-- Bug fixes and performance improvements.
-
-## 2.0.25
-
-- Translation improvements.
-- Bug fixes and performance improvements.
-
-## 2.0.24
-
-- New: You can now use tldraw in Croatian language.
-- Small visual improvements.
-- Bug fixes.
-
-## 2.0.23
-
-- New: Positional keyboard shortcuts for toolbar. You can now use 1, 2, 3,... to select the first, second, third,... tool in the toolbar.
-- New: You can now change the arrow label placement by simply dragging it towards one of the arrow's ends.
-- New: You can now snap shapes that are within the frame to the frame's edges and the frame's centre.
-- Improves duplication. If you alt drag a shape to duplicate it and use duplication afterwards, the new shape will use the same offset as the one you just created.
-- Improves the geo cloud icon.
-- Improves dismissing dialogs.
-- Improves note shape border radius.
-- Improves exporting of images. This should now be significantly faster.
-- Updates the colors of the dark mode.
-
-## 2.0.22
-
-- Improves the dark mode appearance.
-- Fixes an issue with bookmarks not showing images or descriptions.
-
-## 2.0.21
-
-- Improves translations.
-- Fixes an issue with frames. The contents of the frame could become invisible when stacked inside other frames.
-
-## 2.0.20
-
-- Adds edge scrolling functionality. The camera will now move when the pointer is close to the edge of the screen (when resizing, moving, or brush selecting),
-- Improves the default font appearance.
-- Improves the interactions on top of locked shapes. Dragging selected shapes on top and behind them should now work as expected.
-- Fixes an issue with downscaling images that could make the document size grow significantly.
-- Fixes the context menu not closing in some cases.
-- Fixes page names getting cut off.
-- Fixes an issue with loosing focus when deleting from the user interface.
-- Fixes the missing padding on some buttons.
-
-## 2.0.19
-
-- Adds fit to content option for frames.
-- Fixes an issue with loading older files.
-- Fixes an issue with some event handlers not being cleaned up correctly.
-
-## 2.0.18
-
-- Adds the option to remove frames, but keep the children.
-- Add the option to add existing shapes when creating a frame. Just create the frame over the shapes and they will get added to the frame.
-- Improves the appearance of drawings.
-- Improves the way arrows bind inside of shapes.
-- Fixes an issue with new pages not being named correctly.
-
-## 2.0.17
-
-- Improved grouping of shapes. You can now group a shape with an arrow bound to it.
-- Improved handling of images. We now downscale them, which should improve performance.
-- Improved Japanese translations.
-- Fixed the background color of culled shapes when using dark mode.
-- Fixed a bug with exporting shapes that have the same dimensions as their parent frame shape.
-
-## 2.0.16
-
-- Fixed keyboard shortcuts.
-- Fixed edit link button stopping the mouse events from working.
-- Fixed a bug with grouping / ungrouping which prevented the actions menu from closing correctly.
-- Fixed arrowheads not being correctly localized in the Style panel.
-- Fixed a bug where arrows with length 0 could crash the app.
-
-## 2.0.15
-
-- Bug fixes and performance improvements.
-
-## 2.0.14
-
-- Bug fixes and performance improvements. More info:
-  https://github.com/tldraw/tldraw/releases/tag/v2.0.0-alpha.17
-
-## 2.0.13
-
-- Bug fixes and performance improvements. More info:
-  https://github.com/tldraw/tldraw/releases/tag/v2.0.0-alpha.16
-
-## 2.0.12
-
-- Bug fixes and performance improvements.
-
-## 2.0.11
-
-- Added cloud shape.
-
-## 2.0.10
-
-- Removed the lock option from the highlighter tool.
-- Disabled the styles button for the laser tool on small screens.
-- Fixed mouse cursor after resizing during text creation. We now revert back to the default cursor.
-
-## 2.0.9
-
-- Stability improvements
-
-## 2.0.8
-
-- New highlighter tool!
-- You can now lock shapes.
-- Added vertical align setting to Note shapes.
-- Added reduce motion user preference.
-- Fixed control clicking not working on Mac.
-- Improved translations.
-- Fixed a problem where arrows might cause the extension to crash.
-
-## 2.0.7
-
-- New laser tool!
-- New checkbox shape!
-- Add vertical alignment options to Notes and Geo shapes.
-- Change how horizontal alignment works.
-- Improve exporting and saving to svgs.
-
-## 2.0.6
-
-- Improved appearance of selection for single draw shapes.
-- Improve handling of pixel scale when pasting images.
-- Fixed a bug where pasted tabs wouldn't get converted into spaces.
-- Fixed trailing tab characters in text labels not exporting correctly.
-- Fixed empty text shapes sometimes not getting deleted.
-- Fix a bug where grid mode couldn’t be enabled.
-- Fixed a bug where the pointer location would not update when moving the pointer over an editing shape.
-- Fixed a bug where the wrong default language option could be chosen.
-- Fixed a minor consistency bug when re-doing a shape update.
-- Re-doing a deletion of the current page now correctly navigates back to that page.
-
-## 2.0.5
-
-- Fixed another issue with undo / redo.
-
-## 2.0.4
-
-- Fix issues with undo / redo.
-- Fix an issue with extension getting stuck on the loading screen.
-- Fix an issue with the extension not saving changes in newly created files.
-
-## 2.0.3
-
-- Fix description in package.json.
-
-## 2.0.2
-
-- Add images to README.
-
-## 2.0.1
-
-- Release!
+See [tldraw.dev](https://tldraw.dev/releases) for release notes.
diff --git a/apps/vscode/extension/tsconfig.json b/apps/vscode/extension/tsconfig.json
index 18cb82d36e3b..7f1a0d6448cc 100644
--- a/apps/vscode/extension/tsconfig.json
+++ b/apps/vscode/extension/tsconfig.json
@@ -11,7 +11,7 @@
 		"strict": true,
 		"forceConsistentCasingInFileNames": true,
 		"module": "ESNext",
-		"moduleResolution": "Node",
+		"moduleResolution": "bundler",
 		"resolveJsonModule": true,
 		"noEmit": true,
 		"jsx": "react-jsx",
diff --git a/internal/apps-script/tsconfig.json b/internal/apps-script/tsconfig.json
index c0121845445e..e4929404b74c 100644
--- a/internal/apps-script/tsconfig.json
+++ b/internal/apps-script/tsconfig.json
@@ -8,7 +8,7 @@
 		"noEmit": true,
 		"esModuleInterop": true,
 		"module": "esnext",
-		"moduleResolution": "node",
+		"moduleResolution": "bundler",
 		"resolveJsonModule": true,
 		"isolatedModules": true,
 		"jsx": "preserve",
diff --git a/internal/config/tsconfig.base.json b/internal/config/tsconfig.base.json
index 3ffc84291c28..5fb55fef3495 100644
--- a/internal/config/tsconfig.base.json
+++ b/internal/config/tsconfig.base.json
@@ -17,7 +17,7 @@
 		"lib": ["DOM", "DOM.Iterable", "ESNext"],
 		"module": "esnext",
 		"target": "esnext",
-		"moduleResolution": "node",
+		"moduleResolution": "bundler",
 		"noFallthroughCasesInSwitch": true,
 		"noImplicitAny": true,
 		"noImplicitReturns": true,
diff --git a/package.json b/package.json
index 8620120bcef2..dd6f5fcdcef2 100644
--- a/package.json
+++ b/package.json
@@ -113,8 +113,8 @@
 		"lint-staged": "^15.4.3",
 		"open-cli": "^8.0.0",
 		"oxfmt": "^0.41.0",
-		"oxlint": "^1.56.0",
-		"oxlint-tsgolint": "^0.17.0",
+		"oxlint": "^1.58.0",
+		"oxlint-tsgolint": "^0.18.0",
 		"rimraf": "^4.4.1",
 		"tsx": "^4.19.2",
 		"typescript": "^5.8.3",
diff --git a/packages/editor/src/lib/utils/reparenting.ts b/packages/editor/src/lib/utils/reparenting.ts
index 5d5a752af559..f045ad80c667 100644
--- a/packages/editor/src/lib/utils/reparenting.ts
+++ b/packages/editor/src/lib/utils/reparenting.ts
@@ -103,9 +103,13 @@ export function kickoutOccludedShapes(
 					if (oldParentIndex > -1) {
 						// If the old parent is a direct child of the new parent, then we'll add them above the old parent but below the next sibling.
 						const siblingsIndexAbove = oldParentSiblingIds[oldParentIndex + 1]
-						const indexKeyAbove = siblingsIndexAbove
+						const siblingAboveIndex = siblingsIndexAbove
 							? editor.getShape(siblingsIndexAbove)!.index
-							: getIndexAbove(prevParent.index)
+							: undefined
+						const indexKeyAbove =
+							siblingAboveIndex && siblingAboveIndex > prevParent.index
+								? siblingAboveIndex
+								: getIndexAbove(prevParent.index)
 						insertIndexKey = getIndexBetween(prevParent.index, indexKeyAbove)
 					} else {
 						// If the old parent is not a direct child of the new parent, then we'll add them to the "top" of the new parent's children.
diff --git a/packages/sync-core/src/test/syncFuzz.test.ts b/packages/sync-core/src/test/syncFuzz.test.ts
index 10fa8ba607f9..593160de2989 100644
--- a/packages/sync-core/src/test/syncFuzz.test.ts
+++ b/packages/sync-core/src/test/syncFuzz.test.ts
@@ -290,6 +290,10 @@ test('seed 5279266392988747 - undo/redo page integrity regression', () => {
 	runTest(5279266392988747)
 })
 
+test('seed 8090628137862085 - duplicate index key regression', () => {
+	runTest(8090628137862085)
+})
+
 for (let i = 0; i < NUM_TESTS; i++) {
 	const seed = Math.floor(Math.random() * Number.MAX_SAFE_INTEGER)
 	test(`seed ${seed}`, () => {
diff --git a/packages/tldraw/api-report.api.md b/packages/tldraw/api-report.api.md
index 3678dcde774f..4d71782ff982 100644
--- a/packages/tldraw/api-report.api.md
+++ b/packages/tldraw/api-report.api.md
@@ -3149,6 +3149,8 @@ export interface StylePanelContext {
     // (undocumented)
     onHistoryMark(id: string): void;
     // (undocumented)
+    onOpacityChange(opacity: number): void;
+    // (undocumented)
     onValueChange<T>(style: StyleProp<T>, value: T): void;
     // (undocumented)
     styles: ReadonlySharedStyleMap;
diff --git a/packages/tldraw/src/lib/shapes/arrow/ArrowShapeUtil.tsx b/packages/tldraw/src/lib/shapes/arrow/ArrowShapeUtil.tsx
index a5253322a84d..26853765a0f0 100644
--- a/packages/tldraw/src/lib/shapes/arrow/ArrowShapeUtil.tsx
+++ b/packages/tldraw/src/lib/shapes/arrow/ArrowShapeUtil.tsx
@@ -845,18 +845,20 @@ export class ArrowShapeUtil extends ShapeUtil<TLArrowShape> {
 						shapeId={shape.id}
 						type="arrow"
 						fontFamily={dv.labelFontFamily}
-						fontSize={dv.labelFontSize * shape.props.scale}
+						fontSize={dv.labelFontSize}
 						lineHeight={dv.labelLineHeight}
 						textAlign="center"
 						verticalAlign="middle"
 						labelColor={dv.labelColor}
 						richText={shape.props.richText}
-						textWidth={labelPosition.box.w - dv.labelPadding * 2 * shape.props.scale}
+						textWidth={
+							(labelPosition.box.w - dv.labelPadding * 2 * shape.props.scale) / shape.props.scale
+						}
 						isSelected={isSelected}
 						padding={0}
 						showTextOutline={this.options.showTextOutline}
 						style={{
-							transform: `translate(${labelPosition.box.center.x}px, ${labelPosition.box.center.y}px)`,
+							transform: `translate(${labelPosition.box.center.x}px, ${labelPosition.box.center.y}px) scale(${shape.props.scale})`,
 						}}
 					/>
 				)}
@@ -967,8 +969,8 @@ export class ArrowShapeUtil extends ShapeUtil<TLArrowShape> {
 						y={toDomPrecision(labelBounds.y)}
 						width={labelBounds.w}
 						height={labelBounds.h}
-						rx={dv.labelBorderRadius}
-						ry={dv.labelBorderRadius}
+						rx={dv.labelBorderRadius * shape.props.scale}
+						ry={dv.labelBorderRadius * shape.props.scale}
 					/>
 				)}
 			</g>
@@ -1082,7 +1084,7 @@ export class ArrowShapeUtil extends ShapeUtil<TLArrowShape> {
 					labelBounds.y,
 					labelBounds.w,
 					labelBounds.h,
-					dv.labelBorderRadius
+					dv.labelBorderRadius * shape.props.scale
 				)
 				additionalPaths.push(labelPath)
 			}
diff --git a/packages/tldraw/src/lib/shapes/geo/GeoShapeUtil.tsx b/packages/tldraw/src/lib/shapes/geo/GeoShapeUtil.tsx
index 6bc18f3af25c..7ad93da82e3a 100644
--- a/packages/tldraw/src/lib/shapes/geo/GeoShapeUtil.tsx
+++ b/packages/tldraw/src/lib/shapes/geo/GeoShapeUtil.tsx
@@ -357,9 +357,9 @@ export class GeoShapeUtil extends BaseBoxShapeUtil<TLGeoShape> {
 							shapeId={id}
 							type={type}
 							fontFamily={dv.labelFontFamily}
-							fontSize={dv.labelFontSize * props.scale}
+							fontSize={dv.labelFontSize}
 							lineHeight={dv.labelLineHeight}
-							padding={dv.labelPadding * props.scale}
+							padding={dv.labelPadding}
 							textAlign={dv.labelHorizontalAlign}
 							verticalAlign={dv.labelVerticalAlign}
 							richText={richText}
@@ -367,6 +367,12 @@ export class GeoShapeUtil extends BaseBoxShapeUtil<TLGeoShape> {
 							labelColor={dv.labelColor}
 							wrap
 							showTextOutline={this.options.showTextOutline}
+							style={{
+								transform: `scale(${shape.props.scale})`,
+								transformOrigin: 'top left',
+								width: shape.props.w / shape.props.scale,
+								height: (shape.props.h + props.growY) / shape.props.scale,
+							}}
 						/>
 					</HTMLContainer>
 				)}
diff --git a/packages/tldraw/src/lib/shapes/note/NoteShapeUtil.tsx b/packages/tldraw/src/lib/shapes/note/NoteShapeUtil.tsx
index ebccaeb4db47..a26df33b936f 100644
--- a/packages/tldraw/src/lib/shapes/note/NoteShapeUtil.tsx
+++ b/packages/tldraw/src/lib/shapes/note/NoteShapeUtil.tsx
@@ -390,7 +390,7 @@ export class NoteShapeUtil extends ShapeUtil<TLNoteShape> {
 							shapeId={id}
 							type={type}
 							fontFamily={dv.labelFontFamily}
-							fontSize={(fontSizeAdjustment ?? 1) * dv.labelFontSize * scale}
+							fontSize={(fontSizeAdjustment ?? 1) * dv.labelFontSize}
 							lineHeight={dv.labelLineHeight}
 							textAlign={dv.labelHorizontalAlign}
 							verticalAlign={dv.labelVerticalAlign}
@@ -398,10 +398,16 @@ export class NoteShapeUtil extends ShapeUtil<TLNoteShape> {
 							isSelected={isSelected}
 							labelColor={dv.labelColor}
 							wrap
-							padding={dv.labelPadding * scale}
+							padding={dv.labelPadding}
 							hasCustomTabBehavior
 							showTextOutline={false}
 							onKeyDown={handleKeyDown}
+							style={{
+								transform: `scale(${scale})`,
+								transformOrigin: 'top left',
+								width: dv.noteWidth,
+								height: dv.noteHeight + shape.props.growY,
+							}}
 						/>
 					)}
 				</div>
@@ -739,7 +745,8 @@ function getNoteShadow(id: string, rotation: number, scale: number) {
 	const b = 4 * scale
 	const c = 6 * scale
 	const d = 7 * scale
-	return `0px ${a - lift}px ${a}px -${a}px rgba(15, 23, 31, .6),
+	// Clamped so shadow never goes above the note at small scales (e.g. dynamic size mode at high zoom)
+	return `0px ${Math.max(0, a - lift)}px ${a}px -${a}px rgba(15, 23, 31, .6),
 	0px ${(b + lift * d) * Math.max(0, oy)}px ${c + lift * d}px -${b + lift * c}px rgba(15, 23, 31, ${(0.3 + lift * 0.1).toFixed(2)}),
 	0px ${48 * scale}px ${10 * scale}px -${10 * scale}px inset rgba(15, 23, 44, ${((0.022 + random() * 0.005) * ((1 + oy) / 2)).toFixed(2)})`
 }
diff --git a/packages/tldraw/src/lib/tools/SelectTool/childStates/Idle.ts b/packages/tldraw/src/lib/tools/SelectTool/childStates/Idle.ts
index 23796878a875..904866ccf733 100644
--- a/packages/tldraw/src/lib/tools/SelectTool/childStates/Idle.ts
+++ b/packages/tldraw/src/lib/tools/SelectTool/childStates/Idle.ts
@@ -13,6 +13,7 @@ import {
 	kickoutOccludedShapes,
 	pointInPolygon,
 	toRichText,
+	unsafe__withoutCapture,
 } from '@tldraw/editor'
 import { isOverArrowLabel } from '../../../shapes/arrow/arrowLabel'
 import { getHitShapeOnCanvasPointerDown } from '../../selection-logic/getHitShapeOnCanvasPointerDown'
@@ -47,11 +48,15 @@ export class Idle extends StateNode {
 	}
 
 	override onExit() {
+		this.editor.updateInstanceState({ isChangingStyle: false })
 		cancelUpdateHoveredShapeId(this.editor)
 	}
 
 	override onPointerMove() {
 		updateHoveredShapeId(this.editor)
+		if (unsafe__withoutCapture(() => this.editor.getInstanceState()).isChangingStyle) {
+			this.editor.updateInstanceState({ isChangingStyle: false })
+		}
 	}
 
 	override onPointerDown(info: TLPointerEventInfo) {
@@ -650,6 +655,9 @@ export class Idle extends StateNode {
 
 		if (!ephemeral) this.editor.markHistoryStoppingPoint('nudge shapes')
 
+		// Hide the selection overlay while nudging, same as when changing styles
+		this.editor.updateInstanceState({ isChangingStyle: true })
+
 		const { gridSize } = this.editor.getDocumentSettings()
 
 		const step = this.editor.getInstanceState().isGridMode
diff --git a/packages/tldraw/src/lib/ui/components/StylePanel/DefaultStylePanel.tsx b/packages/tldraw/src/lib/ui/components/StylePanel/DefaultStylePanel.tsx
index 989f80ec3a75..b2efed0fbadc 100644
--- a/packages/tldraw/src/lib/ui/components/StylePanel/DefaultStylePanel.tsx
+++ b/packages/tldraw/src/lib/ui/components/StylePanel/DefaultStylePanel.tsx
@@ -5,7 +5,7 @@ import {
 	useValue,
 } from '@tldraw/editor'
 import classNames from 'classnames'
-import { ReactNode, memo, useCallback, useEffect, useRef } from 'react'
+import { ReactNode, memo, useEffect, useRef } from 'react'
 import { useRelevantStyles } from '../../hooks/useRelevantStyles'
 import { DefaultStylePanelContent } from './DefaultStylePanelContent'
 import { StylePanelContextProvider } from './StylePanelContext'
@@ -31,18 +31,21 @@ export const DefaultStylePanel = memo(function DefaultStylePanel({
 	const ref = useRef<HTMLDivElement>(null)
 	usePassThroughWheelEvents(ref)
 
-	const handlePointerOut = useCallback(() => {
-		if (!isMobile) {
-			editor.updateInstanceState({ isChangingStyle: false })
-		}
-	}, [editor, isMobile])
-
 	const defaultStyles = useRelevantStyles()
 	if (styles === undefined) {
 		styles = defaultStyles
 	}
 
 	useEffect(() => {
+		const elm = ref.current as HTMLDivElement | null
+		if (!elm) return
+
+		function handlePointerMove(event: PointerEvent) {
+			// Prevent pointer move events from propagating to the
+			// canvas when the pointer is over the style panel.
+			event.stopPropagation()
+		}
+
 		function handleKeyDown(event: KeyboardEvent) {
 			if (
 				event.key === 'Escape' &&
@@ -53,10 +56,11 @@ export const DefaultStylePanel = memo(function DefaultStylePanel({
 			}
 		}
 
-		const stylePanelContainerEl = ref.current
-		stylePanelContainerEl?.addEventListener('keydown', handleKeyDown, { capture: true })
+		elm.addEventListener('pointermove', handlePointerMove, { capture: true })
+		elm.addEventListener('keydown', handleKeyDown, { capture: true })
 		return () => {
-			stylePanelContainerEl?.removeEventListener('keydown', handleKeyDown, { capture: true })
+			elm.removeEventListener('pointermove', handlePointerMove, { capture: true })
+			elm.removeEventListener('keydown', handleKeyDown, { capture: true })
 		}
 	}, [editor])
 
@@ -68,7 +72,6 @@ export const DefaultStylePanel = memo(function DefaultStylePanel({
 				className={classNames('tlui-style-panel', { 'tlui-style-panel__wrapper': !isMobile })}
 				data-ismobile={isMobile}
 				data-enhanced-a11y-mode={enhancedA11yMode}
-				onPointerLeave={handlePointerOut}
 			>
 				<StylePanelContextProvider styles={styles}>
 					{children ?? <DefaultStylePanelContent />}
diff --git a/packages/tldraw/src/lib/ui/components/StylePanel/DefaultStylePanelContent.tsx b/packages/tldraw/src/lib/ui/components/StylePanel/DefaultStylePanelContent.tsx
index bc1e26199878..51f0ed582bd8 100644
--- a/packages/tldraw/src/lib/ui/components/StylePanel/DefaultStylePanelContent.tsx
+++ b/packages/tldraw/src/lib/ui/components/StylePanel/DefaultStylePanelContent.tsx
@@ -20,7 +20,6 @@ import {
 } from '@tldraw/editor'
 import React from 'react'
 import { getColorStyleItems, getFontStyleItems, STYLES } from '../../../styles'
-import { useUiEvents } from '../../context/events'
 import { useTranslation } from '../../hooks/useTranslation/useTranslation'
 import { TldrawUiButtonIcon } from '../primitives/Button/TldrawUiButtonIcon'
 import { TldrawUiSlider } from '../primitives/TldrawUiSlider'
@@ -97,26 +96,16 @@ const tldrawSupportedOpacities = [0.1, 0.25, 0.5, 0.75, 1] as const
 /** @public @react */
 export function StylePanelOpacityPicker() {
 	const editor = useEditor()
-	const { onHistoryMark, enhancedA11yMode } = useStylePanelContext()
+	const { onHistoryMark, onOpacityChange, enhancedA11yMode } = useStylePanelContext()
 
 	const opacity = useValue('opacity', () => editor.getSharedOpacity(), [editor])
-	const trackEvent = useUiEvents()
 	const msg = useTranslation()
 
 	const handleOpacityValueChange = React.useCallback(
 		(value: number) => {
-			const item = tldrawSupportedOpacities[value]
-			editor.run(() => {
-				if (editor.isIn('select')) {
-					editor.setOpacityForSelectedShapes(item)
-				}
-				editor.setOpacityForNextShapes(item)
-				editor.updateInstanceState({ isChangingStyle: true })
-			})
-
-			trackEvent('set-style', { source: 'style-panel', id: 'opacity', value })
+			onOpacityChange(tldrawSupportedOpacities[value])
 		},
-		[editor, trackEvent]
+		[onOpacityChange]
 	)
 
 	if (opacity === undefined) return null
diff --git a/packages/tldraw/src/lib/ui/components/StylePanel/StylePanelContext.tsx b/packages/tldraw/src/lib/ui/components/StylePanel/StylePanelContext.tsx
index b873bea22b8f..5fcd1d9b8cb8 100644
--- a/packages/tldraw/src/lib/ui/components/StylePanel/StylePanelContext.tsx
+++ b/packages/tldraw/src/lib/ui/components/StylePanel/StylePanelContext.tsx
@@ -1,4 +1,10 @@
-import { ReadonlySharedStyleMap, StyleProp, useEditor, useValue } from '@tldraw/editor'
+import {
+	ReadonlySharedStyleMap,
+	StyleProp,
+	unsafe__withoutCapture,
+	useEditor,
+	useValue,
+} from '@tldraw/editor'
 import { createContext, useCallback, useContext } from 'react'
 import { useUiEvents } from '../../context/events'
 
@@ -8,6 +14,7 @@ export interface StylePanelContext {
 	enhancedA11yMode: boolean
 	onHistoryMark(id: string): void
 	onValueChange<T>(style: StyleProp<T>, value: T): void
+	onOpacityChange(opacity: number): void
 }
 const StylePanelContext = createContext<null | StylePanelContext>(null)
 
@@ -28,11 +35,20 @@ export function StylePanelContextProvider({ children, styles }: StylePanelContex
 	])
 	const onValueChange = useCallback(
 		function <T>(style: StyleProp<T>, value: T) {
+			// If the user is holding down the accelerator key (Ctrl on Windows/Linux, Cmd on Mac)
+			// while shapes are selected, interpret that as a wish to change the style for their
+			// current selected shapes but not for the next shapes.
+			const skipNextShapeStyle = unsafe__withoutCapture(
+				() => editor.getSelectedShapeIds().length > 0 && editor.inputs.getAccelKey()
+			)
+
 			editor.run(() => {
 				if (editor.isIn('select')) {
 					editor.setStyleForSelectedShapes(style, value)
 				}
-				editor.setStyleForNextShapes(style, value)
+				if (!skipNextShapeStyle) {
+					editor.setStyleForNextShapes(style, value)
+				}
 				editor.updateInstanceState({ isChangingStyle: true })
 			})
 
@@ -41,6 +57,27 @@ export function StylePanelContextProvider({ children, styles }: StylePanelContex
 		[editor, trackEvent]
 	)
 
+	const onOpacityChange = useCallback(
+		function (opacity: number) {
+			const skipNextShapeStyle = unsafe__withoutCapture(
+				() => editor.getSelectedShapeIds().length > 0 && editor.inputs.getAccelKey()
+			)
+
+			editor.run(() => {
+				if (editor.isIn('select')) {
+					editor.setOpacityForSelectedShapes(opacity)
+				}
+				if (!skipNextShapeStyle) {
+					editor.setOpacityForNextShapes(opacity)
+				}
+				editor.updateInstanceState({ isChangingStyle: true })
+			})
+
+			trackEvent('set-style', { source: 'style-panel', id: 'opacity', value: opacity })
+		},
+		[editor, trackEvent]
+	)
+
 	return (
 		<StylePanelContext.Provider
 			value={{
@@ -48,6 +85,7 @@ export function StylePanelContextProvider({ children, styles }: StylePanelContex
 				enhancedA11yMode,
 				onHistoryMark,
 				onValueChange,
+				onOpacityChange,
 			}}
 		>
 			{children}
diff --git a/packages/tldraw/src/test/commands/nudge.test.ts b/packages/tldraw/src/test/commands/nudge.test.ts
index 080c067f02ad..549260a8893d 100644
--- a/packages/tldraw/src/test/commands/nudge.test.ts
+++ b/packages/tldraw/src/test/commands/nudge.test.ts
@@ -298,6 +298,42 @@ describe('When nudging a rotated shape...', () => {
 	})
 })
 
+describe('When nudging, the selection overlay is hidden...', () => {
+	it('Sets isChangingStyle to true while nudging', () => {
+		editor.setSelectedShapes([ids.boxA])
+		expect(editor.getInstanceState().isChangingStyle).toBe(false)
+
+		editor.keyDown('ArrowUp')
+		expect(editor.getInstanceState().isChangingStyle).toBe(true)
+		editor.keyUp('ArrowUp')
+	})
+
+	it('Clears isChangingStyle when the pointer moves over the canvas', () => {
+		editor.setSelectedShapes([ids.boxA])
+
+		editor.keyDown('ArrowUp')
+		expect(editor.getInstanceState().isChangingStyle).toBe(true)
+		editor.keyUp('ArrowUp')
+
+		editor.pointerMove(50, 50)
+		expect(editor.getInstanceState().isChangingStyle).toBe(false)
+	})
+
+	it('Sets isChangingStyle to true on key repeat', () => {
+		editor.setSelectedShapes([ids.boxA])
+
+		editor.keyDown('ArrowRight')
+		expect(editor.getInstanceState().isChangingStyle).toBe(true)
+
+		// Reset it manually to verify repeat sets it again
+		editor.updateInstanceState({ isChangingStyle: false })
+
+		editor.keyRepeat('ArrowRight')
+		expect(editor.getInstanceState().isChangingStyle).toBe(true)
+		editor.keyUp('ArrowRight')
+	})
+})
+
 describe('When nudging multiple rotated shapes...', () => {
 	it('Moves the page point correctly', () => {
 		editor.setSelectedShapes([ids.boxA, ids.boxB])
diff --git a/templates/agent/tsconfig.json b/templates/agent/tsconfig.json
index a4d8a2384522..6cce8f70f976 100644
--- a/templates/agent/tsconfig.json
+++ b/templates/agent/tsconfig.json
@@ -16,7 +16,7 @@
 		"lib": ["DOM", "DOM.Iterable", "ESNext"],
 		"module": "esnext",
 		"target": "esnext",
-		"moduleResolution": "node",
+		"moduleResolution": "bundler",
 		"noFallthroughCasesInSwitch": true,
 		"noImplicitAny": true,
 		"noImplicitReturns": true,
diff --git a/templates/chat/tsconfig.json b/templates/chat/tsconfig.json
index bde84ceac637..76b8a5bdf71f 100644
--- a/templates/chat/tsconfig.json
+++ b/templates/chat/tsconfig.json
@@ -1,23 +1,48 @@
 {
-	"compilerOptions": {
-		"lib": ["DOM", "DOM.Iterable", "ESNext"],
-		"allowJs": true,
-		"skipLibCheck": true,
-		"strict": true,
-		"forceConsistentCasingInFileNames": true,
-		"noEmit": true,
-		"esModuleInterop": true,
-		"module": "esnext",
-		"moduleResolution": "node",
-		"resolveJsonModule": true,
-		"isolatedModules": true,
-		"jsx": "preserve",
-		"incremental": true,
-		"plugins": [{ "name": "next" }],
-		"experimentalDecorators": true,
-		"paths": { "@/*": ["./src/*"] }
-	},
-	"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", "next.config.mjs"],
-	"exclude": ["node_modules"],
-	"references": [{ "path": "../../packages/tldraw" }]
+  "compilerOptions": {
+    "lib": [
+      "DOM",
+      "DOM.Iterable",
+      "ESNext"
+    ],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve",
+    "incremental": true,
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ],
+    "experimentalDecorators": true,
+    "paths": {
+      "@/*": [
+        "./src/*"
+      ]
+    },
+    "target": "ES2018"
+  },
+  "include": [
+    "next-env.d.ts",
+    "**/*.ts",
+    "**/*.tsx",
+    ".next/types/**/*.ts",
+    "next.config.mjs"
+  ],
+  "exclude": [
+    "node_modules"
+  ],
+  "references": [
+    {
+      "path": "../../packages/tldraw"
+    }
+  ]
 }
diff --git a/templates/nextjs/tsconfig.json b/templates/nextjs/tsconfig.json
index bde84ceac637..76b8a5bdf71f 100644
--- a/templates/nextjs/tsconfig.json
+++ b/templates/nextjs/tsconfig.json
@@ -1,23 +1,48 @@
 {
-	"compilerOptions": {
-		"lib": ["DOM", "DOM.Iterable", "ESNext"],
-		"allowJs": true,
-		"skipLibCheck": true,
-		"strict": true,
-		"forceConsistentCasingInFileNames": true,
-		"noEmit": true,
-		"esModuleInterop": true,
-		"module": "esnext",
-		"moduleResolution": "node",
-		"resolveJsonModule": true,
-		"isolatedModules": true,
-		"jsx": "preserve",
-		"incremental": true,
-		"plugins": [{ "name": "next" }],
-		"experimentalDecorators": true,
-		"paths": { "@/*": ["./src/*"] }
-	},
-	"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", "next.config.mjs"],
-	"exclude": ["node_modules"],
-	"references": [{ "path": "../../packages/tldraw" }]
+  "compilerOptions": {
+    "lib": [
+      "DOM",
+      "DOM.Iterable",
+      "ESNext"
+    ],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve",
+    "incremental": true,
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ],
+    "experimentalDecorators": true,
+    "paths": {
+      "@/*": [
+        "./src/*"
+      ]
+    },
+    "target": "ES2018"
+  },
+  "include": [
+    "next-env.d.ts",
+    "**/*.ts",
+    "**/*.tsx",
+    ".next/types/**/*.ts",
+    "next.config.mjs"
+  ],
+  "exclude": [
+    "node_modules"
+  ],
+  "references": [
+    {
+      "path": "../../packages/tldraw"
+    }
+  ]
 }
diff --git a/yarn.lock b/yarn.lock
index 4aa95189c894..3c21d0e5f365 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6838,177 +6838,177 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxlint-tsgolint/darwin-arm64@npm:0.17.0":
-  version: 0.17.0
-  resolution: "@oxlint-tsgolint/darwin-arm64@npm:0.17.0"
+"@oxlint-tsgolint/darwin-arm64@npm:0.18.1":
+  version: 0.18.1
+  resolution: "@oxlint-tsgolint/darwin-arm64@npm:0.18.1"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@oxlint-tsgolint/darwin-x64@npm:0.17.0":
-  version: 0.17.0
-  resolution: "@oxlint-tsgolint/darwin-x64@npm:0.17.0"
+"@oxlint-tsgolint/darwin-x64@npm:0.18.1":
+  version: 0.18.1
+  resolution: "@oxlint-tsgolint/darwin-x64@npm:0.18.1"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@oxlint-tsgolint/linux-arm64@npm:0.17.0":
-  version: 0.17.0
-  resolution: "@oxlint-tsgolint/linux-arm64@npm:0.17.0"
+"@oxlint-tsgolint/linux-arm64@npm:0.18.1":
+  version: 0.18.1
+  resolution: "@oxlint-tsgolint/linux-arm64@npm:0.18.1"
   conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
 
-"@oxlint-tsgolint/linux-x64@npm:0.17.0":
-  version: 0.17.0
-  resolution: "@oxlint-tsgolint/linux-x64@npm:0.17.0"
+"@oxlint-tsgolint/linux-x64@npm:0.18.1":
+  version: 0.18.1
+  resolution: "@oxlint-tsgolint/linux-x64@npm:0.18.1"
   conditions: os=linux & cpu=x64
   languageName: node
   linkType: hard
 
-"@oxlint-tsgolint/win32-arm64@npm:0.17.0":
-  version: 0.17.0
-  resolution: "@oxlint-tsgolint/win32-arm64@npm:0.17.0"
+"@oxlint-tsgolint/win32-arm64@npm:0.18.1":
+  version: 0.18.1
+  resolution: "@oxlint-tsgolint/win32-arm64@npm:0.18.1"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@oxlint-tsgolint/win32-x64@npm:0.17.0":
-  version: 0.17.0
-  resolution: "@oxlint-tsgolint/win32-x64@npm:0.17.0"
+"@oxlint-tsgolint/win32-x64@npm:0.18.1":
+  version: 0.18.1
+  resolution: "@oxlint-tsgolint/win32-x64@npm:0.18.1"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@oxlint/binding-android-arm-eabi@npm:1.56.0":
-  version: 1.56.0
-  resolution: "@oxlint/binding-android-arm-eabi@npm:1.56.0"
+"@oxlint/binding-android-arm-eabi@npm:1.58.0":
+  version: 1.58.0
+  resolution: "@oxlint/binding-android-arm-eabi@npm:1.58.0"
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
 
-"@oxlint/binding-android-arm64@npm:1.56.0":
-  version: 1.56.0
-  resolution: "@oxlint/binding-android-arm64@npm:1.56.0"
+"@oxlint/binding-android-arm64@npm:1.58.0":
+  version: 1.58.0
+  resolution: "@oxlint/binding-android-arm64@npm:1.58.0"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
 
-"@oxlint/binding-darwin-arm64@npm:1.56.0":
-  version: 1.56.0
-  resolution: "@oxlint/binding-darwin-arm64@npm:1.56.0"
+"@oxlint/binding-darwin-arm64@npm:1.58.0":
+  version: 1.58.0
+  resolution: "@oxlint/binding-darwin-arm64@npm:1.58.0"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@oxlint/binding-darwin-x64@npm:1.56.0":
-  version: 1.56.0
-  resolution: "@oxlint/binding-darwin-x64@npm:1.56.0"
+"@oxlint/binding-darwin-x64@npm:1.58.0":
+  version: 1.58.0
+  resolution: "@oxlint/binding-darwin-x64@npm:1.58.0"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@oxlint/binding-freebsd-x64@npm:1.56.0":
-  version: 1.56.0
-  resolution: "@oxlint/binding-freebsd-x64@npm:1.56.0"
+"@oxlint/binding-freebsd-x64@npm:1.58.0":
+  version: 1.58.0
+  resolution: "@oxlint/binding-freebsd-x64@npm:1.58.0"
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@oxlint/binding-linux-arm-gnueabihf@npm:1.56.0":
-  version: 1.56.0
-  resolution: "@oxlint/binding-linux-arm-gnueabihf@npm:1.56.0"
+"@oxlint/binding-linux-arm-gnueabihf@npm:1.58.0":
+  version: 1.58.0
+  resolution: "@oxlint/binding-linux-arm-gnueabihf@npm:1.58.0"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@oxlint/binding-linux-arm-musleabihf@npm:1.56.0":
-  version: 1.56.0
-  resolution: "@oxlint/binding-linux-arm-musleabihf@npm:1.56.0"
+"@oxlint/binding-linux-arm-musleabihf@npm:1.58.0":
+  version: 1.58.0
+  resolution: "@oxlint/binding-linux-arm-musleabihf@npm:1.58.0"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@oxlint/binding-linux-arm64-gnu@npm:1.56.0":
-  version: 1.56.0
-  resolution: "@oxlint/binding-linux-arm64-gnu@npm:1.56.0"
+"@oxlint/binding-linux-arm64-gnu@npm:1.58.0":
+  version: 1.58.0
+  resolution: "@oxlint/binding-linux-arm64-gnu@npm:1.58.0"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@oxlint/binding-linux-arm64-musl@npm:1.56.0":
-  version: 1.56.0
-  resolution: "@oxlint/binding-linux-arm64-musl@npm:1.56.0"
+"@oxlint/binding-linux-arm64-musl@npm:1.58.0":
+  version: 1.58.0
+  resolution: "@oxlint/binding-linux-arm64-musl@npm:1.58.0"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@oxlint/binding-linux-ppc64-gnu@npm:1.56.0":
-  version: 1.56.0
-  resolution: "@oxlint/binding-linux-ppc64-gnu@npm:1.56.0"
+"@oxlint/binding-linux-ppc64-gnu@npm:1.58.0":
+  version: 1.58.0
+  resolution: "@oxlint/binding-linux-ppc64-gnu@npm:1.58.0"
   conditions: os=linux & cpu=ppc64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@oxlint/binding-linux-riscv64-gnu@npm:1.56.0":
-  version: 1.56.0
-  resolution: "@oxlint/binding-linux-riscv64-gnu@npm:1.56.0"
+"@oxlint/binding-linux-riscv64-gnu@npm:1.58.0":
+  version: 1.58.0
+  resolution: "@oxlint/binding-linux-riscv64-gnu@npm:1.58.0"
   conditions: os=linux & cpu=riscv64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@oxlint/binding-linux-riscv64-musl@npm:1.56.0":
-  version: 1.56.0
-  resolution: "@oxlint/binding-linux-riscv64-musl@npm:1.56.0"
+"@oxlint/binding-linux-riscv64-musl@npm:1.58.0":
+  version: 1.58.0
+  resolution: "@oxlint/binding-linux-riscv64-musl@npm:1.58.0"
   conditions: os=linux & cpu=riscv64 & libc=musl
   languageName: node
   linkType: hard
 
-"@oxlint/binding-linux-s390x-gnu@npm:1.56.0":
-  version: 1.56.0
-  resolution: "@oxlint/binding-linux-s390x-gnu@npm:1.56.0"
+"@oxlint/binding-linux-s390x-gnu@npm:1.58.0":
+  version: 1.58.0
+  resolution: "@oxlint/binding-linux-s390x-gnu@npm:1.58.0"
   conditions: os=linux & cpu=s390x & libc=glibc
   languageName: node
   linkType: hard
 
-"@oxlint/binding-linux-x64-gnu@npm:1.56.0":
-  version: 1.56.0
-  resolution: "@oxlint/binding-linux-x64-gnu@npm:1.56.0"
+"@oxlint/binding-linux-x64-gnu@npm:1.58.0":
+  version: 1.58.0
+  resolution: "@oxlint/binding-linux-x64-gnu@npm:1.58.0"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@oxlint/binding-linux-x64-musl@npm:1.56.0":
-  version: 1.56.0
-  resolution: "@oxlint/binding-linux-x64-musl@npm:1.56.0"
+"@oxlint/binding-linux-x64-musl@npm:1.58.0":
+  version: 1.58.0
+  resolution: "@oxlint/binding-linux-x64-musl@npm:1.58.0"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@oxlint/binding-openharmony-arm64@npm:1.56.0":
-  version: 1.56.0
-  resolution: "@oxlint/binding-openharmony-arm64@npm:1.56.0"
+"@oxlint/binding-openharmony-arm64@npm:1.58.0":
+  version: 1.58.0
+  resolution: "@oxlint/binding-openharmony-arm64@npm:1.58.0"
   conditions: os=openharmony & cpu=arm64
   languageName: node
   linkType: hard
 
-"@oxlint/binding-win32-arm64-msvc@npm:1.56.0":
-  version: 1.56.0
-  resolution: "@oxlint/binding-win32-arm64-msvc@npm:1.56.0"
+"@oxlint/binding-win32-arm64-msvc@npm:1.58.0":
+  version: 1.58.0
+  resolution: "@oxlint/binding-win32-arm64-msvc@npm:1.58.0"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@oxlint/binding-win32-ia32-msvc@npm:1.56.0":
-  version: 1.56.0
-  resolution: "@oxlint/binding-win32-ia32-msvc@npm:1.56.0"
+"@oxlint/binding-win32-ia32-msvc@npm:1.58.0":
+  version: 1.58.0
+  resolution: "@oxlint/binding-win32-ia32-msvc@npm:1.58.0"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@oxlint/binding-win32-x64-msvc@npm:1.56.0":
-  version: 1.56.0
-  resolution: "@oxlint/binding-win32-x64-msvc@npm:1.56.0"
+"@oxlint/binding-win32-x64-msvc@npm:1.58.0":
+  version: 1.58.0
+  resolution: "@oxlint/binding-win32-x64-msvc@npm:1.58.0"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
@@ -11266,8 +11266,8 @@ __metadata:
     mime: "npm:^4.0.6"
     open-cli: "npm:^8.0.0"
     oxfmt: "npm:^0.41.0"
-    oxlint: "npm:^1.56.0"
-    oxlint-tsgolint: "npm:^0.17.0"
+    oxlint: "npm:^1.58.0"
+    oxlint-tsgolint: "npm:^0.18.0"
     purgecss: "npm:^5.0.0"
     rimraf: "npm:^4.4.1"
     svgo: "npm:^3.3.3"
@@ -24474,16 +24474,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"oxlint-tsgolint@npm:^0.17.0":
-  version: 0.17.0
-  resolution: "oxlint-tsgolint@npm:0.17.0"
+"oxlint-tsgolint@npm:^0.18.0":
+  version: 0.18.1
+  resolution: "oxlint-tsgolint@npm:0.18.1"
   dependencies:
-    "@oxlint-tsgolint/darwin-arm64": "npm:0.17.0"
-    "@oxlint-tsgolint/darwin-x64": "npm:0.17.0"
-    "@oxlint-tsgolint/linux-arm64": "npm:0.17.0"
-    "@oxlint-tsgolint/linux-x64": "npm:0.17.0"
-    "@oxlint-tsgolint/win32-arm64": "npm:0.17.0"
-    "@oxlint-tsgolint/win32-x64": "npm:0.17.0"
+    "@oxlint-tsgolint/darwin-arm64": "npm:0.18.1"
+    "@oxlint-tsgolint/darwin-x64": "npm:0.18.1"
+    "@oxlint-tsgolint/linux-arm64": "npm:0.18.1"
+    "@oxlint-tsgolint/linux-x64": "npm:0.18.1"
+    "@oxlint-tsgolint/win32-arm64": "npm:0.18.1"
+    "@oxlint-tsgolint/win32-x64": "npm:0.18.1"
   dependenciesMeta:
     "@oxlint-tsgolint/darwin-arm64":
       optional: true
@@ -24499,35 +24499,35 @@ __metadata:
       optional: true
   bin:
     tsgolint: bin/tsgolint.js
-  checksum: 10/e292d224c488555ff473943a46ae24955c26a98f5fbd1f5560d93b060d418ff84d8109179f1bb7280ab42d72bb6e3f62225b399fad87ec0902954d9d8faf4529
-  languageName: node
-  linkType: hard
-
-"oxlint@npm:^1.56.0":
-  version: 1.56.0
-  resolution: "oxlint@npm:1.56.0"
-  dependencies:
-    "@oxlint/binding-android-arm-eabi": "npm:1.56.0"
-    "@oxlint/binding-android-arm64": "npm:1.56.0"
-    "@oxlint/binding-darwin-arm64": "npm:1.56.0"
-    "@oxlint/binding-darwin-x64": "npm:1.56.0"
-    "@oxlint/binding-freebsd-x64": "npm:1.56.0"
-    "@oxlint/binding-linux-arm-gnueabihf": "npm:1.56.0"
-    "@oxlint/binding-linux-arm-musleabihf": "npm:1.56.0"
-    "@oxlint/binding-linux-arm64-gnu": "npm:1.56.0"
-    "@oxlint/binding-linux-arm64-musl": "npm:1.56.0"
-    "@oxlint/binding-linux-ppc64-gnu": "npm:1.56.0"
-    "@oxlint/binding-linux-riscv64-gnu": "npm:1.56.0"
-    "@oxlint/binding-linux-riscv64-musl": "npm:1.56.0"
-    "@oxlint/binding-linux-s390x-gnu": "npm:1.56.0"
-    "@oxlint/binding-linux-x64-gnu": "npm:1.56.0"
-    "@oxlint/binding-linux-x64-musl": "npm:1.56.0"
-    "@oxlint/binding-openharmony-arm64": "npm:1.56.0"
-    "@oxlint/binding-win32-arm64-msvc": "npm:1.56.0"
-    "@oxlint/binding-win32-ia32-msvc": "npm:1.56.0"
-    "@oxlint/binding-win32-x64-msvc": "npm:1.56.0"
-  peerDependencies:
-    oxlint-tsgolint: ">=0.15.0"
+  checksum: 10/48a51f5d619b8a4a7b3eee5fff2b5ac6e2ed6cc06b825d13ee860cd870ea3221af1ca0874253cb908a64dbd85be717b5fa3503d2ec6cf0e211c3d81c0a93cd5c
+  languageName: node
+  linkType: hard
+
+"oxlint@npm:^1.58.0":
+  version: 1.58.0
+  resolution: "oxlint@npm:1.58.0"
+  dependencies:
+    "@oxlint/binding-android-arm-eabi": "npm:1.58.0"
+    "@oxlint/binding-android-arm64": "npm:1.58.0"
+    "@oxlint/binding-darwin-arm64": "npm:1.58.0"
+    "@oxlint/binding-darwin-x64": "npm:1.58.0"
+    "@oxlint/binding-freebsd-x64": "npm:1.58.0"
+    "@oxlint/binding-linux-arm-gnueabihf": "npm:1.58.0"
+    "@oxlint/binding-linux-arm-musleabihf": "npm:1.58.0"
+    "@oxlint/binding-linux-arm64-gnu": "npm:1.58.0"
+    "@oxlint/binding-linux-arm64-musl": "npm:1.58.0"
+    "@oxlint/binding-linux-ppc64-gnu": "npm:1.58.0"
+    "@oxlint/binding-linux-riscv64-gnu": "npm:1.58.0"
+    "@oxlint/binding-linux-riscv64-musl": "npm:1.58.0"
+    "@oxlint/binding-linux-s390x-gnu": "npm:1.58.0"
+    "@oxlint/binding-linux-x64-gnu": "npm:1.58.0"
+    "@oxlint/binding-linux-x64-musl": "npm:1.58.0"
+    "@oxlint/binding-openharmony-arm64": "npm:1.58.0"
+    "@oxlint/binding-win32-arm64-msvc": "npm:1.58.0"
+    "@oxlint/binding-win32-ia32-msvc": "npm:1.58.0"
+    "@oxlint/binding-win32-x64-msvc": "npm:1.58.0"
+  peerDependencies:
+    oxlint-tsgolint: ">=0.18.0"
   dependenciesMeta:
     "@oxlint/binding-android-arm-eabi":
       optional: true
@@ -24572,7 +24572,7 @@ __metadata:
       optional: true
   bin:
     oxlint: bin/oxlint
-  checksum: 10/027cfc4b5e286c7ccf7fd415d019d791f224fcc8aef14fb63a4a6aab486d669b427899c8ce7812434f10c8219d51aea20f0bb3c4b996c919d0c8b2c3bde07082
+  checksum: 10/2b2395b2fcda6fc79d367fe57620e18440d0c7b97774a3c6d548e41f9f484e500e9173957e58c007579a2dd8fce609b657154495602b621a2c810531cc37ad4a
   languageName: node
   linkType: hard