Fix bundling/path errors, sidecar support, iOS/Android simulator support, asset hotreload fixes, serverfn hotrelad, native tailwind support (#2779)
* wip: fix manganis import path * upgrade tauri bundler, convert todo!() to unimplemented!() * feat: mobile hotreloading + ios asset configuration * remove oid demo and its associated env vars * nuke all the things that cause cache thrashing * swap to Asset type * add some more logs * display impl for attrvalue * dont panic on collect failure * cut down web deps to 150 * clean up deps in a lot of places, simplify build scripts * clean up asset resolution and cli-dev profile * wire up absolute paths for manganis asset in a particular mode * move document related things around to shorten compile times * move most things to `document::Item` and then decompose the cli-config * switch link to stylesheet for clarity in examples * move manganis workspace example to examples folder * decompose manganis-cli-support * dont need mobile demo anymore * remove gloo dialogs * html doesnt need document * rename hotreload to devtools * really clean up the html crate * fix weird rsx spacing * clean up desktop to use callback * clean up document a bit * re-wire up devsocket * fix utf css * yeeeet that js out of here * synthetic web system works * web crate almost done being cleaned up * desktop mostly cleaned up too * clean up cli a bit * more cli cleanup * cli builds again * clean up cli, inline structs, cut down number of unique types where possible * hotreload works again for desktop and this time, mobile too * cfg out tungstenite * devserver err * more refactor to cli builder * switch to unbounded_send * new structure is much cleaner * add http serve subcommand * bundled hotreload * kick stylsheets * clean up a bit more, split up eventloop * amazingly serve seems done * change from pub to pub(crate) in cli * remove tools * bit more polish to cli * fix issue with join * gracefully handle fullstack without a server * fullstack mobile demo * fix launch function, move projects into example-projects folder * hoist examples * add "run" command * clean up launch * remove old manual websocket receiver * doctor command * allow desktop to scroll * cut apart router crate * dont put launch in prelude * use dioxus::launch where possible * rename rsx, cut out hotreload tests * remove liveview project * bump native * fix compile for renderers * move sync event response out of interpreter * move render in serve * rollback settings change * cli compiles, huzzah! * change uris for asset * fix asset * new tui screen * new cargo-like tui works * very very verty close * it works! very small bug with incorrect grapheme calc * Clean up devserver a bit * status sytem * tidy up debug filters * clean up logging situation * Fix a number of bugs with log printing * new printing system is more reliable * wire up more stuff * things working but fullstack is having issues * fullstack works again! * hotreloading bundled assets works again * bundled hotreload and beginnings of macos bundling * Hotreload desktop * combined server builds * add build handle * fix fullstack assets * make open async, add some hooks for ios * migrate filemap to runner * wip global crate system * fixup bundles + organize asset * fix asset location bug * all the bundled reloading! * open ios simulator! * full hotreload support for mobile + serverfn * basic cleanups * clean up dx * Move filemap * fix cutting of newlines * assets workibg, some android * hoist wry/tao * use sync locks and headers to fix issues with android * desktop -> mac/win/linux with alias * better logging * feat: workspace (entire computer!) hotreload * should rebuild toggle, ios simulator bootup * proper mobile support in launch * more robust handling of assets * fix cargo * bring back some of tauri bundle * make warnings go away, clippy happy on cli * some final clippy cleanups * fmt * move manganis to its own folder * upgrade bundle to stable * drastically slim down manganis, prepping for merge * typos, failing test, docsrs config * remove static gen test * nix static gen test * we use --platform web instead of --platform fullstack now * only bind dev urls in desktop/mobile * install gtk * nix static gen * split build dir by app name
This commit is contained in:
1 parent
ef436e4ed0
commit
7ec3453ca3
156 files changed
+11544
-9005
No files matched your search
@@ -1,4 +1,8 @@
|
||||
use std::{cell::RefCell, collections::VecDeque, rc::Rc, task::Waker};
|
||||
use std::{
|
||||
collections::VecDeque,
|
||||
sync::{Arc, RwLock},
|
||||
task::Waker,
|
||||
};
|
||||
|
||||
use dioxus_interpreter_js::MutationState;
|
||||
|
||||
@@ -6,7 +10,7 @@ use dioxus_interpreter_js::MutationState;
|
||||
/// It will hold onto the requests until the interpreter is ready to handle them and hold onto any pending edits until a new request is made.
|
||||
#[derive(Default, Clone)]
|
||||
pub(crate) struct WryQueue {
|
||||
inner: Rc<RefCell<WryQueueInner>>,
|
||||
inner: Arc<RwLock<WryQueueInner>>,
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
@@ -23,7 +27,7 @@ pub(crate) struct WryQueueInner {
|
||||
|
||||
impl WryQueue {
|
||||
pub fn handle_request(&self, responder: wry::RequestAsyncResponder) {
|
||||
let mut myself = self.inner.borrow_mut();
|
||||
let mut myself = self.inner.write().unwrap();
|
||||
if let Some(bytes) = myself.edit_queue.pop_back() {
|
||||
responder.respond(wry::http::Response::new(bytes));
|
||||
} else {
|
||||
@@ -36,13 +40,17 @@ impl WryQueue {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn mutation_state_mut(&self) -> std::cell::RefMut<'_, MutationState> {
|
||||
std::cell::RefMut::map(self.inner.borrow_mut(), |myself| &mut myself.mutation_state)
|
||||
pub fn with_mutation_state_mut<O: 'static>(
|
||||
&self,
|
||||
f: impl FnOnce(&mut MutationState) -> O,
|
||||
) -> O {
|
||||
let mut inner = self.inner.write().unwrap();
|
||||
f(&mut inner.mutation_state)
|
||||
}
|
||||
|
||||
/// Send a list of mutations to the webview
|
||||
pub(crate) fn send_edits(&self) {
|
||||
let mut myself = self.inner.borrow_mut();
|
||||
let mut myself = self.inner.write().unwrap();
|
||||
let serialized_edits = myself.mutation_state.export_memory();
|
||||
// There are pending edits that need to be applied to the webview before we run futures
|
||||
myself.edits_in_progress = true;
|
||||
@@ -54,13 +62,13 @@ impl WryQueue {
|
||||
}
|
||||
|
||||
fn edits_in_progress(&self) -> bool {
|
||||
self.inner.borrow().edits_in_progress
|
||||
self.inner.read().unwrap().edits_in_progress
|
||||
}
|
||||
|
||||
/// Wait until all pending edits have been rendered in the webview
|
||||
pub fn poll_edits_flushed(&self, cx: &mut std::task::Context<'_>) -> std::task::Poll<()> {
|
||||
if self.edits_in_progress() {
|
||||
let mut myself = self.inner.borrow_mut();
|
||||
let mut myself = self.inner.write().unwrap();
|
||||
let waker = cx.waker();
|
||||
myself.waiting_for_edits_flushed.push(waker.clone());
|
||||
std::task::Poll::Pending
|
||||
|
||||
Reference in new issue
Block a user