From b34043d52012ec0ec83568918de2fb0a1939182e Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Fri, 8 Nov 2024 01:53:33 +0100 Subject: [PATCH 01/27] [NO GBP] You can perform fish scanning experiments again (plus other stuff) (#87721) ## About The Pull Request I've accidentally assigned the FISH_FLAG_UPDATING_SIZE_AND_WEIGHT flag the same value of FISH_FLAG_EXPERIMENT_SCANNABLE, that's why I couldn't perform it while playing the game. Also, this PR fixes the broken interaction of catch'n'release, as well as a typo in the name of material fishing rods. ## Why It's Good For The Game I broke a couple things. --- code/__DEFINES/fish.dm | 2 +- code/modules/fishing/fish/_fish.dm | 2 +- code/modules/fishing/fishing_rod.dm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/fish.dm b/code/__DEFINES/fish.dm index 82c1117e8de61..387d8b47d1ba2 100644 --- a/code/__DEFINES/fish.dm +++ b/code/__DEFINES/fish.dm @@ -157,7 +157,7 @@ ///This fish can be scanned to complete fish scanning experiments #define FISH_FLAG_EXPERIMENT_SCANNABLE (1<<3) ///It lets us know that fish/update_size_and_weight() is currently running. -#define FISH_FLAG_UPDATING_SIZE_AND_WEIGHT (1<<3) +#define FISH_FLAG_UPDATING_SIZE_AND_WEIGHT (1<<4) #define MIN_AQUARIUM_TEMP T0C diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm index 2d26a60311057..124dda7dd0aa4 100644 --- a/code/modules/fishing/fish/_fish.dm +++ b/code/modules/fishing/fish/_fish.dm @@ -227,7 +227,7 @@ balloon_alert(user, "it's stuck to your hand!") return ITEM_INTERACT_BLOCKING balloon_alert(user, "releasing fish...") - if(!do_after(src, 3 SECONDS, interacting_with)) + if(!do_after(user, 3 SECONDS, interacting_with)) return ITEM_INTERACT_BLOCKING balloon_alert(user, "fish released") var/goodbye_text = "Bye bye [name]." diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm index de55aaaaf5fdc..8b24e34b9e541 100644 --- a/code/modules/fishing/fishing_rod.dm +++ b/code/modules/fishing/fishing_rod.dm @@ -817,11 +817,11 @@ /obj/item/fishing_rod/material/Initialize(mapload) . = ..() - name = "fishing_rod" + name = "fishing rod" /obj/item/fishing_rod/material/finalize_remove_material_effects(list/materials) . = ..() - name = "fishing_rod" //so it doesn't reset to "material fishing rod" + name = "fishing rod" //so it doesn't reset to "material fishing rod" #undef ROD_SLOT_BAIT #undef ROD_SLOT_LINE From 3fa1ba46c4415e619cd218eacc9908c8e4355245 Mon Sep 17 00:00:00 2001 From: "tgstation-ci[bot]" <179393467+tgstation-ci[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 00:53:52 +0000 Subject: [PATCH 02/27] Automatic changelog for PR #87721 [ci skip] --- html/changelogs/AutoChangeLog-pr-87721.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-87721.yml diff --git a/html/changelogs/AutoChangeLog-pr-87721.yml b/html/changelogs/AutoChangeLog-pr-87721.yml new file mode 100644 index 0000000000000..82b007fdcb614 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-87721.yml @@ -0,0 +1,6 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "You can perform fish scanning experiments again." + - bugfix: "You can actually release fish on water turfs after catching them." + - spellcheck: "Fixed a typo in the name of material fishing rods." \ No newline at end of file From 322e42658b6166b1cf6edc7684c299cfa28130f0 Mon Sep 17 00:00:00 2001 From: NoselessCanine <131471598+NoselessCanine@users.noreply.github.com> Date: Thu, 7 Nov 2024 20:24:36 -0500 Subject: [PATCH 03/27] Increase gas mask filter effectiveness. (#87712) ## About The Pull Request This PR increases the effectiveness of gas mask filters against small amounts of gas. It increases the filtering efficiency of filters, makes them remove more gas from inhaled air, and makes their degradation more dependent on if they are in use or not. When a mask filter isnt being used it will degrade much slower and when it is being used it will degrade much faster. Testing: all this changes are some magic numbers used in a single short math equation. If this breaks something, I might as well quit TG anyways. ## Why It's Good For The Game Currently, gas mask filters are nigh redundant, and have no noticable effect on any gasses except for those with incredibly low minimum effect concentrations. For example, against n2o or plasma, a filter will make a room temp air mixture with an extra 2 mol of n2o/plasma added, which would normally inhale as a partial pressure of ~3.83, to a partial pressure of ~3.78. Note that the effect PP thresholds of n2o are 0.05 for giggling, 1 for n2o alert, and 4 for sedation. Increasing the effectiveness of filters will not prevent you from being affected by full-on floods, but they will reduce the impact of small concentrations of dangerous gasses. If a chemist boils off plasma accidentally, the pharmacy can end up poisoning people inside it for 10 minutes or longer, without even triggering air alarms. Making it possible to prepare for and work against minor leaks, spills, and the after-effects of cleaned up gas floods will reduce the frequency of "firelock hell" scenarios. ## Changelog :cl: balance: Gas mask filters are now more effective, and their degradation is more heavily influenced by what gasses they are filtering. /:cl: --- code/modules/clothing/masks/gas_filter.dm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/clothing/masks/gas_filter.dm b/code/modules/clothing/masks/gas_filter.dm index e29f80a5ea089..1399a1a07d455 100644 --- a/code/modules/clothing/masks/gas_filter.dm +++ b/code/modules/clothing/masks/gas_filter.dm @@ -1,15 +1,15 @@ ///Filtering ratio for high amounts of gas -#define HIGH_FILTERING_RATIO 0.001 +#define HIGH_FILTERING_RATIO 0.01 ///Filtering ratio for min amount of gas -#define LOW_FILTERING_RATIO 0.0005 +#define LOW_FILTERING_RATIO 0.0025 ///Min amount of high filtering gases for high filtering ratio #define HIGH_FILTERING_MOLES 0.001 ///Min amount of mid filtering gases for high filtering ratio #define MID_FILTERING_MOLES 0.0025 ///Min amount of low filtering gases for high filtering ratio -#define LOW_FILTERING_MOLES 0.0005 +#define LOW_FILTERING_MOLES 0.005 ///Min amount of wear that the filter gets when used -#define FILTERS_CONSTANT_WEAR 0.05 +#define FILTERS_CONSTANT_WEAR 0.025 /obj/item/gas_filter name = "atmospheric gas filter" @@ -71,23 +71,23 @@ if(gas_id in high_filtering_gases) if(breath.gases[gas_id][MOLES] > HIGH_FILTERING_MOLES) breath.gases[gas_id][MOLES] = max(breath.gases[gas_id][MOLES] - filter_strength_high * filter_efficiency * HIGH_FILTERING_RATIO, 0) - danger_points += 0.5 + danger_points += 1 continue breath.gases[gas_id][MOLES] = max(breath.gases[gas_id][MOLES] - filter_strength_high * filter_efficiency * LOW_FILTERING_RATIO, 0) - danger_points += 0.05 + danger_points += 0.2 continue if(gas_id in mid_filtering_gases) if(breath.gases[gas_id][MOLES] > MID_FILTERING_MOLES) breath.gases[gas_id][MOLES] = max(breath.gases[gas_id][MOLES] - filter_strength_mid * filter_efficiency * HIGH_FILTERING_RATIO, 0) - danger_points += 0.75 + danger_points += 1.25 continue breath.gases[gas_id][MOLES] = max(breath.gases[gas_id][MOLES] - filter_strength_mid * filter_efficiency * LOW_FILTERING_RATIO, 0) - danger_points += 0.15 + danger_points += 0.25 continue if(gas_id in low_filtering_gases) if(breath.gases[gas_id][MOLES] > LOW_FILTERING_MOLES) breath.gases[gas_id][MOLES] = max(breath.gases[gas_id][MOLES] - filter_strength_low * filter_efficiency * HIGH_FILTERING_RATIO, 0) - danger_points += 1 + danger_points += 1.5 continue breath.gases[gas_id][MOLES] = max(breath.gases[gas_id][MOLES] - filter_strength_low * filter_efficiency * LOW_FILTERING_RATIO, 0) danger_points += 0.5 From 10224c4fc5ba5c1a1fba560ef254dbf63f4d439c Mon Sep 17 00:00:00 2001 From: "tgstation-ci[bot]" <179393467+tgstation-ci[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 01:25:00 +0000 Subject: [PATCH 04/27] Automatic changelog for PR #87712 [ci skip] --- html/changelogs/AutoChangeLog-pr-87712.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-87712.yml diff --git a/html/changelogs/AutoChangeLog-pr-87712.yml b/html/changelogs/AutoChangeLog-pr-87712.yml new file mode 100644 index 0000000000000..310b552be4722 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-87712.yml @@ -0,0 +1,4 @@ +author: "NoselessCanine" +delete-after: True +changes: + - balance: "Gas mask filters are now more effective, and their degradation is more heavily influenced by what gasses they are filtering." \ No newline at end of file From a8e15af29f279c450e43890b0f8663f600f280ae Mon Sep 17 00:00:00 2001 From: SyncIt21 <110812394+SyncIt21@users.noreply.github.com> Date: Fri, 8 Nov 2024 06:56:42 +0530 Subject: [PATCH 05/27] Remove `cyborg_tool` & improves omnitool tests (#87709) ## About The Pull Request - Removes `cyborg_tool` test, which partially helps with the below issues as it is superseded by `datum/unit_test/omnitool` - #87708 - #87713 - Removes borg transform animation from omnitool test which causes random runtimes. Also restructures it for future omnitool tests which will come in future PR's ## Changelog :cl: N/A /:cl: --- .../mob/living/silicon/robot/robot_model.dm | 5 +- code/modules/unit_tests/_unit_tests.dm | 1 - code/modules/unit_tests/cyborg_tool.dm | 20 --- code/modules/unit_tests/omnitools.dm | 152 +++++++++++------- 4 files changed, 97 insertions(+), 81 deletions(-) delete mode 100644 code/modules/unit_tests/cyborg_tool.dm diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm index b3c2684d470b3..60cf2f6d04654 100644 --- a/code/modules/mob/living/silicon/robot/robot_model.dm +++ b/code/modules/mob/living/silicon/robot/robot_model.dm @@ -226,7 +226,7 @@ module.emp_act(severity) ..() -/obj/item/robot_model/proc/transform_to(new_config_type, forced = FALSE) +/obj/item/robot_model/proc/transform_to(new_config_type, forced = FALSE, transform = TRUE) var/mob/living/silicon/robot/cyborg = loc var/obj/item/robot_model/new_model = new new_config_type(cyborg) new_model.robot = cyborg @@ -245,7 +245,8 @@ cyborg.diag_hud_set_aishell() log_silicon("CYBORG: [key_name(cyborg)] has transformed into the [new_model] model.") - INVOKE_ASYNC(new_model, PROC_REF(do_transform_animation)) + if(transform) + INVOKE_ASYNC(new_model, PROC_REF(do_transform_animation)) qdel(src) return new_model diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index 26eda40f34d0d..53e0cf08eb782 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -130,7 +130,6 @@ #include "container_sanity.dm" #include "crayons.dm" #include "create_and_destroy.dm" -#include "cyborg_tool.dm" #include "dcs_check_list_arguments.dm" #include "dcs_get_id_from_elements.dm" #include "designs.dm" diff --git a/code/modules/unit_tests/cyborg_tool.dm b/code/modules/unit_tests/cyborg_tool.dm deleted file mode 100644 index 39aed619ec50d..0000000000000 --- a/code/modules/unit_tests/cyborg_tool.dm +++ /dev/null @@ -1,20 +0,0 @@ -/// Regression test for the cyborg omnitool to ensure it goes through proper channels -/datum/unit_test/cyborg_tool - var/times_wrenched = 0 - -/datum/unit_test/cyborg_tool/Run() - var/mob/living/carbon/human/consistent/not_a_borg = allocate(__IMPLIED_TYPE__) - var/obj/item/borg/cyborg_omnitool/engineering/tool = allocate(__IMPLIED_TYPE__) - tool.tool_behaviour = TOOL_WRENCH - - not_a_borg.put_in_active_hand(tool) - - var/obj/structure/frame/machine/frame = allocate(__IMPLIED_TYPE__) - RegisterSignal(frame, COMSIG_ATOM_TOOL_ACT(TOOL_WRENCH), PROC_REF(wrenched)) - - not_a_borg.ClickOn(frame) - TEST_ASSERT_EQUAL(times_wrenched, 1, "Wrenching the frame with a cyborg omnitool should have triggered the wrenched signal") - -/datum/unit_test/cyborg_tool/proc/wrenched(...) - SIGNAL_HANDLER - times_wrenched += 1 diff --git a/code/modules/unit_tests/omnitools.dm b/code/modules/unit_tests/omnitools.dm index 700e0efd190cd..9d974138de61b 100644 --- a/code/modules/unit_tests/omnitools.dm +++ b/code/modules/unit_tests/omnitools.dm @@ -1,64 +1,100 @@ -/datum/unit_test/omnitools_engiboorg/Run() - var/mob/living/silicon/robot/borg = allocate(/mob/living/silicon/robot) +/datum/unit_test/omnitools + abstract_type = /datum/unit_test/omnitools + + //The borg model tot ransform to + var/borg_model = /obj/item/robot_model + //Tool type + var/tool_type = /obj/item/borg/cyborg_omnitool + +///Test the current tool in the toolkit +/datum/unit_test/omnitools/proc/TestTool(mob/living/silicon/robot/borg, obj/item/borg/cyborg_omnitool) + PROTECTED_PROC(TRUE) + + return + +/datum/unit_test/omnitools/Run() + var/mob/living/silicon/robot/borg = allocate(__IMPLIED_TYPE__) //transform to engiborg - borg.model.transform_to(/obj/item/robot_model/engineering, forced = TRUE) - var/obj/item/borg/cyborg_omnitool/engineering/engi_tool = null + borg.model.transform_to(borg_model, forced = TRUE, transform = FALSE) + var/obj/item/borg/cyborg_omnitool/omnitool = null for(var/obj/item/borg/tool as anything in borg.model.modules) - if(istype(tool, /obj/item/borg/cyborg_omnitool/engineering)) - engi_tool = tool + if(istype(tool, tool_type)) + omnitool = tool break + TEST_ASSERT_NOTNULL(omnitool, "Could not find [tool_type] in borg inbuilt modules!") borg.shown_robot_modules = TRUE //stops hud from updating which would runtime cause our mob does not have one - borg.equip_module_to_slot(engi_tool, 1) + borg.equip_module_to_slot(omnitool, 1) borg.select_module(1) - var/obj/item/held_item = borg.get_active_held_item() - - //Tests for omnitool wrench - engi_tool.reference = engi_tool.omni_toolkit[1] - engi_tool.tool_behaviour = initial(engi_tool.reference.tool_behaviour) - var/obj/machinery/cell_charger/charger = allocate(/obj/machinery/cell_charger) - //Test 1: charger must be anchored - held_item.melee_attack_chain(borg, charger) - TEST_ASSERT(!charger.anchored, "Cell charger was not anchored by borg omnitool wrench!") - //Test 2: charger must be unanchored - held_item.melee_attack_chain(borg, charger) - TEST_ASSERT(charger.anchored, "Cell charger was not unanchored by borg omnitool wrench!") - - //Tests for omnitool wirecutter - engi_tool.reference = engi_tool.omni_toolkit[2] - engi_tool.tool_behaviour = initial(engi_tool.reference.tool_behaviour) - //Test 1: is holding wirecutters for wires - TEST_ASSERT(borg.is_holding_tool_quality(TOOL_WIRECUTTER), "Cannot find borg omnitool wirecutters in borgs hand!") - //Test 2: frame wires must be cut - var/obj/structure/frame/machine/test_frame = allocate(/obj/structure/frame/machine) - test_frame.state = FRAME_STATE_WIRED - held_item.melee_attack_chain(borg, test_frame) - TEST_ASSERT_EQUAL(test_frame.state, FRAME_STATE_EMPTY, "Machine frame's wires were not cut by the borg omnitool wirecutters!") - - //Test for omnitool screwdriver - engi_tool.reference = engi_tool.omni_toolkit[3] - engi_tool.tool_behaviour = initial(engi_tool.reference.tool_behaviour) - //Test 1: dissemble frame - held_item.melee_attack_chain(borg, test_frame) - TEST_ASSERT(QDELETED(test_frame), "Machine frame was not deconstructed by borg omnitool screwdriver!") - - //Test for borg omnitool crowbar - engi_tool.reference = engi_tool.omni_toolkit[4] - engi_tool.tool_behaviour = initial(engi_tool.reference.tool_behaviour) - var/obj/machinery/recharger/recharger = allocate(/obj/machinery/recharger) - recharger.panel_open = TRUE - //Test 1: should dissemble the charger - held_item.melee_attack_chain(borg, recharger) - TEST_ASSERT(QDELETED(recharger), "Recharger was not deconstructed by borg omnitool crowbar!") - - //Test for borg omnitool multitool - engi_tool.reference = engi_tool.omni_toolkit[5] - engi_tool.tool_behaviour = initial(engi_tool.reference.tool_behaviour) - var/obj/machinery/ore_silo/silo = allocate(/obj/machinery/ore_silo) - //Test 1: should store silo in buffer - held_item.melee_attack_chain(borg, silo) - var/obj/item/multitool/tool = held_item.get_proxy_attacker_for(silo, borg) - TEST_ASSERT(istype(tool), "Borg failed to switch internal tool to multitool") - TEST_ASSERT(istype(tool.buffer, /obj/machinery/ore_silo), "Borg omnitool multitool failed to log ore silo!") - - borg.unequip_module_from_slot(engi_tool, 1) + + //these must match + TEST_ASSERT_EQUAL(borg.get_active_held_item(), omnitool, "Borg held tool is not the selected omnitool!") + + for(var/obj/item/internal_tool as anything in omnitool.omni_toolkit) + //Initialize the tool + omnitool.reference = internal_tool + omnitool.tool_behaviour = initial(internal_tool.tool_behaviour) + + //Test it + TestTool(borg, omnitool) + + borg.unequip_module_from_slot(omnitool, 1) + + +/// Tests for engiborg omnitool +/datum/unit_test/omnitools/engiborg + borg_model = /obj/item/robot_model/engineering + tool_type = /obj/item/borg/cyborg_omnitool/engineering + + /// frame to test wirecutter & screwdriver + var/obj/structure/frame/machine/test_frame + +/datum/unit_test/omnitools/engiborg/TestTool(mob/living/silicon/robot/borg, obj/item/borg/cyborg_omnitool/held_item) + var/tool_behaviour = held_item.tool_behaviour + + switch(tool_behaviour) + //Tests for omnitool wrench + if(TOOL_WRENCH) + var/obj/machinery/cell_charger/charger = allocate(__IMPLIED_TYPE__) + //Test 1: charger must be anchored + held_item.melee_attack_chain(borg, charger) + TEST_ASSERT(!charger.anchored, "Cell charger was not unanchored by borg omnitool wrench!") + //Test 2: charger must be unanchored + held_item.melee_attack_chain(borg, charger) + TEST_ASSERT(charger.anchored, "Cell charger was not anchored by borg omnitool wrench!") + + //Tests for omnitool wirecutter + if(TOOL_WIRECUTTER) + //Test 1: is holding wirecutters for wires + TEST_ASSERT(borg.is_holding_tool_quality(TOOL_WIRECUTTER), "Cannot find borg omnitool wirecutters in borgs hand!") + + //Test 2: frame wires must be cut + if(isnull(test_frame)) + test_frame = allocate(__IMPLIED_TYPE__) + test_frame.state = FRAME_STATE_WIRED + held_item.melee_attack_chain(borg, test_frame) + TEST_ASSERT_EQUAL(test_frame.state, FRAME_STATE_EMPTY, "Machine frame's wires were not cut by the borg omnitool wirecutters!") + + //Test for omnitool screwdriver + if(TOOL_SCREWDRIVER) + //Test 1: dissemble frame + held_item.melee_attack_chain(borg, test_frame) + TEST_ASSERT(QDELETED(test_frame), "Machine frame was not deconstructed by borg omnitool screwdriver!") + + //Test for borg omnitool crowbar + if(TOOL_CROWBAR) + var/obj/machinery/recharger/recharger = allocate(__IMPLIED_TYPE__) + recharger.panel_open = TRUE + //Test 1: should dissemble the charger + held_item.melee_attack_chain(borg, recharger) + TEST_ASSERT(QDELETED(recharger), "Recharger was not deconstructed by borg omnitool crowbar!") + + //Test for borg omnitool multitool + if(TOOL_MULTITOOL) + var/obj/machinery/ore_silo/silo = allocate(__IMPLIED_TYPE__) + //Test 1: should store silo in buffer + held_item.melee_attack_chain(borg, silo) + var/obj/item/multitool/tool = held_item.get_proxy_attacker_for(silo, borg) + TEST_ASSERT(istype(tool), "Borg failed to switch internal tool to multitool") + TEST_ASSERT(istype(tool.buffer, /obj/machinery/ore_silo), "Borg omnitool multitool failed to log ore silo!") + From a4c988a3b534bb0dd74d2f9ceef119627c224129 Mon Sep 17 00:00:00 2001 From: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Date: Fri, 8 Nov 2024 13:11:29 +1100 Subject: [PATCH 06/27] Scared of the Spooky Circus Man? Wear a tinfoil hat! Mental resistance protects from some heretic abilities (mostly Moon effects) (#87702) ## About The Pull Request Several effects that target the mind now are blocked by the presence of MAGIC_RESISTANCE_MIND, which is only found (currently) on tinfoil hats. Affected abilities and items include; Moon Path Powers (like, pretty much every single thing the path gets) Eldritch Paintings Mask of Madness (oh, and normal magic resistance also applies because...it's fucking magic?) Mindswap Terrorize (the nightmare ability) Abyssal Gaze (completely unused, used to be a rune golem spell I think) ## Why It's Good For The Game Tinfoil hats horribly debilitate you and render you pretty terrible at actually validhunting. But it is exceptionally funny for someone to willingly subject themselves to wearing it in fear of being attacked by a Moon heretic. And then get blinded and stunned by their mere presence because they are now scared of heretic's tools, alongside most of the station's various roles. Since this doesn't stop a heretic from A) hitting you with the ol' Mansus Grasp the old fashioned way and B) stabbing the shit out of you after this, I don't anticipate it being TOO effective when it doesn't stop the heretic's bread and butter abilities, as well as causing automatic debuffs just from them being on the screen. If heretics giving out a phobia targeting them specifically wasn't tolerable, then someone willingly subjecting themselves to that same effect to stop a moon heretic is maybe unlikely, or just really funny and sandboxy. Oh, and it makes them scared of, like, security and command and stuff so this is NOT a viable option for those roles at all unless they really want to suffer constantly for it. But maybe that's funnier as a result. ## Changelog :cl: balance: Some mind altering effects of heretics (predominantly Path of the Moon heretic abilities) are nullified using...a tinfoil hat. But awareness of the mind altering psychotropic eldritch brain wizards has spread amongst the conspiracy theorists. They could be anyone! Even YOU. balance: Some additional spells (mindswap, nightmare's terrorize) are also blocked. /:cl: --- code/_globalvars/phobias.dm | 4 ++++ .../antagonists/heretic/items/eldritch_painting.dm | 2 +- .../antagonists/heretic/items/heretic_necks.dm | 2 +- .../modules/antagonists/heretic/items/madness_mask.dm | 3 +++ .../antagonists/heretic/knowledge/moon_lore.dm | 11 ++++++++++- code/modules/antagonists/heretic/magic/moon_parade.dm | 2 +- .../antagonists/heretic/magic/moon_ringleader.dm | 2 +- code/modules/antagonists/heretic/magic/moon_smile.dm | 2 +- .../heretic/status_effects/mark_effects.dm | 2 ++ .../spells/spell_types/pointed/abyssal_gaze.dm | 2 +- .../spells/spell_types/pointed/mind_transfer.dm | 1 + code/modules/spells/spell_types/pointed/terrorize.dm | 1 + 12 files changed, 27 insertions(+), 7 deletions(-) diff --git a/code/_globalvars/phobias.dm b/code/_globalvars/phobias.dm index 21c95d2314dc7..d6677a213a48a 100644 --- a/code/_globalvars/phobias.dm +++ b/code/_globalvars/phobias.dm @@ -338,6 +338,10 @@ GLOBAL_LIST_INIT(phobia_objs, list( /obj/item/toy/plush/abductor/agent, /obj/machinery/atmospherics/miner, /obj/machinery/door/airlock/centcom, + /obj/item/clothing/mask/madness_mask, + /obj/item/wallframe/painting/eldritch, + /obj/item/clothing/neck/heretic_focus/moon_amulet, + /obj/item/melee/sickly_blade/moon, )), "doctors" = typecacheof(list( /obj/item/cautery, diff --git a/code/modules/antagonists/heretic/items/eldritch_painting.dm b/code/modules/antagonists/heretic/items/eldritch_painting.dm index 0cbe1d1117b49..8dd3d7ef6e1ee 100644 --- a/code/modules/antagonists/heretic/items/eldritch_painting.dm +++ b/code/modules/antagonists/heretic/items/eldritch_painting.dm @@ -44,7 +44,7 @@ return if(IS_HERETIC(viewer)) return - if(viewer.can_block_magic(MAGIC_RESISTANCE)) + if(viewer.can_block_magic(MAGIC_RESISTANCE|MAGIC_RESISTANCE_MIND)) return to_chat(viewer, span_notice(text_to_display)) viewer.gain_trauma(applied_trauma, TRAUMA_RESILIENCE_SURGERY) diff --git a/code/modules/antagonists/heretic/items/heretic_necks.dm b/code/modules/antagonists/heretic/items/heretic_necks.dm index a738b4aae47ea..f14c29cad591c 100644 --- a/code/modules/antagonists/heretic/items/heretic_necks.dm +++ b/code/modules/antagonists/heretic/items/heretic_necks.dm @@ -164,7 +164,7 @@ user.add_mood_event("Moon Amulet Insanity", /datum/mood_event/amulet_insanity) user.mob_mood.set_sanity(user.mob_mood.sanity - 50) return - if(hit.can_block_magic()) + if(hit.can_block_magic(MAGIC_RESISTANCE|MAGIC_RESISTANCE_MIND)) return if(!hit.mob_mood) return diff --git a/code/modules/antagonists/heretic/items/madness_mask.dm b/code/modules/antagonists/heretic/items/madness_mask.dm index b7799d685c48b..564715d7dd813 100644 --- a/code/modules/antagonists/heretic/items/madness_mask.dm +++ b/code/modules/antagonists/heretic/items/madness_mask.dm @@ -56,6 +56,9 @@ if(IS_HERETIC_OR_MONSTER(human_in_range) || human_in_range.is_blind()) continue + if(human_in_range.can_block_magic(MAGIC_RESISTANCE|MAGIC_RESISTANCE_MIND)) + continue + human_in_range.mob_mood.direct_sanity_drain(rand(-2, -20) * seconds_per_tick) if(SPT_PROB(60, seconds_per_tick)) diff --git a/code/modules/antagonists/heretic/knowledge/moon_lore.dm b/code/modules/antagonists/heretic/knowledge/moon_lore.dm index b30a6b19ce259..f24b8ff1e3a41 100644 --- a/code/modules/antagonists/heretic/knowledge/moon_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/moon_lore.dm @@ -65,6 +65,10 @@ /datum/heretic_knowledge/moon_grasp/proc/on_mansus_grasp(mob/living/source, mob/living/target) SIGNAL_HANDLER + if(target.can_block_magic(MAGIC_RESISTANCE_MIND)) + to_chat(target, span_danger("You hear echoing laughter from above..but it is dull and distant.")) + return + source.apply_status_effect(/datum/status_effect/moon_grasp_hide) if(!iscarbon(target)) @@ -155,6 +159,9 @@ if(source == target || !isliving(target)) return + if(target.can_block_magic(MAGIC_RESISTANCE_MIND)) + return + target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10, 100) target.cause_hallucination( \ get_random_valid_hallucination_subtype(/datum/hallucination/body), \ @@ -219,7 +226,7 @@ var/amount_of_lunatics = 0 var/list/lunatic_candidates = list() for(var/mob/living/carbon/human/crewmate as anything in shuffle(GLOB.human_list)) - if(QDELETED(crewmate) || isnull(crewmate.client) || isnull(crewmate.mind) || crewmate.stat != CONSCIOUS) + if(QDELETED(crewmate) || isnull(crewmate.client) || isnull(crewmate.mind) || crewmate.stat != CONSCIOUS || crewmate.can_block_magic(MAGIC_RESISTANCE_MIND)) continue var/turf/crewmate_turf = get_turf(crewmate) var/crewmate_z = crewmate_turf?.z @@ -274,6 +281,8 @@ continue if(IS_HERETIC_OR_MONSTER(carbon_view)) continue + if(carbon_view.can_block_magic(MAGIC_RESISTANCE_MIND)) //Somehow a shitty piece of tinfoil is STILL able to hold out against the power of an ascended heretic. + continue new moon_effect(get_turf(carbon_view)) carbon_view.adjust_confusion(2 SECONDS) carbon_view.mob_mood.set_sanity(carbon_sanity - 5) diff --git a/code/modules/antagonists/heretic/magic/moon_parade.dm b/code/modules/antagonists/heretic/magic/moon_parade.dm index e6457a6a2b101..6d18c2113f470 100644 --- a/code/modules/antagonists/heretic/magic/moon_parade.dm +++ b/code/modules/antagonists/heretic/magic/moon_parade.dm @@ -64,7 +64,7 @@ return PROJECTILE_PIERCE_PHASE // Anti-magic destroys the projectile for consistency and counterplay - if(victim.can_block_magic(MAGIC_RESISTANCE)) + if(victim.can_block_magic(MAGIC_RESISTANCE|MAGIC_RESISTANCE_MIND)) visible_message(span_warning("The parade hits [victim] and a sudden wave of clarity comes over you!")) return PROJECTILE_DELETE_WITHOUT_HITTING diff --git a/code/modules/antagonists/heretic/magic/moon_ringleader.dm b/code/modules/antagonists/heretic/magic/moon_ringleader.dm index 3c0b1d2aedb52..d79269dc2694a 100644 --- a/code/modules/antagonists/heretic/magic/moon_ringleader.dm +++ b/code/modules/antagonists/heretic/magic/moon_ringleader.dm @@ -11,7 +11,7 @@ school = SCHOOL_FORBIDDEN cooldown_time = 1 MINUTES - + antimagic_flags = MAGIC_RESISTANCE|MAGIC_RESISTANCE_MIND invocation = "R''S 'E" invocation_type = INVOCATION_SHOUT spell_requirements = NONE diff --git a/code/modules/antagonists/heretic/magic/moon_smile.dm b/code/modules/antagonists/heretic/magic/moon_smile.dm index e2010ac0f9446..2ded0134a0480 100644 --- a/code/modules/antagonists/heretic/magic/moon_smile.dm +++ b/code/modules/antagonists/heretic/magic/moon_smile.dm @@ -11,7 +11,7 @@ sound = 'sound/effects/magic/blind.ogg' school = SCHOOL_FORBIDDEN cooldown_time = 20 SECONDS - + antimagic_flags = MAGIC_RESISTANCE|MAGIC_RESISTANCE_MIND invocation = "Mo'N S'M'LE" invocation_type = INVOCATION_SHOUT spell_requirements = NONE diff --git a/code/modules/antagonists/heretic/status_effects/mark_effects.dm b/code/modules/antagonists/heretic/status_effects/mark_effects.dm index 2521794907231..de895d33caac8 100644 --- a/code/modules/antagonists/heretic/status_effects/mark_effects.dm +++ b/code/modules/antagonists/heretic/status_effects/mark_effects.dm @@ -250,6 +250,8 @@ /datum/status_effect/eldritch/moon/on_apply() . = ..() + if(owner.can_block_magic(MAGIC_RESISTANCE_MIND)) + return FALSE ADD_TRAIT(owner, TRAIT_PACIFISM, id) owner.emote(pick("giggle", "laugh")) owner.balloon_alert(owner, "you feel unable to hurt a soul!") diff --git a/code/modules/spells/spell_types/pointed/abyssal_gaze.dm b/code/modules/spells/spell_types/pointed/abyssal_gaze.dm index a117e577e463c..fdaae45c15f2d 100644 --- a/code/modules/spells/spell_types/pointed/abyssal_gaze.dm +++ b/code/modules/spells/spell_types/pointed/abyssal_gaze.dm @@ -13,7 +13,7 @@ cooldown_time = 75 SECONDS invocation_type = INVOCATION_NONE spell_requirements = NONE - antimagic_flags = MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY + antimagic_flags = MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY|MAGIC_RESISTANCE_MIND cast_range = 5 active_msg = "You prepare to instill a deep terror in a target..." diff --git a/code/modules/spells/spell_types/pointed/mind_transfer.dm b/code/modules/spells/spell_types/pointed/mind_transfer.dm index d779933b01acd..0a800385c5302 100644 --- a/code/modules/spells/spell_types/pointed/mind_transfer.dm +++ b/code/modules/spells/spell_types/pointed/mind_transfer.dm @@ -13,6 +13,7 @@ invocation = "GIN'YU CAPAN" invocation_type = INVOCATION_WHISPER + antimagic_flags = MAGIC_RESISTANCE|MAGIC_RESISTANCE_MIND active_msg = "You prepare to swap minds with a target..." deactive_msg = "You dispel mind swap." diff --git a/code/modules/spells/spell_types/pointed/terrorize.dm b/code/modules/spells/spell_types/pointed/terrorize.dm index 699410b9a3c6b..44d35c1f3ddc9 100644 --- a/code/modules/spells/spell_types/pointed/terrorize.dm +++ b/code/modules/spells/spell_types/pointed/terrorize.dm @@ -6,6 +6,7 @@ button_icon_state = "terrify" background_icon_state = "bg_alien" overlay_icon_state = "bg_alien_border" + antimagic_flags = MAGIC_RESISTANCE_MIND panel = null spell_requirements = NONE cooldown_time = 25 SECONDS From 52554cdbbb744f398dc41d33615cb49179dddc00 Mon Sep 17 00:00:00 2001 From: "tgstation-ci[bot]" <179393467+tgstation-ci[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 02:11:48 +0000 Subject: [PATCH 07/27] Automatic changelog for PR #87702 [ci skip] --- html/changelogs/AutoChangeLog-pr-87702.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-87702.yml diff --git a/html/changelogs/AutoChangeLog-pr-87702.yml b/html/changelogs/AutoChangeLog-pr-87702.yml new file mode 100644 index 0000000000000..21da306548273 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-87702.yml @@ -0,0 +1,5 @@ +author: "necromanceranne" +delete-after: True +changes: + - balance: "Some mind altering effects of heretics (predominantly Path of the Moon heretic abilities) are nullified using...a tinfoil hat. But awareness of the mind altering psychotropic eldritch brain wizards has spread amongst the conspiracy theorists. They could be anyone! Even YOU." + - balance: "Some additional spells (mindswap, nightmare's terrorize) are also blocked." \ No newline at end of file From e5814912b7feb9e4a4ee616eb1bbd021a4434437 Mon Sep 17 00:00:00 2001 From: Jeremiah <42397676+jlsnow301@users.noreply.github.com> Date: Thu, 7 Nov 2024 18:16:42 -0800 Subject: [PATCH 08/27] [tools] Fixes tgui build warning (#87724) ## About The Pull Request This might very well only happen to me, there were no issues, but running `bin\tgui-build` rather than CTRLSHIFTB would error. The default windows powershell (5.1 for me) is the culprit. This routes it to an [upgraded powershell](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-windows?view=powershell-7.4), if you have it installed. ![image](https://github.com/user-attachments/assets/b1ccc00b-d109-4e11-9459-942a765a7d45) ## Why It's Good For The Game I hate red letters in my terminal >:( ## Changelog Dev only --- tools/bootstrap/node.bat | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/bootstrap/node.bat b/tools/bootstrap/node.bat index a3fca88674d69..e95aa7cb45879 100644 --- a/tools/bootstrap/node.bat +++ b/tools/bootstrap/node.bat @@ -1,8 +1,16 @@ @echo off set NODE_SKIP_PLATFORM_CHECK=1 -call powershell -NoLogo -ExecutionPolicy Bypass -File "%~dp0\node_.ps1" Download-Node + +:: Call pwsh if available +set "powershellCmd=powershell" +where pwsh >nul 2>nul +if %errorlevel%==0 ( + set "powershellCmd=pwsh" +) + +call %powershellCmd% -NoLogo -ExecutionPolicy Bypass -File "%~dp0\node_.ps1" Download-Node for /f "tokens=* USEBACKQ" %%s in (` - call powershell -NoLogo -ExecutionPolicy Bypass -File "%~dp0\node_.ps1" Get-Path + call %powershellCmd% -NoLogo -ExecutionPolicy Bypass -File "%~dp0\node_.ps1" Get-Path `) do ( set "PATH=%%s;%PATH%" ) From b75a3a2e82026db1e1215c937eebf12829431b94 Mon Sep 17 00:00:00 2001 From: grungussuss <96586172+Sadboysuss@users.noreply.github.com> Date: Fri, 8 Nov 2024 05:17:42 +0300 Subject: [PATCH 09/27] putting [tm only] in your title will now apply the label automatically (#87703) ## About The Pull Request title ## Why It's Good For The Game automation is nice, makes it more visible to players that a pr is tm only ## Changelog nothing player facing --- tools/WebhookProcessor/github_webhook_processor.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/WebhookProcessor/github_webhook_processor.php b/tools/WebhookProcessor/github_webhook_processor.php index 6d5b18f49225e..c3eb190aeaab0 100644 --- a/tools/WebhookProcessor/github_webhook_processor.php +++ b/tools/WebhookProcessor/github_webhook_processor.php @@ -284,6 +284,7 @@ function tag_pr($payload, $opened) { check_tag_and_replace($payload, '[dnm]', 'Do Not Merge', $tags); check_tag_and_replace($payload, '[no gbp]', 'GBP: No Update', $tags); check_tag_and_replace($payload, '[april fools]', 'April Fools', $tags); + check_tag_and_replace($payload, '[tm only]', 'Test Merge Only', $tags); return array($tags, $remove); } @@ -396,7 +397,7 @@ function handle_pr($payload) { if (!is_blacklisted($discord_announce_blacklist, $repo_name)) { discord_announce($action, $payload, $pr_flags); } - + if (in_array($repo_name, $game_announce_whitelist)) { game_announce($action, $payload, $pr_flags); } From ef9cdee76ed1812c55dd5fd85cfb8a75a3ca696f Mon Sep 17 00:00:00 2001 From: SyncIt21 <110812394+SyncIt21@users.noreply.github.com> Date: Fri, 8 Nov 2024 07:48:12 +0530 Subject: [PATCH 10/27] Removes glass from status & newscaster frame's custom materials (#87689) ## About The Pull Request - Fixes #87574 It's custom materials which is used in deconstruction did not match its crafting recipe requirements ## Changelog :cl: fix: status & newscaster frame won't drop extra glass sheets upon deconstruction /:cl: --- code/game/machinery/newscaster/newscaster_machine.dm | 2 +- code/game/machinery/status_display.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/newscaster/newscaster_machine.dm b/code/game/machinery/newscaster/newscaster_machine.dm index 18c3d9434d869..47ab476cbca16 100644 --- a/code/game/machinery/newscaster/newscaster_machine.dm +++ b/code/game/machinery/newscaster/newscaster_machine.dm @@ -805,7 +805,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster, 30) name = "newscaster frame" desc = "Used to build newscasters, just secure to the wall." icon_state = "newscaster_assembly" - custom_materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT * 7, /datum/material/glass= SHEET_MATERIAL_AMOUNT * 4) + custom_materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT * 7) result_path = /obj/machinery/newscaster pixel_shift = 30 diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index cdc3109c346fb..e98f855c2ce6e 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -41,7 +41,7 @@ GLOBAL_DATUM_INIT(status_font, /datum/font, new /datum/font/tiny_unicode/size_12 name = "status display frame" desc = "Used to build status displays, just secure to the wall." icon_state = "unanchoredstatusdisplay" - custom_materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT * 7, /datum/material/glass= SHEET_MATERIAL_AMOUNT * 4) + custom_materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT * 7) result_path = /obj/machinery/status_display/evac pixel_shift = 32 From 80757114612625752af3fa06991abe15e68be38f Mon Sep 17 00:00:00 2001 From: "tgstation-ci[bot]" <179393467+tgstation-ci[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 02:18:33 +0000 Subject: [PATCH 11/27] Automatic changelog for PR #87689 [ci skip] --- html/changelogs/AutoChangeLog-pr-87689.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-87689.yml diff --git a/html/changelogs/AutoChangeLog-pr-87689.yml b/html/changelogs/AutoChangeLog-pr-87689.yml new file mode 100644 index 0000000000000..40fbd2fab95fb --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-87689.yml @@ -0,0 +1,4 @@ +author: "SyncIt21" +delete-after: True +changes: + - bugfix: "status & newscaster frame won't drop extra glass sheets upon deconstruction" \ No newline at end of file From 1365e6079cc43b092b1c62a7ab94f1aa29971a84 Mon Sep 17 00:00:00 2001 From: _0Steven <42909981+00-Steven@users.noreply.github.com> Date: Fri, 8 Nov 2024 03:19:47 +0100 Subject: [PATCH 12/27] Fix NTNRC duplicate message jank and new message header, makes program headers actually update when there's none. (#87610) ## About The Pull Request As before, more fiddling with NTNRC, more bugs. This time, the same user sending the same message within the same second would cause this message to spawn a new copy each time the channel was opened, until the UI was closed and re-opened. Looking into it, this seemed to be because we would set the `Box`'s `key` value to the message contents: Which isn't actually unique. To fix this, we instead make each channel keep track of an incrementing `id` number to assign to each message, and convert the `messages` list to an associative list using those numerical ids stringified. We don't just use the list index as a key, as we later may want to target specific messages, so a consistent unique key is important. This fixes our primary issue. In the process of making the rest of the code account for this, I noticed that the NTNRC program header that's supposed to show new messages in the active channel when the program is idle didn't actually work. Just at all. So I rewrote the entire thing, and it now tracks the last read message's id rather than the full message, and sets this when you actually background the program. The rest still runs on process tick, where it updates the header if there's a new message with a different id on top. Finally, the header part of the UI wasn't actually updating if there were no headers, so now it forwards a lack of headers change as well. ## Why It's Good For The Game Reduces more NTNRC jank. Good if shit like, actually works. ## Changelog :cl: fix: NTNRC no longer endlessly duplicates messages with duplicate contents upon switching channels. fix: The new message header you get when NTNRC runs in the background actually works. fix: NtOS header actually updates if there are no program headers. /:cl: --------- Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com> --- .../computers/item/computer.dm | 4 +- .../programs/chatroom/conversation.dm | 11 +++-- .../programs/chatroom/ntnrc_client.dm | 49 +++++++++++++------ tgui/packages/tgui/interfaces/NtosNetChat.jsx | 2 +- 4 files changed, 44 insertions(+), 22 deletions(-) diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index 74001a885246c..4923479d71def 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -610,14 +610,14 @@ if(NTNET_ETHERNET_SIGNAL) data["PC_ntneticon"] = "sig_lan.gif" + var/list/program_headers = list() if(length(idle_threads)) - var/list/program_headers = list() for(var/datum/computer_file/program/idle_programs as anything in idle_threads) if(!idle_programs.ui_header) continue program_headers.Add(list(list("icon" = idle_programs.ui_header))) - data["PC_programheaders"] = program_headers + data["PC_programheaders"] = program_headers data["PC_stationtime"] = station_time_timestamp() data["PC_stationdate"] = "[time2text(world.realtime, "DDD, Month DD")], [CURRENT_STATION_YEAR]" diff --git a/code/modules/modular_computers/file_system/programs/chatroom/conversation.dm b/code/modules/modular_computers/file_system/programs/chatroom/conversation.dm index fcfa41e3c90ac..969e56195edbc 100644 --- a/code/modules/modular_computers/file_system/programs/chatroom/conversation.dm +++ b/code/modules/modular_computers/file_system/programs/chatroom/conversation.dm @@ -13,8 +13,10 @@ ///ID using the UID. var/id - ///List of all messages sent in the conversation. + ///Associative list of all messages sent in the conversation. id > message var/list/messages = list() + ///ID used for next message, increments each use. Convert to string before use. + var/next_message_id = 0 ///The "Administrator" of the channel, the creator starts as channel's operator by default. var/datum/computer_file/program/chatclient/channel_operator @@ -45,11 +47,14 @@ /datum/ntnet_conversation/proc/add_message(message, username) message = "[station_time_timestamp(format = "hh:mm")] [username]: [message]" - messages.Add(message) + messages["[next_message_id]"] = message + next_message_id++ trim_message_list() /datum/ntnet_conversation/proc/add_status_message(message) - messages.Add("[station_time_timestamp(format = "hh:mm")] -!- [message]") + message = "[station_time_timestamp(format = "hh:mm")] -!- [message]" + messages["[next_message_id]"] = message + next_message_id++ trim_message_list() /datum/ntnet_conversation/proc/trim_message_list() diff --git a/code/modules/modular_computers/file_system/programs/chatroom/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/chatroom/ntnrc_client.dm index 9e7385c0b6540..8045bcb1db0db 100644 --- a/code/modules/modular_computers/file_system/programs/chatroom/ntnrc_client.dm +++ b/code/modules/modular_computers/file_system/programs/chatroom/ntnrc_client.dm @@ -23,8 +23,8 @@ ///The user's screen name. var/username - ///The last message you sent in a channel, used to tell if someone has sent a new message yet. - var/last_message + ///The id of the last message sent in a channel, used to tell if someone has sent a new message yet. + var/last_message_id ///The channel currently active in. var/active_channel ///If the tablet is in Admin mode, you bypass Passwords and aren't announced when entering a channel. @@ -133,8 +133,8 @@ // Now we will generate HTML-compliant file that can actually be viewed/printed. logfile.filename = logname logfile.stored_text = "\[b\]Logfile dump from NTNRC channel [channel.title]\[/b\]\[BR\]" - for(var/logstring in channel.messages) - logfile.stored_text = "[logfile.stored_text][logstring]\[BR\]" + for(var/message_id in channel.messages) + logfile.stored_text = "[logfile.stored_text][channel.messages[message_id]]\[BR\]" logfile.stored_text = "[logfile.stored_text]\[b\]Logfile dump completed.\[/b\]" logfile.calculate_size() if(!computer || !computer.store_file(logfile)) @@ -183,19 +183,23 @@ /datum/computer_file/program/chatclient/process_tick(seconds_per_tick) . = ..() - var/datum/ntnet_conversation/channel = SSmodular_computers.get_chat_channel_by_id(active_channel) - if(src in computer.idle_threads) + + if(!(src in computer.idle_threads)) + return + + var/datum/ntnet_conversation/watched_channel = SSmodular_computers.get_chat_channel_by_id(active_channel) + if(isnull(watched_channel)) // If we're not in a channel, no need for a message notification header. + ui_header = null + return + if(!length(watched_channel.messages)) // But if there's no messages, we do still wait for a message. ui_header = "ntnrc_idle.gif" - if(channel) - // Remember the last message. If there is no message in the channel remember null. - last_message = length(channel.messages) ? channel.messages[length(channel.messages)] : null - else - last_message = null - return TRUE - if(channel?.messages?.len) - ui_header = (last_message == channel.messages[length(channel.messages)] ? "ntnrc_idle.gif" : "ntnrc_new.gif") - else + return + + var/last_message_id_found = watched_channel.messages[length(watched_channel.messages)] + if(last_message_id_found == last_message_id) ui_header = "ntnrc_idle.gif" + return + ui_header = "ntnrc_new.gif" /datum/computer_file/program/chatclient/on_start(mob/living/user) . = ..() @@ -212,6 +216,17 @@ active_channel = null return ..() +/datum/computer_file/program/chatclient/background_program(mob/user) + . = ..() + var/datum/ntnet_conversation/open_channel = SSmodular_computers.get_chat_channel_by_id(active_channel) + if(isnull(open_channel) || !length(open_channel.messages)) + last_message_id = null + ui_header = null + return + + last_message_id = open_channel.messages[length(open_channel.messages)] + ui_header = "ntnrc_idle.gif" + /// Converts active/idle/closed to a numerical status for sorting clients by. /datum/computer_file/program/chatclient/proc/get_numerical_status() if(src == computer.active_program) @@ -265,8 +280,10 @@ data["clients"] = clients var/list/messages = list() for(var/i=channel.messages.len to 1 step -1) + var/message_id = channel.messages[i] messages.Add(list(list( - "msg" = channel.messages[i], + "key" = message_id, + "msg" = channel.messages[message_id], ))) data["messages"] = messages data["is_operator"] = (channel.channel_operator == src) || netadmin_mode diff --git a/tgui/packages/tgui/interfaces/NtosNetChat.jsx b/tgui/packages/tgui/interfaces/NtosNetChat.jsx index 61f4a7998ccfe..0bfa826847f95 100644 --- a/tgui/packages/tgui/interfaces/NtosNetChat.jsx +++ b/tgui/packages/tgui/interfaces/NtosNetChat.jsx @@ -151,7 +151,7 @@ export const NtosNetChat = (props) => { {(in_channel && (authorized ? ( messages.map((message) => ( - {message.msg} + {message.msg} )) ) : ( From dd91acea23d00fcf671857b938631f156d47ec31 Mon Sep 17 00:00:00 2001 From: "tgstation-ci[bot]" <179393467+tgstation-ci[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 02:20:08 +0000 Subject: [PATCH 13/27] Automatic changelog for PR #87610 [ci skip] --- html/changelogs/AutoChangeLog-pr-87610.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-87610.yml diff --git a/html/changelogs/AutoChangeLog-pr-87610.yml b/html/changelogs/AutoChangeLog-pr-87610.yml new file mode 100644 index 0000000000000..487644fc3a29a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-87610.yml @@ -0,0 +1,6 @@ +author: "00-Steven" +delete-after: True +changes: + - bugfix: "NTNRC no longer endlessly duplicates messages with duplicate contents upon switching channels." + - bugfix: "The new message header you get when NTNRC runs in the background actually works." + - bugfix: "NtOS header actually updates if there are no program headers." \ No newline at end of file From cfdc8b33631234c49496fbf9768f5dfb9d9da633 Mon Sep 17 00:00:00 2001 From: Rhials <28870487+Rhials@users.noreply.github.com> Date: Thu, 7 Nov 2024 21:20:19 -0500 Subject: [PATCH 14/27] Goliath Tendril Hammer is now resistant to acid and fire (#87697) ## About The Pull Request The goliath hammer is now resistant to fire and acid. Being an extension of your body, this should probably not burn off until the entire limb does. ## Why It's Good For The Game Closes #87566. ## Changelog :cl: fix: Goliath Tendril Hammer arm (from the gene brain) is now resistant to being burned off by acid/fire. /:cl: --- code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm b/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm index 4940f6dae6e66..5a06aa8e8c20d 100644 --- a/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm @@ -102,6 +102,7 @@ lefthand_file = 'icons/mob/inhands/weapons/goliath_hammer_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/goliath_hammer_righthand.dmi' item_flags = ABSTRACT | DROPDEL + resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF w_class = WEIGHT_CLASS_HUGE force = 20 throwforce = 0 From 6b8e4c4b383c23be5c5004792f46b185023b87e2 Mon Sep 17 00:00:00 2001 From: "tgstation-ci[bot]" <179393467+tgstation-ci[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 02:20:41 +0000 Subject: [PATCH 15/27] Automatic changelog for PR #87697 [ci skip] --- html/changelogs/AutoChangeLog-pr-87697.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-87697.yml diff --git a/html/changelogs/AutoChangeLog-pr-87697.yml b/html/changelogs/AutoChangeLog-pr-87697.yml new file mode 100644 index 0000000000000..17d5b2b999d92 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-87697.yml @@ -0,0 +1,4 @@ +author: "Rhials" +delete-after: True +changes: + - bugfix: "Goliath Tendril Hammer arm (from the gene brain) is now resistant to being burned off by acid/fire." \ No newline at end of file From 94ff0ada00ecfecf5e3135af6e41514a4950fd49 Mon Sep 17 00:00:00 2001 From: SyncIt21 <110812394+SyncIt21@users.noreply.github.com> Date: Fri, 8 Nov 2024 07:52:48 +0530 Subject: [PATCH 16/27] Moves material container attack to item interaction level (#87676) ## About The Pull Request - Fixes #87664 storage hooks onto pre attack whereas the material container uses attackby so the storage component was intercepting the bananium before the material container could consume it. This also ends the attack chain early so optimization ## Changelog :cl: fix: MK honk shoes now consume bananium & can clown again code: material container objects end their attack chain early /:cl: --- .../components/material/material_container.dm | 51 ++++++++++++------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/code/datums/components/material/material_container.dm b/code/datums/components/material/material_container.dm index 912ae33411677..e4f7941f03ac8 100644 --- a/code/datums/components/material/material_container.dm +++ b/code/datums/components/material/material_container.dm @@ -52,7 +52,8 @@ else allowed_item_typecache = typecacheof(allowed_items) - for(var/mat in init_mats) //Make the assoc list material reference -> amount + //Make the assoc list material reference -> amount + for(var/mat in init_mats) var/mat_ref = GET_MATERIAL_REF(mat) if(isnull(mat_ref)) continue @@ -66,17 +67,6 @@ for(var/signal in container_signals) parent.RegisterSignal(src, signal, container_signals[signal]) - //drop sheets when the object is deconstructed but not deleted - RegisterSignal(parent, COMSIG_OBJ_DECONSTRUCT, PROC_REF(drop_sheets)) - - if(_mat_container_flags & MATCONTAINER_NO_INSERT) - return - - var/atom/atom_target = parent - atom_target.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1 - - RegisterSignal(atom_target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item)) - /datum/component/material_container/Destroy(force) materials = null allowed_materials = null @@ -85,10 +75,35 @@ /datum/component/material_container/RegisterWithParent() . = ..() + var/atom/atom_target = parent + + //can we insert into this container if(!(mat_container_flags & MATCONTAINER_NO_INSERT)) - RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby)) + //to insert stuff into the container + RegisterSignal(atom_target, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(on_item_insert)) + + //screen tips for inserting items + atom_target.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1 + RegisterSignal(atom_target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item)) + + //to see available materials + if(mat_container_flags & MATCONTAINER_EXAMINE) + RegisterSignal(atom_target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) + + //drop sheets when the object is deconstructed but not deleted + RegisterSignal(parent, COMSIG_OBJ_DECONSTRUCT, PROC_REF(drop_sheets)) + +/datum/component/material_container/UnregisterFromParent() + var/list/signals = list() + + if(!(mat_container_flags & MATCONTAINER_NO_INSERT)) + signals += COMSIG_ATOM_ITEM_INTERACTION + signals += COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM if(mat_container_flags & MATCONTAINER_EXAMINE) - RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) + signals += COMSIG_ATOM_EXAMINE + signals += COMSIG_OBJ_DECONSTRUCT + + UnregisterSignal(parent, signals) /datum/component/material_container/proc/drop_sheets() SIGNAL_HANDLER @@ -114,9 +129,9 @@ UnregisterSignal(parent, COMSIG_ATOM_EXAMINE) if(old_flags & MATCONTAINER_NO_INSERT && !(mat_container_flags & MATCONTAINER_NO_INSERT)) - RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(parent, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(on_item_insert)) else if(!(old_flags & MATCONTAINER_NO_INSERT) && mat_container_flags & MATCONTAINER_NO_INSERT) - UnregisterSignal(parent, COMSIG_ATOM_ATTACKBY) + UnregisterSignal(parent, COMSIG_ATOM_ITEM_INTERACTION) /** * 3 Types of Procs @@ -471,7 +486,7 @@ qdel(deleting) /// Proc that allows players to fill the parent with mats -/datum/component/material_container/proc/on_attackby(datum/source, obj/item/weapon, mob/living/user) +/datum/component/material_container/proc/on_item_insert(datum/source, mob/living/user, obj/item/weapon, list/modifiers) SIGNAL_HANDLER //Allows you to attack the machine with iron sheets for e.g. @@ -480,7 +495,7 @@ user_insert(weapon, user) - return COMPONENT_NO_AFTERATTACK + return ITEM_INTERACT_SUCCESS //=============================================================================================== From 20ccb2090ce7f32425421b0a988a2596ba1dd889 Mon Sep 17 00:00:00 2001 From: "tgstation-ci[bot]" <179393467+tgstation-ci[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 02:23:25 +0000 Subject: [PATCH 17/27] Automatic changelog for PR #87676 [ci skip] --- html/changelogs/AutoChangeLog-pr-87676.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-87676.yml diff --git a/html/changelogs/AutoChangeLog-pr-87676.yml b/html/changelogs/AutoChangeLog-pr-87676.yml new file mode 100644 index 0000000000000..df20f96c5612d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-87676.yml @@ -0,0 +1,5 @@ +author: "SyncIt21" +delete-after: True +changes: + - bugfix: "MK honk shoes now consume bananium & can clown again" + - code_imp: "material container objects end their attack chain early" \ No newline at end of file From 437145131e651c3198e49c7303c8a227065d7a05 Mon Sep 17 00:00:00 2001 From: BluBerry016 <50649185+unit0016@users.noreply.github.com> Date: Thu, 7 Nov 2024 21:23:42 -0500 Subject: [PATCH 18/27] Makes #87029 Opt-Out (#87714) ## About The Pull Request Adds a new boolean that lets you opt out of automatically linking zlevels in `LoadGroup()` (as implemented in https://github.com/tgstation/tgstation/pull/87029); and forwards that support to map jsons. Does ***not*** change any /tg/ map jsons in the process; as they all still work as intended. A modified Icebox JSON loading correctly: ![image](https://github.com/user-attachments/assets/5f7a731d-3d4a-461f-9d86-04e1bf162885) ### How do I disable automatic z-level linking? Add the following to your json; under planetary: ``` "height_autosetup": 0, ``` For each z-level's trait; you can then add either `"Up": true` or `"Down": true` to link them manually, as you would've prior to #87029 . ## Why It's Good For The Game tl;dr, map experimentation. It was prior possible to have station segments separated by z-level that weren't vertically linked; which was put to practice most prominently on Nova Sector, of all places, - but #87029 made it automatically assume that they should be linked in that manner. This middleground keeps the new assumption while preserving the old manual process for any mapping projects that need it. ## Changelog :cl: code: Mappers can now opt out of automatically linking their up/down station traits. /:cl: --- code/controllers/subsystem/mapping.dm | 6 +++--- code/datums/map_config.dm | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 742073efca979..c95967078eac5 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -364,7 +364,7 @@ Used by the AI doomsday and the self-destruct nuke. loaded_lazy_templates = SSmapping.loaded_lazy_templates #define INIT_ANNOUNCE(X) to_chat(world, span_boldannounce("[X]")); log_world(X) -/datum/controller/subsystem/mapping/proc/LoadGroup(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE) +/datum/controller/subsystem/mapping/proc/LoadGroup(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE, height_autosetup = TRUE) . = list() var/start_time = REALTIMEOFDAY @@ -394,7 +394,7 @@ Used by the AI doomsday and the self-destruct nuke. while (total_z > traits.len) // fall back to defaults on extra levels traits += list(default_traits.Copy()) - if(total_z > 1) // it's a multi z map + if(total_z > 1 && height_autosetup) // it's a multi z map, and we haven't opted out of trait autosetup for(var/z in 1 to total_z) if(z == 1) // bottom z-level traits[z]["Up"] = TRUE @@ -433,7 +433,7 @@ Used by the AI doomsday and the self-destruct nuke. // load the station station_start = world.maxz + 1 INIT_ANNOUNCE("Loading [current_map.map_name]...") - LoadGroup(FailedZs, "Station", current_map.map_path, current_map.map_file, current_map.traits, ZTRAITS_STATION) + LoadGroup(FailedZs, "Station", current_map.map_path, current_map.map_file, current_map.traits, ZTRAITS_STATION, height_autosetup = current_map.height_autosetup) if(SSdbcore.Connect()) var/datum/db_query/query_round_map_name = SSdbcore.NewQuery({" diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 4c071cbc2bb31..0d7fb3d46d069 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -40,6 +40,8 @@ var/job_changes = list() /// List of additional areas that count as a part of the library var/library_areas = list() + /// Boolean - if TRUE, the "Up" and "Down" traits are automatically distributed to the map's z-levels. If FALSE; they're set via JSON. + var/height_autosetup = TRUE /// List of unit tests that are skipped when running this map var/list/skipped_tests @@ -208,6 +210,9 @@ continue library_areas += path + if ("height_autosetup" in json) + height_autosetup = json["height_autosetup"] + #ifdef UNIT_TESTS // Check for unit tests to skip, no reason to check these if we're not running tests for(var/path_as_text in json["ignored_unit_tests"]) From b1ea3ab93f00e4d096cd2f13162b97d039c35243 Mon Sep 17 00:00:00 2001 From: "tgstation-ci[bot]" <179393467+tgstation-ci[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 02:24:46 +0000 Subject: [PATCH 19/27] Automatic changelog for PR #87714 [ci skip] --- html/changelogs/AutoChangeLog-pr-87714.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-87714.yml diff --git a/html/changelogs/AutoChangeLog-pr-87714.yml b/html/changelogs/AutoChangeLog-pr-87714.yml new file mode 100644 index 0000000000000..0f37160fbee8e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-87714.yml @@ -0,0 +1,4 @@ +author: "unit0016" +delete-after: True +changes: + - code_imp: "Mappers can now opt out of automatically linking their up/down station traits." \ No newline at end of file From d131084830a54e1673ad2fd412a9dee1bff7c589 Mon Sep 17 00:00:00 2001 From: Jeremiah <42397676+jlsnow301@users.noreply.github.com> Date: Thu, 7 Nov 2024 19:08:29 -0800 Subject: [PATCH 20/27] [tgui] Dependency updates (#87723) ## About The Pull Request Some various dependency updates for tgui ## Why It's Good For The Game Shiny! ## Changelog N o p e n/a --- tgui/package.json | 36 +- tgui/packages/tgui-bench/package.json | 8 +- tgui/packages/tgui-dev-server/package.json | 6 +- tgui/packages/tgui-panel/package.json | 12 +- tgui/packages/tgui-polyfill/package.json | 6 +- tgui/packages/tgui-say/package.json | 8 +- .../tgui/interfaces/BluespaceLocator.tsx | 4 +- tgui/packages/tgui/package.json | 16 +- tgui/yarn.lock | 2150 +++++++++-------- 9 files changed, 1158 insertions(+), 1088 deletions(-) diff --git a/tgui/package.json b/tgui/package.json index 0f5a32ff0a978..57d02a389d267 100644 --- a/tgui/package.json +++ b/tgui/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "tgui-workspace", - "version": "5.0.2", + "version": "5.0.3", "packageManager": "yarn@4.5.1", "workspaces": [ "packages/*" @@ -22,15 +22,15 @@ "tgui:eslint-fix": "eslint --fix packages --ext .js,.cjs,.ts,.tsx" }, "dependencies": { - "@swc/core": "^1.4.11", - "@swc/jest": "^0.2.36", - "@types/jest": "^29.5.12", - "@types/node": "^20.12.3", - "@types/webpack-env": "^1.18.4", - "@typescript-eslint/parser": "^7.5.0", - "@typescript-eslint/utils": "^7.5.0", - "css-loader": "^6.10.0", - "esbuild-loader": "^4.1.0", + "@swc/core": "^1.9.1", + "@swc/jest": "^0.2.37", + "@types/jest": "^29.5.14", + "@types/node": "^22.9.0", + "@types/webpack-env": "^1.18.5", + "@typescript-eslint/parser": "^8.13.0", + "@typescript-eslint/utils": "^8.13.0", + "css-loader": "^7.1.2", + "esbuild-loader": "^4.2.2", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-react": "^7.34.1", @@ -41,17 +41,17 @@ "jest": "^29.7.0", "jest-circus": "^29.7.0", "jest-environment-jsdom": "^29.7.0", - "jsdom": "^22.1.0", - "mini-css-extract-plugin": "^2.8.1", + "jsdom": "^25.0.1", + "mini-css-extract-plugin": "^2.9.2", "prettier": "^3.2.5", - "sass": "^1.72.0", - "sass-loader": "^14.1.1", - "style-loader": "^3.3.4", + "sass": "^1.80.6", + "sass-loader": "^14.2.1", + "style-loader": "^4.0.0", "swc-loader": "^0.2.6", - "typescript": "^5.4.3", + "typescript": "^5.6.3", "url-loader": "^4.1.1", - "webpack": "^5.91.0", - "webpack-bundle-analyzer": "^4.10.1", + "webpack": "^5.96.1", + "webpack-bundle-analyzer": "^4.10.2", "webpack-cli": "^5.1.4" } } diff --git a/tgui/packages/tgui-bench/package.json b/tgui/packages/tgui-bench/package.json index 04c95e44c8f17..532363ddda68f 100644 --- a/tgui/packages/tgui-bench/package.json +++ b/tgui/packages/tgui-bench/package.json @@ -1,14 +1,14 @@ { "private": true, "name": "tgui-bench", - "version": "5.0.1", + "version": "5.0.3", "dependencies": { - "@fastify/static": "^6.12.0", + "@fastify/static": "^8.0.2", "common": "workspace:*", - "fastify": "^3.29.5", + "fastify": "^5.1.0", "lodash": "^4.17.21", "platform": "^1.3.6", - "react": "^18.2.0", + "react": "^18.3.1", "tgui": "workspace:*" } } diff --git a/tgui/packages/tgui-dev-server/package.json b/tgui/packages/tgui-dev-server/package.json index 5f1b5be3e5440..01ed38de1f495 100644 --- a/tgui/packages/tgui-dev-server/package.json +++ b/tgui/packages/tgui-dev-server/package.json @@ -1,13 +1,13 @@ { "private": true, "name": "tgui-dev-server", - "version": "5.0.1", + "version": "5.0.3", "type": "module", "dependencies": { - "axios": "^1.6.8", + "axios": "^1.7.7", "glob": "^7.2.3", "source-map": "^0.7.4", "stacktrace-parser": "^0.1.10", - "ws": "^8.16.0" + "ws": "^8.18.0" } } diff --git a/tgui/packages/tgui-panel/package.json b/tgui/packages/tgui-panel/package.json index d435245e3fe35..325e2fde7ca48 100644 --- a/tgui/packages/tgui-panel/package.json +++ b/tgui/packages/tgui-panel/package.json @@ -1,14 +1,14 @@ { "private": true, "name": "tgui-panel", - "version": "5.0.1", + "version": "5.0.3", "dependencies": { - "@types/node": "^20.12.3", - "@types/react": "^18.2.74", + "@types/node": "^22.9.0", + "@types/react": "^18.3.12", "common": "workspace:*", - "dompurify": "^2.4.9", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "dompurify": "^2.5.7", + "react": "^18.3.1", + "react-dom": "^18.3.1", "tgui": "workspace:*", "tgui-dev-server": "workspace:*", "tgui-polyfill": "workspace:*" diff --git a/tgui/packages/tgui-polyfill/package.json b/tgui/packages/tgui-polyfill/package.json index 30f4b6d970027..654069aee9bca 100644 --- a/tgui/packages/tgui-polyfill/package.json +++ b/tgui/packages/tgui-polyfill/package.json @@ -1,16 +1,16 @@ { "private": true, "name": "tgui-polyfill", - "version": "5.0.1", + "version": "5.0.3", "scripts": { "tgui-polyfill:build": "terser 1-misc.js -f ascii_only,comments=false -o ../../public/tgui-polyfill.min.js" }, "dependencies": { - "core-js": "^3.36.1", + "core-js": "^3.39.0", "regenerator-runtime": "^0.14.1", "unfetch": "^5.0.0" }, "devDependencies": { - "terser": "^5.30.2" + "terser": "^5.36.0" } } diff --git a/tgui/packages/tgui-say/package.json b/tgui/packages/tgui-say/package.json index 55410500e586c..5c8eaf390a96c 100644 --- a/tgui/packages/tgui-say/package.json +++ b/tgui/packages/tgui-say/package.json @@ -3,11 +3,11 @@ "name": "tgui-say", "version": "1.0.0", "dependencies": { - "@types/react": "^18.2.74", - "@types/react-dom": "^18.2.24", + "@types/react": "^18.3.12", + "@types/react-dom": "^18.3.1", "common": "workspace:*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", "tgui": "workspace:*", "tgui-polyfill": "workspace:*" } diff --git a/tgui/packages/tgui/interfaces/BluespaceLocator.tsx b/tgui/packages/tgui/interfaces/BluespaceLocator.tsx index 5d8f177b4adee..e1a672c2576cd 100644 --- a/tgui/packages/tgui/interfaces/BluespaceLocator.tsx +++ b/tgui/packages/tgui/interfaces/BluespaceLocator.tsx @@ -52,8 +52,8 @@ export const BluespaceLocator = (props) => { Teleporter Beacons - {(TAB.Beacon && ) || - (TAB.Implant && )} + {tab === TAB.Beacon && } + {tab === TAB.Implant && } ); diff --git a/tgui/packages/tgui/package.json b/tgui/packages/tgui/package.json index 7f7688ac6c797..aa9db580db7de 100644 --- a/tgui/packages/tgui/package.json +++ b/tgui/packages/tgui/package.json @@ -1,24 +1,24 @@ { "private": true, "name": "tgui", - "version": "5.0.1", + "version": "5.0.3", "dependencies": { "@popperjs/core": "^2.11.8", "@types/marked": "4.3.2", - "@types/react": "^18.2.74", + "@types/react": "^18.3.12", "blob-polyfill": "^9.0.20240710", "common": "workspace:*", - "dateformat": "^4.6.3", - "dompurify": "^2.4.9", + "dateformat": "^5.0.3", + "dompurify": "^2.5.7", "file-extension-icon-js": "^1.1.6", - "highlight.js": "^11.9.0", + "highlight.js": "^11.10.0", "jest": "^29.7.0", "js-yaml": "^4.1.0", "marked": "^4.3.0", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", "react-popper": "^2.3.0", - "tgui-core": "^1.1.18", + "tgui-core": "^1.2.0", "tgui-dev-server": "workspace:*", "tgui-polyfill": "workspace:*" } diff --git a/tgui/yarn.lock b/tgui/yarn.lock index c7ce18ba85c68..b4914f88ca6bf 100644 --- a/tgui/yarn.lock +++ b/tgui/yarn.lock @@ -5,13 +5,6 @@ __metadata: version: 8 cacheKey: 10c0 -"@aashutoshrathi/word-wrap@npm:^1.2.3": - version: 1.2.6 - resolution: "@aashutoshrathi/word-wrap@npm:1.2.6" - checksum: 10c0/53c2b231a61a46792b39a0d43bc4f4f776bb4542aa57ee04930676802e5501282c2fc8aac14e4cd1f1120ff8b52616b6ff5ab539ad30aa2277d726444b71619f - languageName: node - linkType: hard - "@adobe/css-tools@npm:^4.0.1": version: 4.3.3 resolution: "@adobe/css-tools@npm:4.3.3" @@ -47,7 +40,7 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.1, @babel/code-frame@npm:^7.24.2, @babel/code-frame@npm:^7.5.5": +"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.2, @babel/code-frame@npm:^7.5.5": version: 7.24.2 resolution: "@babel/code-frame@npm:7.24.2" dependencies: @@ -57,20 +50,13 @@ __metadata: languageName: node linkType: hard -"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.24.4": +"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.23.5, @babel/compat-data@npm:^7.24.4": version: 7.24.4 resolution: "@babel/compat-data@npm:7.24.4" checksum: 10c0/9cd8a9cd28a5ca6db5d0e27417d609f95a8762b655e8c9c97fd2de08997043ae99f0139007083c5e607601c6122e8432c85fe391731b19bf26ad458fa0c60dd3 languageName: node linkType: hard -"@babel/compat-data@npm:^7.23.5": - version: 7.24.1 - resolution: "@babel/compat-data@npm:7.24.1" - checksum: 10c0/8a1935450345c326b14ea632174696566ef9b353bd0d6fb682456c0774342eeee7654877ced410f24a731d386fdcbf980b75083fc764964d6f816b65792af2f5 - languageName: node - linkType: hard - "@babel/core@npm:7.12.3": version: 7.12.3 resolution: "@babel/core@npm:7.12.3" @@ -95,7 +81,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:^7.1.0, @babel/core@npm:^7.16.0, @babel/core@npm:^7.7.5, @babel/core@npm:^7.8.4": +"@babel/core@npm:^7.1.0, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.16.0, @babel/core@npm:^7.23.9, @babel/core@npm:^7.7.5, @babel/core@npm:^7.8.4": version: 7.24.5 resolution: "@babel/core@npm:7.24.5" dependencies: @@ -118,30 +104,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.23.9": - version: 7.24.3 - resolution: "@babel/core@npm:7.24.3" - dependencies: - "@ampproject/remapping": "npm:^2.2.0" - "@babel/code-frame": "npm:^7.24.2" - "@babel/generator": "npm:^7.24.1" - "@babel/helper-compilation-targets": "npm:^7.23.6" - "@babel/helper-module-transforms": "npm:^7.23.3" - "@babel/helpers": "npm:^7.24.1" - "@babel/parser": "npm:^7.24.1" - "@babel/template": "npm:^7.24.0" - "@babel/traverse": "npm:^7.24.1" - "@babel/types": "npm:^7.24.0" - convert-source-map: "npm:^2.0.0" - debug: "npm:^4.1.0" - gensync: "npm:^1.0.0-beta.2" - json5: "npm:^2.2.3" - semver: "npm:^6.3.1" - checksum: 10c0/e6e756b6de27d0312514a005688fa1915c521ad4269a388913eff2120a546538078f8488d6d16e86f851872f263cb45a6bbae08738297afb9382600d2ac342a9 - languageName: node - linkType: hard - -"@babel/generator@npm:^7.12.1, @babel/generator@npm:^7.24.5": +"@babel/generator@npm:^7.12.1, @babel/generator@npm:^7.24.5, @babel/generator@npm:^7.7.2": version: 7.24.5 resolution: "@babel/generator@npm:7.24.5" dependencies: @@ -153,18 +116,6 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.24.1, @babel/generator@npm:^7.7.2": - version: 7.24.1 - resolution: "@babel/generator@npm:7.24.1" - dependencies: - "@babel/types": "npm:^7.24.0" - "@jridgewell/gen-mapping": "npm:^0.3.5" - "@jridgewell/trace-mapping": "npm:^0.3.25" - jsesc: "npm:^2.5.1" - checksum: 10c0/f0eea7497657cdf68cfb4b7d181588e1498eefd1f303d73b0d8ca9b21a6db27136a6f5beb8f988b6bdcd4249870826080950450fd310951de42ecf36df274881 - languageName: node - linkType: hard - "@babel/helper-annotate-as-pure@npm:^7.18.6, @babel/helper-annotate-as-pure@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-annotate-as-pure@npm:7.22.5" @@ -287,7 +238,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.24.5": +"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.23.3, @babel/helper-module-transforms@npm:^7.24.5": version: 7.24.5 resolution: "@babel/helper-module-transforms@npm:7.24.5" dependencies: @@ -302,21 +253,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/helper-module-transforms@npm:7.23.3" - dependencies: - "@babel/helper-environment-visitor": "npm:^7.22.20" - "@babel/helper-module-imports": "npm:^7.22.15" - "@babel/helper-simple-access": "npm:^7.22.5" - "@babel/helper-split-export-declaration": "npm:^7.22.6" - "@babel/helper-validator-identifier": "npm:^7.22.20" - peerDependencies: - "@babel/core": ^7.0.0 - checksum: 10c0/211e1399d0c4993671e8e5c2b25383f08bee40004ace5404ed4065f0e9258cc85d99c1b82fd456c030ce5cfd4d8f310355b54ef35de9924eabfc3dff1331d946 - languageName: node - linkType: hard - "@babel/helper-optimise-call-expression@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-optimise-call-expression@npm:7.22.5" @@ -326,14 +262,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.24.0, @babel/helper-plugin-utils@npm:^7.8.0": - version: 7.24.0 - resolution: "@babel/helper-plugin-utils@npm:7.24.0" - checksum: 10c0/90f41bd1b4dfe7226b1d33a4bb745844c5c63e400f9e4e8bf9103a7ceddd7d425d65333b564d9daba3cebd105985764d51b4bd4c95822b97c2e3ac1201a8a5da - languageName: node - linkType: hard - -"@babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.5, @babel/helper-plugin-utils@npm:^7.8.3": +"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.0, @babel/helper-plugin-utils@npm:^7.24.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3": version: 7.24.5 resolution: "@babel/helper-plugin-utils@npm:7.24.5" checksum: 10c0/4ae40094e6a2f183281213344f4df60c66b16b19a2bc38d2bb11810a6dc0a0e7ec638957d0e433ff8b615775b8f3cd1b7edbf59440d1b50e73c389fc22913377 @@ -366,16 +295,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-simple-access@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/helper-simple-access@npm:7.22.5" - dependencies: - "@babel/types": "npm:^7.22.5" - checksum: 10c0/f0cf81a30ba3d09a625fd50e5a9069e575c5b6719234e04ee74247057f8104beca89ed03e9217b6e9b0493434cedc18c5ecca4cea6244990836f1f893e140369 - languageName: node - linkType: hard - -"@babel/helper-simple-access@npm:^7.24.5": +"@babel/helper-simple-access@npm:^7.22.5, @babel/helper-simple-access@npm:^7.24.5": version: 7.24.5 resolution: "@babel/helper-simple-access@npm:7.24.5" dependencies: @@ -393,15 +313,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-split-export-declaration@npm:^7.22.6": - version: 7.22.6 - resolution: "@babel/helper-split-export-declaration@npm:7.22.6" - dependencies: - "@babel/types": "npm:^7.22.5" - checksum: 10c0/d83e4b623eaa9622c267d3c83583b72f3aac567dc393dda18e559d79187961cb29ae9c57b2664137fc3d19508370b12ec6a81d28af73a50e0846819cb21c6e44 - languageName: node - linkType: hard - "@babel/helper-split-export-declaration@npm:^7.24.5": version: 7.24.5 resolution: "@babel/helper-split-export-declaration@npm:7.24.5" @@ -411,21 +322,14 @@ __metadata: languageName: node linkType: hard -"@babel/helper-string-parser@npm:^7.23.4, @babel/helper-string-parser@npm:^7.24.1": +"@babel/helper-string-parser@npm:^7.24.1": version: 7.24.1 resolution: "@babel/helper-string-parser@npm:7.24.1" checksum: 10c0/2f9bfcf8d2f9f083785df0501dbab92770111ece2f90d120352fda6dd2a7d47db11b807d111e6f32aa1ba6d763fe2dc6603d153068d672a5d0ad33ca802632b2 languageName: node linkType: hard -"@babel/helper-validator-identifier@npm:^7.22.20": - version: 7.22.20 - resolution: "@babel/helper-validator-identifier@npm:7.22.20" - checksum: 10c0/dcad63db345fb110e032de46c3688384b0008a42a4845180ce7cd62b1a9c0507a1bed727c4d1060ed1a03ae57b4d918570259f81724aaac1a5b776056f37504e - languageName: node - linkType: hard - -"@babel/helper-validator-identifier@npm:^7.24.5": +"@babel/helper-validator-identifier@npm:^7.22.20, @babel/helper-validator-identifier@npm:^7.24.5": version: 7.24.5 resolution: "@babel/helper-validator-identifier@npm:7.24.5" checksum: 10c0/05f957229d89ce95a137d04e27f7d0680d84ae48b6ad830e399db0779341f7d30290f863a93351b4b3bde2166737f73a286ea42856bb07c8ddaa95600d38645c @@ -461,18 +365,7 @@ __metadata: languageName: node linkType: hard -"@babel/helpers@npm:^7.24.1": - version: 7.24.1 - resolution: "@babel/helpers@npm:7.24.1" - dependencies: - "@babel/template": "npm:^7.24.0" - "@babel/traverse": "npm:^7.24.1" - "@babel/types": "npm:^7.24.0" - checksum: 10c0/b3445860ae749fc664682b291f092285e949114e8336784ae29f88eb4c176279b01cc6740005a017a0389ae4b4e928d5bbbc01de7da7e400c972e3d6f792063a - languageName: node - linkType: hard - -"@babel/highlight@npm:^7.10.4": +"@babel/highlight@npm:^7.10.4, @babel/highlight@npm:^7.24.2": version: 7.24.5 resolution: "@babel/highlight@npm:7.24.5" dependencies: @@ -484,28 +377,7 @@ __metadata: languageName: node linkType: hard -"@babel/highlight@npm:^7.24.2": - version: 7.24.2 - resolution: "@babel/highlight@npm:7.24.2" - dependencies: - "@babel/helper-validator-identifier": "npm:^7.22.20" - chalk: "npm:^2.4.2" - js-tokens: "npm:^4.0.0" - picocolors: "npm:^1.0.0" - checksum: 10c0/98ce00321daedeed33a4ed9362dc089a70375ff1b3b91228b9f05e6591d387a81a8cba68886e207861b8871efa0bc997ceabdd9c90f6cce3ee1b2f7f941b42db - languageName: node - linkType: hard - -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.9, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.1": - version: 7.24.1 - resolution: "@babel/parser@npm:7.24.1" - bin: - parser: ./bin/babel-parser.js - checksum: 10c0/d2a8b99aa5f33182b69d5569367403a40e7c027ae3b03a1f81fd8ac9b06ceb85b31f6ee4267fb90726dc2ac99909c6bdaa9cf16c379efab73d8dfe85cee32c50 - languageName: node - linkType: hard - -"@babel/parser@npm:^7.12.3, @babel/parser@npm:^7.24.5, @babel/parser@npm:^7.7.0": +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.3, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.9, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.5, @babel/parser@npm:^7.7.0": version: 7.24.5 resolution: "@babel/parser@npm:7.24.5" bin: @@ -1784,36 +1656,7 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.24.1": - version: 7.24.1 - resolution: "@babel/traverse@npm:7.24.1" - dependencies: - "@babel/code-frame": "npm:^7.24.1" - "@babel/generator": "npm:^7.24.1" - "@babel/helper-environment-visitor": "npm:^7.22.20" - "@babel/helper-function-name": "npm:^7.23.0" - "@babel/helper-hoist-variables": "npm:^7.22.5" - "@babel/helper-split-export-declaration": "npm:^7.22.6" - "@babel/parser": "npm:^7.24.1" - "@babel/types": "npm:^7.24.0" - debug: "npm:^4.3.1" - globals: "npm:^11.1.0" - checksum: 10c0/c087b918f6823776537ba246136c70e7ce0719fc05361ebcbfd16f4e6f2f6f1f8f4f9167f1d9b675f27d12074839605189cc9d689de20b89a85e7c140f23daab - languageName: node - linkType: hard - -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.24.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.8.3": - version: 7.24.0 - resolution: "@babel/types@npm:7.24.0" - dependencies: - "@babel/helper-string-parser": "npm:^7.23.4" - "@babel/helper-validator-identifier": "npm:^7.22.20" - to-fast-properties: "npm:^2.0.0" - checksum: 10c0/777a0bb5dbe038ca4c905fdafb1cdb6bdd10fe9d63ce13eca0bd91909363cbad554a53dc1f902004b78c1dcbc742056f877f2c99eeedff647333b1fadf51235d - languageName: node - linkType: hard - -"@babel/types@npm:^7.12.1, @babel/types@npm:^7.12.6, @babel/types@npm:^7.22.15, @babel/types@npm:^7.23.4, @babel/types@npm:^7.24.5, @babel/types@npm:^7.4.4, @babel/types@npm:^7.7.0": +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.1, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.4, @babel/types@npm:^7.24.0, @babel/types@npm:^7.24.5, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.7.0, @babel/types@npm:^7.8.3": version: 7.24.5 resolution: "@babel/types@npm:7.24.5" dependencies: @@ -1864,163 +1707,163 @@ __metadata: languageName: node linkType: hard -"@esbuild/aix-ppc64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/aix-ppc64@npm:0.20.2" +"@esbuild/aix-ppc64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/aix-ppc64@npm:0.21.5" conditions: os=aix & cpu=ppc64 languageName: node linkType: hard -"@esbuild/android-arm64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/android-arm64@npm:0.20.2" +"@esbuild/android-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/android-arm64@npm:0.21.5" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@esbuild/android-arm@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/android-arm@npm:0.20.2" +"@esbuild/android-arm@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/android-arm@npm:0.21.5" conditions: os=android & cpu=arm languageName: node linkType: hard -"@esbuild/android-x64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/android-x64@npm:0.20.2" +"@esbuild/android-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/android-x64@npm:0.21.5" conditions: os=android & cpu=x64 languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/darwin-arm64@npm:0.20.2" +"@esbuild/darwin-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/darwin-arm64@npm:0.21.5" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/darwin-x64@npm:0.20.2" +"@esbuild/darwin-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/darwin-x64@npm:0.21.5" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/freebsd-arm64@npm:0.20.2" +"@esbuild/freebsd-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/freebsd-arm64@npm:0.21.5" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/freebsd-x64@npm:0.20.2" +"@esbuild/freebsd-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/freebsd-x64@npm:0.21.5" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/linux-arm64@npm:0.20.2" +"@esbuild/linux-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-arm64@npm:0.21.5" conditions: os=linux & cpu=arm64 languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/linux-arm@npm:0.20.2" +"@esbuild/linux-arm@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-arm@npm:0.21.5" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/linux-ia32@npm:0.20.2" +"@esbuild/linux-ia32@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-ia32@npm:0.21.5" conditions: os=linux & cpu=ia32 languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/linux-loong64@npm:0.20.2" +"@esbuild/linux-loong64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-loong64@npm:0.21.5" conditions: os=linux & cpu=loong64 languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/linux-mips64el@npm:0.20.2" +"@esbuild/linux-mips64el@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-mips64el@npm:0.21.5" conditions: os=linux & cpu=mips64el languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/linux-ppc64@npm:0.20.2" +"@esbuild/linux-ppc64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-ppc64@npm:0.21.5" conditions: os=linux & cpu=ppc64 languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/linux-riscv64@npm:0.20.2" +"@esbuild/linux-riscv64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-riscv64@npm:0.21.5" conditions: os=linux & cpu=riscv64 languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/linux-s390x@npm:0.20.2" +"@esbuild/linux-s390x@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-s390x@npm:0.21.5" conditions: os=linux & cpu=s390x languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/linux-x64@npm:0.20.2" +"@esbuild/linux-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-x64@npm:0.21.5" conditions: os=linux & cpu=x64 languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/netbsd-x64@npm:0.20.2" +"@esbuild/netbsd-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/netbsd-x64@npm:0.21.5" conditions: os=netbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/openbsd-x64@npm:0.20.2" +"@esbuild/openbsd-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/openbsd-x64@npm:0.21.5" conditions: os=openbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/sunos-x64@npm:0.20.2" +"@esbuild/sunos-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/sunos-x64@npm:0.21.5" conditions: os=sunos & cpu=x64 languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/win32-arm64@npm:0.20.2" +"@esbuild/win32-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/win32-arm64@npm:0.21.5" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/win32-ia32@npm:0.20.2" +"@esbuild/win32-ia32@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/win32-ia32@npm:0.21.5" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.20.2": - version: 0.20.2 - resolution: "@esbuild/win32-x64@npm:0.20.2" +"@esbuild/win32-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/win32-x64@npm:0.21.5" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -2084,53 +1927,73 @@ __metadata: languageName: node linkType: hard -"@fastify/accept-negotiator@npm:^1.0.0": - version: 1.1.0 - resolution: "@fastify/accept-negotiator@npm:1.1.0" - checksum: 10c0/1cb9a298c992b812869158ddc6093557a877b30e5f77618a7afea985a0667c50bc7113593bf0f7f9dc9b82b94c16e8ab127a0afc3efde6677fd645539f6d08e5 +"@fastify/accept-negotiator@npm:^2.0.0": + version: 2.0.0 + resolution: "@fastify/accept-negotiator@npm:2.0.0" + checksum: 10c0/0f93498baa1fc86cea6a6ffd851f0ecf0dfecc89799abad92500102bcbcc57569bce32ef0908b0a8af14501387445e2f37aa559e06744f7069d876eb1a03d4c8 languageName: node linkType: hard -"@fastify/ajv-compiler@npm:^1.0.0": - version: 1.1.0 - resolution: "@fastify/ajv-compiler@npm:1.1.0" +"@fastify/ajv-compiler@npm:^4.0.0": + version: 4.0.1 + resolution: "@fastify/ajv-compiler@npm:4.0.1" dependencies: - ajv: "npm:^6.12.6" - checksum: 10c0/e8c4c468f74db2d5d14ce3e765e8317e302413960f63474e6ef18039b1d711e2712e87808035f3e075b9fdf8f47af1b481979eb1ca8d82e0773ff6a9fd49d903 + ajv: "npm:^8.12.0" + ajv-formats: "npm:^3.0.1" + fast-uri: "npm:^3.0.0" + checksum: 10c0/178d06e799e6ea19d4b579cc90e11ef50babda9fc2828d85edbd7b08aaa5a63dad2a42ba92e07e9c1e5da78e4382854bb1e99a6f2f5e61da67c670dc3572842e languageName: node linkType: hard -"@fastify/error@npm:^2.0.0": - version: 2.0.0 - resolution: "@fastify/error@npm:2.0.0" - checksum: 10c0/32b98cb663e462e3d60a31a46306481f7b84657cfdd301dcd7fa9f77389f180e51c641dc4c6900d423daa264e70172bf23493fae031b6af4844b6cc7f17fe77d +"@fastify/error@npm:^4.0.0": + version: 4.0.0 + resolution: "@fastify/error@npm:4.0.0" + checksum: 10c0/074b8a6c350c29a8fc8314298d9457fe0c1ba6e7f160e9ae6ba0e18853f1ec7427d768f966700cbf67a4694f3a9a593c6a23e42ce3ed62e40fecdf8026040d9a languageName: node linkType: hard -"@fastify/send@npm:^2.0.0": - version: 2.1.0 - resolution: "@fastify/send@npm:2.1.0" +"@fastify/fast-json-stringify-compiler@npm:^5.0.0": + version: 5.0.1 + resolution: "@fastify/fast-json-stringify-compiler@npm:5.0.1" dependencies: - "@lukeed/ms": "npm:^2.0.1" + fast-json-stringify: "npm:^6.0.0" + checksum: 10c0/dc294c24684fe900b9190f3b4d8e52b6438bf9e737dbd2b3b202d906f71ef1fb406c031c40fc34f52c61f4f00e1a0d5753ce5a88064de371248fb4116c02066b + languageName: node + linkType: hard + +"@fastify/merge-json-schemas@npm:^0.1.1": + version: 0.1.1 + resolution: "@fastify/merge-json-schemas@npm:0.1.1" + dependencies: + fast-deep-equal: "npm:^3.1.3" + checksum: 10c0/7979ce12724f7b98aea06f0bb9afb20dd869f0ff6fc697517135cbb54e0a36b062cbb38ec176fe43d1fc455576839240df8f33533939ace2d64a6218a6e6b9c1 + languageName: node + linkType: hard + +"@fastify/send@npm:^3.1.0": + version: 3.1.1 + resolution: "@fastify/send@npm:3.1.1" + dependencies: + "@lukeed/ms": "npm:^2.0.2" escape-html: "npm:~1.0.3" fast-decode-uri-component: "npm:^1.0.1" - http-errors: "npm:2.0.0" - mime: "npm:^3.0.0" - checksum: 10c0/0e1c10022660fa1f1959b7c414d1be2c47ab42be1da8e21cd72a4df3104c516fdf7b590ee67f897037dd4c85b716fac63929e894d7699623549646604f6db14b + http-errors: "npm:^2.0.0" + mime: "npm:^3" + checksum: 10c0/7684b0b9e2fe04ee0ec5720742c263efbf66a61c6d4cd9535437693c8a7303b4e8e1a2945969a12f50202c60b85ded69ecceec44a4a0af68d9970f9f7571c476 languageName: node linkType: hard -"@fastify/static@npm:^6.12.0": - version: 6.12.0 - resolution: "@fastify/static@npm:6.12.0" +"@fastify/static@npm:^8.0.2": + version: 8.0.2 + resolution: "@fastify/static@npm:8.0.2" dependencies: - "@fastify/accept-negotiator": "npm:^1.0.0" - "@fastify/send": "npm:^2.0.0" - content-disposition: "npm:^0.5.3" - fastify-plugin: "npm:^4.0.0" - glob: "npm:^8.0.1" - p-limit: "npm:^3.1.0" - checksum: 10c0/9248c9851c4bb24965e88eb2f0825fda2b2b08ddb83aa5f08e529b8a522cf20978f81e8e4837e2cb550b39ea433790b0fd82db4b2f0673133325e265c9099fff + "@fastify/accept-negotiator": "npm:^2.0.0" + "@fastify/send": "npm:^3.1.0" + content-disposition: "npm:^0.5.4" + fastify-plugin: "npm:^5.0.0" + fastq: "npm:^1.17.1" + glob: "npm:^11.0.0" + checksum: 10c0/88d7600275878987a71555feefacd2b36525edf0ec04f4512bcf6dc96bbb2edfa96335e862f1f6032aee4e05f87cbfd5566ab1a43fc80012a4417f590ff28b6f languageName: node linkType: hard @@ -2746,7 +2609,7 @@ __metadata: languageName: node linkType: hard -"@lukeed/ms@npm:^2.0.1": +"@lukeed/ms@npm:^2.0.2": version: 2.0.2 resolution: "@lukeed/ms@npm:2.0.2" checksum: 10c0/843b922717313bcde4943f478145d8bc13115b9b91d83bbaed53739b5644122984412310aed574792f4e6b492f2cbda178175f601856d310f67e14834c3f17a0 @@ -2842,6 +2705,150 @@ __metadata: languageName: node linkType: hard +"@parcel/watcher-android-arm64@npm:2.5.0": + version: 2.5.0 + resolution: "@parcel/watcher-android-arm64@npm:2.5.0" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + +"@parcel/watcher-darwin-arm64@npm:2.5.0": + version: 2.5.0 + resolution: "@parcel/watcher-darwin-arm64@npm:2.5.0" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@parcel/watcher-darwin-x64@npm:2.5.0": + version: 2.5.0 + resolution: "@parcel/watcher-darwin-x64@npm:2.5.0" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@parcel/watcher-freebsd-x64@npm:2.5.0": + version: 2.5.0 + resolution: "@parcel/watcher-freebsd-x64@npm:2.5.0" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + +"@parcel/watcher-linux-arm-glibc@npm:2.5.0": + version: 2.5.0 + resolution: "@parcel/watcher-linux-arm-glibc@npm:2.5.0" + conditions: os=linux & cpu=arm & libc=glibc + languageName: node + linkType: hard + +"@parcel/watcher-linux-arm-musl@npm:2.5.0": + version: 2.5.0 + resolution: "@parcel/watcher-linux-arm-musl@npm:2.5.0" + conditions: os=linux & cpu=arm & libc=musl + languageName: node + linkType: hard + +"@parcel/watcher-linux-arm64-glibc@npm:2.5.0": + version: 2.5.0 + resolution: "@parcel/watcher-linux-arm64-glibc@npm:2.5.0" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"@parcel/watcher-linux-arm64-musl@npm:2.5.0": + version: 2.5.0 + resolution: "@parcel/watcher-linux-arm64-musl@npm:2.5.0" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"@parcel/watcher-linux-x64-glibc@npm:2.5.0": + version: 2.5.0 + resolution: "@parcel/watcher-linux-x64-glibc@npm:2.5.0" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"@parcel/watcher-linux-x64-musl@npm:2.5.0": + version: 2.5.0 + resolution: "@parcel/watcher-linux-x64-musl@npm:2.5.0" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"@parcel/watcher-win32-arm64@npm:2.5.0": + version: 2.5.0 + resolution: "@parcel/watcher-win32-arm64@npm:2.5.0" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"@parcel/watcher-win32-ia32@npm:2.5.0": + version: 2.5.0 + resolution: "@parcel/watcher-win32-ia32@npm:2.5.0" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"@parcel/watcher-win32-x64@npm:2.5.0": + version: 2.5.0 + resolution: "@parcel/watcher-win32-x64@npm:2.5.0" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + +"@parcel/watcher@npm:^2.4.1": + version: 2.5.0 + resolution: "@parcel/watcher@npm:2.5.0" + dependencies: + "@parcel/watcher-android-arm64": "npm:2.5.0" + "@parcel/watcher-darwin-arm64": "npm:2.5.0" + "@parcel/watcher-darwin-x64": "npm:2.5.0" + "@parcel/watcher-freebsd-x64": "npm:2.5.0" + "@parcel/watcher-linux-arm-glibc": "npm:2.5.0" + "@parcel/watcher-linux-arm-musl": "npm:2.5.0" + "@parcel/watcher-linux-arm64-glibc": "npm:2.5.0" + "@parcel/watcher-linux-arm64-musl": "npm:2.5.0" + "@parcel/watcher-linux-x64-glibc": "npm:2.5.0" + "@parcel/watcher-linux-x64-musl": "npm:2.5.0" + "@parcel/watcher-win32-arm64": "npm:2.5.0" + "@parcel/watcher-win32-ia32": "npm:2.5.0" + "@parcel/watcher-win32-x64": "npm:2.5.0" + detect-libc: "npm:^1.0.3" + is-glob: "npm:^4.0.3" + micromatch: "npm:^4.0.5" + node-addon-api: "npm:^7.0.0" + node-gyp: "npm:latest" + dependenciesMeta: + "@parcel/watcher-android-arm64": + optional: true + "@parcel/watcher-darwin-arm64": + optional: true + "@parcel/watcher-darwin-x64": + optional: true + "@parcel/watcher-freebsd-x64": + optional: true + "@parcel/watcher-linux-arm-glibc": + optional: true + "@parcel/watcher-linux-arm-musl": + optional: true + "@parcel/watcher-linux-arm64-glibc": + optional: true + "@parcel/watcher-linux-arm64-musl": + optional: true + "@parcel/watcher-linux-x64-glibc": + optional: true + "@parcel/watcher-linux-x64-musl": + optional: true + "@parcel/watcher-win32-arm64": + optional: true + "@parcel/watcher-win32-ia32": + optional: true + "@parcel/watcher-win32-x64": + optional: true + checksum: 10c0/9bad727d8b11e5d150ec47459254544c583adaa47d047b8ef65e1c74aede1a0767dc7fc6b8997649dae07318d6ef39caba6a1c405d306398d5bcd47074ec5d29 + languageName: node + linkType: hard + "@pkgjs/parseargs@npm:^0.11.0": version: 0.11.0 resolution: "@pkgjs/parseargs@npm:0.11.0" @@ -3123,94 +3130,94 @@ __metadata: languageName: node linkType: hard -"@swc/core-darwin-arm64@npm:1.4.11": - version: 1.4.11 - resolution: "@swc/core-darwin-arm64@npm:1.4.11" +"@swc/core-darwin-arm64@npm:1.9.1": + version: 1.9.1 + resolution: "@swc/core-darwin-arm64@npm:1.9.1" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@swc/core-darwin-x64@npm:1.4.11": - version: 1.4.11 - resolution: "@swc/core-darwin-x64@npm:1.4.11" +"@swc/core-darwin-x64@npm:1.9.1": + version: 1.9.1 + resolution: "@swc/core-darwin-x64@npm:1.9.1" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@swc/core-linux-arm-gnueabihf@npm:1.4.11": - version: 1.4.11 - resolution: "@swc/core-linux-arm-gnueabihf@npm:1.4.11" +"@swc/core-linux-arm-gnueabihf@npm:1.9.1": + version: 1.9.1 + resolution: "@swc/core-linux-arm-gnueabihf@npm:1.9.1" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@swc/core-linux-arm64-gnu@npm:1.4.11": - version: 1.4.11 - resolution: "@swc/core-linux-arm64-gnu@npm:1.4.11" +"@swc/core-linux-arm64-gnu@npm:1.9.1": + version: 1.9.1 + resolution: "@swc/core-linux-arm64-gnu@npm:1.9.1" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@swc/core-linux-arm64-musl@npm:1.4.11": - version: 1.4.11 - resolution: "@swc/core-linux-arm64-musl@npm:1.4.11" +"@swc/core-linux-arm64-musl@npm:1.9.1": + version: 1.9.1 + resolution: "@swc/core-linux-arm64-musl@npm:1.9.1" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@swc/core-linux-x64-gnu@npm:1.4.11": - version: 1.4.11 - resolution: "@swc/core-linux-x64-gnu@npm:1.4.11" +"@swc/core-linux-x64-gnu@npm:1.9.1": + version: 1.9.1 + resolution: "@swc/core-linux-x64-gnu@npm:1.9.1" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@swc/core-linux-x64-musl@npm:1.4.11": - version: 1.4.11 - resolution: "@swc/core-linux-x64-musl@npm:1.4.11" +"@swc/core-linux-x64-musl@npm:1.9.1": + version: 1.9.1 + resolution: "@swc/core-linux-x64-musl@npm:1.9.1" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@swc/core-win32-arm64-msvc@npm:1.4.11": - version: 1.4.11 - resolution: "@swc/core-win32-arm64-msvc@npm:1.4.11" +"@swc/core-win32-arm64-msvc@npm:1.9.1": + version: 1.9.1 + resolution: "@swc/core-win32-arm64-msvc@npm:1.9.1" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@swc/core-win32-ia32-msvc@npm:1.4.11": - version: 1.4.11 - resolution: "@swc/core-win32-ia32-msvc@npm:1.4.11" +"@swc/core-win32-ia32-msvc@npm:1.9.1": + version: 1.9.1 + resolution: "@swc/core-win32-ia32-msvc@npm:1.9.1" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@swc/core-win32-x64-msvc@npm:1.4.11": - version: 1.4.11 - resolution: "@swc/core-win32-x64-msvc@npm:1.4.11" +"@swc/core-win32-x64-msvc@npm:1.9.1": + version: 1.9.1 + resolution: "@swc/core-win32-x64-msvc@npm:1.9.1" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"@swc/core@npm:^1.4.11": - version: 1.4.11 - resolution: "@swc/core@npm:1.4.11" - dependencies: - "@swc/core-darwin-arm64": "npm:1.4.11" - "@swc/core-darwin-x64": "npm:1.4.11" - "@swc/core-linux-arm-gnueabihf": "npm:1.4.11" - "@swc/core-linux-arm64-gnu": "npm:1.4.11" - "@swc/core-linux-arm64-musl": "npm:1.4.11" - "@swc/core-linux-x64-gnu": "npm:1.4.11" - "@swc/core-linux-x64-musl": "npm:1.4.11" - "@swc/core-win32-arm64-msvc": "npm:1.4.11" - "@swc/core-win32-ia32-msvc": "npm:1.4.11" - "@swc/core-win32-x64-msvc": "npm:1.4.11" - "@swc/counter": "npm:^0.1.2" - "@swc/types": "npm:^0.1.5" +"@swc/core@npm:^1.9.1": + version: 1.9.1 + resolution: "@swc/core@npm:1.9.1" + dependencies: + "@swc/core-darwin-arm64": "npm:1.9.1" + "@swc/core-darwin-x64": "npm:1.9.1" + "@swc/core-linux-arm-gnueabihf": "npm:1.9.1" + "@swc/core-linux-arm64-gnu": "npm:1.9.1" + "@swc/core-linux-arm64-musl": "npm:1.9.1" + "@swc/core-linux-x64-gnu": "npm:1.9.1" + "@swc/core-linux-x64-musl": "npm:1.9.1" + "@swc/core-win32-arm64-msvc": "npm:1.9.1" + "@swc/core-win32-ia32-msvc": "npm:1.9.1" + "@swc/core-win32-x64-msvc": "npm:1.9.1" + "@swc/counter": "npm:^0.1.3" + "@swc/types": "npm:^0.1.14" peerDependencies: - "@swc/helpers": ^0.5.0 + "@swc/helpers": "*" dependenciesMeta: "@swc/core-darwin-arm64": optional: true @@ -3235,36 +3242,36 @@ __metadata: peerDependenciesMeta: "@swc/helpers": optional: true - checksum: 10c0/7860541ba95fc15e6abe1993eb87fdfe05aad3418862b3f790f26cf1de1284e387300020ac60a8487404fd4364af2cc7f9e8a3c4dba49a8683c5d08cd4cb95c4 + checksum: 10c0/7b9a3da9bdd95216b031739ebe35983e69f17284809a62706c93edfd30ede0732060d944db23007aca9aebbc49859eb5784454c8882ae6fd04eb8bd15ac6a247 languageName: node linkType: hard -"@swc/counter@npm:^0.1.2, @swc/counter@npm:^0.1.3": +"@swc/counter@npm:^0.1.3": version: 0.1.3 resolution: "@swc/counter@npm:0.1.3" checksum: 10c0/8424f60f6bf8694cfd2a9bca45845bce29f26105cda8cf19cdb9fd3e78dc6338699e4db77a89ae449260bafa1cc6bec307e81e7fb96dbf7dcfce0eea55151356 languageName: node linkType: hard -"@swc/jest@npm:^0.2.36": - version: 0.2.36 - resolution: "@swc/jest@npm:0.2.36" +"@swc/jest@npm:^0.2.37": + version: 0.2.37 + resolution: "@swc/jest@npm:0.2.37" dependencies: "@jest/create-cache-key-function": "npm:^29.7.0" "@swc/counter": "npm:^0.1.3" jsonc-parser: "npm:^3.2.0" peerDependencies: "@swc/core": "*" - checksum: 10c0/7f1993f9201420bb499c92ab28797352bcbf9e3a6c7b5a1806fdc34c9c3b46ea9e5b2f070c0e13fcf7f3c3fadbbc38777840baabb178f589bf1f67543763adb6 + checksum: 10c0/abe10d87610bf7c172aa7ab14c64599a22e48c1f43a09d6e22733f85f25fb98e57cb4bb58b9554e60a3ac8629be559bd967d7a8601a3ceaacad618aecccebec2 languageName: node linkType: hard -"@swc/types@npm:^0.1.5": - version: 0.1.6 - resolution: "@swc/types@npm:0.1.6" +"@swc/types@npm:^0.1.14": + version: 0.1.14 + resolution: "@swc/types@npm:0.1.14" dependencies: "@swc/counter": "npm:^0.1.3" - checksum: 10c0/043a0e56d69db8733827ad69db55d0ffbd6976fd24ef629a488e57040067ac84d057a57e08bc5a3db545d44b01d6aa43c22df1152c637af450d366e57cde6e22 + checksum: 10c0/5ab5a213f25fbb038e8b2fa001a20c64363f81c199319373ed0228f316c046a996758fbaf906ba84d297b35e37727082d27974266db320e534da594716626529 languageName: node linkType: hard @@ -3387,7 +3394,7 @@ __metadata: languageName: node linkType: hard -"@types/eslint-scope@npm:^3.7.3": +"@types/eslint-scope@npm:^3.7.7": version: 3.7.7 resolution: "@types/eslint-scope@npm:3.7.7" dependencies: @@ -3417,10 +3424,10 @@ __metadata: languageName: node linkType: hard -"@types/estree@npm:*, @types/estree@npm:^1.0.5": - version: 1.0.5 - resolution: "@types/estree@npm:1.0.5" - checksum: 10c0/b3b0e334288ddb407c7b3357ca67dbee75ee22db242ca7c56fe27db4e1a31989cb8af48a84dd401deb787fe10cc6b2ab1ee82dc4783be87ededbe3d53c79c70d +"@types/estree@npm:*, @types/estree@npm:^1.0.6": + version: 1.0.6 + resolution: "@types/estree@npm:1.0.6" + checksum: 10c0/cdfd751f6f9065442cd40957c07fd80361c962869aa853c1c2fd03e101af8b9389d8ff4955a43a6fcfa223dd387a089937f95be0f3eec21ca527039fd2d9859a languageName: node linkType: hard @@ -3482,13 +3489,13 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:*, @types/jest@npm:^29.5.12": - version: 29.5.12 - resolution: "@types/jest@npm:29.5.12" +"@types/jest@npm:*, @types/jest@npm:^29.5.14": + version: 29.5.14 + resolution: "@types/jest@npm:29.5.14" dependencies: expect: "npm:^29.0.0" pretty-format: "npm:^29.0.0" - checksum: 10c0/25fc8e4c611fa6c4421e631432e9f0a6865a8cb07c9815ec9ac90d630271cad773b2ee5fe08066f7b95bebd18bb967f8ce05d018ee9ab0430f9dfd1d84665b6f + checksum: 10c0/18e0712d818890db8a8dab3d91e9ea9f7f19e3f83c2e50b312f557017dc81466207a71f3ed79cf4428e813ba939954fa26ffa0a9a7f153181ba174581b1c2aed languageName: node linkType: hard @@ -3503,7 +3510,7 @@ __metadata: languageName: node linkType: hard -"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.3, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.7, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": +"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.3, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.7, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": version: 7.0.15 resolution: "@types/json-schema@npm:7.0.15" checksum: 10c0/a996a745e6c5d60292f36731dd41341339d4eeed8180bb09226e5c8d23759067692b1d88e5d91d72ee83dfc00d3aca8e7bd43ea120516c17922cbcb7c3e252db @@ -3531,12 +3538,12 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:^20.12.3": - version: 20.12.3 - resolution: "@types/node@npm:20.12.3" +"@types/node@npm:*, @types/node@npm:^22.9.0": + version: 22.9.0 + resolution: "@types/node@npm:22.9.0" dependencies: - undici-types: "npm:~5.26.4" - checksum: 10c0/45c8485a0e55276b42c26ba1df6c480e4e1a3a3abbf4ea0ff6b4e2823c4f77e32b7e166d4263d464f207cfea5bd4de8879b8df2c7132a727b0346a30191d6bea + undici-types: "npm:~6.19.8" + checksum: 10c0/3f46cbe0a49bab4ba30494025e4c8a6e699b98ac922857aa1f0209ce11a1313ee46e6808b8f13fe5b8b960a9d7796b77c8d542ad4e9810e85ef897d5593b5d51 languageName: node linkType: hard @@ -3575,22 +3582,22 @@ __metadata: languageName: node linkType: hard -"@types/react-dom@npm:^18.2.24": - version: 18.2.24 - resolution: "@types/react-dom@npm:18.2.24" +"@types/react-dom@npm:^18.3.1": + version: 18.3.1 + resolution: "@types/react-dom@npm:18.3.1" dependencies: "@types/react": "npm:*" - checksum: 10c0/9ec38e5ab4727c56ef17bd8e938ead88748ba19db314b8d9807714a5cae430f5b799514667b221b4f2dc8d9b4ca17dd1c3da8c41c083c2de9eddcc31bec6b8ff + checksum: 10c0/8b416551c60bb6bd8ec10e198c957910cfb271bc3922463040b0d57cf4739cdcd24b13224f8d68f10318926e1ec3cd69af0af79f0291b599a992f8c80d47f1eb languageName: node linkType: hard -"@types/react@npm:*, @types/react@npm:^18.2.74": - version: 18.2.74 - resolution: "@types/react@npm:18.2.74" +"@types/react@npm:*, @types/react@npm:^18.3.12": + version: 18.3.12 + resolution: "@types/react@npm:18.3.12" dependencies: "@types/prop-types": "npm:*" csstype: "npm:^3.0.2" - checksum: 10c0/347e38b4c5dc20d50ff71bf04b7caaef490e5ff695e74a0088a13fbb2a0c5d125a5ecfd142adfa30f0176da0e2734942c91ba61d95ce269c43b3265bd7379361 + checksum: 10c0/8bae8d9a41619804561574792e29112b413044eb0d53746dde2b9720c1f9a59f71c895bbd7987cd8ce9500b00786e53bc032dced38cddf42910458e145675290 languageName: node linkType: hard @@ -3603,13 +3610,6 @@ __metadata: languageName: node linkType: hard -"@types/semver@npm:^7.5.0": - version: 7.5.8 - resolution: "@types/semver@npm:7.5.8" - checksum: 10c0/8663ff927234d1c5fcc04b33062cb2b9fcfbe0f5f351ed26c4d1e1581657deebd506b41ff7fdf89e787e3d33ce05854bc01686379b89e9c49b564c4cfa988efa - languageName: node - linkType: hard - "@types/source-list-map@npm:*": version: 0.1.6 resolution: "@types/source-list-map@npm:0.1.6" @@ -3656,10 +3656,10 @@ __metadata: languageName: node linkType: hard -"@types/webpack-env@npm:^1.18.4": - version: 1.18.4 - resolution: "@types/webpack-env@npm:1.18.4" - checksum: 10c0/3fa77dbff0ed71685404576b0a1cf74587567fe2ee1cfd11d56d6eefcab7a61e4c9ead0eced264e289d2cf0fc74296dbd55ed6c95774fe0fd6264d156c5a59f0 +"@types/webpack-env@npm:^1.18.5": + version: 1.18.5 + resolution: "@types/webpack-env@npm:1.18.5" + checksum: 10c0/b9e4876e8c7cae419896249f9ed795db283c008fe1d38efa679cbbf05194fc2eea2a5bfb4ff4393d109e3a9895416dadf5f3ddd5c22931b678062230f860454e languageName: node linkType: hard @@ -3783,21 +3783,21 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:^7.5.0": - version: 7.5.0 - resolution: "@typescript-eslint/parser@npm:7.5.0" +"@typescript-eslint/parser@npm:^8.13.0": + version: 8.13.0 + resolution: "@typescript-eslint/parser@npm:8.13.0" dependencies: - "@typescript-eslint/scope-manager": "npm:7.5.0" - "@typescript-eslint/types": "npm:7.5.0" - "@typescript-eslint/typescript-estree": "npm:7.5.0" - "@typescript-eslint/visitor-keys": "npm:7.5.0" + "@typescript-eslint/scope-manager": "npm:8.13.0" + "@typescript-eslint/types": "npm:8.13.0" + "@typescript-eslint/typescript-estree": "npm:8.13.0" + "@typescript-eslint/visitor-keys": "npm:8.13.0" debug: "npm:^4.3.4" peerDependencies: - eslint: ^8.56.0 + eslint: ^8.57.0 || ^9.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 10c0/65521202ff024e79594272fbb7e4731ecf9d2fdd2f58fc81450bfd2bca94ce9c17b0eadd7338c01701f5cf16d38b6c025ed3fc322380b1e4b5424b7484098cda + checksum: 10c0/fa04f6c417c0f72104e148f1d7ff53e04108d383550365a556fbfae5d2283484696235db522189e17bc49039946977078e324100cef991ca01f78704182624ad languageName: node linkType: hard @@ -3811,13 +3811,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:7.5.0": - version: 7.5.0 - resolution: "@typescript-eslint/scope-manager@npm:7.5.0" +"@typescript-eslint/scope-manager@npm:8.13.0": + version: 8.13.0 + resolution: "@typescript-eslint/scope-manager@npm:8.13.0" dependencies: - "@typescript-eslint/types": "npm:7.5.0" - "@typescript-eslint/visitor-keys": "npm:7.5.0" - checksum: 10c0/a017b151a6b39ef591f8e2e65598e005e1b4b2d5494e4b91bddb5856b3a4d57dd8a58d2bc7a140e627eb574f93a2c8fe55f1307aa264c928ffd31d9e190bc5dd + "@typescript-eslint/types": "npm:8.13.0" + "@typescript-eslint/visitor-keys": "npm:8.13.0" + checksum: 10c0/1924b3e740e244d98f8a99740b4196d23ae3263303b387c66db94e140455a3132e603a130f3f70fc71e37f4bda5d0c0c67224ae3911908b097ef3f972c136be4 languageName: node linkType: hard @@ -3835,10 +3835,10 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:7.5.0": - version: 7.5.0 - resolution: "@typescript-eslint/types@npm:7.5.0" - checksum: 10c0/f3394f71f422dbd89f63b230f20e9769c12e47a287ff30ca03a80714e57ea21279b6f12a8ab14bafb00b59926f20a88894b2d1e72679f7ff298bae112679d4b3 +"@typescript-eslint/types@npm:8.13.0": + version: 8.13.0 + resolution: "@typescript-eslint/types@npm:8.13.0" + checksum: 10c0/bd3f88b738a92b2222f388bcf831357ef8940a763c2c2eb1947767e1051dd2f8bee387020e8cf4c2309e4142353961b659abc2885e30679109a0488b0bfefc23 languageName: node linkType: hard @@ -3879,39 +3879,36 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:7.5.0": - version: 7.5.0 - resolution: "@typescript-eslint/typescript-estree@npm:7.5.0" +"@typescript-eslint/typescript-estree@npm:8.13.0": + version: 8.13.0 + resolution: "@typescript-eslint/typescript-estree@npm:8.13.0" dependencies: - "@typescript-eslint/types": "npm:7.5.0" - "@typescript-eslint/visitor-keys": "npm:7.5.0" + "@typescript-eslint/types": "npm:8.13.0" + "@typescript-eslint/visitor-keys": "npm:8.13.0" debug: "npm:^4.3.4" - globby: "npm:^11.1.0" + fast-glob: "npm:^3.3.2" is-glob: "npm:^4.0.3" - minimatch: "npm:9.0.3" - semver: "npm:^7.5.4" - ts-api-utils: "npm:^1.0.1" + minimatch: "npm:^9.0.4" + semver: "npm:^7.6.0" + ts-api-utils: "npm:^1.3.0" peerDependenciesMeta: typescript: optional: true - checksum: 10c0/ea3a270c725d6be273188b86110e0393052cd64d1c54a56eb5ea405e6d3fbbe84fb3b1ce1b8496a4078ac1eefd37aedcf12be91876764f6de31d5aa5131c7bcd + checksum: 10c0/2d45bc5ed4ac352bea927167ac28ef23bd13b6ae352ff50e85cddfdc4b06518f1dd4ae5f2495e30d6f62d247987677a4e807065d55829ba28963908a821dc96d languageName: node linkType: hard -"@typescript-eslint/utils@npm:^7.5.0": - version: 7.5.0 - resolution: "@typescript-eslint/utils@npm:7.5.0" +"@typescript-eslint/utils@npm:^8.13.0": + version: 8.13.0 + resolution: "@typescript-eslint/utils@npm:8.13.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.4.0" - "@types/json-schema": "npm:^7.0.12" - "@types/semver": "npm:^7.5.0" - "@typescript-eslint/scope-manager": "npm:7.5.0" - "@typescript-eslint/types": "npm:7.5.0" - "@typescript-eslint/typescript-estree": "npm:7.5.0" - semver: "npm:^7.5.4" + "@typescript-eslint/scope-manager": "npm:8.13.0" + "@typescript-eslint/types": "npm:8.13.0" + "@typescript-eslint/typescript-estree": "npm:8.13.0" peerDependencies: - eslint: ^8.56.0 - checksum: 10c0/c815ed6909769648953d6963c069038f7cac0c979051b25718feb30e0d3337b9647b75b8de00ac03fe960f0cc8dc4e8a81d4aac4719090a99785e0068712bd24 + eslint: ^8.57.0 || ^9.0.0 + checksum: 10c0/3fc5a7184a949df5f5b64f6af039a1d21ef7fe15f3d88a5d485ccbb535746d18514751143993a5aee287228151be3e326baf8f899a0a0a93368f6f20857ffa6d languageName: node linkType: hard @@ -3934,13 +3931,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:7.5.0": - version: 7.5.0 - resolution: "@typescript-eslint/visitor-keys@npm:7.5.0" +"@typescript-eslint/visitor-keys@npm:8.13.0": + version: 8.13.0 + resolution: "@typescript-eslint/visitor-keys@npm:8.13.0" dependencies: - "@typescript-eslint/types": "npm:7.5.0" - eslint-visitor-keys: "npm:^3.4.1" - checksum: 10c0/eecf02b8dd54e83738a143aca87b902af4b357028a90fd34ed7a2f40a3ae2f6a188b9ba53903f23c80e868f1fffbb039e9ddb63525438d659707cc7bfb269317 + "@typescript-eslint/types": "npm:8.13.0" + eslint-visitor-keys: "npm:^3.4.3" + checksum: 10c0/50b35f3cf673aaed940613f0007f7c4558a89ebef15c49824e65b6f084b700fbf01b01a4e701e24bbe651297a39678645e739acd255255f1603867a84bef0383 languageName: node linkType: hard @@ -4358,7 +4355,7 @@ __metadata: languageName: node linkType: hard -"abstract-logging@npm:^2.0.0": +"abstract-logging@npm:^2.0.1": version: 2.0.1 resolution: "abstract-logging@npm:2.0.1" checksum: 10c0/304879d9babcf6772260e5ddde632e6428e1f42f7a7a116d4689e97ad813a20e0ec2dd1e0a122f3617557f40091b9ca85735de4b48c17a2041268cb47b3f8ef1 @@ -4395,15 +4392,6 @@ __metadata: languageName: node linkType: hard -"acorn-import-assertions@npm:^1.9.0": - version: 1.9.0 - resolution: "acorn-import-assertions@npm:1.9.0" - peerDependencies: - acorn: ^8 - checksum: 10c0/3b4a194e128efdc9b86c2b1544f623aba4c1aa70d638f8ab7dc3971a5b4aa4c57bd62f99af6e5325bb5973c55863b4112e708a6f408bad7a138647ca72283afe - languageName: node - linkType: hard - "acorn-jsx@npm:^5.3.1, acorn-jsx@npm:^5.3.2": version: 5.3.2 resolution: "acorn-jsx@npm:5.3.2" @@ -4445,12 +4433,12 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.2.4, acorn@npm:^8.5.0, acorn@npm:^8.7.1, acorn@npm:^8.8.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0": - version: 8.11.3 - resolution: "acorn@npm:8.11.3" +"acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.14.0, acorn@npm:^8.2.4, acorn@npm:^8.5.0, acorn@npm:^8.8.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0": + version: 8.14.0 + resolution: "acorn@npm:8.14.0" bin: acorn: bin/acorn - checksum: 10c0/3ff155f8812e4a746fee8ecff1f227d527c4c45655bb1fad6347c3cb58e46190598217551b1500f18542d2bbe5c87120cb6927f5a074a59166fbdd9468f0a299 + checksum: 10c0/6d4ee461a7734b2f48836ee0fbb752903606e576cc100eb49340295129ca0b452f3ba91ddd4424a1d4406a98adfb2ebb6bd0ff4c49d7a0930c10e462719bbfd7 languageName: node linkType: hard @@ -4538,6 +4526,20 @@ __metadata: languageName: node linkType: hard +"ajv-formats@npm:^3.0.1": + version: 3.0.1 + resolution: "ajv-formats@npm:3.0.1" + dependencies: + ajv: "npm:^8.0.0" + peerDependencies: + ajv: ^8.0.0 + peerDependenciesMeta: + ajv: + optional: true + checksum: 10c0/168d6bca1ea9f163b41c8147bae537e67bd963357a5488a1eaf3abe8baa8eec806d4e45f15b10767e6020679315c7e1e5e6803088dfb84efa2b4e9353b83dd0a + languageName: node + linkType: hard + "ajv-keywords@npm:^3.1.0, ajv-keywords@npm:^3.4.1, ajv-keywords@npm:^3.5.2": version: 3.5.2 resolution: "ajv-keywords@npm:3.5.2" @@ -4558,7 +4560,7 @@ __metadata: languageName: node linkType: hard -"ajv@npm:^6.1.0, ajv@npm:^6.10.0, ajv@npm:^6.10.2, ajv@npm:^6.11.0, ajv@npm:^6.12.4, ajv@npm:^6.12.5, ajv@npm:^6.12.6": +"ajv@npm:^6.1.0, ajv@npm:^6.10.0, ajv@npm:^6.10.2, ajv@npm:^6.12.4, ajv@npm:^6.12.5": version: 6.12.6 resolution: "ajv@npm:6.12.6" dependencies: @@ -4570,27 +4572,15 @@ __metadata: languageName: node linkType: hard -"ajv@npm:^8.0.0, ajv@npm:^8.1.0, ajv@npm:^8.9.0": - version: 8.12.0 - resolution: "ajv@npm:8.12.0" - dependencies: - fast-deep-equal: "npm:^3.1.1" - json-schema-traverse: "npm:^1.0.0" - require-from-string: "npm:^2.0.2" - uri-js: "npm:^4.2.2" - checksum: 10c0/ac4f72adf727ee425e049bc9d8b31d4a57e1c90da8d28bcd23d60781b12fcd6fc3d68db5df16994c57b78b94eed7988f5a6b482fd376dc5b084125e20a0a622e - languageName: node - linkType: hard - -"ajv@npm:^8.0.1": - version: 8.13.0 - resolution: "ajv@npm:8.13.0" +"ajv@npm:^8.0.0, ajv@npm:^8.0.1, ajv@npm:^8.12.0, ajv@npm:^8.9.0": + version: 8.17.1 + resolution: "ajv@npm:8.17.1" dependencies: fast-deep-equal: "npm:^3.1.3" + fast-uri: "npm:^3.0.1" json-schema-traverse: "npm:^1.0.0" require-from-string: "npm:^2.0.2" - uri-js: "npm:^4.4.1" - checksum: 10c0/14c6497b6f72843986d7344175a1aa0e2c35b1e7f7475e55bc582cddb765fca7e6bf950f465dc7846f817776d9541b706f4b5b3fbedd8dfdeb5fce6f22864264 + checksum: 10c0/ec3ba10a573c6b60f94639ffc53526275917a2df6810e4ab5a6b959d87459f9ef3f00d5e7865b82677cb7d21590355b34da14d1d0b9c32d75f95a187e76fff35 languageName: node linkType: hard @@ -4727,13 +4717,6 @@ __metadata: languageName: node linkType: hard -"archy@npm:^1.0.0": - version: 1.0.0 - resolution: "archy@npm:1.0.0" - checksum: 10c0/200c849dd1c304ea9914827b0555e7e1e90982302d574153e28637db1a663c53de62bad96df42d50e8ce7fc18d05e3437d9aa8c4b383803763755f0956c7d308 - languageName: node - linkType: hard - "are-we-there-yet@npm:^3.0.0": version: 3.0.1 resolution: "are-we-there-yet@npm:3.0.1" @@ -5118,15 +5101,13 @@ __metadata: languageName: node linkType: hard -"avvio@npm:^7.1.2": - version: 7.2.5 - resolution: "avvio@npm:7.2.5" +"avvio@npm:^9.0.0": + version: 9.1.0 + resolution: "avvio@npm:9.1.0" dependencies: - archy: "npm:^1.0.0" - debug: "npm:^4.0.0" - fastq: "npm:^1.6.1" - queue-microtask: "npm:^1.1.2" - checksum: 10c0/20ca0bf216647ff09ebaa9f206cd55dbe768a72b915ad41e517223ed4595ab7ec72eeff99a5da88d47a7ecc53002424d2b4c68b09559e3ab918c296ced5100d8 + "@fastify/error": "npm:^4.0.0" + fastq: "npm:^1.17.1" + checksum: 10c0/bdc294a7e8f38e1e21f9d338d97d7240025db54f1005fc419cfe0499a35edf2276ab1fe91135739faa3a9437358ec6912d5a56f23361b061880333cb4f1c7884 languageName: node linkType: hard @@ -5137,14 +5118,14 @@ __metadata: languageName: node linkType: hard -"axios@npm:^1.6.8": - version: 1.6.8 - resolution: "axios@npm:1.6.8" +"axios@npm:^1.7.7": + version: 1.7.7 + resolution: "axios@npm:1.7.7" dependencies: follow-redirects: "npm:^1.15.6" form-data: "npm:^4.0.0" proxy-from-env: "npm:^1.1.0" - checksum: 10c0/0f22da6f490335479a89878bc7d5a1419484fbb437b564a80c34888fc36759ae4f56ea28d55a191695e5ed327f0bad56e7ff60fb6770c14d1be6501505d47ab9 + checksum: 10c0/4499efc89e86b0b49ffddc018798de05fab26e3bf57913818266be73279a6418c3ce8f9e934c7d2d707ab8c095e837fc6c90608fb7715b94d357720b5f568af7 languageName: node linkType: hard @@ -5735,17 +5716,17 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:^4.0.0, browserslist@npm:^4.12.0, browserslist@npm:^4.21.10, browserslist@npm:^4.22.2, browserslist@npm:^4.23.0, browserslist@npm:^4.6.2, browserslist@npm:^4.6.4": - version: 4.23.0 - resolution: "browserslist@npm:4.23.0" +"browserslist@npm:^4.0.0, browserslist@npm:^4.12.0, browserslist@npm:^4.22.2, browserslist@npm:^4.23.0, browserslist@npm:^4.24.0, browserslist@npm:^4.6.2, browserslist@npm:^4.6.4": + version: 4.24.2 + resolution: "browserslist@npm:4.24.2" dependencies: - caniuse-lite: "npm:^1.0.30001587" - electron-to-chromium: "npm:^1.4.668" - node-releases: "npm:^2.0.14" - update-browserslist-db: "npm:^1.0.13" + caniuse-lite: "npm:^1.0.30001669" + electron-to-chromium: "npm:^1.5.41" + node-releases: "npm:^2.0.18" + update-browserslist-db: "npm:^1.1.1" bin: browserslist: cli.js - checksum: 10c0/8e9cc154529062128d02a7af4d8adeead83ca1df8cd9ee65a88e2161039f3d68a4d40fea7353cab6bae4c16182dec2fdd9a1cf7dc2a2935498cee1af0e998943 + checksum: 10c0/d747c9fb65ed7b4f1abcae4959405707ed9a7b835639f8a9ba0da2911995a6ab9b0648fd05baf2a4d4e3cf7f9fdbad56d3753f91881e365992c1d49c8d88ff7a languageName: node linkType: hard @@ -6020,17 +6001,10 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30000981, caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001125": - version: 1.0.30001617 - resolution: "caniuse-lite@npm:1.0.30001617" - checksum: 10c0/711702501063968b2807d1a8f40981e66f45eb8962968b4b84c70392dc804cee62845e8e391e9749f78ff41ca48be2a4a7a38620c44af526b5e03bc3c7a1bc0a - languageName: node - linkType: hard - -"caniuse-lite@npm:^1.0.30001587": - version: 1.0.30001605 - resolution: "caniuse-lite@npm:1.0.30001605" - checksum: 10c0/ceb96a0ecfdaee6510c00aebaaa63db20aaeafab03450d4e3b214e009cb632f87385a70c299cdd1ca4c17e1473883d8fa2051c5b2d083a454338c0c779b25cbc +"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30000981, caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001125, caniuse-lite@npm:^1.0.30001669": + version: 1.0.30001677 + resolution: "caniuse-lite@npm:1.0.30001677" + checksum: 10c0/22b4aa738b213b5d0bc820c26ba23fa265ca90a5c59776e1a686b9ab6fff9120d0825fd920c0a601a4b65056ef40d01548405feb95c8dd6083255f50c71a0864 languageName: node linkType: hard @@ -6126,25 +6100,6 @@ __metadata: languageName: node linkType: hard -"chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.4.1": - version: 3.6.0 - resolution: "chokidar@npm:3.6.0" - dependencies: - anymatch: "npm:~3.1.2" - braces: "npm:~3.0.2" - fsevents: "npm:~2.3.2" - glob-parent: "npm:~5.1.2" - is-binary-path: "npm:~2.1.0" - is-glob: "npm:~4.0.1" - normalize-path: "npm:~3.0.0" - readdirp: "npm:~3.6.0" - dependenciesMeta: - fsevents: - optional: true - checksum: 10c0/8361dcd013f2ddbe260eacb1f3cb2f2c6f2b0ad118708a343a5ed8158941a39cb8fb1d272e0f389712e74ee90ce8ba864eece9e0e62b9705cb468a2f6d917462 - languageName: node - linkType: hard - "chokidar@npm:^2.1.8": version: 2.1.8 resolution: "chokidar@npm:2.1.8" @@ -6168,6 +6123,34 @@ __metadata: languageName: node linkType: hard +"chokidar@npm:^3.4.1": + version: 3.6.0 + resolution: "chokidar@npm:3.6.0" + dependencies: + anymatch: "npm:~3.1.2" + braces: "npm:~3.0.2" + fsevents: "npm:~2.3.2" + glob-parent: "npm:~5.1.2" + is-binary-path: "npm:~2.1.0" + is-glob: "npm:~4.0.1" + normalize-path: "npm:~3.0.0" + readdirp: "npm:~3.6.0" + dependenciesMeta: + fsevents: + optional: true + checksum: 10c0/8361dcd013f2ddbe260eacb1f3cb2f2c6f2b0ad118708a343a5ed8158941a39cb8fb1d272e0f389712e74ee90ce8ba864eece9e0e62b9705cb468a2f6d917462 + languageName: node + linkType: hard + +"chokidar@npm:^4.0.0": + version: 4.0.1 + resolution: "chokidar@npm:4.0.1" + dependencies: + readdirp: "npm:^4.0.1" + checksum: 10c0/4bb7a3adc304059810bb6c420c43261a15bb44f610d77c35547addc84faa0374265c3adc67f25d06f363d9a4571962b02679268c40de07676d260de1986efea9 + languageName: node + linkType: hard + "chownr@npm:^1.1.1": version: 1.1.4 resolution: "chownr@npm:1.1.4" @@ -6577,7 +6560,7 @@ __metadata: languageName: node linkType: hard -"content-disposition@npm:0.5.4, content-disposition@npm:^0.5.3": +"content-disposition@npm:0.5.4, content-disposition@npm:^0.5.4": version: 0.5.4 resolution: "content-disposition@npm:0.5.4" dependencies: @@ -6637,10 +6620,10 @@ __metadata: languageName: node linkType: hard -"cookie@npm:^0.5.0": - version: 0.5.0 - resolution: "cookie@npm:0.5.0" - checksum: 10c0/c01ca3ef8d7b8187bae434434582288681273b5a9ed27521d4d7f9f7928fe0c920df0decd9f9d3bbd2d14ac432b8c8cf42b98b3bdd5bfe0e6edddeebebe8b61d +"cookie@npm:^1.0.1": + version: 1.0.1 + resolution: "cookie@npm:1.0.1" + checksum: 10c0/80afdcad7fe9cab7a0ea1802629f6f4cf9ff957e9489daa7a813e3ac4ca842b0e5ab3f8e6a6ddc1f3f5c771b81c229afd6f0f3c083025d68c48d214ea8fb1097 languageName: node linkType: hard @@ -6688,17 +6671,10 @@ __metadata: languageName: node linkType: hard -"core-js@npm:^3.36.1": - version: 3.36.1 - resolution: "core-js@npm:3.36.1" - checksum: 10c0/4f0ad2464535d809ba659226feca15bff14b9b5452518bddff8d81b9c94b0227b3027d9838f22f1dce664958acb4107b935cc0037695ae545edc2a303bca98bf - languageName: node - linkType: hard - -"core-js@npm:^3.6.5": - version: 3.37.0 - resolution: "core-js@npm:3.37.0" - checksum: 10c0/7e00331f346318ca3f595c08ce9e74ddae744715aef137486c1399163afd79792fb94c3161280863adfdc3e30f8026912d56bd3036f93cacfc689d33e185f2ee +"core-js@npm:^3.39.0, core-js@npm:^3.6.5": + version: 3.39.0 + resolution: "core-js@npm:3.39.0" + checksum: 10c0/f7602069b6afb2e3298eec612a5c1e0c3e6a458930fbfc7a4c5f9ac03426507f49ce395eecdd2d9bae9024f820e44582b67ffe16f2272395af26964f174eeb6b languageName: node linkType: hard @@ -6900,27 +6876,27 @@ __metadata: languageName: node linkType: hard -"css-loader@npm:^6.10.0": - version: 6.10.0 - resolution: "css-loader@npm:6.10.0" +"css-loader@npm:^7.1.2": + version: 7.1.2 + resolution: "css-loader@npm:7.1.2" dependencies: icss-utils: "npm:^5.1.0" postcss: "npm:^8.4.33" - postcss-modules-extract-imports: "npm:^3.0.0" - postcss-modules-local-by-default: "npm:^4.0.4" - postcss-modules-scope: "npm:^3.1.1" + postcss-modules-extract-imports: "npm:^3.1.0" + postcss-modules-local-by-default: "npm:^4.0.5" + postcss-modules-scope: "npm:^3.2.0" postcss-modules-values: "npm:^4.0.0" postcss-value-parser: "npm:^4.2.0" semver: "npm:^7.5.4" peerDependencies: "@rspack/core": 0.x || 1.x - webpack: ^5.0.0 + webpack: ^5.27.0 peerDependenciesMeta: "@rspack/core": optional: true webpack: optional: true - checksum: 10c0/acadd2a93f505bf8a8d1c6912a476ef953585f195412b6aa1f2581053bcce8563b833f2a6666c1e1521f4b35fb315176563495a38933becc89e3143cfa7dce45 + checksum: 10c0/edec9ed71e3c416c9c6ad41c138834c94baf7629de3b97a3337ae8cec4a45e05c57bdb7c4b4d267229fc04b8970d0d1c0734ded8dcd0ac8c7c286b36facdbbf0 languageName: node linkType: hard @@ -7164,12 +7140,12 @@ __metadata: languageName: node linkType: hard -"cssstyle@npm:^3.0.0": - version: 3.0.0 - resolution: "cssstyle@npm:3.0.0" +"cssstyle@npm:^4.1.0": + version: 4.1.0 + resolution: "cssstyle@npm:4.1.0" dependencies: - rrweb-cssom: "npm:^0.6.0" - checksum: 10c0/23acee092c1cec670fb7b8110e48abd740dc4e574d3b74848743067cb3377a86a1f64cf02606aabd7bb153785e68c2c1e09ce53295ddf7a4b470b3c7c55ec807 + rrweb-cssom: "npm:^0.7.1" + checksum: 10c0/05c6597e5d3e0ec6b15221f2c0ce9a0443a46cc50a6089a3ba9ee1ac27f83ff86a445a8f95435137dadd859f091fc61b6d342abaf396d3c910471b5b33cfcbfa languageName: node linkType: hard @@ -7233,14 +7209,13 @@ __metadata: languageName: node linkType: hard -"data-urls@npm:^4.0.0": - version: 4.0.0 - resolution: "data-urls@npm:4.0.0" +"data-urls@npm:^5.0.0": + version: 5.0.0 + resolution: "data-urls@npm:5.0.0" dependencies: - abab: "npm:^2.0.6" - whatwg-mimetype: "npm:^3.0.0" - whatwg-url: "npm:^12.0.0" - checksum: 10c0/928d9a21db31d3dcee125d514fddfeb88067c348b1225e9d2c6ca55db16e1cbe49bf58c092cae7163de958f415fd5c612c2aef2eef87896e097656fce205d766 + whatwg-mimetype: "npm:^4.0.0" + whatwg-url: "npm:^14.0.0" + checksum: 10c0/1b894d7d41c861f3a4ed2ae9b1c3f0909d4575ada02e36d3d3bc584bdd84278e20709070c79c3b3bff7ac98598cb191eb3e86a89a79ea4ee1ef360e1694f92ad languageName: node linkType: hard @@ -7277,10 +7252,10 @@ __metadata: languageName: node linkType: hard -"dateformat@npm:^4.6.3": - version: 4.6.3 - resolution: "dateformat@npm:4.6.3" - checksum: 10c0/e2023b905e8cfe2eb8444fb558562b524807a51cdfe712570f360f873271600b5c94aebffaf11efb285e2c072264a7cf243eadb68f3eba0f8cc85fb86cd25df6 +"dateformat@npm:^5.0.3": + version: 5.0.3 + resolution: "dateformat@npm:5.0.3" + checksum: 10c0/ccc7a5351080f7ae00496e246ed4d3afdba770f9a8267348d0d04387e23414ef219d9bb6f273a6d628c0ff5f0255ab75977d668dc7ab066b916a196950bdde9a languageName: node linkType: hard @@ -7300,7 +7275,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": +"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": version: 4.3.4 resolution: "debug@npm:4.3.4" dependencies: @@ -7516,6 +7491,15 @@ __metadata: languageName: node linkType: hard +"detect-libc@npm:^1.0.3": + version: 1.0.3 + resolution: "detect-libc@npm:1.0.3" + bin: + detect-libc: ./bin/detect-libc.js + checksum: 10c0/4da0deae9f69e13bc37a0902d78bf7169480004b1fed3c19722d56cff578d16f0e11633b7fbf5fb6249181236c72e90024cbd68f0b9558ae06e281f47326d50d + languageName: node + linkType: hard + "detect-newline@npm:^3.0.0": version: 3.1.0 resolution: "detect-newline@npm:3.1.0" @@ -7706,10 +7690,10 @@ __metadata: languageName: node linkType: hard -"dompurify@npm:^2.4.9": - version: 2.4.9 - resolution: "dompurify@npm:2.4.9" - checksum: 10c0/cb847f5eacd9ff326dfc4566875709d050dc78c58837cc3afb83386992f6e7002295358cb9f75d66a9b638fe6da71b7d02ffa82f121713f78f7f3891394dece8 +"dompurify@npm:^2.5.7": + version: 2.5.7 + resolution: "dompurify@npm:2.5.7" + checksum: 10c0/23c4f737182fcf3e731e458c3930ef4d2916191e4180e1e345f153124dfa7ec117d2810af1754e8854c581131fc75dac914a8391183d1511852ef32b4055f711 languageName: node linkType: hard @@ -7807,17 +7791,10 @@ __metadata: languageName: node linkType: hard -"electron-to-chromium@npm:^1.3.564": - version: 1.4.763 - resolution: "electron-to-chromium@npm:1.4.763" - checksum: 10c0/8787092e2c237699d145860564635391eb856febad3d2ab171a12c671788d1aee323a42822daf0fc8ee49d615b85776470c97ecf212edeb64794f1ffc171f842 - languageName: node - linkType: hard - -"electron-to-chromium@npm:^1.4.668": - version: 1.4.724 - resolution: "electron-to-chromium@npm:1.4.724" - checksum: 10c0/bc7a3f153d952325bac09c1e67325bfc6d686130541550d1b7429cf72a1202256eed09299c4d8010684aa3683332336f05324acf03bc0be7c7060f4e0820c267 +"electron-to-chromium@npm:^1.3.564, electron-to-chromium@npm:^1.5.41": + version: 1.5.52 + resolution: "electron-to-chromium@npm:1.5.52" + checksum: 10c0/1c85a5710ad21758780b8e067d5f63ed00416dbe93f64bd8937dbfb4ed98cf93d80c471a30daed439cb91a00ff4942ea2628e00a69d56639cc7070e9e8ab2694 languageName: node linkType: hard @@ -7914,13 +7891,13 @@ __metadata: languageName: node linkType: hard -"enhanced-resolve@npm:^5.16.0": - version: 5.16.0 - resolution: "enhanced-resolve@npm:5.16.0" +"enhanced-resolve@npm:^5.17.1": + version: 5.17.1 + resolution: "enhanced-resolve@npm:5.17.1" dependencies: graceful-fs: "npm:^4.2.4" tapable: "npm:^2.2.0" - checksum: 10c0/dd69669cbb638ccacefd03e04d5e195ee6a99b7f5f8012f86d2df7781834de357923e06064ea621137c4ce0b37cc12b872b4e6d1ac6ab15fe98e7f1dfbbb08c4 + checksum: 10c0/81a0515675eca17efdba2cf5bad87abc91a528fc1191aad50e275e74f045b41506167d420099022da7181c8d787170ea41e4a11a0b10b7a16f6237daecb15370 languageName: node linkType: hard @@ -8071,41 +8048,19 @@ __metadata: linkType: hard "es-errors@npm:^1.1.0, es-errors@npm:^1.2.1, es-errors@npm:^1.3.0": - version: 1.3.0 - resolution: "es-errors@npm:1.3.0" - checksum: 10c0/0a61325670072f98d8ae3b914edab3559b6caa980f08054a3b872052640d91da01d38df55df797fcc916389d77fc92b8d5906cf028f4db46d7e3003abecbca85 - languageName: node - linkType: hard - -"es-iterator-helpers@npm:^1.0.15": - version: 1.0.19 - resolution: "es-iterator-helpers@npm:1.0.19" - dependencies: - call-bind: "npm:^1.0.7" - define-properties: "npm:^1.2.1" - es-abstract: "npm:^1.23.3" - es-errors: "npm:^1.3.0" - es-set-tostringtag: "npm:^2.0.3" - function-bind: "npm:^1.1.2" - get-intrinsic: "npm:^1.2.4" - globalthis: "npm:^1.0.3" - has-property-descriptors: "npm:^1.0.2" - has-proto: "npm:^1.0.3" - has-symbols: "npm:^1.0.3" - internal-slot: "npm:^1.0.7" - iterator.prototype: "npm:^1.1.2" - safe-array-concat: "npm:^1.1.2" - checksum: 10c0/ae8f0241e383b3d197383b9842c48def7fce0255fb6ed049311b686ce295595d9e389b466f6a1b7d4e7bb92d82f5e716d6fae55e20c1040249bf976743b038c5 + version: 1.3.0 + resolution: "es-errors@npm:1.3.0" + checksum: 10c0/0a61325670072f98d8ae3b914edab3559b6caa980f08054a3b872052640d91da01d38df55df797fcc916389d77fc92b8d5906cf028f4db46d7e3003abecbca85 languageName: node linkType: hard -"es-iterator-helpers@npm:^1.0.17": - version: 1.0.18 - resolution: "es-iterator-helpers@npm:1.0.18" +"es-iterator-helpers@npm:^1.0.15, es-iterator-helpers@npm:^1.0.17": + version: 1.0.19 + resolution: "es-iterator-helpers@npm:1.0.19" dependencies: call-bind: "npm:^1.0.7" define-properties: "npm:^1.2.1" - es-abstract: "npm:^1.23.0" + es-abstract: "npm:^1.23.3" es-errors: "npm:^1.3.0" es-set-tostringtag: "npm:^2.0.3" function-bind: "npm:^1.1.2" @@ -8117,7 +8072,7 @@ __metadata: internal-slot: "npm:^1.0.7" iterator.prototype: "npm:^1.1.2" safe-array-concat: "npm:^1.1.2" - checksum: 10c0/93be402e01fa3d8bf62fcadd2fb3055126ffcfe8846911b10b85918ef46775252696c84e6191ec8125bedb61e92242ad1a54a86118436ba19814720cb9ff4aed + checksum: 10c0/ae8f0241e383b3d197383b9842c48def7fce0255fb6ed049311b686ce295595d9e389b466f6a1b7d4e7bb92d82f5e716d6fae55e20c1040249bf976743b038c5 languageName: node linkType: hard @@ -8213,47 +8168,47 @@ __metadata: languageName: node linkType: hard -"esbuild-loader@npm:^4.1.0": - version: 4.1.0 - resolution: "esbuild-loader@npm:4.1.0" +"esbuild-loader@npm:^4.2.2": + version: 4.2.2 + resolution: "esbuild-loader@npm:4.2.2" dependencies: - esbuild: "npm:^0.20.0" + esbuild: "npm:^0.21.0" get-tsconfig: "npm:^4.7.0" loader-utils: "npm:^2.0.4" webpack-sources: "npm:^1.4.3" peerDependencies: webpack: ^4.40.0 || ^5.0.0 - checksum: 10c0/6752f48a88c85524ef316b5c7251e44f206da7aac4c63a02e8b4e8ff915d7215a7713710d41575dc749d0ac56cb0becf3f5b2cf543df875f4027b6009d73d7bc - languageName: node - linkType: hard - -"esbuild@npm:^0.20.0": - version: 0.20.2 - resolution: "esbuild@npm:0.20.2" - dependencies: - "@esbuild/aix-ppc64": "npm:0.20.2" - "@esbuild/android-arm": "npm:0.20.2" - "@esbuild/android-arm64": "npm:0.20.2" - "@esbuild/android-x64": "npm:0.20.2" - "@esbuild/darwin-arm64": "npm:0.20.2" - "@esbuild/darwin-x64": "npm:0.20.2" - "@esbuild/freebsd-arm64": "npm:0.20.2" - "@esbuild/freebsd-x64": "npm:0.20.2" - "@esbuild/linux-arm": "npm:0.20.2" - "@esbuild/linux-arm64": "npm:0.20.2" - "@esbuild/linux-ia32": "npm:0.20.2" - "@esbuild/linux-loong64": "npm:0.20.2" - "@esbuild/linux-mips64el": "npm:0.20.2" - "@esbuild/linux-ppc64": "npm:0.20.2" - "@esbuild/linux-riscv64": "npm:0.20.2" - "@esbuild/linux-s390x": "npm:0.20.2" - "@esbuild/linux-x64": "npm:0.20.2" - "@esbuild/netbsd-x64": "npm:0.20.2" - "@esbuild/openbsd-x64": "npm:0.20.2" - "@esbuild/sunos-x64": "npm:0.20.2" - "@esbuild/win32-arm64": "npm:0.20.2" - "@esbuild/win32-ia32": "npm:0.20.2" - "@esbuild/win32-x64": "npm:0.20.2" + checksum: 10c0/be15346c570c02a7f4caa6c59bf57287eee9b5e37f34b0275507d3fea4d7c67e7e773b4a5bed1cd2e1a94e66bd650454471a3d0de769dfef57e104ef211ea3d4 + languageName: node + linkType: hard + +"esbuild@npm:^0.21.0": + version: 0.21.5 + resolution: "esbuild@npm:0.21.5" + dependencies: + "@esbuild/aix-ppc64": "npm:0.21.5" + "@esbuild/android-arm": "npm:0.21.5" + "@esbuild/android-arm64": "npm:0.21.5" + "@esbuild/android-x64": "npm:0.21.5" + "@esbuild/darwin-arm64": "npm:0.21.5" + "@esbuild/darwin-x64": "npm:0.21.5" + "@esbuild/freebsd-arm64": "npm:0.21.5" + "@esbuild/freebsd-x64": "npm:0.21.5" + "@esbuild/linux-arm": "npm:0.21.5" + "@esbuild/linux-arm64": "npm:0.21.5" + "@esbuild/linux-ia32": "npm:0.21.5" + "@esbuild/linux-loong64": "npm:0.21.5" + "@esbuild/linux-mips64el": "npm:0.21.5" + "@esbuild/linux-ppc64": "npm:0.21.5" + "@esbuild/linux-riscv64": "npm:0.21.5" + "@esbuild/linux-s390x": "npm:0.21.5" + "@esbuild/linux-x64": "npm:0.21.5" + "@esbuild/netbsd-x64": "npm:0.21.5" + "@esbuild/openbsd-x64": "npm:0.21.5" + "@esbuild/sunos-x64": "npm:0.21.5" + "@esbuild/win32-arm64": "npm:0.21.5" + "@esbuild/win32-ia32": "npm:0.21.5" + "@esbuild/win32-x64": "npm:0.21.5" dependenciesMeta: "@esbuild/aix-ppc64": optional: true @@ -8303,14 +8258,14 @@ __metadata: optional: true bin: esbuild: bin/esbuild - checksum: 10c0/66398f9fb2c65e456a3e649747b39af8a001e47963b25e86d9c09d2a48d61aa641b27da0ce5cad63df95ad246105e1d83e7fee0e1e22a0663def73b1c5101112 + checksum: 10c0/fa08508adf683c3f399e8a014a6382a6b65542213431e26206c0720e536b31c09b50798747c2a105a4bbba1d9767b8d3615a74c2f7bf1ddf6d836cd11eb672de languageName: node linkType: hard -"escalade@npm:^3.0.2, escalade@npm:^3.1.1": - version: 3.1.2 - resolution: "escalade@npm:3.1.2" - checksum: 10c0/6b4adafecd0682f3aa1cd1106b8fff30e492c7015b178bc81b2d2f75106dabea6c6d6e8508fc491bd58e597c74abb0e8e2368f943ecb9393d4162e3c2f3cf287 +"escalade@npm:^3.0.2, escalade@npm:^3.1.1, escalade@npm:^3.2.0": + version: 3.2.0 + resolution: "escalade@npm:3.2.0" + checksum: 10c0/ced4dd3a78e15897ed3be74e635110bbf3b08877b0a41be50dcb325ee0e0b5f65fc2d50e9845194d7c4633f327e2e1c6cce00a71b617c5673df0374201d67f65 languageName: node linkType: hard @@ -9165,13 +9120,6 @@ __metadata: languageName: node linkType: hard -"fast-content-type-parse@npm:^1.0.0": - version: 1.1.0 - resolution: "fast-content-type-parse@npm:1.1.0" - checksum: 10c0/882bf990fa5d64be1825ce183818db43900ece0d7ef184cb9409bae8ed1001acbe536a657b1496382cb3e308e71ab39cc399bbdae70cba1745eecaeca4e55384 - languageName: node - linkType: hard - "fast-decode-uri-component@npm:^1.0.1": version: 1.0.1 resolution: "fast-decode-uri-component@npm:1.0.1" @@ -9186,7 +9134,7 @@ __metadata: languageName: node linkType: hard -"fast-glob@npm:^3.1.1, fast-glob@npm:^3.2.9": +"fast-glob@npm:^3.1.1, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.2": version: 3.3.2 resolution: "fast-glob@npm:3.3.2" dependencies: @@ -9206,15 +9154,18 @@ __metadata: languageName: node linkType: hard -"fast-json-stringify@npm:^2.5.2": - version: 2.7.13 - resolution: "fast-json-stringify@npm:2.7.13" +"fast-json-stringify@npm:^6.0.0": + version: 6.0.0 + resolution: "fast-json-stringify@npm:6.0.0" dependencies: - ajv: "npm:^6.11.0" - deepmerge: "npm:^4.2.2" + "@fastify/merge-json-schemas": "npm:^0.1.1" + ajv: "npm:^8.12.0" + ajv-formats: "npm:^3.0.1" + fast-deep-equal: "npm:^3.1.3" + fast-uri: "npm:^2.3.0" + json-schema-ref-resolver: "npm:^1.0.1" rfdc: "npm:^1.2.0" - string-similarity: "npm:^4.0.1" - checksum: 10c0/9c63e9e575bd75153afe456bd5c1d8afbfade79c79578f89fc0b8d599cdd65f3e731c826241caf472e11a915e6351a4c4c3f8295096be3fb01a79d2dbbbb22ed + checksum: 10c0/590bbb284df45972822773ebc41c8592c412cc8c2d123d43a41579c9972ff8004d1aea7d0c7cffaebf246ee28be964d605ad9d52bb96c26d8dc5fa4e225c1998 languageName: node linkType: hard @@ -9225,17 +9176,33 @@ __metadata: languageName: node linkType: hard -"fast-redact@npm:^3.0.0": +"fast-querystring@npm:^1.0.0": + version: 1.1.2 + resolution: "fast-querystring@npm:1.1.2" + dependencies: + fast-decode-uri-component: "npm:^1.0.1" + checksum: 10c0/e8223273a9b199722f760f5a047a77ad049a14bd444b821502cb8218f5925e3a5fffb56b64389bca73ab2ac6f1aa7aebbe4e203e5f6e53ff5978de97c0fde4e3 + languageName: node + linkType: hard + +"fast-redact@npm:^3.1.1": version: 3.5.0 resolution: "fast-redact@npm:3.5.0" checksum: 10c0/7e2ce4aad6e7535e0775bf12bd3e4f2e53d8051d8b630e0fa9e67f68cb0b0e6070d2f7a94b1d0522ef07e32f7c7cda5755e2b677a6538f1e9070ca053c42343a languageName: node linkType: hard -"fast-safe-stringify@npm:^2.0.8": - version: 2.1.1 - resolution: "fast-safe-stringify@npm:2.1.1" - checksum: 10c0/d90ec1c963394919828872f21edaa3ad6f1dddd288d2bd4e977027afff09f5db40f94e39536d4646f7e01761d704d72d51dce5af1b93717f3489ef808f5f4e4d +"fast-uri@npm:^2.3.0": + version: 2.4.0 + resolution: "fast-uri@npm:2.4.0" + checksum: 10c0/300453cfe2f7d5ec16be0f2c8dc5b280edbaca59440b2deb4ab56ac0f584637179e9ee7539d0b70ef0fce9608245ebfa75307c84fa4829b1065c3b7ef7dcf706 + languageName: node + linkType: hard + +"fast-uri@npm:^3.0.0, fast-uri@npm:^3.0.1": + version: 3.0.3 + resolution: "fast-uri@npm:3.0.3" + checksum: 10c0/4b2c5ce681a062425eae4f15cdc8fc151fd310b2f69b1f96680677820a8b49c3cd6e80661a406e19d50f0c40a3f8bffdd458791baf66f4a879d80be28e10a320 languageName: node linkType: hard @@ -9246,38 +9213,37 @@ __metadata: languageName: node linkType: hard -"fastify-plugin@npm:^4.0.0": - version: 4.5.1 - resolution: "fastify-plugin@npm:4.5.1" - checksum: 10c0/f58f79cd9d3c88fd7f79a3270276c6339fc57bbe72ef14d20b73779193c404e317ac18e8eae2c5071b3909ebee45d7eb6871da4e65464ac64ed0d9746b4e9b9f +"fastify-plugin@npm:^5.0.0": + version: 5.0.1 + resolution: "fastify-plugin@npm:5.0.1" + checksum: 10c0/c5e5932e7b8c5713ff881adeade3e8ee8fc288e8249d79cd193a2a2438eef1ad58ae5814f12835acbf04025dbddf2628787cd845f3e550dee847f494a08f7c5b languageName: node linkType: hard -"fastify@npm:^3.29.5": - version: 3.29.5 - resolution: "fastify@npm:3.29.5" - dependencies: - "@fastify/ajv-compiler": "npm:^1.0.0" - "@fastify/error": "npm:^2.0.0" - abstract-logging: "npm:^2.0.0" - avvio: "npm:^7.1.2" - fast-content-type-parse: "npm:^1.0.0" - fast-json-stringify: "npm:^2.5.2" - find-my-way: "npm:^4.5.0" - flatstr: "npm:^1.0.12" - light-my-request: "npm:^4.2.0" - pino: "npm:^6.13.0" - process-warning: "npm:^1.0.0" +"fastify@npm:^5.1.0": + version: 5.1.0 + resolution: "fastify@npm:5.1.0" + dependencies: + "@fastify/ajv-compiler": "npm:^4.0.0" + "@fastify/error": "npm:^4.0.0" + "@fastify/fast-json-stringify-compiler": "npm:^5.0.0" + abstract-logging: "npm:^2.0.1" + avvio: "npm:^9.0.0" + fast-json-stringify: "npm:^6.0.0" + find-my-way: "npm:^9.0.0" + light-my-request: "npm:^6.0.0" + pino: "npm:^9.0.0" + process-warning: "npm:^4.0.0" proxy-addr: "npm:^2.0.7" - rfdc: "npm:^1.1.4" - secure-json-parse: "npm:^2.0.0" - semver: "npm:^7.3.2" - tiny-lru: "npm:^8.0.1" - checksum: 10c0/83a4850c38b1ac8934eff07030f2d0b5ed37b190cbaf05d22b3ca93f00e4735dfe62e48f183bcc5af76b6697512a32e692e6e1765cf51c69819216629f125b3b + rfdc: "npm:^1.3.1" + secure-json-parse: "npm:^2.7.0" + semver: "npm:^7.6.0" + toad-cache: "npm:^3.7.0" + checksum: 10c0/3c06e9a64d8458a1ece5d97d048c094a42600b58a92943e547bbe2ba0a97d79472943f99c372da038db4fad78805dfc14e49a74e39916f1b52cf966b2339599b languageName: node linkType: hard -"fastq@npm:^1.6.0, fastq@npm:^1.6.1": +"fastq@npm:^1.17.1, fastq@npm:^1.6.0": version: 1.17.1 resolution: "fastq@npm:1.17.1" dependencies: @@ -9431,15 +9397,14 @@ __metadata: languageName: node linkType: hard -"find-my-way@npm:^4.5.0": - version: 4.5.1 - resolution: "find-my-way@npm:4.5.1" +"find-my-way@npm:^9.0.0": + version: 9.1.0 + resolution: "find-my-way@npm:9.1.0" dependencies: - fast-decode-uri-component: "npm:^1.0.1" fast-deep-equal: "npm:^3.1.3" - safe-regex2: "npm:^2.0.0" - semver-store: "npm:^0.3.0" - checksum: 10c0/3e56f50befde96d4b0a0a8118bd7fe283184e54ed61ac359ce62e7229229ab8b4a5aebe02edfcc126f0b6eef38660b59347293d61752bc845aae823cace8042a + fast-querystring: "npm:^1.0.0" + safe-regex2: "npm:^4.0.0" + checksum: 10c0/ddde633673b512940f8d183c8684f1441d623464364f931af979a71baa0cb5b774ed574a80eaddba40fc605c7d35bc1c74c9469732eaf381a1c4a3e59611686f languageName: node linkType: hard @@ -9492,13 +9457,6 @@ __metadata: languageName: node linkType: hard -"flatstr@npm:^1.0.12": - version: 1.0.12 - resolution: "flatstr@npm:1.0.12" - checksum: 10c0/f99cf801fd3606e8b4aa96b93ec09caab42bc304526ff55a80db03db0ef73c9a014e983a6d72009c4f1bc50e2483d137041fae18a325dc0d851d045c4d6929a9 - languageName: node - linkType: hard - "flatted@npm:^3.2.9": version: 3.3.1 resolution: "flatted@npm:3.3.1" @@ -9925,17 +9883,34 @@ __metadata: linkType: hard "glob@npm:^10.2.2, glob@npm:^10.3.10": - version: 10.3.12 - resolution: "glob@npm:10.3.12" + version: 10.4.5 + resolution: "glob@npm:10.4.5" + dependencies: + foreground-child: "npm:^3.1.0" + jackspeak: "npm:^3.1.2" + minimatch: "npm:^9.0.4" + minipass: "npm:^7.1.2" + package-json-from-dist: "npm:^1.0.0" + path-scurry: "npm:^1.11.1" + bin: + glob: dist/esm/bin.mjs + checksum: 10c0/19a9759ea77b8e3ca0a43c2f07ecddc2ad46216b786bb8f993c445aee80d345925a21e5280c7b7c6c59e860a0154b84e4b2b60321fea92cd3c56b4a7489f160e + languageName: node + linkType: hard + +"glob@npm:^11.0.0": + version: 11.0.0 + resolution: "glob@npm:11.0.0" dependencies: foreground-child: "npm:^3.1.0" - jackspeak: "npm:^2.3.6" - minimatch: "npm:^9.0.1" - minipass: "npm:^7.0.4" - path-scurry: "npm:^1.10.2" + jackspeak: "npm:^4.0.1" + minimatch: "npm:^10.0.0" + minipass: "npm:^7.1.2" + package-json-from-dist: "npm:^1.0.0" + path-scurry: "npm:^2.0.0" bin: glob: dist/esm/bin.mjs - checksum: 10c0/f60cefdc1cf3f958b2bb5823e1b233727f04916d489dc4641d76914f016e6704421e06a83cbb68b0cb1cb9382298b7a88075b844ad2127fc9727ea22b18b0711 + checksum: 10c0/419866015d8795258a8ac51de5b9d1a99c72634fc3ead93338e4da388e89773ab21681e494eac0fbc4250b003451ca3110bb4f1c9393d15d14466270094fdb4e languageName: node linkType: hard @@ -10025,7 +10000,7 @@ __metadata: languageName: node linkType: hard -"globby@npm:^11.0.3, globby@npm:^11.1.0": +"globby@npm:^11.0.3": version: 11.1.0 resolution: "globby@npm:11.1.0" dependencies: @@ -10305,10 +10280,10 @@ __metadata: languageName: node linkType: hard -"highlight.js@npm:^11.9.0": - version: 11.9.0 - resolution: "highlight.js@npm:11.9.0" - checksum: 10c0/27cfa8717dc9d200aecbdb383eb122d5f45ce715d2f468583785d36fbfe5076ce033abb02486dc13b407171721cda6f474ed3f3a5a8e8c3d91367fa5f51ee374 +"highlight.js@npm:^11.10.0": + version: 11.10.0 + resolution: "highlight.js@npm:11.10.0" + checksum: 10c0/cd8bf7ef06cbd72ddb83580ecabe769f08f062be8bb82d2eb492d31c17f7480d1f8d14a66fc81deee0601645435f19f04c470510563f847242a41ccff0ab873e languageName: node linkType: hard @@ -10381,6 +10356,15 @@ __metadata: languageName: node linkType: hard +"html-encoding-sniffer@npm:^4.0.0": + version: 4.0.0 + resolution: "html-encoding-sniffer@npm:4.0.0" + dependencies: + whatwg-encoding: "npm:^3.1.1" + checksum: 10c0/523398055dc61ac9b34718a719cb4aa691e4166f29187e211e1607de63dc25ac7af52ca7c9aead0c4b3c0415ffecb17326396e1202e2e86ff4bca4c0ee4c6140 + languageName: node + linkType: hard + "html-entities@npm:^1.2.1, html-entities@npm:^1.3.1": version: 1.4.0 resolution: "html-entities@npm:1.4.0" @@ -10457,7 +10441,7 @@ __metadata: languageName: node linkType: hard -"http-errors@npm:2.0.0": +"http-errors@npm:2.0.0, http-errors@npm:^2.0.0": version: 2.0.0 resolution: "http-errors@npm:2.0.0" dependencies: @@ -10511,7 +10495,7 @@ __metadata: languageName: node linkType: hard -"http-proxy-agent@npm:^7.0.0": +"http-proxy-agent@npm:^7.0.0, http-proxy-agent@npm:^7.0.2": version: 7.0.2 resolution: "http-proxy-agent@npm:7.0.2" dependencies: @@ -10561,13 +10545,13 @@ __metadata: languageName: node linkType: hard -"https-proxy-agent@npm:^7.0.1": - version: 7.0.4 - resolution: "https-proxy-agent@npm:7.0.4" +"https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.5": + version: 7.0.5 + resolution: "https-proxy-agent@npm:7.0.5" dependencies: agent-base: "npm:^7.0.2" debug: "npm:4" - checksum: 10c0/bc4f7c38da32a5fc622450b6cb49a24ff596f9bd48dcedb52d2da3fa1c1a80e100fb506bd59b326c012f21c863c69b275c23de1a01d0b84db396822fdf25e52b + checksum: 10c0/2490e3acec397abeb88807db52cac59102d5ed758feee6df6112ab3ccd8325e8a1ce8bce6f4b66e5470eca102d31e425ace904242e4fa28dbe0c59c4bafa7b2c languageName: node linkType: hard @@ -11270,13 +11254,6 @@ __metadata: languageName: node linkType: hard -"is-plain-object@npm:^5.0.0": - version: 5.0.0 - resolution: "is-plain-object@npm:5.0.0" - checksum: 10c0/893e42bad832aae3511c71fd61c0bf61aa3a6d853061c62a307261842727d0d25f761ce9379f7ba7226d6179db2a3157efa918e7fe26360f3bf0842d9f28942c - languageName: node - linkType: hard - "is-potential-custom-element-name@npm:^1.0.1": version: 1.0.1 resolution: "is-potential-custom-element-name@npm:1.0.1" @@ -11576,16 +11553,25 @@ __metadata: languageName: node linkType: hard -"jackspeak@npm:^2.3.6": - version: 2.3.6 - resolution: "jackspeak@npm:2.3.6" +"jackspeak@npm:^3.1.2": + version: 3.4.3 + resolution: "jackspeak@npm:3.4.3" dependencies: "@isaacs/cliui": "npm:^8.0.2" "@pkgjs/parseargs": "npm:^0.11.0" dependenciesMeta: "@pkgjs/parseargs": optional: true - checksum: 10c0/f01d8f972d894cd7638bc338e9ef5ddb86f7b208ce177a36d718eac96ec86638a6efa17d0221b10073e64b45edc2ce15340db9380b1f5d5c5d000cbc517dc111 + checksum: 10c0/6acc10d139eaefdbe04d2f679e6191b3abf073f111edf10b1de5302c97ec93fffeb2fdd8681ed17f16268aa9dd4f8c588ed9d1d3bffbbfa6e8bf897cbb3149b9 + languageName: node + linkType: hard + +"jackspeak@npm:^4.0.1": + version: 4.0.2 + resolution: "jackspeak@npm:4.0.2" + dependencies: + "@isaacs/cliui": "npm:^8.0.2" + checksum: 10c0/b26039d11c0163a95b1e58851b9ac453cce64ad6d1eb98a00b303ad5eeb761b29d33c9419d1e16c016d3f7151c8edf7df223e6cf93a1907655fd95d6ce85c0de languageName: node linkType: hard @@ -12683,39 +12669,37 @@ __metadata: languageName: node linkType: hard -"jsdom@npm:^22.1.0": - version: 22.1.0 - resolution: "jsdom@npm:22.1.0" +"jsdom@npm:^25.0.1": + version: 25.0.1 + resolution: "jsdom@npm:25.0.1" dependencies: - abab: "npm:^2.0.6" - cssstyle: "npm:^3.0.0" - data-urls: "npm:^4.0.0" + cssstyle: "npm:^4.1.0" + data-urls: "npm:^5.0.0" decimal.js: "npm:^10.4.3" - domexception: "npm:^4.0.0" form-data: "npm:^4.0.0" - html-encoding-sniffer: "npm:^3.0.0" - http-proxy-agent: "npm:^5.0.0" - https-proxy-agent: "npm:^5.0.1" + html-encoding-sniffer: "npm:^4.0.0" + http-proxy-agent: "npm:^7.0.2" + https-proxy-agent: "npm:^7.0.5" is-potential-custom-element-name: "npm:^1.0.1" - nwsapi: "npm:^2.2.4" + nwsapi: "npm:^2.2.12" parse5: "npm:^7.1.2" - rrweb-cssom: "npm:^0.6.0" + rrweb-cssom: "npm:^0.7.1" saxes: "npm:^6.0.0" symbol-tree: "npm:^3.2.4" - tough-cookie: "npm:^4.1.2" - w3c-xmlserializer: "npm:^4.0.0" + tough-cookie: "npm:^5.0.0" + w3c-xmlserializer: "npm:^5.0.0" webidl-conversions: "npm:^7.0.0" - whatwg-encoding: "npm:^2.0.0" - whatwg-mimetype: "npm:^3.0.0" - whatwg-url: "npm:^12.0.1" - ws: "npm:^8.13.0" - xml-name-validator: "npm:^4.0.0" + whatwg-encoding: "npm:^3.1.1" + whatwg-mimetype: "npm:^4.0.0" + whatwg-url: "npm:^14.0.0" + ws: "npm:^8.18.0" + xml-name-validator: "npm:^5.0.0" peerDependencies: - canvas: ^2.5.0 + canvas: ^2.11.2 peerDependenciesMeta: canvas: optional: true - checksum: 10c0/a1c1501c611d1fe833e0a28796a234325aa09d4c597a9d8ccf6970004a9d946d261469502eadb555bdd7a55f5a2fbf3ce60c727cd99acb0d63f257fb9afcd33d + checksum: 10c0/6bda32a6dfe4e37a30568bf51136bdb3ba9c0b72aadd6356280404275a34c9e097c8c25b5eb3c742e602623741e172da977ff456684befd77c9042ed9bf8c2b4 languageName: node linkType: hard @@ -12758,6 +12742,15 @@ __metadata: languageName: node linkType: hard +"json-schema-ref-resolver@npm:^1.0.1": + version: 1.0.1 + resolution: "json-schema-ref-resolver@npm:1.0.1" + dependencies: + fast-deep-equal: "npm:^3.1.3" + checksum: 10c0/aa89d88108c0109ae35b913c89c132fb50c00f3b99fc8a8309b524b9e3a6a77414f19a6a35a1253871462984cbabc74279ebbd9bf103c6629fb7b37c9fb59bcf + languageName: node + linkType: hard + "json-schema-traverse@npm:^0.4.1": version: 0.4.1 resolution: "json-schema-traverse@npm:0.4.1" @@ -12962,15 +12955,14 @@ __metadata: languageName: node linkType: hard -"light-my-request@npm:^4.2.0": - version: 4.12.0 - resolution: "light-my-request@npm:4.12.0" +"light-my-request@npm:^6.0.0": + version: 6.3.0 + resolution: "light-my-request@npm:6.3.0" dependencies: - ajv: "npm:^8.1.0" - cookie: "npm:^0.5.0" - process-warning: "npm:^1.0.0" - set-cookie-parser: "npm:^2.4.1" - checksum: 10c0/d95b9e5bec2fe32ec02d77791c2e5786358f396f27c9c15c97f224e8bb94e357e143f89b67856f20ee2f980136f2c9ac3a934177f8d10b3c184a81c578b00e6f + cookie: "npm:^1.0.1" + process-warning: "npm:^4.0.0" + set-cookie-parser: "npm:^2.6.0" + checksum: 10c0/a5b33461a7c6a00f5ed89fd62aa384d424c480566ee5016c8d2becd87eb5d5c7d60b4fffcdcc6ac4b64283df7a91c50423a1baae19aa131e7eaba2fd493c092b languageName: node linkType: hard @@ -13158,6 +13150,13 @@ __metadata: languageName: node linkType: hard +"lru-cache@npm:^11.0.0": + version: 11.0.2 + resolution: "lru-cache@npm:11.0.2" + checksum: 10c0/c993b8e06ead0b24b969c1dbb5b301716aed66e320e9014a80012f5febe280b438f28ff50046b2c55ff404e889351ccb332ff91f8dd175a21f5eae80e3fb155f + languageName: node + linkType: hard + "lru-cache@npm:^5.1.1": version: 5.1.1 resolution: "lru-cache@npm:5.1.1" @@ -13502,7 +13501,7 @@ __metadata: languageName: node linkType: hard -"mime@npm:^3.0.0": +"mime@npm:^3": version: 3.0.0 resolution: "mime@npm:3.0.0" bin: @@ -13539,15 +13538,15 @@ __metadata: languageName: node linkType: hard -"mini-css-extract-plugin@npm:^2.8.1": - version: 2.8.1 - resolution: "mini-css-extract-plugin@npm:2.8.1" +"mini-css-extract-plugin@npm:^2.9.2": + version: 2.9.2 + resolution: "mini-css-extract-plugin@npm:2.9.2" dependencies: schema-utils: "npm:^4.0.0" tapable: "npm:^2.2.1" peerDependencies: webpack: ^5.0.0 - checksum: 10c0/ef0064f32051294e76141ba74ddf139d313ba26f3abcef1a3906347ca75df8e69c490351bd4c2f373b0cf5c934f39c7d643c8615421c24e4d2c724345294f80a + checksum: 10c0/5d3218dbd7db48b572925ddac05162a7415bf81b321f1a0c07016ec643cb5720c8a836ae68d45f5de826097a3013b601706c9c5aacb7f610dc2041b271de2ce0 languageName: node linkType: hard @@ -13574,12 +13573,12 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:9.0.3": - version: 9.0.3 - resolution: "minimatch@npm:9.0.3" +"minimatch@npm:^10.0.0": + version: 10.0.1 + resolution: "minimatch@npm:10.0.1" dependencies: brace-expansion: "npm:^2.0.1" - checksum: 10c0/85f407dcd38ac3e180f425e86553911d101455ca3ad5544d6a7cec16286657e4f8a9aa6695803025c55e31e35a91a2252b5dc8e7d527211278b8b65b4dbd5eac + checksum: 10c0/e6c29a81fe83e1877ad51348306be2e8aeca18c88fdee7a99df44322314279e15799e41d7cb274e4e8bb0b451a3bc622d6182e157dfa1717d6cda75e9cd8cd5d languageName: node linkType: hard @@ -13601,12 +13600,12 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^9.0.1": - version: 9.0.4 - resolution: "minimatch@npm:9.0.4" +"minimatch@npm:^9.0.4": + version: 9.0.5 + resolution: "minimatch@npm:9.0.5" dependencies: brace-expansion: "npm:^2.0.1" - checksum: 10c0/2c16f21f50e64922864e560ff97c587d15fd491f65d92a677a344e970fe62aafdbeafe648965fa96d33c061b4d0eabfe0213466203dd793367e7f28658cf6414 + checksum: 10c0/de96cf5e35bdf0eab3e2c853522f98ffbe9a36c37797778d2665231ec1f20a9447a7e567cb640901f89e4daaa95ae5d70c65a9e8aa2bb0019b6facbc3c0575ed languageName: node linkType: hard @@ -13708,10 +13707,10 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.0.4": - version: 7.0.4 - resolution: "minipass@npm:7.0.4" - checksum: 10c0/6c7370a6dfd257bf18222da581ba89a5eaedca10e158781232a8b5542a90547540b4b9b7e7f490e4cda43acfbd12e086f0453728ecf8c19e0ef6921bc5958ac5 +"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.1.2": + version: 7.1.2 + resolution: "minipass@npm:7.1.2" + checksum: 10c0/b0fd20bb9fb56e5fa9a8bfac539e8915ae07430a619e4b86ff71f5fc757ef3924b23b2c4230393af1eda647ed3d75739e4e0acb250a6b1eb277cf7f8fe449557 languageName: node linkType: hard @@ -13934,6 +13933,15 @@ __metadata: languageName: node linkType: hard +"node-addon-api@npm:^7.0.0": + version: 7.1.1 + resolution: "node-addon-api@npm:7.1.1" + dependencies: + node-gyp: "npm:latest" + checksum: 10c0/fb32a206276d608037fa1bcd7e9921e177fe992fc610d098aa3128baca3c0050fc1e014fa007e9b3874cf865ddb4f5bd9f43ccb7cbbbe4efaff6a83e920b17e9 + languageName: node + linkType: hard + "node-forge@npm:^0.10.0": version: 0.10.0 resolution: "node-forge@npm:0.10.0" @@ -14041,10 +14049,10 @@ __metadata: languageName: node linkType: hard -"node-releases@npm:^2.0.14": - version: 2.0.14 - resolution: "node-releases@npm:2.0.14" - checksum: 10c0/199fc93773ae70ec9969bc6d5ac5b2bbd6eb986ed1907d751f411fef3ede0e4bfdb45ceb43711f8078bea237b6036db8b1bf208f6ff2b70c7d615afd157f3ab9 +"node-releases@npm:^2.0.18": + version: 2.0.18 + resolution: "node-releases@npm:2.0.18" + checksum: 10c0/786ac9db9d7226339e1dc84bbb42007cb054a346bd9257e6aa154d294f01bc6a6cddb1348fa099f079be6580acbb470e3c048effd5f719325abd0179e566fd27 languageName: node linkType: hard @@ -14179,17 +14187,10 @@ __metadata: languageName: node linkType: hard -"nwsapi@npm:^2.2.0": - version: 2.2.9 - resolution: "nwsapi@npm:2.2.9" - checksum: 10c0/e6ebbaedf44d1c1e13f7193e5129c8da1b2e8064862b70458ab9bd9e9640b8ad035a0e48d509e787527ecdddea74d5a02798420cd971264a4e03c2b173fadac8 - languageName: node - linkType: hard - -"nwsapi@npm:^2.2.2, nwsapi@npm:^2.2.4": - version: 2.2.7 - resolution: "nwsapi@npm:2.2.7" - checksum: 10c0/44be198adae99208487a1c886c0a3712264f7bbafa44368ad96c003512fed2753d4e22890ca1e6edb2690c3456a169f2a3c33bfacde1905cf3bf01c7722464db +"nwsapi@npm:^2.2.0, nwsapi@npm:^2.2.12, nwsapi@npm:^2.2.2": + version: 2.2.13 + resolution: "nwsapi@npm:2.2.13" + checksum: 10c0/9dbd1071bba3570ef0b046c43c03d0584c461063f27539ba39f4185188e9d5c10cb06fd4426cdb300bb83020c3daa2c8f4fa9e8a070299539ac4007433357ac0 languageName: node linkType: hard @@ -14343,6 +14344,13 @@ __metadata: languageName: node linkType: hard +"on-exit-leak-free@npm:^2.1.0": + version: 2.1.2 + resolution: "on-exit-leak-free@npm:2.1.2" + checksum: 10c0/faea2e1c9d696ecee919026c32be8d6a633a7ac1240b3b87e944a380e8a11dc9c95c4a1f8fb0568de7ab8db3823e790f12bda45296b1d111e341aad3922a0570 + languageName: node + linkType: hard + "on-finished@npm:2.4.1": version: 2.4.1 resolution: "on-finished@npm:2.4.1" @@ -14431,7 +14439,7 @@ __metadata: languageName: node linkType: hard -"optionator@npm:^0.9.1": +"optionator@npm:^0.9.1, optionator@npm:^0.9.3": version: 0.9.4 resolution: "optionator@npm:0.9.4" dependencies: @@ -14445,20 +14453,6 @@ __metadata: languageName: node linkType: hard -"optionator@npm:^0.9.3": - version: 0.9.3 - resolution: "optionator@npm:0.9.3" - dependencies: - "@aashutoshrathi/word-wrap": "npm:^1.2.3" - deep-is: "npm:^0.1.3" - fast-levenshtein: "npm:^2.0.6" - levn: "npm:^0.4.1" - prelude-ls: "npm:^1.2.1" - type-check: "npm:^0.4.0" - checksum: 10c0/66fba794d425b5be51353035cf3167ce6cfa049059cbb93229b819167687e0f48d2bc4603fcb21b091c99acb516aae1083624675b15c4765b2e4693a085e959c - languageName: node - linkType: hard - "os-browserify@npm:^0.3.0": version: 0.3.0 resolution: "os-browserify@npm:0.3.0" @@ -14557,6 +14551,13 @@ __metadata: languageName: node linkType: hard +"package-json-from-dist@npm:^1.0.0": + version: 1.0.1 + resolution: "package-json-from-dist@npm:1.0.1" + checksum: 10c0/62ba2785eb655fec084a257af34dbe24292ab74516d6aecef97ef72d4897310bc6898f6c85b5cd22770eaa1ce60d55a0230e150fb6a966e3ecd6c511e23d164b + languageName: node + linkType: hard + "pako@npm:^1.0.0, pako@npm:~1.0.5": version: 1.0.11 resolution: "pako@npm:1.0.11" @@ -14743,13 +14744,23 @@ __metadata: languageName: node linkType: hard -"path-scurry@npm:^1.10.2": - version: 1.10.2 - resolution: "path-scurry@npm:1.10.2" +"path-scurry@npm:^1.11.1": + version: 1.11.1 + resolution: "path-scurry@npm:1.11.1" dependencies: lru-cache: "npm:^10.2.0" minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0" - checksum: 10c0/d723777fbf9627f201e64656680f66ebd940957eebacf780e6cce1c2919c29c116678b2d7dbf8821b3a2caa758d125f4444005ccec886a25c8f324504e48e601 + checksum: 10c0/32a13711a2a505616ae1cc1b5076801e453e7aae6ac40ab55b388bb91b9d0547a52f5aaceff710ea400205f18691120d4431e520afbe4266b836fadede15872d + languageName: node + linkType: hard + +"path-scurry@npm:^2.0.0": + version: 2.0.0 + resolution: "path-scurry@npm:2.0.0" + dependencies: + lru-cache: "npm:^11.0.0" + minipass: "npm:^7.1.2" + checksum: 10c0/3da4adedaa8e7ef8d6dc4f35a0ff8f05a9b4d8365f2b28047752b62d4c1ad73eec21e37b1579ef2d075920157856a3b52ae8309c480a6f1a8bbe06ff8e52b33c languageName: node linkType: hard @@ -14794,10 +14805,10 @@ __metadata: languageName: node linkType: hard -"picocolors@npm:^1.0.0": - version: 1.0.0 - resolution: "picocolors@npm:1.0.0" - checksum: 10c0/20a5b249e331c14479d94ec6817a182fd7a5680debae82705747b2db7ec50009a5f6648d0621c561b0572703f84dbef0858abcbd5856d3c5511426afcb1961f7 +"picocolors@npm:^1.0.0, picocolors@npm:^1.1.0": + version: 1.1.1 + resolution: "picocolors@npm:1.1.1" + checksum: 10c0/e2e3e8170ab9d7c7421969adaa7e1b31434f789afb9b3f115f6b96d91945041ac3ceb02e9ec6fe6510ff036bcc0bf91e69a1772edc0b707e12b19c0f2d6bcf58 languageName: node linkType: hard @@ -14838,27 +14849,40 @@ __metadata: languageName: node linkType: hard -"pino-std-serializers@npm:^3.1.0": - version: 3.2.0 - resolution: "pino-std-serializers@npm:3.2.0" - checksum: 10c0/ae08159372b5bbe69f13770a7f20ba7ded0bb97b2c6f42f780995582135ca907e66504f06371c12f991dbfcd489280f942786c02a9e8e952974d455cb0a477c9 +"pino-abstract-transport@npm:^2.0.0": + version: 2.0.0 + resolution: "pino-abstract-transport@npm:2.0.0" + dependencies: + split2: "npm:^4.0.0" + checksum: 10c0/02c05b8f2ffce0d7c774c8e588f61e8b77de8ccb5f8125afd4a7325c9ea0e6af7fb78168999657712ae843e4462bb70ac550dfd6284f930ee57f17f486f25a9f + languageName: node + linkType: hard + +"pino-std-serializers@npm:^7.0.0": + version: 7.0.0 + resolution: "pino-std-serializers@npm:7.0.0" + checksum: 10c0/73e694d542e8de94445a03a98396cf383306de41fd75ecc07085d57ed7a57896198508a0dec6eefad8d701044af21eb27253ccc352586a03cf0d4a0bd25b4133 languageName: node linkType: hard -"pino@npm:^6.13.0": - version: 6.14.0 - resolution: "pino@npm:6.14.0" +"pino@npm:^9.0.0": + version: 9.5.0 + resolution: "pino@npm:9.5.0" dependencies: - fast-redact: "npm:^3.0.0" - fast-safe-stringify: "npm:^2.0.8" - flatstr: "npm:^1.0.12" - pino-std-serializers: "npm:^3.1.0" - process-warning: "npm:^1.0.0" + atomic-sleep: "npm:^1.0.0" + fast-redact: "npm:^3.1.1" + on-exit-leak-free: "npm:^2.1.0" + pino-abstract-transport: "npm:^2.0.0" + pino-std-serializers: "npm:^7.0.0" + process-warning: "npm:^4.0.0" quick-format-unescaped: "npm:^4.0.3" - sonic-boom: "npm:^1.0.2" + real-require: "npm:^0.2.0" + safe-stable-stringify: "npm:^2.3.1" + sonic-boom: "npm:^4.0.1" + thread-stream: "npm:^3.0.0" bin: pino: bin.js - checksum: 10c0/5d3cb22c804e2bf2439ace64a46a7901d0a138cb75715ad8a8bbcf3ddb09dc5e33a9fc8a49527c3345d317619748c6de94d28481911ae931c21b953e24048425 + checksum: 10c0/b06590c5f4da43df59905af1aac344432b43154c4c1569ebea168e7ae7fd0a4181ccabb769a6568cf3e781e1d1b9df13d65b3603e25ebb05539bcb02ea04215e languageName: node linkType: hard @@ -15337,12 +15361,12 @@ __metadata: languageName: node linkType: hard -"postcss-modules-extract-imports@npm:^3.0.0": - version: 3.0.0 - resolution: "postcss-modules-extract-imports@npm:3.0.0" +"postcss-modules-extract-imports@npm:^3.1.0": + version: 3.1.0 + resolution: "postcss-modules-extract-imports@npm:3.1.0" peerDependencies: postcss: ^8.1.0 - checksum: 10c0/f8879d66d8162fb7a3fcd916d37574006c584ea509107b1cfb798a5e090175ef9470f601e46f0a305070d8ff2500e07489a5c1ac381c29a1dc1120e827ca7943 + checksum: 10c0/402084bcab376083c4b1b5111b48ec92974ef86066f366f0b2d5b2ac2b647d561066705ade4db89875a13cb175b33dd6af40d16d32b2ea5eaf8bac63bd2bf219 languageName: node linkType: hard @@ -15358,16 +15382,16 @@ __metadata: languageName: node linkType: hard -"postcss-modules-local-by-default@npm:^4.0.4": - version: 4.0.4 - resolution: "postcss-modules-local-by-default@npm:4.0.4" +"postcss-modules-local-by-default@npm:^4.0.5": + version: 4.0.5 + resolution: "postcss-modules-local-by-default@npm:4.0.5" dependencies: icss-utils: "npm:^5.0.0" postcss-selector-parser: "npm:^6.0.2" postcss-value-parser: "npm:^4.1.0" peerDependencies: postcss: ^8.1.0 - checksum: 10c0/9ebf464867eb10b29b73501b1466dcac8352ed852ef68ec23571f515daa74401d7ace9a6c72f354542081fdbb47d098c9bc6b05373b553a6e35779d072f967bb + checksum: 10c0/f4ad35abeb685ecb25f80c93d9fe23c8b89ee45ac4185f3560e701b4d7372f9b798577e79c5ed03b6d9c80bc923b001210c127c04ced781f43cda9e32b202a5b languageName: node linkType: hard @@ -15381,14 +15405,14 @@ __metadata: languageName: node linkType: hard -"postcss-modules-scope@npm:^3.1.1": - version: 3.1.1 - resolution: "postcss-modules-scope@npm:3.1.1" +"postcss-modules-scope@npm:^3.2.0": + version: 3.2.0 + resolution: "postcss-modules-scope@npm:3.2.0" dependencies: postcss-selector-parser: "npm:^6.0.4" peerDependencies: postcss: ^8.1.0 - checksum: 10c0/3ef6ac14fcda1581bc43e37622256bd87b99ea49c59b2aae648d057d57f5ecc634648cce9910166220a797567af674bc09246ccc010f1dd58d2863b805719109 + checksum: 10c0/a2f5ffe372169b3feb8628cd785eb748bf12e344cfa57bce9e5cdc4fa5adcdb40d36daa86bb35dad53427703b185772aad08825b5783f745fcb1b6039454a84b languageName: node linkType: hard @@ -15885,10 +15909,10 @@ __metadata: languageName: node linkType: hard -"process-warning@npm:^1.0.0": - version: 1.0.0 - resolution: "process-warning@npm:1.0.0" - checksum: 10c0/43ec4229d64eb5c58340c8aacade49eb5f6fd513eae54140abf365929ca20987f0a35c5868125e2b583cad4de8cd257beb5667d9cc539d9190a7a4c3014adf22 +"process-warning@npm:^4.0.0": + version: 4.0.0 + resolution: "process-warning@npm:4.0.0" + checksum: 10c0/5312a72b69d37a1b82ad03f3dfa0090dab3804a8fd995d06c28e3c002852bd82f5584217d9f4a3f197892bb2afc22d57e2c662c7e906b5abb48c0380c7b0880d languageName: node linkType: hard @@ -16046,7 +16070,7 @@ __metadata: languageName: node linkType: hard -"punycode@npm:^2.1.0, punycode@npm:^2.1.1, punycode@npm:^2.3.0": +"punycode@npm:^2.1.0, punycode@npm:^2.1.1, punycode@npm:^2.3.1": version: 2.3.1 resolution: "punycode@npm:2.3.1" checksum: 10c0/14f76a8206bc3464f794fb2e3d3cc665ae416c01893ad7a02b23766eb07159144ee612ad67af5e84fa4479ccfe67678c4feb126b0485651b302babf66f04f9e9 @@ -16116,7 +16140,7 @@ __metadata: languageName: node linkType: hard -"queue-microtask@npm:^1.1.2, queue-microtask@npm:^1.2.2": +"queue-microtask@npm:^1.2.2": version: 1.2.3 resolution: "queue-microtask@npm:1.2.3" checksum: 10c0/900a93d3cdae3acd7d16f642c29a642aea32c2026446151f0778c62ac089d4b8e6c986811076e1ae180a694cedf077d453a11b58ff0a865629a4f82ab558e102 @@ -16236,15 +16260,15 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:^18.2.0": - version: 18.2.0 - resolution: "react-dom@npm:18.2.0" +"react-dom@npm:^18.3.1": + version: 18.3.1 + resolution: "react-dom@npm:18.3.1" dependencies: loose-envify: "npm:^1.1.0" - scheduler: "npm:^0.23.0" + scheduler: "npm:^0.23.2" peerDependencies: - react: ^18.2.0 - checksum: 10c0/66dfc5f93e13d0674e78ef41f92ed21dfb80f9c4ac4ac25a4b51046d41d4d2186abc915b897f69d3d0ebbffe6184e7c5876f2af26bfa956f179225d921be713a + react: ^18.3.1 + checksum: 10c0/a752496c1941f958f2e8ac56239172296fcddce1365ce45222d04a1947e0cc5547df3e8447f855a81d6d39f008d7c32eab43db3712077f09e3f67c4874973e85 languageName: node linkType: hard @@ -16392,12 +16416,12 @@ __metadata: languageName: node linkType: hard -"react@npm:^18.2.0": - version: 18.2.0 - resolution: "react@npm:18.2.0" +"react@npm:^18.3.1": + version: 18.3.1 + resolution: "react@npm:18.3.1" dependencies: loose-envify: "npm:^1.1.0" - checksum: 10c0/b562d9b569b0cb315e44b48099f7712283d93df36b19a39a67c254c6686479d3980b7f013dc931f4a5a3ae7645eae6386b4aa5eea933baa54ecd0f9acb0902b8 + checksum: 10c0/283e8c5efcf37802c9d1ce767f302dd569dd97a70d9bb8c7be79a789b9902451e0d16334b05d73299b20f048cbc3c7d288bbbde10b701fa194e2089c237dbea3 languageName: node linkType: hard @@ -16473,6 +16497,13 @@ __metadata: languageName: node linkType: hard +"readdirp@npm:^4.0.1": + version: 4.0.2 + resolution: "readdirp@npm:4.0.2" + checksum: 10c0/a16ecd8ef3286dcd90648c3b103e3826db2b766cdb4a988752c43a83f683d01c7059158d623cbcd8bdfb39e65d302d285be2d208e7d9f34d022d912b929217dd + languageName: node + linkType: hard + "readdirp@npm:~3.6.0": version: 3.6.0 resolution: "readdirp@npm:3.6.0" @@ -16482,6 +16513,13 @@ __metadata: languageName: node linkType: hard +"real-require@npm:^0.2.0": + version: 0.2.0 + resolution: "real-require@npm:0.2.0" + checksum: 10c0/23eea5623642f0477412ef8b91acd3969015a1501ed34992ada0e3af521d3c865bb2fe4cdbfec5fe4b505f6d1ef6a03e5c3652520837a8c3b53decff7e74b6a0 + languageName: node + linkType: hard + "rechoir@npm:^0.8.0": version: 0.8.0 resolution: "rechoir@npm:0.8.0" @@ -16858,10 +16896,10 @@ __metadata: languageName: node linkType: hard -"ret@npm:~0.2.0": - version: 0.2.2 - resolution: "ret@npm:0.2.2" - checksum: 10c0/1a41e543913cda851abb1dae4852efa97bb693ce58fde3b51cc1cae94e2599dd70b91ad6268a4a07fc238305be06fed91723ef6d08863c48a0d02e0a74b943cd +"ret@npm:~0.5.0": + version: 0.5.0 + resolution: "ret@npm:0.5.0" + checksum: 10c0/220868b194f87bf1998e32e409086eec6b39e860c052bf267f8ad4d0131706a9773d45fd3f91acfb1a7c928fce002b694ab86fdba90bc8d4b8df68fa8645c5cc languageName: node linkType: hard @@ -16896,10 +16934,10 @@ __metadata: languageName: node linkType: hard -"rfdc@npm:^1.1.4, rfdc@npm:^1.2.0": - version: 1.3.1 - resolution: "rfdc@npm:1.3.1" - checksum: 10c0/69f65e3ed30970f8055fac9fbbef9ce578800ca19554eab1dcbffe73a4b8aef536bc4248313889cf25e3b4e38b212c721eabe30856575bf2b2bc3d90f8ba93ef +"rfdc@npm:^1.2.0, rfdc@npm:^1.3.1": + version: 1.4.1 + resolution: "rfdc@npm:1.4.1" + checksum: 10c0/4614e4292356cafade0b6031527eea9bc90f2372a22c012313be1dcc69a3b90c7338158b414539be863fa95bfcb2ddcd0587be696841af4e6679d85e62c060c7 languageName: node linkType: hard @@ -16999,10 +17037,10 @@ __metadata: languageName: node linkType: hard -"rrweb-cssom@npm:^0.6.0": - version: 0.6.0 - resolution: "rrweb-cssom@npm:0.6.0" - checksum: 10c0/3d9d90d53c2349ea9c8509c2690df5a4ef930c9cf8242aeb9425d4046f09d712bb01047e00da0e1c1dab5db35740b3d78fd45c3e7272f75d3724a563f27c30a3 +"rrweb-cssom@npm:^0.7.1": + version: 0.7.1 + resolution: "rrweb-cssom@npm:0.7.1" + checksum: 10c0/127b8ca6c8aac45e2755abbae6138d4a813b1bedc2caabf79466ae83ab3cfc84b5bfab513b7033f0aa4561c7753edf787d0dd01163ceacdee2e8eb1b6bf7237e languageName: node linkType: hard @@ -17068,12 +17106,12 @@ __metadata: languageName: node linkType: hard -"safe-regex2@npm:^2.0.0": - version: 2.0.0 - resolution: "safe-regex2@npm:2.0.0" +"safe-regex2@npm:^4.0.0": + version: 4.0.0 + resolution: "safe-regex2@npm:4.0.0" dependencies: - ret: "npm:~0.2.0" - checksum: 10c0/f499e4fc69caafd7dd8023759e69a32991baa66e90bec5e2a7777b907943b27068dbff4e7a32cc8231f1354fcb779142f419e85498ae1e37384dc60619509c27 + ret: "npm:~0.5.0" + checksum: 10c0/faebf910036228868e83b4a33a84405b04e8e89f01283efe847e17e96b6b4658cc65c6560cef11de3bd5aef3b28b58dffac48744df67ca2ae46e073f668cb71d languageName: node linkType: hard @@ -17086,6 +17124,13 @@ __metadata: languageName: node linkType: hard +"safe-stable-stringify@npm:^2.3.1": + version: 2.5.0 + resolution: "safe-stable-stringify@npm:2.5.0" + checksum: 10c0/baea14971858cadd65df23894a40588ed791769db21bafb7fd7608397dbdce9c5aac60748abae9995e0fc37e15f2061980501e012cd48859740796bea2987f49 + languageName: node + linkType: hard + "safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0": version: 2.1.2 resolution: "safer-buffer@npm:2.1.2" @@ -17144,9 +17189,9 @@ __metadata: languageName: node linkType: hard -"sass-loader@npm:^14.1.1": - version: 14.1.1 - resolution: "sass-loader@npm:14.1.1" +"sass-loader@npm:^14.2.1": + version: 14.2.1 + resolution: "sass-loader@npm:14.2.1" dependencies: neo-async: "npm:^2.6.2" peerDependencies: @@ -17166,20 +17211,24 @@ __metadata: optional: true webpack: optional: true - checksum: 10c0/303ae65c38019723c1d534d6c70ba051b2744ea52c9e07c1c761303962540e8f3147bd73ff0ce2767c7435bc76f544f5cbc5db03617689f30ec9ffb26494289d + checksum: 10c0/9a48d454584d96d6c562eb323bb9e3c6808e930eeaaa916975b97d45831e0b87936a8655cdb3a4512a25abc9587dea65a9616e42396be0d7e7c507a4795a8146 languageName: node linkType: hard -"sass@npm:^1.72.0": - version: 1.72.0 - resolution: "sass@npm:1.72.0" +"sass@npm:^1.80.6": + version: 1.80.6 + resolution: "sass@npm:1.80.6" dependencies: - chokidar: "npm:>=3.0.0 <4.0.0" + "@parcel/watcher": "npm:^2.4.1" + chokidar: "npm:^4.0.0" immutable: "npm:^4.0.0" source-map-js: "npm:>=0.6.2 <2.0.0" + dependenciesMeta: + "@parcel/watcher": + optional: true bin: sass: sass.js - checksum: 10c0/7df1bb470648edc4b528976b1b165c78d4c6731f680afac7cdc8324142f1ef4304598d317d98dac747a2ae8eee17271d760def90bba072021a8b19b459336ccd + checksum: 10c0/04ce40d4dcf06cf2a94a66c1cc4fd4a9eb4033fd039291acd0be9d1d4123860da568c5cbef9de8493ffbedd8acae1cd0b8346f5da21c6f7cf0ffd3477730beca languageName: node linkType: hard @@ -17225,12 +17274,12 @@ __metadata: languageName: node linkType: hard -"scheduler@npm:^0.23.0": - version: 0.23.0 - resolution: "scheduler@npm:0.23.0" +"scheduler@npm:^0.23.2": + version: 0.23.2 + resolution: "scheduler@npm:0.23.2" dependencies: loose-envify: "npm:^1.1.0" - checksum: 10c0/b777f7ca0115e6d93e126ac490dbd82642d14983b3079f58f35519d992fa46260be7d6e6cede433a92db70306310c6f5f06e144f0e40c484199e09c1f7be53dd + checksum: 10c0/26383305e249651d4c58e6705d5f8425f153211aef95f15161c151f7b8de885f24751b377e4a0b3dd42cce09aad3f87a61dab7636859c0d89b7daf1a1e2a5c78 languageName: node linkType: hard @@ -17279,7 +17328,7 @@ __metadata: languageName: node linkType: hard -"secure-json-parse@npm:^2.0.0": +"secure-json-parse@npm:^2.7.0": version: 2.7.0 resolution: "secure-json-parse@npm:2.7.0" checksum: 10c0/f57eb6a44a38a3eeaf3548228585d769d788f59007454214fab9ed7f01fbf2e0f1929111da6db28cf0bcc1a2e89db5219a59e83eeaec3a54e413a0197ce879e4 @@ -17302,13 +17351,6 @@ __metadata: languageName: node linkType: hard -"semver-store@npm:^0.3.0": - version: 0.3.0 - resolution: "semver-store@npm:0.3.0" - checksum: 10c0/4197aecef21dce734e8053e990c27f179136b106dbba69a8f52c1fb82779c670e456b21bbd0193bf10abe129ee44aa817eda75a3470f50f7b9284920d8af4fba - languageName: node - linkType: hard - "semver@npm:2 || 3 || 4 || 5, semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.6.0": version: 5.7.2 resolution: "semver@npm:5.7.2" @@ -17336,23 +17378,12 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.2.1": - version: 7.6.2 - resolution: "semver@npm:7.6.2" - bin: - semver: bin/semver.js - checksum: 10c0/97d3441e97ace8be4b1976433d1c32658f6afaff09f143e52c593bae7eef33de19e3e369c88bd985ce1042c6f441c80c6803078d1de2a9988080b66684cbb30c - languageName: node - linkType: hard - -"semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4": - version: 7.6.0 - resolution: "semver@npm:7.6.0" - dependencies: - lru-cache: "npm:^6.0.0" +"semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0": + version: 7.6.3 + resolution: "semver@npm:7.6.3" bin: semver: bin/semver.js - checksum: 10c0/fbfe717094ace0aa8d6332d7ef5ce727259815bd8d8815700853f4faf23aacbd7192522f0dc5af6df52ef4fa85a355ebd2f5d39f554bd028200d6cf481ab9b53 + checksum: 10c0/88f33e148b210c153873cb08cfe1e281d518aaa9a666d4d148add6560db5cd3c582f3a08ccb91f38d5f379ead256da9931234ed122057f40bb5766e65e58adaf languageName: node linkType: hard @@ -17449,10 +17480,10 @@ __metadata: languageName: node linkType: hard -"set-cookie-parser@npm:^2.4.1": - version: 2.6.0 - resolution: "set-cookie-parser@npm:2.6.0" - checksum: 10c0/739da029f0e56806a103fcd5501d9c475e19e77bd8274192d7ae5c374ae714a82bba9a7ac00b0330a18227c5644b08df9e442240527be578f5a6030f9bb2bb80 +"set-cookie-parser@npm:^2.6.0": + version: 2.7.1 + resolution: "set-cookie-parser@npm:2.7.1" + checksum: 10c0/060c198c4c92547ac15988256f445eae523f57f2ceefeccf52d30d75dedf6bff22b9c26f756bd44e8e560d44ff4ab2130b178bd2e52ef5571bf7be3bd7632d9a languageName: node linkType: hard @@ -17769,13 +17800,12 @@ __metadata: languageName: node linkType: hard -"sonic-boom@npm:^1.0.2": - version: 1.4.1 - resolution: "sonic-boom@npm:1.4.1" +"sonic-boom@npm:^4.0.1": + version: 4.2.0 + resolution: "sonic-boom@npm:4.2.0" dependencies: atomic-sleep: "npm:^1.0.0" - flatstr: "npm:^1.0.12" - checksum: 10c0/3498b835071365cc94aac0eae50c5ee3c2552a4e48cf6dce59ae2d995af6c62a8f529377852b39b073b8190b772a9fb2cdb48f515c0fec4948646dea862fb120 + checksum: 10c0/ae897e6c2cd6d3cb7cdcf608bc182393b19c61c9413a85ce33ffd25891485589f39bece0db1de24381d0a38fc03d08c9862ded0c60f184f1b852f51f97af9684 languageName: node linkType: hard @@ -17940,6 +17970,13 @@ __metadata: languageName: node linkType: hard +"split2@npm:^4.0.0": + version: 4.2.0 + resolution: "split2@npm:4.2.0" + checksum: 10c0/b292beb8ce9215f8c642bb68be6249c5a4c7f332fc8ecadae7be5cbdf1ea95addc95f0459ef2e7ad9d45fd1064698a097e4eb211c83e772b49bc0ee423e91534 + languageName: node + linkType: hard + "sprintf-js@npm:^1.1.3": version: 1.1.3 resolution: "sprintf-js@npm:1.1.3" @@ -18119,13 +18156,6 @@ __metadata: languageName: node linkType: hard -"string-similarity@npm:^4.0.1": - version: 4.0.4 - resolution: "string-similarity@npm:4.0.4" - checksum: 10c0/fce331b818efafa701f692ddc2e170bd3ceaf6e7ca56a445b36b139981effe0884d8edc794a65005e54304da55ba054edfcff16a339bd301c9b94983fbc62047 - languageName: node - linkType: hard - "string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3": version: 4.2.3 resolution: "string-width@npm:4.2.3" @@ -18360,12 +18390,12 @@ __metadata: languageName: node linkType: hard -"style-loader@npm:^3.3.4": - version: 3.3.4 - resolution: "style-loader@npm:3.3.4" +"style-loader@npm:^4.0.0": + version: 4.0.0 + resolution: "style-loader@npm:4.0.0" peerDependencies: - webpack: ^5.0.0 - checksum: 10c0/8f8027fc5c6e91400cbb60066e7db3315810f8eaa0d19b2a254936eb0bec399ba8a7043b1789da9d05ab7c3ba50faf9267765ae0bf3571e48aa34ecdc774be37 + webpack: ^5.27.0 + checksum: 10c0/214bc0f3b018f8c374f79b9fa16da43df78c7fef2261e9a99e36c2f8387601fad10ac75a171aa8edba75903db214bc46952ae08b94a1f8544bd146c2c8d07d27 languageName: node linkType: hard @@ -18671,23 +18701,9 @@ __metadata: languageName: node linkType: hard -"terser@npm:^5.26.0, terser@npm:^5.30.2": - version: 5.30.2 - resolution: "terser@npm:5.30.2" - dependencies: - "@jridgewell/source-map": "npm:^0.3.3" - acorn: "npm:^8.8.2" - commander: "npm:^2.20.0" - source-map-support: "npm:~0.5.20" - bin: - terser: bin/terser - checksum: 10c0/6ad6beee2b8e2fdeb8b5451acfd88802becca7f2556ef2d1891b9ae90512f68d4a0d45558ceaf535f0a7cfaa152d7a7f4832a640ce3dca1ed9c4ef84c68893ee - languageName: node - linkType: hard - -"terser@npm:^5.3.4": - version: 5.31.0 - resolution: "terser@npm:5.31.0" +"terser@npm:^5.26.0, terser@npm:^5.3.4, terser@npm:^5.36.0": + version: 5.36.0 + resolution: "terser@npm:5.36.0" dependencies: "@jridgewell/source-map": "npm:^0.3.3" acorn: "npm:^8.8.2" @@ -18695,7 +18711,7 @@ __metadata: source-map-support: "npm:~0.5.20" bin: terser: bin/terser - checksum: 10c0/cb127a579b03fb9dcee0d293ff24814deedcd430f447933b618e8593b7454f615b5c8493c68e86a4b0188769d5ea2af5251b5d507edb208114f7e8aebdc7c850 + checksum: 10c0/f4ed2bead19f64789ddcfb85b7cef78f3942f967b8890c54f57d1e35bc7d547d551c6a4c32210bce6ba45b1c738314bbfac6acbc6c762a45cd171777d0c120d9 languageName: node linkType: hard @@ -18729,23 +18745,23 @@ __metadata: version: 0.0.0-use.local resolution: "tgui-bench@workspace:packages/tgui-bench" dependencies: - "@fastify/static": "npm:^6.12.0" + "@fastify/static": "npm:^8.0.2" common: "workspace:*" - fastify: "npm:^3.29.5" + fastify: "npm:^5.1.0" lodash: "npm:^4.17.21" platform: "npm:^1.3.6" - react: "npm:^18.2.0" + react: "npm:^18.3.1" tgui: "workspace:*" languageName: unknown linkType: soft -"tgui-core@npm:^1.1.18": - version: 1.1.18 - resolution: "tgui-core@npm:1.1.18" +"tgui-core@npm:^1.2.0": + version: 1.2.0 + resolution: "tgui-core@npm:1.2.0" peerDependencies: react: ^18.2.0 react-dom: ^18.2.0 - checksum: 10c0/5c66bd68b409596dc0773debdd6cf57016827a82874f7e18ac2f05bf7285133e32d82ae4753583cd67d162c460c9d14e6c98ec11747950782da49c3a31bda49f + checksum: 10c0/1eead0edbe0df5c49bfa88f0d2caa5df743057be75e9c526d0afd838b8def072c67fe60435c66cba52551c4ef70749d60d68094fa103542187008998002714f7 languageName: node linkType: hard @@ -18753,11 +18769,11 @@ __metadata: version: 0.0.0-use.local resolution: "tgui-dev-server@workspace:packages/tgui-dev-server" dependencies: - axios: "npm:^1.6.8" + axios: "npm:^1.7.7" glob: "npm:^7.2.3" source-map: "npm:^0.7.4" stacktrace-parser: "npm:^0.1.10" - ws: "npm:^8.16.0" + ws: "npm:^8.18.0" languageName: unknown linkType: soft @@ -18765,12 +18781,12 @@ __metadata: version: 0.0.0-use.local resolution: "tgui-panel@workspace:packages/tgui-panel" dependencies: - "@types/node": "npm:^20.12.3" - "@types/react": "npm:^18.2.74" + "@types/node": "npm:^22.9.0" + "@types/react": "npm:^18.3.12" common: "workspace:*" - dompurify: "npm:^2.4.9" - react: "npm:^18.2.0" - react-dom: "npm:^18.2.0" + dompurify: "npm:^2.5.7" + react: "npm:^18.3.1" + react-dom: "npm:^18.3.1" tgui: "workspace:*" tgui-dev-server: "workspace:*" tgui-polyfill: "workspace:*" @@ -18781,9 +18797,9 @@ __metadata: version: 0.0.0-use.local resolution: "tgui-polyfill@workspace:packages/tgui-polyfill" dependencies: - core-js: "npm:^3.36.1" + core-js: "npm:^3.39.0" regenerator-runtime: "npm:^0.14.1" - terser: "npm:^5.30.2" + terser: "npm:^5.36.0" unfetch: "npm:^5.0.0" languageName: unknown linkType: soft @@ -18792,11 +18808,11 @@ __metadata: version: 0.0.0-use.local resolution: "tgui-say@workspace:packages/tgui-say" dependencies: - "@types/react": "npm:^18.2.74" - "@types/react-dom": "npm:^18.2.24" + "@types/react": "npm:^18.3.12" + "@types/react-dom": "npm:^18.3.1" common: "workspace:*" - react: "npm:^18.2.0" - react-dom: "npm:^18.2.0" + react: "npm:^18.3.1" + react-dom: "npm:^18.3.1" tgui: "workspace:*" tgui-polyfill: "workspace:*" languageName: unknown @@ -18806,15 +18822,15 @@ __metadata: version: 0.0.0-use.local resolution: "tgui-workspace@workspace:." dependencies: - "@swc/core": "npm:^1.4.11" - "@swc/jest": "npm:^0.2.36" - "@types/jest": "npm:^29.5.12" - "@types/node": "npm:^20.12.3" - "@types/webpack-env": "npm:^1.18.4" - "@typescript-eslint/parser": "npm:^7.5.0" - "@typescript-eslint/utils": "npm:^7.5.0" - css-loader: "npm:^6.10.0" - esbuild-loader: "npm:^4.1.0" + "@swc/core": "npm:^1.9.1" + "@swc/jest": "npm:^0.2.37" + "@types/jest": "npm:^29.5.14" + "@types/node": "npm:^22.9.0" + "@types/webpack-env": "npm:^1.18.5" + "@typescript-eslint/parser": "npm:^8.13.0" + "@typescript-eslint/utils": "npm:^8.13.0" + css-loader: "npm:^7.1.2" + esbuild-loader: "npm:^4.2.2" eslint: "npm:^8.57.0" eslint-config-prettier: "npm:^9.1.0" eslint-plugin-react: "npm:^7.34.1" @@ -18825,17 +18841,17 @@ __metadata: jest: "npm:^29.7.0" jest-circus: "npm:^29.7.0" jest-environment-jsdom: "npm:^29.7.0" - jsdom: "npm:^22.1.0" - mini-css-extract-plugin: "npm:^2.8.1" + jsdom: "npm:^25.0.1" + mini-css-extract-plugin: "npm:^2.9.2" prettier: "npm:^3.2.5" - sass: "npm:^1.72.0" - sass-loader: "npm:^14.1.1" - style-loader: "npm:^3.3.4" + sass: "npm:^1.80.6" + sass-loader: "npm:^14.2.1" + style-loader: "npm:^4.0.0" swc-loader: "npm:^0.2.6" - typescript: "npm:^5.4.3" + typescript: "npm:^5.6.3" url-loader: "npm:^4.1.1" - webpack: "npm:^5.91.0" - webpack-bundle-analyzer: "npm:^4.10.1" + webpack: "npm:^5.96.1" + webpack-bundle-analyzer: "npm:^4.10.2" webpack-cli: "npm:^5.1.4" languageName: unknown linkType: soft @@ -18846,25 +18862,34 @@ __metadata: dependencies: "@popperjs/core": "npm:^2.11.8" "@types/marked": "npm:4.3.2" - "@types/react": "npm:^18.2.74" + "@types/react": "npm:^18.3.12" blob-polyfill: "npm:^9.0.20240710" common: "workspace:*" - dateformat: "npm:^4.6.3" - dompurify: "npm:^2.4.9" + dateformat: "npm:^5.0.3" + dompurify: "npm:^2.5.7" file-extension-icon-js: "npm:^1.1.6" - highlight.js: "npm:^11.9.0" + highlight.js: "npm:^11.10.0" jest: "npm:^29.7.0" js-yaml: "npm:^4.1.0" marked: "npm:^4.3.0" - react: "npm:^18.2.0" - react-dom: "npm:^18.2.0" + react: "npm:^18.3.1" + react-dom: "npm:^18.3.1" react-popper: "npm:^2.3.0" - tgui-core: "npm:^1.1.18" + tgui-core: "npm:^1.2.0" tgui-dev-server: "workspace:*" tgui-polyfill: "workspace:*" languageName: unknown linkType: soft +"thread-stream@npm:^3.0.0": + version: 3.1.0 + resolution: "thread-stream@npm:3.1.0" + dependencies: + real-require: "npm:^0.2.0" + checksum: 10c0/c36118379940b77a6ef3e6f4d5dd31e97b8210c3f7b9a54eb8fe6358ab173f6d0acfaf69b9c3db024b948c0c5fd2a7df93e2e49151af02076b35ada3205ec9a6 + languageName: node + linkType: hard + "throat@npm:^5.0.0": version: 5.0.0 resolution: "throat@npm:5.0.0" @@ -18915,10 +18940,21 @@ __metadata: languageName: node linkType: hard -"tiny-lru@npm:^8.0.1": - version: 8.0.2 - resolution: "tiny-lru@npm:8.0.2" - checksum: 10c0/32dc73db748ae50bf43498f81150ed23922c924d7a3665ea240c7041abbbd5e8667c05328fd520ca923b4d10b89e69a4ba671365eaac221c6f7eb8b898530506 +"tldts-core@npm:^6.1.58": + version: 6.1.58 + resolution: "tldts-core@npm:6.1.58" + checksum: 10c0/aadb37cad88c8ab59042471f6de7c269f9e4db4fc0b644787176ddc7ed1c95ebd486071836a3fc6e09c59421040a7002cc61b36c983eb66938630536aa042299 + languageName: node + linkType: hard + +"tldts@npm:^6.1.32": + version: 6.1.58 + resolution: "tldts@npm:6.1.58" + dependencies: + tldts-core: "npm:^6.1.58" + bin: + tldts: bin/cli.js + checksum: 10c0/dc2c95cf84e9bde5a86b37d3fd0e2d37cd3c1a9057cb122663899368ee45fa2b12a9d4848cb67785bf3a9a2bf9323bfac4c2ffadb815e1a6948b3e053c06f848 languageName: node linkType: hard @@ -18983,6 +19019,13 @@ __metadata: languageName: node linkType: hard +"toad-cache@npm:^3.7.0": + version: 3.7.0 + resolution: "toad-cache@npm:3.7.0" + checksum: 10c0/7dae2782ee20b22c9798bb8b71dec7ec6a0091021d2ea9dd6e8afccab6b65b358fdba49a02209fac574499702e2c000660721516c87c2538d1b2c0ba03e8c0c3 + languageName: node + linkType: hard + "toidentifier@npm:1.0.1": version: 1.0.1 resolution: "toidentifier@npm:1.0.1" @@ -18997,7 +19040,7 @@ __metadata: languageName: node linkType: hard -"tough-cookie@npm:^4.0.0": +"tough-cookie@npm:^4.0.0, tough-cookie@npm:^4.1.2": version: 4.1.4 resolution: "tough-cookie@npm:4.1.4" dependencies: @@ -19009,15 +19052,12 @@ __metadata: languageName: node linkType: hard -"tough-cookie@npm:^4.1.2": - version: 4.1.3 - resolution: "tough-cookie@npm:4.1.3" +"tough-cookie@npm:^5.0.0": + version: 5.0.0 + resolution: "tough-cookie@npm:5.0.0" dependencies: - psl: "npm:^1.1.33" - punycode: "npm:^2.1.1" - universalify: "npm:^0.2.0" - url-parse: "npm:^1.5.3" - checksum: 10c0/4fc0433a0cba370d57c4b240f30440c848906dee3180bb6e85033143c2726d322e7e4614abb51d42d111ebec119c4876ed8d7247d4113563033eebbc1739c831 + tldts: "npm:^6.1.32" + checksum: 10c0/4a69c885bf6f45c5a64e60262af99e8c0d58a33bd3d0ce5da62121eeb9c00996d0128a72df8fc4614cbde59cc8b70aa3e21e4c3c98c2bbde137d7aba7fa00124 languageName: node linkType: hard @@ -19039,12 +19079,12 @@ __metadata: languageName: node linkType: hard -"tr46@npm:^4.1.1": - version: 4.1.1 - resolution: "tr46@npm:4.1.1" +"tr46@npm:^5.0.0": + version: 5.0.0 + resolution: "tr46@npm:5.0.0" dependencies: - punycode: "npm:^2.3.0" - checksum: 10c0/92085dcf186f56a49ba4124a581d9ae6a5d0cd4878107c34e2e670b9ddc49da85e4950084bb3e75015195cc23f37ae1c02d45064e94dd6018f5e789aa51d93a8 + punycode: "npm:^2.3.1" + checksum: 10c0/1521b6e7bbc8adc825c4561480f9fe48eb2276c81335eed9fa610aa4c44a48a3221f78b10e5f18b875769eb3413e30efbf209ed556a17a42aa8d690df44b7bee languageName: node linkType: hard @@ -19055,12 +19095,12 @@ __metadata: languageName: node linkType: hard -"ts-api-utils@npm:^1.0.1": - version: 1.3.0 - resolution: "ts-api-utils@npm:1.3.0" +"ts-api-utils@npm:^1.3.0": + version: 1.4.0 + resolution: "ts-api-utils@npm:1.4.0" peerDependencies: typescript: ">=4.2.0" - checksum: 10c0/f54a0ba9ed56ce66baea90a3fa087a484002e807f28a8ccb2d070c75e76bde64bd0f6dce98b3802834156306050871b67eec325cb4e918015a360a3f0868c77c + checksum: 10c0/1b2bfa50ea52771d564bb143bb69010d25cda03ed573095fbac9b86f717012426443af6647e00e3db70fca60360482a30c1be7cf73c3521c321f6bf5e3594ea0 languageName: node linkType: hard @@ -19308,23 +19348,23 @@ __metadata: languageName: node linkType: hard -"typescript@npm:^5.4.3": - version: 5.4.3 - resolution: "typescript@npm:5.4.3" +"typescript@npm:^5.6.3": + version: 5.6.3 + resolution: "typescript@npm:5.6.3" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/22443a8760c3668e256c0b34b6b45c359ef6cecc10c42558806177a7d500ab1a7d7aac1f976d712e26989ddf6731d2fbdd3212b7c73290a45127c1c43ba2005a + checksum: 10c0/44f61d3fb15c35359bc60399cb8127c30bae554cd555b8e2b46d68fa79d680354b83320ad419ff1b81a0bdf324197b29affe6cc28988cd6a74d4ac60c94f9799 languageName: node linkType: hard -"typescript@patch:typescript@npm%3A^5.4.3#optional!builtin": - version: 5.4.3 - resolution: "typescript@patch:typescript@npm%3A5.4.3#optional!builtin::version=5.4.3&hash=5adc0c" +"typescript@patch:typescript@npm%3A^5.6.3#optional!builtin": + version: 5.6.3 + resolution: "typescript@patch:typescript@npm%3A5.6.3#optional!builtin::version=5.6.3&hash=8c6c40" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/6e51f8b7e6ec55b897b9e56b67e864fe8f44e30f4a14357aad5dc0f7432db2f01efc0522df0b6c36d361c51f2dc3dcac5c832efd96a404cfabf884e915d38828 + checksum: 10c0/7c9d2e07c81226d60435939618c91ec2ff0b75fbfa106eec3430f0fcf93a584bc6c73176676f532d78c3594fe28a54b36eb40b3d75593071a7ec91301533ace7 languageName: node linkType: hard @@ -19356,10 +19396,10 @@ __metadata: languageName: node linkType: hard -"undici-types@npm:~5.26.4": - version: 5.26.5 - resolution: "undici-types@npm:5.26.5" - checksum: 10c0/bb673d7876c2d411b6eb6c560e0c571eef4a01c1c19925175d16e3a30c4c428181fb8d7ae802a261f283e4166a0ac435e2f505743aa9e45d893f9a3df017b501 +"undici-types@npm:~6.19.8": + version: 6.19.8 + resolution: "undici-types@npm:6.19.8" + checksum: 10c0/078afa5990fba110f6824823ace86073b4638f1d5112ee26e790155f481f2a868cc3e0615505b6f4282bdf74a3d8caad715fd809e870c2bb0704e3ea6082f344 languageName: node linkType: hard @@ -19542,17 +19582,17 @@ __metadata: languageName: node linkType: hard -"update-browserslist-db@npm:^1.0.13": - version: 1.0.13 - resolution: "update-browserslist-db@npm:1.0.13" +"update-browserslist-db@npm:^1.1.1": + version: 1.1.1 + resolution: "update-browserslist-db@npm:1.1.1" dependencies: - escalade: "npm:^3.1.1" - picocolors: "npm:^1.0.0" + escalade: "npm:^3.2.0" + picocolors: "npm:^1.1.0" peerDependencies: browserslist: ">= 4.21.0" bin: update-browserslist-db: cli.js - checksum: 10c0/e52b8b521c78ce1e0c775f356cd16a9c22c70d25f3e01180839c407a5dc787fb05a13f67560cbaf316770d26fa99f78f1acd711b1b54a4f35d4820d4ea7136e6 + checksum: 10c0/536a2979adda2b4be81b07e311bd2f3ad5e978690987956bc5f514130ad50cac87cd22c710b686d79731e00fbee8ef43efe5fcd72baa241045209195d43dcc80 languageName: node linkType: hard @@ -19574,7 +19614,7 @@ __metadata: languageName: node linkType: hard -"uri-js@npm:^4.2.2, uri-js@npm:^4.4.1": +"uri-js@npm:^4.2.2": version: 4.4.1 resolution: "uri-js@npm:4.4.1" dependencies: @@ -19812,6 +19852,15 @@ __metadata: languageName: node linkType: hard +"w3c-xmlserializer@npm:^5.0.0": + version: 5.0.0 + resolution: "w3c-xmlserializer@npm:5.0.0" + dependencies: + xml-name-validator: "npm:^5.0.0" + checksum: 10c0/8712774c1aeb62dec22928bf1cdfd11426c2c9383a1a63f2bcae18db87ca574165a0fbe96b312b73652149167ac6c7f4cf5409f2eb101d9c805efe0e4bae798b + languageName: node + linkType: hard + "walker@npm:^1.0.7, walker@npm:^1.0.8, walker@npm:~1.0.5": version: 1.0.8 resolution: "walker@npm:1.0.8" @@ -19903,9 +19952,9 @@ __metadata: languageName: node linkType: hard -"webpack-bundle-analyzer@npm:^4.10.1": - version: 4.10.1 - resolution: "webpack-bundle-analyzer@npm:4.10.1" +"webpack-bundle-analyzer@npm:^4.10.2": + version: 4.10.2 + resolution: "webpack-bundle-analyzer@npm:4.10.2" dependencies: "@discoveryjs/json-ext": "npm:0.5.7" acorn: "npm:^8.0.4" @@ -19915,14 +19964,13 @@ __metadata: escape-string-regexp: "npm:^4.0.0" gzip-size: "npm:^6.0.0" html-escaper: "npm:^2.0.2" - is-plain-object: "npm:^5.0.0" opener: "npm:^1.5.2" picocolors: "npm:^1.0.0" sirv: "npm:^2.0.3" ws: "npm:^7.3.1" bin: webpack-bundle-analyzer: lib/bin/analyzer.js - checksum: 10c0/6a94c8f6aa03296fb2eb00d6ad3b27bd5c551590fd253772bc61debf3177414d42701014079d4f85c74ba1ca685ae9f0cb4063812b58c21f294d108e9908e5cd + checksum: 10c0/00603040e244ead15b2d92981f0559fa14216381349412a30070a7358eb3994cd61a8221d34a3b3fb8202dc3d1c5ee1fbbe94c5c52da536e5b410aa1cf279a48 languageName: node linkType: hard @@ -20111,20 +20159,19 @@ __metadata: languageName: node linkType: hard -"webpack@npm:^5.91.0": - version: 5.91.0 - resolution: "webpack@npm:5.91.0" +"webpack@npm:^5.96.1": + version: 5.96.1 + resolution: "webpack@npm:5.96.1" dependencies: - "@types/eslint-scope": "npm:^3.7.3" - "@types/estree": "npm:^1.0.5" + "@types/eslint-scope": "npm:^3.7.7" + "@types/estree": "npm:^1.0.6" "@webassemblyjs/ast": "npm:^1.12.1" "@webassemblyjs/wasm-edit": "npm:^1.12.1" "@webassemblyjs/wasm-parser": "npm:^1.12.1" - acorn: "npm:^8.7.1" - acorn-import-assertions: "npm:^1.9.0" - browserslist: "npm:^4.21.10" + acorn: "npm:^8.14.0" + browserslist: "npm:^4.24.0" chrome-trace-event: "npm:^1.0.2" - enhanced-resolve: "npm:^5.16.0" + enhanced-resolve: "npm:^5.17.1" es-module-lexer: "npm:^1.2.1" eslint-scope: "npm:5.1.1" events: "npm:^3.2.0" @@ -20144,7 +20191,7 @@ __metadata: optional: true bin: webpack: bin/webpack.js - checksum: 10c0/74a3e0ea1c9a492accf035317f31769ffeaaab415811524b9f17bc7bf7012c5b6e1a9860df5ca6903f3ae2618727b801eb47d9351a2595dfffb25941d368b88c + checksum: 10c0/ae6052fde9a546f79f14987b65823ba4024c6642a8489339ecfee7a351dff93325842aad453295bbdc6b65fb1690e4ef07529db63aa84ece55c7869e991a0039 languageName: node linkType: hard @@ -20184,6 +20231,15 @@ __metadata: languageName: node linkType: hard +"whatwg-encoding@npm:^3.1.1": + version: 3.1.1 + resolution: "whatwg-encoding@npm:3.1.1" + dependencies: + iconv-lite: "npm:0.6.3" + checksum: 10c0/273b5f441c2f7fda3368a496c3009edbaa5e43b71b09728f90425e7f487e5cef9eb2b846a31bd760dd8077739c26faf6b5ca43a5f24033172b003b72cf61a93e + languageName: node + linkType: hard + "whatwg-fetch@npm:^3.4.1": version: 3.6.20 resolution: "whatwg-fetch@npm:3.6.20" @@ -20205,6 +20261,13 @@ __metadata: languageName: node linkType: hard +"whatwg-mimetype@npm:^4.0.0": + version: 4.0.0 + resolution: "whatwg-mimetype@npm:4.0.0" + checksum: 10c0/a773cdc8126b514d790bdae7052e8bf242970cebd84af62fb2f35a33411e78e981f6c0ab9ed1fe6ec5071b09d5340ac9178e05b52d35a9c4bcf558ba1b1551df + languageName: node + linkType: hard + "whatwg-url@npm:^11.0.0": version: 11.0.0 resolution: "whatwg-url@npm:11.0.0" @@ -20215,13 +20278,13 @@ __metadata: languageName: node linkType: hard -"whatwg-url@npm:^12.0.0, whatwg-url@npm:^12.0.1": - version: 12.0.1 - resolution: "whatwg-url@npm:12.0.1" +"whatwg-url@npm:^14.0.0": + version: 14.0.0 + resolution: "whatwg-url@npm:14.0.0" dependencies: - tr46: "npm:^4.1.1" + tr46: "npm:^5.0.0" webidl-conversions: "npm:^7.0.0" - checksum: 10c0/99f506b2c996704fa0fc5c70d8e5e27dce15492db2921c99cf319a8d56cb61641f5c06089f63e1ab1983de9fd6a63c3c112a90cdb5fe352d7a846979b10df566 + checksum: 10c0/ac32e9ba9d08744605519bbe9e1371174d36229689ecc099157b6ba102d4251a95e81d81f3d80271eb8da182eccfa65653f07f0ab43ea66a6934e643fd091ba9 languageName: node linkType: hard @@ -20666,9 +20729,9 @@ __metadata: languageName: node linkType: hard -"ws@npm:^8.11.0, ws@npm:^8.13.0, ws@npm:^8.16.0": - version: 8.16.0 - resolution: "ws@npm:8.16.0" +"ws@npm:^8.11.0, ws@npm:^8.18.0": + version: 8.18.0 + resolution: "ws@npm:8.18.0" peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ">=5.0.2" @@ -20677,7 +20740,7 @@ __metadata: optional: true utf-8-validate: optional: true - checksum: 10c0/a7783bb421c648b1e622b423409cb2a58ac5839521d2f689e84bc9dc41d59379c692dd405b15a997ea1d4c0c2e5314ad707332d0c558f15232d2bc07c0b4618a + checksum: 10c0/25eb33aff17edcb90721ed6b0eb250976328533ad3cd1a28a274bd263682e7296a6591ff1436d6cbc50fa67463158b062f9d1122013b361cec99a05f84680e06 languageName: node linkType: hard @@ -20695,6 +20758,13 @@ __metadata: languageName: node linkType: hard +"xml-name-validator@npm:^5.0.0": + version: 5.0.0 + resolution: "xml-name-validator@npm:5.0.0" + checksum: 10c0/3fcf44e7b73fb18be917fdd4ccffff3639373c7cb83f8fc35df6001fecba7942f1dbead29d91ebb8315e2f2ff786b508f0c9dc0215b6353f9983c6b7d62cb1f5 + languageName: node + linkType: hard + "xmlchars@npm:^2.2.0": version: 2.2.0 resolution: "xmlchars@npm:2.2.0" From 438b16bb554fe5b864d10ee73622aeb6afdcf8b3 Mon Sep 17 00:00:00 2001 From: Fikou <23585223+Fikou@users.noreply.github.com> Date: Fri, 8 Nov 2024 13:28:53 +0100 Subject: [PATCH 21/27] fixes borgs linking to ais in mechs cards and modsuits (#87737) --- code/__HELPERS/level_traits.dm | 3 ++- code/__HELPERS/mobs.dm | 9 ++++----- code/modules/mob/living/carbon/alien/alien.dm | 8 ++++---- code/modules/mob/living/living.dm | 6 +++--- code/modules/mob/living/living_defines.dm | 2 +- code/modules/mob/living/silicon/robot/robot.dm | 13 +++++++------ .../mob/living/silicon/robot/robot_defines.dm | 3 +-- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/code/__HELPERS/level_traits.dm b/code/__HELPERS/level_traits.dm index 0e489f3f57239..f78e8476b2841 100644 --- a/code/__HELPERS/level_traits.dm +++ b/code/__HELPERS/level_traits.dm @@ -11,7 +11,7 @@ GLOBAL_VAR(station_level_z_scratch) // Called a lot, somewhat slow, so has its own cache #define is_station_level(z_level) \ ( \ - (z_level) && \ + (z_level) && ( \ ( \ /* The right hand side of this guarantees that we'll have the space to fill later on, while also not failing the condition */ \ (GLOB.station_levels_cache.len < (GLOB.station_level_z_scratch = (z_level)) && (GLOB.station_levels_cache.len = GLOB.station_level_z_scratch)) \ @@ -19,6 +19,7 @@ GLOBAL_VAR(station_level_z_scratch) ) \ ? (GLOB.station_levels_cache[GLOB.station_level_z_scratch] = !!SSmapping.level_trait(GLOB.station_level_z_scratch, ZTRAIT_STATION)) \ : GLOB.station_levels_cache[GLOB.station_level_z_scratch] \ + ) \ ) #define is_mining_level(z) SSmapping.level_trait(z, ZTRAIT_MINING) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 01d1e42013ff6..92ebff1cc4e29 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -489,7 +489,7 @@ GLOBAL_LIST_INIT(skin_tone_names, list( . += borg //Returns a list of AI's -/proc/active_ais(check_mind=FALSE, z = null, skip_syndicate, only_syndicate) +/proc/active_ais(check_mind = FALSE, z = null, skip_syndicate = FALSE, only_syndicate = FALSE) . = list() for(var/mob/living/silicon/ai/ai as anything in GLOB.ai_list) if(ai.stat == DEAD) @@ -501,10 +501,9 @@ GLOBAL_LIST_INIT(skin_tone_names, list( continue if(only_syndicate && !syndie_ai) continue - if(check_mind) - if(!ai.mind) - continue - if(z && !(z == ai.z) && (!is_station_level(z) || !is_station_level(ai.z))) //if a Z level was specified, AND the AI is not on the same level, AND either is off the station... + if(check_mind && !ai.mind) + continue + if(!isnull(z) && z != ai.z && (!is_station_level(z) || !is_station_level(ai.z))) //if a Z level was specified, AND the AI is not on the same level, AND either is off the station... continue . += ai diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index 663001c2cc7b0..120633acdfe4a 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -139,7 +139,7 @@ Des: Removes all infected images from the alien. ) new_xeno.setDir(dir) - new_xeno.change_name(name, real_name, numba) + new_xeno.change_name(name, real_name, identifier) if(mind) mind.name = new_xeno.real_name @@ -153,7 +153,7 @@ Des: Removes all infected images from the alien. qdel(src) /// Changes the name of the xeno we are evolving into in order to keep the same numerical identifier the old xeno had. -/mob/living/carbon/alien/proc/change_name(old_name, old_real_name, old_number) +/mob/living/carbon/alien/proc/change_name(old_name, old_real_name, old_identifier) if(!alien_name_regex.Find(old_name)) // check to make sure there's no admins doing funny stuff with naming these aliens name = old_name real_name = old_real_name @@ -162,8 +162,8 @@ Des: Removes all infected images from the alien. if(!unique_name) return - if(old_number != 0) - numba = old_number + if(old_identifier != 0) + identifier = old_identifier name = initial(name) // prevent chicanery like two different numerical identifiers tied to the same mob set_name() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index a1aca6ea9bf61..01b8bb300ea3b 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1961,9 +1961,9 @@ GLOBAL_LIST_EMPTY(fire_appearances) user.put_in_hands(holder) /mob/living/proc/set_name() - if(numba == 0) - numba = rand(1, 1000) - name = "[name] ([numba])" + if(identifier == 0) + identifier = rand(1, 999) + name = "[name] ([identifier])" real_name = name /mob/living/proc/mob_try_pickup(mob/living/user, instant=FALSE) diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index a0061cb618f41..37d161d4ffa50 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -148,7 +148,7 @@ ///if a mob's name should be appended with an id when created e.g. Mob (666) var/unique_name = FALSE ///the id a mob gets when it's created - var/numba = 0 + var/identifier = 0 ///these will be yielded from butchering with a probability chance equal to the butcher item's effectiveness var/list/butcher_results = null diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index d88573510d3d1..88876e0233e52 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -28,8 +28,6 @@ inv2 = new /atom/movable/screen/robot/module2() inv3 = new /atom/movable/screen/robot/module3() - ident = rand(1, 999) - previous_health = health if(ispath(cell)) @@ -184,6 +182,9 @@ model.transform_to(model_list[input_model]) +/mob/living/silicon/robot/set_name() //we have our name-making proc to call after we make our mmi, just set identifier here + if(identifier == 0) + identifier = rand(1, 999) /// Used to setup the a basic and (somewhat) unique name for the robot. /mob/living/silicon/robot/proc/setup_default_name() @@ -219,7 +220,7 @@ /mob/living/silicon/robot/proc/get_standard_name() - return "[(designation ? "[designation] " : "")][mmi.braintype]-[ident]" + return "[(designation ? "[designation] " : "")][mmi.braintype]-[identifier]" /mob/living/silicon/robot/proc/ionpulse() if(!ionpulse_on) @@ -842,7 +843,7 @@ shell = TRUE braintype = "AI Shell" - name = "Empty AI Shell-[ident]" + name = "Empty AI Shell-[identifier]" real_name = name GLOB.available_ai_shells |= src if(!QDELETED(builtInCamera)) @@ -861,7 +862,7 @@ qdel(boris) shell = FALSE GLOB.available_ai_shells -= src - name = "Unformatted Cyborg-[ident]" + name = "Unformatted Cyborg-[identifier]" real_name = name if(!QDELETED(builtInCamera)) builtInCamera.c_tag = real_name @@ -874,7 +875,7 @@ * * AI - AI unit that initiated the deployment into the AI shell */ /mob/living/silicon/robot/proc/deploy_init(mob/living/silicon/ai/AI) - real_name = "[AI.real_name] [designation] Shell-[ident]" + real_name = "[AI.real_name] [designation] Shell-[identifier]" name = real_name if(!QDELETED(builtInCamera)) builtInCamera.c_tag = real_name //update the camera name too diff --git a/code/modules/mob/living/silicon/robot/robot_defines.dm b/code/modules/mob/living/silicon/robot/robot_defines.dm index e85dba4a134d3..dd4ba8b6bd499 100644 --- a/code/modules/mob/living/silicon/robot/robot_defines.dm +++ b/code/modules/mob/living/silicon/robot/robot_defines.dm @@ -15,6 +15,7 @@ designation = "Default" //used for displaying the prefix & getting the current model of cyborg has_limbs = TRUE hud_type = /datum/hud/robot + unique_name = TRUE ///Represents the cyborg's model (engineering, medical, etc.) var/obj/item/robot_model/model = null @@ -110,8 +111,6 @@ var/ai_lockdown = FALSE ///Timer that allows the borg to self-unlock after a set amount of time var/lockdown_timer = null - ///Random serial number generated for each cyborg upon its initialization - var/ident = 0 var/locked = TRUE req_one_access = list(ACCESS_ROBOTICS) From 7c9da8c8bcab91d50563ab1dd1cc7a12a9ed1f71 Mon Sep 17 00:00:00 2001 From: "tgstation-ci[bot]" <179393467+tgstation-ci[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 12:29:13 +0000 Subject: [PATCH 22/27] Automatic changelog for PR #87737 [ci skip] --- html/changelogs/AutoChangeLog-pr-87737.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-87737.yml diff --git a/html/changelogs/AutoChangeLog-pr-87737.yml b/html/changelogs/AutoChangeLog-pr-87737.yml new file mode 100644 index 0000000000000..63f172548d766 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-87737.yml @@ -0,0 +1,4 @@ +author: "Fikou" +delete-after: True +changes: + - bugfix: "fixes borgs linking to ais in mechs cards and modsuits" \ No newline at end of file From 4664b630c56df041136c0141c35b976285d6ce0f Mon Sep 17 00:00:00 2001 From: Jacquerel Date: Fri, 8 Nov 2024 15:12:48 +0000 Subject: [PATCH 23/27] Living Flesh limbs won't try to grab underfloor objects (#87736) ## About The Pull Request There were checks in living limbs that were checking the wrong thing, at least one of which was introduced by a feature change in a PR I merged but didn't notice. Notably: - We were checking if the person with the limb was invisible, not the thing they were trying to touch. - We were checking if the person with the limb was anchored, not the thing they were trying to grab. Now your arm will no longer reach out and grab wires that are under the floor. Additionally to this: - I made all of the output say "Your left arm" or "Your left leg" instead of "Your flesh left leg" because it sounded stupid. - I removed an unused argument from `can_be_pulled` because it was confusing me when I looked at the proc. - I reworded some of the user feedback messages because "the thing pretending to be your left arm feels funny" just isn't very evocative. The diff is long because I reversed the order of arm/leg operations because the leg block is much smaller :clueless: ## Why It's Good For The Game Fixes bug. I like it more. ## Changelog :cl: fix: Living Limbs no longer try to grab things that are under the floor. spellcheck: Living Limb feedback messages now don't redundantly specify that they are flesh arms. /:cl: --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/datums/components/wormborn.dm | 2 +- code/game/atoms_movable.dm | 4 +- code/game/machinery/doors/airlock.dm | 2 +- code/game/objects/items/theft_tools.dm | 2 +- .../mob/living/basic/heretic/flesh_worm.dm | 2 +- .../mob/living/basic/pets/orbie/orbie.dm | 2 +- .../mob/living/basic/ruin_defender/flesh.dm | 72 ++++++++++--------- code/modules/mob/living/living.dm | 4 +- code/modules/religion/religion_structures.dm | 2 +- 9 files changed, 50 insertions(+), 42 deletions(-) diff --git a/code/datums/components/wormborn.dm b/code/datums/components/wormborn.dm index 1841dbf38cc3e..05f833fc28fcd 100644 --- a/code/datums/components/wormborn.dm +++ b/code/datums/components/wormborn.dm @@ -50,7 +50,7 @@ /mob/living/basic/wizard_worm/has_gravity(turf/gravity_turf) return TRUE -/mob/living/basic/wizard_worm/can_be_pulled() +/mob/living/basic/wizard_worm/can_be_pulled(user, force) return FALSE /mob/living/basic/wizard_worm/Initialize(mapload, spawn_bodyparts = TRUE) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 8acbf59b4d821..10aa07e624232 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -514,7 +514,7 @@ /atom/movable/proc/start_pulling(atom/movable/pulled_atom, state, force = move_force, supress_message = FALSE) if(QDELETED(pulled_atom)) return FALSE - if(!(pulled_atom.can_be_pulled(src, state, force))) + if(!(pulled_atom.can_be_pulled(src, force))) return FALSE // If we're pulling something then drop what we're currently pulling and pull this instead. @@ -1643,7 +1643,7 @@ /atom/movable/proc/get_cell(atom/movable/interface, mob/user) return -/atom/movable/proc/can_be_pulled(user, grab_state, force) +/atom/movable/proc/can_be_pulled(user, force) if(src == user || !isturf(loc)) return FALSE if(SEND_SIGNAL(src, COMSIG_ATOM_CAN_BE_PULLED, user) & COMSIG_ATOM_CANT_PULL) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 04f67cee1c1ba..39909c64cf994 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1816,7 +1816,7 @@ if(istype(mover) && (mover.pass_flags & PASSGLASS)) return !opacity -/obj/structure/fluff/airlock_filler/can_be_pulled(user, grab_state, force) +/obj/structure/fluff/airlock_filler/can_be_pulled(user, force) return FALSE /obj/structure/fluff/airlock_filler/singularity_act() diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm index a2efbe2d4beba..6f09f58169521 100644 --- a/code/game/objects/items/theft_tools.dm +++ b/code/game/objects/items/theft_tools.dm @@ -161,7 +161,7 @@ /obj/item/nuke_core/supermatter_sliver/attack_tk(mob/user) // no TK dusting memes return -/obj/item/nuke_core/supermatter_sliver/can_be_pulled(user) // no drag memes +/obj/item/nuke_core/supermatter_sliver/can_be_pulled(user, force) // no drag memes return FALSE /obj/item/nuke_core/supermatter_sliver/attackby(obj/item/W, mob/living/user, params) diff --git a/code/modules/mob/living/basic/heretic/flesh_worm.dm b/code/modules/mob/living/basic/heretic/flesh_worm.dm index cddd34ba44184..13372c726887e 100644 --- a/code/modules/mob/living/basic/heretic/flesh_worm.dm +++ b/code/modules/mob/living/basic/heretic/flesh_worm.dm @@ -56,7 +56,7 @@ /mob/living/basic/heretic_summon/armsy/has_gravity(turf/gravity_turf) return TRUE -/mob/living/basic/heretic_summon/armsy/can_be_pulled() +/mob/living/basic/heretic_summon/armsy/can_be_pulled(user, force) return FALSE // The component does this but not on the head. We don't want the head to be pulled either. /mob/living/basic/heretic_summon/armsy/proc/build_tail(worm_length) diff --git a/code/modules/mob/living/basic/pets/orbie/orbie.dm b/code/modules/mob/living/basic/pets/orbie/orbie.dm index 85d82e92515f0..b4099a8c6344c 100644 --- a/code/modules/mob/living/basic/pets/orbie/orbie.dm +++ b/code/modules/mob/living/basic/pets/orbie/orbie.dm @@ -77,7 +77,7 @@ happy_state = !happy_state update_appearance() -/mob/living/basic/orbie/can_be_pulled(user, grab_state, force) +/mob/living/basic/orbie/can_be_pulled(user, force) return FALSE /mob/living/basic/orbie/proc/on_level_up(datum/source, new_level) diff --git a/code/modules/mob/living/basic/ruin_defender/flesh.dm b/code/modules/mob/living/basic/ruin_defender/flesh.dm index c5ff2fb90e740..550484a75c51d 100644 --- a/code/modules/mob/living/basic/ruin_defender/flesh.dm +++ b/code/modules/mob/living/basic/ruin_defender/flesh.dm @@ -1,4 +1,10 @@ +/// Chance per second to print a warning text +#define LIVING_FLESH_WARN_CHANCE 3 +/// Chance per second to perform an unwanted interaction +#define LIVING_FLESH_INTERFERENCE_CHANCE 1.5 +/// Chance to caress instead of grab something nearby without combat mode #define LIVING_FLESH_TOUCH_CHANCE 30 +/// Chance to punch instead of grab something nearby in combat mode #define LIVING_FLESH_COMBAT_TOUCH_CHANCE 70 /datum/ai_controller/basic_controller/living_limb_flesh @@ -59,47 +65,47 @@ if(isnull(current_bodypart) || isnull(current_bodypart.owner)) return var/mob/living/carbon/human/victim = current_bodypart.owner - if(SPT_PROB(3, SSMOBS_DT)) - to_chat(victim, span_warning("The thing posing as your limb makes you feel funny...")) //warn em - //firstly as a sideeffect we drain nutrition from our host + if(SPT_PROB(LIVING_FLESH_WARN_CHANCE, SSMOBS_DT)) + to_chat(victim, span_warning("The skin on your [current_bodypart.plaintext_zone] crawls.")) + victim.adjust_nutrition(-1.5) - if(!SPT_PROB(1.5, SSMOBS_DT)) + if(!SPT_PROB(LIVING_FLESH_INTERFERENCE_CHANCE, SSMOBS_DT)) return - if(istype(current_bodypart, /obj/item/bodypart/arm)) - var/list/candidates = list() - for(var/atom/movable/movable in orange(victim, 1)) - if(movable == victim) - continue - if(!victim.CanReach(movable) || victim.invisibility) - continue - candidates += movable - if(!length(candidates)) - return - var/atom/movable/candidate = pick(candidates) - if(isnull(candidate)) - return - - victim.visible_message(span_warning("[victim]'s [current_bodypart.name] instinctively starts feeling [candidate]!")) - if (!victim.anchored && !prob(victim.combat_mode ? LIVING_FLESH_COMBAT_TOUCH_CHANCE : LIVING_FLESH_TOUCH_CHANCE)) - INVOKE_ASYNC(victim, TYPE_PROC_REF(/atom/movable, start_pulling), candidate, supress_message = TRUE) + if(istype(current_bodypart, /obj/item/bodypart/leg)) + if(HAS_TRAIT(victim, TRAIT_IMMOBILIZED)) return + step(victim, pick(GLOB.cardinals)) + to_chat(victim, span_warning("Your [current_bodypart.plaintext_zone] moves on its own!")) + return - var/active_hand = victim.active_hand_index - var/new_index = (current_bodypart.body_zone == BODY_ZONE_L_ARM) ? LEFT_HANDS : RIGHT_HANDS - if (active_hand != new_index) - victim.swap_hand(new_index, TRUE) - victim.resolve_unarmed_attack(candidate) - if (active_hand != victim.active_hand_index) // Different check in case we failed to swap hands previously due to holding a bulky item - victim.swap_hand(active_hand, TRUE) + var/list/candidates = list() + for(var/atom/movable/movable in orange(victim, 1)) + if(movable == victim) + continue + if(!victim.CanReach(movable) || movable.invisibility > victim.see_invisible) + continue + candidates += movable + if(!length(candidates)) + return + var/atom/movable/candidate = pick(candidates) + if(isnull(candidate)) return - if(HAS_TRAIT(victim, TRAIT_IMMOBILIZED)) + if (!prob(victim.combat_mode ? LIVING_FLESH_COMBAT_TOUCH_CHANCE : LIVING_FLESH_TOUCH_CHANCE) && candidate.can_be_pulled(user = victim, force = victim.pull_force)) + victim.visible_message(span_warning("[victim]'s [current_bodypart.plaintext_zone] suddenly fastens around [candidate]!")) + INVOKE_ASYNC(victim, TYPE_PROC_REF(/atom/movable, start_pulling), candidate, supress_message = TRUE) return - step(victim, pick(GLOB.cardinals)) - to_chat(victim, span_warning("Your [current_bodypart] moves on its own!")) + victim.visible_message(span_warning("[victim]'s [current_bodypart.plaintext_zone] suddenly spasms towards [candidate]!")) + var/active_hand = victim.active_hand_index + var/new_index = (current_bodypart.body_zone == BODY_ZONE_L_ARM) ? LEFT_HANDS : RIGHT_HANDS + if (active_hand != new_index) + victim.swap_hand(new_index, TRUE) + victim.resolve_unarmed_attack(candidate) + if (active_hand != victim.active_hand_index) // Different check in case we failed to swap hands previously due to holding a bulky item + victim.swap_hand(active_hand, TRUE) /mob/living/basic/living_limb_flesh/melee_attack(mob/living/carbon/human/target, list/modifiers, ignore_cooldown) . = ..() @@ -157,7 +163,7 @@ if(!detach_self()) return var/turf/our_location = get_turf(src) - our_location.visible_message(span_warning("[part_owner][part_owner.p_s()] [current_bodypart] begins to convulse wildly!")) + our_location.visible_message(span_warning("[part_owner][part_owner.p_s()] [current_bodypart.plaintext_zone] begins to convulse wildly!")) /mob/living/basic/living_limb_flesh/proc/owner_died(datum/source, gibbed) SIGNAL_HANDLER @@ -200,3 +206,5 @@ #undef LIVING_FLESH_TOUCH_CHANCE #undef LIVING_FLESH_COMBAT_TOUCH_CHANCE +#undef LIVING_FLESH_WARN_CHANCE +#undef LIVING_FLESH_INTERFERENCE_CHANCE diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 01b8bb300ea3b..c0d2e1d4785c0 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -373,7 +373,7 @@ /mob/living/start_pulling(atom/movable/AM, state, force = pull_force, supress_message = FALSE) if(!AM || !src) return FALSE - if(!(AM.can_be_pulled(src, state, force))) + if(!(AM.can_be_pulled(src, force))) return FALSE if(throwing || !(mobility_flags & MOBILITY_PULL)) return FALSE @@ -1890,7 +1890,7 @@ GLOBAL_LIST_EMPTY(fire_appearances) "[C] leaps out of [src]'s way!"))) C.Paralyze(40) -/mob/living/can_be_pulled() +/mob/living/can_be_pulled(user, force) return ..() && !(buckled?.buckle_prevents_pull) diff --git a/code/modules/religion/religion_structures.dm b/code/modules/religion/religion_structures.dm index 1b30d021268cf..8c8783f16eb71 100644 --- a/code/modules/religion/religion_structures.dm +++ b/code/modules/religion/religion_structures.dm @@ -109,7 +109,7 @@ new /obj/effect/decal/cleanable/ash(drop_location()) qdel(src) -/obj/item/ritual_totem/can_be_pulled(user, grab_state, force) +/obj/item/ritual_totem/can_be_pulled(user, force) . = ..() return FALSE //no From f2efb6891a1b37e0cf11e8826c7390d10f00ec64 Mon Sep 17 00:00:00 2001 From: "tgstation-ci[bot]" <179393467+tgstation-ci[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 15:13:08 +0000 Subject: [PATCH 24/27] Automatic changelog for PR #87736 [ci skip] --- html/changelogs/AutoChangeLog-pr-87736.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-87736.yml diff --git a/html/changelogs/AutoChangeLog-pr-87736.yml b/html/changelogs/AutoChangeLog-pr-87736.yml new file mode 100644 index 0000000000000..f5aa63c75db72 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-87736.yml @@ -0,0 +1,5 @@ +author: "Jacquerel" +delete-after: True +changes: + - bugfix: "Living Limbs no longer try to grab things that are under the floor." + - spellcheck: "Living Limb feedback messages now don't redundantly specify that they are flesh arms." \ No newline at end of file From 35e53f5496eb179f0be3a0bb2fd07780331b3102 Mon Sep 17 00:00:00 2001 From: thegrb93 Date: Fri, 8 Nov 2024 10:18:43 -0500 Subject: [PATCH 25/27] Fix oil slime making vegetable oil instead of corn oil (#87730) ## About The Pull Request Fixes bug caused by https://github.com/tgstation/tgstation/commit/b1c5e5e0f6a1edf58b49b238af7d3094da76c69b#diff-aedb81aab354c31e90007bd0ad4e8babf347ac7d6003c3b01da14021ff5a10f4R387 The wiki and code prior both say oil slimes should make corn oil, but they currently make vegetable oil. Since corn oil is needed for nitroglycerin and oil slimes are explosive-centric, it makes sense they should be making corn oil. ## Why It's Good For The Game Fixes: #81036 ## Changelog :cl: fix: Fixes oil slimes making vegetable oil instead of corn oil /:cl: --- code/modules/reagents/chemistry/recipes/slime_extracts.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm index 21d076e949fd7..41622550f8f78 100644 --- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm +++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm @@ -384,7 +384,7 @@ /datum/chemical_reaction/slime/slimeoil - results = list(/datum/reagent/consumable/nutriment/fat/oil = 10) + results = list(/datum/reagent/consumable/nutriment/fat/oil/corn = 10) required_reagents = list(/datum/reagent/blood = 1) required_container = /obj/item/slime_extract/oil From 51572115ae4ac4d3f0e53a02cd135591cd7e7329 Mon Sep 17 00:00:00 2001 From: "tgstation-ci[bot]" <179393467+tgstation-ci[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 15:19:07 +0000 Subject: [PATCH 26/27] Automatic changelog for PR #87730 [ci skip] --- html/changelogs/AutoChangeLog-pr-87730.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-87730.yml diff --git a/html/changelogs/AutoChangeLog-pr-87730.yml b/html/changelogs/AutoChangeLog-pr-87730.yml new file mode 100644 index 0000000000000..2450028e1e18d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-87730.yml @@ -0,0 +1,4 @@ +author: "thegrb93" +delete-after: True +changes: + - bugfix: "Fixes oil slimes making vegetable oil instead of corn oil" \ No newline at end of file From e76ab8d4ac009b014429e3ff907eace26d0fb2a0 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Fri, 8 Nov 2024 18:13:13 +0100 Subject: [PATCH 27/27] Moved the big slapping parts from the misc section to weapons (#87637) --- code/modules/cargo/markets/market_items/misc.dm | 9 --------- code/modules/cargo/markets/market_items/weapons.dm | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/cargo/markets/market_items/misc.dm b/code/modules/cargo/markets/market_items/misc.dm index b0ea89485801c..c53076f737cb6 100644 --- a/code/modules/cargo/markets/market_items/misc.dm +++ b/code/modules/cargo/markets/market_items/misc.dm @@ -134,12 +134,3 @@ stock_min = 3 stock_max = 8 availability_prob = 90 - -/datum/market_item/misc/giant_wrench_parts - name = "Big Slappy parts" - desc = "Cheap illegal Big Slappy parts. The fastest and statistically most dangerous wrench." - item = /obj/item/weaponcrafting/giant_wrench - price_min = CARGO_CRATE_VALUE * 2 - price_max = CARGO_CRATE_VALUE * 5 - stock_max = 1 - availability_prob = 25 diff --git a/code/modules/cargo/markets/market_items/weapons.dm b/code/modules/cargo/markets/market_items/weapons.dm index 12241450ba59a..94aa533c26e3f 100644 --- a/code/modules/cargo/markets/market_items/weapons.dm +++ b/code/modules/cargo/markets/market_items/weapons.dm @@ -92,3 +92,12 @@ price_max = CARGO_CRATE_VALUE * 50 stock_max = 1 availability_prob = 15 + +/datum/market_item/weapon/giant_wrench_parts + name = "Big Slappy parts" + desc = "Cheap illegal Big Slappy parts. The fastest and statistically most dangerous wrench." + item = /obj/item/weaponcrafting/giant_wrench + price_min = CARGO_CRATE_VALUE * 2 + price_max = CARGO_CRATE_VALUE * 5 + stock_max = 1 + availability_prob = 25