release v0.3.1

.eslintrc.cjs

@@ -1,25 +0,0 @@
-require("@rushstack/eslint-patch/modern-module-resolution")
-
-/** @type {import('eslint').Linter.Config} */
-module.exports = {
-  extends: [require.resolve("@itsmapleleaf/configs/eslint")],
-  ignorePatterns: [
-    "**/node_modules/**",
-    "**/.cache/**",
-    "**/build/**",
-    "**/dist/**",
-    "**/coverage/**",
-    "**/public/**",
-  ],
-  parserOptions: {
-    project: require.resolve("./tsconfig.base.json"),
-  },
-  overrides: [
-    {
-      files: ["packages/website/cypress/**"],
-      parserOptions: {
-        project: require.resolve("./packages/website/cypress/tsconfig.json"),
-      },
-    },
-  ],
-}

.eslintrc.json

@@ -0,0 +1,26 @@
+{
+  "extends": ["./node_modules/@itsmapleleaf/configs/eslint"],
+  "ignorePatterns": [
+    "**/node_modules/**",
+    "**/.cache/**",
+    "**/build/**",
+    "**/dist/**",
+    "**/coverage/**",
+    "**/public/**"
+  ],
+  "parserOptions": {
+    "project": "./tsconfig.base.json"
+  },
+  "rules": {
+    "import/no-unused-modules": "off",
+    "unicorn/prevent-abbreviations": "off"
+  },
+  "overrides": [
+    {
+      "files": ["packages/website/cypress/**"],
+      "parserOptions": {
+        "project": "./packages/website/cypress/tsconfig.json"
+      }
+    }
+  ]
+}

.github/workflows/deploy-website.yml

@@ -0,0 +1,17 @@
+name: deploy website
+on:
+  push:
+    branches: [main]
+    paths:
+      - "packages/website/**"
+      - "reacord/library/**/*.{ts,tsx}"
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: superfly/flyctl-actions@master
+        env:
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+        with:
+          args: "deploy"

.gitignore

@@ -3,7 +3,4 @@ node_modules
 .vscode
 coverage
 .env
-*.code-workspace
 
-build
-.cache

.npmrc

@@ -1 +0,0 @@
-ignore-workspace-root-check = true

.prettierignore

@@ -4,4 +4,3 @@ coverage
 pnpm-lock.yaml
 build
 .cache
-packages/website/public/api

README.md

@@ -1,9 +1,7 @@
-<center>
-  <img src="./packages/website/app/assets/banner.png" alt="Reacord: Create interactive Discord messages using React">
-</center>
-
-## Installation ∙ [![npm](https://img.shields.io/npm/v/reacord?color=blue&style=flat-square)](https://www.npmjs.com/package/reacord)
+# reacord
+Create interactive Discord messages using React!
 
+## Installation
 ```console
 # npm
 npm install reacord react discord.js
@@ -17,11 +15,9 @@ pnpm add reacord react discord.js
 ```
 
 ## Get Started
-
-[Visit the docs to get started.](https://reacord.mapleleaf.dev/guides/getting-started)
+[Visit the docs to get started.](https://reacord.fly.dev/guides/getting-started)
 
 ## Example
-
 <!-- prettier-ignore -->
 ```tsx
 import * as React from "react"

fly.toml

@@ -0,0 +1,40 @@
+# fly.toml file generated for reacord on 2021-12-29T14:06:41-06:00
+
+app = "reacord"
+
+kill_signal = "SIGINT"
+kill_timeout = 5
+processes = []
+
+[env]
+PORT = 8080
+
+[experimental]
+allowed_public_ports = []
+auto_rollback = true
+
+[[services]]
+http_checks = []
+internal_port = 8080
+processes = ["app"]
+protocol = "tcp"
+script_checks = []
+
+[services.concurrency]
+hard_limit = 25
+soft_limit = 20
+type = "connections"
+
+[[services.ports]]
+handlers = ["http"]
+port = 80
+
+[[services.ports]]
+handlers = ["tls", "http"]
+port = 443
+
+[[services.tcp_checks]]
+grace_period = "1s"
+interval = "15s"
+restart_limit = 0
+timeout = "2s"

package.json

@@ -5,13 +5,22 @@
     "lint-fix": "pnpm lint -- --fix",
     "format": "prettier --write ."
   },
+  "dependencies": {
+    "@itsmapleleaf/configs": "^1.1.2"
+  },
   "devDependencies": {
-    "@itsmapleleaf/configs": "^1.1.3",
-    "@rushstack/eslint-patch": "^1.1.3",
-    "@types/eslint": "^8.4.1",
-    "eslint": "^8.14.0",
-    "prettier": "^2.6.2",
-    "typescript": "^4.6.3"
+    "@typescript-eslint/eslint-plugin": "^5.9.1",
+    "@typescript-eslint/parser": "^5.9.1",
+    "eslint": "^8.6.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-import-resolver-typescript": "^2.5.0",
+    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-jsx-a11y": "^6.5.1",
+    "eslint-plugin-react": "^7.28.0",
+    "eslint-plugin-react-hooks": "^4.3.0",
+    "eslint-plugin-unicorn": "^40.0.0",
+    "prettier": "^2.5.1",
+    "typescript": "^4.5.4"
   },
   "resolutions": {
     "esbuild": "latest"

packages/reacord/.gitignore

@@ -1,2 +0,0 @@
-/README.md
-/LICENSE

packages/reacord/helpers/log-pretty.ts

@@ -1,5 +1,6 @@
 import { inspect } from "node:util"
 
+// eslint-disable-next-line import/no-unused-modules
 export function logPretty(value: unknown) {
   console.info(
     inspect(value, {

packages/reacord/helpers/omit.ts

@@ -1,3 +1,4 @@
+// eslint-disable-next-line import/no-unused-modules
 export function omit<Subject extends object, Key extends PropertyKey>(
   subject: Subject,
   keys: Key[],

packages/reacord/helpers/pick.ts

@@ -1,5 +1,6 @@
 import type { LoosePick, UnknownRecord } from "./types"
 
+// eslint-disable-next-line import/no-unused-modules
 export function pick<T, K extends keyof T | PropertyKey>(
   object: T,
   keys: K[],

packages/reacord/helpers/prune-nullish-values.test.ts

@@ -1,33 +0,0 @@
-import { expect, test } from "vitest"
-import { PruneNullishValues, pruneNullishValues } from "./prune-nullish-values"
-
-test("pruneNullishValues", () => {
-  type InputType = {
-    a: string
-    b: string | null | undefined
-    c?: string
-    d: {
-      a: string
-      b: string | undefined
-    }
-  }
-
-  const input: InputType = {
-    a: "a",
-    b: null,
-    c: undefined,
-    d: {
-      a: "a",
-      b: undefined,
-    },
-  }
-
-  const output: PruneNullishValues<InputType> = {
-    a: "a",
-    d: {
-      a: "a",
-    },
-  }
-
-  expect(pruneNullishValues(input)).toEqual(output)
-})

packages/reacord/helpers/prune-nullish-values.ts

@@ -18,25 +18,10 @@ export function pruneNullishValues<T>(input: T): PruneNullishValues<T> {
   return result
 }
 
-export type PruneNullishValues<Input> = Input extends object
-  ? OptionalKeys<
-      { [Key in keyof Input]: NonNullable<PruneNullishValues<Input[Key]>> },
-      KeysWithNullishValues<Input>
-    >
+type PruneNullishValues<Input> = Input extends ReadonlyArray<infer Value>
+  ? ReadonlyArray<NonNullable<Value>>
+  : Input extends object
+  ? {
+      [Key in keyof Input]: NonNullable<Input[Key]>
+    }
   : Input
-
-type OptionalKeys<Input, Keys extends keyof Input> = Omit<Input, Keys> & {
-  [Key in Keys]?: Input[Key]
-}
-
-type KeysWithNullishValues<Input> = NonNullable<
-  Values<{
-    [Key in keyof Input]: null extends Input[Key]
-      ? Key
-      : undefined extends Input[Key]
-      ? Key
-      : never
-  }>
->
-
-type Values<Input> = Input[keyof Input]

packages/reacord/helpers/wait-for.ts

@@ -1,21 +0,0 @@
-import { setTimeout } from "timers/promises"
-
-const maxTime = 1000
-
-export async function waitFor<Result>(
-  predicate: () => Result,
-): Promise<Awaited<Result>> {
-  const startTime = Date.now()
-  let lastError: unknown
-
-  while (Date.now() - startTime < maxTime) {
-    try {
-      return await predicate()
-    } catch (error) {
-      lastError = error
-      await setTimeout(50)
-    }
-  }
-
-  throw lastError ?? new Error("Timeout")
-}

packages/reacord/helpers/with-logged-method-calls.ts

@@ -1,5 +1,6 @@
 import { inspect } from "node:util"
 
+// eslint-disable-next-line import/no-unused-modules
 export function withLoggedMethodCalls<T extends object>(value: T) {
   return new Proxy(value as Record<string | symbol, unknown>, {
     get(target, property) {

packages/reacord/library/core/components/action-row.tsx

@@ -21,9 +21,9 @@ export type ActionRowProps = {
  * ```tsx
  * // put buttons on two separate rows
  * <ActionRow>
- *   <Button label="First" onClick={handleFirst} />
+ *   <Button onClick={handleFirst}>First</Button>
  * </ActionRow>
- * <Button label="Second" onClick={handleSecond} />
+ * <Button onClick={handleSecond}>Second</Button>
  * ```
  *
  * @category Action Row

packages/reacord/library/core/file.ts

@@ -1,7 +0,0 @@
-import { Readable } from "node:stream"
-
-export type ReacordFile = {
-  name?: string
-  description?: string
-  data: Buffer | Readable | string
-}

packages/reacord/library/core/instance-context.tsx

@@ -10,7 +10,7 @@ export const InstanceProvider = Context.Provider
  * Get the associated instance for the current component.
  *
  * @category Core
- * @see https://reacord.mapleleaf.dev/guides/use-instance
+ * @see https://reacord.fly.dev/guides/use-instance
  */
 export function useInstance(): ReacordInstance {
   return (

packages/reacord/library/core/instance.ts

@@ -1,5 +1,4 @@
 import type { ReactNode } from "react"
-import { ReacordFile } from "./file"
 
 /**
  * Represents an interactive message, which can later be replaced or deleted.
@@ -17,7 +16,4 @@ export type ReacordInstance = {
    * This prevents it from listening to user interactions.
    */
   deactivate: () => void
-
-  /** Attach a file to the message for this instance */
-  attach: (file: ReacordFile) => void
 }

packages/reacord/library/core/reacord-discord-js.ts

@@ -40,7 +40,7 @@ export class ReacordDiscordJs extends Reacord {
 
   /**
    * Sends a message to a channel.
-   * @see https://reacord.mapleleaf.dev/guides/sending-messages
+   * @see https://reacord.fly.dev/guides/sending-messages
    */
   override send(
     channelId: string,
@@ -54,7 +54,7 @@ export class ReacordDiscordJs extends Reacord {
 
   /**
    * Sends a message as a reply to a command interaction.
-   * @see https://reacord.mapleleaf.dev/guides/sending-messages
+   * @see https://reacord.fly.dev/guides/sending-messages
    */
   override reply(
     interaction: Discord.CommandInteraction,
@@ -68,7 +68,7 @@ export class ReacordDiscordJs extends Reacord {
 
   /**
    * Sends an ephemeral message as a reply to a command interaction.
-   * @see https://reacord.mapleleaf.dev/guides/sending-messages
+   * @see https://reacord.fly.dev/guides/sending-messages
    */
   override ephemeralReply(
     interaction: Discord.CommandInteraction,
@@ -298,18 +298,20 @@ function createReacordMessage(message: Discord.Message): Message {
     edit: async (options) => {
       await message.edit(getDiscordMessageOptions(options))
     },
+    disableComponents: async () => {
+      for (const actionRow of message.components) {
+        for (const component of actionRow.components) {
+          component.setDisabled(true)
+        }
+      }
+
+      await message.edit({
+        components: message.components,
+      })
+    },
     delete: async () => {
       await message.delete()
     },
-    updateFiles: async (files) => {
-      await message.edit({
-        files: files.map(({ name, description, data }) => ({
-          name,
-          description,
-          attachment: data,
-        })),
-      })
-    },
   }
 }
 
@@ -319,7 +321,7 @@ function createEphemeralReacordMessage(): Message {
       console.warn("Ephemeral messages can't be edited")
       return Promise.resolve()
     },
-    updateFiles: () => {
+    disableComponents: () => {
       console.warn("Ephemeral messages can't be edited")
       return Promise.resolve()
     },
@@ -371,10 +373,7 @@ function getDiscordMessageOptions(
     })),
   }
 
-  const hasContent =
-    options.content || options.embeds?.length || options.files?.length
-
-  if (!hasContent) {
+  if (!options.content && !options.embeds?.length) {
     options.content = "_ _"
   }
 

packages/reacord/library/core/reacord.tsx

@@ -63,9 +63,6 @@ export abstract class Reacord {
         this.renderers = this.renderers.filter((it) => it !== renderer)
         renderer.destroy()
       },
-      attach: (file) => {
-        renderer.attach(file)
-      },
     }
 
     if (initialContent !== undefined) {

packages/reacord/library/internal/channel.ts

@@ -1,7 +1,5 @@
-import { ReacordFile } from "../core/file"
 import type { Message, MessageOptions } from "./message"
 
 export type Channel = {
   send(message: MessageOptions): Promise<Message>
-  sendFiles(files: readonly ReacordFile[]): Promise<Message>
 }

packages/reacord/library/internal/message.ts

@@ -2,7 +2,6 @@ import type { Except } from "type-fest"
 import { last } from "../../helpers/last"
 import type { EmbedOptions } from "../core/components/embed-options"
 import type { SelectProps } from "../core/components/select"
-import { ReacordFile } from "../main"
 
 export type MessageOptions = {
   content: string
@@ -50,7 +49,7 @@ export type MessageSelectOptionOptions = {
 export type Message = {
   edit(options: MessageOptions): Promise<void>
   delete(): Promise<void>
-  updateFiles(files: readonly ReacordFile[]): Promise<void>
+  disableComponents(): Promise<void>
 }
 
 export function getNextActionRow(options: MessageOptions): ActionRow {

packages/reacord/library/internal/reconciler.ts

@@ -52,8 +52,6 @@ const config: HostConfig<
   },
   createTextInstance: (text) => new TextNode(text),
   shouldSetTextContent: () => false,
-  // @ts-expect-error
-  detachDeletedInstance: (instance) => {},
 
   clearContainer: (renderer) => {
     renderer.nodes.clear()

packages/reacord/library/internal/renderers/channel-message-renderer.ts

@@ -1,4 +1,3 @@
-import { ReacordFile } from "../../core/file"
 import type { Channel } from "../channel"
 import type { Message, MessageOptions } from "../message"
 import { Renderer } from "./renderer"
@@ -11,10 +10,4 @@ export class ChannelMessageRenderer extends Renderer {
   protected createMessage(options: MessageOptions): Promise<Message> {
     return this.channel.send(options)
   }
-
-  protected createMessageFromFiles(
-    files: readonly ReacordFile[],
-  ): Promise<Message> {
-    return this.channel.sendFiles(files)
-  }
 }

packages/reacord/library/internal/renderers/renderer.ts

@@ -1,6 +1,5 @@
 import { Subject } from "rxjs"
 import { concatMap } from "rxjs/operators"
-import { ReacordFile } from "../../core/file"
 import { Container } from "../container.js"
 import type { ComponentInteraction } from "../interaction"
 import type { Message, MessageOptions } from "../message"
@@ -8,21 +7,15 @@ import type { Node } from "../node.js"
 
 type UpdatePayload =
   | { action: "update" | "deactivate"; options: MessageOptions }
-  | { action: "files"; files: readonly ReacordFile[] }
   | { action: "deferUpdate"; interaction: ComponentInteraction }
   | { action: "destroy" }
 
-type NewMessagePayload =
-  | { source: "content"; messageOptions?: MessageOptions }
-  | { source: "files"; files?: readonly ReacordFile[] }
-
 export abstract class Renderer {
   readonly nodes = new Container<Node<unknown>>()
   private componentInteraction?: ComponentInteraction
   private message?: Message
   private active = true
   private updates = new Subject<UpdatePayload>()
-  private files: readonly ReacordFile[] = []
 
   private updateSubscription = this.updates
     .pipe(concatMap((payload) => this.updateMessage(payload)))
@@ -53,11 +46,6 @@ export abstract class Renderer {
     this.updates.next({ action: "destroy" })
   }
 
-  attach(file: ReacordFile) {
-    const newFiles = (this.files = [...this.files, file])
-    this.updates.next({ action: "files", files: newFiles })
-  }
-
   handleComponentInteraction(interaction: ComponentInteraction) {
     this.componentInteraction = interaction
 
@@ -72,7 +60,7 @@ export abstract class Renderer {
     }
   }
 
-  protected abstract createMessage(options: NewMessagePayload): Promise<Message>
+  protected abstract createMessage(options: MessageOptions): Promise<Message>
 
   private getMessageOptions(): MessageOptions {
     const options: MessageOptions = {
@@ -95,17 +83,7 @@ export abstract class Renderer {
 
     if (payload.action === "deactivate") {
       this.updateSubscription.unsubscribe()
-
-      await this.message?.edit({
-        ...payload.options,
-        actionRows: payload.options.actionRows.map((row) =>
-          row.map((component) => ({
-            ...component,
-            disabled: true,
-          })),
-        ),
-      })
-
+      await this.message?.disableComponents()
       return
     }
 
@@ -114,15 +92,6 @@ export abstract class Renderer {
       return
     }
 
-    if (payload.action === "files") {
-      if (this.message) {
-        await this.message?.updateFiles(payload.files)
-      } else {
-        this.message = await this.createMessageFromFiles(payload.files)
-      }
-      return
-    }
-
     if (this.componentInteraction) {
       const promise = this.componentInteraction.update(payload.options)
       this.componentInteraction = undefined

packages/reacord/library/main.ts

@@ -12,7 +12,6 @@ export * from "./core/components/embed-title"
 export * from "./core/components/link"
 export * from "./core/components/option"
 export * from "./core/components/select"
-export * from "./core/file"
 export * from "./core/instance"
 export { useInstance } from "./core/instance-context"
 export * from "./core/reacord"

packages/reacord/package.json

@@ -2,27 +2,10 @@
   "name": "reacord",
   "type": "module",
   "description": "Create interactive Discord messages using React.",
-  "version": "0.3.5",
+  "version": "0.3.1",
   "types": "./dist/main.d.ts",
-  "homepage": "https://reacord.mapleleaf.dev",
-  "repository": "https://github.com/itsMapleLeaf/reacord.git",
-  "changelog": "https://github.com/itsMapleLeaf/reacord/releases",
-  "license": "MIT",
-  "keywords": [
-    "discord",
-    "discord-js",
-    "react",
-    "react-js",
-    "react-renderer",
-    "interaction",
-    "message",
-    "embed",
-    "reacord"
-  ],
   "files": [
-    "dist",
-    "README.md",
-    "LICENSE"
+    "dist"
   ],
   "exports": {
     ".": {
@@ -41,15 +24,15 @@
     "test-dev": "vitest",
     "typecheck": "tsc --noEmit",
     "playground": "nodemon --exec esmo --ext ts,tsx --inspect=5858 --enable-source-maps ./playground/main.tsx",
-    "release": "bash scripts/release.sh"
+    "release": "pnpm build && release-it"
   },
   "dependencies": {
     "@types/node": "*",
     "@types/react": "*",
-    "@types/react-reconciler": "^0.26.6",
-    "nanoid": "^3.3.3",
-    "react-reconciler": "^0.27.0",
-    "rxjs": "^7.5.5"
+    "@types/react-reconciler": "^0.26.4",
+    "nanoid": "^3.1.31",
+    "react-reconciler": "^0.26.2",
+    "rxjs": "^7.5.2"
   },
   "peerDependencies": {
     "discord.js": "^13.3",
@@ -61,24 +44,24 @@
     }
   },
   "devDependencies": {
-    "@types/lodash-es": "^4.17.6",
-    "c8": "^7.11.2",
-    "discord.js": "^13.6.0",
-    "dotenv": "^16.0.0",
+    "@types/lodash-es": "^4.17.5",
+    "c8": "^7.11.0",
+    "discord.js": "^13.5.1",
+    "dotenv": "^11.0.0",
     "esbuild": "latest",
     "esbuild-jest": "^0.5.0",
-    "esmo": "^0.14.1",
+    "esmo": "^0.13.0",
     "lodash-es": "^4.17.21",
     "nodemon": "^2.0.15",
-    "prettier": "^2.6.2",
+    "prettier": "^2.5.1",
     "pretty-ms": "^7.0.1",
-    "react": "^18.0.0",
-    "release-it": "^14.14.2",
-    "tsup": "^5.12.6",
-    "type-fest": "^2.12.2",
-    "typescript": "^4.6.3",
-    "vite": "^2.9.5",
-    "vitest": "^0.9.4"
+    "react": "^17.0.2",
+    "release-it": "^14.12.1",
+    "tsup": "^5.11.11",
+    "type-fest": "^2.9.0",
+    "typescript": "^4.5.4",
+    "vite": "^2.7.10",
+    "vitest": "^0.0.141"
   },
   "resolutions": {
     "esbuild": "latest"

packages/reacord/playground/command-handler.ts

@@ -8,14 +8,16 @@ type Command = {
 
 export function createCommandHandler(client: Client, commands: Command[]) {
   client.on("ready", async () => {
-    for (const guild of client.guilds.cache.values()) {
-      client.application!.commands.set(
-        commands.map(({ name, description }) => ({
-          name,
-          description,
-        })),
-        guild.id,
-      )
+    for (const command of commands) {
+      for (const guild of client.guilds.cache.values()) {
+        await client.application?.commands.create(
+          {
+            name: command.name,
+            description: command.description,
+          },
+          guild.id,
+        )
+      }
     }
   })
 

packages/reacord/playground/main.tsx

@@ -1,9 +1,6 @@
 import { Client } from "discord.js"
 import "dotenv/config"
-import { readFile } from "fs/promises"
-import { join } from "path"
 import React from "react"
-import { fileURLToPath } from "url"
 import { Button, ReacordDiscordJs, useInstance } from "../library/main"
 import { createCommandHandler } from "./command-handler"
 import { Counter } from "./counter"
@@ -107,19 +104,6 @@ createCommandHandler(client, [
       reacord.reply(interaction, <DeleteThis />)
     },
   },
-  {
-    name: "anime",
-    description: "shows an anime image",
-    run: async (interaction) => {
-      const reply = reacord.reply(interaction)
-      const image = await readFile(
-        join(fileURLToPath(import.meta.url), "../anime.jpg"),
-      )
-
-      reply.attach({ name: "anime.jpg", data: image })
-      // reply.render("anime")
-    },
-  },
 ])
 
 await client.login(process.env.TEST_BOT_TOKEN)

packages/reacord/scripts/release.sh

@@ -1,4 +0,0 @@
-pnpm build
-cp ../../README.md .
-cp ../../LICENSE .
-pnpx release-it

packages/reacord/test/select.test.tsx

@@ -1,11 +1,11 @@
 import React, { useState } from "react"
-import { expect, test, vi } from "vitest"
+import { expect, fn, test } from "vitest"
 import { Button, Option, Select } from "../library/main"
 import { ReacordTester } from "./test-adapter"
 
 test("single select", async () => {
   const tester = new ReacordTester()
-  const onSelect = vi.fn()
+  const onSelect = fn()
 
   function TestSelect() {
     const [value, setValue] = useState<string>()
@@ -75,7 +75,7 @@ test("single select", async () => {
 
 test("multiple select", async () => {
   const tester = new ReacordTester()
-  const onSelect = vi.fn()
+  const onSelect = fn()
 
   function TestSelect() {
     const [values, setValues] = useState<string[]>([])

packages/reacord/test/test-adapter.ts

@@ -1,14 +1,14 @@
 /* eslint-disable class-methods-use-this */
 /* eslint-disable require-await */
 import { nanoid } from "nanoid"
-import { setTimeout } from "node:timers/promises"
+import { nextTick } from "node:process"
+import { promisify } from "node:util"
 import type { ReactNode } from "react"
 import { expect } from "vitest"
 import { logPretty } from "../helpers/log-pretty"
 import { omit } from "../helpers/omit"
 import { pruneNullishValues } from "../helpers/prune-nullish-values"
 import { raise } from "../helpers/raise"
-import { waitFor } from "../helpers/wait-for"
 import type {
   ChannelInfo,
   GuildInfo,
@@ -26,10 +26,17 @@ import type {
   CommandInteraction,
   SelectInteraction,
 } from "../library/internal/interaction"
-import type { Message, MessageOptions } from "../library/internal/message"
+import type {
+  Message,
+  MessageButtonOptions,
+  MessageOptions,
+  MessageSelectOptions,
+} from "../library/internal/message"
 import { ChannelMessageRenderer } from "../library/internal/renderers/channel-message-renderer"
 import { InteractionReplyRenderer } from "../library/internal/renderers/interaction-reply-renderer"
 
+const nextTickPromise = promisify(nextTick)
+
 export type MessageSample = ReturnType<ReacordTester["sampleMessages"]>[0]
 
 /**
@@ -66,10 +73,9 @@ export class ReacordTester extends Reacord {
     return this.reply(initialContent)
   }
 
-  assertMessages(expected: MessageSample[]) {
-    return waitFor(() => {
-      expect(this.sampleMessages()).toEqual(expected)
-    })
+  async assertMessages(expected: MessageSample[]) {
+    await nextTickPromise()
+    expect(this.sampleMessages()).toEqual(expected)
   }
 
   async assertRender(content: ReactNode, expected: MessageSample[]) {
@@ -102,58 +108,57 @@ export class ReacordTester extends Reacord {
   }
 
   findButtonByLabel(label: string) {
-    return {
-      click: () => {
-        return waitFor(() => {
-          for (const [component, message] of this.eachComponent()) {
-            if (component.type === "button" && component.label === label) {
-              this.handleComponentInteraction(
-                new TestButtonInteraction(component.customId, message, this),
-              )
-              return
-            }
-          }
-          raise(`Couldn't find button with label "${label}"`)
-        })
-      },
+    for (const message of this.messageContainer) {
+      for (const component of message.options.actionRows.flat()) {
+        if (component.type === "button" && component.label === label) {
+          return this.createButtonActions(component, message)
+        }
+      }
     }
+    raise(`Couldn't find button with label "${label}"`)
   }
 
   findSelectByPlaceholder(placeholder: string) {
-    return {
-      select: (...values: string[]) => {
-        return waitFor(() => {
-          for (const [component, message] of this.eachComponent()) {
-            if (
-              component.type === "select" &&
-              component.placeholder === placeholder
-            ) {
-              this.handleComponentInteraction(
-                new TestSelectInteraction(
-                  component.customId,
-                  message,
-                  values,
-                  this,
-                ),
-              )
-              return
-            }
-          }
-          raise(`Couldn't find select with placeholder "${placeholder}"`)
-        })
-      },
+    for (const message of this.messageContainer) {
+      for (const component of message.options.actionRows.flat()) {
+        if (
+          component.type === "select" &&
+          component.placeholder === placeholder
+        ) {
+          return this.createSelectActions(component, message)
+        }
+      }
     }
+    raise(`Couldn't find select with placeholder "${placeholder}"`)
   }
 
   createMessage(options: MessageOptions) {
     return new TestMessage(options, this.messageContainer)
   }
 
-  private *eachComponent() {
-    for (const message of this.messageContainer) {
-      for (const component of message.options.actionRows.flat()) {
-        yield [component, message] as const
-      }
+  private createButtonActions(
+    button: MessageButtonOptions,
+    message: TestMessage,
+  ) {
+    return {
+      click: () => {
+        this.handleComponentInteraction(
+          new TestButtonInteraction(button.customId, message, this),
+        )
+      },
+    }
+  }
+
+  private createSelectActions(
+    component: MessageSelectOptions,
+    message: TestMessage,
+  ) {
+    return {
+      select: (...values: string[]) => {
+        this.handleComponentInteraction(
+          new TestSelectInteraction(component.customId, message, values, this),
+        )
+      },
     }
   }
 }
@@ -170,6 +175,16 @@ class TestMessage implements Message {
     this.options = options
   }
 
+  async disableComponents(): Promise<void> {
+    for (const row of this.options.actionRows) {
+      for (const action of row) {
+        if (action.type === "button") {
+          action.disabled = true
+        }
+      }
+    }
+  }
+
   async delete(): Promise<void> {
     this.container.remove(this)
   }
@@ -182,14 +197,16 @@ class TestCommandInteraction implements CommandInteraction {
 
   constructor(private messageContainer: Container<TestMessage>) {}
 
-  async reply(messageOptions: MessageOptions): Promise<Message> {
-    await setTimeout()
-    return new TestMessage(messageOptions, this.messageContainer)
+  reply(messageOptions: MessageOptions): Promise<Message> {
+    return Promise.resolve(
+      new TestMessage(messageOptions, this.messageContainer),
+    )
   }
 
-  async followUp(messageOptions: MessageOptions): Promise<Message> {
-    await setTimeout()
-    return new TestMessage(messageOptions, this.messageContainer)
+  followUp(messageOptions: MessageOptions): Promise<Message> {
+    return Promise.resolve(
+      new TestMessage(messageOptions, this.messageContainer),
+    )
   }
 }
 

packages/reacord/test/use-instance.test.tsx

@@ -55,7 +55,7 @@ describe("useInstance", () => {
     await tester.assertMessages([messageOutput("parent")])
     expect(instanceFromHook).toBe(instance)
 
-    await tester.findButtonByLabel("create parent").click()
+    tester.findButtonByLabel("create parent").click()
     await tester.assertMessages([
       messageOutput("parent"),
       messageOutput("child"),
@@ -63,10 +63,10 @@ describe("useInstance", () => {
 
     // this test ensures that the only the child instance is destroyed,
     // and not the parent instance
-    await tester.findButtonByLabel("destroy child").click()
+    tester.findButtonByLabel("destroy child").click()
     await tester.assertMessages([messageOutput("parent")])
 
-    await tester.findButtonByLabel("destroy parent").click()
+    tester.findButtonByLabel("destroy parent").click()
     await tester.assertMessages([])
   })
 })

packages/website/.gitignore

@@ -7,4 +7,3 @@ node_modules
 /public/api
 cypress/videos
 cypress/screenshots
-*.out.css

packages/website/app/assets/dots-background.svg

@@ -1,3 +0,0 @@
-<svg width="53" height="35" viewBox="0 0 53 35" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="3" cy="3" r="1" fill="white"/>
-</svg>

packages/website/app/entry.client.tsx

@@ -1,4 +1,4 @@
-import { hydrate } from "react-dom"
-import { RemixBrowser } from "@remix-run/react"
+import { hydrate } from "react-dom";
+import { RemixBrowser } from "remix";
 
-hydrate(<RemixBrowser />, document)
+hydrate(<RemixBrowser />, document);

packages/website/app/entry.server.tsx

@@ -1,21 +1,21 @@
-import { renderToString } from "react-dom/server"
-import type { EntryContext } from "@remix-run/node"
-import { RemixServer } from "@remix-run/react"
+import { renderToString } from "react-dom/server";
+import { RemixServer } from "remix";
+import type { EntryContext } from "remix";
 
 export default function handleRequest(
   request: Request,
   responseStatusCode: number,
   responseHeaders: Headers,
-  remixContext: EntryContext,
+  remixContext: EntryContext
 ) {
   const markup = renderToString(
-    <RemixServer context={remixContext} url={request.url} />,
-  )
+    <RemixServer context={remixContext} url={request.url} />
+  );
 
-  responseHeaders.set("Content-Type", "text/html")
+  responseHeaders.set("Content-Type", "text/html");
 
   return new Response("<!DOCTYPE html>" + markup, {
     status: responseStatusCode,
-    headers: responseHeaders,
-  })
+    headers: responseHeaders
+  });
 }

packages/website/app/modules/app/app-footer.tsx

@@ -1,27 +0,0 @@
-import { HeartIcon } from "@heroicons/react/solid"
-import clsx from "clsx"
-import { ExternalLink } from "~/modules/dom/external-link"
-import { linkClass, maxWidthContainer } from "~/modules/ui/components"
-
-export function AppFooter() {
-  return (
-    <footer className={clsx(maxWidthContainer, "text-xs opacity-75")}>
-      <address className="not-italic">
-        &copy; {new Date().getFullYear()} itsMapleLeaf
-      </address>
-      <p>
-        Coded with <HeartIcon className="inline w-4 align-sub" /> using{" "}
-        <ExternalLink className={linkClass()} href="https://remix.run">
-          Remix
-        </ExternalLink>
-      </p>
-      <p>
-        Uses{" "}
-        <ExternalLink className={linkClass()} href="https://umami.is/">
-          umami
-        </ExternalLink>{" "}
-        for simple, non-identifying analytics.
-      </p>
-    </footer>
-  )
-}

packages/website/app/modules/dom/external-link.tsx

@@ -1,12 +0,0 @@
-import type { ComponentPropsWithoutRef } from "react"
-
-export function ExternalLink({
-  children,
-  ...props
-}: ComponentPropsWithoutRef<"a">) {
-  return (
-    <a target="_blank" rel="noopener noreferrer" {...props}>
-      {children}
-    </a>
-  )
-}

packages/website/app/modules/dom/portal.tsx

@@ -1,20 +0,0 @@
-import type { ReactNode } from "react"
-import { useEffect, useRef } from "react"
-import { createPortal } from "react-dom"
-
-export function Portal({ children }: { children: ReactNode }) {
-  const containerRef = useRef<Element>()
-
-  if (!containerRef.current && typeof document !== "undefined") {
-    containerRef.current = document.createElement("react-portal")
-    document.body.append(containerRef.current)
-  }
-
-  useEffect(() => () => containerRef.current!.remove(), [])
-
-  return containerRef.current ? (
-    createPortal(children, containerRef.current)
-  ) : (
-    <>{children}</>
-  )
-}

packages/website/app/modules/landing/landing-animation.tsx

@@ -1,195 +0,0 @@
-import clsx from "clsx"
-import { useEffect, useRef, useState } from "react"
-import blobComfyUrl from "~/assets/blob-comfy.png"
-import cursorIbeamUrl from "~/assets/cursor-ibeam.png"
-import cursorUrl from "~/assets/cursor.png"
-
-const defaultState = {
-  chatInputText: "",
-  chatInputCursorVisible: true,
-  messageVisible: false,
-  count: 0,
-  cursorLeft: "25%",
-  cursorBottom: "-15px",
-}
-
-const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
-
-const animationFrame = () =>
-  new Promise((resolve) => requestAnimationFrame(resolve))
-
-export function LandingAnimation() {
-  const [state, setState] = useState(defaultState)
-  const chatInputRef = useRef<HTMLDivElement>(null)
-  const addRef = useRef<HTMLDivElement>(null)
-  const deleteRef = useRef<HTMLDivElement>(null)
-  const cursorRef = useRef<HTMLImageElement>(null)
-
-  useEffect(() => {
-    const animateClick = (element: HTMLElement) =>
-      element.animate(
-        [{ transform: `translateY(2px)` }, { transform: `translateY(0px)` }],
-        300,
-      )
-
-    let running = true
-
-    void (async () => {
-      while (running) {
-        setState(defaultState)
-        await delay(700)
-
-        for (const letter of "/counter") {
-          setState((state) => ({
-            ...state,
-            chatInputText: state.chatInputText + letter,
-          }))
-          await delay(100)
-        }
-
-        await delay(1000)
-
-        setState((state) => ({
-          ...state,
-          messageVisible: true,
-          chatInputText: "",
-        }))
-        await delay(1000)
-
-        setState((state) => ({
-          ...state,
-          cursorLeft: "70px",
-          cursorBottom: "40px",
-        }))
-        await delay(1500)
-
-        for (let i = 0; i < 3; i++) {
-          setState((state) => ({
-            ...state,
-            count: state.count + 1,
-            chatInputCursorVisible: false,
-          }))
-          animateClick(addRef.current!)
-          await delay(700)
-        }
-
-        await delay(500)
-
-        setState((state) => ({
-          ...state,
-          cursorLeft: "140px",
-        }))
-        await delay(1000)
-
-        animateClick(deleteRef.current!)
-        setState((state) => ({ ...state, messageVisible: false }))
-        await delay(1000)
-
-        setState(() => ({
-          ...defaultState,
-          chatInputCursorVisible: false,
-        }))
-        await delay(500)
-      }
-    })()
-
-    return () => {
-      running = false
-    }
-  }, [])
-
-  useEffect(() => {
-    let running = true
-
-    void (async () => {
-      while (running) {
-        // check if the cursor is in the input
-        const cursorRect = cursorRef.current!.getBoundingClientRect()
-        const chatInputRect = chatInputRef.current!.getBoundingClientRect()
-
-        const isOverInput =
-          cursorRef.current &&
-          chatInputRef.current &&
-          cursorRect.top + cursorRect.height / 2 > chatInputRect.top
-
-        cursorRef.current!.src = isOverInput ? cursorIbeamUrl : cursorUrl
-
-        await animationFrame()
-      }
-    })()
-
-    return () => {
-      running = false
-    }
-  })
-
-  return (
-    <div
-      className="grid gap-2 relative pointer-events-none select-none"
-      role="presentation"
-    >
-      <div
-        className={clsx(
-          "bg-slate-800 p-4 rounded-lg shadow transition",
-          state.messageVisible ? "opacity-100" : "opacity-0 -translate-y-2",
-        )}
-      >
-        <div className="flex items-start gap-4">
-          <div className="w-12 h-12 p-2 rounded-full bg-no-repeat bg-contain bg-black/25">
-            <img
-              src={blobComfyUrl}
-              alt=""
-              className="object-contain scale-90 w-full h-full"
-            />
-          </div>
-          <div>
-            <p className="font-bold">comfybot</p>
-            <p>this button was clicked {state.count} times</p>
-            <div className="mt-2 flex flex-row gap-3">
-              <div
-                ref={addRef}
-                className="bg-emerald-700 text-white py-1.5 px-3 text-sm rounded"
-              >
-                +1
-              </div>
-              <div
-                ref={deleteRef}
-                className="bg-red-700 text-white py-1.5 px-3 text-sm rounded"
-              >
-                🗑 delete
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        className="bg-slate-700 pb-2 pt-1.5 px-4 rounded-lg shadow"
-        ref={chatInputRef}
-      >
-        <span
-          className={clsx(
-            "text-sm after:content-[attr(data-after)] after:relative after:-top-px after:-left-[2px]",
-            state.chatInputCursorVisible
-              ? "after:opacity-100"
-              : "after:opacity-0",
-          )}
-          data-after="|"
-        >
-          {state.chatInputText || (
-            <span className="opacity-50 block absolute translate-y-1">
-              Message #showing-off-reacord
-            </span>
-          )}
-        </span>
-      </div>
-
-      <img
-        src={cursorUrl}
-        alt=""
-        className="transition-all duration-500 absolute scale-75"
-        style={{ left: state.cursorLeft, bottom: state.cursorBottom }}
-        ref={cursorRef}
-      />
-    </div>
-  )
-}

packages/website/app/modules/landing/landing-code.mdx

@@ -1,26 +0,0 @@
-{/* prettier-ignore */}
-```tsx
-import * as React from "react"
-import { Button, useInstance } from "reacord"
-
-function Counter() {
-  const [count, setCount] = React.useState(0)
-  const instance = useInstance()
-  return (
-    <>
-      this button was clicked {count} times
-      <Button
-        label="+1"
-        style="success"
-        onClick={() => setCount(count + 1)}
-      />
-      <Button
-        label="delete"
-        emoji="🗑"
-        style="danger"
-        onClick={() => instance.destroy()}
-      />
-    </>
-  )
-}
-```

packages/website/app/modules/landing/landing-example.mdx

@@ -0,0 +1,19 @@
+{/* prettier-ignore */}
+```tsx
+import * as React from "react"
+import { Embed, Button } from "reacord"
+
+function Counter() {
+  const [count, setCount] = React.useState(0)
+  return (
+    <>
+      <Embed title="Counter">
+        This button has been clicked {count} times.
+      </Embed>
+      <Button onClick={() => setCount(count + 1)}>
+        +1
+      </Button>
+    </>
+  )
+}
+```

packages/website/app/modules/navigation/active-link.tsx

@@ -1,14 +0,0 @@
-import type { ReactNode } from "react"
-import type { PathPattern } from "react-router"
-import { useMatch } from "react-router"
-
-export function ActiveLink({
-  to,
-  children,
-}: {
-  to: string | PathPattern
-  children: (props: { active: boolean }) => ReactNode
-}) {
-  const match = useMatch(to)
-  return <>{children({ active: match != undefined })}</>
-}

packages/website/app/modules/navigation/app-link.tsx

@@ -1,6 +1,5 @@
 import type { ComponentPropsWithoutRef } from "react"
-import { Link } from "@remix-run/react"
-import { ExternalLink } from "~/modules/dom/external-link"
+import { Link } from "remix"
 
 export type AppLinkProps = ComponentPropsWithoutRef<"a"> & {
   type: "internal" | "external" | "router"
@@ -18,9 +17,9 @@ export function AppLink({ type, to, children, ...props }: AppLinkProps) {
 
   if (type === "external") {
     return (
-      <ExternalLink href={to} {...props}>
+      <a href={to} target="_blank" rel="noopener noreferrer" {...props}>
         {children}
-      </ExternalLink>
+      </a>
     )
   }
 

packages/website/app/modules/navigation/main-links.tsx

@@ -18,7 +18,7 @@ export const mainLinks: AppLinkProps[] = [
   },
   {
     type: "internal",
-    to: "/api/",
+    to: "/api",
     children: (
       <>
         <CodeIcon className={inlineIconClass} /> API Reference

packages/website/app/modules/navigation/main-navigation-menu.tsx

@@ -1,69 +0,0 @@
-import { Menu, Transition } from "@headlessui/react"
-import { MenuAlt4Icon } from "@heroicons/react/outline"
-import clsx from "clsx"
-import { ActiveLink } from "~/modules/navigation/active-link"
-import { useGuideLinksContext } from "~/modules/navigation/guide-links-context"
-import { Popper } from "~/modules/ui/popper"
-import { AppLink } from "./app-link"
-import { mainLinks } from "./main-links"
-
-export function MainNavigationMenu() {
-  const guideLinks = useGuideLinksContext()
-  return (
-    <Menu>
-      <Popper
-        renderReference={(reference) => (
-          <Menu.Button {...reference}>
-            <MenuAlt4Icon className="w-6" />
-            <span className="sr-only">Menu</span>
-          </Menu.Button>
-        )}
-        renderPopover={() => (
-          <Transition
-            enter="transition"
-            enterFrom="translate-y-4 opacity-0"
-            enterTo="translate-y-0 opacity-100"
-            leave="transition"
-            leaveFrom="translate-y-0 opacity-100"
-            leaveTo="translate-y-4 opacity-0"
-          >
-            <Menu.Items className="w-48 max-h-[calc(100vh-5rem)] bg-slate-800 shadow rounded-lg overflow-hidden overflow-y-auto focus:outline-none">
-              {mainLinks.map((link) => (
-                <Menu.Item key={link.to}>
-                  {({ active }) => (
-                    <AppLink {...link} className={menuItemClass({ active })} />
-                  )}
-                </Menu.Item>
-              ))}
-              <Menu.Item disabled>
-                <hr className="border-0 h-[2px] bg-black/50" />
-              </Menu.Item>
-              {guideLinks.map(({ link }) => (
-                <Menu.Item key={link.to}>
-                  {(menuItem) => (
-                    <ActiveLink to={link.to}>
-                      {(activeLink) => (
-                        <AppLink
-                          {...link}
-                          className={menuItemClass({
-                            active: activeLink.active || menuItem.active,
-                          })}
-                        />
-                      )}
-                    </ActiveLink>
-                  )}
-                </Menu.Item>
-              ))}
-            </Menu.Items>
-          </Transition>
-        )}
-      />
-    </Menu>
-  )
-}
-
-const menuItemClass = ({ active = false }) =>
-  clsx(
-    clsx`px-3 py-2 transition text-left font-medium block opacity-50`,
-    active && clsx`opacity-100 bg-black/75 text-emerald-400`,
-  )

packages/website/app/modules/navigation/main-navigation.tsx

@@ -1,23 +1,41 @@
-import { AppLogo } from "~/modules/app/app-logo"
+import { useGuideLinksContext } from "~/modules/navigation/guide-links-context"
 import { linkClass } from "../ui/components"
+import { PopoverMenu } from "../ui/popover-menu"
 import { AppLink } from "./app-link"
 import { mainLinks } from "./main-links"
-import { MainNavigationMenu } from "./main-navigation-menu"
 
 export function MainNavigation() {
+  const guideLinks = useGuideLinksContext()
   return (
     <nav className="flex justify-between items-center h-16">
       <a href="/">
-        <AppLogo className="w-32" />
-        <span className="sr-only">Home</span>
+        <h1 className="text-3xl font-light">reacord</h1>
       </a>
       <div className="hidden md:flex gap-4">
         {mainLinks.map((link) => (
-          <AppLink {...link} key={link.to} className={linkClass()} />
+          <AppLink {...link} key={link.to} className={linkClass} />
         ))}
       </div>
       <div className="md:hidden">
-        <MainNavigationMenu />
+        <PopoverMenu>
+          {mainLinks.map((link) => (
+            <AppLink
+              {...link}
+              role="menuitem"
+              key={link.to}
+              className={PopoverMenu.itemClass}
+            />
+          ))}
+          <hr className="border-0 h-[2px] bg-black/50" />
+          {guideLinks.map(({ link }) => (
+            <AppLink
+              {...link}
+              role="menuitem"
+              key={link.to}
+              className={PopoverMenu.itemClass}
+            />
+          ))}
+        </PopoverMenu>
       </div>
     </nav>
   )

packages/website/app/modules/ui/components.ts

@@ -4,41 +4,21 @@ export const maxWidthContainer = clsx`mx-auto w-full max-w-screen-lg px-4`
 
 export const inlineIconClass = clsx`inline w-5 align-sub`
 
-export const linkClass = ({ active = false } = {}) =>
-  clsx(
-    clsx`font-medium inline-block relative`,
-    clsx`opacity-60 hover:opacity-100 transition-opacity`,
-    clsx`after:absolute after:block after:w-full after:h-px after:bg-white/50 after:translate-y-[3px] after:opacity-0 after:transition`,
-    clsx`hover:after:translate-y-[-1px] hover:after:opacity-100`,
-    active
-      ? clsx`text-emerald-500 after:bg-emerald-500`
-      : clsx`after:bg-white/50`,
-  )
+export const linkClass = clsx`
+  font-medium inline-block relative
+  opacity-60 hover:opacity-100 transition-opacity
+  after:absolute after:block after:w-full after:h-px after:bg-white/50 after:translate-y-[3px] after:opacity-0 after:transition
+  hover:after:translate-y-[-1px] hover:after:opacity-100
+`
 
 export const docsProseClass = clsx`
   prose prose-invert
   prose-h1:font-light prose-h1:mb-4 prose-h1:text-3xl lg:prose-h1:text-4xl
   prose-h2:font-light
   prose-h3:font-light
-  prose-p:my-3
+  prose-p:my-4
   prose-a:font-medium prose-a:text-emerald-400 hover:prose-a:no-underline
   prose-strong:font-medium prose-strong:text-emerald-400
   prose-pre:font-monospace prose-pre:overflow-x-auto
-  prose-code:before:hidden prose-code:after:hidden prose-code:text-slate-400
-  prose-li:mb-5
   max-w-none
 `
-
-export const buttonClass = ({
-  variant,
-}: {
-  variant: "solid" | "semiblack"
-}) => {
-  return clsx(
-    clsx`inline-block mt-4 px-4 py-2.5 text-xl transition rounded-lg`,
-    clsx`hover:translate-y-[-2px] hover:shadow`,
-    clsx`active:translate-y-[0px] active:transition-none`, // using translate-y-[0px] instead of just -0 so it takes priority
-    variant === "solid" && clsx`bg-emerald-700 hover:bg-emerald-800`,
-    variant === "semiblack" && clsx`bg-black/25 hover:bg-black/40`,
-  )
-}

packages/website/app/modules/ui/modal.tsx

@@ -1,80 +0,0 @@
-import { XIcon } from "@heroicons/react/outline"
-import clsx from "clsx"
-import type { ReactNode } from "react"
-import { useEffect, useRef, useState } from "react"
-import { FocusOn } from "react-focus-on"
-import { Portal } from "~/modules/dom/portal"
-
-export function Modal({
-  children,
-  visible,
-  onClose,
-}: {
-  children: ReactNode
-  visible: boolean
-  onClose: () => void
-}) {
-  const closeButtonRef = useRef<HTMLButtonElement>(null)
-
-  useEffect(() => {
-    if (visible) {
-      // trying to immediately focus doesn't work for whatever reason
-      // neither did requestAnimationFrame
-      setTimeout(() => {
-        closeButtonRef.current?.focus()
-      }, 50)
-    }
-  }, [visible])
-
-  return (
-    <Portal>
-      <div
-        className={clsx(
-          "bg-black/70 fixed inset-0 transition-all flex flex-col p-4",
-          visible ? "opacity-100 visible" : "opacity-0 invisible",
-        )}
-      >
-        <FocusOn
-          className={clsx(
-            "m-auto flex flex-col gap-2 w-full max-h-full max-w-screen-sm overflow-y-auto transition",
-            visible ? "translate-y-0" : "translate-y-3",
-          )}
-          enabled={visible}
-          onClickOutside={onClose}
-          onEscapeKey={onClose}
-        >
-          <button
-            type="button"
-            className="self-end"
-            onClick={onClose}
-            ref={closeButtonRef}
-          >
-            <span className="sr-only">Close</span>
-            <XIcon aria-hidden className="w-6 text-white" />
-          </button>
-          <div className={clsx("bg-slate-700 rounded-md shadow p-4")}>
-            {children}
-          </div>
-        </FocusOn>
-      </div>
-    </Portal>
-  )
-}
-
-export function UncontrolledModal({
-  children,
-  button,
-}: {
-  children: ReactNode
-  button: (buttonProps: { onClick: () => void }) => void
-}) {
-  const [visible, setVisible] = useState(false)
-  return (
-    <>
-      {button({ onClick: () => setVisible(true) })}
-      <Modal visible={visible} onClose={() => setVisible(false)}>
-        {children}
-      </Modal>
-    </>
-  )
-}

packages/website/app/modules/ui/popover-menu.tsx

@@ -0,0 +1,32 @@
+import { MenuAlt4Icon } from "@heroicons/react/outline"
+import clsx from "clsx"
+import React from "react"
+import { linkClass } from "./components"
+
+export function PopoverMenu({ children }: { children: React.ReactNode }) {
+  return (
+    <div className="relative" x-data="{ open: false }">
+      <button title="Menu" className={linkClass} x-on:click="open = !open">
+        <MenuAlt4Icon className="w-6" />
+      </button>
+      <div
+        role="menu"
+        className={`
+          w-48 max-h-[calc(100vh-4rem)]
+          absolute right-0 top-[calc(100%+8px)]
+          bg-slate-800 shadow rounded-lg
+          overflow-hidden overflow-y-auto 
+          transition-all
+        `}
+        x-bind:class="open ? 'visible opacity-100' : 'invisible opacity-0 translate-y-3'"
+      >
+        {children}
+      </div>
+    </div>
+  )
+}
+
+PopoverMenu.itemClass = clsx`
+  px-3 py-2 transition text-left font-medium block
+  opacity-50 hover:opacity-100 hover:bg-black/30
+`

packages/website/app/modules/ui/popper.tsx

@@ -1,41 +0,0 @@
-import { useRect } from "@reach/rect"
-import * as React from "react"
-import { Portal } from "~/modules/dom/portal"
-
-export function Popper({
-  renderReference,
-  renderPopover,
-}: {
-  renderReference: (referenceProps: {
-    ref: (element: HTMLElement | null | undefined) => void
-  }) => React.ReactNode
-  renderPopover: () => React.ReactNode
-}) {
-  const [reference, referenceRef] = React.useState<HTMLElement | null>()
-  const referenceRect = useRect(useValueAsRefObject(reference))
-
-  return (
-    <>
-      {renderReference({ ref: referenceRef })}
-      <Portal>
-        {referenceRect && (
-          <div
-            className="fixed -translate-x-full"
-            style={{
-              left: referenceRect.right,
-              top: referenceRect.bottom + 16,
-            }}
-          >
-            {renderPopover()}
-          </div>
-        )}
-      </Portal>
-    </>
-  )
-}
-
-function useValueAsRefObject<Value>(value: Value): { readonly current: Value } {
-  const ref = React.useRef<Value>(value)
-  ref.current = value
-  return ref
-}

packages/website/app/root.tsx

@@ -1,49 +1,24 @@
 import packageJson from "reacord/package.json"
-import type {
-  LinksFunction,
-  LoaderFunction,
-  MetaFunction,
-} from "@remix-run/node"
+import type { LinksFunction, LoaderFunction, MetaFunction } from "remix"
 import {
   Links,
   LiveReload,
   Meta,
   Outlet,
-  Scripts,
   ScrollRestoration,
   useLoaderData,
-} from "@remix-run/react"
-import bannerUrl from "~/assets/banner.png"
-import faviconUrl from "~/assets/favicon.png"
+} from "remix"
 import { GuideLinksProvider } from "~/modules/navigation/guide-links-context"
 import type { GuideLink } from "~/modules/navigation/load-guide-links.server"
 import { loadGuideLinks } from "~/modules/navigation/load-guide-links.server"
 import prismThemeCss from "~/modules/ui/prism-theme.css"
-import tailwindCss from "~/modules/ui/tailwind.out.css"
 
 export const meta: MetaFunction = () => ({
-  "title": "Reacord",
-  "description": packageJson.description,
-  "theme-color": "#21754b",
-
-  "og:url": "https://reacord.mapleleaf.dev/",
-  "og:type": "website",
-  "og:title": "Reacord",
-  "og:description": "Create interactive Discord messages using React",
-  "og:image": bannerUrl,
-
-  "twitter:card": "summary_large_image",
-  "twitter:domain": "reacord.mapleleaf.dev",
-  "twitter:url": "https://reacord.mapleleaf.dev/",
-  "twitter:title": "Reacord",
-  "twitter:description": "Create interactive Discord messages using React",
-  "twitter:image": bannerUrl,
+  title: "Reacord",
+  description: packageJson.description,
 })
 
 export const links: LinksFunction = () => [
-  { rel: "icon", type: "image/png", href: faviconUrl },
-  { rel: "stylesheet", href: tailwindCss },
-  { rel: "stylesheet", href: prismThemeCss },
   { rel: "preconnect", href: "https://fonts.googleapis.com" },
   {
     rel: "preconnect",
@@ -55,10 +30,8 @@ export const links: LinksFunction = () => [
     as: "style",
     href: "https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@500&family=Rubik:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap",
   },
-  {
-    rel: "stylesheet",
-    href: "https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@500&family=Rubik:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap",
-  },
+  { rel: "stylesheet", href: "/tailwind.css" },
+  { rel: "stylesheet", href: prismThemeCss },
 ]
 
 type LoaderData = {
@@ -81,20 +54,13 @@ export default function App() {
         <meta name="viewport" content="width=device-width,initial-scale=1" />
         <Meta />
         <Links />
-        {process.env.NODE_ENV === "production" && (
-          <script
-            async
-            data-website-id="49c69ade-5593-4853-9686-c9ca9d519a18"
-            src="https://umami-production-265f.up.railway.app/umami.js"
-          />
-        )}
+        <script defer src="https://unpkg.com/alpinejs@3.7.1/dist/cdn.min.js" />
       </head>
       <body>
         <GuideLinksProvider value={data.guideLinks}>
           <Outlet />
         </GuideLinksProvider>
         <ScrollRestoration />
-        <Scripts />
         {process.env.NODE_ENV === "development" && <LiveReload />}
       </body>
     </html>

packages/website/app/routes/guides.tsx

@@ -1,6 +1,5 @@
 import clsx from "clsx"
-import { Outlet } from "@remix-run/react"
-import { ActiveLink } from "~/modules/navigation/active-link"
+import { Outlet } from "remix"
 import { AppLink } from "~/modules/navigation/app-link"
 import { useGuideLinksContext } from "~/modules/navigation/guide-links-context"
 import { MainNavigation } from "~/modules/navigation/main-navigation"
@@ -13,7 +12,7 @@ import {
 export default function GuidePage() {
   const guideLinks = useGuideLinksContext()
   return (
-    <div className="isolate">
+    <>
       <header className="bg-slate-700/30 shadow sticky top-0 backdrop-blur-sm transition z-10 flex">
         <div className={maxWidthContainer}>
           <MainNavigation />
@@ -25,11 +24,7 @@ export default function GuidePage() {
           <ul className="mt-3 flex flex-col gap-2 items-start">
             {guideLinks.map(({ link }) => (
               <li key={link.to}>
-                <ActiveLink to={link.to}>
-                  {({ active }) => (
-                    <AppLink {...link} className={linkClass({ active })} />
-                  )}
-                </ActiveLink>
+                <AppLink {...link} className={linkClass} />
               </li>
             ))}
           </ul>
@@ -38,6 +33,6 @@ export default function GuidePage() {
           <Outlet />
         </section>
       </main>
-    </div>
+    </>
   )
 }

packages/website/app/routes/index.tsx

@@ -1,63 +1,29 @@
-import dotsBackgroundUrl from "~/assets/dots-background.svg"
-import { AppFooter } from "~/modules/app/app-footer"
-import { AppLogo } from "~/modules/app/app-logo"
-import LandingCode from "~/modules/landing/landing-code.mdx"
+import packageJson from "reacord/package.json"
+import LandingExample from "~/modules/landing/landing-example.mdx"
 import { MainNavigation } from "~/modules/navigation/main-navigation"
-import { buttonClass, maxWidthContainer } from "~/modules/ui/components"
-import { LandingAnimation } from "../modules/landing/landing-animation"
-import { UncontrolledModal } from "../modules/ui/modal"
+import { maxWidthContainer } from "~/modules/ui/components"
 
 export default function Landing() {
   return (
-    <>
-      <div
-        className="fixed inset-0 rotate-6 scale-125 opacity-20"
-        style={{ backgroundImage: `url(${dotsBackgroundUrl})` }}
-      />
-      <div className="flex flex-col relative min-w-0 min-h-screen pb-4 gap-4">
-        <header className={maxWidthContainer}>
-          <MainNavigation />
-        </header>
-        <div className="flex flex-col gap-4 my-auto px-4">
-          <AppLogo className="w-full max-w-lg mx-auto" />
-
-          <div className="max-w-md w-full mx-auto">
-            <LandingAnimation />
-          </div>
-
-          <p className="text-center text-lg font-light -mb-1">
-            Create interactive Discord messages with React.
-          </p>
-
-          <div className="flex gap-4 self-center">
-            <a
-              href="/guides/getting-started"
-              className={buttonClass({ variant: "solid" })}
-            >
-              Get Started
-            </a>
-
-            <UncontrolledModal
-              button={(button) => (
-                <button
-                  {...button}
-                  className={buttonClass({ variant: "semiblack" })}
-                >
-                  Show Code
-                </button>
-              )}
-            >
-              <div className="text-sm sm:text-base">
-                <LandingCode />
-              </div>
-            </UncontrolledModal>
-          </div>
-        </div>
-
-        <div className="text-center">
-          <AppFooter />
-        </div>
+    <div className="flex flex-col min-w-0 min-h-screen text-center">
+      <header className={maxWidthContainer}>
+        <MainNavigation />
+      </header>
+      <div className="px-4 pb-8 flex flex-1">
+        <main className="px-4 py-6 rounded-lg shadow bg-slate-800 space-y-5 m-auto w-full max-w-xl">
+          <h1 className="text-6xl font-light">reacord</h1>
+          <section className="mx-auto text-sm sm:text-base">
+            <LandingExample />
+          </section>
+          <p className="text-2xl font-light">{packageJson.description}</p>
+          <a
+            href="/guides/getting-started"
+            className="inline-block px-4 py-3 text-xl transition rounded-lg bg-emerald-700 hover:translate-y-[-2px] hover:bg-emerald-800 hover:shadow"
+          >
+            Get Started
+          </a>
+        </main>
       </div>
-    </>
+    </div>
   )
 }

packages/website/app/routes/tailwind[.]css.tsx

@@ -0,0 +1,5 @@
+import type { LoaderFunction } from "remix"
+import { serveTailwindCss } from "remix-tailwind"
+
+export const loader: LoaderFunction = () =>
+  serveTailwindCss("app/modules/ui/tailwind.css")

packages/website/cypress/support/index.js

@@ -14,7 +14,7 @@
 // ***********************************************************
 
 // Import commands.js using ES2015 syntax:
-import "./commands"
+import './commands'
 
 // Alternatively you can use CommonJS syntax:
 // require('./commands')

packages/website/package.json

@@ -2,51 +2,47 @@
   "private": true,
   "name": "website",
   "scripts": {
-    "dev": "concurrently 'typedoc --watch' 'pnpm tailwind -- --watch' 'remix dev'",
+    "prepare": "remix setup node",
+    "dev": "concurrently 'typedoc --watch' 'remix dev'",
     "test": "node ./scripts/test.js",
     "test-dev": "pnpm dev & wait-on http-get://localhost:3000 && cypress open",
-    "build": "typedoc && pnpm tailwind -- --minify && remix build",
+    "build": "typedoc && remix build",
     "start": "remix-serve build",
-    "tailwind": "tailwindcss --config tailwind.config.cjs --input app/modules/ui/tailwind.css --output app/modules/ui/tailwind.out.css",
     "typecheck": "tsc --noEmit && tsc --project cypress/tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@headlessui/react": "^1.5.0",
-    "@heroicons/react": "^1.0.6",
-    "@reach/rect": "^0.17.0",
-    "@remix-run/node": "^1.4.1",
-    "@remix-run/react": "^1.4.1",
-    "@remix-run/serve": "^1.4.1",
-    "@tailwindcss/typography": "^0.5.2",
+    "@heroicons/react": "^1.0.5",
+    "@remix-run/react": "^1.1.1",
+    "@remix-run/serve": "^1.1.1",
+    "@tailwindcss/typography": "^0.5.0",
+    "autoprefixer": "^10.4.2",
     "clsx": "^1.1.1",
-    "fast-glob": "^3.2.11",
+    "fast-glob": "^3.2.10",
     "gray-matter": "^4.0.3",
+    "postcss": "^8.4.5",
     "reacord": "workspace:*",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "react-focus-on": "^3.5.4",
-    "react-router": "^6.3.0",
-    "react-router-dom": "^6.3.0"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "remix": "^1.1.1",
+    "remix-tailwind": "^0.2.1",
+    "tailwindcss": "^3.0.13"
   },
   "devDependencies": {
-    "@remix-run/dev": "^1.4.1",
-    "@remix-run/node": "^1.4.1",
+    "@remix-run/dev": "^1.1.1",
+    "@remix-run/node": "^1.1.1",
     "@testing-library/cypress": "^8.0.2",
     "@types/node": "*",
-    "@types/react": "^18.0.6",
-    "@types/react-dom": "^18.0.2",
-    "@types/tailwindcss": "^3.0.10",
+    "@types/react": "^17.0.38",
+    "@types/react-dom": "^17.0.11",
+    "@types/tailwindcss": "^3.0.2",
     "@types/wait-on": "^5.3.1",
-    "autoprefixer": "^10.4.4",
-    "concurrently": "^7.1.0",
-    "cypress": "^9.5.4",
-    "execa": "^6.1.0",
-    "postcss": "^8.4.12",
-    "rehype-prism-plus": "^1.3.2",
-    "tailwindcss": "^3.0.24",
-    "typedoc": "^0.22.15",
-    "typescript": "^4.6.3",
-    "wait-on": "^6.0.1"
+    "concurrently": "^7.0.0",
+    "cypress": "^9.2.1",
+    "execa": "^6.0.0",
+    "rehype-prism-plus": "^1.3.1",
+    "typedoc": "^0.22.10",
+    "typescript": "^4.5.4",
+    "wait-on": "^6.0.0"
   },
   "engines": {
     "node": ">=14"

packages/website/scripts/test.js

@@ -6,4 +6,5 @@ await execa("pnpm", ["build"], { stdio: "inherit" })
 const app = execa("pnpm", ["start"], { stdio: "inherit" })
 await waitOn({ resources: ["http-get://localhost:3000"] })
 await cypress.run()
+console.log("cypress run done")
 app.kill()

packages/website/tsconfig.json

@@ -2,7 +2,6 @@
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "jsx": "react-jsx",
-    "baseUrl": ".",
     "paths": {
       "~/*": ["./app/*"]
     }