From 587a01e5174fdce92fac6fb938538790d6edf3dc Mon Sep 17 00:00:00 2001 From: ghostly_zsh Date: Sat, 14 Dec 2024 12:32:26 -0600 Subject: [PATCH] all planets, module attachment broke --- kabel/src/codegen.rs | 10 +- kabel/src/main.rs | 1 + kabel/tmp.kab | 11 +- server/src/crafting/components.rs | 21 ++ server/src/crafting/mod.rs | 1 + server/src/main.rs | 3 +- server/src/module/mod.rs | 1 + server/src/planet.rs | 163 ++++++++- server/src/player/client_login.rs | 17 +- server/src/player/mod.rs | 4 +- server/src/player/packet.rs | 6 +- starkingdoms-client/package.json | 2 +- starkingdoms-client/src/protocol.ts | 8 + starkingdoms-client/src/textures.ts | 19 +- starkingdoms-client/yarn.lock | 492 ++++++++++++++++------------ 15 files changed, 504 insertions(+), 255 deletions(-) create mode 100644 server/src/crafting/components.rs create mode 100644 server/src/crafting/mod.rs diff --git a/kabel/src/codegen.rs b/kabel/src/codegen.rs index 18c9ae393b435425c713d6a4b83cae4db85b19de..ef64c240155869591e2d1a6a65e1dad22b3a3dea 100644 --- a/kabel/src/codegen.rs +++ b/kabel/src/codegen.rs @@ -89,18 +89,10 @@ impl Codegen { // add function to constant pool and add a load expression in its place let new_unit_ptr = self.vm.units.len()-1; - self.vm.units[self.vm.unit_ptr].pool.push(Value::Fun(Function { + self.vm.variables.push(Value::Fun(Function { unit_ptr: new_unit_ptr, arity: args.len(), })); - self.vm.units[self.vm.unit_ptr].code.push(OpCode::LOAD.into()); - let loc = (self.vm.units[self.vm.unit_ptr].pool.len()-1) as u8; - self.vm.units[self.vm.unit_ptr].code.push(loc); - if self.vm.units[self.vm.unit_ptr].lines.len() == 0 || self.vm.units[self.vm.unit_ptr].lines.last().unwrap().0 != block.end_line { - self.vm.units[self.vm.unit_ptr].lines.push((block.end_line, 2)); - } else { - self.vm.units[self.vm.unit_ptr].lines.last_mut().unwrap().1 += 2; - } self.scopes.last_mut().expect("codegen scopes vec was empty").1 += 1; let old_unit_ptr = self.vm.unit_ptr; diff --git a/kabel/src/main.rs b/kabel/src/main.rs index 133df716d6633cc208044112fc50e489eada123b..8431d7c4cf6b7f3ebd5e85836d78b0ca848bc165 100644 --- a/kabel/src/main.rs +++ b/kabel/src/main.rs @@ -67,6 +67,7 @@ fn main() { } vm.unit_ptr = 0; println!("{}", output); + println!("{:?}", vm.variables); output += "\n"; match vm.run(&mut output) { diff --git a/kabel/tmp.kab b/kabel/tmp.kab index 5a073aaa3e1b076b946330c05fe9632fd0b850ba..13b8a273481aafcb4f2de2a9387e8752c8934609 100644 --- a/kabel/tmp.kab +++ b/kabel/tmp.kab @@ -1,3 +1,8 @@ -var i = [3, 2]; -i[0] = 1; -print i; +function addOne(n) { + n += 1; +} + +//var i = 0; +//var j = 0; +addOne(0); +//print i; diff --git a/server/src/crafting/components.rs b/server/src/crafting/components.rs new file mode 100644 index 0000000000000000000000000000000000000000..0fd4af341ba19ed500e419cdb8e1c078b5f66c3f --- /dev/null +++ b/server/src/crafting/components.rs @@ -0,0 +1,21 @@ +use std::collections::HashMap; + +use bevy::prelude::Component; + +#[derive(Debug, Clone, Copy, PartialEq)] +pub enum MaterialType { + Silicon, // Mercury + Sulfur, // Venus + Iron, // Mars + Hydrogen, // Jupiter + Helium, // Saturn + Rubber, // Uranus + Composite, // Neptune + Ice, // Pluto +} + +#[derive(Component, Debug, Clone)] +pub struct MaterialStorage { + pub materials: HashMap, + pub capacity: u32, +} diff --git a/server/src/crafting/mod.rs b/server/src/crafting/mod.rs new file mode 100644 index 0000000000000000000000000000000000000000..f188f2c26df92954cf6bc22d15be25d77f9dc62f --- /dev/null +++ b/server/src/crafting/mod.rs @@ -0,0 +1 @@ +pub mod components; diff --git a/server/src/main.rs b/server/src/main.rs index 86650f95d3b0e49aa53c19d8319246641845e273..15f8d07702543f580a519eeb1af18ddbbf0483cc 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -43,6 +43,7 @@ pub mod module; pub mod packet; pub mod planet; pub mod player; +pub mod crafting; pub mod ws; struct StkPluginGroup; @@ -147,7 +148,7 @@ fn main() { .init_resource::() .add_plugins(RapierPhysicsPlugin::::pixels_per_meter( server_config.world.pixels_per_meter, - )) + ).in_fixed_schedule()) .add_plugins(StkTungsteniteServerPlugin) .add_systems( Startup, diff --git a/server/src/module/mod.rs b/server/src/module/mod.rs index abfe2b529abd85d786729e266f5cabac594f38a4..eaf715eb165351aef476bb14d54a67d507368e32 100644 --- a/server/src/module/mod.rs +++ b/server/src/module/mod.rs @@ -34,6 +34,7 @@ pub fn module_spawn( }; let mut transform = Transform::from_xyz(angle.cos() * 30.0, angle.sin() * 30.0, 0.0); transform.rotate_z(angle); + transform.translation += Vec3::new(6000.0, 0.0, 0.0); let flags = PartFlags { attached: false }; let mut entity = commands.spawn(PartBundle { part_type: PartType::Cargo, diff --git a/server/src/planet.rs b/server/src/planet.rs index 1f84243fb0f1a084f599f2272ec993662cd9775b..fdcf6b141593274612a4b4bd38dd7e54b2af02ce 100644 --- a/server/src/planet.rs +++ b/server/src/planet.rs @@ -6,9 +6,17 @@ use crate::{config::StkConfig, module::component::PartType, planet}; #[derive(Component, Clone, Copy, Serialize, Deserialize, Debug, PartialEq, Eq, Hash)] pub enum PlanetType { + Sun, + Mercury, + Venus, Earth, Moon, Mars, + Jupiter, + Saturn, + Uranus, + Neptune, + Pluto, } #[derive(Bundle)] @@ -19,7 +27,61 @@ pub struct PlanetBundle { pub fn spawn_planets(mut commands: Commands) { info!("Spawning planets"); - let earth_pos = Transform::from_xyz(0.0, 0.0, 0.0); + let sun_pos = Transform::from_xyz(0.0, 0.0, 0.0); + commands + .spawn(PlanetBundle { + planet_type: PlanetType::Sun, + transform: TransformBundle::from(sun_pos), + }) + .insert(Collider::ball(planet!(PlanetType::Sun).size)) + .insert(AdditionalMassProperties::Mass( + planet!(PlanetType::Sun).mass, + )) + .insert(ReadMassProperties::default()) + .with_children(|children| { + children + .spawn(Collider::ball(planet!(PlanetType::Sun).size + 0.3)) + .insert(ActiveEvents::COLLISION_EVENTS) + .insert(Sensor); + }) + .insert(RigidBody::Fixed); + let mercury_pos = Transform::from_xyz(2322.588, 0.0, 0.0); + commands + .spawn(PlanetBundle { + planet_type: PlanetType::Mercury, + transform: TransformBundle::from(mercury_pos), + }) + .insert(Collider::ball(planet!(PlanetType::Mercury).size)) + .insert(AdditionalMassProperties::Mass( + planet!(PlanetType::Mercury).mass, + )) + .insert(ReadMassProperties::default()) + .with_children(|children| { + children + .spawn(Collider::ball(planet!(PlanetType::Mercury).size + 0.3)) + .insert(ActiveEvents::COLLISION_EVENTS) + .insert(Sensor); + }) + .insert(RigidBody::Fixed); + let venus_pos = Transform::from_xyz(4339.992, 0.0, 0.0); + commands + .spawn(PlanetBundle { + planet_type: PlanetType::Venus, + transform: TransformBundle::from(venus_pos), + }) + .insert(Collider::ball(planet!(PlanetType::Venus).size)) + .insert(AdditionalMassProperties::Mass( + planet!(PlanetType::Venus).mass, + )) + .insert(ReadMassProperties::default()) + .with_children(|children| { + children + .spawn(Collider::ball(planet!(PlanetType::Venus).size + 0.3)) + .insert(ActiveEvents::COLLISION_EVENTS) + .insert(Sensor); + }) + .insert(RigidBody::Fixed); + let earth_pos = Transform::from_xyz(6000.0, 0.0, 0.0); commands .spawn(PlanetBundle { planet_type: PlanetType::Earth, @@ -37,7 +99,7 @@ pub fn spawn_planets(mut commands: Commands) { .insert(Sensor); }) .insert(RigidBody::Fixed); - let moon_pos = Transform::from_xyz(50.0, 20.0, 0.0); + let moon_pos = Transform::from_xyz(6030.828, 0.0, 0.0); commands .spawn(PlanetBundle { planet_type: PlanetType::Moon, @@ -55,7 +117,7 @@ pub fn spawn_planets(mut commands: Commands) { .insert(Sensor); }) .insert(RigidBody::Fixed); - let mars_pos = Transform::from_xyz(-50.0, 300.0, 0.0); + let mars_pos = Transform::from_xyz(9142.0833, 0.0, 0.0); commands .spawn(PlanetBundle { planet_type: PlanetType::Mars, @@ -73,6 +135,96 @@ pub fn spawn_planets(mut commands: Commands) { .insert(Sensor); }) .insert(RigidBody::Fixed); + let jupiter_pos = Transform::from_xyz(31222.8, 0.0, 0.0); + commands + .spawn(PlanetBundle { + planet_type: PlanetType::Jupiter, + transform: TransformBundle::from(jupiter_pos), + }) + .insert(Collider::ball(planet!(PlanetType::Jupiter).size)) + .insert(AdditionalMassProperties::Mass( + planet!(PlanetType::Jupiter).mass, + )) + .insert(ReadMassProperties::default()) + .with_children(|children| { + children + .spawn(Collider::ball(planet!(PlanetType::Jupiter).size + 0.1)) + .insert(ActiveEvents::COLLISION_EVENTS) + .insert(Sensor); + }) + .insert(RigidBody::Fixed); + let saturn_pos = Transform::from_xyz(57495.6, 0.0, 0.0); + commands + .spawn(PlanetBundle { + planet_type: PlanetType::Saturn, + transform: TransformBundle::from(saturn_pos), + }) + .insert(Collider::ball(planet!(PlanetType::Saturn).size)) + .insert(AdditionalMassProperties::Mass( + planet!(PlanetType::Saturn).mass, + )) + .insert(ReadMassProperties::default()) + .with_children(|children| { + children + .spawn(Collider::ball(planet!(PlanetType::Saturn).size + 0.1)) + .insert(ActiveEvents::COLLISION_EVENTS) + .insert(Sensor); + }) + .insert(RigidBody::Fixed); + let uranus_pos = Transform::from_xyz(115147.56, 0.0, 0.0); + commands + .spawn(PlanetBundle { + planet_type: PlanetType::Uranus, + transform: TransformBundle::from(uranus_pos), + }) + .insert(Collider::ball(planet!(PlanetType::Uranus).size)) + .insert(AdditionalMassProperties::Mass( + planet!(PlanetType::Uranus).mass, + )) + .insert(ReadMassProperties::default()) + .with_children(|children| { + children + .spawn(Collider::ball(planet!(PlanetType::Uranus).size + 0.1)) + .insert(ActiveEvents::COLLISION_EVENTS) + .insert(Sensor); + }) + .insert(RigidBody::Fixed); + let neptune_pos = Transform::from_xyz(180420.0, 0.0, 0.0); + commands + .spawn(PlanetBundle { + planet_type: PlanetType::Neptune, + transform: TransformBundle::from(neptune_pos), + }) + .insert(Collider::ball(planet!(PlanetType::Neptune).size)) + .insert(AdditionalMassProperties::Mass( + planet!(PlanetType::Neptune).mass, + )) + .insert(ReadMassProperties::default()) + .with_children(|children| { + children + .spawn(Collider::ball(planet!(PlanetType::Neptune).size + 0.1)) + .insert(ActiveEvents::COLLISION_EVENTS) + .insert(Sensor); + }) + .insert(RigidBody::Fixed); + let pluto_pos = Transform::from_xyz(236892.0, 0.0, 0.0); + commands + .spawn(PlanetBundle { + planet_type: PlanetType::Pluto, + transform: TransformBundle::from(pluto_pos), + }) + .insert(Collider::ball(planet!(PlanetType::Pluto).size)) + .insert(AdditionalMassProperties::Mass( + planet!(PlanetType::Pluto).mass, + )) + .insert(ReadMassProperties::default()) + .with_children(|children| { + children + .spawn(Collider::ball(planet!(PlanetType::Pluto).size + 0.1)) + .insert(ActiveEvents::COLLISION_EVENTS) + .insert(Sensor); + }) + .insert(RigidBody::Fixed); } pub fn gravity_update( @@ -89,8 +241,8 @@ pub fn gravity_update( server_config: Res, ) { for (part_transform, part_mp, mut forces, mut impulses) in &mut part_query { - impulses.impulse = Vec2::ZERO; forces.force = Vec2::ZERO; + impulses.impulse = Vec2::ZERO; forces.torque = 0.; let part_mp = part_mp.get(); let part_mass = part_mp.mass; @@ -106,7 +258,8 @@ pub fn gravity_update( // gravity vector let direction = (planet_translate - part_translate).normalize() * force; // apply gravity vector as impulse to body - impulses.impulse += direction.xy(); + forces.force += direction.xy(); + //impulses.impulse += direction.xy(); } } } diff --git a/server/src/player/client_login.rs b/server/src/player/client_login.rs index 2094cd233e926a2f62ef0b986f8367f1393f99b5..40afab1d995b0bb4ca6b2c2f6467b25939a85dae 100644 --- a/server/src/player/client_login.rs +++ b/server/src/player/client_login.rs @@ -28,7 +28,7 @@ pub fn join_auth( from: &SocketAddr, event_queue: &mut Vec, server_config: StkConfig, -) -> Result<(), ()> { +) -> bool { if let Some(token) = jwt { let key: Hmac = Hmac::new_from_slice(&app_keys.app_key).unwrap(); let claims: UserToken = match token.verify_with_key(&key) { @@ -39,7 +39,7 @@ pub fn join_auth( message: Packet::Message { message_type: MessageType::Error, actor: "SERVER".to_string(), content: format!("Token is invalid or verification failed: {e}. Please log in again, or contact StarKingdoms staff if the problem persists.") }.into(), }); event_queue.push(WsEvent::Close { addr: *from }); - return Err(()); + return false; } }; @@ -49,7 +49,7 @@ pub fn join_auth( message: Packet::Message { message_type: MessageType::Error, actor: "SERVER".to_string(), content: format!("Permission level {} is too low, {} is required. If your permissions were just changed, you need to log out and log back in for the change to take effect. If you believe this is a mistake, contact StarKingdoms staff.", claims.permission_level, server_config.security.required_permission_level) }.into(), }); event_queue.push(WsEvent::Close { addr: *from }); - return Err(()); + return false; } event_queue.push(WsEvent::Send { @@ -62,9 +62,9 @@ pub fn join_auth( message: Packet::Message { message_type: MessageType::Error, actor: "SERVER".to_string(), content: "Authentication is required to join this server at the moment. Log in and try again, or try again later.".to_string() }.into(), }); event_queue.push(WsEvent::Close { addr: *from }); - return Err(()); + return false; } - Ok(()) + true } pub fn spawn_player( @@ -80,6 +80,7 @@ pub fn spawn_player( // convert to cartesian with 30.0 meter radius let mut transform = Transform::from_xyz(angle.cos() * 30.0, angle.sin() * 30.0, 0.0); transform.rotate_z(angle); + transform.translation += Vec3::new(6000.0, 0.0, 0.0); let player_comp = Player { addr: *from, username, @@ -241,11 +242,7 @@ pub fn packet_stream( transform: proto_transform!(Transform::from_translation( translation * CLIENT_SCALE )), - radius: match *planet_type { - PlanetType::Earth => planet!(PlanetType::Earth).size * CLIENT_SCALE, - PlanetType::Moon => planet!(PlanetType::Moon).size * CLIENT_SCALE, - PlanetType::Mars => planet!(PlanetType::Mars).size * CLIENT_SCALE, - }, + radius: planet!(*planet_type).size * CLIENT_SCALE, }, )); } diff --git a/server/src/player/mod.rs b/server/src/player/mod.rs index 83974e3a118b1fcb4cf4cde3b478057fb15ceade..2bda007e150b2f93c76a7214f99c5024cff29954 100644 --- a/server/src/player/mod.rs +++ b/server/src/player/mod.rs @@ -82,13 +82,13 @@ pub fn on_message( jwt, } => { // auth - err_or_cont!(client_login::join_auth( + if !client_login::join_auth( jwt, app_keys.clone(), from, &mut event_queue, server_config.clone() - )); + ) { continue } // create player in world let (id, transform, mut player_comp) = diff --git a/server/src/player/packet.rs b/server/src/player/packet.rs index f6eac7bbb43cb8da5f0c2b247ebd9f7b847d033f..52f13a8e2b0189aab651533f59bd5f1f6acf9531 100644 --- a/server/src/player/packet.rs +++ b/server/src/player/packet.rs @@ -66,11 +66,7 @@ pub fn on_position_change( transform: proto_transform!(Transform::from_translation( transform.translation * CLIENT_SCALE )), - radius: match *planet_type { - PlanetType::Earth => planet!(PlanetType::Earth).size * CLIENT_SCALE, - PlanetType::Moon => planet!(PlanetType::Moon).size * CLIENT_SCALE, - PlanetType::Mars => planet!(PlanetType::Mars).size * CLIENT_SCALE, - }, + radius: planet!(*planet_type).size * CLIENT_SCALE }, )); } diff --git a/starkingdoms-client/package.json b/starkingdoms-client/package.json index ceb5f301fad15c808d91f8aeda8c3b9abb926962..cce4a870c3ed112e6ee6ee2ded30fc9a606b53a0 100644 --- a/starkingdoms-client/package.json +++ b/starkingdoms-client/package.json @@ -23,7 +23,7 @@ "svelte-check": "^3.6.2", "tslib": "^2.6.2", "typescript": "^5.2.2", - "vite": "^5.0.0" + "vite": "^5.4.8" }, "dependencies": { "@msgpack/msgpack": "^3.0.0-beta2", diff --git a/starkingdoms-client/src/protocol.ts b/starkingdoms-client/src/protocol.ts index 95a376471723c1db5a1e99c0bf195adc610f7ee5..a2a5fd05b954a1b6dfd09b2932cc404e66b68831 100644 --- a/starkingdoms-client/src/protocol.ts +++ b/starkingdoms-client/src/protocol.ts @@ -4,9 +4,17 @@ export interface ProtoTransform { rot: number; } export enum PlanetType { + Sun = "Sun", + Mercury = "Mercury", + Venus = "Venus", Earth = "Earth", Moon = "Moon", Mars = "Mars", + Jupiter = "Jupiter", + Saturn = "Saturn", + Uranus = "Uranus", + Neptune = "Neptune", + Pluto = "Pluto", } export enum PartType { Hearty = "Hearty", diff --git a/starkingdoms-client/src/textures.ts b/starkingdoms-client/src/textures.ts index dcb2d90ea8b24e25f51cacef4ed60bfe536dc999..4db5786178cbc41c78393312746220c6126a6368 100644 --- a/starkingdoms-client/src/textures.ts +++ b/starkingdoms-client/src/textures.ts @@ -1,4 +1,5 @@ import { PartType, PlanetType } from "./protocol.ts"; +import tex_sun from "./assets/sun.svg"; import tex_earth from "./assets/earth.svg"; import tex_moon from "./assets/moon.svg"; import tex_mars from "./assets/mars.svg"; @@ -16,12 +17,28 @@ import tex_landing_thruster_suspension from "./assets/landingleg.svg"; import tex_missing from "./assets/missing.svg"; export function planet_texture_url(type: PlanetType): string { - if (type == PlanetType.Earth) { + if (type == PlanetType.Sun) { + return tex_sun; + } else if (type == PlanetType.Mercury) { + return tex_mars; + } else if (type == PlanetType.Venus) { + return tex_moon; + } else if (type == PlanetType.Earth) { return tex_earth; } else if (type == PlanetType.Moon) { return tex_moon; } else if (type == PlanetType.Mars) { return tex_mars; + } else if (type == PlanetType.Jupiter) { + return tex_earth; + } else if (type == PlanetType.Saturn) { + return tex_sun; + } else if (type == PlanetType.Uranus) { + return tex_mars; + } else if (type == PlanetType.Neptune) { + return tex_moon; + } else if (type == PlanetType.Pluto) { + return tex_mars; } return tex_missing; } diff --git a/starkingdoms-client/yarn.lock b/starkingdoms-client/yarn.lock index 04863912a05883bd279fba91b3cfa86fc86847d8..b27bb119f1a59cb8f9d2f005978b13c0495e7d33 100644 --- a/starkingdoms-client/yarn.lock +++ b/starkingdoms-client/yarn.lock @@ -10,115 +10,120 @@ "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@esbuild/android-arm64@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.7.tgz#646156aea43e8e6723de6e94a4ac07c5aed41be1" - integrity sha512-YEDcw5IT7hW3sFKZBkCAQaOCJQLONVcD4bOyTXMZz5fr66pTHnAet46XAtbXAkJRfIn2YVhdC6R9g4xa27jQ1w== - -"@esbuild/android-arm@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.7.tgz#0827b49aed813c33ea18ee257c1728cdc4a01030" - integrity sha512-YGSPnndkcLo4PmVl2tKatEn+0mlVMr3yEpOOT0BeMria87PhvoJb5dg5f5Ft9fbCVgtAz4pWMzZVgSEGpDAlww== - -"@esbuild/android-x64@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.7.tgz#fa294ed5214d88219d519e0ab1bbb0253a89b864" - integrity sha512-jhINx8DEjz68cChFvM72YzrqfwJuFbfvSxZAk4bebpngGfNNRm+zRl4rtT9oAX6N9b6gBcFaJHFew5Blf6CvUw== - -"@esbuild/darwin-arm64@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.7.tgz#e24d2ed545749ff251eabe8bce11fefa688892d3" - integrity sha512-dr81gbmWN//3ZnBIm6YNCl4p3pjnabg1/ZVOgz2fJoUO1a3mq9WQ/1iuEluMs7mCL+Zwv7AY5e3g1hjXqQZ9Iw== - -"@esbuild/darwin-x64@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.7.tgz#02d1f8a572874c90d8f55dde8a859e5145bd06f6" - integrity sha512-Lc0q5HouGlzQEwLkgEKnWcSazqr9l9OdV2HhVasWJzLKeOt0PLhHaUHuzb8s/UIya38DJDoUm74GToZ6Wc7NGQ== - -"@esbuild/freebsd-arm64@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.7.tgz#bc6a69b9a7915da278f0a5ebaec069c813982c22" - integrity sha512-+y2YsUr0CxDFF7GWiegWjGtTUF6gac2zFasfFkRJPkMAuMy9O7+2EH550VlqVdpEEchWMynkdhC9ZjtnMiHImQ== - -"@esbuild/freebsd-x64@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.7.tgz#ec3708488625d70e565968ceea1355e7c8613865" - integrity sha512-CdXOxIbIzPJmJhrpmJTLx+o35NoiKBIgOvmvT+jeSadYiWJn0vFKsl+0bSG/5lwjNHoIDEyMYc/GAPR9jxusTA== - -"@esbuild/linux-arm64@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.7.tgz#8e04b66c306858f92d4f90f8222775270755e88a" - integrity sha512-inHqdOVCkUhHNvuQPT1oCB7cWz9qQ/Cz46xmVe0b7UXcuIJU3166aqSunsqkgSGMtUCWOZw3+KMwI6otINuC9g== - -"@esbuild/linux-arm@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.7.tgz#12d5b65e089029ee1fe4c591b60969c9b1a85355" - integrity sha512-Y+SCmWxsJOdQtjcBxoacn/pGW9HDZpwsoof0ttL+2vGcHokFlfqV666JpfLCSP2xLxFpF1lj7T3Ox3sr95YXww== - -"@esbuild/linux-ia32@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.7.tgz#01eabc2a3ad9039e115db650268e4f48f910dbe2" - integrity sha512-2BbiL7nLS5ZO96bxTQkdO0euGZIUQEUXMTrqLxKUmk/Y5pmrWU84f+CMJpM8+EHaBPfFSPnomEaQiG/+Gmh61g== - -"@esbuild/linux-loong64@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.7.tgz#70681113632970e6a5766607bbdb98aa18cf4d5f" - integrity sha512-BVFQla72KXv3yyTFCQXF7MORvpTo4uTA8FVFgmwVrqbB/4DsBFWilUm1i2Oq6zN36DOZKSVUTb16jbjedhfSHw== - -"@esbuild/linux-mips64el@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.7.tgz#f63c022a71a3d70c482d1943a27cb8997021e230" - integrity sha512-DzAYckIaK+pS31Q/rGpvUKu7M+5/t+jI+cdleDgUwbU7KdG2eC3SUbZHlo6Q4P1CfVKZ1lUERRFP8+q0ob9i2w== - -"@esbuild/linux-ppc64@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.7.tgz#614eafd08b0c50212f287b948b3c08d6e60f221f" - integrity sha512-JQ1p0SmUteNdUaaiRtyS59GkkfTW0Edo+e0O2sihnY4FoZLz5glpWUQEKMSzMhA430ctkylkS7+vn8ziuhUugQ== - -"@esbuild/linux-riscv64@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.7.tgz#31d3b63f92f65968268a8e61ba59872538e80e88" - integrity sha512-xGwVJ7eGhkprY/nB7L7MXysHduqjpzUl40+XoYDGC4UPLbnG+gsyS1wQPJ9lFPcxYAaDXbdRXd1ACs9AE9lxuw== - -"@esbuild/linux-s390x@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.7.tgz#be94974e0caa0783ae05f9477fd7170b9ac29cb0" - integrity sha512-U8Rhki5PVU0L0nvk+E8FjkV8r4Lh4hVEb9duR6Zl21eIEYEwXz8RScj4LZWA2i3V70V4UHVgiqMpszXvG0Yqhg== - -"@esbuild/linux-x64@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.7.tgz#84e8018a913dd4ecee954623e395984aef3d0007" - integrity sha512-ZYZopyLhm4mcoZXjFt25itRlocKlcazDVkB4AhioiL9hOWhDldU9n38g62fhOI4Pth6vp+Mrd5rFKxD0/S+7aQ== - -"@esbuild/netbsd-x64@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.7.tgz#98898ba8800374c9df9bb182ca4f69fcecaf4411" - integrity sha512-/yfjlsYmT1O3cum3J6cmGG16Fd5tqKMcg5D+sBYLaOQExheAJhqr8xOAEIuLo8JYkevmjM5zFD9rVs3VBcsjtQ== - -"@esbuild/openbsd-x64@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.7.tgz#46dc4eda2adb51f16361b1ad10e9b3f4938c4573" - integrity sha512-MYDFyV0EW1cTP46IgUJ38OnEY5TaXxjoDmwiTXPjezahQgZd+j3T55Ht8/Q9YXBM0+T9HJygrSRGV5QNF/YVDQ== - -"@esbuild/sunos-x64@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.7.tgz#1650d40dd88412ecc11490119cd23cbaf661a591" - integrity sha512-JcPvgzf2NN/y6X3UUSqP6jSS06V0DZAV/8q0PjsZyGSXsIGcG110XsdmuWiHM+pno7/mJF6fjH5/vhUz/vA9fw== - -"@esbuild/win32-arm64@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.7.tgz#e61de6c4eb204d83fd912f3ae6812cc8c7d32d25" - integrity sha512-ZA0KSYti5w5toax5FpmfcAgu3ZNJxYSRm0AW/Dao5up0YV1hDVof1NvwLomjEN+3/GMtaWDI+CIyJOMTRSTdMw== - -"@esbuild/win32-ia32@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.7.tgz#3d9c159d42c67e37a433e44ef8217c661cb6f6d0" - integrity sha512-CTOnijBKc5Jpk6/W9hQMMvJnsSYRYgveN6O75DTACCY18RA2nqka8dTZR+x/JqXCRiKk84+5+bRKXUSbbwsS0A== - -"@esbuild/win32-x64@0.19.7": - version "0.19.7" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.7.tgz#02c4446f802706098d8e6ee70cf2b7aba96ded0b" - integrity sha512-gRaP2sk6hc98N734luX4VpF318l3w+ofrtTu9j5L8EQXF+FzQKV6alCOHMVoJJHvVK/mGbwBXfOL1HETQu9IGQ== +"@esbuild/aix-ppc64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f" + integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ== + +"@esbuild/android-arm64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz#09d9b4357780da9ea3a7dfb833a1f1ff439b4052" + integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A== + +"@esbuild/android-arm@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.21.5.tgz#9b04384fb771926dfa6d7ad04324ecb2ab9b2e28" + integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg== + +"@esbuild/android-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.21.5.tgz#29918ec2db754cedcb6c1b04de8cd6547af6461e" + integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA== + +"@esbuild/darwin-arm64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz#e495b539660e51690f3928af50a76fb0a6ccff2a" + integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ== + +"@esbuild/darwin-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz#c13838fa57372839abdddc91d71542ceea2e1e22" + integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw== + +"@esbuild/freebsd-arm64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz#646b989aa20bf89fd071dd5dbfad69a3542e550e" + integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g== + +"@esbuild/freebsd-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz#aa615cfc80af954d3458906e38ca22c18cf5c261" + integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ== + +"@esbuild/linux-arm64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz#70ac6fa14f5cb7e1f7f887bcffb680ad09922b5b" + integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q== + +"@esbuild/linux-arm@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz#fc6fd11a8aca56c1f6f3894f2bea0479f8f626b9" + integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA== + +"@esbuild/linux-ia32@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz#3271f53b3f93e3d093d518d1649d6d68d346ede2" + integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg== + +"@esbuild/linux-loong64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz#ed62e04238c57026aea831c5a130b73c0f9f26df" + integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg== + +"@esbuild/linux-mips64el@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz#e79b8eb48bf3b106fadec1ac8240fb97b4e64cbe" + integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg== + +"@esbuild/linux-ppc64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz#5f2203860a143b9919d383ef7573521fb154c3e4" + integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w== + +"@esbuild/linux-riscv64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz#07bcafd99322d5af62f618cb9e6a9b7f4bb825dc" + integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA== + +"@esbuild/linux-s390x@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz#b7ccf686751d6a3e44b8627ababc8be3ef62d8de" + integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A== + +"@esbuild/linux-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0" + integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ== + +"@esbuild/netbsd-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz#bbe430f60d378ecb88decb219c602667387a6047" + integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg== + +"@esbuild/openbsd-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz#99d1cf2937279560d2104821f5ccce220cb2af70" + integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow== + +"@esbuild/sunos-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz#08741512c10d529566baba837b4fe052c8f3487b" + integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg== + +"@esbuild/win32-arm64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz#675b7385398411240735016144ab2e99a60fc75d" + integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A== + +"@esbuild/win32-ia32@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz#1bfc3ce98aa6ca9a0969e4d2af72144c59c1193b" + integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA== + +"@esbuild/win32-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c" + integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw== "@jridgewell/gen-mapping@^0.3.0": version "0.3.3" @@ -398,65 +403,85 @@ eventemitter3 "^4.0.0" url "^0.11.0" -"@rollup/rollup-android-arm-eabi@4.5.2": - version "4.5.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.5.2.tgz#fa3e9ba323449f098b8d144ecaa4f044d2ff2ee3" - integrity sha512-ee7BudTwwrglFYSc3UnqInDDjCLWHKrFmGNi4aK7jlEyg4CyPa1DCMrZfsN1O13YT76UFEqXz2CoN7BCGpUlJw== - -"@rollup/rollup-android-arm64@4.5.2": - version "4.5.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.5.2.tgz#961089fe117ceca642b6432fadd093048da93ae8" - integrity sha512-xOuhj9HHtn8128ir8veoQsBbAUBasDbHIBniYTEx02pAmu9EXL+ZjJqngnNEy6ZgZ4h1JwL33GMNu3yJL5Mzow== - -"@rollup/rollup-darwin-arm64@4.5.2": - version "4.5.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.5.2.tgz#a8c13123b830aa743f604b732d72b260dd9de0f6" - integrity sha512-NTGJWoL8bKyqyWFn9/RzSv4hQ4wTbaAv0lHHRwf4OnpiiP4P8W0jiXbm8Nc5BCXKmWAwuvJY82mcIU2TayC20g== - -"@rollup/rollup-darwin-x64@4.5.2": - version "4.5.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.5.2.tgz#ab3a46c846bed784e8f52f253c59dcd70175ef24" - integrity sha512-hlKqj7bpPvU15sZo4za14u185lpMzdwWLMc9raMqPK4wywt0wR23y1CaVQ4oAFXat3b5/gmRntyfpwWTKl+vvA== - -"@rollup/rollup-linux-arm-gnueabihf@4.5.2": - version "4.5.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.5.2.tgz#aa98197f06d9d795a317152ec8d95e65a369053b" - integrity sha512-7ZIZx8c3u+pfI0ohQsft/GywrXez0uR6dUP0JhBuCK3sFO5TfdLn/YApnVkvPxuTv3+YKPIZend9Mt7Cz6sS3Q== - -"@rollup/rollup-linux-arm64-gnu@4.5.2": - version "4.5.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.5.2.tgz#a0dc66fa46553b8bb1c96df41ae8308770aebecf" - integrity sha512-7Pk/5mO11JW/cH+a8lL/i0ZxmRGrbpYqN0VwO2DHhU+SJWWOH2zE1RAcPaj8KqiwC8DCDIJOSxjV9+9lLb6aeA== - -"@rollup/rollup-linux-arm64-musl@4.5.2": - version "4.5.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.5.2.tgz#32117bb51bdd761b8f759c9fed9eab493154cdfd" - integrity sha512-KrRnuG5phJx756e62wxvWH2e+TK84MP2IVuPwfge+GBvWqIUfVzFRn09TKruuQBXzZp52Vyma7FjMDkwlA9xpg== - -"@rollup/rollup-linux-x64-gnu@4.5.2": - version "4.5.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.5.2.tgz#566cda292f95d6ef995344887217a82e9fd20ad6" - integrity sha512-My+53GasPa2D2tU5dXiyHYwrELAUouSfkNlZ3bUKpI7btaztO5vpALEs3mvFjM7aKTvEbc7GQckuXeXIDKQ0fg== - -"@rollup/rollup-linux-x64-musl@4.5.2": - version "4.5.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.5.2.tgz#d5dcc18af0388209e11586d3c0c9626ba7577b04" - integrity sha512-/f0Q6Sc+Vw54Ws6N8fxaEe4R7at3b8pFyv+O/F2VaQ4hODUJcRUcCBJh6zuqtgQQt7w845VTkGLFgWZkP3tUoQ== - -"@rollup/rollup-win32-arm64-msvc@4.5.2": - version "4.5.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.5.2.tgz#b880eb1d349f166939ffbe27cbf1efd2e1923819" - integrity sha512-NCKuuZWLht6zj7s6EIFef4BxCRX1GMr83S2W4HPCA0RnJ4iHE4FS1695q6Ewoa6A9nFjJe1//yUu0kgBU07Edw== - -"@rollup/rollup-win32-ia32-msvc@4.5.2": - version "4.5.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.5.2.tgz#4b799c851864a10491a4755b5b8eadceae3e9889" - integrity sha512-J5zL3riR4AOyU/J3M/i4k/zZ8eP1yT+nTmAKztCXJtnI36jYH0eepvob22mAQ/kLwfsK2TB6dbyVY1F8c/0H5A== - -"@rollup/rollup-win32-x64-msvc@4.5.2": - version "4.5.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.5.2.tgz#7e59216d929a6b444304000be40c32d2d127fe4f" - integrity sha512-pL0RXRHuuGLhvs7ayX/SAHph1hrDPXOM5anyYUQXWJEENxw3nfHkzv8FfVlEVcLyKPAEgDRkd6RKZq2SMqS/yg== +"@rollup/rollup-android-arm-eabi@4.24.0": + version "4.24.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.0.tgz#1661ff5ea9beb362795304cb916049aba7ac9c54" + integrity sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA== + +"@rollup/rollup-android-arm64@4.24.0": + version "4.24.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.0.tgz#2ffaa91f1b55a0082b8a722525741aadcbd3971e" + integrity sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA== + +"@rollup/rollup-darwin-arm64@4.24.0": + version "4.24.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.0.tgz#627007221b24b8cc3063703eee0b9177edf49c1f" + integrity sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA== + +"@rollup/rollup-darwin-x64@4.24.0": + version "4.24.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.0.tgz#0605506142b9e796c370d59c5984ae95b9758724" + integrity sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ== + +"@rollup/rollup-linux-arm-gnueabihf@4.24.0": + version "4.24.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.0.tgz#62dfd196d4b10c0c2db833897164d2d319ee0cbb" + integrity sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA== + +"@rollup/rollup-linux-arm-musleabihf@4.24.0": + version "4.24.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.0.tgz#53ce72aeb982f1f34b58b380baafaf6a240fddb3" + integrity sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw== + +"@rollup/rollup-linux-arm64-gnu@4.24.0": + version "4.24.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.0.tgz#1632990f62a75c74f43e4b14ab3597d7ed416496" + integrity sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA== + +"@rollup/rollup-linux-arm64-musl@4.24.0": + version "4.24.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.0.tgz#8c03a996efb41e257b414b2e0560b7a21f2d9065" + integrity sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw== + +"@rollup/rollup-linux-powerpc64le-gnu@4.24.0": + version "4.24.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.0.tgz#5b98729628d5bcc8f7f37b58b04d6845f85c7b5d" + integrity sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw== + +"@rollup/rollup-linux-riscv64-gnu@4.24.0": + version "4.24.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.0.tgz#48e42e41f4cabf3573cfefcb448599c512e22983" + integrity sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg== + +"@rollup/rollup-linux-s390x-gnu@4.24.0": + version "4.24.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.0.tgz#e0b4f9a966872cb7d3e21b9e412a4b7efd7f0b58" + integrity sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g== + +"@rollup/rollup-linux-x64-gnu@4.24.0": + version "4.24.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.0.tgz#78144741993100f47bd3da72fce215e077ae036b" + integrity sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A== + +"@rollup/rollup-linux-x64-musl@4.24.0": + version "4.24.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.0.tgz#d9fe32971883cd1bd858336bd33a1c3ca6146127" + integrity sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ== + +"@rollup/rollup-win32-arm64-msvc@4.24.0": + version "4.24.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.0.tgz#71fa3ea369316db703a909c790743972e98afae5" + integrity sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ== + +"@rollup/rollup-win32-ia32-msvc@4.24.0": + version "4.24.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.0.tgz#653f5989a60658e17d7576a3996deb3902e342e2" + integrity sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ== + +"@rollup/rollup-win32-x64-msvc@4.24.0": + version "4.24.0" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.0.tgz#0574d7e87b44ee8511d08cc7f914bcb802b70818" + integrity sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw== "@sveltejs/vite-plugin-svelte-inspector@^2.0.0-next.0 || ^2.0.0": version "2.0.0" @@ -505,6 +530,11 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== +"@types/estree@1.0.6": + version "1.0.6" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50" + integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw== + "@types/ms@*": version "0.7.34" resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.34.tgz#10964ba0dee6ac4cd462e2795b6bebd407303433" @@ -710,33 +740,34 @@ es6-promise@^3.1.2: resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz#a08cdde84ccdbf34d027a1451bc91d4bcd28a613" integrity sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg== -esbuild@^0.19.3: - version "0.19.7" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.7.tgz#b9a7235097b81278dcf090e2532ed13c95a2ee84" - integrity sha512-6brbTZVqxhqgbpqBR5MzErImcpA0SQdoKOkcWK/U30HtQxnokIpG3TX2r0IJqbFUzqLjhU/zC1S5ndgakObVCQ== +esbuild@^0.21.3: + version "0.21.5" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d" + integrity sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw== optionalDependencies: - "@esbuild/android-arm" "0.19.7" - "@esbuild/android-arm64" "0.19.7" - "@esbuild/android-x64" "0.19.7" - "@esbuild/darwin-arm64" "0.19.7" - "@esbuild/darwin-x64" "0.19.7" - "@esbuild/freebsd-arm64" "0.19.7" - "@esbuild/freebsd-x64" "0.19.7" - "@esbuild/linux-arm" "0.19.7" - "@esbuild/linux-arm64" "0.19.7" - "@esbuild/linux-ia32" "0.19.7" - "@esbuild/linux-loong64" "0.19.7" - "@esbuild/linux-mips64el" "0.19.7" - "@esbuild/linux-ppc64" "0.19.7" - "@esbuild/linux-riscv64" "0.19.7" - "@esbuild/linux-s390x" "0.19.7" - "@esbuild/linux-x64" "0.19.7" - "@esbuild/netbsd-x64" "0.19.7" - "@esbuild/openbsd-x64" "0.19.7" - "@esbuild/sunos-x64" "0.19.7" - "@esbuild/win32-arm64" "0.19.7" - "@esbuild/win32-ia32" "0.19.7" - "@esbuild/win32-x64" "0.19.7" + "@esbuild/aix-ppc64" "0.21.5" + "@esbuild/android-arm" "0.21.5" + "@esbuild/android-arm64" "0.21.5" + "@esbuild/android-x64" "0.21.5" + "@esbuild/darwin-arm64" "0.21.5" + "@esbuild/darwin-x64" "0.21.5" + "@esbuild/freebsd-arm64" "0.21.5" + "@esbuild/freebsd-x64" "0.21.5" + "@esbuild/linux-arm" "0.21.5" + "@esbuild/linux-arm64" "0.21.5" + "@esbuild/linux-ia32" "0.21.5" + "@esbuild/linux-loong64" "0.21.5" + "@esbuild/linux-mips64el" "0.21.5" + "@esbuild/linux-ppc64" "0.21.5" + "@esbuild/linux-riscv64" "0.21.5" + "@esbuild/linux-s390x" "0.21.5" + "@esbuild/linux-x64" "0.21.5" + "@esbuild/netbsd-x64" "0.21.5" + "@esbuild/openbsd-x64" "0.21.5" + "@esbuild/sunos-x64" "0.21.5" + "@esbuild/win32-arm64" "0.21.5" + "@esbuild/win32-ia32" "0.21.5" + "@esbuild/win32-x64" "0.21.5" escalade@^3.1.1: version "3.1.1" @@ -996,7 +1027,7 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -nanoid@^3.3.6: +nanoid@^3.3.6, nanoid@^3.3.7: version "3.3.7" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== @@ -1054,6 +1085,11 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== +picocolors@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.0.tgz#5358b76a78cde483ba5cef6a9dc9671440b27d59" + integrity sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw== + picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" @@ -1109,6 +1145,15 @@ postcss@^8.4.31: picocolors "^1.0.0" source-map-js "^1.0.2" +postcss@^8.4.43: + version "8.4.47" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.47.tgz#5bf6c9a010f3e724c503bf03ef7947dcb0fea365" + integrity sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ== + dependencies: + nanoid "^3.3.7" + picocolors "^1.1.0" + source-map-js "^1.2.1" + prettier-plugin-svelte@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/prettier-plugin-svelte/-/prettier-plugin-svelte-3.1.2.tgz#2e050eb56dbb467a42c45ad6ce18bb277d28ffa0" @@ -1160,23 +1205,29 @@ rimraf@^2.5.2: dependencies: glob "^7.1.3" -rollup@^4.2.0: - version "4.5.2" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.5.2.tgz#2cf0ef0a57cb4038c50a66356684fd30071d0595" - integrity sha512-CRK1uoROBfkcqrZKyaFcqCcZWNsvJ6yVYZkqTlRocZhO2s5yER6Z3f/QaYtO8RGyloPnmhwgzuPQpNGeK210xQ== +rollup@^4.20.0: + version "4.24.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.24.0.tgz#c14a3576f20622ea6a5c9cad7caca5e6e9555d05" + integrity sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg== + dependencies: + "@types/estree" "1.0.6" optionalDependencies: - "@rollup/rollup-android-arm-eabi" "4.5.2" - "@rollup/rollup-android-arm64" "4.5.2" - "@rollup/rollup-darwin-arm64" "4.5.2" - "@rollup/rollup-darwin-x64" "4.5.2" - "@rollup/rollup-linux-arm-gnueabihf" "4.5.2" - "@rollup/rollup-linux-arm64-gnu" "4.5.2" - "@rollup/rollup-linux-arm64-musl" "4.5.2" - "@rollup/rollup-linux-x64-gnu" "4.5.2" - "@rollup/rollup-linux-x64-musl" "4.5.2" - "@rollup/rollup-win32-arm64-msvc" "4.5.2" - "@rollup/rollup-win32-ia32-msvc" "4.5.2" - "@rollup/rollup-win32-x64-msvc" "4.5.2" + "@rollup/rollup-android-arm-eabi" "4.24.0" + "@rollup/rollup-android-arm64" "4.24.0" + "@rollup/rollup-darwin-arm64" "4.24.0" + "@rollup/rollup-darwin-x64" "4.24.0" + "@rollup/rollup-linux-arm-gnueabihf" "4.24.0" + "@rollup/rollup-linux-arm-musleabihf" "4.24.0" + "@rollup/rollup-linux-arm64-gnu" "4.24.0" + "@rollup/rollup-linux-arm64-musl" "4.24.0" + "@rollup/rollup-linux-powerpc64le-gnu" "4.24.0" + "@rollup/rollup-linux-riscv64-gnu" "4.24.0" + "@rollup/rollup-linux-s390x-gnu" "4.24.0" + "@rollup/rollup-linux-x64-gnu" "4.24.0" + "@rollup/rollup-linux-x64-musl" "4.24.0" + "@rollup/rollup-win32-arm64-msvc" "4.24.0" + "@rollup/rollup-win32-ia32-msvc" "4.24.0" + "@rollup/rollup-win32-x64-msvc" "4.24.0" fsevents "~2.3.2" run-parallel@^1.1.9: @@ -1246,6 +1297,11 @@ sorcery@^0.11.0: resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== +source-map-js@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" + integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA== + strip-indent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001" @@ -1345,14 +1401,14 @@ url@^0.11.0: punycode "^1.4.1" qs "^6.11.2" -vite@^5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/vite/-/vite-5.0.2.tgz#3c94627dace83b9bf04b64eaf618038e30fb95c0" - integrity sha512-6CCq1CAJCNM1ya2ZZA7+jS2KgnhbzvxakmlIjN24cF/PXhRMzpM/z8QgsVJA/Dm5fWUWnVEsmtBoMhmerPxT0g== +vite@^5.4.8: + version "5.4.8" + resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.8.tgz#af548ce1c211b2785478d3ba3e8da51e39a287e8" + integrity sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ== dependencies: - esbuild "^0.19.3" - postcss "^8.4.31" - rollup "^4.2.0" + esbuild "^0.21.3" + postcss "^8.4.43" + rollup "^4.20.0" optionalDependencies: fsevents "~2.3.3"