web: Rename Player to PlayerElement, matches all over *Elements

web/packages/core/src/index.ts

@@ -10,4 +10,4 @@ export * from "./build-info";
 export * from "./movie-metadata";
 export * from "./public/flash";
 export * from "./public/legacy";
-export * from "./public/player";
+export * from "./public/player-element";

web/packages/core/src/internal/internal-source-api.ts

@@ -1,6 +1,6 @@
 import { buildInfo } from "../build-info";
 import { pluginPolyfill, polyfill } from "../polyfills";
-import { Player } from "../public/player";
+import { PlayerElement } from "../public/player-element";
 import { registerElement } from "./register-element";
 import { RufflePlayerElement } from "./player/ruffle-player-element";
 import { InstallationOptions } from "../public/setup";
@@ -40,7 +40,7 @@ export const internalSourceApi = {
      * @returns The player element. This is a DOM element that may be inserted
      * into the current page as you wish.
      */
-    createPlayer(): Player {
+    createPlayer(): PlayerElement {
         const name = registerElement("ruffle-player", RufflePlayerElement);
         return document.createElement(name) as RufflePlayerElement;
     },

web/packages/core/src/internal/player/ruffle-player-element.tsx

@@ -1,14 +1,14 @@
 import type { DataLoadOptions, URLLoadOptions } from "../../public/config";
 import type { MovieMetadata } from "../../movie-metadata";
 import { InnerPlayer, ReadyState } from "./inner";
-import { Player } from "../../public/player";
+import { PlayerElement } from "../../public/player-element";
 
 /**
  * The ruffle player element that should be inserted onto the page.
  *
  * This element will represent the rendered and intractable flash movie.
  */
-export class RufflePlayerElement extends HTMLElement implements Player {
+export class RufflePlayerElement extends HTMLElement implements PlayerElement {
     #inner: InnerPlayer;
 
     get onFSCommand(): ((command: string, args: string) => boolean) | null {

web/packages/core/src/public/player.ts → web/packages/core/src/public/player-element.ts

@@ -9,4 +9,4 @@ import { FlashAPI } from "./flash";
  * In addition to usual HTML attributes, this player contains methods and properties that belong to both
  * the **Flash JS API** and **legacy Ruffle API**s.
  */
-export interface Player extends HTMLElement, LegacyRuffleAPI, FlashAPI {}
+export interface PlayerElement extends HTMLElement, LegacyRuffleAPI, FlashAPI {}

web/packages/core/src/public/setup/source-api.ts

@@ -1,4 +1,4 @@
-import { Player } from "../player";
+import { PlayerElement } from "../player-element";
 
 /**
  * Represents this particular version of Ruffle.
@@ -34,5 +34,5 @@ export interface SourceAPI {
      * @returns The player element. This is a DOM element that may be inserted
      * into the current page as you wish.
      */
-    createPlayer(): Player;
+    createPlayer(): PlayerElement;
 }

web/packages/demo/src/player.tsx

@@ -1,10 +1,5 @@
 import React, { ReactNode, DragEvent } from "react";
-import {
-    Setup,
-    Player as RufflePlayer,
-    MovieMetadata,
-    Config,
-} from "ruffle-core";
+import { Setup, PlayerElement, MovieMetadata, Config } from "ruffle-core";
 
 export interface PlayerAttributes {
     id?: string | undefined;
@@ -19,7 +14,7 @@ export interface PlayerAttributes {
 
 export class Player extends React.Component<PlayerAttributes> {
     private readonly container: React.RefObject<HTMLDivElement>;
-    private player: RufflePlayer | null = null;
+    private player: PlayerElement | null = null;
 
     // [NA] Ruffle has a bug where if you load a swf whilst it's already loading another swf, it breaks
     // Combine this with React testing everything by loading things twice to catch bugs - well, they caught the bug for sure.

web/packages/extension/src/player.ts

@@ -1,7 +1,7 @@
 import * as utils from "./utils";
 import { Setup } from "ruffle-core";
 
-import type { Config, Player } from "ruffle-core";
+import type { Config, PlayerElement } from "ruffle-core";
 
 declare global {
     interface Navigator {
@@ -15,7 +15,7 @@ declare global {
 
 Setup.installRuffle("local");
 const ruffle = (window.RufflePlayer as Setup.PublicAPI).newest()!;
-let player: Player;
+let player: PlayerElement;
 
 const playerContainer = document.getElementById("player-container")!;
 const overlay = document.getElementById("overlay")!;

web/packages/selfhosted/test/js_api/load.ts

@@ -1,7 +1,7 @@
 import { loadJsAPI, playAndMonitor } from "../utils.js";
 import { use } from "chai";
 import chaiHtml from "chai-html";
-import { Player } from "ruffle-core";
+import { PlayerElement } from "ruffle-core";
 
 use(chaiHtml);
 
@@ -12,7 +12,7 @@ describe("RufflePlayer.load", () => {
         const player = await browser.$("<ruffle-player>");
         await browser.execute(async (playerElement) => {
             // https://github.com/webdriverio/webdriverio/issues/6486
-            const player = playerElement as unknown as Player;
+            const player = playerElement as unknown as PlayerElement;
             await player.load("/test_assets/example.swf");
         }, player);
         await playAndMonitor(browser, player);

web/packages/selfhosted/test/js_api/metadata.ts

@@ -1,7 +1,7 @@
 import { loadJsAPI } from "../utils.js";
 import { expect, use } from "chai";
 import chaiHtml from "chai-html";
-import { Player } from "ruffle-core";
+import { PlayerElement } from "ruffle-core";
 
 use(chaiHtml);
 
@@ -12,7 +12,7 @@ describe("RufflePlayer.metadata", () => {
         const player = await browser.$("<ruffle-player>");
         const metadata = await browser.execute(
             // https://github.com/webdriverio/webdriverio/issues/6486
-            (player) => (player as unknown as Player).metadata,
+            (player) => (player as unknown as PlayerElement).metadata,
             player,
         );
         // [NA] Work around a chrome 87 bug where it's (somehow) adding extra data to this object

web/packages/selfhosted/test/utils.ts

@@ -1,5 +1,5 @@
 import { expect } from "chai";
-import { Player, Setup } from "ruffle-core";
+import { PlayerElement, Setup } from "ruffle-core";
 
 declare global {
     interface Window {
@@ -8,7 +8,7 @@ declare global {
 }
 
 declare module "ruffle-core" {
-    interface Player {
+    interface PlayerElement {
         __ruffle_log__: string;
     }
 }
@@ -31,7 +31,7 @@ export async function isRufflePlayerLoaded(
             (player) =>
                 // https://github.com/webdriverio/webdriverio/issues/6486
                 // TODO: How can we import ReadyState enum?
-                (player as unknown as Player).readyState,
+                (player as unknown as PlayerElement).readyState,
             player,
         )) === 2
     );
@@ -103,7 +103,7 @@ export async function setupAndPlay(
 ) {
     await browser.execute((playerElement) => {
         // https://github.com/webdriverio/webdriverio/issues/6486
-        const player = playerElement as unknown as Player;
+        const player = playerElement as unknown as PlayerElement;
         player.__ruffle_log__ = "";
         player.traceObserver = (msg) => {
             player.__ruffle_log__ += msg + "\n";
@@ -122,7 +122,7 @@ export async function getTraceOutput(
             return (
                 (await browser.execute((player) => {
                     // https://github.com/webdriverio/webdriverio/issues/6486
-                    return (player as unknown as Player).__ruffle_log__;
+                    return (player as unknown as PlayerElement).__ruffle_log__;
                 }, player)) !== ""
             );
         },
@@ -134,7 +134,7 @@ export async function getTraceOutput(
     // Get the output, and replace it with an empty string for any future test
     return await browser.execute((playerElement) => {
         // https://github.com/webdriverio/webdriverio/issues/6486
-        const player = playerElement as unknown as Player;
+        const player = playerElement as unknown as PlayerElement;
         const log = player.__ruffle_log__;
         player.__ruffle_log__ = "";
         return log;
@@ -190,7 +190,7 @@ export function loadJsAPI(swf?: string) {
             await browser.execute(
                 async (player, swf) => {
                     // https://github.com/webdriverio/webdriverio/issues/6486
-                    await (player as unknown as Player).load(swf);
+                    await (player as unknown as PlayerElement).load(swf);
                 },
                 player,
                 swf,