cursorless-dev · AndreasArvidsson · Mar 14, 2026 · Mar 14, 2026 · Mar 14, 2026 · Mar 14, 2026
@@ -20,7 +20,6 @@ jobs:
   lint:
     name: Lint
     runs-on: ubuntu-latest
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
@@ -31,6 +30,22 @@ jobs:
       - name: Lint
         run: pnpm --color lint
 
+      - name: Forbid TODO
+        run: ./scripts/forbid-todo.sh
+
+  build-website:
+    name: Build Website
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Set up Node.js
+        uses: ./.github/actions/setup-node
+
+      - name: Build website
+        run: bash -x scripts/build-and-assemble-website.sh
+
   test-main:
     name: Test
     strategy:
@@ -46,7 +61,6 @@ jobs:
       APP_VERSION: ${{ matrix.app_version }}
       VSCODE_CRASH_DIR: ${{ github.workspace }}/artifacts/dumps
       VSCODE_LOGS_DIR: ${{ github.workspace }}/artifacts/logs
-
     steps:
       - name: Git config
         run: git config --global core.autocrlf false
@@ -139,7 +153,6 @@ jobs:
   test-neovim:
     name: Test Neovim
     runs-on: ubuntu-latest
-
     steps:
       - name: Git config
         run: git config --global core.autocrlf false

@@ -1,3 +1,6 @@
+# Netlify configuration file for building and deploying the Cursorless website.
+# Read by Netlify GitHub app.
+
 [build]
   command = "./scripts/build-and-assemble-website.sh"
   publish = "dist/cursorless-org"
@@ -11,7 +11,7 @@
       document.cheatsheetInfo = __FAKE_CHEATSHEET_INFO__;
     </script>
   </head>
-  <body class="__BODY_CLASSES__">
+  <body>
     <div id="root"></div>
     <script type="module" src="./src/index.tsx"></script>
   </body>

@@ -28,6 +28,7 @@
   },
   "dependencies": {
     "@cursorless/cheatsheet": "workspace:*",
+    "@cursorless/common": "workspace:*",
     "react": "^19.2.4",
     "react-dom": "^19.2.4",
     "tslib": "^2.8.1"

@@ -1,6 +1,5 @@
 import { render } from "@testing-library/react";
-
-import App from "./app";
+import { App } from "./app";
 
 describe("App", () => {
   it("should render successfully", () => {

@@ -1,6 +1,6 @@
 import type { CheatsheetInfo } from "@cursorless/cheatsheet";
 import { CheatsheetPage } from "@cursorless/cheatsheet";
-import "../styles.css";
+import "./styles.css";
 
 declare global {
   interface Document {
@@ -18,5 +18,3 @@ declare global {
 export function App() {
   return <CheatsheetPage cheatsheetInfo={document.cheatsheetInfo} />;
 }
-
-export default App;
@@ -0,0 +1,3 @@
+@import "tailwindcss";
+
+@config "../../tailwind.config.mjs";
@@ -1,7 +1,6 @@
 import { StrictMode } from "react";
 import * as ReactDOM from "react-dom/client";
-
-import App from "./app/app";
+import { App } from "./app/app";
 
 const root = ReactDOM.createRoot(
   document.getElementById("root") as HTMLElement,

@@ -15,6 +15,9 @@
   "references": [
     {
       "path": "../cheatsheet"
+    },
+    {
+      "path": "../common"
     }
   ],
   "include": [

@@ -1,37 +1,21 @@
-import {
-  cheatsheetBodyClasses,
-  fakeCheatsheetInfo,
-} from "@cursorless/cheatsheet";
+import { fakeCheatsheetInfo } from "@cursorless/cheatsheet";
+import { viteHtmlParams } from "@cursorless/common";
 import react from "@vitejs/plugin-react";
-import { defineConfig, type PluginOption } from "vite";
+import { defineConfig } from "vite";
 import { viteSingleFile } from "vite-plugin-singlefile";
 
 export default defineConfig(() => {
   return {
     build: {
       outDir: "dist",
-
-      rollupOptions: {
-        input: {
-          index: "./index.html",
-        },
-      },
     },
 
-    plugins: [react(), viteSingleFile(), injectCheatsheetTemplateData()],
+    plugins: [
+      react(),
+      viteSingleFile(),
+      viteHtmlParams({
+        FAKE_CHEATSHEET_INFO: JSON.stringify(fakeCheatsheetInfo),
+      }),
+    ],
   };
 });
-
-function injectCheatsheetTemplateData(): PluginOption {
-  return {
-    name: "inject-cheatsheet-template-data",
-    transformIndexHtml(html) {
-      return html
-        .replaceAll("__BODY_CLASSES__", cheatsheetBodyClasses)
-        .replaceAll(
-          "__FAKE_CHEATSHEET_INFO__",
-          JSON.stringify(fakeCheatsheetInfo),
-        );
-    },
-  };
-}
@@ -1,6 +1,4 @@
-export * from "./lib/cheatsheet";
-export * from "./lib/cheatsheetBodyClasses";
+export * from "./lib/CheatsheetPage";
 export * from "./lib/CheatsheetInfo";
 export * from "./lib/fakeCheatsheetInfo";
-import defaultCheatsheetInfo from "./lib/sampleSpokenFormInfos/defaults.json";
-export { defaultCheatsheetInfo };
+export { default as defaultCheatsheetInfo } from "./lib/sampleSpokenFormInfos/defaults.json";
@@ -8,16 +8,14 @@ import CheatsheetNotesComponent from "./components/CheatsheetNotesComponent";
 import SmartLink from "./components/SmartLink";
 import type { CheatsheetInfo } from "./CheatsheetInfo";
 
-type CheatsheetPageProps = {
+type Props = {
   cheatsheetInfo: CheatsheetInfo;
 };
 
-export const CheatsheetPage: React.FC<CheatsheetPageProps> = ({
-  cheatsheetInfo,
-}) => {
+export function CheatsheetPage({ cheatsheetInfo }: Props) {
   return (
-    <main className="dark:text-stone-100">
-      <h1 className="mt-2 mb-1 text-center text-2xl md:text-3xl xl:mt-4">
+    <main className="min-h-screen bg-stone-50 pt-2 xl:pt-4 dark:bg-stone-800 dark:text-stone-100">
+      <h1 className="mb-1 text-center text-2xl md:text-3xl">
         Cursorless Cheatsheet{" "}
         <span className="inline-block align-middle text-sm">
           <SmartLink to="#legend">
@@ -35,36 +33,36 @@ export const CheatsheetPage: React.FC<CheatsheetPageProps> = ({
       <Cheatsheet cheatsheetInfo={cheatsheetInfo} />
     </main>
   );
-};
-
-type CheatsheetProps = {
-  cheatsheetInfo: CheatsheetInfo;
-};
+}
 
-const Cheatsheet: React.FC<CheatsheetProps> = ({ cheatsheetInfo }) => (
-  <div className="columns-1 gap-2 p-2 md:columns-2 md:gap-3 md:p-3 xl:mx-auto xl:max-w-[1600px] xl:columns-3 xl:gap-4 xl:p-4">
-    {cheatsheetInfo.sections
-      .filter((section) => section.items.length > 0)
-      .map((section) => (
-        <CheatsheetSection key={section.id}>
-          <CheatsheetListComponent section={section} />
-        </CheatsheetSection>
-      ))}
-    <CheatsheetSection>
-      <CheatsheetLegendComponent data={cheatsheetLegend} />
-    </CheatsheetSection>
-    <CheatsheetSection>
-      <CheatsheetNotesComponent />
-    </CheatsheetSection>
-  </div>
-);
+function Cheatsheet({ cheatsheetInfo }: Props) {
+  return (
+    <div className="columns-1 gap-2 p-2 md:columns-2 md:gap-3 md:p-3 xl:mx-auto xl:max-w-[1600px] xl:columns-3 xl:gap-4 xl:p-4">
+      {cheatsheetInfo.sections
+        .filter((section) => section.items.length > 0)
+        .map((section) => (
+          <CheatsheetSection key={section.id}>
+            <CheatsheetListComponent section={section} />
+          </CheatsheetSection>
+        ))}
+      <CheatsheetSection>
+        <CheatsheetLegendComponent data={cheatsheetLegend} />
+      </CheatsheetSection>
+      <CheatsheetSection>
+        <CheatsheetNotesComponent />
+      </CheatsheetSection>
+    </div>
+  );
+}
 
 type CheatsheetSectionProps = {
   children?: React.ReactNode;
 };
 
-const CheatsheetSection: React.FC<CheatsheetSectionProps> = ({ children }) => (
-  <section className="mb-5 break-inside-avoid last:mb-0 md:mb-3 xl:mb-4">
-    {children}
-  </section>
-);
+function CheatsheetSection({ children }: CheatsheetSectionProps) {
+  return (
+    <section className="mb-5 break-inside-avoid last:mb-0 md:mb-3 xl:mb-4">
+      {children}
+    </section>
+  );
+}
@@ -1,6 +1,5 @@
 import { render } from "@testing-library/react";
-
-import { CheatsheetPage } from "./cheatsheet";
+import { CheatsheetPage } from "./CheatsheetPage";
 import { fakeCheatsheetInfo } from "./fakeCheatsheetInfo";
 
 describe("Cheatsheet", () => {

@@ -122,3 +122,4 @@ export * from "./util/type";
 export * from "./util/typeUtils";
 export * from "./util/uniqWithHash";
 export * from "./util/zipStrict";
+export * from "./viteHtmlParamsPlugin";
@@ -0,0 +1,17 @@
+export function viteHtmlParams(params: Record<string, string>) {
+  return {
+    name: "vite-html-params",
+    enforce: "post",
+
+    transformIndexHtml(html: string): string {
+      for (const [key, value] of Object.entries(params)) {
+        const pattern = `__${key}__`;
+        if (!html.includes(pattern)) {
+          throw new Error(`Expected index.html to contain pattern ${pattern}`);
+        }
+        html = html.replaceAll(pattern, value);
+      }
+      return html;
+    },
+  };
+}
@@ -1,40 +1,10 @@
-import { fixupPluginRules } from "@eslint/compat";
 import type { ConfigWithExtends } from "@eslint/config-helpers";
-import nextVitals from "eslint-config-next/core-web-vitals";
 import tsEslint from "typescript-eslint";
 
-const nextVitalsCompat = nextVitals.map((config) => {
-  if (config.plugins == null) {
-    return config;
-  }
-
-  const plugins = { ...config.plugins };
-
-  // The Next.js ESLint config includes the `react` plugin which is not compatible with eslint 10.
-  if (plugins.react != null) {
-    plugins.react = fixupPluginRules(plugins.react);
-  }
-
-  // The Next.js ESLint config includes the `import` plugin, which conflicts with our own import plugin in the root configuration.
-  if (plugins.import != null) {
-    delete plugins.import;
-  }
-
-  return { ...config, plugins };
-});
-
 export const cursorlessOrgConfig: ConfigWithExtends = {
   files: ["packages/cursorless-org/**/*"],
 
-  extends: nextVitalsCompat,
-
   languageOptions: {
     parser: tsEslint.parser,
   },
-
-  settings: {
-    next: {
-      rootDir: "packages/cursorless-org",
-    },
-  },
 };
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		@import "tailwindcss";

		@config "../../tailwind.config.mjs";