Merge dfd8aef into 065202e

AUTHORS

@@ -16,3 +16,4 @@ Satana Charuwichitratana
 Pete Nykänen
 Philihp Busby
 Jason Harrison
+Brendon Roberto

packages/plugins.ts

@@ -7,5 +7,6 @@
  */
 
 import PluginPlayer from '../src/plugins/plugin-player';
+import { PlayerPlugin } from '../src/plugins/plugin-player';
 
-export { PluginPlayer };
+export { PluginPlayer, PlayerPlugin };

src/client/react.tsx

@@ -10,6 +10,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Client as RawClient } from './client';
 import type { ClientOpts, ClientState, _ClientImpl } from './client';
+import type { Ctx } from '../types';
 
 type WrappedBoardDelegates = 'matchID' | 'playerID' | 'credentials';
 
@@ -40,8 +41,9 @@ export type BoardProps<G extends any = any> = ClientState<G> &
 
 type ReactClientOpts<
   G extends any = any,
-  P extends BoardProps<G> = BoardProps<G>
-> = Omit<ClientOpts<G>, WrappedBoardDelegates> & {
+  P extends BoardProps<G> = BoardProps<G>,
+  CtxWithPlugins extends Ctx = Ctx
+> = Omit<ClientOpts<G, CtxWithPlugins>, WrappedBoardDelegates> & {
   board?: React.ComponentType<P>;
   loading?: React.ComponentType;
 };
@@ -67,8 +69,9 @@ type ReactClientOpts<
  */
 export function Client<
   G extends any = any,
-  P extends BoardProps<G> = BoardProps<G>
->(opts: ReactClientOpts<G, P>) {
+  P extends BoardProps<G> = BoardProps<G>,
+  ContextWithPlugins extends Ctx = Ctx
+>(opts: ReactClientOpts<G, P, ContextWithPlugins>) {
   let { game, numPlayers, loading, board, multiplayer, enhancer, debug } = opts;
 
   // Component that is displayed before the client has synced