account for trailing slashes

Version Packages

.changeset/README.md

@@ -0,0 +1,8 @@
+# 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

@@ -0,0 +1,11 @@
+{
+  "$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

@@ -0,0 +1,38 @@
+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"),
+    extraFileExtensions: [".astro"],
+  },
+  overrides: [
+    {
+      files: ["packages/website/cypress/**"],
+      parserOptions: {
+        project: require.resolve("./packages/website/cypress/tsconfig.json"),
+      },
+    },
+    {
+      files: ["*.astro"],
+      parser: "astro-eslint-parser",
+      parserOptions: {
+        parser: "@typescript-eslint/parser",
+      },
+      rules: {
+        "react/no-unknown-property": "off",
+        "react/jsx-key": "off",
+        "react/jsx-no-undef": "off",
+      },
+    },
+  ],
+}

.eslintrc.json

@@ -1,26 +0,0 @@
-{
-  "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

@@ -1,17 +0,0 @@
-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,6 +10,10 @@ 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:
@@ -19,23 +23,31 @@ jobs:
           # if these run in the same process, it dies,
           # so we test them separate
           - name: test reacord
-            run: pnpm test -C packages/reacord
-          - name: test website
-            run: pnpm test -C packages/website
+            run: pnpm -C packages/reacord test
+          # - name: test website
+          #   run: pnpm -C packages/website test
           - name: build
-            run: pnpm build --recursive
+            run: pnpm --recursive run build
           - name: lint
-            run: pnpm lint
+            run: pnpm run lint
           - name: typecheck
-            run: pnpm typecheck --parallel
+            run: pnpm --recursive run typecheck
     name: ${{ matrix.command.name }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - name: setup pnpm
+        uses: pnpm/action-setup@v2
         with:
-          # https://github.com/actions/setup-node#supported-version-syntax
-          node-version: "16"
-      - run: npm i -g pnpm
+          version: 7.13.4
+
+      - name: setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: pnpm
+
       - run: pnpm install --frozen-lockfile
       - run: ${{ matrix.command.run }}

.github/workflows/release.yml

@@ -0,0 +1,40 @@
+# 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@v3
+
+      - name: setup pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 7.13.4
+
+      - name: setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: 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,4 +3,10 @@ node_modules
 .vscode
 coverage
 .env
+*.code-workspace
+.pnpm-debug.log
 
+build
+.cache
+
+.vercel

.npmrc

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

.prettierignore

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

.prettierrc.cjs

@@ -0,0 +1,14 @@
+const base = require("@itsmapleleaf/configs/prettier")
+
+module.exports = {
+  ...base,
+  plugins: [require.resolve("prettier-plugin-astro")],
+  overrides: [
+    {
+      files: "*.astro",
+      options: {
+        parser: "astro",
+      },
+    },
+  ],
+}

Dockerfile

@@ -1,15 +0,0 @@
-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,7 +1,9 @@
-# reacord
-Create interactive Discord messages using React!
+<center>
+  <img src="./packages/website/app/assets/banner.png" alt="Reacord: Create interactive Discord messages using React">
+</center>
+
+## Installation ∙ [![npm](https://img.shields.io/npm/v/reacord?color=blue&style=flat-square)](https://www.npmjs.com/package/reacord)
 
-## Installation
 ```console
 # npm
 npm install reacord react discord.js
@@ -15,9 +17,11 @@ 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

@@ -1,40 +0,0 @@
-# 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,29 +1,26 @@
 {
+  "name": "reacord-monorepo",
   "private": true,
   "scripts": {
     "lint": "eslint --ext js,ts,tsx .",
     "lint-fix": "pnpm lint -- --fix",
-    "format": "prettier --write ."
-  },
-  "dependencies": {
-    "@itsmapleleaf/configs": "^1.1.2"
+    "format": "prettier --write .",
+    "build": "pnpm -r run build",
+    "start": "pnpm -C packages/website run start",
+    "release": "pnpm -r run build && changeset publish"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.9.1",
-    "@typescript-eslint/parser": "^5.9.1",
-    "eslint": "^8.6.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-import-resolver-typescript": "^2.5.0",
-    "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-jsx-a11y": "^6.5.1",
-    "eslint-plugin-react": "^7.28.0",
-    "eslint-plugin-react-hooks": "^4.3.0",
-    "eslint-plugin-unicorn": "^40.0.0",
-    "prettier": "^2.5.1",
-    "typescript": "^4.5.4"
+    "@changesets/cli": "^2.25.0",
+    "@itsmapleleaf/configs": "^1.1.7",
+    "@rushstack/eslint-patch": "^1.2.0",
+    "@types/eslint": "^8.4.6",
+    "astro-eslint-parser": "^0.12.0",
+    "eslint": "^8.36.0",
+    "prettier": "^2.7.1",
+    "prettier-plugin-astro": "^0.8.0",
+    "typescript": "^4.8.4"
   },
   "resolutions": {
     "esbuild": "latest"
-  },
-  "prettier": "@itsmapleleaf/configs/prettier"
+  }
 }

packages/helpers/log-pretty.ts

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

packages/helpers/omit.ts

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

packages/helpers/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "@reacord/helpers",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@types/lodash-es": "^4.17.6",
+    "lodash-es": "^4.17.21",
+    "type-fest": "^2.17.0",
+    "vitest": "^0.18.1"
+  }
+}

packages/helpers/pick.ts

@@ -1,6 +1,5 @@
 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/helpers/prune-nullish-values.test.ts

@@ -0,0 +1,35 @@
+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/helpers/prune-nullish-values.ts

@@ -0,0 +1,42 @@
+import { isObject } from "./is-object"
+
+export function pruneNullishValues<T>(input: T): PruneNullishValues<T> {
+  if (Array.isArray(input)) {
+    return input.filter(Boolean).map((item) => pruneNullishValues(item)) as any
+  }
+
+  if (!isObject(input)) {
+    return input as any
+  }
+
+  const result: any = {}
+  for (const [key, value] of Object.entries(input as any)) {
+    if (value != undefined) {
+      result[key] = pruneNullishValues(value)
+    }
+  }
+  return result
+}
+
+export type PruneNullishValues<Input> = Input extends object
+  ? OptionalKeys<
+      { [Key in keyof Input]: NonNullable<PruneNullishValues<Input[Key]>> },
+      KeysWithNullishValues<Input>
+    >
+  : Input
+
+type OptionalKeys<Input, Keys extends keyof Input> = Omit<Input, Keys> & {
+  [Key in Keys]?: Input[Key]
+}
+
+type KeysWithNullishValues<Input> = NonNullable<
+  Values<{
+    [Key in keyof Input]: null extends Input[Key]
+      ? Key
+      : undefined extends Input[Key]
+      ? Key
+      : never
+  }>
+>
+
+type Values<Input> = Input[keyof Input]

packages/helpers/types.ts

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

packages/helpers/wait-for.ts

@@ -0,0 +1,21 @@
+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/helpers/with-logged-method-calls.ts

@@ -1,6 +1,5 @@
 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/.gitignore

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

packages/reacord/CHANGELOG.md

@@ -0,0 +1,23 @@
+# reacord
+
+## 0.5.2
+
+### Patch Changes
+
+- 9813a01: import react-reconciler/constants.js for esm
+
+  ESM projects which tried to import reacord would fail due to the lack of .js on this import
+
+## 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/prune-nullish-values.ts

@@ -1,27 +0,0 @@
-import { isObject } from "./is-object"
-
-export function pruneNullishValues<T>(input: T): PruneNullishValues<T> {
-  if (Array.isArray(input)) {
-    return input.filter(Boolean).map((item) => pruneNullishValues(item)) as any
-  }
-
-  if (!isObject(input)) {
-    return input as any
-  }
-
-  const result: any = {}
-  for (const [key, value] of Object.entries(input)) {
-    if (value != undefined) {
-      result[key] = pruneNullishValues(value)
-    }
-  }
-  return result
-}
-
-type PruneNullishValues<Input> = Input extends ReadonlyArray<infer Value>
-  ? ReadonlyArray<NonNullable<Value>>
-  : Input extends object
-  ? {
-      [Key in keyof Input]: NonNullable<Input[Key]>
-    }
-  : Input

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

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

packages/reacord/library/core/components/button-shared-props.ts

@@ -1,10 +1,12 @@
+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?: string
+  label?: ReactNode
 
   /** 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 { nanoid } from "nanoid"
+import { randomUUID } from "node:crypto"
 import React from "react"
 import { ReacordElement } from "../../internal/element.js"
 import type { ComponentInteraction } from "../../internal/interaction"
@@ -34,12 +34,22 @@ 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 = nanoid()
+  private customId = randomUUID()
+
+  // 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({
@@ -48,7 +58,7 @@ class ButtonNode extends Node<ButtonProps> {
       style: this.props.style ?? "secondary",
       disabled: this.props.disabled,
       emoji: this.props.emoji,
-      label: this.props.label,
+      label: this.children.findType(ButtonLabelNode)?.text,
     })
   }
 
@@ -63,3 +73,5 @@ class ButtonNode extends Node<ButtonProps> {
     return false
   }
 }
+
+class ButtonLabelNode extends Node<{}> {}

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
+import { snakeCaseDeep } from "@reacord/helpers/convert-object-property-case"
+import { omit } from "@reacord/helpers/omit"
 import React from "react"
-import { snakeCaseDeep } from "../../../helpers/convert-object-property-case"
-import { omit } from "../../../helpers/omit"
 import { ReacordElement } from "../../internal/element.js"
 import type { MessageOptions } from "../../internal/message"
 import { Node } from "../../internal/node.js"

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

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

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

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

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

@@ -1,6 +1,11 @@
+import type { ReactNode } from "react"
 import React from "react"
 import { ReacordElement } from "../../internal/element"
-import { OptionNode } from "./option-node"
+import {
+  OptionDescriptionNode,
+  OptionLabelNode,
+  OptionNode,
+} from "./option-node"
 
 /**
  * @category Select
@@ -9,11 +14,11 @@ export type OptionProps = {
   /** The internal value of this option */
   value: string
   /** The text shown to the user. This takes priority over `children` */
-  label?: string
+  label?: ReactNode
   /** The text shown to the user */
-  children?: string
+  children?: ReactNode
   /** Description for the option, shown to the user */
-  description?: string
+  description?: ReactNode
 
   /**
    * Renders an emoji to the left of the text.
@@ -31,8 +36,27 @@ export type OptionProps = {
 /**
  * @category Select
  */
-export function Option(props: OptionProps) {
+export function Option({
+  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,7 +1,7 @@
-import { nanoid } from "nanoid"
+import { isInstanceOf } from "@reacord/helpers/is-instance-of"
+import { randomUUID } from "node:crypto"
 import type { ReactNode } from "react"
 import React from "react"
-import { isInstanceOf } from "../../../helpers/is-instance-of"
 import { ReacordElement } from "../../internal/element.js"
 import type { ComponentInteraction } from "../../internal/interaction"
 import type {
@@ -89,7 +89,7 @@ export function Select(props: SelectProps) {
 }
 
 class SelectNode extends Node<SelectProps> {
-  readonly customId = nanoid()
+  readonly customId = randomUUID()
 
   override modifyMessageOptions(message: MessageOptions): void {
     const actionRow: ActionRow = []

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

@@ -1,5 +1,5 @@
+import { raise } from "@reacord/helpers/raise"
 import * as React from "react"
-import { raise } from "../../helpers/raise"
 import type { ReacordInstance } from "./instance"
 
 const Context = React.createContext<ReacordInstance | undefined>(undefined)
@@ -10,7 +10,7 @@ export const InstanceProvider = Context.Provider
  * Get the associated instance for the current component.
  *
  * @category Core
- * @see https://reacord.fly.dev/guides/use-instance
+ * @see https://reacord.mapleleaf.dev/guides/use-instance
  */
 export function useInstance(): ReacordInstance {
   return (

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

@@ -1,13 +1,16 @@
 /* eslint-disable class-methods-use-this */
+import { pick } from "@reacord/helpers/pick"
+import { pruneNullishValues } from "@reacord/helpers/prune-nullish-values"
+import { raise } from "@reacord/helpers/raise"
 import * as Discord from "discord.js"
 import type { ReactNode } from "react"
 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 { Message, MessageOptions } from "../internal/message"
+import type {
+  Message,
+  MessageButtonOptions,
+  MessageOptions,
+} from "../internal/message"
 import { ChannelMessageRenderer } from "../internal/renderers/channel-message-renderer"
 import { InteractionReplyRenderer } from "../internal/renderers/interaction-reply-renderer"
 import type {
@@ -30,7 +33,7 @@ export class ReacordDiscordJs extends Reacord {
     super(config)
 
     client.on("interactionCreate", (interaction) => {
-      if (interaction.isMessageComponent()) {
+      if (interaction.isButton() || interaction.isSelectMenu()) {
         this.handleComponentInteraction(
           this.createReacordComponentInteraction(interaction),
         )
@@ -40,7 +43,7 @@ export class ReacordDiscordJs extends Reacord {
 
   /**
    * Sends a message to a channel.
-   * @see https://reacord.fly.dev/guides/sending-messages
+   * @see https://reacord.mapleleaf.dev/guides/sending-messages
    */
   override send(
     channelId: string,
@@ -54,7 +57,7 @@ export class ReacordDiscordJs extends Reacord {
 
   /**
    * Sends a message as a reply to a command interaction.
-   * @see https://reacord.fly.dev/guides/sending-messages
+   * @see https://reacord.mapleleaf.dev/guides/sending-messages
    */
   override reply(
     interaction: Discord.CommandInteraction,
@@ -68,7 +71,7 @@ export class ReacordDiscordJs extends Reacord {
 
   /**
    * Sends an ephemeral message as a reply to a command interaction.
-   * @see https://reacord.fly.dev/guides/sending-messages
+   * @see https://reacord.mapleleaf.dev/guides/sending-messages
    */
   override ephemeralReply(
     interaction: Discord.CommandInteraction,
@@ -88,7 +91,7 @@ export class ReacordDiscordJs extends Reacord {
           (await this.client.channels.fetch(channelId)) ??
           raise(`Channel ${channelId} not found`)
 
-        if (!channel.isText()) {
+        if (!channel.isTextBased()) {
           raise(`Channel ${channelId} is not a text channel`)
         }
 
@@ -204,7 +207,7 @@ export class ReacordDiscordJs extends Reacord {
               ]),
             ),
             displayName: interaction.member.displayName,
-            roles: [...interaction.member.roles.cache.map((role) => role.id)],
+            roles: interaction.member.roles.cache.map((role) => role.id),
             joinedAt: interaction.member.joinedAt?.toISOString(),
             premiumSince: interaction.member.premiumSince?.toISOString(),
             communicationDisabledUntil:
@@ -298,17 +301,6 @@ 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()
     },
@@ -321,10 +313,6 @@ 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()
@@ -332,25 +320,45 @@ 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,
-): Discord.MessageOptions {
-  const options: Discord.MessageOptions = {
+function getDiscordMessageOptions(reacordOptions: MessageOptions) {
+  const options = {
     // eslint-disable-next-line unicorn/no-null
     content: reacordOptions.content || null,
     embeds: reacordOptions.embeds,
     components: reacordOptions.actionRows.map((row) => ({
-      type: "ACTION_ROW",
+      type: Discord.ComponentType.ActionRow,
       components: row.map(
-        (component): Discord.MessageActionRowComponentOptions => {
+        (component): Discord.MessageActionRowComponentData => {
           if (component.type === "button") {
             return {
-              type: "BUTTON",
+              type: Discord.ComponentType.Button,
               customId: component.customId,
               label: component.label ?? "",
-              style: toUpper(component.style ?? "secondary"),
+              style: convertButtonStyleToEnum(component.style),
+              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,
             }
@@ -359,7 +367,7 @@ function getDiscordMessageOptions(
           if (component.type === "select") {
             return {
               ...component,
-              type: "SELECT_MENU",
+              type: Discord.ComponentType.SelectMenu,
               options: component.options.map((option) => ({
                 ...option,
                 default: component.values?.includes(option.value),
@@ -367,7 +375,7 @@ function getDiscordMessageOptions(
             }
           }
 
-          raise(`Unsupported component type: ${component.type}`)
+          raise(`Unsupported component type: ${(component as any).type}`)
         },
       ),
     })),

packages/reacord/library/core/reacord.tsx

@@ -47,7 +47,19 @@ export abstract class Reacord {
 
     this.renderers.push(renderer)
 
-    const container = reconciler.createContainer(renderer, 0, false, {})
+    const container = reconciler.createContainer(
+      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,6 +21,16 @@ 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

@@ -1,5 +1,5 @@
+import { last } from "@reacord/helpers/last"
 import type { Except } from "type-fest"
-import { last } from "../../helpers/last"
 import type { EmbedOptions } from "../core/components/embed-options"
 import type { SelectProps } from "../core/components/select"
 
@@ -49,7 +49,6 @@ 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,4 +13,8 @@ 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,7 @@
+import { raise } from "@reacord/helpers/raise.js"
 import type { HostConfig } from "react-reconciler"
 import ReactReconciler from "react-reconciler"
-import { raise } from "../../helpers/raise.js"
+import { DefaultEventPriority } from "react-reconciler/constants.js"
 import { Node } from "./node.js"
 import type { Renderer } from "./renderers/renderer"
 import { TextNode } from "./text-node.js"
@@ -20,8 +21,6 @@ const config: HostConfig<
   number, // TimeoutHandle,
   number // NoTimeout,
 > = {
-  // config
-  now: Date.now,
   supportsMutation: true,
   supportsPersistence: false,
   supportsHydration: false,
@@ -52,6 +51,13 @@ 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()
@@ -92,11 +98,14 @@ 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,7 +83,17 @@ 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,4 +5,8 @@ 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,15 +2,33 @@
   "name": "reacord",
   "type": "module",
   "description": "Create interactive Discord messages using React.",
-  "version": "0.3.1",
+  "version": "0.5.2",
   "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",
@@ -18,24 +36,22 @@
     }
   },
   "scripts": {
-    "build": "tsup-node library/main.ts --target node16 --format cjs,esm --dts --sourcemap",
+    "build": "cp ../../README.md . && cp ../../LICENSE . && tsup library/main.ts --target node16 --format cjs,esm --dts --sourcemap",
     "build-watch": "pnpm build -- --watch",
     "test": "vitest --coverage --no-watch",
     "test-dev": "vitest",
-    "typecheck": "tsc --noEmit",
-    "playground": "nodemon --exec esmo --ext ts,tsx --inspect=5858 --enable-source-maps ./playground/main.tsx",
-    "release": "pnpm build && release-it"
+    "test-manual": "nodemon --exec tsx --ext ts,tsx ./scripts/discordjs-manual-test.tsx",
+    "typecheck": "tsc --noEmit"
   },
   "dependencies": {
     "@types/node": "*",
     "@types/react": "*",
-    "@types/react-reconciler": "^0.26.4",
-    "nanoid": "^3.1.31",
-    "react-reconciler": "^0.26.2",
-    "rxjs": "^7.5.2"
+    "@types/react-reconciler": "^0.28.0",
+    "react-reconciler": "^0.29.0",
+    "rxjs": "^7.5.6"
   },
   "peerDependencies": {
-    "discord.js": "^13.3",
+    "discord.js": "^14",
     "react": ">=17"
   },
   "peerDependenciesMeta": {
@@ -44,24 +60,21 @@
     }
   },
   "devDependencies": {
-    "@types/lodash-es": "^4.17.5",
-    "c8": "^7.11.0",
-    "discord.js": "^13.5.1",
-    "dotenv": "^11.0.0",
-    "esbuild": "latest",
-    "esbuild-jest": "^0.5.0",
-    "esmo": "^0.13.0",
+    "@reacord/helpers": "workspace:*",
+    "@types/lodash-es": "^4.17.6",
+    "c8": "^7.12.0",
+    "discord.js": "^14.0.3",
+    "dotenv": "^16.0.1",
     "lodash-es": "^4.17.21",
-    "nodemon": "^2.0.15",
-    "prettier": "^2.5.1",
-    "pretty-ms": "^7.0.1",
-    "react": "^17.0.2",
-    "release-it": "^14.12.1",
-    "tsup": "^5.11.11",
-    "type-fest": "^2.9.0",
-    "typescript": "^4.5.4",
-    "vite": "^2.7.10",
-    "vitest": "^0.0.141"
+    "nodemon": "^2.0.19",
+    "prettier": "^2.7.1",
+    "pretty-ms": "^8.0.0",
+    "react": "^18.2.0",
+    "tsup": "^6.1.3",
+    "tsx": "^3.8.0",
+    "type-fest": "^2.17.0",
+    "typescript": "^4.7.4",
+    "vitest": "^0.18.1"
   },
   "resolutions": {
     "esbuild": "latest"
@@ -74,5 +87,8 @@
       "release": true,
       "web": true
     }
+  },
+  "publishConfig": {
+    "access": "public"
   }
 }

packages/reacord/playground/command-handler.ts

@@ -1,38 +0,0 @@
-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

@@ -1,36 +0,0 @@
-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

@@ -1,31 +0,0 @@
-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

@@ -1,109 +0,0 @@
-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

@@ -0,0 +1,139 @@
+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

@@ -0,0 +1,12 @@
+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 () => {
     },
   ])
 
-  tester.findButtonByLabel("show embed").click()
+  await tester.findButtonByLabel("show embed").click()
   await tester.assertMessages([
     {
       content: "count: 0",
@@ -62,7 +62,7 @@ test("rendering behavior", async () => {
     },
   ])
 
-  tester.findButtonByLabel("clicc").click()
+  await tester.findButtonByLabel("clicc").click()
   await tester.assertMessages([
     {
       content: "count: 1",
@@ -94,7 +94,7 @@ test("rendering behavior", async () => {
     },
   ])
 
-  tester.findButtonByLabel("clicc").click()
+  await tester.findButtonByLabel("clicc").click()
   await tester.assertMessages([
     {
       content: "count: 2",
@@ -126,7 +126,7 @@ test("rendering behavior", async () => {
     },
   ])
 
-  tester.findButtonByLabel("hide embed").click()
+  await tester.findButtonByLabel("hide embed").click()
   await tester.assertMessages([
     {
       content: "count: 2",
@@ -153,7 +153,7 @@ test("rendering behavior", async () => {
     },
   ])
 
-  tester.findButtonByLabel("clicc").click()
+  await tester.findButtonByLabel("clicc").click()
   await tester.assertMessages([
     {
       content: "count: 3",
@@ -180,7 +180,7 @@ test("rendering behavior", async () => {
     },
   ])
 
-  tester.findButtonByLabel("deactivate").click()
+  await tester.findButtonByLabel("deactivate").click()
   await tester.assertMessages([
     {
       content: "count: 3",
@@ -210,7 +210,7 @@ test("rendering behavior", async () => {
     },
   ])
 
-  tester.findButtonByLabel("clicc").click()
+  await 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, fn, test } from "vitest"
+import { expect, test, vi } from "vitest"
 import { Button, Option, Select } from "../library/main"
 import { ReacordTester } from "./test-adapter"
 
 test("single select", async () => {
   const tester = new ReacordTester()
-  const onSelect = fn()
+  const onSelect = vi.fn()
 
   function TestSelect() {
     const [value, setValue] = useState<string>()
@@ -59,23 +59,23 @@ test("single select", async () => {
   await assertSelect([])
   expect(onSelect).toHaveBeenCalledTimes(0)
 
-  tester.findSelectByPlaceholder("choose one").select("2")
+  await tester.findSelectByPlaceholder("choose one").select("2")
   await assertSelect(["2"])
   expect(onSelect).toHaveBeenCalledWith(
     expect.objectContaining({ values: ["2"] }),
   )
 
-  tester.findButtonByLabel("disable").click()
+  await tester.findButtonByLabel("disable").click()
   await assertSelect(["2"], true)
 
-  tester.findSelectByPlaceholder("choose one").select("1")
+  await tester.findSelectByPlaceholder("choose one").select("1")
   await assertSelect(["2"], true)
   expect(onSelect).toHaveBeenCalledTimes(1)
 })
 
 test("multiple select", async () => {
   const tester = new ReacordTester()
-  const onSelect = fn()
+  const onSelect = vi.fn()
 
   function TestSelect() {
     const [values, setValues] = useState<string[]>([])
@@ -125,19 +125,19 @@ test("multiple select", async () => {
   await assertSelect([])
   expect(onSelect).toHaveBeenCalledTimes(0)
 
-  tester.findSelectByPlaceholder("select").select("1", "3")
+  await 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"]) }),
   )
 
-  tester.findSelectByPlaceholder("select").select("2")
+  await tester.findSelectByPlaceholder("select").select("2")
   await assertSelect(expect.arrayContaining(["2"]) as unknown as string[])
   expect(onSelect).toHaveBeenCalledWith(
     expect.objectContaining({ values: expect.arrayContaining(["2"]) }),
   )
 
-  tester.findSelectByPlaceholder("select").select()
+  await 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" />)
-  tester.findSelectByPlaceholder("select").select("something")
+  await 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 { nanoid } from "nanoid"
-import { nextTick } from "node:process"
-import { promisify } from "node:util"
+import { logPretty } from "@reacord/helpers/log-pretty"
+import { omit } from "@reacord/helpers/omit"
+import { pruneNullishValues } from "@reacord/helpers/prune-nullish-values"
+import { raise } from "@reacord/helpers/raise"
+import { waitFor } from "@reacord/helpers/wait-for"
+import { randomUUID } from "node:crypto"
+import { setTimeout } from "node:timers/promises"
 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 type {
   ChannelInfo,
   GuildInfo,
@@ -26,17 +26,10 @@ import type {
   CommandInteraction,
   SelectInteraction,
 } from "../library/internal/interaction"
-import type {
-  Message,
-  MessageButtonOptions,
-  MessageOptions,
-  MessageSelectOptions,
-} from "../library/internal/message"
+import type { Message, MessageOptions } 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]
 
 /**
@@ -73,9 +66,10 @@ export class ReacordTester extends Reacord {
     return this.reply(initialContent)
   }
 
-  async assertMessages(expected: MessageSample[]) {
-    await nextTickPromise()
+  assertMessages(expected: MessageSample[]) {
+    return waitFor(() => {
       expect(this.sampleMessages()).toEqual(expected)
+    })
   }
 
   async assertRender(content: ReactNode, expected: MessageSample[]) {
@@ -108,58 +102,59 @@ export class ReacordTester extends Reacord {
   }
 
   findButtonByLabel(label: string) {
-    for (const message of this.messageContainer) {
-      for (const component of message.options.actionRows.flat()) {
+    return {
+      click: () => {
+        return waitFor(() => {
+          for (const [component, message] of this.eachComponent()) {
             if (component.type === "button" && component.label === label) {
-          return this.createButtonActions(component, message)
-        }
+              this.handleComponentInteraction(
+                new TestButtonInteraction(component.customId, message, this),
+              )
+              return
             }
           }
           raise(`Couldn't find button with label "${label}"`)
+        })
+      },
+    }
   }
 
   findSelectByPlaceholder(placeholder: string) {
-    for (const message of this.messageContainer) {
-      for (const component of message.options.actionRows.flat()) {
+    return {
+      select: (...values: string[]) => {
+        return waitFor(() => {
+          for (const [component, message] of this.eachComponent()) {
             if (
               component.type === "select" &&
               component.placeholder === placeholder
             ) {
-          return this.createSelectActions(component, message)
-        }
+              this.handleComponentInteraction(
+                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 createButtonActions(
-    button: MessageButtonOptions,
-    message: TestMessage,
-  ) {
-    return {
-      click: () => {
-        this.handleComponentInteraction(
-          new TestButtonInteraction(button.customId, message, this),
-        )
-      },
+  private *eachComponent() {
+    for (const message of this.messageContainer) {
+      for (const component of message.options.actionRows.flat()) {
+        yield [component, message] as const
       }
     }
-
-  private createSelectActions(
-    component: MessageSelectOptions,
-    message: TestMessage,
-  ) {
-    return {
-      select: (...values: string[]) => {
-        this.handleComponentInteraction(
-          new TestSelectInteraction(component.customId, message, values, this),
-        )
-      },
-    }
   }
 }
 
@@ -175,16 +170,6 @@ 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)
   }
@@ -197,21 +182,19 @@ class TestCommandInteraction implements CommandInteraction {
 
   constructor(private messageContainer: Container<TestMessage>) {}
 
-  reply(messageOptions: MessageOptions): Promise<Message> {
-    return Promise.resolve(
-      new TestMessage(messageOptions, this.messageContainer),
-    )
+  async reply(messageOptions: MessageOptions): Promise<Message> {
+    await setTimeout()
+    return new TestMessage(messageOptions, this.messageContainer)
   }
 
-  followUp(messageOptions: MessageOptions): Promise<Message> {
-    return Promise.resolve(
-      new TestMessage(messageOptions, this.messageContainer),
-    )
+  async followUp(messageOptions: MessageOptions): Promise<Message> {
+    await setTimeout()
+    return new TestMessage(messageOptions, this.messageContainer)
   }
 }
 
 class TestInteraction {
-  readonly id = nanoid()
+  readonly id = randomUUID()
   readonly channelId = "test-channel-id"
 
   constructor(

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

@@ -0,0 +1,89 @@
+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)
 
-    tester.findButtonByLabel("create parent").click()
+    await 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
-    tester.findButtonByLabel("destroy child").click()
+    await tester.findButtonByLabel("destroy child").click()
     await tester.assertMessages([messageOutput("parent")])
 
-    tester.findButtonByLabel("destroy parent").click()
+    await tester.findButtonByLabel("destroy parent").click()
     await tester.assertMessages([])
   })
 })

packages/reacord/tsconfig.json

@@ -1,3 +1,4 @@
 {
-  "extends": "../../tsconfig.base.json"
+  "extends": "../../tsconfig.base.json",
+  "include": ["**/*.ts", "**/*.tsx", "**/*.cjs", "**/*.mjs"]
 }

packages/reacord/vitest.config.ts

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

packages/website/.gitignore

@@ -1,5 +1,4 @@
 node_modules
-
 /.cache
 /build
 /public/build
@@ -7,3 +6,6 @@ node_modules
 /public/api
 cypress/videos
 cypress/screenshots
+*.out.css
+/api
+.astro

packages/website/CHANGELOG.md

@@ -0,0 +1,24 @@
+# website
+
+## 0.4.3
+
+### Patch Changes
+
+- Updated dependencies [9813a01]
+  - reacord@0.5.2
+
+## 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/entry.client.tsx

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

packages/website/app/entry.server.tsx

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

packages/website/app/modules/helpers/raise.ts

@@ -1,3 +0,0 @@
-export function raise(error: unknown): never {
-  throw error instanceof Error ? error : new Error(String(error))
-}

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

@@ -1,19 +0,0 @@
-{/* 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/app-link.tsx

@@ -1,31 +0,0 @@
-import type { ComponentPropsWithoutRef } from "react"
-import { Link } from "remix"
-
-export type AppLinkProps = ComponentPropsWithoutRef<"a"> & {
-  type: "internal" | "external" | "router"
-  to: string
-}
-
-export function AppLink({ type, to, children, ...props }: AppLinkProps) {
-  if (type === "internal") {
-    return (
-      <a href={to} {...props}>
-        {children}
-      </a>
-    )
-  }
-
-  if (type === "external") {
-    return (
-      <a href={to} target="_blank" rel="noopener noreferrer" {...props}>
-        {children}
-      </a>
-    )
-  }
-
-  return (
-    <Link to={to} {...props}>
-      {children}
-    </Link>
-  )
-}

packages/website/app/modules/navigation/guide-links-context.tsx

@@ -1,10 +0,0 @@
-import { createContext, useContext } from "react"
-import type { GuideLink } from "~/modules/navigation/load-guide-links.server"
-
-const Context = createContext<GuideLink[]>([])
-
-export const GuideLinksProvider = Context.Provider
-
-export function useGuideLinksContext() {
-  return useContext(Context)
-}

packages/website/app/modules/navigation/load-guide-links.server.ts

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

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

@@ -1,37 +0,0 @@
-import {
-  CodeIcon,
-  DocumentTextIcon,
-  ExternalLinkIcon,
-} from "@heroicons/react/solid"
-import type { AppLinkProps } from "~/modules/navigation/app-link"
-import { inlineIconClass } from "../ui/components"
-
-export const mainLinks: AppLinkProps[] = [
-  {
-    type: "internal",
-    to: "/guides/getting-started",
-    children: (
-      <>
-        <DocumentTextIcon className={inlineIconClass} /> Guides
-      </>
-    ),
-  },
-  {
-    type: "internal",
-    to: "/api",
-    children: (
-      <>
-        <CodeIcon className={inlineIconClass} /> API Reference
-      </>
-    ),
-  },
-  {
-    type: "external",
-    to: "https://github.com/itsMapleLeaf/reacord",
-    children: (
-      <>
-        <ExternalLinkIcon className={inlineIconClass} /> GitHub
-      </>
-    ),
-  },
-]

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

@@ -1,42 +0,0 @@
-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"
-
-export function MainNavigation() {
-  const guideLinks = useGuideLinksContext()
-  return (
-    <nav className="flex justify-between items-center h-16">
-      <a href="/">
-        <h1 className="text-3xl font-light">reacord</h1>
-      </a>
-      <div className="hidden md:flex gap-4">
-        {mainLinks.map((link) => (
-          <AppLink {...link} key={link.to} className={linkClass} />
-        ))}
-      </div>
-      <div className="md:hidden">
-        <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

@@ -1,24 +0,0 @@
-import clsx from "clsx"
-
-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 = clsx`
-  font-medium inline-block relative
-  opacity-60 hover:opacity-100 transition-opacity
-  after:absolute after:block after:w-full after:h-px after:bg-white/50 after:translate-y-[3px] after:opacity-0 after:transition
-  hover:after:translate-y-[-1px] hover:after:opacity-100
-`
-
-export const docsProseClass = clsx`
-  prose prose-invert
-  prose-h1:font-light prose-h1:mb-4 prose-h1:text-3xl lg:prose-h1:text-4xl
-  prose-h2:font-light
-  prose-h3:font-light
-  prose-p:my-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
-  max-w-none
-`

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

@@ -1,32 +0,0 @@
-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/tailwind.css

@@ -1,9 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-@layer utilities {
-  .prose aside {
-    @apply opacity-75 italic border-l-4 pl-3 border-white/50;
-  }
-}

packages/website/app/react.d.ts

@@ -1,4 +0,0 @@
-import "react"
-declare module "react" {
-  export function createContext<Value>(): Context<Value | undefined>
-}

packages/website/app/remix.env.d.ts

@@ -1,2 +0,0 @@
-/// <reference types="@remix-run/dev" />
-/// <reference types="@remix-run/node/globals" />

packages/website/app/root.tsx

@@ -1,68 +0,0 @@
-import packageJson from "reacord/package.json"
-import type { LinksFunction, LoaderFunction, MetaFunction } from "remix"
-import {
-  Links,
-  LiveReload,
-  Meta,
-  Outlet,
-  ScrollRestoration,
-  useLoaderData,
-} from "remix"
-import { GuideLinksProvider } from "~/modules/navigation/guide-links-context"
-import type { GuideLink } from "~/modules/navigation/load-guide-links.server"
-import { loadGuideLinks } from "~/modules/navigation/load-guide-links.server"
-import prismThemeCss from "~/modules/ui/prism-theme.css"
-
-export const meta: MetaFunction = () => ({
-  title: "Reacord",
-  description: packageJson.description,
-})
-
-export const links: LinksFunction = () => [
-  { rel: "preconnect", href: "https://fonts.googleapis.com" },
-  {
-    rel: "preconnect",
-    href: "https://fonts.gstatic.com",
-    crossOrigin: "anonymous",
-  },
-  {
-    rel: "preload",
-    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", href: prismThemeCss },
-]
-
-type LoaderData = {
-  guideLinks: GuideLink[]
-}
-
-export const loader: LoaderFunction = async () => {
-  const data: LoaderData = {
-    guideLinks: await loadGuideLinks(),
-  }
-  return data
-}
-
-export default function App() {
-  const data: LoaderData = useLoaderData()
-  return (
-    <html lang="en" className="bg-slate-900 text-slate-100">
-      <head>
-        <meta charSet="utf-8" />
-        <meta name="viewport" content="width=device-width,initial-scale=1" />
-        <Meta />
-        <Links />
-        <script defer src="https://unpkg.com/alpinejs@3.7.1/dist/cdn.min.js" />
-      </head>
-      <body>
-        <GuideLinksProvider value={data.guideLinks}>
-          <Outlet />
-        </GuideLinksProvider>
-        <ScrollRestoration />
-        {process.env.NODE_ENV === "development" && <LiveReload />}
-      </body>
-    </html>
-  )
-}

packages/website/app/routes/guides.tsx

@@ -1,38 +0,0 @@
-import clsx from "clsx"
-import { Outlet } from "remix"
-import { AppLink } from "~/modules/navigation/app-link"
-import { useGuideLinksContext } from "~/modules/navigation/guide-links-context"
-import { MainNavigation } from "~/modules/navigation/main-navigation"
-import {
-  docsProseClass,
-  linkClass,
-  maxWidthContainer,
-} from "~/modules/ui/components"
-
-export default function GuidePage() {
-  const guideLinks = useGuideLinksContext()
-  return (
-    <>
-      <header className="bg-slate-700/30 shadow sticky top-0 backdrop-blur-sm transition z-10 flex">
-        <div className={maxWidthContainer}>
-          <MainNavigation />
-        </div>
-      </header>
-      <main className={clsx(maxWidthContainer, "mt-8 flex items-start gap-4")}>
-        <nav className="w-48 sticky top-24 hidden md:block">
-          <h2 className="text-2xl">Guides</h2>
-          <ul className="mt-3 flex flex-col gap-2 items-start">
-            {guideLinks.map(({ link }) => (
-              <li key={link.to}>
-                <AppLink {...link} className={linkClass} />
-              </li>
-            ))}
-          </ul>
-        </nav>
-        <section className={clsx(docsProseClass, "pb-8 flex-1 min-w-0")}>
-          <Outlet />
-        </section>
-      </main>
-    </>
-  )
-}

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

@@ -1,44 +0,0 @@
----
-order: 0
-meta:
-  title: Getting Started
-  description: Learn how to get started with Reacord.
----
-
-# Getting Started
-
-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.
-
-**Note:** Ensure your project has support for running code with JSX. I recommend using [esno](https://npm.im/esno).
-
-## Install
-
-```bash
-# npm
-npm install reacord react discord.js
-
-# yarn
-yarn add reacord react discord.js
-
-# pnpm
-pnpm add reacord react discord.js
-```
-
-## Setup
-
-Create a Discord.js client and a Reacord instance:
-
-```js
-// main.js
-import { Client } from "discord.js"
-import { ReacordDiscordJs } from "reacord"
-
-const client = new Client()
-const reacord = new ReacordDiscordJs(client)
-
-client.on("ready", () => {
-  console.log("Ready!")
-})
-
-await client.login(process.env.BOT_TOKEN)
-```

packages/website/app/routes/index.tsx

@@ -1,29 +0,0 @@
-import packageJson from "reacord/package.json"
-import LandingExample from "~/modules/landing/landing-example.mdx"
-import { MainNavigation } from "~/modules/navigation/main-navigation"
-import { maxWidthContainer } from "~/modules/ui/components"
-
-export default function Landing() {
-  return (
-    <div className="flex flex-col min-w-0 min-h-screen text-center">
-      <header className={maxWidthContainer}>
-        <MainNavigation />
-      </header>
-      <div className="px-4 pb-8 flex flex-1">
-        <main className="px-4 py-6 rounded-lg shadow bg-slate-800 space-y-5 m-auto w-full max-w-xl">
-          <h1 className="text-6xl font-light">reacord</h1>
-          <section className="mx-auto text-sm sm:text-base">
-            <LandingExample />
-          </section>
-          <p className="text-2xl font-light">{packageJson.description}</p>
-          <a
-            href="/guides/getting-started"
-            className="inline-block px-4 py-3 text-xl transition rounded-lg bg-emerald-700 hover:translate-y-[-2px] hover:bg-emerald-800 hover:shadow"
-          >
-            Get Started
-          </a>
-        </main>
-      </div>
-    </div>
-  )
-}

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

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

packages/website/astro.config.mjs

@@ -0,0 +1,17 @@
+import prefetch from "@astrojs/prefetch"
+import react from "@astrojs/react"
+import tailwind from "@astrojs/tailwind"
+import { defineConfig } from "astro/config"
+
+// https://astro.build/config
+export default defineConfig({
+  integrations: [
+    tailwind({
+      config: {
+        applyBaseStyles: false,
+      },
+    }),
+    react(),
+    prefetch(),
+  ],
+})

packages/website/cypress.json

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

packages/website/cypress/fixtures/example.json

@@ -1,5 +0,0 @@
-{
-  "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/integration/mobile-popover-menu.test.ts

@@ -1,12 +0,0 @@
-export {}
-
-describe("main popover menu", () => {
-  it("should toggle on button click", () => {
-    cy.viewport(480, 720)
-    cy.visit("/")
-    cy.findByRole("button", { name: "Menu" }).click()
-    cy.findByRole("menu").should("be.visible")
-    cy.findByRole("button", { name: "Menu" }).click()
-    cy.findByRole("menu").should("not.exist")
-  })
-})

packages/website/cypress/plugins/index.js

@@ -1,22 +0,0 @@
-/// <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

@@ -1,26 +0,0 @@
-// ***********************************************
-// 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"