Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

web: Switch to ES2021, move some files around #17148

Merged
merged 2 commits into from
Jul 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
2 changes: 1 addition & 1 deletion web/packages/core/src/internal/ui/panic.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { text, textAsParagraphs } from "../../i18n";
import { text, textAsParagraphs } from "../i18n";
import { createRef } from "tsx-dom";
import { buildInfo } from "../../build-info";
import { RUFFLE_ORIGIN } from "../constants";
Expand Down
2 changes: 1 addition & 1 deletion web/packages/core/src/ruffle-embed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
RufflePlayer,
workaroundYoutubeMixedContent,
} from "./ruffle-player";
import { registerElement } from "./register-element";
import { registerElement } from "./internal/register-element";
import { isSwf } from "./swf-utils";

/**
Expand Down
2 changes: 1 addition & 1 deletion web/packages/core/src/ruffle-object.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
getPolyfillOptions,
} from "./ruffle-player";
import { FLASH_ACTIVEX_CLASSID } from "./flash-identifiers";
import { registerElement } from "./register-element";
import { registerElement } from "./internal/register-element";
import { RuffleEmbed } from "./ruffle-embed";
import { isSwf } from "./swf-utils";

Expand Down
4 changes: 2 additions & 2 deletions web/packages/core/src/ruffle-player.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { RuffleHandle, ZipWriter } from "../dist/ruffle_web";
import { createRuffleBuilder } from "./load-ruffle";
import { applyStaticStyles, ruffleShadowTemplate } from "./shadow-template";
import { lookupElement } from "./register-element";
import { lookupElement } from "./internal/register-element";
import { DEFAULT_CONFIG } from "./config";
import type { DataLoadOptions, URLLoadOptions } from "./load-options";
import {
Expand All @@ -14,7 +14,7 @@ import {
import type { MovieMetadata } from "./movie-metadata";
import { swfFileName } from "./swf-utils";
import { buildInfo } from "./build-info";
import { text, textAsParagraphs } from "./i18n";
import { text, textAsParagraphs } from "./internal/i18n";
import { isExtension } from "./current-script";
import { configureBuilder } from "./internal/builder";
import { showPanicScreen } from "./internal/ui/panic";
Expand Down
2 changes: 1 addition & 1 deletion web/packages/core/src/shadow-template.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { text } from "./i18n";
import { text } from "./internal/i18n";

/**
* Insert all rules from array in the style sheet.
Expand Down
2 changes: 1 addition & 1 deletion web/packages/core/src/source-api.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { pluginPolyfill, polyfill } from "./polyfills";
import { registerElement } from "./register-element";
import { registerElement } from "./internal/register-element";
import { RufflePlayer } from "./ruffle-player";
import { buildInfo } from "./build-info";
import { InstallationOptions } from "./install";
Expand Down
2 changes: 1 addition & 1 deletion web/packages/core/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"composite": true,
"module": "es2020",
"moduleResolution": "node",
"target": "es2017",
"target": "es2021",
"rootDir": "src",
"outDir": "dist",
"jsx": "react-jsx",
Expand Down
2 changes: 1 addition & 1 deletion web/packages/demo/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"target": "ES2020",
"target": "ES2021",
"useDefineForClassFields": true,
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "ESNext",
Expand Down
2 changes: 1 addition & 1 deletion web/packages/extension/jsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"lib": ["es2021"],
"module": "es2022",
"moduleResolution": "node",
"target": "es2017",
"target": "es2021",
"resolveJsonModule": true,
"maxNodeModuleJsDepth": 0,
},
Expand Down
2 changes: 1 addition & 1 deletion web/packages/extension/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"compilerOptions": {
"module": "es2020",
"moduleResolution": "node",
"target": "es2017",
"target": "es2021",
"rootDir": "src",
},
"include": ["src/**/*"],
Expand Down
2 changes: 1 addition & 1 deletion web/packages/selfhosted/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"composite": true,
"module": "es2020",
"moduleResolution": "node",
"target": "es2017",
"target": "es2021",
"rootDir": ".",
"outDir": "dist",
"types": ["node", "@wdio/globals/types", "@wdio/mocha-framework", "ruffle-core"]
Expand Down