diff --git a/.eslintrc.json b/.eslintrc.json index b80c8fa3c..c2454acf9 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,6 +1,7 @@ { "extends": [ "eslint:recommended", + "plugin:import/recommended", "plugin:vue/recommended" ], "env": { @@ -14,7 +15,46 @@ "sourceType": "module", "parser": "@babel/eslint-parser" }, + "settings": { + "import/resolver": { + "alias": { + "map": [ + ["@", "./src"] + ], + "extensions": [".js", ".vue"] + } + } + }, "rules": { + "import/prefer-default-export": "off", + + "import/no-unresolved": "error", + "import/named": "error", + "import/namespace": "error", + "import/default": "error", + "import/export": "error", + "import/no-named-as-default": "warn", + "import/no-named-as-default-member": "warn", + "import/no-duplicates": "warn", + "import/extensions": ["warn", "never"], + "import/first": "warn", + "import/newline-after-import": "warn", + "import/no-named-default": "warn", + "import/no-self-import": "warn", + "import/order": [ + "warn", + { + "newlines-between": "always-and-inside-groups", + "pathGroups": [{ "pattern": "@/**", "group": "sibling" }] + } + ], + "sort-imports": [ + "warn", + { + "ignoreCase": true, + "allowSeparatedGroups": true + } + ], "no-console": "warn", "no-template-curly-in-string": "warn", "array-callback-return": "error", @@ -32,7 +72,6 @@ "allowElseIf": false } ], - "vue/one-component-per-file": "error", "vue/component-definition-name-casing": "warn", "vue/order-in-components": "warn", diff --git a/javascripts/core/achievements/normal-achievement.js b/javascripts/core/achievements/normal-achievement.js index a1db5a63c..b66955cb5 100644 --- a/javascripts/core/achievements/normal-achievement.js +++ b/javascripts/core/achievements/normal-achievement.js @@ -1,4 +1,4 @@ -import { GameMechanicState } from "../game-mechanics/index.js"; +import { GameMechanicState } from "../game-mechanics/index"; class AchievementState extends GameMechanicState { constructor(config) { diff --git a/javascripts/core/achievements/secret-achievement.js b/javascripts/core/achievements/secret-achievement.js index 8d2ec2710..35d351738 100644 --- a/javascripts/core/achievements/secret-achievement.js +++ b/javascripts/core/achievements/secret-achievement.js @@ -1,4 +1,4 @@ -import { GameMechanicState } from "../game-mechanics/index.js"; +import { GameMechanicState } from "../game-mechanics/index"; class SecretAchievementState extends GameMechanicState { constructor(config) { diff --git a/javascripts/core/app/modal.js b/javascripts/core/app/modal.js index 6f7d14b79..faaf3ad85 100644 --- a/javascripts/core/app/modal.js +++ b/javascripts/core/app/modal.js @@ -1,64 +1,64 @@ -import MessageModal from "@/components/modals/MessageModal"; import CelestialQuoteModal from "@/components/modals/CelestialQuoteModal"; -import CloudSaveConflictModal from "@/components/modals/cloud/CloudSaveConflictModal"; import CloudLoadConflictModal from "@/components/modals/cloud/CloudLoadConflictModal"; +import CloudSaveConflictModal from "@/components/modals/cloud/CloudSaveConflictModal"; import EternityChallengeStartModal from "@/components/modals/challenges/EternityChallengeStartModal"; import InfinityChallengeStartModal from "@/components/modals/challenges/InfinityChallengeStartModal"; +import MessageModal from "@/components/modals/MessageModal"; import NormalChallengeStartModal from "@/components/modals/challenges/NormalChallengeStartModal"; -import DimensionBoostModal from "@/components/modals/prestige/DimensionBoostModal"; import AntimatterGalaxyModal from "@/components/modals/prestige/AntimatterGalaxyModal"; -import BigCrunchModal from "@/components/modals/prestige/BigCrunchModal"; -import ReplicantiGalaxyModal from "@/components/modals/prestige/ReplicantiGalaxyModal"; -import EternityModal from "@/components/modals/prestige/EternityModal"; -import EnterDilationModal from "@/components/modals/prestige/EnterDilationModal"; -import RealityModal from "@/components/modals/prestige/RealityModal"; -import ResetRealityModal from "@/components/modals/prestige/ResetRealityModal"; -import ExitCelestialModal from "@/components/modals/prestige/ExitCelestialModal"; -import EnterCelestialsModal from "@/components/modals/prestige/EnterCelestialsModal"; -import HardResetModal from "@/components/modals/prestige/HardResetModal"; -import SpeedrunModeModal from "@/components/modals/SpeedrunModeModal"; -import ChangeNameModal from "@/components/modals/ChangeNameModal"; import ArmageddonModal from "@/components/modals/prestige/ArmageddonModal"; +import BigCrunchModal from "@/components/modals/prestige/BigCrunchModal"; +import ChangeNameModal from "@/components/modals/ChangeNameModal"; +import DimensionBoostModal from "@/components/modals/prestige/DimensionBoostModal"; +import EnterCelestialsModal from "@/components/modals/prestige/EnterCelestialsModal"; +import EnterDilationModal from "@/components/modals/prestige/EnterDilationModal"; +import EternityModal from "@/components/modals/prestige/EternityModal"; +import ExitCelestialModal from "@/components/modals/prestige/ExitCelestialModal"; +import HardResetModal from "@/components/modals/prestige/HardResetModal"; +import RealityModal from "@/components/modals/prestige/RealityModal"; +import ReplicantiGalaxyModal from "@/components/modals/prestige/ReplicantiGalaxyModal"; +import ResetRealityModal from "@/components/modals/prestige/ResetRealityModal"; +import SpeedrunModeModal from "@/components/modals/SpeedrunModeModal"; -import ConfirmationOptionsModal from "@/components/modals/options/ConfirmationOptionsModal"; -import InfoDisplayOptionsModal from "@/components/modals/options/InfoDisplayOptionsModal"; -import AwayProgressOptionsModal from "@/components/modals/options/AwayProgressOptionsModal"; -import HotkeysModal from "@/components/modals/options/HotkeysModal"; -import NewsOptionsModal from "@/components/modals/options/NewsOptionsModal"; import AnimationOptionsModal from "@/components/modals/options/AnimationOptionsModal"; -import PreferredTreeModal from "@/components/modals/options/PreferredTreeModal"; +import AwayProgressOptionsModal from "@/components/modals/options/AwayProgressOptionsModal"; +import ConfirmationOptionsModal from "@/components/modals/options/ConfirmationOptionsModal"; import HiddenTabsModal from "@/components/modals/options/hidden-tabs/HiddenTabsModal"; +import HotkeysModal from "@/components/modals/options/HotkeysModal"; +import InfoDisplayOptionsModal from "@/components/modals/options/InfoDisplayOptionsModal"; +import NewsOptionsModal from "@/components/modals/options/NewsOptionsModal"; +import PreferredTreeModal from "@/components/modals/options/PreferredTreeModal"; import DeleteCompanionGlyphModal from "@/components/modals/glyph-management/DeleteCompanionGlyphModal"; import DeleteGlyphModal from "@/components/modals/glyph-management/DeleteGlyphModal"; -import PurgeGlyphModal from "@/components/modals/glyph-management/PurgeGlyphModal"; -import SacrificeGlyphModal from "@/components/modals/glyph-management/SacrificeGlyphModal"; -import RefineGlyphModal from "@/components/modals/glyph-management/RefineGlyphModal"; -import PurgeAllUnprotectedGlyphsModal from "@/components/modals/glyph-management/PurgeAllUnprotectedGlyphsModal"; import PurgeAllRejectedGlyphsModal from "@/components/modals/glyph-management/PurgeAllRejectedGlyphsModal"; +import PurgeAllUnprotectedGlyphsModal from "@/components/modals/glyph-management/PurgeAllUnprotectedGlyphsModal"; +import PurgeGlyphModal from "@/components/modals/glyph-management/PurgeGlyphModal"; +import RefineGlyphModal from "@/components/modals/glyph-management/RefineGlyphModal"; +import SacrificeGlyphModal from "@/components/modals/glyph-management/SacrificeGlyphModal"; -import H2PModal from "@/components/modals/H2PModal"; -import InformationModal from "@/components/modals/InformationModal"; -import GlyphShowcasePanelModal from "@/components/modals/GlyphShowcasePanelModal"; -import UndoGlyphModal from "@/components/modals/UndoGlyphModal"; -import ReplaceGlyphModal from "@/components/modals/ReplaceGlyphModal"; -import UiChoiceModal from "@/components/modals/UiChoiceModal"; -import AwayProgressModal from "@/components/modals/AwayProgressModal"; -import LoadGameModal from "@/components/modals/LoadGameModal"; -import ImportSaveModal from "@/components/modals/ImportSaveModal"; -import ImportAutomatorScriptModal from "@/components/modals/ImportAutomatorScriptModal"; -import DeleteAutomatorScriptModal from "@/components/modals/DeleteAutomatorScriptModal"; import AutomatorScriptTemplate from "@/components/modals/AutomatorScriptTemplate"; +import AwayProgressModal from "@/components/modals/AwayProgressModal"; +import BreakInfinityModal from "@/components/modals/BreakInfinityModal"; +import DeleteAutomatorScriptModal from "@/components/modals/DeleteAutomatorScriptModal"; +import EnslavedHintsModal from "@/components/modals/EnslavedHintsModal"; +import GlyphSetSaveDeleteModal from "@/components/modals/GlyphSetSaveDeleteModal"; +import GlyphShowcasePanelModal from "@/components/modals/GlyphShowcasePanelModal"; +import H2PModal from "@/components/modals/H2PModal"; +import ImportAutomatorScriptModal from "@/components/modals/ImportAutomatorScriptModal"; +import ImportSaveModal from "@/components/modals/ImportSaveModal"; +import InformationModal from "@/components/modals/InformationModal"; +import LoadGameModal from "@/components/modals/LoadGameModal"; +import PelleEffectsModal from "@/components/modals/PelleEffectsModal"; +import RealityGlyphCreationModal from "@/components/modals/RealityGlyphCreationModal"; +import ReplaceGlyphModal from "@/components/modals/ReplaceGlyphModal"; +import SacrificeModal from "@/components/modals/SacrificeModal"; +import SingularityMilestonesModal from "@/components/modals/SingularityMilestonesModal"; import StdStoreModal from "@/components/modals/StdStoreModal"; import StudyStringModal from "@/components/modals/StudyStringModal"; -import SacrificeModal from "@/components/modals/SacrificeModal"; -import BreakInfinityModal from "@/components/modals/BreakInfinityModal"; -import GlyphSetSaveDeleteModal from "@/components/modals/GlyphSetSaveDeleteModal"; -import RealityGlyphCreationModal from "@/components/modals/RealityGlyphCreationModal"; -import EnslavedHintsModal from "@/components/modals/EnslavedHintsModal"; -import SingularityMilestonesModal from "@/components/modals/SingularityMilestonesModal"; -import PelleEffectsModal from "@/components/modals/PelleEffectsModal"; +import UiChoiceModal from "@/components/modals/UiChoiceModal"; +import UndoGlyphModal from "@/components/modals/UndoGlyphModal"; export class Modal { diff --git a/javascripts/core/app/ui.js b/javascripts/core/app/ui.js index a84c9749a..3d2c53787 100644 --- a/javascripts/core/app/ui.js +++ b/javascripts/core/app/ui.js @@ -1,8 +1,10 @@ -import { notify } from "./notify.js"; -import { state } from "./ui.init.js"; import VTooltip from "v-tooltip"; -import { useLongPress, useRepeatingClick } from "./longpress"; import VueGtag from "vue-gtag"; + +import { useLongPress, useRepeatingClick } from "./longpress"; +import { notify } from "./notify"; +import { state } from "./ui.init"; + import GameUIComponent from "@/components/GameUIComponent"; Vue.mixin({ diff --git a/javascripts/core/autobuyers/annihilation-autobuyer.js b/javascripts/core/autobuyers/annihilation-autobuyer.js index 2dfa16fc7..ca2a1d629 100644 --- a/javascripts/core/autobuyers/annihilation-autobuyer.js +++ b/javascripts/core/autobuyers/annihilation-autobuyer.js @@ -1,4 +1,4 @@ -import { Autobuyer, AutobuyerState } from "./autobuyer.js"; +import { Autobuyer, AutobuyerState } from "./autobuyer"; Autobuyer.annihilation = new class AnnihilationAutobuyerState extends AutobuyerState { get data() { diff --git a/javascripts/core/autobuyers/antimatter-dimension-autobuyer.js b/javascripts/core/autobuyers/antimatter-dimension-autobuyer.js index 8ec91a596..861eb39a8 100644 --- a/javascripts/core/autobuyers/antimatter-dimension-autobuyer.js +++ b/javascripts/core/autobuyers/antimatter-dimension-autobuyer.js @@ -1,5 +1,6 @@ -import { Autobuyer, UpgradeableAutobuyerState } from "./autobuyer.js"; -import { DC } from "../constants.js"; +import { DC } from "../constants"; + +import { Autobuyer, UpgradeableAutobuyerState } from "./autobuyer"; class AntimatterDimensionAutobuyerState extends UpgradeableAutobuyerState { get tier() { diff --git a/javascripts/core/autobuyers/autobuyers.js b/javascripts/core/autobuyers/autobuyers.js index 359859a07..c4d97dc78 100644 --- a/javascripts/core/autobuyers/autobuyers.js +++ b/javascripts/core/autobuyers/autobuyers.js @@ -1,4 +1,4 @@ -import { Autobuyer } from "./autobuyer.js"; +import { Autobuyer } from "./autobuyer"; export const Autobuyers = (function() { const antimatterDimensions = Autobuyer.antimatterDimension.zeroIndexed; diff --git a/javascripts/core/autobuyers/big-crunch-autobuyer.js b/javascripts/core/autobuyers/big-crunch-autobuyer.js index fc6ee2eab..2542d321e 100644 --- a/javascripts/core/autobuyers/big-crunch-autobuyer.js +++ b/javascripts/core/autobuyers/big-crunch-autobuyer.js @@ -1,4 +1,4 @@ -import { Autobuyer, UpgradeableAutobuyerState } from "./autobuyer.js"; +import { Autobuyer, UpgradeableAutobuyerState } from "./autobuyer"; Autobuyer.bigCrunch = new class BigCrunchAutobuyerState extends UpgradeableAutobuyerState { get data() { diff --git a/javascripts/core/autobuyers/black-hole-power-autobuyer.js b/javascripts/core/autobuyers/black-hole-power-autobuyer.js index 108eeba6e..9ccf311e0 100644 --- a/javascripts/core/autobuyers/black-hole-power-autobuyer.js +++ b/javascripts/core/autobuyers/black-hole-power-autobuyer.js @@ -1,4 +1,4 @@ -import { Autobuyer, AutobuyerState } from "./autobuyer.js"; +import { Autobuyer, AutobuyerState } from "./autobuyer"; class BlackHolePowerAutobuyerState extends AutobuyerState { get data() { diff --git a/javascripts/core/autobuyers/dark-matter-dimension-ascension-autobuyer.js b/javascripts/core/autobuyers/dark-matter-dimension-ascension-autobuyer.js index d86f133f8..32c919472 100644 --- a/javascripts/core/autobuyers/dark-matter-dimension-ascension-autobuyer.js +++ b/javascripts/core/autobuyers/dark-matter-dimension-ascension-autobuyer.js @@ -1,4 +1,4 @@ -import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer.js"; +import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer"; Autobuyer.darkMatterDimsAscension = new class DarkMatterDimensionAscensionAutobuyerState extends IntervaledAutobuyerState { diff --git a/javascripts/core/autobuyers/dark-matter-dimension-autobuyer.js b/javascripts/core/autobuyers/dark-matter-dimension-autobuyer.js index 502d53990..c3c39bba7 100644 --- a/javascripts/core/autobuyers/dark-matter-dimension-autobuyer.js +++ b/javascripts/core/autobuyers/dark-matter-dimension-autobuyer.js @@ -1,4 +1,4 @@ -import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer.js"; +import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer"; Autobuyer.darkMatterDims = new class DarkMatterDimensionAutobuyerState extends IntervaledAutobuyerState { get data() { diff --git a/javascripts/core/autobuyers/dilation-upgrade-autobuyer.js b/javascripts/core/autobuyers/dilation-upgrade-autobuyer.js index 0c46b71f7..9f00eaa87 100644 --- a/javascripts/core/autobuyers/dilation-upgrade-autobuyer.js +++ b/javascripts/core/autobuyers/dilation-upgrade-autobuyer.js @@ -1,4 +1,4 @@ -import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer.js"; +import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer"; class DilationUpgradeAutobuyerState extends IntervaledAutobuyerState { get _upgradeName() { return ["dtGain", "galaxyThreshold", "tachyonGain"][this.id - 1]; } diff --git a/javascripts/core/autobuyers/dimboost-autobuyer.js b/javascripts/core/autobuyers/dimboost-autobuyer.js index 2b3de13a2..ee27c01f6 100644 --- a/javascripts/core/autobuyers/dimboost-autobuyer.js +++ b/javascripts/core/autobuyers/dimboost-autobuyer.js @@ -1,4 +1,4 @@ -import { Autobuyer, UpgradeableAutobuyerState } from "./autobuyer.js"; +import { Autobuyer, UpgradeableAutobuyerState } from "./autobuyer"; Autobuyer.dimboost = new class DimBoostAutobuyerState extends UpgradeableAutobuyerState { get data() { diff --git a/javascripts/core/autobuyers/eternity-autobuyer.js b/javascripts/core/autobuyers/eternity-autobuyer.js index cbf187cd4..2254ee2cd 100644 --- a/javascripts/core/autobuyers/eternity-autobuyer.js +++ b/javascripts/core/autobuyers/eternity-autobuyer.js @@ -1,4 +1,4 @@ -import { Autobuyer, AutobuyerState } from "./autobuyer.js"; +import { Autobuyer, AutobuyerState } from "./autobuyer"; Autobuyer.eternity = new class EternityAutobuyerState extends AutobuyerState { get data() { diff --git a/javascripts/core/autobuyers/galaxy-autobuyer.js b/javascripts/core/autobuyers/galaxy-autobuyer.js index 0109fd878..fa50801d8 100644 --- a/javascripts/core/autobuyers/galaxy-autobuyer.js +++ b/javascripts/core/autobuyers/galaxy-autobuyer.js @@ -1,4 +1,4 @@ -import { Autobuyer, UpgradeableAutobuyerState } from "./autobuyer.js"; +import { Autobuyer, UpgradeableAutobuyerState } from "./autobuyer"; Autobuyer.galaxy = new class GalaxyAutobuyerState extends UpgradeableAutobuyerState { get data() { diff --git a/javascripts/core/autobuyers/imaginary-upgrade-autobuyer.js b/javascripts/core/autobuyers/imaginary-upgrade-autobuyer.js index 18407020c..9064b4d84 100644 --- a/javascripts/core/autobuyers/imaginary-upgrade-autobuyer.js +++ b/javascripts/core/autobuyers/imaginary-upgrade-autobuyer.js @@ -1,4 +1,4 @@ -import { Autobuyer, AutobuyerState } from "./autobuyer.js"; +import { Autobuyer, AutobuyerState } from "./autobuyer"; class ImaginaryUpgradeAutobuyerState extends AutobuyerState { get name() { diff --git a/javascripts/core/autobuyers/index.js b/javascripts/core/autobuyers/index.js index c8b7d8a89..977d7d2f4 100644 --- a/javascripts/core/autobuyers/index.js +++ b/javascripts/core/autobuyers/index.js @@ -1,27 +1,27 @@ -import "./autobuyer.js"; +import "./autobuyer"; -import "./antimatter-dimension-autobuyer.js"; -import "./tickspeed-autobuyer.js"; -import "./dimboost-autobuyer.js"; -import "./galaxy-autobuyer.js"; -import "./big-crunch-autobuyer.js"; -import "./sacrifice-autobuyer.js"; -import "./eternity-autobuyer.js"; -import "./reality-autobuyer.js"; +import "./antimatter-dimension-autobuyer"; +import "./tickspeed-autobuyer"; +import "./dimboost-autobuyer"; +import "./galaxy-autobuyer"; +import "./big-crunch-autobuyer"; +import "./sacrifice-autobuyer"; +import "./eternity-autobuyer"; +import "./reality-autobuyer"; -import "./infinity-dimension-autobuyer.js"; -import "./time-dimension-autobuyer.js"; -import "./time-theorem-autobuyer.js"; -import "./black-hole-power-autobuyer.js"; -import "./reality-upgrade-autobuyer.js"; -import "./imaginary-upgrade-autobuyer.js"; -import "./replicanti-upgrade-autobuyer.js"; -import "./dilation-upgrade-autobuyer.js"; -import "./prestige-currency-multiplier-autobuyer.js"; -import "./replicanti-galaxy-autobuyer.js"; -import "./dark-matter-dimension-autobuyer.js"; -import "./dark-matter-dimension-ascension-autobuyer.js"; -import "./singularity-autobuyer.js"; -import "./annihilation-autobuyer.js"; +import "./infinity-dimension-autobuyer"; +import "./time-dimension-autobuyer"; +import "./time-theorem-autobuyer"; +import "./black-hole-power-autobuyer"; +import "./reality-upgrade-autobuyer"; +import "./imaginary-upgrade-autobuyer"; +import "./replicanti-upgrade-autobuyer"; +import "./dilation-upgrade-autobuyer"; +import "./prestige-currency-multiplier-autobuyer"; +import "./replicanti-galaxy-autobuyer"; +import "./dark-matter-dimension-autobuyer"; +import "./dark-matter-dimension-ascension-autobuyer"; +import "./singularity-autobuyer"; +import "./annihilation-autobuyer"; -export * from "./autobuyers.js"; +export * from "./autobuyers"; diff --git a/javascripts/core/autobuyers/infinity-dimension-autobuyer.js b/javascripts/core/autobuyers/infinity-dimension-autobuyer.js index f2c4400c7..fa3e5a0eb 100644 --- a/javascripts/core/autobuyers/infinity-dimension-autobuyer.js +++ b/javascripts/core/autobuyers/infinity-dimension-autobuyer.js @@ -1,5 +1,6 @@ -import { InfinityDimensions } from "../globals.js"; -import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer.js"; +import { InfinityDimensions } from "../globals"; + +import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer"; class InfinityDimensionAutobuyerState extends IntervaledAutobuyerState { get tier() { diff --git a/javascripts/core/autobuyers/prestige-currency-multiplier-autobuyer.js b/javascripts/core/autobuyers/prestige-currency-multiplier-autobuyer.js index 049e7a4c5..f85e85019 100644 --- a/javascripts/core/autobuyers/prestige-currency-multiplier-autobuyer.js +++ b/javascripts/core/autobuyers/prestige-currency-multiplier-autobuyer.js @@ -1,4 +1,4 @@ -import { Autobuyer, AutobuyerState } from "./autobuyer.js"; +import { Autobuyer, AutobuyerState } from "./autobuyer"; Autobuyer.ipMult = new class IPMultAutobuyerState extends AutobuyerState { get data() { diff --git a/javascripts/core/autobuyers/reality-autobuyer.js b/javascripts/core/autobuyers/reality-autobuyer.js index ae43a486c..ed094e199 100644 --- a/javascripts/core/autobuyers/reality-autobuyer.js +++ b/javascripts/core/autobuyers/reality-autobuyer.js @@ -1,4 +1,4 @@ -import { Autobuyer, AutobuyerState } from "./autobuyer.js"; +import { Autobuyer, AutobuyerState } from "./autobuyer"; Autobuyer.reality = new class RealityAutobuyerState extends AutobuyerState { get data() { diff --git a/javascripts/core/autobuyers/reality-upgrade-autobuyer.js b/javascripts/core/autobuyers/reality-upgrade-autobuyer.js index 2c7db85a5..f94dc7aae 100644 --- a/javascripts/core/autobuyers/reality-upgrade-autobuyer.js +++ b/javascripts/core/autobuyers/reality-upgrade-autobuyer.js @@ -1,4 +1,4 @@ -import { Autobuyer, AutobuyerState } from "./autobuyer.js"; +import { Autobuyer, AutobuyerState } from "./autobuyer"; class RealityUpgradeAutobuyerState extends AutobuyerState { get name() { diff --git a/javascripts/core/autobuyers/replicanti-galaxy-autobuyer.js b/javascripts/core/autobuyers/replicanti-galaxy-autobuyer.js index 8f8b91032..08ce679b4 100644 --- a/javascripts/core/autobuyers/replicanti-galaxy-autobuyer.js +++ b/javascripts/core/autobuyers/replicanti-galaxy-autobuyer.js @@ -1,4 +1,4 @@ -import { Autobuyer, AutobuyerState } from "./autobuyer.js"; +import { Autobuyer, AutobuyerState } from "./autobuyer"; Autobuyer.replicantiGalaxy = new class ReplicantiGalaxyAutobuyerState extends AutobuyerState { get data() { diff --git a/javascripts/core/autobuyers/replicanti-upgrade-autobuyer.js b/javascripts/core/autobuyers/replicanti-upgrade-autobuyer.js index 49fe1ade5..8530745ba 100644 --- a/javascripts/core/autobuyers/replicanti-upgrade-autobuyer.js +++ b/javascripts/core/autobuyers/replicanti-upgrade-autobuyer.js @@ -1,4 +1,4 @@ -import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer.js"; +import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer"; class ReplicantiUpgradeAutobuyerState extends IntervaledAutobuyerState { get _upgradeName() { return ["chance", "interval", "galaxies"][this.id - 1]; } diff --git a/javascripts/core/autobuyers/sacrifice-autobuyer.js b/javascripts/core/autobuyers/sacrifice-autobuyer.js index 4f17908ac..49b475630 100644 --- a/javascripts/core/autobuyers/sacrifice-autobuyer.js +++ b/javascripts/core/autobuyers/sacrifice-autobuyer.js @@ -1,4 +1,4 @@ -import { Autobuyer, AutobuyerState } from "./autobuyer.js"; +import { Autobuyer, AutobuyerState } from "./autobuyer"; Autobuyer.sacrifice = new class SacrificeAutobuyerState extends AutobuyerState { get data() { diff --git a/javascripts/core/autobuyers/singularity-autobuyer.js b/javascripts/core/autobuyers/singularity-autobuyer.js index cd791bd98..5a9468637 100644 --- a/javascripts/core/autobuyers/singularity-autobuyer.js +++ b/javascripts/core/autobuyers/singularity-autobuyer.js @@ -1,4 +1,4 @@ -import { Autobuyer, AutobuyerState } from "./autobuyer.js"; +import { Autobuyer, AutobuyerState } from "./autobuyer"; Autobuyer.singularity = new class SingularityAutobuyerState extends AutobuyerState { get data() { diff --git a/javascripts/core/autobuyers/tickspeed-autobuyer.js b/javascripts/core/autobuyers/tickspeed-autobuyer.js index 6801f1532..f42debb64 100644 --- a/javascripts/core/autobuyers/tickspeed-autobuyer.js +++ b/javascripts/core/autobuyers/tickspeed-autobuyer.js @@ -1,5 +1,6 @@ -import { Autobuyer, UpgradeableAutobuyerState } from "./autobuyer.js"; -import { DC } from "../constants.js"; +import { DC } from "../constants"; + +import { Autobuyer, UpgradeableAutobuyerState } from "./autobuyer"; Autobuyer.tickspeed = new class TickspeedAutobuyerState extends UpgradeableAutobuyerState { get data() { diff --git a/javascripts/core/autobuyers/time-dimension-autobuyer.js b/javascripts/core/autobuyers/time-dimension-autobuyer.js index ce9c29dad..523417699 100644 --- a/javascripts/core/autobuyers/time-dimension-autobuyer.js +++ b/javascripts/core/autobuyers/time-dimension-autobuyer.js @@ -1,4 +1,4 @@ -import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer.js"; +import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer"; class TimeDimensionAutobuyerState extends IntervaledAutobuyerState { get tier() { diff --git a/javascripts/core/autobuyers/time-theorem-autobuyer.js b/javascripts/core/autobuyers/time-theorem-autobuyer.js index a63110afa..13d0e061b 100644 --- a/javascripts/core/autobuyers/time-theorem-autobuyer.js +++ b/javascripts/core/autobuyers/time-theorem-autobuyer.js @@ -1,4 +1,4 @@ -import { Autobuyer, AutobuyerState } from "./autobuyer.js"; +import { Autobuyer, AutobuyerState } from "./autobuyer"; Autobuyer.timeTheorem = new class TimeTheoremAutobuyerState extends AutobuyerState { get data() { diff --git a/javascripts/core/automator/automator-codemirror.js b/javascripts/core/automator/automator-codemirror.js index 4acedd864..8d3812c36 100644 --- a/javascripts/core/automator/automator-codemirror.js +++ b/javascripts/core/automator/automator-codemirror.js @@ -1,5 +1,5 @@ -import { AutomatorGrammar } from "./parser.js"; -import { AutomatorLexer } from "./lexer.js"; +import { AutomatorGrammar } from "./parser"; +import { AutomatorLexer } from "./lexer"; (function() { function walkSuggestion(suggestion, prefix, output) { diff --git a/javascripts/core/automator/automator-commands.js b/javascripts/core/automator/automator-commands.js index b23a02d54..23d85fb14 100644 --- a/javascripts/core/automator/automator-commands.js +++ b/javascripts/core/automator/automator-commands.js @@ -1,4 +1,4 @@ -import { AutomatorLexer } from "./lexer.js"; +import { AutomatorLexer } from "./lexer"; /** * Note: the $ shorthand for the parser object is required by Chevrotain. Don't mess with it. @@ -723,7 +723,7 @@ export const AutomatorCommands = ((() => { if (missingStudyCount === 0) { AutomatorData.logCommandEvent(`Fully loaded study preset ${ctx.Preset[0].image}`, ctx.startLine); } else if (afterCount > beforeCount) { - AutomatorData.logCommandEvent(`Partially loaded study preset ${ctx.Preset[0].image} + AutomatorData.logCommandEvent(`Partially loaded study preset ${ctx.Preset[0].image} (missing ${quantifyInt("study", missingStudyCount)})`, ctx.startLine); } return ctx.Nowait !== undefined || missingStudyCount === 0 diff --git a/javascripts/core/automator/compiler.js b/javascripts/core/automator/compiler.js index 23cc57247..ced011a23 100644 --- a/javascripts/core/automator/compiler.js +++ b/javascripts/core/automator/compiler.js @@ -1,6 +1,6 @@ -import { AutomatorCommands } from "./automator-commands.js"; -import { AutomatorGrammar } from "./parser.js"; -import { AutomatorLexer } from "./lexer.js"; +import { AutomatorCommands } from "./automator-commands"; +import { AutomatorGrammar } from "./parser"; +import { AutomatorLexer } from "./lexer"; (function() { if (AutomatorGrammar === undefined) { diff --git a/javascripts/core/automator/index.js b/javascripts/core/automator/index.js index 72759cf64..019909292 100644 --- a/javascripts/core/automator/index.js +++ b/javascripts/core/automator/index.js @@ -1,5 +1,5 @@ -import "./compiler.js"; -import "./automator-codemirror.js"; +import "./compiler"; +import "./automator-codemirror"; -export { AutomatorGrammar } from "./parser.js"; -export { standardizeAutomatorCurrencyName } from "./lexer.js"; +export { AutomatorGrammar } from "./parser"; +export { standardizeAutomatorCurrencyName } from "./lexer"; diff --git a/javascripts/core/automator/lexer.js b/javascripts/core/automator/lexer.js index 1d1b6270e..7118aa06c 100644 --- a/javascripts/core/automator/lexer.js +++ b/javascripts/core/automator/lexer.js @@ -2,7 +2,8 @@ /* eslint-disable require-unicode-regexp */ /* eslint-disable camelcase */ import { createToken, Lexer } from "chevrotain"; -import { DC } from "../constants.js"; + +import { DC } from "../constants"; export const AutomatorLexer = (() => { const createCategory = name => createToken({ name, pattern: Lexer.NA, longer_alt: Identifier }); diff --git a/javascripts/core/automator/parser.js b/javascripts/core/automator/parser.js index 32bac32f7..714554a2f 100644 --- a/javascripts/core/automator/parser.js +++ b/javascripts/core/automator/parser.js @@ -1,6 +1,7 @@ -import { Parser, EOF } from "chevrotain"; -import { AutomatorCommands } from "./automator-commands.js"; -import { AutomatorLexer } from "./lexer.js"; +import { EOF, Parser } from "chevrotain"; + +import { AutomatorCommands } from "./automator-commands"; +import { AutomatorLexer } from "./lexer"; export const AutomatorGrammar = (function() { const T = AutomatorLexer.tokenMap; diff --git a/javascripts/core/big_crunch.js b/javascripts/core/big_crunch.js index 48fdf30e8..063572e1c 100644 --- a/javascripts/core/big_crunch.js +++ b/javascripts/core/big_crunch.js @@ -1,6 +1,6 @@ -import { GameMechanicState, SetPurchasableMechanicState, RebuyableMechanicState } from "./game-mechanics/index.js"; -import { DC } from "./constants.js"; -import { SpeedrunMilestones } from "./speedrun.js"; +import { GameMechanicState, RebuyableMechanicState, SetPurchasableMechanicState } from "./game-mechanics/index"; +import { DC } from "./constants"; +import { SpeedrunMilestones } from "./speedrun"; export function bigCrunchAnimation() { document.body.style.animation = "implode 2s 1"; @@ -52,10 +52,10 @@ export function bigCrunchReset() { if (Pelle.isDoomed) PelleStrikes.infinity.trigger(); EventHub.dispatch(GAME_EVENT.BIG_CRUNCH_AFTER); - if (firstInfinity && !Pelle.isDoomed) Modal.message.show(`Upon Infinity, all Dimensions, Dimension Boosts, and Antimatter - Galaxies are reset, but in return, you gain an Infinity Point (IP). This allows you to buy multiple upgrades that - you can find in the Infinity tab. You will also gain one Infinity, which is the stat shown in the Statistics - tab.`); + if (firstInfinity && !Pelle.isDoomed) Modal.message.show(`Upon Infinity, all Dimensions, Dimension Boosts, and + Antimatter Galaxies are reset, but in return, you gain an Infinity Point (IP). This allows you to buy multiple + upgrades that you can find in the Infinity tab. You will also gain one Infinity, which is the stat shown in the + Statistics tab.`); } function bigCrunchUpdateStatistics() { diff --git a/javascripts/core/black_hole.js b/javascripts/core/black_hole.js index 597c6ca2b..f4cf69aa2 100644 --- a/javascripts/core/black_hole.js +++ b/javascripts/core/black_hole.js @@ -1,5 +1,5 @@ -import { DC } from "./constants.js"; -import { SpeedrunMilestones } from "./speedrun.js"; +import { DC } from "./constants"; +import { SpeedrunMilestones } from "./speedrun"; class BlackHoleUpgradeState { constructor(config) { diff --git a/javascripts/core/celestials/V.js b/javascripts/core/celestials/V.js index fa00faa17..918da7264 100644 --- a/javascripts/core/celestials/V.js +++ b/javascripts/core/celestials/V.js @@ -1,7 +1,9 @@ -import { GameDatabase } from "../secret-formula/game-database.js"; -import { GameMechanicState, BitUpgradeState } from "../game-mechanics/index.js"; -import { CelestialQuotes } from "./quotes.js"; -import { SpeedrunMilestones } from "../speedrun.js"; +import { BitUpgradeState, GameMechanicState } from "../game-mechanics/index"; +import { GameDatabase } from "../secret-formula/game-database"; + +import { SpeedrunMilestones } from "../speedrun"; + +import { CelestialQuotes } from "./quotes"; /** * Information about how to format runUnlocks: diff --git a/javascripts/core/celestials/celestials.js b/javascripts/core/celestials/celestials.js index 2563eaff6..e7ad90555 100644 --- a/javascripts/core/celestials/celestials.js +++ b/javascripts/core/celestials/celestials.js @@ -1,10 +1,10 @@ -import { Teresa } from "./teresa.js"; -import { Effarig } from "./effarig.js"; -import { Enslaved } from "./enslaved.js"; -import { V } from "./V.js"; -import { Ra } from "./ra/ra.js"; -import { Laitela } from "./laitela/laitela.js"; +import { Effarig } from "./effarig"; +import { Enslaved } from "./enslaved"; +import { Laitela } from "./laitela/laitela"; import { Pelle } from "./pelle/pelle"; +import { Ra } from "./ra/ra"; +import { Teresa } from "./teresa"; +import { V } from "./V"; export const Celestials = { teresa: Teresa, diff --git a/javascripts/core/celestials/effarig.js b/javascripts/core/celestials/effarig.js index 1ddee8829..823a0984e 100644 --- a/javascripts/core/celestials/effarig.js +++ b/javascripts/core/celestials/effarig.js @@ -1,7 +1,9 @@ -import { GameDatabase } from "../secret-formula/game-database.js"; -import { BitUpgradeState } from "../game-mechanics/index.js"; -import { CelestialQuotes } from "./quotes.js"; -import { DC } from "../constants.js"; +import { BitUpgradeState } from "../game-mechanics/index"; +import { GameDatabase } from "../secret-formula/game-database"; + +import { DC } from "../constants"; + +import { CelestialQuotes } from "./quotes"; export const EFFARIG_STAGES = { INFINITY: 1, diff --git a/javascripts/core/celestials/enslaved.js b/javascripts/core/celestials/enslaved.js index 78900e9b8..bf34196ec 100644 --- a/javascripts/core/celestials/enslaved.js +++ b/javascripts/core/celestials/enslaved.js @@ -1,6 +1,7 @@ -import { GameDatabase } from "../secret-formula/game-database.js"; -import { BitUpgradeState } from "../game-mechanics/index.js"; -import { CelestialQuotes } from "./quotes.js"; +import { BitUpgradeState } from "../game-mechanics/index"; +import { GameDatabase } from "../secret-formula/game-database"; + +import { CelestialQuotes } from "./quotes"; export const ENSLAVED_UNLOCKS = { FREE_TICKSPEED_SOFTCAP: { diff --git a/javascripts/core/celestials/laitela/dark-matter-dimension.js b/javascripts/core/celestials/laitela/dark-matter-dimension.js index 98577bdb4..bf9aaa4a4 100644 --- a/javascripts/core/celestials/laitela/dark-matter-dimension.js +++ b/javascripts/core/celestials/laitela/dark-matter-dimension.js @@ -1,5 +1,5 @@ -import { DimensionState } from "../../dimensions/dimension.js"; -import { DC } from "../../constants.js"; +import { DC } from "../../constants"; +import { DimensionState } from "../../dimensions/dimension"; /** * Constants for easily adjusting values diff --git a/javascripts/core/celestials/laitela/laitela.js b/javascripts/core/celestials/laitela/laitela.js index f14bbe65a..c8544a9a7 100644 --- a/javascripts/core/celestials/laitela/laitela.js +++ b/javascripts/core/celestials/laitela/laitela.js @@ -1,6 +1,7 @@ -import { CelestialQuotes } from "../quotes.js"; -import { DC } from "../../constants.js"; -import { DarkMatterDimensions } from "./dark-matter-dimension.js"; +import { CelestialQuotes } from "../quotes"; +import { DC } from "../../constants"; + +import { DarkMatterDimensions } from "./dark-matter-dimension"; export const Laitela = { displayName: "Lai'tela", diff --git a/javascripts/core/celestials/laitela/singularity.js b/javascripts/core/celestials/laitela/singularity.js index a0afdb20a..bfc172164 100644 --- a/javascripts/core/celestials/laitela/singularity.js +++ b/javascripts/core/celestials/laitela/singularity.js @@ -1,4 +1,5 @@ -import { GameMechanicState } from "../../game-mechanics/index.js"; +import { GameMechanicState } from "../../game-mechanics/index"; + import { deepmergeAll } from "@/utility/deepmerge"; class SingularityMilestoneState extends GameMechanicState { diff --git a/javascripts/core/celestials/pelle/galaxy-generator.js b/javascripts/core/celestials/pelle/galaxy-generator.js index 1ab9144c3..b5249e0ad 100644 --- a/javascripts/core/celestials/pelle/galaxy-generator.js +++ b/javascripts/core/celestials/pelle/galaxy-generator.js @@ -1,5 +1,6 @@ import { DC } from "../../constants"; import { RebuyableMechanicState } from "../../game-mechanics/rebuyable"; + import { PelleRifts } from "./rifts"; export const GalaxyGenerator = { diff --git a/javascripts/core/celestials/pelle/pelle.js b/javascripts/core/celestials/pelle/pelle.js index 89dd64349..e9d522e41 100644 --- a/javascripts/core/celestials/pelle/pelle.js +++ b/javascripts/core/celestials/pelle/pelle.js @@ -1,9 +1,11 @@ -import { DC } from "../../constants"; import { Currency } from "../../currency"; +import { DC } from "../../constants"; import { RebuyableMechanicState } from "../../game-mechanics/rebuyable"; import { SetPurchasableMechanicState } from "../../utils"; + +import { CelestialQuotes } from "../quotes"; + import zalgo from "./zalgo"; -import { CelestialQuotes } from "../quotes.js"; const disabledMechanicUnlocks = { achievements: () => ({}), diff --git a/javascripts/core/celestials/ra/alchemy.js b/javascripts/core/celestials/ra/alchemy.js index 84e7f6e8f..fe02a65bd 100644 --- a/javascripts/core/celestials/ra/alchemy.js +++ b/javascripts/core/celestials/ra/alchemy.js @@ -1,4 +1,4 @@ -import { GameMechanicState } from "../../game-mechanics/index.js"; +import { GameMechanicState } from "../../game-mechanics/index"; /** * @abstract diff --git a/javascripts/core/celestials/ra/ra.js b/javascripts/core/celestials/ra/ra.js index 1ded82f31..102cf7c2f 100644 --- a/javascripts/core/celestials/ra/ra.js +++ b/javascripts/core/celestials/ra/ra.js @@ -1,5 +1,5 @@ -import { GameMechanicState, BitUpgradeState } from "../../game-mechanics/index.js"; -import { CelestialQuotes } from "../quotes.js"; +import { BitUpgradeState, GameMechanicState } from "../../game-mechanics/index"; +import { CelestialQuotes } from "../quotes"; class RaUnlockState extends BitUpgradeState { get bits() { return player.celestials.ra.unlockBits; } diff --git a/javascripts/core/celestials/teresa.js b/javascripts/core/celestials/teresa.js index c255fc9f1..e8e99da69 100644 --- a/javascripts/core/celestials/teresa.js +++ b/javascripts/core/celestials/teresa.js @@ -1,6 +1,7 @@ -import { GameDatabase } from "../secret-formula/game-database.js"; -import { BitUpgradeState, RebuyableMechanicState } from "../game-mechanics/index.js"; -import { CelestialQuotes } from "./quotes.js"; +import { BitUpgradeState, RebuyableMechanicState } from "../game-mechanics/index"; +import { GameDatabase } from "../secret-formula/game-database"; + +import { CelestialQuotes } from "./quotes"; export const Teresa = { timePoured: 0, diff --git a/javascripts/core/challenge.js b/javascripts/core/challenge.js index 78d7613e2..19d2fc835 100644 --- a/javascripts/core/challenge.js +++ b/javascripts/core/challenge.js @@ -1,5 +1,5 @@ -import { GameMechanicState } from "./game-mechanics/index.js"; -import { DC } from "./constants.js"; +import { DC } from "./constants"; +import { GameMechanicState } from "./game-mechanics/index"; // This function does *not* reset anything. Only call it when you've already // done all the non-UI stuff. Right now the only UI thing to do is switch to diff --git a/javascripts/core/currency.js b/javascripts/core/currency.js index 695514a03..08521d49e 100644 --- a/javascripts/core/currency.js +++ b/javascripts/core/currency.js @@ -1,4 +1,4 @@ -import { DC } from "./constants.js"; +import { DC } from "./constants"; /** diff --git a/javascripts/core/devtools.js b/javascripts/core/devtools.js index e1ea9ed91..8ac429cbd 100644 --- a/javascripts/core/devtools.js +++ b/javascripts/core/devtools.js @@ -1,6 +1,7 @@ -import { DC } from "./constants.js"; import { sha512_256 } from "js-sha512"; +import { DC } from "./constants"; + /* eslint-disable no-console */ // Disabling no-console here seems // reasonable, since these are the devtools after all diff --git a/javascripts/core/dilation.js b/javascripts/core/dilation.js index 4bc20bb5e..00e780749 100644 --- a/javascripts/core/dilation.js +++ b/javascripts/core/dilation.js @@ -1,6 +1,6 @@ -import { SetPurchasableMechanicState, RebuyableMechanicState } from "./game-mechanics/index.js"; -import { DC } from "./constants.js"; -import { SpeedrunMilestones } from "./speedrun.js"; +import { RebuyableMechanicState, SetPurchasableMechanicState } from "./game-mechanics/index"; +import { DC } from "./constants"; +import { SpeedrunMilestones } from "./speedrun"; export function animateAndDilate() { document.body.style.animation = "dilate 2s 1 linear"; diff --git a/javascripts/core/dimboost.js b/javascripts/core/dimboost.js index 2b39897f9..ef475da11 100644 --- a/javascripts/core/dimboost.js +++ b/javascripts/core/dimboost.js @@ -1,4 +1,4 @@ -import { DC } from "./constants.js"; +import { DC } from "./constants"; class DimBoostRequirement { constructor(tier, amount) { diff --git a/javascripts/core/dimensions/antimatter-dimension.js b/javascripts/core/dimensions/antimatter-dimension.js index 294c1e0e8..627a6d706 100644 --- a/javascripts/core/dimensions/antimatter-dimension.js +++ b/javascripts/core/dimensions/antimatter-dimension.js @@ -1,5 +1,6 @@ -import { DimensionState } from "./dimension.js"; -import { DC } from "../constants.js"; +import { DC } from "../constants"; + +import { DimensionState } from "./dimension"; // Multiplier applied to all Antimatter Dimensions, regardless of tier. This is cached using a Lazy // and invalidated every update. diff --git a/javascripts/core/dimensions/infinity-dimension.js b/javascripts/core/dimensions/infinity-dimension.js index b626d9cc4..de810c5da 100644 --- a/javascripts/core/dimensions/infinity-dimension.js +++ b/javascripts/core/dimensions/infinity-dimension.js @@ -1,5 +1,6 @@ -import { DimensionState } from "./dimension.js"; -import { DC } from "../constants.js"; +import { DC } from "../constants"; + +import { DimensionState } from "./dimension"; export function infinityDimensionCommonMultiplier() { let mult = new Decimal(ShopPurchase.allDimPurchases.currentMult) diff --git a/javascripts/core/dimensions/time-dimension.js b/javascripts/core/dimensions/time-dimension.js index 1571006b3..503998a18 100644 --- a/javascripts/core/dimensions/time-dimension.js +++ b/javascripts/core/dimensions/time-dimension.js @@ -1,5 +1,6 @@ -import { DimensionState } from "./dimension.js"; -import { DC } from "../constants.js"; +import { DC } from "../constants"; + +import { DimensionState } from "./dimension"; export function buySingleTimeDimension(tier) { const dim = TimeDimension(tier); diff --git a/javascripts/core/eternity.js b/javascripts/core/eternity.js index cd3e0d2cf..0475eb0cc 100644 --- a/javascripts/core/eternity.js +++ b/javascripts/core/eternity.js @@ -1,5 +1,5 @@ -import { GameMechanicState, SetPurchasableMechanicState } from "./game-mechanics/index.js"; -import { DC } from "./constants.js"; +import { GameMechanicState, SetPurchasableMechanicState } from "./game-mechanics/index"; +import { DC } from "./constants"; function giveEternityRewards(auto) { player.records.bestEternity.time = Math.min(player.records.thisEternity.time, player.records.bestEternity.time); diff --git a/javascripts/core/eternity_challenge.js b/javascripts/core/eternity_challenge.js index dcb640a7e..08172b901 100644 --- a/javascripts/core/eternity_challenge.js +++ b/javascripts/core/eternity_challenge.js @@ -1,6 +1,6 @@ -import { GameMechanicState } from "./game-mechanics/index.js"; -import { DC } from "./constants.js"; +import { DC } from "./constants"; import { deepmergeAll } from "@/utility/deepmerge"; +import { GameMechanicState } from "./game-mechanics/index"; export function startEternityChallenge() { initializeChallengeCompletions(); diff --git a/javascripts/core/game-mechanics/bit-purchasable.js b/javascripts/core/game-mechanics/bit-purchasable.js index 670998158..c2c339858 100644 --- a/javascripts/core/game-mechanics/bit-purchasable.js +++ b/javascripts/core/game-mechanics/bit-purchasable.js @@ -1,4 +1,4 @@ -import { PurchasableMechanicState } from "./puchasable.js"; +import { PurchasableMechanicState } from "./puchasable"; /** * @abstract diff --git a/javascripts/core/game-mechanics/bit-upgrade-state.js b/javascripts/core/game-mechanics/bit-upgrade-state.js index 2c21de72a..ff971913b 100644 --- a/javascripts/core/game-mechanics/bit-upgrade-state.js +++ b/javascripts/core/game-mechanics/bit-upgrade-state.js @@ -1,4 +1,4 @@ -import { GameMechanicState } from "./game-mechanic.js"; +import { GameMechanicState } from "./game-mechanic"; /** * @abstract diff --git a/javascripts/core/game-mechanics/game-mechanic.js b/javascripts/core/game-mechanics/game-mechanic.js index de6012e04..03e156de6 100644 --- a/javascripts/core/game-mechanics/game-mechanic.js +++ b/javascripts/core/game-mechanics/game-mechanic.js @@ -1,4 +1,4 @@ -import { Effect } from "./effect.js"; +import { Effect } from "./effect"; /** * @abstract diff --git a/javascripts/core/game-mechanics/index.js b/javascripts/core/game-mechanics/index.js index 5268f10d4..9756ec589 100644 --- a/javascripts/core/game-mechanics/index.js +++ b/javascripts/core/game-mechanics/index.js @@ -1,8 +1,8 @@ -export * from "./effect.js"; -export * from "./effects.js"; -export * from "./game-mechanic.js"; -export * from "./bit-upgrade-state.js"; -export * from "./puchasable.js"; -export * from "./set-purchasable.js"; -export * from "./bit-purchasable.js"; -export * from "./rebuyable.js"; +export * from "./effect"; +export * from "./effects"; +export * from "./game-mechanic"; +export * from "./bit-upgrade-state"; +export * from "./puchasable"; +export * from "./set-purchasable"; +export * from "./bit-purchasable"; +export * from "./rebuyable"; diff --git a/javascripts/core/game-mechanics/puchasable.js b/javascripts/core/game-mechanics/puchasable.js index fb4843bb4..44f24c146 100644 --- a/javascripts/core/game-mechanics/puchasable.js +++ b/javascripts/core/game-mechanics/puchasable.js @@ -1,4 +1,4 @@ -import { GameMechanicState } from "./game-mechanic.js"; +import { GameMechanicState } from "./game-mechanic"; /** * @abstract diff --git a/javascripts/core/game-mechanics/rebuyable.js b/javascripts/core/game-mechanics/rebuyable.js index f6c98eab0..ac3abbb0d 100644 --- a/javascripts/core/game-mechanics/rebuyable.js +++ b/javascripts/core/game-mechanics/rebuyable.js @@ -1,4 +1,4 @@ -import { GameMechanicState } from "./game-mechanic.js"; +import { GameMechanicState } from "./game-mechanic"; /** * @abstract diff --git a/javascripts/core/game-mechanics/set-purchasable.js b/javascripts/core/game-mechanics/set-purchasable.js index 0a763198c..96e48ca6d 100644 --- a/javascripts/core/game-mechanics/set-purchasable.js +++ b/javascripts/core/game-mechanics/set-purchasable.js @@ -1,4 +1,4 @@ -import { PurchasableMechanicState } from "./puchasable.js"; +import { PurchasableMechanicState } from "./puchasable"; /** * @abstract diff --git a/javascripts/core/globals.js b/javascripts/core/globals.js index 7a75923c9..a341628b0 100644 --- a/javascripts/core/globals.js +++ b/javascripts/core/globals.js @@ -1,90 +1,90 @@ -export * from "./glyph-effects.js"; -export * from "./player.js"; +export * from "./glyph-effects"; +export * from "./player"; -export * from "./automator/automator-backend.js"; -export * from "./performance-stats.js"; -export * from "./currency.js"; -export * from "./cache.js"; -export * from "./intervals.js"; -export * from "./keyboard.js"; -export * from "./hotkeys.js"; -export * from "./galaxy.js"; -export * from "./away-progress.js"; -export * from "./confirmations.js"; +export * from "./automator/automator-backend"; +export * from "./performance-stats"; +export * from "./currency"; +export * from "./cache"; +export * from "./intervals"; +export * from "./keyboard"; +export * from "./hotkeys"; +export * from "./galaxy"; +export * from "./away-progress"; +export * from "./confirmations"; -export * from "./autobuyers/index.js"; -export * from "./storage/index.js"; +export * from "./autobuyers/index"; +export * from "./storage/index"; -export * from "./notations.js"; -export * from "./tutorial.js"; +export * from "./notations"; +export * from "./tutorial"; -export * from "./new-game.js"; +export * from "./new-game"; -export * from "./celestials/quotes.js"; -export * from "./celestials/teresa.js"; -export * from "./celestials/effarig.js"; -export * from "./celestials/enslaved.js"; -export * from "./celestials/V.js"; -export * from "./celestials/ra/ra.js"; -export * from "./celestials/ra/alchemy.js"; -export * from "./celestials/laitela/laitela.js"; -export * from "./celestials/laitela/dark-matter-dimension.js"; -export * from "./celestials/laitela/singularity.js"; -export * from "./celestials/pelle/pelle.js"; -export * from "./celestials/pelle/strikes.js"; -export * from "./celestials/pelle/rifts.js"; -export * from "./celestials/pelle/galaxy-generator.js"; -export * from "./celestials/pelle/game-end.js"; -export * from "./celestials/celestials.js"; +export * from "./celestials/quotes"; +export * from "./celestials/teresa"; +export * from "./celestials/effarig"; +export * from "./celestials/enslaved"; +export * from "./celestials/V"; +export * from "./celestials/ra/ra"; +export * from "./celestials/ra/alchemy"; +export * from "./celestials/laitela/laitela"; +export * from "./celestials/laitela/dark-matter-dimension"; +export * from "./celestials/laitela/singularity"; +export * from "./celestials/pelle/pelle"; +export * from "./celestials/pelle/strikes"; +export * from "./celestials/pelle/rifts"; +export * from "./celestials/pelle/galaxy-generator"; +export * from "./celestials/pelle/game-end"; +export * from "./celestials/celestials"; -export * from "./automator/index.js"; -export * from "./automator/automator-points.js"; +export * from "./automator/index"; +export * from "./automator/automator-points"; -export * from "./app/player-progress.js"; -export * from "./app/modal.js"; -export * from "./app/themes.js"; -export * from "./app/options.js"; -export * from "./app/ui.js"; +export * from "./app/player-progress"; +export * from "./app/modal"; +export * from "./app/themes"; +export * from "./app/options"; +export * from "./app/ui"; -export * from "./achievements/normal-achievement.js"; -export * from "./achievements/secret-achievement.js"; -export * from "./achievements/achievement-timer.js"; +export * from "./achievements/normal-achievement"; +export * from "./achievements/secret-achievement"; +export * from "./achievements/achievement-timer"; -export * from "./glyphs/glyph-core.js"; -export * from "./glyphs/glyph-effects.js"; -export * from "./glyphs/glyph-generator.js"; -export * from "./glyphs/glyph-purge-handler.js"; -export * from "./glyphs/auto-glyph-processor.js"; +export * from "./glyphs/glyph-core"; +export * from "./glyphs/glyph-effects"; +export * from "./glyphs/glyph-generator"; +export * from "./glyphs/glyph-purge-handler"; +export * from "./glyphs/auto-glyph-processor"; -export * from "./time.js"; -export * from "./tickspeed.js"; +export * from "./time"; +export * from "./tickspeed"; -export * from "./dimensions/antimatter-dimension.js"; -export * from "./dimensions/infinity-dimension.js"; -export * from "./dimensions/time-dimension.js"; +export * from "./dimensions/antimatter-dimension"; +export * from "./dimensions/infinity-dimension"; +export * from "./dimensions/time-dimension"; -export * from "./time-studies/index.js"; +export * from "./time-studies/index"; -export * from "./dimboost.js"; -export * from "./sacrifice.js"; -export * from "./big_crunch.js"; -export * from "./challenge.js"; -export * from "./eternity.js"; -export * from "./eternity_challenge.js"; -export * from "./reality.js"; -export * from "./replicanti.js"; -export * from "./time-theorems.js"; -export * from "./reality-upgrades.js"; -export * from "./imaginary-upgrades.js"; -export * from "./perks.js"; -export * from "./dilation.js"; -export * from "./black_hole.js"; -export * from "./machines.js"; -export * from "./devtools.js"; -export * from "./news-ticker.js"; -export * from "./kong.js"; -export * from "./ui/tabs.js"; -export * from "./ui/tab-notifications.js"; -export * from "./speedrun.js"; +export * from "./dimboost"; +export * from "./sacrifice"; +export * from "./big_crunch"; +export * from "./challenge"; +export * from "./eternity"; +export * from "./eternity_challenge"; +export * from "./reality"; +export * from "./replicanti"; +export * from "./time-theorems"; +export * from "./reality-upgrades"; +export * from "./imaginary-upgrades"; +export * from "./perks"; +export * from "./dilation"; +export * from "./black_hole"; +export * from "./machines"; +export * from "./devtools"; +export * from "./news-ticker"; +export * from "./kong"; +export * from "./ui/tabs"; +export * from "./ui/tab-notifications"; +export * from "./speedrun"; -export * from "./automator/script-templates.js"; +export * from "./automator/script-templates"; diff --git a/javascripts/core/glyph-effects.js b/javascripts/core/glyph-effects.js index 717b69d7f..6b0f39010 100644 --- a/javascripts/core/glyph-effects.js +++ b/javascripts/core/glyph-effects.js @@ -1,5 +1,5 @@ -import { GameDatabase } from "./secret-formula/game-database.js"; -import { DC } from "./constants.js"; +import { DC } from "./constants"; +import { GameDatabase } from "./secret-formula/game-database"; // There is a little too much stuff about glyph effects to put in constants. diff --git a/javascripts/core/glyphs/glyph-core.js b/javascripts/core/glyphs/glyph-core.js index 9ab3f56c8..131cf7f77 100644 --- a/javascripts/core/glyphs/glyph-core.js +++ b/javascripts/core/glyphs/glyph-core.js @@ -1,4 +1,4 @@ -import { GameMechanicState } from "../game-mechanics/index.js"; +import { GameMechanicState } from "../game-mechanics/index"; export const orderedEffectList = ["powerpow", "infinitypow", "replicationpow", "timepow", "dilationpow", "timeshardpow", "powermult", "powerdimboost", "powerbuy10", diff --git a/javascripts/core/hotkeys.js b/javascripts/core/hotkeys.js index 9151d6d93..592399dba 100644 --- a/javascripts/core/hotkeys.js +++ b/javascripts/core/hotkeys.js @@ -1,6 +1,7 @@ -import { GameKeyboard } from "./keyboard.js"; import Mousetrap from "mousetrap"; +import { GameKeyboard } from "./keyboard"; + // Add your hotkeys and combinations here // GameKeyboard.bind for single press combinations // GameKeyboard.bindRepeatable for repeatable combinations diff --git a/javascripts/core/imaginary-upgrades.js b/javascripts/core/imaginary-upgrades.js index e5a394323..d1c41dd62 100644 --- a/javascripts/core/imaginary-upgrades.js +++ b/javascripts/core/imaginary-upgrades.js @@ -1,5 +1,5 @@ -import { BitPurchasableMechanicState, RebuyableMechanicState } from "./game-mechanics/index.js"; -import { DC } from "./constants.js"; +import { BitPurchasableMechanicState, RebuyableMechanicState } from "./game-mechanics/index"; +import { DC } from "./constants"; class ImaginaryUpgradeState extends BitPurchasableMechanicState { constructor(config) { diff --git a/javascripts/core/kong.js b/javascripts/core/kong.js index a2897f39e..f38387381 100644 --- a/javascripts/core/kong.js +++ b/javascripts/core/kong.js @@ -1,4 +1,4 @@ -import { RebuyableMechanicState } from "./game-mechanics/index.js"; +import { RebuyableMechanicState } from "./game-mechanics/index"; export const kong = {}; diff --git a/javascripts/core/machines.js b/javascripts/core/machines.js index ec371c829..75bdf5dbe 100644 --- a/javascripts/core/machines.js +++ b/javascripts/core/machines.js @@ -1,4 +1,4 @@ -import { DC } from "./constants.js"; +import { DC } from "./constants"; export const MachineHandler = { get baseRMCap() { return DC.E1000; }, diff --git a/javascripts/core/math.js b/javascripts/core/math.js index f127c00e8..1075d6364 100644 --- a/javascripts/core/math.js +++ b/javascripts/core/math.js @@ -1,6 +1,7 @@ -import { DC } from "./constants.js"; import { log as lngamma } from "gamma"; +import { DC } from "./constants"; + /* eslint-disable no-use-before-define */ /* eslint-disable max-params */ diff --git a/javascripts/core/perks.js b/javascripts/core/perks.js index 6b5e058f1..2606bb25c 100644 --- a/javascripts/core/perks.js +++ b/javascripts/core/perks.js @@ -1,4 +1,4 @@ -import { SetPurchasableMechanicState } from "./game-mechanics/index.js"; +import { SetPurchasableMechanicState } from "./game-mechanics/index"; class PerkState extends SetPurchasableMechanicState { constructor(config) { diff --git a/javascripts/core/player.js b/javascripts/core/player.js index bd2d58dc6..debb9bf53 100644 --- a/javascripts/core/player.js +++ b/javascripts/core/player.js @@ -1,7 +1,7 @@ -import { GlyphTypes } from "./glyph-effects.js"; -import { AUTOMATOR_MODE, AUTOMATOR_TYPE } from "./automator/automator-backend.js"; -import { DC } from "./constants.js"; +import { AUTOMATOR_MODE, AUTOMATOR_TYPE } from "./automator/automator-backend"; +import { DC } from "./constants"; import { deepmergeAll } from "@/utility/deepmerge"; +import { GlyphTypes } from "./glyph-effects"; // This is actually reassigned when importing saves // eslint-disable-next-line prefer-const diff --git a/javascripts/core/reality-upgrades.js b/javascripts/core/reality-upgrades.js index 144ad447a..6a95d2404 100644 --- a/javascripts/core/reality-upgrades.js +++ b/javascripts/core/reality-upgrades.js @@ -1,4 +1,4 @@ -import { BitPurchasableMechanicState, RebuyableMechanicState } from "./game-mechanics/index.js"; +import { BitPurchasableMechanicState, RebuyableMechanicState } from "./game-mechanics/index"; class RealityUpgradeState extends BitPurchasableMechanicState { constructor(config) { diff --git a/javascripts/core/reality.js b/javascripts/core/reality.js index 9569d5592..1e8c8efce 100644 --- a/javascripts/core/reality.js +++ b/javascripts/core/reality.js @@ -1,4 +1,4 @@ -import { DC } from "./constants.js"; +import { DC } from "./constants"; /** * Object that manages the selection of glyphs offered to the player diff --git a/javascripts/core/replicanti.js b/javascripts/core/replicanti.js index b9806ef3b..2a644a73a 100644 --- a/javascripts/core/replicanti.js +++ b/javascripts/core/replicanti.js @@ -1,4 +1,4 @@ -import { DC } from "./constants.js"; +import { DC } from "./constants"; // Slowdown parameters for replicanti growth, interval will increase by scaleFactor for every scaleLog10 // OoM past the cap (default is 308.25 (log10 of 1.8e308), 1.2, Number.MAX_VALUE) diff --git a/javascripts/core/sacrifice.js b/javascripts/core/sacrifice.js index 80d2e8615..bbacd5829 100644 --- a/javascripts/core/sacrifice.js +++ b/javascripts/core/sacrifice.js @@ -1,4 +1,4 @@ -import { DC } from "./constants.js"; +import { DC } from "./constants"; export class Sacrifice { // This is tied to the "buying an 8th dimension" achievement in order to hide it from new players before they reach diff --git a/javascripts/core/secret-formula/achievements/normal-achievements.js b/javascripts/core/secret-formula/achievements/normal-achievements.js index b0b4df793..be17661e7 100644 --- a/javascripts/core/secret-formula/achievements/normal-achievements.js +++ b/javascripts/core/secret-formula/achievements/normal-achievements.js @@ -1,5 +1,5 @@ -import { GameDatabase } from "../game-database.js"; -import { DC } from "../../constants.js"; +import { DC } from "../../constants"; +import { GameDatabase } from "../game-database"; GameDatabase.achievements.normal = [ { diff --git a/javascripts/core/secret-formula/achievements/secret-achievements.js b/javascripts/core/secret-formula/achievements/secret-achievements.js index 567a52efd..df4f6a9d9 100644 --- a/javascripts/core/secret-formula/achievements/secret-achievements.js +++ b/javascripts/core/secret-formula/achievements/secret-achievements.js @@ -1,4 +1,4 @@ -import { GameDatabase } from "../game-database.js"; +import { GameDatabase } from "../game-database"; GameDatabase.achievements.secret = [ { diff --git a/javascripts/core/secret-formula/away-progress-types.js b/javascripts/core/secret-formula/away-progress-types.js index 6b2a7070b..e6d3f0cca 100644 --- a/javascripts/core/secret-formula/away-progress-types.js +++ b/javascripts/core/secret-formula/away-progress-types.js @@ -1,4 +1,4 @@ -import { GameDatabase } from "./game-database.js"; +import { GameDatabase } from "./game-database"; GameDatabase.awayProgressTypes = [ { diff --git a/javascripts/core/secret-formula/celestials/alchemy.js b/javascripts/core/secret-formula/celestials/alchemy.js index 7ba950abc..938388e91 100644 --- a/javascripts/core/secret-formula/celestials/alchemy.js +++ b/javascripts/core/secret-formula/celestials/alchemy.js @@ -1,5 +1,5 @@ -import { GameDatabase } from "../game-database.js"; -import { DC } from "../../constants.js"; +import { DC } from "../../constants"; +import { GameDatabase } from "../game-database"; GameDatabase.celestials.alchemy = { resources: { diff --git a/javascripts/core/secret-formula/celestials/effarig.js b/javascripts/core/secret-formula/celestials/effarig.js index a44b35def..9c10719cf 100644 --- a/javascripts/core/secret-formula/celestials/effarig.js +++ b/javascripts/core/secret-formula/celestials/effarig.js @@ -1,5 +1,5 @@ -import { GameDatabase } from "../game-database.js"; -import { DC } from "../../constants.js"; +import { DC } from "../../constants"; +import { GameDatabase } from "../game-database"; GameDatabase.celestials.effarig = { unlocks: { diff --git a/javascripts/core/secret-formula/celestials/enslaved.js b/javascripts/core/secret-formula/celestials/enslaved.js index 7da0c908a..e3305e9a7 100644 --- a/javascripts/core/secret-formula/celestials/enslaved.js +++ b/javascripts/core/secret-formula/celestials/enslaved.js @@ -1,4 +1,4 @@ -import { GameDatabase } from "../game-database.js"; +import { GameDatabase } from "../game-database"; GameDatabase.celestials.enslaved = { // Note that "condition" isn't displayed in-game. These are meant to be indicators here of diff --git a/javascripts/core/secret-formula/celestials/galaxy-generator.js b/javascripts/core/secret-formula/celestials/galaxy-generator.js index dda1d0f96..3d6fbe98a 100644 --- a/javascripts/core/secret-formula/celestials/galaxy-generator.js +++ b/javascripts/core/secret-formula/celestials/galaxy-generator.js @@ -1,4 +1,4 @@ -import { GameDatabase } from "../game-database.js"; +import { GameDatabase } from "../game-database"; GameDatabase.celestials.pelle.galaxyGeneratorUpgrades = (function() { const formatCost = c => format(c, 2); diff --git a/javascripts/core/secret-formula/celestials/navigation.js b/javascripts/core/secret-formula/celestials/navigation.js index 9a5f659e6..69328ee3c 100644 --- a/javascripts/core/secret-formula/celestials/navigation.js +++ b/javascripts/core/secret-formula/celestials/navigation.js @@ -1,5 +1,5 @@ -import { GameDatabase } from "../game-database.js"; -import { DC } from "../../constants.js"; +import { DC } from "../../constants"; +import { GameDatabase } from "../game-database"; export function emphasizeEnd(fraction) { return Math.pow(fraction, 10); diff --git a/javascripts/core/secret-formula/celestials/pelle-quotes.js b/javascripts/core/secret-formula/celestials/pelle-quotes.js index d9a86823c..835fa1faf 100644 --- a/javascripts/core/secret-formula/celestials/pelle-quotes.js +++ b/javascripts/core/secret-formula/celestials/pelle-quotes.js @@ -1,4 +1,4 @@ -import { GameDatabase } from "../game-database.js"; +import { GameDatabase } from "../game-database"; GameDatabase.celestials.pelle.quotes = {}; diff --git a/javascripts/core/secret-formula/celestials/pelle-upgrades.js b/javascripts/core/secret-formula/celestials/pelle-upgrades.js index 1c900d91d..21e8312ac 100644 --- a/javascripts/core/secret-formula/celestials/pelle-upgrades.js +++ b/javascripts/core/secret-formula/celestials/pelle-upgrades.js @@ -1,4 +1,4 @@ -import { GameDatabase } from "../game-database.js"; +import { GameDatabase } from "../game-database"; GameDatabase.celestials.pelle.upgrades = (function() { const formatCost = c => format(c, 2); diff --git a/javascripts/core/secret-formula/celestials/perk-shop.js b/javascripts/core/secret-formula/celestials/perk-shop.js index 54ed6ccd4..af1c23607 100644 --- a/javascripts/core/secret-formula/celestials/perk-shop.js +++ b/javascripts/core/secret-formula/celestials/perk-shop.js @@ -1,4 +1,4 @@ -import { GameDatabase } from "../game-database.js"; +import { GameDatabase } from "../game-database"; GameDatabase.celestials.perkShop = (function() { function rebuyableCost(initialCost, increment, id) { diff --git a/javascripts/core/secret-formula/celestials/ra.js b/javascripts/core/secret-formula/celestials/ra.js index ace9fe785..41d86fe8c 100644 --- a/javascripts/core/secret-formula/celestials/ra.js +++ b/javascripts/core/secret-formula/celestials/ra.js @@ -1,4 +1,4 @@ -import { GameDatabase } from "../game-database.js"; +import { GameDatabase } from "../game-database"; GameDatabase.celestials.ra = { pets: { diff --git a/javascripts/core/secret-formula/celestials/rifts.js b/javascripts/core/secret-formula/celestials/rifts.js index 18af25382..a8c0b4aca 100644 --- a/javascripts/core/secret-formula/celestials/rifts.js +++ b/javascripts/core/secret-formula/celestials/rifts.js @@ -1,5 +1,5 @@ -import { GameDatabase } from "../game-database.js"; -import { DC } from "../../constants.js"; +import { DC } from "../../constants"; +import { GameDatabase } from "../game-database"; GameDatabase.celestials.pelle.rifts = { famine: { diff --git a/javascripts/core/secret-formula/celestials/singularity-milestones.js b/javascripts/core/secret-formula/celestials/singularity-milestones.js index f0faa7f97..b0e87ac8c 100644 --- a/javascripts/core/secret-formula/celestials/singularity-milestones.js +++ b/javascripts/core/secret-formula/celestials/singularity-milestones.js @@ -1,4 +1,4 @@ -import { GameDatabase } from "../game-database.js"; +import { GameDatabase } from "../game-database"; // Used for UI purposes to give different theming for different kinds of upgrades export const LAITELA_UPGRADE_DIRECTION = { diff --git a/javascripts/core/secret-formula/celestials/strikes.js b/javascripts/core/secret-formula/celestials/strikes.js index 5650118b1..f5e61d8cb 100644 --- a/javascripts/core/secret-formula/celestials/strikes.js +++ b/javascripts/core/secret-formula/celestials/strikes.js @@ -1,5 +1,5 @@ -import { GameDatabase } from "../game-database.js"; -import { DC } from "../../constants.js"; +import { DC } from "../../constants"; +import { GameDatabase } from "../game-database"; GameDatabase.celestials.pelle.strikes = { infinity: { diff --git a/javascripts/core/secret-formula/celestials/teresa.js b/javascripts/core/secret-formula/celestials/teresa.js index 141d3f160..e3460c442 100644 --- a/javascripts/core/secret-formula/celestials/teresa.js +++ b/javascripts/core/secret-formula/celestials/teresa.js @@ -1,4 +1,4 @@ -import { GameDatabase } from "../game-database.js"; +import { GameDatabase } from "../game-database"; GameDatabase.celestials.teresa = { unlocks: { @@ -37,4 +37,4 @@ GameDatabase.celestials.teresa = { isDisabledInDoomed: true } } -}; \ No newline at end of file +}; diff --git a/javascripts/core/secret-formula/celestials/v.js b/javascripts/core/secret-formula/celestials/v.js index 4bd457d0d..342144a95 100644 --- a/javascripts/core/secret-formula/celestials/v.js +++ b/javascripts/core/secret-formula/celestials/v.js @@ -1,5 +1,6 @@ -import { GameDatabase } from "../game-database.js"; -import { DC } from "../../constants.js"; +import { DC } from "../../constants"; +import { GameDatabase } from "../game-database"; + // This is supposed to be in ./navigation.js but importing doesn't work for some stupid reason function emphasizeEnd(fraction) { return Math.pow(fraction, 10); diff --git a/javascripts/core/secret-formula/challenges/eternity-challenges.js b/javascripts/core/secret-formula/challenges/eternity-challenges.js index 79b5dc2cb..e646cda58 100644 --- a/javascripts/core/secret-formula/challenges/eternity-challenges.js +++ b/javascripts/core/secret-formula/challenges/eternity-challenges.js @@ -1,5 +1,5 @@ -import { GameDatabase } from "../game-database.js"; -import { DC } from "../../constants.js"; +import { DC } from "../../constants"; +import { GameDatabase } from "../game-database"; const specialInfinityGlyphDisabledEffectText = () => (PelleRifts.chaos.milestones[1].canBeApplied ? "The Pelle-Specific effect from Infinity Glyphs is also disabled." diff --git a/javascripts/core/secret-formula/challenges/infinity-challenges.js b/javascripts/core/secret-formula/challenges/infinity-challenges.js index d59b8938e..d195e9230 100644 --- a/javascripts/core/secret-formula/challenges/infinity-challenges.js +++ b/javascripts/core/secret-formula/challenges/infinity-challenges.js @@ -1,5 +1,5 @@ -import { GameDatabase } from "../game-database.js"; -import { DC } from "../../constants.js"; +import { DC } from "../../constants"; +import { GameDatabase } from "../game-database"; GameDatabase.challenges.infinity = [ { diff --git a/javascripts/core/secret-formula/challenges/normal-challenges.js b/javascripts/core/secret-formula/challenges/normal-challenges.js index daafa2ffa..142cf49bc 100644 --- a/javascripts/core/secret-formula/challenges/normal-challenges.js +++ b/javascripts/core/secret-formula/challenges/normal-challenges.js @@ -1,5 +1,5 @@ -import { GameDatabase } from "../game-database.js"; -import { DC } from "../../constants.js"; +import { DC } from "../../constants"; +import { GameDatabase } from "../game-database"; // I tried to make it relatively simple to add more locks; the idea is that you give it a value here // and then it's all handled in the backend diff --git a/javascripts/core/secret-formula/confirmation-types.js b/javascripts/core/secret-formula/confirmation-types.js index 4bd07b2c7..fee535d74 100644 --- a/javascripts/core/secret-formula/confirmation-types.js +++ b/javascripts/core/secret-formula/confirmation-types.js @@ -1,4 +1,4 @@ -import { GameDatabase } from "./game-database.js"; +import { GameDatabase } from "./game-database"; GameDatabase.confirmationTypes = [ { diff --git a/javascripts/core/secret-formula/credits.js b/javascripts/core/secret-formula/credits.js index a1418224e..2dddbefb9 100644 --- a/javascripts/core/secret-formula/credits.js +++ b/javascripts/core/secret-formula/credits.js @@ -1,4 +1,4 @@ -import { GameDatabase } from "./game-database.js"; +import { GameDatabase } from "./game-database"; GameDatabase.credits = { // Must be placed in the order it is desired they appear in the credits @@ -359,4 +359,4 @@ GameDatabase.credits = { ] }; -GameDatabase.credits.roles.count = Object.keys(GameDatabase.credits.roles).length; \ No newline at end of file +GameDatabase.credits.roles.count = Object.keys(GameDatabase.credits.roles).length; diff --git a/javascripts/core/secret-formula/eternity/dilation-upgrades.js b/javascripts/core/secret-formula/eternity/dilation-upgrades.js index b81d97106..44db5a33a 100644 --- a/javascripts/core/secret-formula/eternity/dilation-upgrades.js +++ b/javascripts/core/secret-formula/eternity/dilation-upgrades.js @@ -1,5 +1,5 @@ -import { GameDatabase } from "../game-database.js"; -import { DC } from "../../constants.js"; +import { DC } from "../../constants"; +import { GameDatabase } from "../game-database"; GameDatabase.eternity.dilation = (function() { function rebuyableCost(initialCost, increment, id) { diff --git a/javascripts/core/secret-formula/eternity/eternity-milestones.js b/javascripts/core/secret-formula/eternity/eternity-milestones.js index 99c201250..691007ce9 100644 --- a/javascripts/core/secret-formula/eternity/eternity-milestones.js +++ b/javascripts/core/secret-formula/eternity/eternity-milestones.js @@ -1,4 +1,4 @@ -import { GameDatabase } from "../game-database.js"; +import { GameDatabase } from "../game-database"; GameDatabase.eternity.milestones = { autobuyerIPMult: { diff --git a/javascripts/core/secret-formula/eternity/eternity-upgrades.js b/javascripts/core/secret-formula/eternity/eternity-upgrades.js index 250d6bdd7..f5d17939d 100644 --- a/javascripts/core/secret-formula/eternity/eternity-upgrades.js +++ b/javascripts/core/secret-formula/eternity/eternity-upgrades.js @@ -1,5 +1,5 @@ -import { GameDatabase } from "../game-database.js"; -import { DC } from "../../constants.js"; +import { DC } from "../../constants"; +import { GameDatabase } from "../game-database"; GameDatabase.eternity.upgrades = { idMultEP: { diff --git a/javascripts/core/secret-formula/eternity/time-studies/dilation-time-studies.js b/javascripts/core/secret-formula/eternity/time-studies/dilation-time-studies.js index 2a02794ea..7d7efd129 100644 --- a/javascripts/core/secret-formula/eternity/time-studies/dilation-time-studies.js +++ b/javascripts/core/secret-formula/eternity/time-studies/dilation-time-studies.js @@ -1,4 +1,4 @@ -import { GameDatabase } from "../../game-database.js"; +import { GameDatabase } from "../../game-database"; GameDatabase.eternity.timeStudies.dilation = [ { diff --git a/javascripts/core/secret-formula/eternity/time-studies/ec-time-studies.js b/javascripts/core/secret-formula/eternity/time-studies/ec-time-studies.js index d0913bf5f..adf5bb08a 100644 --- a/javascripts/core/secret-formula/eternity/time-studies/ec-time-studies.js +++ b/javascripts/core/secret-formula/eternity/time-studies/ec-time-studies.js @@ -1,5 +1,5 @@ -import { GameDatabase } from "../../game-database.js"; -import { DC } from "../../../constants.js"; +import { DC } from "../../../constants"; +import { GameDatabase } from "../../game-database"; GameDatabase.eternity.timeStudies.ec = [ { diff --git a/javascripts/core/secret-formula/eternity/time-studies/normal-time-studies.js b/javascripts/core/secret-formula/eternity/time-studies/normal-time-studies.js index be3adcfb4..3c42f10f6 100644 --- a/javascripts/core/secret-formula/eternity/time-studies/normal-time-studies.js +++ b/javascripts/core/secret-formula/eternity/time-studies/normal-time-studies.js @@ -1,5 +1,5 @@ -import { GameDatabase } from "../../game-database.js"; -import { DC } from "../../../constants.js"; +import { DC } from "../../../constants"; +import { GameDatabase } from "../../game-database"; /** * List of time study specifications and attributes diff --git a/javascripts/core/secret-formula/h2p.js b/javascripts/core/secret-formula/h2p.js index e2eacfcce..3ea6a0612 100644 --- a/javascripts/core/secret-formula/h2p.js +++ b/javascripts/core/secret-formula/h2p.js @@ -1,6 +1,7 @@ -import { GameDatabase } from "./game-database.js"; -import { DC } from "../constants.js"; -import { Pelle, PelleStrikes } from "../globals.js"; +import { Pelle, PelleStrikes } from "../globals"; +import { DC } from "../constants"; + +import { GameDatabase } from "./game-database"; GameDatabase.h2p = { /** diff --git a/javascripts/core/secret-formula/index.js b/javascripts/core/secret-formula/index.js index d76c8d8e9..a8380d6a8 100644 --- a/javascripts/core/secret-formula/index.js +++ b/javascripts/core/secret-formula/index.js @@ -1,45 +1,47 @@ -import "./game-database.js"; +/* eslint-disable import/newline-after-import */ +/* eslint-disable import/first */ +import "./game-database"; -import "./tabs.js"; -import "./away-progress-types.js"; -import "./confirmation-types.js"; -import "./tab-notifications.js"; -import "./news.js"; -import "./achievements/normal-achievements.js"; -import "./achievements/secret-achievements.js"; -import "./challenges/normal-challenges.js"; -import "./challenges/infinity-challenges.js"; -import "./challenges/eternity-challenges.js"; -import "./infinity/infinity-upgrades.js"; -import "./infinity/break-infinity-upgrades.js"; -import "./eternity/time-studies/normal-time-studies.js"; -import "./eternity/time-studies/ec-time-studies.js"; -import "./eternity/time-studies/dilation-time-studies.js"; -import "./eternity/eternity-upgrades.js"; -import "./eternity/eternity-milestones.js"; -import "./eternity/dilation-upgrades.js"; -import "./reality/reality-upgrades.js"; -import "./reality/imaginary-upgrades.js"; -export * from "./reality/perks.js"; -import "./reality/automator.js"; -import "./reality/glyph-sacrifices.js"; -import "./celestials/perk-shop.js"; -import "./celestials/teresa.js"; -import "./celestials/effarig.js"; -import "./celestials/pelle-upgrades.js"; -import "./celestials/strikes.js"; -import "./celestials/rifts.js"; -import "./celestials/galaxy-generator.js"; -import "./celestials/ra.js"; -import "./celestials/pelle-quotes.js"; -import "./celestials/enslaved.js"; -export * from "./celestials/v.js"; -import "./celestials/alchemy.js"; -import "./shop-purchases.js"; -export * from "./celestials/singularity-milestones.js"; -import "./script-templates.js"; -import "./speedrun-milestones.js"; +import "./tabs"; +import "./away-progress-types"; +import "./confirmation-types"; +import "./tab-notifications"; +import "./news"; +import "./achievements/normal-achievements"; +import "./achievements/secret-achievements"; +import "./challenges/normal-challenges"; +import "./challenges/infinity-challenges"; +import "./challenges/eternity-challenges"; +import "./infinity/infinity-upgrades"; +import "./infinity/break-infinity-upgrades"; +import "./eternity/time-studies/normal-time-studies"; +import "./eternity/time-studies/ec-time-studies"; +import "./eternity/time-studies/dilation-time-studies"; +import "./eternity/eternity-upgrades"; +import "./eternity/eternity-milestones"; +import "./eternity/dilation-upgrades"; +import "./reality/reality-upgrades"; +import "./reality/imaginary-upgrades"; +export * from "./reality/perks"; +import "./reality/automator"; +import "./reality/glyph-sacrifices"; +import "./celestials/perk-shop"; +import "./celestials/teresa"; +import "./celestials/effarig"; +import "./celestials/pelle-upgrades"; +import "./celestials/strikes"; +import "./celestials/rifts"; +import "./celestials/galaxy-generator"; +import "./celestials/ra"; +import "./celestials/pelle-quotes"; +import "./celestials/enslaved"; +export * from "./celestials/v"; +import "./celestials/alchemy"; +import "./shop-purchases"; +export * from "./celestials/singularity-milestones"; +import "./script-templates"; +import "./speedrun-milestones"; -import "./h2p.js"; +import "./h2p"; -import "./credits.js"; \ No newline at end of file +import "./credits"; diff --git a/javascripts/core/secret-formula/infinity/break-infinity-upgrades.js b/javascripts/core/secret-formula/infinity/break-infinity-upgrades.js index 5119dae59..9c0a606f3 100644 --- a/javascripts/core/secret-formula/infinity/break-infinity-upgrades.js +++ b/javascripts/core/secret-formula/infinity/break-infinity-upgrades.js @@ -1,5 +1,5 @@ -import { GameDatabase } from "../game-database.js"; -import { DC } from "../../constants.js"; +import { DC } from "../../constants"; +import { GameDatabase } from "../game-database"; GameDatabase.infinity.breakUpgrades = (function() { function rebuyable(config) { diff --git a/javascripts/core/secret-formula/infinity/infinity-upgrades.js b/javascripts/core/secret-formula/infinity/infinity-upgrades.js index 79b740ddb..0d9db2860 100644 --- a/javascripts/core/secret-formula/infinity/infinity-upgrades.js +++ b/javascripts/core/secret-formula/infinity/infinity-upgrades.js @@ -1,5 +1,5 @@ -import { GameDatabase } from "../game-database.js"; -import { DC } from "../../constants.js"; +import { DC } from "../../constants"; +import { GameDatabase } from "../game-database"; GameDatabase.infinity.upgrades = (function() { function dimInfinityMult() { diff --git a/javascripts/core/secret-formula/news.js b/javascripts/core/secret-formula/news.js index c9eae6f85..e51d6bb06 100644 --- a/javascripts/core/secret-formula/news.js +++ b/javascripts/core/secret-formula/news.js @@ -1,5 +1,6 @@ -import { GameDatabase } from "./game-database.js"; -import { DC } from "../constants.js"; +import { DC } from "../constants"; + +import { GameDatabase } from "./game-database"; // A = always there // L = locked diff --git a/javascripts/core/secret-formula/reality/automator.js b/javascripts/core/secret-formula/reality/automator.js index 10a42b5b1..1f88f19f4 100644 --- a/javascripts/core/secret-formula/reality/automator.js +++ b/javascripts/core/secret-formula/reality/automator.js @@ -1,4 +1,4 @@ -import { GameDatabase } from "../game-database.js"; +import { GameDatabase } from "../game-database"; GameDatabase.reality.automator = { commands: [ diff --git a/javascripts/core/secret-formula/reality/glyph-sacrifices.js b/javascripts/core/secret-formula/reality/glyph-sacrifices.js index edb2aaad9..7f54e1008 100644 --- a/javascripts/core/secret-formula/reality/glyph-sacrifices.js +++ b/javascripts/core/secret-formula/reality/glyph-sacrifices.js @@ -1,4 +1,4 @@ -import { GameDatabase } from "../game-database.js"; +import { GameDatabase } from "../game-database"; GameDatabase.reality.glyphSacrifice = [ { diff --git a/javascripts/core/secret-formula/reality/imaginary-upgrades.js b/javascripts/core/secret-formula/reality/imaginary-upgrades.js index 8b33e189d..982bc7a9f 100644 --- a/javascripts/core/secret-formula/reality/imaginary-upgrades.js +++ b/javascripts/core/secret-formula/reality/imaginary-upgrades.js @@ -1,5 +1,5 @@ -import { GameDatabase } from "../game-database.js"; -import { DC } from "../../constants.js"; +import { DC } from "../../constants"; +import { GameDatabase } from "../game-database"; GameDatabase.reality.imaginaryUpgrades = (function() { const rebuyable = props => { @@ -130,7 +130,7 @@ GameDatabase.reality.imaginaryUpgrades = (function() { name: "Transience of Information", id: 13, cost: 5e7, - requirement: () => `Reach ${format(Number.MAX_VALUE, 2)} projected Reality Machines within + requirement: () => `Reach ${format(Number.MAX_VALUE, 2)} projected Reality Machines within The Enslaved Ones' Reality`, hasFailed: () => !Enslaved.isRunning, checkRequirement: () => Enslaved.isRunning && MachineHandler.uncappedRM.gte(Number.MAX_VALUE), diff --git a/javascripts/core/secret-formula/reality/perks.js b/javascripts/core/secret-formula/reality/perks.js index 831642e83..d402025d0 100644 --- a/javascripts/core/secret-formula/reality/perks.js +++ b/javascripts/core/secret-formula/reality/perks.js @@ -1,5 +1,5 @@ -import { GameDatabase } from "../game-database.js"; -import { DC } from "../../constants.js"; +import { DC } from "../../constants"; +import { GameDatabase } from "../game-database"; export const PERK_FAMILY = { ANTIMATTER: "ANTIMATTER", diff --git a/javascripts/core/secret-formula/reality/reality-upgrades.js b/javascripts/core/secret-formula/reality/reality-upgrades.js index cc63e9ef5..7f35f3233 100644 --- a/javascripts/core/secret-formula/reality/reality-upgrades.js +++ b/javascripts/core/secret-formula/reality/reality-upgrades.js @@ -1,5 +1,5 @@ -import { GameDatabase } from "../game-database.js"; -import { DC } from "../../constants.js"; +import { DC } from "../../constants"; +import { GameDatabase } from "../game-database"; GameDatabase.reality.upgrades = (function() { const rebuyable = props => { diff --git a/javascripts/core/secret-formula/script-templates.js b/javascripts/core/secret-formula/script-templates.js index b906951fc..7efc7d2eb 100644 --- a/javascripts/core/secret-formula/script-templates.js +++ b/javascripts/core/secret-formula/script-templates.js @@ -1,5 +1,5 @@ -import { GameDatabase } from "./game-database.js"; import { AutobuyerInputFunctions } from "@/components/tabs/autobuyers/AutobuyerInput"; +import { GameDatabase } from "./game-database"; GameDatabase.reality.automator.templates = { /** diff --git a/javascripts/core/secret-formula/shop-purchases.js b/javascripts/core/secret-formula/shop-purchases.js index fbc167e51..7e2fb54f2 100644 --- a/javascripts/core/secret-formula/shop-purchases.js +++ b/javascripts/core/secret-formula/shop-purchases.js @@ -1,4 +1,4 @@ -import { GameDatabase } from "./game-database.js"; +import { GameDatabase } from "./game-database"; GameDatabase.shopPurchases = { dimPurchases: { diff --git a/javascripts/core/secret-formula/speedrun-milestones.js b/javascripts/core/secret-formula/speedrun-milestones.js index 02e675cac..226453045 100644 --- a/javascripts/core/secret-formula/speedrun-milestones.js +++ b/javascripts/core/secret-formula/speedrun-milestones.js @@ -1,4 +1,4 @@ -import { GameDatabase } from "./game-database.js"; +import { GameDatabase } from "./game-database"; GameDatabase.speedrunMilestones = [ { diff --git a/javascripts/core/secret-formula/tab-notifications.js b/javascripts/core/secret-formula/tab-notifications.js index 7edf277f6..5957593d9 100644 --- a/javascripts/core/secret-formula/tab-notifications.js +++ b/javascripts/core/secret-formula/tab-notifications.js @@ -1,5 +1,6 @@ -import { GameDatabase } from "./game-database.js"; -import { DC } from "../constants.js"; +import { DC } from "../constants"; + +import { GameDatabase } from "./game-database"; GameDatabase.tabNotifications = { firstInfinity: { diff --git a/javascripts/core/secret-formula/tabs.js b/javascripts/core/secret-formula/tabs.js index 475fa3874..89db891ea 100644 --- a/javascripts/core/secret-formula/tabs.js +++ b/javascripts/core/secret-formula/tabs.js @@ -1,4 +1,4 @@ -import { GameDatabase } from "./game-database.js"; +import { GameDatabase } from "./game-database"; GameDatabase.tabs = [ { diff --git a/javascripts/core/speedrun.js b/javascripts/core/speedrun.js index b9b1cc13a..b8b03f13d 100644 --- a/javascripts/core/speedrun.js +++ b/javascripts/core/speedrun.js @@ -1,5 +1,5 @@ import { GameDatabase } from "./secret-formula/game-database"; -import { GameMechanicState } from "./game-mechanics/index.js"; +import { GameMechanicState } from "./game-mechanics/index"; export const Speedrun = { unlock() { diff --git a/javascripts/core/storage/cloud-saving.js b/javascripts/core/storage/cloud-saving.js index a682ea1dd..8ae5ab1f1 100644 --- a/javascripts/core/storage/cloud-saving.js +++ b/javascripts/core/storage/cloud-saving.js @@ -1,9 +1,13 @@ +/* eslint-disable import/extensions */ import pako from "pako/dist/pako.esm.mjs"; -import { decodeBase64Binary } from "./base64-binary"; -import { ProgressChecker } from "./progress-checker.js"; +/* eslint-enable import/extensions */ + +import { get, getDatabase, ref, set } from "firebase/database"; +import { getAuth, GoogleAuthProvider, signInWithPopup, signOut } from "firebase/auth"; import { initializeApp } from "firebase/app"; -import { getAuth, signInWithPopup, signOut, GoogleAuthProvider } from "firebase/auth"; -import { getDatabase, ref, get, set } from "firebase/database"; + +import { decodeBase64Binary } from "./base64-binary"; +import { ProgressChecker } from "./progress-checker"; const firebaseConfig = { apiKey: "AIzaSyDuRTTluAFufmvw1zxGH6fsyEHmmbu8IHI", diff --git a/javascripts/core/storage/dev-migrations.js b/javascripts/core/storage/dev-migrations.js index 2d065654f..58789eab6 100644 --- a/javascripts/core/storage/dev-migrations.js +++ b/javascripts/core/storage/dev-migrations.js @@ -1,4 +1,4 @@ -import { GameStorage } from "./storage.js"; +import { GameStorage } from "./storage"; function arrayToBits(array) { let bits = 0; diff --git a/javascripts/core/storage/index.js b/javascripts/core/storage/index.js index 3c62e61f9..91b0685f1 100644 --- a/javascripts/core/storage/index.js +++ b/javascripts/core/storage/index.js @@ -1,6 +1,6 @@ -import "./migrations.js"; -import "./dev-migrations.js"; +import "./migrations"; +import "./dev-migrations"; -export * from "./serializer.js"; -export * from "./storage.js"; -export * from "./cloud-saving.js"; +export * from "./serializer"; +export * from "./storage"; +export * from "./cloud-saving"; diff --git a/javascripts/core/storage/migrations.js b/javascripts/core/storage/migrations.js index e8cc1ccef..0f6ed4188 100644 --- a/javascripts/core/storage/migrations.js +++ b/javascripts/core/storage/migrations.js @@ -1,5 +1,5 @@ -import { GameStorage } from "./storage.js"; import { deepmergeAll } from "@/utility/deepmerge"; +import { GameStorage } from "./storage"; // WARNING: Don't use state accessors and functions from global scope here, that's not safe in long-term GameStorage.migrations = { diff --git a/javascripts/core/storage/serializer.js b/javascripts/core/storage/serializer.js index d80a0dfd8..cf649f7bd 100644 --- a/javascripts/core/storage/serializer.js +++ b/javascripts/core/storage/serializer.js @@ -1,4 +1,6 @@ +/* eslint-disable import/extensions */ import pako from "pako/dist/pako.esm.mjs"; +/* eslint-enable import/extensions */ export const GameSaveSerializer = { serialize(save) { diff --git a/javascripts/core/storage/storage.js b/javascripts/core/storage/storage.js index 11932967b..c647fa191 100644 --- a/javascripts/core/storage/storage.js +++ b/javascripts/core/storage/storage.js @@ -1,4 +1,5 @@ import * as ADNotations from "@antimatter-dimensions/notations"; + import { deepmergeAll } from "@/utility/deepmerge"; export const GameStorage = { diff --git a/javascripts/core/tickspeed.js b/javascripts/core/tickspeed.js index 666ef7e63..3677e94d9 100644 --- a/javascripts/core/tickspeed.js +++ b/javascripts/core/tickspeed.js @@ -1,4 +1,4 @@ -import { DC } from "./constants.js"; +import { DC } from "./constants"; export function getTickSpeedMultiplier() { if (InfinityChallenge(3).isRunning) return DC.D1; diff --git a/javascripts/core/time-studies/dilation-time-study.js b/javascripts/core/time-studies/dilation-time-study.js index 2a3bb9782..701762f81 100644 --- a/javascripts/core/time-studies/dilation-time-study.js +++ b/javascripts/core/time-studies/dilation-time-study.js @@ -1,5 +1,5 @@ -import { TimeStudyState } from "./time-studies.js"; -import { TimeStudy } from "./normal-time-study.js"; +import { TimeStudy } from "./normal-time-study"; +import { TimeStudyState } from "./time-studies"; export class DilationTimeStudyState extends TimeStudyState { constructor(config) { diff --git a/javascripts/core/time-studies/ec-time-study.js b/javascripts/core/time-studies/ec-time-study.js index 2688406f3..50a7cc826 100644 --- a/javascripts/core/time-studies/ec-time-study.js +++ b/javascripts/core/time-studies/ec-time-study.js @@ -1,5 +1,5 @@ -import { TimeStudyState } from "./time-studies.js"; -import { TimeStudy } from "./normal-time-study.js"; +import { TimeStudy } from "./normal-time-study"; +import { TimeStudyState } from "./time-studies"; export class ECTimeStudyState extends TimeStudyState { constructor(config) { diff --git a/javascripts/core/time-studies/index.js b/javascripts/core/time-studies/index.js index acaf2fac4..143bee257 100644 --- a/javascripts/core/time-studies/index.js +++ b/javascripts/core/time-studies/index.js @@ -1,6 +1,6 @@ -export * from "./time-studies.js"; -export * from "./time-study-tree.js"; -export * from "./normal-time-study.js"; -export * from "./ec-time-study.js"; -export * from "./dilation-time-study.js"; -export * from "./time-study-connections.js"; +export * from "./time-studies"; +export * from "./time-study-tree"; +export * from "./normal-time-study"; +export * from "./ec-time-study"; +export * from "./dilation-time-study"; +export * from "./time-study-connections"; diff --git a/javascripts/core/time-studies/normal-time-study.js b/javascripts/core/time-studies/normal-time-study.js index ca60fe697..384b3449d 100644 --- a/javascripts/core/time-studies/normal-time-study.js +++ b/javascripts/core/time-studies/normal-time-study.js @@ -1,4 +1,4 @@ -import { TimeStudyState } from "./time-studies.js"; +import { TimeStudyState } from "./time-studies"; export const NormalTimeStudies = {}; diff --git a/javascripts/core/time-studies/time-studies.js b/javascripts/core/time-studies/time-studies.js index b63f0f0ec..e190736fe 100644 --- a/javascripts/core/time-studies/time-studies.js +++ b/javascripts/core/time-studies/time-studies.js @@ -1,4 +1,4 @@ -import { GameMechanicState } from "../game-mechanics/index.js"; +import { GameMechanicState } from "../game-mechanics/index"; function showSecondPreferredWarning(currTree) { // Show a warning if the player can choose the second preferred dimension path and hasn't yet done so. diff --git a/javascripts/core/time-studies/time-study-connections.js b/javascripts/core/time-studies/time-study-connections.js index 15d3712d8..cce890cb2 100644 --- a/javascripts/core/time-studies/time-study-connections.js +++ b/javascripts/core/time-studies/time-study-connections.js @@ -1,4 +1,4 @@ -import { TimeStudy } from "./normal-time-study.js"; +import { TimeStudy } from "./normal-time-study"; export class TimeStudyConnection { constructor(from, to, override) { diff --git a/javascripts/core/time-theorems.js b/javascripts/core/time-theorems.js index 7a1b0c264..3324dd394 100644 --- a/javascripts/core/time-theorems.js +++ b/javascripts/core/time-theorems.js @@ -1,4 +1,4 @@ -import { DC } from "./constants.js"; +import { DC } from "./constants"; /** * @abstract diff --git a/javascripts/core/utils.js b/javascripts/core/utils.js index 4365ea8e3..c0c69d79b 100644 --- a/javascripts/core/utils.js +++ b/javascripts/core/utils.js @@ -1,14 +1,14 @@ // Stuff to be loaded into global before anything else -import "./polyfill.js"; -import "./extensions.js"; +import "./polyfill"; +import "./extensions"; -import "./crash.js"; -import "./timespan.js"; -import "./format.js"; -import "./constants.js"; -import "./math.js"; -import "./async-utils.js"; -import "./event-hub.js"; +import "./crash"; +import "./timespan"; +import "./format"; +import "./constants"; +import "./math"; +import "./async-utils"; +import "./event-hub"; -export * from "./game-mechanics/index.js"; +export * from "./game-mechanics/index"; diff --git a/javascripts/game.js b/javascripts/game.js index 04c511526..f56e8d19e 100644 --- a/javascripts/game.js +++ b/javascripts/game.js @@ -1,8 +1,9 @@ -import { playFabLogin } from "./core/playfab.js"; -import { DC } from "./core/constants.js"; -import { SpeedrunMilestones } from "./core/speedrun.js"; import TWEEN from "tween.js"; + +import { DC } from "./core/constants"; import { deepmergeAll } from "@/utility/deepmerge"; +import { playFabLogin } from "./core/playfab"; +import { SpeedrunMilestones } from "./core/speedrun"; import { supportedBrowsers } from "./supported-browsers"; if (GlobalErrorHandler.handled) { diff --git a/package-lock.json b/package-lock.json index 9d965c854..ee4ae2e58 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,6 +37,8 @@ "@vue/cli-service": "^5.0.0-rc.0", "browserslist-useragent-regexp": "^3.0.2", "eslint": "^7.20.0", + "eslint-import-resolver-alias": "^1.1.2", + "eslint-plugin-import": "^2.26.0", "eslint-plugin-vue": "^8.0.3", "vue-template-compiler": "^2.6.11", "webpack": "^5.64.0" @@ -2908,6 +2910,12 @@ "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", "dev": true }, + "node_modules/@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", + "dev": true + }, "node_modules/@types/long": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", @@ -6320,6 +6328,25 @@ "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", "dev": true }, + "node_modules/array-includes": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz", + "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.19.5", + "get-intrinsic": "^1.1.1", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/array-union": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", @@ -6329,6 +6356,24 @@ "node": ">=8" } }, + "node_modules/array.prototype.flat": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz", + "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "es-abstract": "^1.19.2", + "es-shim-unscopables": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/astral-regex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", @@ -8194,15 +8239,19 @@ } }, "node_modules/define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", + "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", "dev": true, "dependencies": { - "object-keys": "^1.0.12" + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/del": { @@ -8686,12 +8735,75 @@ "stackframe": "^1.1.1" } }, + "node_modules/es-abstract": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz", + "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "function.prototype.name": "^1.1.5", + "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", + "has": "^1.0.3", + "has-property-descriptors": "^1.0.0", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.3", + "is-callable": "^1.2.4", + "is-negative-zero": "^2.0.2", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.2", + "is-string": "^1.0.7", + "is-weakref": "^1.0.2", + "object-inspect": "^1.12.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.2", + "regexp.prototype.flags": "^1.4.1", + "string.prototype.trimend": "^1.0.5", + "string.prototype.trimstart": "^1.0.5", + "unbox-primitive": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/es-module-lexer": { "version": "0.9.3", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", "dev": true }, + "node_modules/es-shim-unscopables": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", + "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", + "dev": true, + "dependencies": { + "has": "^1.0.3" + } + }, + "node_modules/es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "dependencies": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -8772,6 +8884,177 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint-import-resolver-alias": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-alias/-/eslint-import-resolver-alias-1.1.2.tgz", + "integrity": "sha512-WdviM1Eu834zsfjHtcGHtGfcu+F30Od3V7I9Fi57uhBEwPkjDcii7/yW8jAT+gOhn4P/vOxxNAXbFAKsrrc15w==", + "dev": true, + "engines": { + "node": ">= 4" + }, + "peerDependencies": { + "eslint-plugin-import": ">=1.4.0" + } + }, + "node_modules/eslint-import-resolver-node": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz", + "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==", + "dev": true, + "dependencies": { + "debug": "^3.2.7", + "resolve": "^1.20.0" + } + }, + "node_modules/eslint-import-resolver-node/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-import-resolver-node/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + }, + "node_modules/eslint-module-utils": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz", + "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==", + "dev": true, + "dependencies": { + "debug": "^3.2.7", + "find-up": "^2.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-module-utils/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-module-utils/node_modules/find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "dependencies": { + "locate-path": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-module-utils/node_modules/locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "dependencies": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-module-utils/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + }, + "node_modules/eslint-module-utils/node_modules/p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "dependencies": { + "p-try": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-module-utils/node_modules/p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "dependencies": { + "p-limit": "^1.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-module-utils/node_modules/p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-module-utils/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import": { + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz", + "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==", + "dev": true, + "dependencies": { + "array-includes": "^3.1.4", + "array.prototype.flat": "^1.2.5", + "debug": "^2.6.9", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.6", + "eslint-module-utils": "^2.7.3", + "has": "^1.0.3", + "is-core-module": "^2.8.1", + "is-glob": "^4.0.3", + "minimatch": "^3.1.2", + "object.values": "^1.1.5", + "resolve": "^1.22.0", + "tsconfig-paths": "^3.14.1" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" + } + }, + "node_modules/eslint-plugin-import/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/eslint-plugin-vue": { "version": "8.0.3", "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.0.3.tgz", @@ -9784,12 +10067,39 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, + "node_modules/function.prototype.name": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", + "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "es-abstract": "^1.19.0", + "functions-have-names": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/functional-red-black-tree": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, + "node_modules/functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/gamma": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/gamma/-/gamma-1.0.0.tgz", @@ -9838,6 +10148,22 @@ "node": ">=6" } }, + "node_modules/get-symbol-description": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", + "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/glob": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", @@ -9952,6 +10278,15 @@ "node": ">= 0.4.0" } }, + "node_modules/has-bigints": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", + "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -9961,10 +10296,22 @@ "node": ">=4" } }, + "node_modules/has-property-descriptors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", + "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", "dev": true, "engines": { "node": ">= 0.4" @@ -10426,6 +10773,20 @@ "node": ">= 0.10" } }, + "node_modules/internal-slot": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz", + "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.0", + "has": "^1.0.3", + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -10481,6 +10842,18 @@ "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", "dev": true }, + "node_modules/is-bigint": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "dev": true, + "dependencies": { + "has-bigints": "^1.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -10493,6 +10866,34 @@ "node": ">=8" } }, + "node_modules/is-boolean-object": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", + "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-callable": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", + "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-ci": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz", @@ -10506,9 +10907,9 @@ } }, "node_modules/is-core-module": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz", - "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", + "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", "dev": true, "dependencies": { "has": "^1.0.3" @@ -10606,6 +11007,33 @@ "node": ">=8" } }, + "node_modules/is-negative-zero": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", + "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-number-object": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", + "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-path-cwd": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", @@ -10670,6 +11098,18 @@ "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", "dev": true }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", + "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", @@ -10679,6 +11119,36 @@ "node": ">=0.10.0" } }, + "node_modules/is-string": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-symbol": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", + "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-unicode-supported": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", @@ -10691,6 +11161,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/is-weakref": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", + "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-wsl": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", @@ -11490,9 +11972,9 @@ "dev": true }, "node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -11501,9 +11983,9 @@ } }, "node_modules/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, "node_modules/minipass": { @@ -11762,6 +12244,15 @@ "node": ">=0.10.0" } }, + "node_modules/object-inspect": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/object-is": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", @@ -11805,6 +12296,23 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/object.values": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz", + "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "es-abstract": "^1.19.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/obuf": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", @@ -13269,13 +13777,14 @@ "integrity": "sha512-4qf/7IsIKfSNHQXSwial1IFmfM1Cc/whNBQqRwe0V2stPe7KmN1U0tWQiIx6JiirgSrisjE0eECdNf7Tav1Ntw==" }, "node_modules/regexp.prototype.flags": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz", - "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", + "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3" + "define-properties": "^1.1.3", + "functions-have-names": "^1.2.2" }, "engines": { "node": ">= 0.4" @@ -13386,13 +13895,17 @@ "dev": true }, "node_modules/resolve": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", - "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", + "version": "1.22.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", + "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", "dev": true, "dependencies": { - "is-core-module": "^2.2.0", - "path-parse": "^1.0.6" + "is-core-module": "^2.8.1", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -13707,6 +14220,20 @@ "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==", "dev": true }, + "node_modules/side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/signal-exit": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz", @@ -14019,6 +14546,34 @@ "node": ">=8" } }, + "node_modules/string.prototype.trimend": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz", + "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.19.5" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz", + "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.19.5" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -14030,6 +14585,15 @@ "node": ">=8" } }, + "node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true, + "engines": { + "node": ">=4" + } + }, "node_modules/strip-eof": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", @@ -14097,6 +14661,18 @@ "node": ">=4" } }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/svg-pan-zoom": { "version": "3.6.1", "resolved": "https://registry.npmjs.org/svg-pan-zoom/-/svg-pan-zoom-3.6.1.tgz", @@ -14417,6 +14993,30 @@ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" }, + "node_modules/tsconfig-paths": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", + "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==", + "dev": true, + "dependencies": { + "@types/json5": "^0.0.29", + "json5": "^1.0.1", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + }, + "node_modules/tsconfig-paths/node_modules/json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, "node_modules/tslib": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", @@ -14462,6 +15062,21 @@ "node": ">= 0.6" } }, + "node_modules/unbox-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", + "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-bigints": "^1.0.2", + "has-symbols": "^1.0.3", + "which-boxed-primitive": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/unicode-canonical-property-names-ecmascript": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", @@ -15507,6 +16122,22 @@ "which": "bin/which" } }, + "node_modules/which-boxed-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", + "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "dev": true, + "dependencies": { + "is-bigint": "^1.0.1", + "is-boolean-object": "^1.1.0", + "is-number-object": "^1.0.4", + "is-string": "^1.0.5", + "is-symbol": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/wildcard": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", @@ -17834,6 +18465,12 @@ "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", "dev": true }, + "@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", + "dev": true + }, "@types/long": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", @@ -20500,12 +21137,37 @@ "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", "dev": true }, + "array-includes": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz", + "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.19.5", + "get-intrinsic": "^1.1.1", + "is-string": "^1.0.7" + } + }, "array-union": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true }, + "array.prototype.flat": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz", + "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "es-abstract": "^1.19.2", + "es-shim-unscopables": "^1.0.0" + } + }, "astral-regex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", @@ -21901,12 +22563,13 @@ "dev": true }, "define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", + "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", "dev": true, "requires": { - "object-keys": "^1.0.12" + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" } }, "del": { @@ -22290,12 +22953,63 @@ "stackframe": "^1.1.1" } }, + "es-abstract": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz", + "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "function.prototype.name": "^1.1.5", + "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", + "has": "^1.0.3", + "has-property-descriptors": "^1.0.0", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.3", + "is-callable": "^1.2.4", + "is-negative-zero": "^2.0.2", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.2", + "is-string": "^1.0.7", + "is-weakref": "^1.0.2", + "object-inspect": "^1.12.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.2", + "regexp.prototype.flags": "^1.4.1", + "string.prototype.trimend": "^1.0.5", + "string.prototype.trimstart": "^1.0.5", + "unbox-primitive": "^1.0.2" + } + }, "es-module-lexer": { "version": "0.9.3", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", "dev": true }, + "es-shim-unscopables": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", + "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + }, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -22532,6 +23246,148 @@ } } }, + "eslint-import-resolver-alias": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-alias/-/eslint-import-resolver-alias-1.1.2.tgz", + "integrity": "sha512-WdviM1Eu834zsfjHtcGHtGfcu+F30Od3V7I9Fi57uhBEwPkjDcii7/yW8jAT+gOhn4P/vOxxNAXbFAKsrrc15w==", + "dev": true, + "requires": {} + }, + "eslint-import-resolver-node": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz", + "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==", + "dev": true, + "requires": { + "debug": "^3.2.7", + "resolve": "^1.20.0" + }, + "dependencies": { + "debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + } + } + }, + "eslint-module-utils": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz", + "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==", + "dev": true, + "requires": { + "debug": "^3.2.7", + "find-up": "^2.1.0" + }, + "dependencies": { + "debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "^2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "requires": { + "p-try": "^1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { + "p-limit": "^1.1.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + } + } + }, + "eslint-plugin-import": { + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz", + "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==", + "dev": true, + "requires": { + "array-includes": "^3.1.4", + "array.prototype.flat": "^1.2.5", + "debug": "^2.6.9", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.6", + "eslint-module-utils": "^2.7.3", + "has": "^1.0.3", + "is-core-module": "^2.8.1", + "is-glob": "^4.0.3", + "minimatch": "^3.1.2", + "object.values": "^1.1.5", + "resolve": "^1.22.0", + "tsconfig-paths": "^3.14.1" + }, + "dependencies": { + "doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "requires": { + "esutils": "^2.0.2" + } + } + } + }, "eslint-plugin-vue": { "version": "8.0.3", "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.0.3.tgz", @@ -23107,12 +23963,30 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, + "function.prototype.name": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", + "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "es-abstract": "^1.19.0", + "functions-have-names": "^1.2.2" + } + }, "functional-red-black-tree": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, + "functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true + }, "gamma": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/gamma/-/gamma-1.0.0.tgz", @@ -23149,6 +24023,16 @@ "pump": "^3.0.0" } }, + "get-symbol-description": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", + "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + } + }, "glob": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", @@ -23235,16 +24119,31 @@ "function-bind": "^1.1.1" } }, + "has-bigints": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", + "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", + "dev": true + }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true }, + "has-property-descriptors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", + "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "dev": true, + "requires": { + "get-intrinsic": "^1.1.1" + } + }, "has-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", "dev": true }, "has-tostringtag": { @@ -23586,6 +24485,17 @@ } } }, + "internal-slot": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz", + "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==", + "dev": true, + "requires": { + "get-intrinsic": "^1.1.0", + "has": "^1.0.3", + "side-channel": "^1.0.4" + } + }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -23626,6 +24536,15 @@ "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", "dev": true }, + "is-bigint": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "dev": true, + "requires": { + "has-bigints": "^1.0.1" + } + }, "is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -23635,6 +24554,22 @@ "binary-extensions": "^2.0.0" } }, + "is-boolean-object": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", + "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + } + }, + "is-callable": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", + "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", + "dev": true + }, "is-ci": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz", @@ -23645,9 +24580,9 @@ } }, "is-core-module": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz", - "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", + "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", "dev": true, "requires": { "has": "^1.0.3" @@ -23712,6 +24647,21 @@ "ip-regex": "^4.0.0" } }, + "is-negative-zero": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", + "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", + "dev": true + }, + "is-number-object": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", + "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", + "dev": true, + "requires": { + "has-tostringtag": "^1.0.0" + } + }, "is-path-cwd": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", @@ -23755,18 +24705,54 @@ "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", "dev": true }, + "is-shared-array-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", + "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2" + } + }, "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", "dev": true }, + "is-string": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "dev": true, + "requires": { + "has-tostringtag": "^1.0.0" + } + }, + "is-symbol": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", + "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", + "dev": true, + "requires": { + "has-symbols": "^1.0.2" + } + }, "is-unicode-supported": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "dev": true }, + "is-weakref": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", + "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.2" + } + }, "is-wsl": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", @@ -24414,17 +25400,17 @@ "dev": true }, "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, "minipass": { @@ -24636,6 +25622,12 @@ "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true }, + "object-inspect": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==", + "dev": true + }, "object-is": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", @@ -24664,6 +25656,17 @@ "object-keys": "^1.1.1" } }, + "object.values": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz", + "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "es-abstract": "^1.19.1" + } + }, "obuf": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", @@ -25720,13 +26723,14 @@ "integrity": "sha512-4qf/7IsIKfSNHQXSwial1IFmfM1Cc/whNBQqRwe0V2stPe7KmN1U0tWQiIx6JiirgSrisjE0eECdNf7Tav1Ntw==" }, "regexp.prototype.flags": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz", - "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", + "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3" + "define-properties": "^1.1.3", + "functions-have-names": "^1.2.2" } }, "regexpp": { @@ -25809,13 +26813,14 @@ "dev": true }, "resolve": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", - "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", + "version": "1.22.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", + "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", "dev": true, "requires": { - "is-core-module": "^2.2.0", - "path-parse": "^1.0.6" + "is-core-module": "^2.8.1", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" } }, "resolve-from": { @@ -26055,6 +27060,17 @@ "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==", "dev": true }, + "side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + } + }, "signal-exit": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz", @@ -26315,6 +27331,28 @@ "strip-ansi": "^6.0.1" } }, + "string.prototype.trimend": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz", + "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.19.5" + } + }, + "string.prototype.trimstart": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz", + "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.19.5" + } + }, "strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -26323,6 +27361,12 @@ "ansi-regex": "^5.0.1" } }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + }, "strip-eof": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", @@ -26366,6 +27410,12 @@ "has-flag": "^3.0.0" } }, + "supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true + }, "svg-pan-zoom": { "version": "3.6.1", "resolved": "https://registry.npmjs.org/svg-pan-zoom/-/svg-pan-zoom-3.6.1.tgz", @@ -26599,6 +27649,29 @@ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" }, + "tsconfig-paths": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", + "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==", + "dev": true, + "requires": { + "@types/json5": "^0.0.29", + "json5": "^1.0.1", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + }, + "dependencies": { + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + } + } + }, "tslib": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", @@ -26634,6 +27707,18 @@ "mime-types": "~2.1.24" } }, + "unbox-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", + "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "has-bigints": "^1.0.2", + "has-symbols": "^1.0.3", + "which-boxed-primitive": "^1.0.2" + } + }, "unicode-canonical-property-names-ecmascript": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", @@ -27411,6 +28496,19 @@ "isexe": "^2.0.0" } }, + "which-boxed-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", + "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "dev": true, + "requires": { + "is-bigint": "^1.0.1", + "is-boolean-object": "^1.1.0", + "is-number-object": "^1.0.4", + "is-string": "^1.0.5", + "is-symbol": "^1.0.3" + } + }, "wildcard": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", diff --git a/package.json b/package.json index 71b2d35b3..5e6a3a173 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,8 @@ "@vue/cli-service": "^5.0.0-rc.0", "browserslist-useragent-regexp": "^3.0.2", "eslint": "^7.20.0", + "eslint-import-resolver-alias": "^1.1.2", + "eslint-plugin-import": "^2.26.0", "eslint-plugin-vue": "^8.0.3", "vue-template-compiler": "^2.6.11", "webpack": "^5.64.0" diff --git a/src/components/BlobSnowflake.vue b/src/components/BlobSnowflake.vue index f9af5934f..deda011cb 100644 --- a/src/components/BlobSnowflake.vue +++ b/src/components/BlobSnowflake.vue @@ -107,4 +107,4 @@ export default { user-select: none; cursor: default; } - \ No newline at end of file + diff --git a/src/components/BlobSnowflakes.vue b/src/components/BlobSnowflakes.vue index c9d9a17b9..e344c4754 100644 --- a/src/components/BlobSnowflakes.vue +++ b/src/components/BlobSnowflakes.vue @@ -1,6 +1,6 @@