Replaced Tailwind with Bootstrap

.vscode/tasks.json

@@ -134,7 +134,7 @@
     {
       "label": "VSCode: Watch tutorial",
       "type": "npm",
-      "script": "watch:tailwind",
+      "script": "watch",
       "isBackground": true,
       "presentation": {
         "reveal": "never"

netlify.toml

@@ -1,5 +1,6 @@
 # Netlify configuration file for building and deploying the Cursorless website.
 # Read by Netlify GitHub app.
+# https://app.netlify.com/projects/cursorless/deploys
 
 [build]
   command = "./scripts/build-and-assemble-website.sh"

package.json

@@ -51,7 +51,6 @@
     "eslint-plugin-unicorn": "^63.0.0",
     "eslint-plugin-unused-imports": "^4.4.1",
     "prettier": "^3.8.1",
-    "prettier-plugin-tailwindcss": "^0.7.2",
     "syncpack": "^14.2.0",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",

packages/cheatsheet-local/index.html

@@ -5,7 +5,6 @@
     <title>Cursorless Cheatsheet</title>
 
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="icon" type="image/x-icon" href="./src/favicon.ico" />
     <script id="cheatsheet-data">
       // Dummy data for use in debugging
       document.cheatsheetInfo = __FAKE_CHEATSHEET_INFO__;

packages/cheatsheet-local/package.json

@@ -13,36 +13,29 @@
       "default": "./out/index.js"
     }
   },
-  "postcss": {
-    "plugins": {
-      "@tailwindcss/postcss": {}
-    }
-  },
   "scripts": {
     "test": "jest",
     "compile": "tsc --build",
     "watch": "tsc --build --watch",
-    "build": "pnpm build:prod",
+    "serve": "vite serve",
+    "preview": "vite preview",
+    "build": "vite build",
     "build:dev": "vite build --mode development",
-    "build:prod": "vite build --mode production",
     "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
   },
   "dependencies": {
     "@cursorless/cheatsheet": "workspace:*",
     "@cursorless/common": "workspace:*",
-    "preact": "^10.29.0",
-    "tslib": "^2.8.1"
+    "bootstrap": "^5.3.8",
+    "preact": "^10.29.0"
   },
   "devDependencies": {
-    "@preact/preset-vite": "^2.10.3",
-    "@tailwindcss/postcss": "^4.2.1",
     "@types/jest": "^30.0.0",
     "@types/node": "^24.12.0",
     "jest": "^30.3.0",
-    "postcss": "^8.5.8",
-    "tailwindcss": "^4.2.1",
     "typescript": "^5.9.3",
     "vite": "^8.0.0",
+    "vite-plugin-purgecss": "^0.2.13",
     "vite-plugin-singlefile": "^2.3.0"
   }
 }

packages/cheatsheet-local/src/app/app.tsx → packages/cheatsheet-local/src/app.tsx

@@ -1,5 +1,5 @@
 import type { CheatsheetInfo } from "@cursorless/cheatsheet";
-import { CheatsheetPage } from "@cursorless/cheatsheet";
+import { Cheatsheet } from "@cursorless/cheatsheet";
 import "./styles.css";
 
 declare global {
@@ -16,5 +16,5 @@ declare global {
 }
 
 export function App() {
-  return <CheatsheetPage cheatsheetInfo={document.cheatsheetInfo} />;
+  return <Cheatsheet cheatsheetInfo={document.cheatsheetInfo} />;
 }

packages/cheatsheet-local/src/index.tsx

@@ -1,6 +1,6 @@
 import { render } from "preact";
 import { StrictMode } from "preact/compat";
-import { App } from "./app/app";
+import { App } from "./app";
 
 render(
   <StrictMode>

packages/cheatsheet-local/src/styles.css

@@ -0,0 +1 @@
+@import "bootstrap/dist/css/bootstrap.min.css";

packages/cheatsheet-local/src/app/app.spec.tsx → packages/cheatsheet-local/src/test/app.spec.tsx

@@ -1,7 +1,7 @@
 import { fakeCheatsheetInfo } from "@cursorless/cheatsheet";
 import { render } from "preact";
 import { act } from "preact/test-utils";
-import { App } from "./app";
+import { App } from "../app";
 
 describe("App", () => {
   beforeEach(() => {

packages/cheatsheet-local/vite.config.ts

@@ -1,20 +1,25 @@
-import { fakeCheatsheetInfo } from "@cursorless/cheatsheet";
-import { viteHtmlParams } from "@cursorless/common";
-import preact from "@preact/preset-vite";
-import { defineConfig } from "vite";
+import { defaultCheatsheetInfo } from "@cursorless/cheatsheet";
+import { viteHtmlParams, vitePreactAlias } from "@cursorless/common";
+import { defineConfig, type UserConfig } from "vite";
+import purgeCss from "vite-plugin-purgecss";
 import { viteSingleFile } from "vite-plugin-singlefile";
 
-export default defineConfig(() => {
+export default defineConfig((): UserConfig => {
   return {
     build: {
       outDir: "dist",
     },
 
+    resolve: {
+      conditions: ["cursorless:bundler"],
+      alias: vitePreactAlias,
+    },
+
     plugins: [
-      preact(),
+      purgeCss({}),
       viteSingleFile(),
       viteHtmlParams({
-        FAKE_CHEATSHEET_INFO: JSON.stringify(fakeCheatsheetInfo),
+        FAKE_CHEATSHEET_INFO: JSON.stringify(defaultCheatsheetInfo),
       }),
     ],
   };

packages/cheatsheet/jest.config.ts

@@ -4,7 +4,10 @@ import { preactModuleNameMapper } from "@cursorless/common";
 const config: Config = {
   preset: "ts-jest",
   testEnvironment: "jsdom",
-  moduleNameMapper: preactModuleNameMapper,
+  moduleNameMapper: {
+    ...preactModuleNameMapper,
+    "\\.(css|scss)$": "<rootDir>/src/test/styleMock.ts",
+  },
 };
 
 export default config;

packages/cheatsheet/package.json

@@ -27,10 +27,8 @@
   },
   "dependencies": {
     "@cursorless/common": "workspace:*",
-    "@fortawesome/fontawesome-svg-core": "^7.2.0",
-    "@fortawesome/free-solid-svg-icons": "^7.2.0",
-    "@fortawesome/react-fontawesome": "^3.2.0",
     "preact": "^10.29.0",
+    "react-bootstrap-icons": "^1.11.6",
     "react-use": "^17.6.0"
   },
   "devDependencies": {

packages/cheatsheet/src/index.ts

@@ -1,4 +1,4 @@
-export * from "./lib/CheatsheetPage";
-export * from "./lib/CheatsheetInfo";
-export * from "./lib/fakeCheatsheetInfo";
+export * from "./lib/Cheatsheet";
+export * from "./lib/cheatsheet.types";
+export * from "./lib/utils/fakeCheatsheetInfo";
 export { default as defaultCheatsheetInfo } from "./lib/sampleSpokenFormInfos/defaults.json";

packages/cheatsheet/src/lib/Cheatsheet.tsx

@@ -0,0 +1,63 @@
+import { useEffect } from "preact/hooks";
+import { QuestionCircleFill } from "react-bootstrap-icons";
+import "./cheatsheet.css";
+import type { CheatsheetInfo } from "./cheatsheet.types";
+import CheatsheetLegendSection from "./CheatsheetLegendSection";
+import CheatsheetListSection from "./CheatsheetListSection";
+import CheatsheetNotesSection from "./CheatsheetNotesSection";
+import { applyBootstrapTheme } from "./utils/applyBootstrapTheme";
+import { cheatsheetLegendData } from "./utils/cheatsheetLegendData";
+import SmartLink from "./utils/SmartLink";
+
+type Props = {
+  cheatsheetInfo: CheatsheetInfo;
+};
+
+export function Cheatsheet({ cheatsheetInfo }: Props) {
+  useEffect(() => {
+    return applyBootstrapTheme();
+  }, []);
+
+  return (
+    <main className="cheatsheet">
+      <div className="container-xxl pb-2">
+        <Title />
+        <CheatsheetSections cheatsheetInfo={cheatsheetInfo} />
+      </div>
+    </main>
+  );
+}
+
+function Title() {
+  return (
+    <div className="col-12 text-center mb-3">
+      <h1>
+        Cursorless Cheatsheet{" "}
+        <SmartLink to="#legend">
+          <QuestionCircleFill className="question-icon" />
+        </SmartLink>
+        <small>
+          See the{" "}
+          <SmartLink to={"https://www.cursorless.org/docs/"}>
+            full documentation
+          </SmartLink>{" "}
+          to learn more.
+        </small>
+      </h1>
+    </div>
+  );
+}
+
+function CheatsheetSections({ cheatsheetInfo }: Props) {
+  return (
+    <div className="cheatsheet-sections">
+      {cheatsheetInfo.sections
+        .filter((section) => section.items.length > 0)
+        .map((section) => (
+          <CheatsheetListSection key={section.id} section={section} />
+        ))}
+      <CheatsheetLegendSection data={cheatsheetLegendData} />
+      <CheatsheetNotesSection />
+    </div>
+  );
+}

packages/cheatsheet/src/lib/CheatsheetLegendSection.tsx

@@ -0,0 +1,62 @@
+import type { JSX } from "preact";
+import type { CheatsheetLegend } from "./cheatsheet.types";
+import { formatCaptures } from "./utils/formatCaptures";
+import SmartLink from "./utils/SmartLink";
+import useIsHighlighted from "./utils/useIsHighlighted";
+
+type Props = {
+  data: CheatsheetLegend;
+};
+
+export default function CheatsheetLegendSection({ data }: Props): JSX.Element {
+  const isHighlighted = useIsHighlighted("legend");
+
+  return (
+    <section
+      id="legend"
+      className={"card bg-info" + (isHighlighted ? " highlighted" : "")}
+    >
+      <div className="card-header">
+        <h2>Legend</h2>
+      </div>
+      <div className="card-body">
+        <table className="table table-striped">
+          <thead>
+            <tr>
+              <th>Term</th>
+              <th>Definition</th>
+            </tr>
+          </thead>
+          <tbody>
+            {data.map(({ term, definition, link, linkName, id }) => (
+              <tr key={id}>
+                <td>{formatCaptures(`<${term}>`)}</td>
+                <td>{renderDefinition(definition, link, linkName)}</td>
+              </tr>
+            ))}
+          </tbody>
+        </table>
+      </div>
+    </section>
+  );
+}
+
+function renderDefinition(
+  definition: string,
+  link?: string,
+  linkName?: string,
+) {
+  if (link == null) {
+    return definition;
+  }
+  if (linkName == null) {
+    return <SmartLink to={link}>{definition}</SmartLink>;
+  }
+  return (
+    <>
+      <SmartLink to={link}>{linkName}</SmartLink>
+      &nbsp;
+      {definition}
+    </>
+  );
+}