Skip to content

Commit

Permalink
web: Move config to public/config
Browse files Browse the repository at this point in the history
  • Loading branch information
Dinnerbone committed Oct 6, 2024
1 parent 4dd996b commit c15c273
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 10 deletions.
4 changes: 2 additions & 2 deletions web/packages/core/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*/

export * from "./public-api";
export * from "./config";
export * from "./load-options";
export * from "./public/config/config";
export * from "./public/config/load-options";
export * from "./build-info";
export * from "./movie-metadata";
export * from "./install";
Expand Down
6 changes: 5 additions & 1 deletion web/packages/core/src/internal/builder.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import type { RuffleInstanceBuilder } from "../../dist/ruffle_web";
import { BaseLoadOptions, Duration, SecsDuration } from "../load-options";
import {
BaseLoadOptions,
Duration,
SecsDuration,
} from "../public/config/load-options";

/**
* Checks if the given value is explicitly `T` (not null, not undefined)
Expand Down
4 changes: 2 additions & 2 deletions web/packages/core/src/internal/player/inner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
UnmuteOverlay,
URLLoadOptions,
WindowMode,
} from "../../load-options";
} from "../../public/config/load-options";
import type { MovieMetadata } from "../../movie-metadata";
import { ruffleShadowTemplate } from "../ui/shadow-template";
import { text, textAsParagraphs } from "../i18n";
Expand All @@ -25,7 +25,7 @@ import { showPanicScreen } from "../ui/panic";
import { createRuffleBuilder } from "../../load-ruffle";
import { lookupElement } from "../register-element";
import { configureBuilder } from "../builder";
import { DEFAULT_CONFIG } from "../../config";
import { DEFAULT_CONFIG } from "../../public/config/config";

const DIMENSION_REGEX = /^\s*(\d+(\.\d+)?(%)?)/;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import type { DataLoadOptions, URLLoadOptions } from "../../load-options";
import type {
DataLoadOptions,
URLLoadOptions,
} from "../../public/config/load-options";
import type { MovieMetadata } from "../../movie-metadata";
import { InnerPlayer, ReadyState } from "./inner";
import { Player } from "../../public/player";
Expand Down
5 changes: 4 additions & 1 deletion web/packages/core/src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ import { RuffleObjectElement } from "./internal/player/ruffle-object-element";
import { RuffleEmbedElement } from "./internal/player/ruffle-embed-element";
import { installPlugin, FLASH_PLUGIN } from "./plugin-polyfill";
import { publicPath } from "./public-path";
import type { DataLoadOptions, URLLoadOptions } from "./load-options";
import type {
DataLoadOptions,
URLLoadOptions,
} from "./public/config/load-options";
import { isExtension } from "./current-script";

const globalConfig: DataLoadOptions | URLLoadOptions | object =
Expand Down
5 changes: 4 additions & 1 deletion web/packages/core/src/public-api.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { Version } from "./version";
import { VersionRange } from "./version-range";
import { SourceAPI } from "./source-api";
import type { DataLoadOptions, URLLoadOptions } from "./load-options";
import type {
DataLoadOptions,
URLLoadOptions,
} from "./public/config/load-options";

declare global {
interface Window {
Expand Down
2 changes: 1 addition & 1 deletion web/packages/core/src/public-path.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseLoadOptions } from "./load-options";
import { BaseLoadOptions } from "./public/config/load-options";
import { currentScriptURL, isExtension } from "./current-script";

/**
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion web/packages/core/src/public/legacy.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DataLoadOptions, URLLoadOptions } from "../load-options";
import { DataLoadOptions, URLLoadOptions } from "./config/load-options";
import { MovieMetadata } from "../movie-metadata";
import { ReadyState } from "../internal/player/inner";

Expand Down

0 comments on commit c15c273

Please sign in to comment.