[squashme] rebase changes again

Author: gnidan

packages/web/package.json

@@ -22,8 +22,6 @@
     "@docusaurus/tsconfig": "^3.4.0",
     "@docusaurus/types": "^3.4.0",
     "@ethdebug/format": "^0.1.0-0",
-    "@ethdebug/materials": "^0.1.0-0",
-    "@ethdebug/programs": "^0.1.0-0",
     "@fortawesome/fontawesome-svg-core": "^6.5.1",
     "@fortawesome/free-brands-svg-icons": "^6.5.1",
     "@fortawesome/free-solid-svg-icons": "^6.5.1",

packages/web/src/theme/ProgramExample/Opcodes.tsx

@@ -1,8 +1,7 @@
 import React, { useEffect, useState } from "react";
 import { useProgramExampleContext } from "./ProgramExampleContext";
 
-import { Data } from "@ethdebug/materials";
-import { Program } from "@ethdebug/programs";
+import { Data, Program } from "@ethdebug/format";
 
 import "./Opcodes.css";
 

packages/web/src/theme/ProgramExample/ProgramExampleContext.tsx

@@ -1,7 +1,6 @@
 import React, { createContext, useContext, useState, useEffect } from "react";
 
-import { Program } from "@ethdebug/programs";
-import { Data, Materials } from "@ethdebug/materials";
+import { Data, Materials, Program } from "@ethdebug/format";
 import { computeOffsets } from "./offsets";
 import { type DynamicInstruction, resolveDynamicInstruction } from "./dynamic";
 

packages/web/src/theme/ProgramExample/SourceContents.tsx

@@ -10,8 +10,7 @@ import "./SourceContents.css";
 import type * as Shiki from "shiki/core";
 import { useProgramExampleContext } from "./ProgramExampleContext";
 
-import { Materials } from "@ethdebug/materials";
-import { Program } from "@ethdebug/programs";
+import { Materials, Program } from "@ethdebug/format";
 
 export function SourceContents(
   props: Omit<ShikiCodeBlockProps, "code" | "decorations">

packages/web/src/theme/ProgramExample/Variables.tsx

@@ -3,8 +3,8 @@ import Admonition from "@theme/Admonition";
 import Link from "@docusaurus/Link";
 import { useProgramExampleContext } from "./ProgramExampleContext";
 
+import { Program } from "@ethdebug/format";
 import { ShikiCodeBlock } from "@theme/ShikiCodeBlock";
-import { Program } from "@ethdebug/programs";
 
 export function Variables(): JSX.Element {
   const { highlightedInstruction } = useProgramExampleContext();

packages/web/src/theme/ProgramExample/dynamic.ts

@@ -1,5 +1,4 @@
-import { Materials } from "@ethdebug/materials";
-import { Program } from "@ethdebug/programs";
+import { Program, Materials } from "@ethdebug/format";
 
 export type DynamicInstruction =
   & Omit<Program.Instruction, "context" | "operation">

packages/web/src/theme/ProgramExample/offsets.ts

@@ -1,5 +1,4 @@
-import { Data } from "@ethdebug/materials";
-import { Program } from "@ethdebug/programs";
+import { Data, Program } from "@ethdebug/format";
 
 // define base generic instruction since other parts of this module
 // allow dynamic contexts and such