release v0.3.1

.changeset/README.md

@@ -1,8 +0,0 @@
-# Changesets
-
-Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
-with multi-package repos, or single-package repos to help you version and publish your code. You can
-find the full documentation for it [in our repository](https://github.com/changesets/changesets)
-
-We have a quick list of common questions to get you started engaging with this project in
-[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

.changeset/config.json

@@ -1,11 +0,0 @@
-{
-  "$schema": "https://unpkg.com/@changesets/config@2.1.0/schema.json",
-  "changelog": "@changesets/cli/changelog",
-  "commit": false,
-  "fixed": [],
-  "linked": [],
-  "access": "public",
-  "baseBranch": "main",
-  "updateInternalDependencies": "patch",
-  "ignore": []
-}

.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"

.github/workflows/main.yml

@@ -10,10 +10,6 @@ env:
   TEST_CHANNEL_ID: ${{ secrets.TEST_CHANNEL_ID }}
   TEST_GUILD_ID: ${{ secrets.TEST_GUILD_ID }}
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   run-commands:
     strategy:
@@ -23,15 +19,15 @@ jobs:
           # if these run in the same process, it dies,
           # so we test them separate
           - name: test reacord
-            run: pnpm -C packages/reacord test
+            run: pnpm test -C packages/reacord
           - name: test website
-            run: pnpm -C packages/website test
+            run: pnpm test -C packages/website
           - name: build
-            run: pnpm --recursive run build
+            run: pnpm build --recursive
           - name: lint
-            run: pnpm run lint
+            run: pnpm lint
           - name: typecheck
-            run: pnpm --recursive run typecheck
+            run: pnpm typecheck --parallel
     name: ${{ matrix.command.name }}
     runs-on: ubuntu-latest
     steps:
@@ -40,6 +36,6 @@ jobs:
         with:
           # https://github.com/actions/setup-node#supported-version-syntax
           node-version: "16"
-      - run: npm i -g pnpm@7.5.0
+      - run: npm i -g pnpm
       - run: pnpm install --frozen-lockfile
       - run: ${{ matrix.command.run }}

.github/workflows/release.yml

@@ -1,37 +0,0 @@
-# https://pnpm.io/using-changesets
-name: release
-
-on:
-  push:
-    branches:
-      - main
-
-concurrency: ${{ github.workflow }}-${{ github.ref }}
-
-jobs:
-  release:
-    name: release
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-
-      - name: setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 16
-
-      - name: install pnpm
-        run: npm install -g pnpm
-
-      - name: install deps
-        run: pnpm install --frozen-lockfile
-
-      - name: changesets release
-        id: changesets
-        uses: changesets/action@v1
-        with:
-          publish: pnpm run release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.gitignore

@@ -3,8 +3,4 @@ node_modules
 .vscode
 coverage
 .env
-*.code-workspace
-.pnpm-debug.log
 
-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

Dockerfile

@@ -0,0 +1,15 @@
+FROM node:lts-slim
+
+ENV CYPRESS_INSTALL_BINARY=0
+
+WORKDIR /app
+
+COPY / ./
+RUN ls -R
+
+RUN npm install -g pnpm
+RUN pnpm install --unsafe-perm --frozen-lockfile
+RUN pnpm run build -C packages/website
+
+ENV NODE_ENV=production
+CMD [ "pnpm", "-C", "packages/website", "start" ]

README.md

@@ -1,9 +1,7 @@
-<center>
+# reacord
-  <img src="./packages/website/app/assets/banner.png" alt="Reacord: Create interactive Discord messages using React">
+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)
 
+## 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.fly.dev/guides/getting-started)
-[Visit the docs to get started.](https://reacord.mapleleaf.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

@@ -1,23 +1,26 @@
 {
-  "name": "reacord-monorepo",
   "private": true,
   "scripts": {
     "lint": "eslint --ext js,ts,tsx .",
     "lint-fix": "pnpm lint -- --fix",
-    "format": "prettier --write .",
+    "format": "prettier --write ."
-    "build": "pnpm -r run build",
+  },
-    "start": "pnpm -C packages/website run start",
+  "dependencies": {
-    "release": "pnpm -r run build && changeset publish"
+    "@itsmapleleaf/configs": "^1.1.2"
   },
   "devDependencies": {
-    "@changesets/cli": "^2.24.0",
+    "@typescript-eslint/eslint-plugin": "^5.9.1",
-    "@itsmapleleaf/configs": "^1.1.5",
+    "@typescript-eslint/parser": "^5.9.1",
-    "@rushstack/eslint-patch": "^1.1.4",
+    "eslint": "^8.6.0",
-    "@types/eslint": "^8.4.5",
+    "eslint-config-prettier": "^8.3.0",
-    "eslint": "^8.20.0",
+    "eslint-import-resolver-typescript": "^2.5.0",
-    "node": "^16.16.0",
+    "eslint-plugin-import": "^2.25.4",
-    "prettier": "^2.7.1",
+    "eslint-plugin-jsx-a11y": "^6.5.1",
-    "typescript": "^4.7.4"
+    "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/CHANGELOG.md

@@ -1,15 +0,0 @@
-# reacord
-
-## 0.5.1
-
-### Patch Changes
-
-- 72f4a4a: upgrade dependencies and remove some unneeded
-- 7536bde: add types in exports to work with TS nodenext
-- e335165: fix links
-
-## 0.5.0
-
-### Minor Changes
-
-- aa65da5: allow JSX in more places

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,35 +0,0 @@
-import { expect, test } from "vitest"
-import type { PruneNullishValues } from "./prune-nullish-values"
-import { 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",
-    // eslint-disable-next-line unicorn/no-null
-    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
+type PruneNullishValues<Input> = Input extends ReadonlyArray<infer Value>
-  ? OptionalKeys<
+  ? ReadonlyArray<NonNullable<Value>>
-      { [Key in keyof Input]: NonNullable<PruneNullishValues<Input[Key]>> },
+  : Input extends object
-      KeysWithNullishValues<Input>
+  ? {
-    >
+      [Key in keyof Input]: NonNullable<Input[Key]>
-  : Input
-
-type OptionalKeys<Input, Keys extends keyof Input> = Omit<Input, Keys> & {
-  [Key in Keys]?: Input[Key]
     }
-
+  : Input
-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/types.ts

@@ -1,3 +1,4 @@
+/* eslint-disable import/no-unused-modules */
 export type MaybePromise<T> = T | Promise<T>
 
 export type ValueOf<Type> = Type extends ReadonlyArray<infer Value>

packages/reacord/helpers/wait-for.ts

@@ -1,21 +0,0 @@
-import { setTimeout } from "node: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/components/button-shared-props.ts

@@ -1,12 +1,10 @@
-import type { ReactNode } from "react"
-
 /**
  * Common props between button-like components
  * @category Button
  */
 export type ButtonSharedProps = {
   /** The text on the button. Rich formatting (markdown) is not supported here. */
-  label?: ReactNode
+  label?: string
 
   /** When true, the button will be slightly faded, and cannot be clicked. */
   disabled?: boolean

packages/reacord/library/core/components/button.tsx

@@ -1,4 +1,4 @@
-import { randomUUID } from "node:crypto"
+import { nanoid } from "nanoid"
 import React from "react"
 import { ReacordElement } from "../../internal/element.js"
 import type { ComponentInteraction } from "../../internal/interaction"
@@ -34,22 +34,12 @@ export type ButtonClickEvent = ComponentEvent
  */
 export function Button(props: ButtonProps) {
   return (
-    <ReacordElement props={props} createNode={() => new ButtonNode(props)}>
+    <ReacordElement props={props} createNode={() => new ButtonNode(props)} />
-      <ReacordElement props={{}} createNode={() => new ButtonLabelNode({})}>
-        {props.label}
-      </ReacordElement>
-    </ReacordElement>
   )
 }
 
 class ButtonNode extends Node<ButtonProps> {
-  private customId = randomUUID()
+  private customId = nanoid()
-
-  // this has text children, but buttons themselves shouldn't yield text
-  // eslint-disable-next-line class-methods-use-this
-  override get text() {
-    return ""
-  }
 
   override modifyMessageOptions(options: MessageOptions): void {
     getNextActionRow(options).push({
@@ -58,7 +48,7 @@ class ButtonNode extends Node<ButtonProps> {
       style: this.props.style ?? "secondary",
       disabled: this.props.disabled,
       emoji: this.props.emoji,
-      label: this.children.findType(ButtonLabelNode)?.text,
+      label: this.props.label,
     })
   }
 
@@ -73,5 +63,3 @@ class ButtonNode extends Node<ButtonProps> {
     return false
   }
 }
-
-class ButtonLabelNode extends Node<{}> {}

packages/reacord/library/core/components/embed-author.tsx

@@ -1,7 +1,5 @@
-import type { ReactNode } from "react"
 import React from "react"
 import { ReacordElement } from "../../internal/element.js"
-import { Node } from "../../internal/node.js"
 import { EmbedChildNode } from "./embed-child.js"
 import type { EmbedOptions } from "./embed-options"
 
@@ -9,8 +7,8 @@ import type { EmbedOptions } from "./embed-options"
  * @category Embed
  */
 export type EmbedAuthorProps = {
-  name?: ReactNode
+  name?: string
-  children?: ReactNode
+  children?: string
   url?: string
   iconUrl?: string
 }
@@ -20,22 +18,19 @@ export type EmbedAuthorProps = {
  */
 export function EmbedAuthor(props: EmbedAuthorProps) {
   return (
-    <ReacordElement props={props} createNode={() => new EmbedAuthorNode(props)}>
+    <ReacordElement
-      <ReacordElement props={{}} createNode={() => new AuthorTextNode({})}>
+      props={props}
-        {props.name ?? props.children}
+      createNode={() => new EmbedAuthorNode(props)}
-      </ReacordElement>
+    />
-    </ReacordElement>
   )
 }
 
 class EmbedAuthorNode extends EmbedChildNode<EmbedAuthorProps> {
   override modifyEmbedOptions(options: EmbedOptions): void {
     options.author = {
-      name: this.children.findType(AuthorTextNode)?.text ?? "",
+      name: this.props.name ?? this.props.children ?? "",
       url: this.props.url,
       icon_url: this.props.iconUrl,
     }
   }
 }
-
-class AuthorTextNode extends Node<{}> {}

packages/reacord/library/core/components/embed-field.tsx

@@ -1,7 +1,5 @@
-import type { ReactNode } from "react"
 import React from "react"
 import { ReacordElement } from "../../internal/element.js"
-import { Node } from "../../internal/node.js"
 import { EmbedChildNode } from "./embed-child.js"
 import type { EmbedOptions } from "./embed-options"
 
@@ -9,10 +7,10 @@ import type { EmbedOptions } from "./embed-options"
  * @category Embed
  */
 export type EmbedFieldProps = {
-  name: ReactNode
+  name: string
-  value?: ReactNode
+  value?: string
   inline?: boolean
-  children?: ReactNode
+  children?: string
 }
 
 /**
@@ -20,14 +18,10 @@ export type EmbedFieldProps = {
  */
 export function EmbedField(props: EmbedFieldProps) {
   return (
-    <ReacordElement props={props} createNode={() => new EmbedFieldNode(props)}>
+    <ReacordElement
-      <ReacordElement props={{}} createNode={() => new FieldNameNode({})}>
+      props={props}
-        {props.name}
+      createNode={() => new EmbedFieldNode(props)}
-      </ReacordElement>
+    />
-      <ReacordElement props={{}} createNode={() => new FieldValueNode({})}>
-        {props.value || props.children}
-      </ReacordElement>
-    </ReacordElement>
   )
 }
 
@@ -35,12 +29,9 @@ class EmbedFieldNode extends EmbedChildNode<EmbedFieldProps> {
   override modifyEmbedOptions(options: EmbedOptions): void {
     options.fields ??= []
     options.fields.push({
-      name: this.children.findType(FieldNameNode)?.text ?? "",
+      name: this.props.name,
-      value: this.children.findType(FieldValueNode)?.text ?? "",
+      value: this.props.value ?? this.props.children ?? "",
       inline: this.props.inline,
     })
   }
 }
-
-class FieldNameNode extends Node<{}> {}
-class FieldValueNode extends Node<{}> {}

packages/reacord/library/core/components/embed-footer.tsx

@@ -1,7 +1,5 @@
-import type { ReactNode } from "react"
 import React from "react"
 import { ReacordElement } from "../../internal/element.js"
-import { Node } from "../../internal/node.js"
 import { EmbedChildNode } from "./embed-child.js"
 import type { EmbedOptions } from "./embed-options"
 
@@ -9,8 +7,8 @@ import type { EmbedOptions } from "./embed-options"
  * @category Embed
  */
 export type EmbedFooterProps = {
-  text?: ReactNode
+  text?: string
-  children?: ReactNode
+  children?: string
   iconUrl?: string
   timestamp?: string | number | Date
 }
@@ -18,22 +16,19 @@ export type EmbedFooterProps = {
 /**
  * @category Embed
  */
-export function EmbedFooter({ text, children, ...props }: EmbedFooterProps) {
+export function EmbedFooter(props: EmbedFooterProps) {
   return (
-    <ReacordElement props={props} createNode={() => new EmbedFooterNode(props)}>
+    <ReacordElement
-      <ReacordElement props={{}} createNode={() => new FooterTextNode({})}>
+      props={props}
-        {text ?? children}
+      createNode={() => new EmbedFooterNode(props)}
-      </ReacordElement>
+    />
-    </ReacordElement>
   )
 }
 
-class EmbedFooterNode extends EmbedChildNode<
+class EmbedFooterNode extends EmbedChildNode<EmbedFooterProps> {
-  Omit<EmbedFooterProps, "text" | "children">
-> {
   override modifyEmbedOptions(options: EmbedOptions): void {
     options.footer = {
-      text: this.children.findType(FooterTextNode)?.text ?? "",
+      text: this.props.text ?? this.props.children ?? "",
       icon_url: this.props.iconUrl,
     }
     options.timestamp = this.props.timestamp
@@ -41,5 +36,3 @@ class EmbedFooterNode extends EmbedChildNode<
       : undefined
   }
 }
-
-class FooterTextNode extends Node<{}> {}

packages/reacord/library/core/components/embed-title.tsx

@@ -1,7 +1,5 @@
-import type { ReactNode } from "react"
 import React from "react"
 import { ReacordElement } from "../../internal/element.js"
-import { Node } from "../../internal/node.js"
 import { EmbedChildNode } from "./embed-child.js"
 import type { EmbedOptions } from "./embed-options"
 
@@ -9,28 +7,25 @@ import type { EmbedOptions } from "./embed-options"
  * @category Embed
  */
 export type EmbedTitleProps = {
-  children: ReactNode
+  children: string
   url?: string
 }
 
 /**
  * @category Embed
  */
-export function EmbedTitle({ children, ...props }: EmbedTitleProps) {
+export function EmbedTitle(props: EmbedTitleProps) {
   return (
-    <ReacordElement props={props} createNode={() => new EmbedTitleNode(props)}>
+    <ReacordElement
-      <ReacordElement props={{}} createNode={() => new TitleTextNode({})}>
+      props={props}
-        {children}
+      createNode={() => new EmbedTitleNode(props)}
-      </ReacordElement>
+    />
-    </ReacordElement>
   )
 }
 
-class EmbedTitleNode extends EmbedChildNode<Omit<EmbedTitleProps, "children">> {
+class EmbedTitleNode extends EmbedChildNode<EmbedTitleProps> {
   override modifyEmbedOptions(options: EmbedOptions): void {
-    options.title = this.children.findType(TitleTextNode)?.text ?? ""
+    options.title = this.props.children
     options.url = this.props.url
   }
 }
-
-class TitleTextNode extends Node<{}> {}

packages/reacord/library/core/components/link.tsx

@@ -18,26 +18,18 @@ export type LinkProps = ButtonSharedProps & {
 /**
  * @category Link
  */
-export function Link({ label, children, ...props }: LinkProps) {
+export function Link(props: LinkProps) {
-  return (
+  return <ReacordElement props={props} createNode={() => new LinkNode(props)} />
-    <ReacordElement props={props} createNode={() => new LinkNode(props)}>
-      <ReacordElement props={{}} createNode={() => new LinkTextNode({})}>
-        {label || children}
-      </ReacordElement>
-    </ReacordElement>
-  )
 }
 
-class LinkNode extends Node<Omit<LinkProps, "label" | "children">> {
+class LinkNode extends Node<LinkProps> {
   override modifyMessageOptions(options: MessageOptions): void {
     getNextActionRow(options).push({
       type: "link",
       disabled: this.props.disabled,
       emoji: this.props.emoji,
-      label: this.children.findType(LinkTextNode)?.text,
+      label: this.props.label || this.props.children,
       url: this.props.url,
     })
   }
 }
-
-class LinkTextNode extends Node<{}> {}

packages/reacord/library/core/components/option-node.ts

@@ -2,18 +2,13 @@ import type { MessageSelectOptionOptions } from "../../internal/message"
 import { Node } from "../../internal/node"
 import type { OptionProps } from "./option"
 
-export class OptionNode extends Node<
+export class OptionNode extends Node<OptionProps> {
-  Omit<OptionProps, "children" | "label" | "description">
-> {
   get options(): MessageSelectOptionOptions {
     return {
-      label: this.children.findType(OptionLabelNode)?.text ?? this.props.value,
+      label: this.props.children || this.props.label || this.props.value,
       value: this.props.value,
-      description: this.children.findType(OptionDescriptionNode)?.text,
+      description: this.props.description,
       emoji: this.props.emoji,
     }
   }
 }
-
-export class OptionLabelNode extends Node<{}> {}
-export class OptionDescriptionNode extends Node<{}> {}

packages/reacord/library/core/components/option.tsx

@@ -1,11 +1,6 @@
-import type { ReactNode } from "react"
 import React from "react"
 import { ReacordElement } from "../../internal/element"
-import {
+import { OptionNode } from "./option-node"
-  OptionDescriptionNode,
-  OptionLabelNode,
-  OptionNode,
-} from "./option-node"
 
 /**
  * @category Select
@@ -14,11 +9,11 @@ export type OptionProps = {
   /** The internal value of this option */
   value: string
   /** The text shown to the user. This takes priority over `children` */
-  label?: ReactNode
+  label?: string
   /** The text shown to the user */
-  children?: ReactNode
+  children?: string
   /** Description for the option, shown to the user */
-  description?: ReactNode
+  description?: string
 
   /**
    * Renders an emoji to the left of the text.
@@ -36,27 +31,8 @@ export type OptionProps = {
 /**
  * @category Select
  */
-export function Option({
+export function Option(props: OptionProps) {
-  label,
-  children,
-  description,
-  ...props
-}: OptionProps) {
   return (
-    <ReacordElement props={props} createNode={() => new OptionNode(props)}>
+    <ReacordElement props={props} createNode={() => new OptionNode(props)} />
-      {(label !== undefined || children !== undefined) && (
-        <ReacordElement props={{}} createNode={() => new OptionLabelNode({})}>
-          {label || children}
-        </ReacordElement>
-      )}
-      {description !== undefined && (
-        <ReacordElement
-          props={{}}
-          createNode={() => new OptionDescriptionNode({})}
-        >
-          {description}
-        </ReacordElement>
-      )}
-    </ReacordElement>
   )
 }

packages/reacord/library/core/components/select.tsx

@@ -1,4 +1,4 @@
-import { randomUUID } from "node:crypto"
+import { nanoid } from "nanoid"
 import type { ReactNode } from "react"
 import React from "react"
 import { isInstanceOf } from "../../../helpers/is-instance-of"
@@ -89,7 +89,7 @@ export function Select(props: SelectProps) {
 }
 
 class SelectNode extends Node<SelectProps> {
-  readonly customId = randomUUID()
+  readonly customId = nanoid()
 
   override modifyMessageOptions(message: MessageOptions): void {
     const actionRow: ActionRow = []

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/reacord-discord-js.ts

@@ -5,12 +5,9 @@ import type { Except } from "type-fest"
 import { pick } from "../../helpers/pick"
 import { pruneNullishValues } from "../../helpers/prune-nullish-values"
 import { raise } from "../../helpers/raise"
+import { toUpper } from "../../helpers/to-upper"
 import type { ComponentInteraction } from "../internal/interaction"
-import type {
+import type { Message, MessageOptions } from "../internal/message"
-  Message,
-  MessageButtonOptions,
-  MessageOptions,
-} from "../internal/message"
 import { ChannelMessageRenderer } from "../internal/renderers/channel-message-renderer"
 import { InteractionReplyRenderer } from "../internal/renderers/interaction-reply-renderer"
 import type {
@@ -33,7 +30,7 @@ export class ReacordDiscordJs extends Reacord {
     super(config)
 
     client.on("interactionCreate", (interaction) => {
-      if (interaction.isButton() || interaction.isSelectMenu()) {
+      if (interaction.isMessageComponent()) {
         this.handleComponentInteraction(
           this.createReacordComponentInteraction(interaction),
         )
@@ -43,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,
@@ -57,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,
@@ -71,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,
@@ -91,7 +88,7 @@ export class ReacordDiscordJs extends Reacord {
           (await this.client.channels.fetch(channelId)) ??
           raise(`Channel ${channelId} not found`)
 
-        if (!channel.isTextBased()) {
+        if (!channel.isText()) {
           raise(`Channel ${channelId} is not a text channel`)
         }
 
@@ -301,6 +298,17 @@ 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()
     },
@@ -313,6 +321,10 @@ function createEphemeralReacordMessage(): Message {
       console.warn("Ephemeral messages can't be edited")
       return Promise.resolve()
     },
+    disableComponents: () => {
+      console.warn("Ephemeral messages can't be edited")
+      return Promise.resolve()
+    },
     delete: () => {
       console.warn("Ephemeral messages can't be deleted")
       return Promise.resolve()
@@ -320,45 +332,25 @@ function createEphemeralReacordMessage(): Message {
   }
 }
 
-function convertButtonStyleToEnum(style: MessageButtonOptions["style"]) {
-  const styleMap = {
-    primary: Discord.ButtonStyle.Primary,
-    secondary: Discord.ButtonStyle.Secondary,
-    success: Discord.ButtonStyle.Success,
-    danger: Discord.ButtonStyle.Danger,
-  } as const
-
-  return styleMap[style ?? "secondary"]
-}
-
 // TODO: this could be a part of the core library,
 // and also handle some edge cases, e.g. empty messages
-function getDiscordMessageOptions(reacordOptions: MessageOptions) {
+function getDiscordMessageOptions(
-  const options = {
+  reacordOptions: MessageOptions,
+): Discord.MessageOptions {
+  const options: Discord.MessageOptions = {
     // eslint-disable-next-line unicorn/no-null
     content: reacordOptions.content || null,
     embeds: reacordOptions.embeds,
     components: reacordOptions.actionRows.map((row) => ({
-      type: Discord.ComponentType.ActionRow,
+      type: "ACTION_ROW",
       components: row.map(
-        (component): Discord.MessageActionRowComponentData => {
+        (component): Discord.MessageActionRowComponentOptions => {
           if (component.type === "button") {
             return {
-              type: Discord.ComponentType.Button,
+              type: "BUTTON",
               customId: component.customId,
               label: component.label ?? "",
-              style: convertButtonStyleToEnum(component.style),
+              style: toUpper(component.style ?? "secondary"),
-              disabled: component.disabled,
-              emoji: component.emoji,
-            }
-          }
-
-          if (component.type === "link") {
-            return {
-              type: Discord.ComponentType.Button,
-              url: component.url,
-              label: component.label ?? "",
-              style: Discord.ButtonStyle.Link,
               disabled: component.disabled,
               emoji: component.emoji,
             }
@@ -367,7 +359,7 @@ function getDiscordMessageOptions(reacordOptions: MessageOptions) {
           if (component.type === "select") {
             return {
               ...component,
-              type: Discord.ComponentType.SelectMenu,
+              type: "SELECT_MENU",
               options: component.options.map((option) => ({
                 ...option,
                 default: component.values?.includes(option.value),
@@ -375,7 +367,7 @@ function getDiscordMessageOptions(reacordOptions: MessageOptions) {
             }
           }
 
-          raise(`Unsupported component type: ${(component as any).type}`)
+          raise(`Unsupported component type: ${component.type}`)
         },
       ),
     })),

packages/reacord/library/core/reacord.tsx

@@ -47,19 +47,7 @@ export abstract class Reacord {
 
     this.renderers.push(renderer)
 
-    const container = reconciler.createContainer(
+    const container = reconciler.createContainer(renderer, 0, false, {})
-      renderer,
-      0,
-      // eslint-disable-next-line unicorn/no-null
-      null,
-      false,
-      // eslint-disable-next-line unicorn/no-null
-      null,
-      "reacord",
-      () => {},
-      // eslint-disable-next-line unicorn/no-null
-      null,
-    )
 
     const instance: ReacordInstance = {
       render: (content: ReactNode) => {

packages/reacord/library/internal/container.ts

@@ -21,16 +21,6 @@ export class Container<T> {
     this.items = []
   }
 
-  find(predicate: (item: T) => boolean): T | undefined {
-    return this.items.find(predicate)
-  }
-
-  findType<U extends T>(type: new (...args: any[]) => U): U | undefined {
-    for (const item of this.items) {
-      if (item instanceof type) return item
-    }
-  }
-
   [Symbol.iterator]() {
     return this.items[Symbol.iterator]()
   }

packages/reacord/library/internal/message.ts

@@ -49,6 +49,7 @@ export type MessageSelectOptionOptions = {
 export type Message = {
   edit(options: MessageOptions): Promise<void>
   delete(): Promise<void>
+  disableComponents(): Promise<void>
 }
 
 export function getNextActionRow(options: MessageOptions): ActionRow {

packages/reacord/library/internal/node.ts

@@ -13,8 +13,4 @@ export abstract class Node<Props> {
   handleComponentInteraction(interaction: ComponentInteraction): boolean {
     return false
   }
-
-  get text(): string {
-    return [...this.children].map((child) => child.text).join("")
-  }
 }

packages/reacord/library/internal/reconciler.ts

@@ -1,6 +1,5 @@
 import type { HostConfig } from "react-reconciler"
 import ReactReconciler from "react-reconciler"
-import { DefaultEventPriority } from "react-reconciler/constants"
 import { raise } from "../../helpers/raise.js"
 import { Node } from "./node.js"
 import type { Renderer } from "./renderers/renderer"
@@ -21,6 +20,8 @@ const config: HostConfig<
   number, // TimeoutHandle,
   number // NoTimeout,
 > = {
+  // config
+  now: Date.now,
   supportsMutation: true,
   supportsPersistence: false,
   supportsHydration: false,
@@ -51,13 +52,6 @@ const config: HostConfig<
   },
   createTextInstance: (text) => new TextNode(text),
   shouldSetTextContent: () => false,
-  detachDeletedInstance: (instance) => {},
-  beforeActiveInstanceBlur: () => {},
-  afterActiveInstanceBlur: () => {},
-  // eslint-disable-next-line unicorn/no-null
-  getInstanceFromNode: (node: any) => null,
-  // eslint-disable-next-line unicorn/no-null
-  getInstanceFromScope: (scopeInstance: any) => null,
 
   clearContainer: (renderer) => {
     renderer.nodes.clear()
@@ -98,14 +92,11 @@ const config: HostConfig<
   resetAfterCommit: (renderer) => {
     renderer.render()
   },
-  prepareScopeUpdate: (scopeInstance: any, instance: any) => {},
 
   preparePortalMount: () => raise("Portals are not supported"),
   getPublicInstance: () => raise("Refs are currently not supported"),
 
   finalizeInitialChildren: () => false,
-
-  getCurrentEventPriority: () => DefaultEventPriority,
 }
 
 export const reconciler = ReactReconciler(config)

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

@@ -83,17 +83,7 @@ export abstract class Renderer {
 
     if (payload.action === "deactivate") {
       this.updateSubscription.unsubscribe()
-
+      await this.message?.disableComponents()
-      await this.message?.edit({
-        ...payload.options,
-        actionRows: payload.options.actionRows.map((row) =>
-          row.map((component) => ({
-            ...component,
-            disabled: true,
-          })),
-        ),
-      })
-
       return
     }
 

packages/reacord/library/internal/text-node.ts

@@ -5,8 +5,4 @@ export class TextNode extends Node<string> {
   override modifyMessageOptions(options: MessageOptions) {
     options.content = options.content + this.props
   }
-
-  override get text() {
-    return this.props
-  }
 }

packages/reacord/package.json

@@ -2,33 +2,15 @@
   "name": "reacord",
   "type": "module",
   "description": "Create interactive Discord messages using React.",
-  "version": "0.5.1",
+  "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",
+    "dist"
-    "README.md",
-    "LICENSE"
   ],
   "exports": {
     ".": {
       "import": "./dist/main.js",
-      "require": "./dist/main.cjs",
+      "require": "./dist/main.cjs"
-      "types": "./dist/main.d.ts"
     },
     "./package.json": {
       "import": "./package.json",
@@ -36,23 +18,24 @@
     }
   },
   "scripts": {
-    "build": "cp ../../README.md . && cp ../../LICENSE . && tsup library/main.ts --target node16 --format cjs,esm --dts --sourcemap",
+    "build": "tsup-node library/main.ts --target node16 --format cjs,esm --dts --sourcemap",
     "build-watch": "pnpm build -- --watch",
     "test": "vitest --coverage --no-watch",
     "test-dev": "vitest",
-    "test-manual": "nodemon --exec tsx --ext ts,tsx ./scripts/discordjs-manual-test.tsx",
     "typecheck": "tsc --noEmit",
-    "release": "bash scripts/release.sh"
+    "playground": "nodemon --exec esmo --ext ts,tsx --inspect=5858 --enable-source-maps ./playground/main.tsx",
+    "release": "pnpm build && release-it"
   },
   "dependencies": {
     "@types/node": "*",
     "@types/react": "*",
-    "@types/react-reconciler": "^0.28.0",
+    "@types/react-reconciler": "^0.26.4",
-    "react-reconciler": "^0.29.0",
+    "nanoid": "^3.1.31",
-    "rxjs": "^7.5.6"
+    "react-reconciler": "^0.26.2",
+    "rxjs": "^7.5.2"
   },
   "peerDependencies": {
-    "discord.js": "^14",
+    "discord.js": "^13.3",
     "react": ">=17"
   },
   "peerDependenciesMeta": {
@@ -61,21 +44,24 @@
     }
   },
   "devDependencies": {
-    "@types/lodash-es": "^4.17.6",
+    "@types/lodash-es": "^4.17.5",
-    "c8": "^7.12.0",
+    "c8": "^7.11.0",
-    "discord.js": "^14.0.3",
+    "discord.js": "^13.5.1",
-    "dotenv": "^16.0.1",
+    "dotenv": "^11.0.0",
+    "esbuild": "latest",
+    "esbuild-jest": "^0.5.0",
+    "esmo": "^0.13.0",
     "lodash-es": "^4.17.21",
-    "nodemon": "^2.0.19",
+    "nodemon": "^2.0.15",
-    "prettier": "^2.7.1",
+    "prettier": "^2.5.1",
-    "pretty-ms": "^8.0.0",
+    "pretty-ms": "^7.0.1",
-    "react": "^18.2.0",
+    "react": "^17.0.2",
-    "release-it": "^15.1.3",
+    "release-it": "^14.12.1",
-    "tsup": "^6.1.3",
+    "tsup": "^5.11.11",
-    "tsx": "^3.8.0",
+    "type-fest": "^2.9.0",
-    "type-fest": "^2.17.0",
+    "typescript": "^4.5.4",
-    "typescript": "^4.7.4",
+    "vite": "^2.7.10",
-    "vitest": "^0.18.1"
+    "vitest": "^0.0.141"
   },
   "resolutions": {
     "esbuild": "latest"
@@ -88,8 +74,5 @@
       "release": true,
       "web": true
     }
-  },
-  "publishConfig": {
-    "access": "public"
   }
 }

packages/reacord/playground/command-handler.ts

@@ -0,0 +1,38 @@
+import type { Client, CommandInteraction } from "discord.js"
+
+type Command = {
+  name: string
+  description: string
+  run: (interaction: CommandInteraction) => unknown
+}
+
+export function createCommandHandler(client: Client, commands: Command[]) {
+  client.on("ready", async () => {
+    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,
+        )
+      }
+    }
+  })
+
+  client.on("interactionCreate", async (interaction) => {
+    if (!interaction.isCommand()) return
+
+    const command = commands.find(
+      (command) => command.name === interaction.commandName,
+    )
+    if (command) {
+      try {
+        await command.run(interaction)
+      } catch (error) {
+        console.error(error)
+      }
+    }
+  })
+}

packages/reacord/playground/counter.tsx

@@ -0,0 +1,36 @@
+import * as React from "react"
+import { Button, Embed, EmbedField, EmbedTitle } from "../library/main"
+
+export function Counter(props: { onDeactivate: () => void }) {
+  const [count, setCount] = React.useState(0)
+  const [embedVisible, setEmbedVisible] = React.useState(false)
+
+  return (
+    <>
+      this button was clicked {count} times
+      {embedVisible && (
+        <Embed>
+          <EmbedTitle>the counter</EmbedTitle>
+          {count > 0 && (
+            <EmbedField name="is it even?">
+              {count % 2 === 0 ? "yes" : "no"}
+            </EmbedField>
+          )}
+        </Embed>
+      )}
+      {embedVisible && (
+        <Button label="hide embed" onClick={() => setEmbedVisible(false)} />
+      )}
+      <Button
+        style="primary"
+        emoji="<:plus_one:778531744860602388>"
+        label="clicc"
+        onClick={() => setCount(count + 1)}
+      />
+      {!embedVisible && (
+        <Button label="show embed" onClick={() => setEmbedVisible(true)} />
+      )}
+      <Button style="danger" label="deactivate" onClick={props.onDeactivate} />
+    </>
+  )
+}

packages/reacord/playground/fruit-select.tsx

@@ -0,0 +1,31 @@
+import React, { useState } from "react"
+import { Button, Option, Select } from "../library/main"
+
+export function FruitSelect({
+  onConfirm,
+}: {
+  onConfirm: (choice: string) => void
+}) {
+  const [value, setValue] = useState<string>()
+
+  return (
+    <>
+      <Select
+        placeholder="choose a fruit"
+        value={value}
+        onChangeValue={setValue}
+      >
+        <Option value="🍎" />
+        <Option value="🍌" />
+        <Option value="🍒" />
+      </Select>
+      <Button
+        label="confirm"
+        disabled={value == undefined}
+        onClick={() => {
+          if (value) onConfirm(value)
+        }}
+      />
+    </>
+  )
+}

packages/reacord/playground/main.tsx

@@ -0,0 +1,109 @@
+import { Client } from "discord.js"
+import "dotenv/config"
+import React from "react"
+import { Button, ReacordDiscordJs, useInstance } from "../library/main"
+import { createCommandHandler } from "./command-handler"
+import { Counter } from "./counter"
+import { FruitSelect } from "./fruit-select"
+
+const client = new Client({
+  intents: ["GUILDS"],
+})
+
+const reacord = new ReacordDiscordJs(client)
+
+client.on("ready", () => {
+  console.info("ready 💖")
+
+  // const now = new Date()
+
+  // function UptimeCounter() {
+  //   const [uptime, setUptime] = React.useState(0)
+
+  //   React.useEffect(() => {
+  //     const interval = setInterval(() => {
+  //       setUptime(Date.now() - now.getTime())
+  //     }, 5000)
+  //     return () => clearInterval(interval)
+  //   }, [])
+
+  //   return (
+  //     <Embed>this bot has been running for {prettyMilliseconds(uptime)}</Embed>
+  //   )
+  // }
+
+  // reacord.send("671787605624487941", <UptimeCounter />)
+})
+
+createCommandHandler(client, [
+  {
+    name: "button",
+    description: "it's a button",
+    run: (interaction) => {
+      reacord.reply(
+        interaction,
+        <Button label="clic" onClick={() => console.info("was clic")} />,
+      )
+    },
+  },
+  {
+    name: "counter",
+    description: "shows a counter button",
+    run: (interaction) => {
+      const reply = reacord.reply(interaction)
+      reply.render(<Counter onDeactivate={() => reply.destroy()} />)
+    },
+  },
+  {
+    name: "select",
+    description: "shows a select",
+    run: (interaction) => {
+      const instance = reacord.reply(
+        interaction,
+        <FruitSelect
+          onConfirm={(value) => {
+            instance.render(`you chose ${value}`)
+            instance.deactivate()
+          }}
+        />,
+      )
+    },
+  },
+  {
+    name: "ephemeral-button",
+    description: "button which shows ephemeral messages",
+    run: (interaction) => {
+      reacord.reply(
+        interaction,
+        <>
+          <Button
+            label="public clic"
+            onClick={(event) =>
+              reacord.reply(
+                interaction,
+                `${event.guild?.member.displayName} clic`,
+              )
+            }
+          />
+          <Button
+            label="clic"
+            onClick={(event) => event.ephemeralReply("you clic")}
+          />
+        </>,
+      )
+    },
+  },
+  {
+    name: "delete-this",
+    description: "delete this",
+    run: (interaction) => {
+      function DeleteThis() {
+        const instance = useInstance()
+        return <Button label="delete this" onClick={() => instance.destroy()} />
+      }
+      reacord.reply(interaction, <DeleteThis />)
+    },
+  },
+])
+
+await client.login(process.env.TEST_BOT_TOKEN)

packages/reacord/scripts/discordjs-manual-test.tsx

@@ -1,139 +0,0 @@
-import type { TextChannel } from "discord.js"
-import { ChannelType, Client, IntentsBitField } from "discord.js"
-import "dotenv/config"
-import { kebabCase } from "lodash-es"
-import * as React from "react"
-import { useState } from "react"
-import {
-  Button,
-  Link,
-  Option,
-  ReacordDiscordJs,
-  Select,
-  useInstance,
-} from "../library/main"
-
-const client = new Client({ intents: IntentsBitField.Flags.Guilds })
-const reacord = new ReacordDiscordJs(client)
-
-await client.login(process.env.TEST_BOT_TOKEN)
-
-const guild = await client.guilds.fetch(process.env.TEST_GUILD_ID!)
-
-const category = await guild.channels.fetch(process.env.TEST_CATEGORY_ID!)
-if (category?.type !== ChannelType.GuildCategory) {
-  throw new Error(
-    `channel ${process.env.TEST_CATEGORY_ID} is not a guild category. received ${category?.type}`,
-  )
-}
-
-for (const [, channel] of category.children.cache) {
-  await channel.delete()
-}
-
-let prefix = 0
-const createTest = async (
-  name: string,
-  block: (channel: TextChannel) => void | Promise<unknown>,
-) => {
-  prefix += 1
-  const channel = await category.children.create({
-    type: ChannelType.GuildText,
-    name: `${String(prefix).padStart(3, "0")}-${kebabCase(name)}`,
-  })
-  await block(channel)
-}
-
-await createTest("basic", (channel) => {
-  reacord.send(channel.id, "Hello, world!")
-})
-
-await createTest("counter", (channel) => {
-  const Counter = () => {
-    const [count, setCount] = React.useState(0)
-    return (
-      <>
-        count: {count}
-        <Button
-          style="primary"
-          emoji="➕"
-          onClick={() => setCount(count + 1)}
-        />
-        <Button
-          style="primary"
-          emoji="➖"
-          onClick={() => setCount(count - 1)}
-        />
-        <Button label="reset" onClick={() => setCount(0)} />
-      </>
-    )
-  }
-  reacord.send(channel.id, <Counter />)
-})
-
-await createTest("select", (channel) => {
-  function FruitSelect({ onConfirm }: { onConfirm: (choice: string) => void }) {
-    const [value, setValue] = useState<string>()
-
-    return (
-      <>
-        <Select
-          placeholder="choose a fruit"
-          value={value}
-          onChangeValue={setValue}
-        >
-          <Option value="🍎" emoji="🍎" label="apple" description="it red" />
-          <Option value="🍌" emoji="🍌" label="banana" description="bnanbna" />
-          <Option value="🍒" emoji="🍒" label="cherry" description="heh" />
-        </Select>
-        <Button
-          label="confirm"
-          disabled={value == undefined}
-          onClick={() => {
-            if (value) onConfirm(value)
-          }}
-        />
-      </>
-    )
-  }
-
-  const instance = reacord.send(
-    channel.id,
-    <FruitSelect
-      onConfirm={(value) => {
-        instance.render(`you chose ${value}`)
-        instance.deactivate()
-      }}
-    />,
-  )
-})
-
-await createTest("ephemeral button", (channel) => {
-  reacord.send(
-    channel.id,
-    <>
-      <Button
-        label="public clic"
-        onClick={(event) =>
-          event.reply(`${event.guild?.member.displayName} clic`)
-        }
-      />
-      <Button
-        label="clic"
-        onClick={(event) => event.ephemeralReply("you clic")}
-      />
-    </>,
-  )
-})
-
-await createTest("delete this", (channel) => {
-  function DeleteThis() {
-    const instance = useInstance()
-    return <Button label="delete this" onClick={() => instance.destroy()} />
-  }
-  reacord.send(channel.id, <DeleteThis />)
-})
-
-await createTest("link", (channel) => {
-  reacord.send(channel.id, <Link label="hi" url="https://mapleleaf.dev" />)
-})

packages/reacord/test/commonjs-require.test.ts

@@ -1,12 +0,0 @@
-import { spawnSync } from "node:child_process"
-import { createRequire } from "node:module"
-import { beforeAll, expect, test } from "vitest"
-
-beforeAll(() => {
-  spawnSync("pnpm", ["run", "build"])
-})
-
-test("can require commonjs", () => {
-  const require = createRequire(import.meta.url)
-  expect(() => require("../dist/main.cjs")).not.toThrow()
-})

packages/reacord/test/reacord.test.tsx

@@ -35,7 +35,7 @@ test("rendering behavior", async () => {
     },
   ])
 
-  await tester.findButtonByLabel("show embed").click()
+  tester.findButtonByLabel("show embed").click()
   await tester.assertMessages([
     {
       content: "count: 0",
@@ -62,7 +62,7 @@ test("rendering behavior", async () => {
     },
   ])
 
-  await tester.findButtonByLabel("clicc").click()
+  tester.findButtonByLabel("clicc").click()
   await tester.assertMessages([
     {
       content: "count: 1",
@@ -94,7 +94,7 @@ test("rendering behavior", async () => {
     },
   ])
 
-  await tester.findButtonByLabel("clicc").click()
+  tester.findButtonByLabel("clicc").click()
   await tester.assertMessages([
     {
       content: "count: 2",
@@ -126,7 +126,7 @@ test("rendering behavior", async () => {
     },
   ])
 
-  await tester.findButtonByLabel("hide embed").click()
+  tester.findButtonByLabel("hide embed").click()
   await tester.assertMessages([
     {
       content: "count: 2",
@@ -153,7 +153,7 @@ test("rendering behavior", async () => {
     },
   ])
 
-  await tester.findButtonByLabel("clicc").click()
+  tester.findButtonByLabel("clicc").click()
   await tester.assertMessages([
     {
       content: "count: 3",
@@ -180,7 +180,7 @@ test("rendering behavior", async () => {
     },
   ])
 
-  await tester.findButtonByLabel("deactivate").click()
+  tester.findButtonByLabel("deactivate").click()
   await tester.assertMessages([
     {
       content: "count: 3",
@@ -210,7 +210,7 @@ test("rendering behavior", async () => {
     },
   ])
 
-  await tester.findButtonByLabel("clicc").click()
+  tester.findButtonByLabel("clicc").click()
   await tester.assertMessages([
     {
       content: "count: 3",

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>()
@@ -59,23 +59,23 @@ test("single select", async () => {
   await assertSelect([])
   expect(onSelect).toHaveBeenCalledTimes(0)
 
-  await tester.findSelectByPlaceholder("choose one").select("2")
+  tester.findSelectByPlaceholder("choose one").select("2")
   await assertSelect(["2"])
   expect(onSelect).toHaveBeenCalledWith(
     expect.objectContaining({ values: ["2"] }),
   )
 
-  await tester.findButtonByLabel("disable").click()
+  tester.findButtonByLabel("disable").click()
   await assertSelect(["2"], true)
 
-  await tester.findSelectByPlaceholder("choose one").select("1")
+  tester.findSelectByPlaceholder("choose one").select("1")
   await assertSelect(["2"], true)
   expect(onSelect).toHaveBeenCalledTimes(1)
 })
 
 test("multiple select", async () => {
   const tester = new ReacordTester()
-  const onSelect = vi.fn()
+  const onSelect = fn()
 
   function TestSelect() {
     const [values, setValues] = useState<string[]>([])
@@ -125,19 +125,19 @@ test("multiple select", async () => {
   await assertSelect([])
   expect(onSelect).toHaveBeenCalledTimes(0)
 
-  await tester.findSelectByPlaceholder("select").select("1", "3")
+  tester.findSelectByPlaceholder("select").select("1", "3")
   await assertSelect(expect.arrayContaining(["1", "3"]) as unknown as string[])
   expect(onSelect).toHaveBeenCalledWith(
     expect.objectContaining({ values: expect.arrayContaining(["1", "3"]) }),
   )
 
-  await tester.findSelectByPlaceholder("select").select("2")
+  tester.findSelectByPlaceholder("select").select("2")
   await assertSelect(expect.arrayContaining(["2"]) as unknown as string[])
   expect(onSelect).toHaveBeenCalledWith(
     expect.objectContaining({ values: expect.arrayContaining(["2"]) }),
   )
 
-  await tester.findSelectByPlaceholder("select").select()
+  tester.findSelectByPlaceholder("select").select()
   await assertSelect([])
   expect(onSelect).toHaveBeenCalledWith(expect.objectContaining({ values: [] }))
 })
@@ -145,7 +145,7 @@ test("multiple select", async () => {
 test("optional onSelect + unknown value", async () => {
   const tester = new ReacordTester()
   tester.reply().render(<Select placeholder="select" />)
-  await tester.findSelectByPlaceholder("select").select("something")
+  tester.findSelectByPlaceholder("select").select("something")
   await tester.assertMessages([
     {
       content: "",

packages/reacord/test/test-adapter.ts

@@ -1,14 +1,14 @@
 /* eslint-disable class-methods-use-this */
 /* eslint-disable require-await */
-import { randomUUID } from "node:crypto"
+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[]) {
+  async assertMessages(expected: MessageSample[]) {
-    return waitFor(() => {
+    await nextTickPromise()
     expect(this.sampleMessages()).toEqual(expected)
-    })
   }
 
   async assertRender(content: ReactNode, expected: MessageSample[]) {
@@ -102,59 +108,58 @@ export class ReacordTester extends Reacord {
   }
 
   findButtonByLabel(label: string) {
-    return {
+    for (const message of this.messageContainer) {
-      click: () => {
+      for (const component of message.options.actionRows.flat()) {
-        return waitFor(() => {
-          for (const [component, message] of this.eachComponent()) {
         if (component.type === "button" && component.label === label) {
-              this.handleComponentInteraction(
+          return this.createButtonActions(component, message)
-                new TestButtonInteraction(component.customId, message, this),
+        }
-              )
-              return
       }
     }
     raise(`Couldn't find button with label "${label}"`)
-        })
-      },
-    }
   }
 
   findSelectByPlaceholder(placeholder: string) {
-    return {
+    for (const message of this.messageContainer) {
-      select: (...values: string[]) => {
+      for (const component of message.options.actionRows.flat()) {
-        return waitFor(() => {
-          for (const [component, message] of this.eachComponent()) {
         if (
           component.type === "select" &&
           component.placeholder === placeholder
         ) {
-              this.handleComponentInteraction(
+          return this.createSelectActions(component, message)
-                new TestSelectInteraction(
+        }
-                  component.customId,
-                  message,
-                  values,
-                  this,
-                ),
-              )
-              return
       }
     }
     raise(`Couldn't find select with placeholder "${placeholder}"`)
-        })
-      },
-    }
   }
 
   createMessage(options: MessageOptions) {
     return new TestMessage(options, this.messageContainer)
   }
 
-  private *eachComponent() {
+  private createButtonActions(
-    for (const message of this.messageContainer) {
+    button: MessageButtonOptions,
-      for (const component of message.options.actionRows.flat()) {
+    message: TestMessage,
-        yield [component, message] as const
+  ) {
+    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,19 +197,21 @@ class TestCommandInteraction implements CommandInteraction {
 
   constructor(private messageContainer: Container<TestMessage>) {}
 
-  async reply(messageOptions: MessageOptions): Promise<Message> {
+  reply(messageOptions: MessageOptions): Promise<Message> {
-    await setTimeout()
+    return Promise.resolve(
-    return new TestMessage(messageOptions, this.messageContainer)
+      new TestMessage(messageOptions, this.messageContainer),
+    )
   }
 
-  async followUp(messageOptions: MessageOptions): Promise<Message> {
+  followUp(messageOptions: MessageOptions): Promise<Message> {
-    await setTimeout()
+    return Promise.resolve(
-    return new TestMessage(messageOptions, this.messageContainer)
+      new TestMessage(messageOptions, this.messageContainer),
+    )
   }
 }
 
 class TestInteraction {
-  readonly id = randomUUID()
+  readonly id = nanoid()
   readonly channelId = "test-channel-id"
 
   constructor(

packages/reacord/test/text-children.test.tsx

@@ -1,89 +0,0 @@
-import * as React from "react"
-import { test } from "vitest"
-import {
-  Button,
-  Embed,
-  EmbedAuthor,
-  EmbedField,
-  EmbedFooter,
-  EmbedTitle,
-  Link,
-  Option,
-  Select,
-} from "../library/main"
-import { ReacordTester } from "./test-adapter"
-
-test("text children in other components", async () => {
-  const tester = new ReacordTester()
-
-  const SomeText = () => <>some text</>
-
-  await tester.assertRender(
-    <>
-      <Embed>
-        <EmbedTitle>
-          <SomeText />
-        </EmbedTitle>
-        <EmbedAuthor>
-          <SomeText />
-        </EmbedAuthor>
-        <EmbedField name={<SomeText />}>
-          <SomeText /> <Button label="ignore this" onClick={() => {}} />
-          nailed it
-        </EmbedField>
-        <EmbedFooter>
-          <SomeText />
-        </EmbedFooter>
-      </Embed>
-      <Button label={<SomeText />} onClick={() => {}} />
-      <Link url="https://discord.com" label={<SomeText />} />
-      <Select>
-        <Option value="1">
-          <SomeText />
-        </Option>
-        <Option value="2" label={<SomeText />} description={<SomeText />} />
-      </Select>
-    </>,
-    [
-      {
-        content: "",
-        embeds: [
-          {
-            title: "some text",
-            author: {
-              name: "some text",
-            },
-            fields: [{ name: "some text", value: "some text nailed it" }],
-            footer: {
-              text: "some text",
-            },
-          },
-        ],
-        actionRows: [
-          [
-            {
-              type: "button",
-              label: "some text",
-              style: "secondary",
-            },
-            {
-              type: "link",
-              url: "https://discord.com",
-              label: "some text",
-            },
-          ],
-          [
-            {
-              type: "select",
-              values: [],
-              options: [
-                { value: "1", label: "some text" },
-                { value: "2", label: "some text", description: "some text" },
-              ],
-            },
-          ],
-        ],
-      },
-    ],
-  )
-})

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/reacord/vitest.config.ts

@@ -1,5 +1,5 @@
 /// <reference types="vitest" />
-import { defineConfig } from "vitest/config"
+import { defineConfig } from "vite"
 
 export default defineConfig({
   build: {

packages/website/.gitignore

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

packages/website/CHANGELOG.md

@@ -1,17 +0,0 @@
-# website
-
-## 0.4.2
-
-### Patch Changes
-
-- Updated dependencies [72f4a4a]
-- Updated dependencies [7536bde]
-- Updated dependencies [e335165]
-  - reacord@0.5.1
-
-## 0.4.1
-
-### Patch Changes
-
-- Updated dependencies [aa65da5]
-  - reacord@0.5.0

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 { hydrate } from "react-dom";
-import { RemixBrowser } from "@remix-run/react"
+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 { renderToString } from "react-dom/server";
-import type { EntryContext } from "@remix-run/node"
+import { RemixServer } from "remix";
-import { RemixServer } from "@remix-run/react"
+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 { Link } from "remix"
-import { ExternalLink } from "~/modules/dom/external-link"
 
 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/load-guide-links.server.ts

@@ -2,34 +2,35 @@ import glob from "fast-glob"
 import grayMatter from "gray-matter"
 import { readFile } from "node:fs/promises"
 import { join, parse } from "node:path"
-import { z } from "zod"
+import type { AppLinkProps } from "~/modules/navigation/app-link"
 
 const guidesFolder = "app/routes/guides"
 
-const frontmatterSchema = z.object({
+export type GuideLink = {
-  meta: z.object({
+  title: string
-    title: z.string(),
+  order: number
-    description: z.string(),
+  link: AppLinkProps
-  }),
+}
-  order: z.number().optional(),
-})
 
-export type GuideLink = Awaited<ReturnType<typeof loadGuideLinks>>[0]
+export async function loadGuideLinks(): Promise<GuideLink[]> {
-
-export async function loadGuideLinks() {
   const guideFiles = await glob(`**/*.md`, { cwd: guidesFolder })
 
-  const links = await Promise.all(
+  const links: GuideLink[] = await Promise.all(
     guideFiles.map(async (file) => {
-      const result = grayMatter(await readFile(join(guidesFolder, file)))
+      const { data } = grayMatter(await readFile(join(guidesFolder, file)))
-      const data = frontmatterSchema.parse(result.data)
+
+      let order = data.order
+      if (!Number.isFinite(order)) {
+        order = Number.POSITIVE_INFINITY
+      }
+
       return {
-        title: data.meta.title,
+        title: data.meta?.title,
-        order: data.order ?? Number.POSITIVE_INFINITY,
+        order,
         link: {
-          type: "router" as const,
+          type: "router",
           to: `/guides/${parse(file).name}`,
-          children: data.meta.title,
+          children: data.meta?.title,
         },
       }
     }),

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" />
+        <h1 className="text-3xl font-light">reacord</h1>
-        <span className="sr-only">Home</span>
       </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 } = {}) =>
+export const linkClass = clsx`
-  clsx(
+  font-medium inline-block relative
-    clsx`font-medium inline-block relative`,
+  opacity-60 hover:opacity-100 transition-opacity
-    clsx`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
-    clsx`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
-    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 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,44 +1,24 @@
-import type { LinksFunction, MetaFunction } from "@remix-run/node"
+import packageJson from "reacord/package.json"
+import type { LinksFunction, LoaderFunction, MetaFunction } from "remix"
 import {
   Links,
   LiveReload,
   Meta,
   Outlet,
-  Scripts,
   ScrollRestoration,
   useLoaderData,
-} from "@remix-run/react"
+} from "remix"
-import packageJson from "reacord/package.json"
-import bannerUrl from "~/assets/banner.png"
-import faviconUrl from "~/assets/favicon.png"
 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",
+  title: "Reacord",
-  "description": packageJson.description,
+  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,
 })
 
 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",
@@ -50,43 +30,37 @@ 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: "/tailwind.css" },
-    rel: "stylesheet",
+  { rel: "stylesheet", href: prismThemeCss },
-    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",
-  },
 ]
 
-export async function loader() {
+type LoaderData = {
-  return {
+  guideLinks: GuideLink[]
+}
+
+export const loader: LoaderFunction = async () => {
+  const data: LoaderData = {
     guideLinks: await loadGuideLinks(),
   }
+  return data
 }
 
 export default function App() {
-  const data = useLoaderData<typeof loader>()
+  const data: LoaderData = useLoaderData()
   return (
     <html lang="en" className="bg-slate-900 text-slate-100">
       <head>
-        {/* eslint-disable-next-line unicorn/text-encoding-identifier-case */}
         <meta charSet="utf-8" />
         <meta name="viewport" content="width=device-width,initial-scale=1" />
         <Meta />
         <Links />
-        {process.env.NODE_ENV === "production" && (
+        <script defer src="https://unpkg.com/alpinejs@3.7.1/dist/cdn.min.js" />
-          <script
-            async
-            defer
-            data-website-id="e3ce3a50-720e-4489-be37-cc091c1b7029"
-            src="https://umami-production-72bc.up.railway.app/umami.js"
-          ></script>
-        )}
       </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 { Outlet } from "remix"
-import { ActiveLink } from "~/modules/navigation/active-link"
 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}>
+                <AppLink {...link} className={linkClass} />
-                  {({ active }) => (
-                    <AppLink {...link} className={linkClass({ active })} />
-                  )}
-                </ActiveLink>
               </li>
             ))}
           </ul>
@@ -38,6 +33,6 @@ export default function GuidePage() {
           <Outlet />
         </section>
       </main>
-    </div>
+    </>
   )
 }

packages/website/app/routes/guides/getting-started.md

@@ -7,15 +7,11 @@ meta:
 
 # Getting Started
 
-These guides assume some familiarity with JavaScript, [React](https://reactjs.org), [Discord.js](https://discord.js.org) and the [Discord API](https://discord.dev). Keep these pages as reference if you need it.
+This guide assumes some familiarity with JavaScript, [React](https://reactjs.org), [Discord.js](https://discord.js.org) and the [Discord API](https://discord.dev). Keep these pages as reference if you need it.
 
-## Setup from template
+**Note:** Ensure your project has support for running code with JSX. I recommend using [esno](https://npm.im/esno).
 
-[Use this starter template](https://github.com/itsMapleLeaf/reacord-starter) to get off the ground quickly.
+## Install
-
-## Adding to an existing project
-
-Install Reacord and dependencies:
 
 ```bash
 # npm
@@ -28,10 +24,12 @@ yarn add reacord react discord.js
 pnpm add reacord react discord.js
 ```
 
+## Setup
+
 Create a Discord.js client and a Reacord instance:
 
 ```js
-// main.jsx
+// main.js
 import { Client } from "discord.js"
 import { ReacordDiscordJs } from "reacord"
 
@@ -44,10 +42,3 @@ client.on("ready", () => {
 
 await client.login(process.env.BOT_TOKEN)
 ```
-
-To use JSX in your code, run it with [tsx](https://npm.im/tsx):
-
-```bash
-npm install tsx
-tsx main.tsx
-```

packages/website/app/routes/guides/use-instance.md

@@ -1,5 +1,4 @@
 ---
-order: 5
 meta:
   title: useInstance
   description: Using useInstance to get the current instance within a component

packages/website/app/routes/index.tsx

@@ -1,63 +1,29 @@
-import dotsBackgroundUrl from "~/assets/dots-background.svg"
+import packageJson from "reacord/package.json"
-import { AppFooter } from "~/modules/app/app-footer"
+import LandingExample from "~/modules/landing/landing-example.mdx"
-import { AppLogo } from "~/modules/app/app-logo"
-import LandingCode from "~/modules/landing/landing-code.mdx"
 import { MainNavigation } from "~/modules/navigation/main-navigation"
-import { buttonClass, maxWidthContainer } from "~/modules/ui/components"
+import { maxWidthContainer } from "~/modules/ui/components"
-import { LandingAnimation } from "../modules/landing/landing-animation"
-import { UncontrolledModal } from "../modules/ui/modal"
 
 export default function Landing() {
   return (
-    <>
+    <div className="flex flex-col min-w-0 min-h-screen text-center">
-      <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">
+      <div className="px-4 pb-8 flex flex-1">
-          <AppLogo className="w-full max-w-lg mx-auto" />
+        <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>
-          <div className="max-w-md w-full mx-auto">
+          <section className="mx-auto text-sm sm:text-base">
-            <LandingAnimation />
+            <LandingExample />
-          </div>
+          </section>
-
+          <p className="text-2xl font-light">{packageJson.description}</p>
-          <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" })}
+            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>
-            <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>
-    </>
   )
 }

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.config.ts

@@ -1,8 +0,0 @@
-import { defineConfig } from "cypress"
-
-export default defineConfig({
-  e2e: {
-    setupNodeEvents(on, config) {},
-    baseUrl: "http://localhost:3000/",
-  },
-})

packages/website/cypress.json

@@ -0,0 +1,3 @@
+{
+  "baseUrl": "http://localhost:3000/"
+}

packages/website/cypress/fixtures/example.json

@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}

packages/website/cypress/plugins/index.js

@@ -0,0 +1,22 @@
+/// <reference types="cypress" />
+// ***********************************************************
+// This example plugins/index.js can be used to load plugins
+//
+// You can change the location of this file or turn off loading
+// the plugins file with the 'pluginsFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/plugins-guide
+// ***********************************************************
+
+// This function is called when a project is opened or re-opened (e.g. due to
+// the project's config changing)
+
+/**
+ * @type {Cypress.PluginConfig}
+ */
+// eslint-disable-next-line no-unused-vars
+export default function cypressConfig(on, config) {
+  // `on` is used to hook into various events Cypress emits
+  // `config` is the resolved Cypress config
+}

packages/website/cypress/support/commands.js

@@ -0,0 +1,26 @@
+// ***********************************************
+// This example commands.js shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+//
+//
+// -- This is a parent command --
+// Cypress.Commands.add('login', (email, password) => { ... })
+//
+//
+// -- This is a child command --
+// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
+import "@testing-library/cypress/add-commands"

packages/website/cypress/support/commands.ts

@@ -1 +0,0 @@
-import "@testing-library/cypress/add-commands"

packages/website/cypress/support/e2e.ts

@@ -1 +0,0 @@
-import "./commands"

packages/website/cypress/support/index.js

@@ -0,0 +1,20 @@
+// ***********************************************************
+// This example support/index.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands'
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')

packages/website/package.json

@@ -1,54 +1,51 @@
 {
-  "name": "website",
-  "version": "0.4.2",
   "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.6.6",
+    "@heroicons/react": "^1.0.5",
-    "@heroicons/react": "^1.0.6",
+    "@remix-run/react": "^1.1.1",
-    "@reach/rect": "^0.17.0",
+    "@remix-run/serve": "^1.1.1",
-    "@remix-run/node": "^1.6.5",
+    "@tailwindcss/typography": "^0.5.0",
-    "@remix-run/react": "^1.6.5",
+    "autoprefixer": "^10.4.2",
-    "@remix-run/serve": "^1.6.5",
+    "clsx": "^1.1.1",
-    "@tailwindcss/typography": "^0.5.4",
+    "fast-glob": "^3.2.10",
-    "clsx": "^1.2.1",
-    "fast-glob": "^3.2.11",
     "gray-matter": "^4.0.3",
+    "postcss": "^8.4.5",
     "reacord": "workspace:*",
-    "react": "^18.2.0",
+    "react": "^17.0.2",
-    "react-dom": "^18.2.0",
+    "react-dom": "^17.0.2",
-    "react-focus-on": "^3.6.0",
+    "remix": "^1.1.1",
-    "react-router": "^6.3.0",
+    "remix-tailwind": "^0.2.1",
-    "react-router-dom": "^6.3.0",
+    "tailwindcss": "^3.0.13"
-    "zod": "^3.17.10"
   },
   "devDependencies": {
-    "@remix-run/dev": "^1.6.5",
+    "@remix-run/dev": "^1.1.1",
-    "@remix-run/node": "^1.4.1",
+    "@remix-run/node": "^1.1.1",
-    "@testing-library/cypress": "^8.0.3",
+    "@testing-library/cypress": "^8.0.2",
     "@types/node": "*",
-    "@types/react": "^18.0.15",
+    "@types/react": "^17.0.38",
-    "@types/react-dom": "^18.0.6",
+    "@types/react-dom": "^17.0.11",
-    "@types/tailwindcss": "^3.0.11",
+    "@types/tailwindcss": "^3.0.2",
     "@types/wait-on": "^5.3.1",
-    "autoprefixer": "^10.4.7",
+    "concurrently": "^7.0.0",
-    "concurrently": "^7.3.0",
+    "cypress": "^9.2.1",
-    "cypress": "^10.3.1",
+    "execa": "^6.0.0",
-    "execa": "^6.1.0",
+    "rehype-prism-plus": "^1.3.1",
-    "postcss": "^8.4.14",
+    "typedoc": "^0.22.10",
-    "rehype-prism-plus": "^1.4.2",
+    "typescript": "^4.5.4",
-    "tailwindcss": "^3.1.6",
+    "wait-on": "^6.0.0"
-    "typedoc": "^0.23.8",
+  },
-    "typescript": "^4.7.4",
+  "engines": {
-    "wait-on": "^6.0.1"
+    "node": ">=14"
   },
   "sideEffects": false
 }