diff --git a/maplibre-winit/src/winit/web.rs b/maplibre-winit/src/winit/web.rs index 73912b4b..4d81d517 100644 --- a/maplibre-winit/src/winit/web.rs +++ b/maplibre-winit/src/winit/web.rs @@ -4,42 +4,12 @@ use super::WinitEventLoop; use super::WinitMapWindow; use super::WinitMapWindowConfig; use super::WinitWindow; +use maplibre::window::HeadedMapWindow; +use maplibre::window::MapWindowConfig; use maplibre::window::{MapWindow, WindowSize}; use winit::platform::web::WindowBuilderExtWebSys; -impl MapWindow for WinitMapWindow { - type EventLoop = WinitEventLoop; - type RawWindow = WinitWindow; - type MapWindowConfig = WinitMapWindowConfig; - - fn size(&self) -> WindowSize { - let size = self.window.inner_size(); - - WindowSize::new(size.width, size.height).expect("failed to get window dimensions.") - } - - fn inner(&self) -> &Self::RawWindow { - &self.window - } -} - -fn create(map_window_config: &Self::MapWindowConfig) -> Self { - let event_loop = WinitEventLoop::new(); - - let window: winit::window::Window = WindowBuilder::new() - .with_canvas(Some(get_canvas(&map_window_config.canvas_id))) - .build(&event_loop) - .unwrap(); - - let size = get_body_size().unwrap(); - window.set_inner_size(size); - Self { - window, - event_loop: Some(event_loop), - } -} - impl MapWindowConfig for WinitMapWindowConfig { type MapWindow = WinitMapWindow; @@ -47,7 +17,7 @@ impl MapWindowConfig for WinitMapWindowConfig { let event_loop = WinitEventLoop::new(); let window: winit::window::Window = WindowBuilder::new() - .with_canvas(Some(get_canvas(&map_window_config.canvas_id))) + .with_canvas(Some(get_canvas(&self.canvas_id))) .build(&event_loop) .unwrap(); @@ -60,6 +30,21 @@ impl MapWindowConfig for WinitMapWindowConfig { } } +impl MapWindow for WinitMapWindow { + fn size(&self) -> WindowSize { + let size = self.window.inner_size(); + + WindowSize::new(size.width, size.height).expect("failed to get window dimensions.") + } +} +impl HeadedMapWindow for WinitMapWindow { + type RawWindow = WinitWindow; + + fn inner(&self) -> &Self::RawWindow { + &self.window + } +} + pub fn get_body_size() -> Option> { let web_window: web_sys::Window = web_sys::window().unwrap(); let document = web_window.document().unwrap(); diff --git a/maplibre/src/map_schedule.rs b/maplibre/src/map_schedule.rs index 88115ec1..a8d56f90 100644 --- a/maplibre/src/map_schedule.rs +++ b/maplibre/src/map_schedule.rs @@ -104,7 +104,7 @@ where let http_source_client: HttpSourceClient = HttpSourceClient::new(http_client); register_stages(&mut schedule, http_source_client, Box::new(scheduler)); - register_render_stages(&mut schedule); + register_render_stages(&mut schedule, false); Self { map_window_config, @@ -247,7 +247,7 @@ where let tile_repository = TileRepository::new(); let mut schedule = Schedule::default(); - register_render_stages(&mut schedule); + register_render_stages(&mut schedule, true); Self { map_window_config, diff --git a/maplibre/src/render/copy_surface_to_buffer_node.rs b/maplibre/src/render/copy_surface_to_buffer_node.rs index c38cc484..da0af63d 100644 --- a/maplibre/src/render/copy_surface_to_buffer_node.rs +++ b/maplibre/src/render/copy_surface_to_buffer_node.rs @@ -2,7 +2,6 @@ use crate::render::graph::{Node, NodeRunError, RenderContext, RenderGraphContext use crate::render::render_commands::{DrawMasks, DrawTiles}; use crate::render::render_phase::{PhaseItem, RenderCommand}; use crate::render::resource::{Head, TrackedRenderPass}; -use crate::render::stages::draw_graph; use crate::render::util::FloatOrd; use crate::render::Eventually::Initialized; use crate::render::RenderState; diff --git a/maplibre/src/render/main_pass.rs b/maplibre/src/render/main_pass.rs index cfa2299d..b5374556 100644 --- a/maplibre/src/render/main_pass.rs +++ b/maplibre/src/render/main_pass.rs @@ -7,12 +7,21 @@ use crate::render::graph::{Node, NodeRunError, RenderContext, RenderGraphContext use crate::render::render_commands::{DrawMasks, DrawTiles}; use crate::render::render_phase::{PhaseItem, RenderCommand}; use crate::render::resource::TrackedRenderPass; -use crate::render::stages::draw_graph; use crate::render::util::FloatOrd; use crate::render::Eventually::Initialized; -use crate::render::RenderState; +use crate::render::{draw_graph, main_graph, RenderState}; use std::ops::{Deref, Range}; +pub mod graph { + // Labels for input nodes + pub mod input {} + // Labels for non-input nodes + pub mod node { + pub const MAIN_PASS_DEPENDENCIES: &str = "main_pass_dependencies"; + pub const MAIN_PASS_DRIVER: &str = "main_pass_driver"; + } +} + pub struct MainPassNode {} impl MainPassNode { diff --git a/maplibre/src/render/mod.rs b/maplibre/src/render/mod.rs index 7628a673..4ac852cc 100644 --- a/maplibre/src/render/mod.rs +++ b/maplibre/src/render/mod.rs @@ -32,6 +32,7 @@ use log::info; use std::sync::Arc; // Rendering internals +#[cfg(not(target_arch = "wasm32"))] mod copy_surface_to_buffer_node; mod graph; mod graph_runner; @@ -410,3 +411,30 @@ mod tests { RenderGraphRunner::run(&graph, &device, &queue, &render_state); } } + +// Plugins that contribute to the RenderGraph should use the following label conventions: +// 1. Graph modules should have a NAME, input module, and node module (where relevant) +// 2. The "top level" graph is the plugin module root. Just add things like `pub mod node` directly under the plugin module +// 3. "sub graph" modules should be nested beneath their parent graph module +pub mod main_graph { + // Labels for input nodes + pub mod input {} + // Labels for non-input nodes + pub mod node { + pub const MAIN_PASS_DEPENDENCIES: &str = "main_pass_dependencies"; + pub const MAIN_PASS_DRIVER: &str = "main_pass_driver"; + } +} + +/// Labels for the "draw" graph +pub mod draw_graph { + pub const NAME: &str = "draw"; + // Labels for input nodes + pub mod input {} + // Labels for non-input nodes + pub mod node { + pub const MAIN_PASS: &str = "main_pass"; + #[cfg(not(target_arch = "wasm32"))] + pub const COPY: &str = "copy"; + } +} diff --git a/maplibre/src/render/stages/graph_runner_stage.rs b/maplibre/src/render/stages/graph_runner_stage.rs index 9a9f7cb6..b0253bd8 100644 --- a/maplibre/src/render/stages/graph_runner_stage.rs +++ b/maplibre/src/render/stages/graph_runner_stage.rs @@ -1,12 +1,6 @@ //! Executes the [`RenderGraph`] current render graph. -// Plugins that contribute to the RenderGraph should use the following label conventions: -// 1. Graph modules should have a NAME, input module, and node module (where relevant) -// 2. The "top level" graph is the plugin module root. Just add things like `pub mod node` directly under the plugin module -// 3. "sub graph" modules should be nested beneath their parent graph module - use crate::context::MapContext; -use crate::render::copy_surface_to_buffer_node::CopySurfaceBufferNode; use crate::render::graph::{EmptyNode, RenderGraph}; use crate::render::graph_runner::RenderGraphRunner; use crate::render::main_pass::{MainPassDriverNode, MainPassNode}; @@ -15,46 +9,13 @@ use crate::schedule::Stage; use crate::Renderer; use log::error; -pub mod node { - pub const MAIN_PASS_DEPENDENCIES: &str = "main_pass_dependencies"; - pub const MAIN_PASS_DRIVER: &str = "main_pass_driver"; -} - -pub mod draw_graph { - pub const NAME: &str = "draw"; - pub mod input {} - pub mod node { - pub const MAIN_PASS: &str = "main_pass"; - pub const COPY: &str = "copy"; - } -} - /// Updates the [`RenderGraph`] with all of its nodes and then runs it to render the entire frame. pub struct GraphRunnerStage { graph: RenderGraph, } -impl Default for GraphRunnerStage { - fn default() -> Self { - let mut graph = RenderGraph::default(); - - let mut draw_graph = RenderGraph::default(); - draw_graph.add_node(draw_graph::node::MAIN_PASS, MainPassNode::new()); - let input_node_id = draw_graph.set_input(vec![]); - draw_graph - .add_node_edge(input_node_id, draw_graph::node::MAIN_PASS) - .unwrap(); - draw_graph.add_node(draw_graph::node::COPY, CopySurfaceBufferNode::default()); - draw_graph - .add_node_edge(draw_graph::node::MAIN_PASS, draw_graph::node::COPY) - .unwrap(); - - graph.add_sub_graph(draw_graph::NAME, draw_graph); - graph.add_node(node::MAIN_PASS_DEPENDENCIES, EmptyNode); - graph.add_node(node::MAIN_PASS_DRIVER, MainPassDriverNode); - graph - .add_node_edge(node::MAIN_PASS_DEPENDENCIES, node::MAIN_PASS_DRIVER) - .unwrap(); +impl GraphRunnerStage { + pub fn new(graph: RenderGraph) -> Self { Self { graph } } } diff --git a/maplibre/src/render/stages/mod.rs b/maplibre/src/render/stages/mod.rs index 3b44e2d9..676644d4 100644 --- a/maplibre/src/render/stages/mod.rs +++ b/maplibre/src/render/stages/mod.rs @@ -1,6 +1,13 @@ //! Rendering specific [Stages](Stage) use crate::context::MapContext; +use crate::multi_stage; +use crate::render::graph::{EmptyNode, RenderGraph, RenderGraphError}; +use crate::render::main_pass::{MainPassDriverNode, MainPassNode}; +use crate::render::stages::extract_stage::ExtractStage; +use crate::render::stages::phase_sort_stage::PhaseSortStage; +use crate::render::stages::queue_stage::QueueStage; +use crate::render::{draw_graph, main_graph}; use crate::schedule::{MultiStage, Schedule, Stage, StageLabel}; use graph_runner_stage::GraphRunnerStage; use resource_stage::ResourceStage; @@ -12,15 +19,9 @@ mod phase_sort_stage; mod queue_stage; mod resource_stage; mod upload_stage; +#[cfg(not(target_arch = "wasm32"))] mod write_surface_buffer_stage; -use crate::multi_stage; -use crate::render::stages::extract_stage::ExtractStage; -use crate::render::stages::phase_sort_stage::PhaseSortStage; -use crate::render::stages::queue_stage::QueueStage; -use crate::render::stages::write_surface_buffer_stage::WriteSurfaceBufferStage; -pub use graph_runner_stage::{draw_graph, node}; - /// The labels of the default App rendering stages. #[derive(Debug, Hash, PartialEq, Eq, Clone)] pub enum RenderStageLabel { @@ -57,13 +58,45 @@ multi_stage!( upload: UploadStage ); -pub fn register_render_stages(schedule: &mut Schedule) { +pub fn register_render_stages( + schedule: &mut Schedule, + headless: bool, +) -> Result<(), RenderGraphError> { + let mut graph = RenderGraph::default(); + + let mut draw_graph = RenderGraph::default(); + draw_graph.add_node(draw_graph::node::MAIN_PASS, MainPassNode::new()); + let input_node_id = draw_graph.set_input(vec![]); + draw_graph.add_node_edge(input_node_id, draw_graph::node::MAIN_PASS)?; + + #[cfg(not(target_arch = "wasm32"))] + if headless { + use crate::render::copy_surface_to_buffer_node::CopySurfaceBufferNode; + draw_graph.add_node(draw_graph::node::COPY, CopySurfaceBufferNode::default()); + draw_graph.add_node_edge(draw_graph::node::MAIN_PASS, draw_graph::node::COPY)?; + } + + graph.add_sub_graph(draw_graph::NAME, draw_graph); + graph.add_node(main_graph::node::MAIN_PASS_DEPENDENCIES, EmptyNode); + graph.add_node(main_graph::node::MAIN_PASS_DRIVER, MainPassDriverNode); + graph.add_node_edge( + main_graph::node::MAIN_PASS_DEPENDENCIES, + main_graph::node::MAIN_PASS_DRIVER, + )?; + schedule.add_stage(RenderStageLabel::Prepare, PrepareStage::default()); schedule.add_stage(RenderStageLabel::Queue, QueueStage::default()); schedule.add_stage(RenderStageLabel::PhaseSort, PhaseSortStage::default()); - schedule.add_stage(RenderStageLabel::Render, GraphRunnerStage::default()); - schedule.add_stage( - RenderStageLabel::Cleanup, - WriteSurfaceBufferStage::default(), - ); + schedule.add_stage(RenderStageLabel::Render, GraphRunnerStage::new(graph)); + + #[cfg(not(target_arch = "wasm32"))] + if headless { + use crate::render::stages::write_surface_buffer_stage::WriteSurfaceBufferStage; + schedule.add_stage( + RenderStageLabel::Cleanup, + WriteSurfaceBufferStage::default(), + ); + } + + Ok(()) } diff --git a/web/demo/package-lock.json b/web/demo/package-lock.json index 47cd8f38..8478c320 100644 --- a/web/demo/package-lock.json +++ b/web/demo/package-lock.json @@ -28,7 +28,6 @@ "../lib": { "name": "maplibre-rs", "version": "0.0.1", - "hasInstallScript": true, "license": "MIT", "dependencies": { "spectorjs": "^0.9.27", @@ -36,10 +35,9 @@ }, "devDependencies": { "@chialab/esbuild-plugin-env": "^0.15.3", - "@chialab/esbuild-plugin-meta-url": "^0.15.15", + "@chialab/esbuild-plugin-meta-url": "^0.15.28", "esbuild": "^0.14.38", "esbuild-plugin-inline-worker": "^0.1.1", - "patch-package": "^6.4.7", "ts-loader": "^9.2.8", "typescript": "^4.5.4", "wasm-pack": "^0.10.2" @@ -5892,10 +5890,9 @@ "version": "file:../lib", "requires": { "@chialab/esbuild-plugin-env": "^0.15.3", - "@chialab/esbuild-plugin-meta-url": "^0.15.15", + "@chialab/esbuild-plugin-meta-url": "^0.15.28", "esbuild": "^0.14.38", "esbuild-plugin-inline-worker": "^0.1.1", - "patch-package": "^6.4.7", "spectorjs": "^0.9.27", "ts-loader": "^9.2.8", "typescript": "^4.5.4", diff --git a/web/lib/package-lock.json b/web/lib/package-lock.json index 823db7d9..50a9f44d 100644 --- a/web/lib/package-lock.json +++ b/web/lib/package-lock.json @@ -7,7 +7,6 @@ "": { "name": "maplibre-rs", "version": "0.0.1", - "hasInstallScript": true, "license": "MIT", "dependencies": { "spectorjs": "^0.9.27", @@ -18,7 +17,6 @@ "@chialab/esbuild-plugin-meta-url": "^0.15.28", "esbuild": "^0.14.38", "esbuild-plugin-inline-worker": "^0.1.1", - "patch-package": "^6.4.7", "ts-loader": "^9.2.8", "typescript": "^4.5.4", "wasm-pack": "^0.10.2" @@ -288,12 +286,6 @@ "license": "Apache-2.0", "peer": true }, - "node_modules/@yarnpkg/lockfile": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", - "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", - "dev": true - }, "node_modules/acorn": { "version": "8.7.0", "dev": true, @@ -315,18 +307,6 @@ "acorn": "^8" } }, - "node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/axios": { "version": "0.21.4", "dev": true, @@ -424,20 +404,6 @@ "license": "CC-BY-4.0", "peer": true }, - "node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/chownr": { "version": "2.0.0", "dev": true, @@ -455,27 +421,6 @@ "node": ">=6.0" } }, - "node_modules/ci-info": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", - "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", - "dev": true - }, - "node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, "node_modules/commondir": { "version": "1.0.1", "dev": true, @@ -486,31 +431,6 @@ "dev": true, "license": "MIT" }, - "node_modules/cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "dependencies": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - }, - "engines": { - "node": ">=4.8" - } - }, - "node_modules/cross-spawn/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, "node_modules/detect-libc": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", @@ -614,15 +534,6 @@ "node": ">=6" } }, - "node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, "node_modules/eslint-scope": { "version": "5.1.1", "dev": true, @@ -726,15 +637,6 @@ "node": ">=8" } }, - "node_modules/find-yarn-workspace-root": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz", - "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==", - "dev": true, - "dependencies": { - "micromatch": "^4.0.2" - } - }, "node_modules/follow-redirects": { "version": "1.14.9", "dev": true, @@ -754,20 +656,6 @@ } } }, - "node_modules/fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, "node_modules/fs-minipass": { "version": "2.1.0", "dev": true, @@ -814,15 +702,6 @@ "dev": true, "license": "ISC" }, - "node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/inflight": { "version": "1.0.6", "dev": true, @@ -837,33 +716,6 @@ "dev": true, "license": "ISC" }, - "node_modules/is-ci": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", - "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", - "dev": true, - "dependencies": { - "ci-info": "^2.0.0" - }, - "bin": { - "is-ci": "bin.js" - } - }, - "node_modules/is-docker": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", - "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", - "dev": true, - "bin": { - "is-docker": "cli.js" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/is-number": { "version": "7.0.0", "dev": true, @@ -872,24 +724,6 @@ "node": ">=0.12.0" } }, - "node_modules/is-wsl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", - "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", - "dev": true, - "dependencies": { - "is-docker": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, "node_modules/jest-worker": { "version": "27.5.1", "dev": true, @@ -934,24 +768,6 @@ "license": "MIT", "peer": true }, - "node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/klaw-sync": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz", - "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.11" - } - }, "node_modules/loader-runner": { "version": "4.3.0", "dev": true, @@ -1055,12 +871,6 @@ "node": "*" } }, - "node_modules/minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", - "dev": true - }, "node_modules/minipass": { "version": "3.1.6", "dev": true, @@ -1101,12 +911,6 @@ "license": "MIT", "peer": true }, - "node_modules/nice-try": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", - "dev": true - }, "node_modules/node-releases": { "version": "2.0.3", "dev": true, @@ -1121,31 +925,6 @@ "wrappy": "1" } }, - "node_modules/open": { - "version": "7.4.2", - "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz", - "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==", - "dev": true, - "dependencies": { - "is-docker": "^2.0.0", - "is-wsl": "^2.1.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/p-limit": { "version": "2.3.0", "dev": true, @@ -1179,54 +958,6 @@ "node": ">=6" } }, - "node_modules/patch-package": { - "version": "6.4.7", - "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-6.4.7.tgz", - "integrity": "sha512-S0vh/ZEafZ17hbhgqdnpunKDfzHQibQizx9g8yEf5dcVk3KOflOfdufRXQX8CSEkyOQwuM/bNz1GwKvFj54kaQ==", - "dev": true, - "dependencies": { - "@yarnpkg/lockfile": "^1.1.0", - "chalk": "^2.4.2", - "cross-spawn": "^6.0.5", - "find-yarn-workspace-root": "^2.0.0", - "fs-extra": "^7.0.1", - "is-ci": "^2.0.0", - "klaw-sync": "^6.0.0", - "minimist": "^1.2.0", - "open": "^7.4.2", - "rimraf": "^2.6.3", - "semver": "^5.6.0", - "slash": "^2.0.0", - "tmp": "^0.0.33" - }, - "bin": { - "patch-package": "index.js" - }, - "engines": { - "npm": ">5" - } - }, - "node_modules/patch-package/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/patch-package/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, "node_modules/path-exists": { "version": "4.0.0", "dev": true, @@ -1243,15 +974,6 @@ "node": ">=0.10.0" } }, - "node_modules/path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/picocolors": { "version": "1.0.0", "dev": true, @@ -1355,36 +1077,6 @@ "randombytes": "^2.1.0" } }, - "node_modules/shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, - "dependencies": { - "shebang-regex": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/slash": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", - "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/source-map": { "version": "0.6.1", "dev": true, @@ -1408,18 +1100,6 @@ "version": "0.9.27", "license": "MIT" }, - "node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/tapable": { "version": "2.2.1", "dev": true, @@ -1560,18 +1240,6 @@ "node": ">= 8" } }, - "node_modules/tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "dependencies": { - "os-tmpdir": "~1.0.2" - }, - "engines": { - "node": ">=0.6.0" - } - }, "node_modules/to-regex-range": { "version": "5.0.1", "dev": true, @@ -1677,15 +1345,6 @@ "node": ">=4.2.0" } }, - "node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true, - "engines": { - "node": ">= 4.0.0" - } - }, "node_modules/uri-js": { "version": "4.4.1", "dev": true, @@ -1829,18 +1488,6 @@ "url": "https://opencollective.com/webpack" } }, - "node_modules/which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "which": "bin/which" - } - }, "node_modules/wrappy": { "version": "1.0.2", "dev": true, @@ -2076,12 +1723,6 @@ "dev": true, "peer": true }, - "@yarnpkg/lockfile": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", - "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", - "dev": true - }, "acorn": { "version": "8.7.0", "dev": true, @@ -2093,15 +1734,6 @@ "peer": true, "requires": {} }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, "axios": { "version": "0.21.4", "dev": true, @@ -2159,17 +1791,6 @@ "dev": true, "peer": true }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, "chownr": { "version": "2.0.0", "dev": true @@ -2179,27 +1800,6 @@ "dev": true, "peer": true }, - "ci-info": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", - "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", - "dev": true - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, "commondir": { "version": "1.0.1", "dev": true @@ -2208,27 +1808,6 @@ "version": "0.0.1", "dev": true }, - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } - } - }, "detect-libc": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", @@ -2297,12 +1876,6 @@ "dev": true, "peer": true }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, "eslint-scope": { "version": "5.1.1", "dev": true, @@ -2371,30 +1944,10 @@ "path-exists": "^4.0.0" } }, - "find-yarn-workspace-root": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz", - "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==", - "dev": true, - "requires": { - "micromatch": "^4.0.2" - } - }, "follow-redirects": { "version": "1.14.9", "dev": true }, - "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, "fs-minipass": { "version": "2.1.0", "dev": true, @@ -2427,12 +1980,6 @@ "version": "4.2.10", "dev": true }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, "inflight": { "version": "1.0.6", "dev": true, @@ -2445,40 +1992,10 @@ "version": "2.0.4", "dev": true }, - "is-ci": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", - "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", - "dev": true, - "requires": { - "ci-info": "^2.0.0" - } - }, - "is-docker": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", - "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", - "dev": true - }, "is-number": { "version": "7.0.0", "dev": true }, - "is-wsl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", - "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", - "dev": true, - "requires": { - "is-docker": "^2.0.0" - } - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, "jest-worker": { "version": "27.5.1", "dev": true, @@ -2509,24 +2026,6 @@ "dev": true, "peer": true }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "klaw-sync": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz", - "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.11" - } - }, "loader-runner": { "version": "4.3.0", "dev": true, @@ -2592,12 +2091,6 @@ "brace-expansion": "^1.1.7" } }, - "minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", - "dev": true - }, "minipass": { "version": "3.1.6", "dev": true, @@ -2622,12 +2115,6 @@ "dev": true, "peer": true }, - "nice-try": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", - "dev": true - }, "node-releases": { "version": "2.0.3", "dev": true, @@ -2640,22 +2127,6 @@ "wrappy": "1" } }, - "open": { - "version": "7.4.2", - "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz", - "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==", - "dev": true, - "requires": { - "is-docker": "^2.0.0", - "is-wsl": "^2.1.1" - } - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", - "dev": true - }, "p-limit": { "version": "2.3.0", "dev": true, @@ -2674,44 +2145,6 @@ "version": "2.2.0", "dev": true }, - "patch-package": { - "version": "6.4.7", - "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-6.4.7.tgz", - "integrity": "sha512-S0vh/ZEafZ17hbhgqdnpunKDfzHQibQizx9g8yEf5dcVk3KOflOfdufRXQX8CSEkyOQwuM/bNz1GwKvFj54kaQ==", - "dev": true, - "requires": { - "@yarnpkg/lockfile": "^1.1.0", - "chalk": "^2.4.2", - "cross-spawn": "^6.0.5", - "find-yarn-workspace-root": "^2.0.0", - "fs-extra": "^7.0.1", - "is-ci": "^2.0.0", - "klaw-sync": "^6.0.0", - "minimist": "^1.2.0", - "open": "^7.4.2", - "rimraf": "^2.6.3", - "semver": "^5.6.0", - "slash": "^2.0.0", - "tmp": "^0.0.33" - }, - "dependencies": { - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } - } - }, "path-exists": { "version": "4.0.0", "dev": true @@ -2720,12 +2153,6 @@ "version": "1.0.1", "dev": true }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true - }, "picocolors": { "version": "1.0.0", "dev": true, @@ -2782,27 +2209,6 @@ "randombytes": "^2.1.0" } }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, - "requires": { - "shebang-regex": "^1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true - }, - "slash": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", - "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", - "dev": true - }, "source-map": { "version": "0.6.1", "dev": true, @@ -2820,15 +2226,6 @@ "spectorjs": { "version": "0.9.27" }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - }, "tapable": { "version": "2.2.1", "dev": true @@ -2914,15 +2311,6 @@ } } }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "requires": { - "os-tmpdir": "~1.0.2" - } - }, "to-regex-range": { "version": "5.0.1", "dev": true, @@ -2983,12 +2371,6 @@ "version": "4.6.3", "dev": true }, - "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true - }, "uri-js": { "version": "4.4.1", "dev": true, @@ -3086,15 +2468,6 @@ "dev": true, "peer": true }, - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, "wrappy": { "version": "1.0.2", "dev": true diff --git a/web/lib/src/index.ts b/web/lib/src/index.ts index ffc0e661..56c00921 100644 --- a/web/lib/src/index.ts +++ b/web/lib/src/index.ts @@ -1,4 +1,4 @@ -import init, {create_pool_scheduler, new_thread_local_state, run} from "./wasm-pack" +import init, {create_pool_scheduler, run} from "./wasm-pack" import {Spector} from "spectorjs" import {WebWorkerMessageType} from "./types" import { diff --git a/web/lib/src/legacy.worker.ts b/web/lib/src/legacy.worker.ts index 0f7b1c25..c9a6010a 100644 --- a/web/lib/src/legacy.worker.ts +++ b/web/lib/src/legacy.worker.ts @@ -1,3 +1,4 @@ +/* import init, {InitOutput, tessellate_layers} from "./wasm-pack" import {WebWorkerMessageType} from "./types" @@ -30,3 +31,4 @@ onmessage = async message => { break } } +*/ diff --git a/web/src/platform/legacy_webworker_fetcher.rs b/web/src/platform/legacy_webworker_fetcher.rs index c099ba28..4129fb88 100644 --- a/web/src/platform/legacy_webworker_fetcher.rs +++ b/web/src/platform/legacy_webworker_fetcher.rs @@ -5,7 +5,6 @@ use wasm_bindgen::prelude::*; use maplibre::coords::TileCoords; use maplibre::io::scheduler::Scheduler; -use maplibre::io::shared_thread_state::SharedThreadState; use maplibre::io::TileRequestID; diff --git a/web/src/platform/mod.rs b/web/src/platform/mod.rs index 4b07af78..8522af98 100644 --- a/web/src/platform/mod.rs +++ b/web/src/platform/mod.rs @@ -1,4 +1,4 @@ pub mod http_client; -pub mod legacy_webworker_fetcher; +//pub mod legacy_webworker_fetcher; pub mod pool; pub mod schedule_method; diff --git a/web/src/platform/schedule_method.rs b/web/src/platform/schedule_method.rs index 6596d74d..8949ccca 100644 --- a/web/src/platform/schedule_method.rs +++ b/web/src/platform/schedule_method.rs @@ -8,7 +8,6 @@ use web_sys::Worker; use maplibre::error::Error; use maplibre::io::scheduler::ScheduleMethod; -use maplibre::io::shared_thread_state::SharedThreadState; use super::pool::WorkerPool; @@ -37,17 +36,14 @@ impl WebWorkerPoolScheduleMethod { impl ScheduleMethod for WebWorkerPoolScheduleMethod { fn schedule( &self, - shared_thread_state: SharedThreadState, future_factory: Box< - (dyn (FnOnce(SharedThreadState) -> Pin + 'static>>) - + Send - + 'static), + (dyn (FnOnce() -> Pin + 'static>>) + Send + 'static), >, ) -> Result<(), Error> { self.pool .run(move || { wasm_bindgen_futures::future_to_promise(async move { - future_factory(shared_thread_state).await; + future_factory().await; Ok(JsValue::undefined()) }) })