diff --git a/frontend/src/ts/account/result-filters.ts b/frontend/src/ts/account/result-filters.ts index 88c98ad2884d..4d86bb12c3cb 100644 --- a/frontend/src/ts/account/result-filters.ts +++ b/frontend/src/ts/account/result-filters.ts @@ -1,6 +1,6 @@ import * as Misc from "../utils/misc"; import * as Strings from "../utils/strings"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import * as DB from "../db"; import Config from "../config"; import * as Notifications from "../elements/notifications"; diff --git a/frontend/src/ts/commandline/lists.ts b/frontend/src/ts/commandline/lists.ts index 5937cbf55193..b83673db8509 100644 --- a/frontend/src/ts/commandline/lists.ts +++ b/frontend/src/ts/commandline/lists.ts @@ -92,7 +92,7 @@ import KeymapLayoutsCommands, { import Config, * as UpdateConfig from "../config"; import * as Misc from "../utils/misc"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import { randomizeTheme } from "../controllers/theme-controller"; import * as CustomTextPopup from "../popups/custom-text-popup"; import * as Settings from "../pages/settings"; diff --git a/frontend/src/ts/config-validation.ts b/frontend/src/ts/config-validation.ts index 6cdd162ad48d..9d9777422d6e 100644 --- a/frontend/src/ts/config-validation.ts +++ b/frontend/src/ts/config-validation.ts @@ -1,5 +1,5 @@ import * as Misc from "./utils/misc"; -import * as JSONData from "./utils/JSON-data2"; +import * as JSONData from "./utils/json-data"; import * as Notifications from "./elements/notifications"; type PossibleType = diff --git a/frontend/src/ts/controllers/account-controller.ts b/frontend/src/ts/controllers/account-controller.ts index e2e2837626be..50ff47ac9384 100644 --- a/frontend/src/ts/controllers/account-controller.ts +++ b/frontend/src/ts/controllers/account-controller.ts @@ -3,7 +3,7 @@ import * as Notifications from "../elements/notifications"; import Config, * as UpdateConfig from "../config"; import * as AccountButton from "../elements/account-button"; import * as Misc from "../utils/misc"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import * as Settings from "../pages/settings"; import * as AllTimeStats from "../account/all-time-stats"; import * as DB from "../db"; diff --git a/frontend/src/ts/controllers/challenge-controller.ts b/frontend/src/ts/controllers/challenge-controller.ts index 8efe75fefab6..360f0c033f67 100644 --- a/frontend/src/ts/controllers/challenge-controller.ts +++ b/frontend/src/ts/controllers/challenge-controller.ts @@ -1,5 +1,5 @@ import * as Misc from "../utils/misc"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import * as Notifications from "../elements/notifications"; import * as ManualRestart from "../test/manual-restart-tracker"; import * as CustomText from "../test/custom-text"; diff --git a/frontend/src/ts/controllers/input-controller.ts b/frontend/src/ts/controllers/input-controller.ts index 39dfe29d6a69..a7661bcf8496 100644 --- a/frontend/src/ts/controllers/input-controller.ts +++ b/frontend/src/ts/controllers/input-controller.ts @@ -4,7 +4,7 @@ import * as TestStats from "../test/test-stats"; import * as Monkey from "../test/monkey"; import Config from "../config"; import * as Misc from "../utils/misc"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import * as Numbers from "../utils/numbers"; import * as LiveAcc from "../test/live-acc"; import * as LiveBurst from "../test/live-burst"; diff --git a/frontend/src/ts/controllers/quotes-controller.ts b/frontend/src/ts/controllers/quotes-controller.ts index c2c52a5a4ea3..b6e175e9bea7 100644 --- a/frontend/src/ts/controllers/quotes-controller.ts +++ b/frontend/src/ts/controllers/quotes-controller.ts @@ -1,6 +1,6 @@ import { removeLanguageSize } from "../utils/strings"; import { randomElementFromArray, shuffle } from "../utils/arrays"; -import { cachedFetchJson } from "../utils/JSON-data2"; +import { cachedFetchJson } from "../utils/json-data"; import { subscribe } from "../observables/config-event"; import * as DB from "../db"; diff --git a/frontend/src/ts/controllers/theme-controller.ts b/frontend/src/ts/controllers/theme-controller.ts index 21570d86e0b8..d95b155272a9 100644 --- a/frontend/src/ts/controllers/theme-controller.ts +++ b/frontend/src/ts/controllers/theme-controller.ts @@ -2,7 +2,7 @@ import * as ThemeColors from "../elements/theme-colors"; import * as ChartController from "./chart-controller"; import * as Misc from "../utils/misc"; import * as Arrays from "../utils/arrays"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import { isColorDark, isColorLight } from "../utils/colors"; import Config, { setAutoSwitchTheme } from "../config"; import * as BackgroundFilter from "../elements/custom-background-filter"; diff --git a/frontend/src/ts/db.ts b/frontend/src/ts/db.ts index 1289ccae75f8..6f818e4f7e5e 100644 --- a/frontend/src/ts/db.ts +++ b/frontend/src/ts/db.ts @@ -6,7 +6,7 @@ import { isAuthenticated } from "./firebase"; import { defaultSnap } from "./constants/default-snapshot"; import * as ConnectionState from "./states/connection"; import { lastElementFromArray } from "./utils/arrays"; -import { getFunboxList } from "./utils/JSON-data2"; +import { getFunboxList } from "./utils/json-data"; import { mergeWithDefaultConfig } from "./utils/config"; let dbSnapshot: MonkeyTypes.Snapshot | undefined; diff --git a/frontend/src/ts/elements/keymap.ts b/frontend/src/ts/elements/keymap.ts index 9014177d6c44..d288b3dc7cc3 100644 --- a/frontend/src/ts/elements/keymap.ts +++ b/frontend/src/ts/elements/keymap.ts @@ -4,7 +4,7 @@ import * as SlowTimer from "../states/slow-timer"; import * as ConfigEvent from "../observables/config-event"; import * as KeymapEvent from "../observables/keymap-event"; import * as Misc from "../utils/misc"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import * as Hangul from "hangul-js"; import * as Notifications from "../elements/notifications"; import * as ActivePage from "../states/active-page"; diff --git a/frontend/src/ts/elements/result-word-highlight.ts b/frontend/src/ts/elements/result-word-highlight.ts index 0ad08de082af..95aedd773d21 100644 --- a/frontend/src/ts/elements/result-word-highlight.ts +++ b/frontend/src/ts/elements/result-word-highlight.ts @@ -4,7 +4,7 @@ // Constants for padding around the highlights import * as Misc from "../utils/misc"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import Config from "../config"; const PADDING_X = 16; diff --git a/frontend/src/ts/modals/quote-submit.ts b/frontend/src/ts/modals/quote-submit.ts index 943a65fda4db..866c63e4b364 100644 --- a/frontend/src/ts/modals/quote-submit.ts +++ b/frontend/src/ts/modals/quote-submit.ts @@ -3,7 +3,7 @@ import * as Loader from "../elements/loader"; import * as Notifications from "../elements/notifications"; import * as CaptchaController from "../controllers/captcha-controller"; import * as Strings from "../utils/strings"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import Config from "../config"; import SlimSelect from "slim-select"; import AnimatedModal, { ShowOptions } from "../utils/animated-modal"; diff --git a/frontend/src/ts/modals/version-history.ts b/frontend/src/ts/modals/version-history.ts index 160c1067759f..f0d95cda3eec 100644 --- a/frontend/src/ts/modals/version-history.ts +++ b/frontend/src/ts/modals/version-history.ts @@ -1,5 +1,5 @@ import format from "date-fns/format"; -import { getReleasesFromGitHub } from "../utils/JSON-data2"; +import { getReleasesFromGitHub } from "../utils/json-data"; import AnimatedModal from "../utils/animated-modal"; export function show(): void { diff --git a/frontend/src/ts/modals/word-filter.ts b/frontend/src/ts/modals/word-filter.ts index 38455eb1b472..31cd73d01594 100644 --- a/frontend/src/ts/modals/word-filter.ts +++ b/frontend/src/ts/modals/word-filter.ts @@ -1,5 +1,5 @@ import * as Misc from "../utils/misc"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import * as CustomText from "../test/custom-text"; import * as Notifications from "../elements/notifications"; import SlimSelect from "slim-select"; diff --git a/frontend/src/ts/pages/about.ts b/frontend/src/ts/pages/about.ts index 16cdb728f50b..92a98687239a 100644 --- a/frontend/src/ts/pages/about.ts +++ b/frontend/src/ts/pages/about.ts @@ -1,5 +1,5 @@ import * as Misc from "../utils/misc"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import * as Numbers from "../utils/numbers"; import Page from "./page"; import Ape from "../ape"; diff --git a/frontend/src/ts/pages/settings.ts b/frontend/src/ts/pages/settings.ts index 454f3cc44dbf..fb83c20b129f 100644 --- a/frontend/src/ts/pages/settings.ts +++ b/frontend/src/ts/pages/settings.ts @@ -3,7 +3,7 @@ import Config, * as UpdateConfig from "../config"; import * as Sound from "../controllers/sound-controller"; import * as Misc from "../utils/misc"; import * as Strings from "../utils/strings"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import * as DB from "../db"; import { toggleFunbox } from "../test/funbox/funbox"; import * as TagController from "../controllers/tag-controller"; diff --git a/frontend/src/ts/ready.ts b/frontend/src/ts/ready.ts index 6b4279c788f2..29d036566e6d 100644 --- a/frontend/src/ts/ready.ts +++ b/frontend/src/ts/ready.ts @@ -1,7 +1,7 @@ import * as ManualRestart from "./test/manual-restart-tracker"; import Config, * as UpdateConfig from "./config"; import * as Misc from "./utils/misc"; -import * as JSONData from "./utils/JSON-data2"; +import * as JSONData from "./utils/json-data"; import * as MonkeyPower from "./elements/monkey-power"; import * as NewVersionNotification from "./elements/version-check"; import * as Notifications from "./elements/notifications"; diff --git a/frontend/src/ts/settings/theme-picker.ts b/frontend/src/ts/settings/theme-picker.ts index a8fd73892a9c..3af265f29bc4 100644 --- a/frontend/src/ts/settings/theme-picker.ts +++ b/frontend/src/ts/settings/theme-picker.ts @@ -1,7 +1,7 @@ import Config, * as UpdateConfig from "../config"; import * as ThemeController from "../controllers/theme-controller"; import * as Misc from "../utils/misc"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import * as Colors from "../utils/colors"; import * as Notifications from "../elements/notifications"; import * as ThemeColors from "../elements/theme-colors"; diff --git a/frontend/src/ts/test/british-english.ts b/frontend/src/ts/test/british-english.ts index 10fbe625c776..dd5b8ab222ef 100644 --- a/frontend/src/ts/test/british-english.ts +++ b/frontend/src/ts/test/british-english.ts @@ -1,6 +1,6 @@ import Config from "../config"; import { capitalizeFirstLetterOfEachWord } from "../utils/strings"; -import { cachedFetchJson } from "../utils/JSON-data2"; +import { cachedFetchJson } from "../utils/json-data"; import * as CustomText from "../test/custom-text"; type BritishEnglishReplacement = { diff --git a/frontend/src/ts/test/caret.ts b/frontend/src/ts/test/caret.ts index 7db134d68003..842d9bca4e19 100644 --- a/frontend/src/ts/test/caret.ts +++ b/frontend/src/ts/test/caret.ts @@ -1,5 +1,5 @@ import * as Numbers from "../utils/numbers"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import Config from "../config"; import * as TestInput from "./test-input"; import * as SlowTimer from "../states/slow-timer"; diff --git a/frontend/src/ts/test/funbox/funbox.ts b/frontend/src/ts/test/funbox/funbox.ts index aea6f39f1e3c..00915893ce82 100644 --- a/frontend/src/ts/test/funbox/funbox.ts +++ b/frontend/src/ts/test/funbox/funbox.ts @@ -1,6 +1,6 @@ import * as Notifications from "../../elements/notifications"; import * as Misc from "../../utils/misc"; -import * as JSONData from "../../utils/JSON-data2"; +import * as JSONData from "../../utils/json-data"; import * as GetText from "../../utils/generate"; import * as Numbers from "../../utils/numbers"; import * as Arrays from "../../utils/arrays"; diff --git a/frontend/src/ts/test/layout-emulator.ts b/frontend/src/ts/test/layout-emulator.ts index 11698c76d700..37210d6f5955 100644 --- a/frontend/src/ts/test/layout-emulator.ts +++ b/frontend/src/ts/test/layout-emulator.ts @@ -1,6 +1,6 @@ import Config from "../config"; import * as Misc from "../utils/misc"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import { capsState } from "./caps-warning"; import * as Notifications from "../elements/notifications"; diff --git a/frontend/src/ts/test/pace-caret.ts b/frontend/src/ts/test/pace-caret.ts index 74d6a0368fe9..85e5ef478d73 100644 --- a/frontend/src/ts/test/pace-caret.ts +++ b/frontend/src/ts/test/pace-caret.ts @@ -5,7 +5,7 @@ import * as DB from "../db"; import * as SlowTimer from "../states/slow-timer"; import * as Misc from "../utils/misc"; import * as Numbers from "../utils/numbers"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import * as TestState from "./test-state"; import * as ConfigEvent from "../observables/config-event"; diff --git a/frontend/src/ts/test/result.ts b/frontend/src/ts/test/result.ts index f102dafc77ec..1ee32ce1eba7 100644 --- a/frontend/src/ts/test/result.ts +++ b/frontend/src/ts/test/result.ts @@ -15,7 +15,7 @@ import * as SlowTimer from "../states/slow-timer"; import * as DateTime from "../utils/date-and-time"; import * as Misc from "../utils/misc"; import * as Strings from "../utils/strings"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import * as Numbers from "../utils/numbers"; import * as Arrays from "../utils/arrays"; import { get as getTypingSpeedUnit } from "../utils/typing-speed-units"; diff --git a/frontend/src/ts/test/shift-tracker.ts b/frontend/src/ts/test/shift-tracker.ts index 42d3844542e8..627e5679e7cd 100644 --- a/frontend/src/ts/test/shift-tracker.ts +++ b/frontend/src/ts/test/shift-tracker.ts @@ -1,5 +1,5 @@ import Config from "../config"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import { capsState } from "./caps-warning"; import * as Notifications from "../elements/notifications"; diff --git a/frontend/src/ts/test/test-logic.ts b/frontend/src/ts/test/test-logic.ts index 0d6ee14fc48a..49a55218c968 100644 --- a/frontend/src/ts/test/test-logic.ts +++ b/frontend/src/ts/test/test-logic.ts @@ -5,7 +5,7 @@ import Config, * as UpdateConfig from "../config"; import * as Strings from "../utils/strings"; import * as Misc from "../utils/misc"; import * as Arrays from "../utils/arrays"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import * as Numbers from "../utils/numbers"; import * as Notifications from "../elements/notifications"; import * as CustomText from "./custom-text"; diff --git a/frontend/src/ts/test/test-ui.ts b/frontend/src/ts/test/test-ui.ts index 27f7d472c69d..cb8813e4123c 100644 --- a/frontend/src/ts/test/test-ui.ts +++ b/frontend/src/ts/test/test-ui.ts @@ -10,7 +10,7 @@ import * as OutOfFocus from "./out-of-focus"; import * as Replay from "./replay"; import * as Misc from "../utils/misc"; import * as Strings from "../utils/strings"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import * as Numbers from "../utils/numbers"; import { blendTwoHexColors } from "../utils/colors"; import { get as getTypingSpeedUnit } from "../utils/typing-speed-units"; diff --git a/frontend/src/ts/test/tts.ts b/frontend/src/ts/test/tts.ts index 7a6e7241327e..27b9dd98c245 100644 --- a/frontend/src/ts/test/tts.ts +++ b/frontend/src/ts/test/tts.ts @@ -1,5 +1,5 @@ import Config from "../config"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import * as ConfigEvent from "../observables/config-event"; import * as TTSEvent from "../observables/tts-event"; diff --git a/frontend/src/ts/test/wikipedia.ts b/frontend/src/ts/test/wikipedia.ts index 65f6da022433..20fbef8c258f 100644 --- a/frontend/src/ts/test/wikipedia.ts +++ b/frontend/src/ts/test/wikipedia.ts @@ -1,6 +1,6 @@ import * as Loader from "../elements/loader"; import * as Misc from "../utils/misc"; -import * as JSONData from "../utils/JSON-data2"; +import * as JSONData from "../utils/json-data"; import { Section } from "../utils/misc"; export async function getTLD( diff --git a/frontend/src/ts/utils/JSON-data2.ts b/frontend/src/ts/utils/json-data.ts similarity index 100% rename from frontend/src/ts/utils/JSON-data2.ts rename to frontend/src/ts/utils/json-data.ts diff --git a/frontend/src/ts/utils/misc.ts b/frontend/src/ts/utils/misc.ts index a98fbf870c76..dcd294dcf9a2 100644 --- a/frontend/src/ts/utils/misc.ts +++ b/frontend/src/ts/utils/misc.ts @@ -1,7 +1,7 @@ import * as Loader from "../elements/loader"; import { envConfig } from "../constants/env-config"; import { lastElementFromArray } from "./arrays"; -import * as JSONData from "./JSON-data2"; +import * as JSONData from "./json-data"; export function kogasa(cov: number): number { return (