May 11, 2023 · Apr 13, 2023 · Apr 16, 2023 · Apr 16, 2023 · Apr 18, 2023 · May 7, 2023
diff --git a/src/lib/client/adapters/webcontainer/index.js b/src/lib/client/adapters/webcontainer/index.js
 progress.set({ value: 0, text: 'loading files' });

 const q = yootils.queue(1);
 /** @type {Map<string, Array<import('$lib/types').FileStub>>} */
 const q_per_file = new Map();

 /** Paths and contents of the currently loaded file stubs */
 let current_stubs = stubs_to_map([]);
 // For some reason, server-ready is fired again when the vite dev server is restarted.
 // We need to wait for it to finish before we can continue, else we might
 // request files from Vite before it's ready, leading to a timeout.
 const will_restart = launched && to_write.some(will_restart_vite_dev_server);
 const promise = will_restart
 ? new Promise((fulfil, reject) => {
 const error_unsub = vm.on('error', (error) => {
 error_unsub();
 reject(new Error(error.message));
 });

 const ready_unsub = vm.on('server-ready', (port, base) => {
 ready_unsub();
 console.log(`server ready on port ${port} at ${performance.now()}: ${base}`);
 fulfil(undefined);
 });

 setTimeout(() => {
 reject(new Error('Timed out resetting WebContainer'));
 }, 10000);
  })
 : Promise.resolve();
 const will_restart = launched &&
 (to_write.some(is_config) || to_delete.some(is_config_path));
 const promise = will_restart ? wait_for_restart_vite() : Promise.resolve();

 for (const file of to_delete) {
 await vm.fs.rm(file, { force: true, recursive: true });
 });
 },
 update: (file) => {

 let queue = q_per_file.get(file.name);
 if (queue) {
 queue.push(file);
 return Promise.resolve(false);
 }

 q_per_file.set(file.name, queue = [file]);

 return q.add(async () => {
 /** @type {import('@webcontainer/api').FileSystemTree} */
 const root = {};
 tree = /** @type {import('@webcontainer/api').DirectoryNode} */ (tree[part]).directory;
 }

 tree[basename] = to_file(file);
 const will_restart = is_config(file);

 while (queue && queue.length > 0) {

 //initialize warnings of this file
 $warnings[file.name] =[];
 schedule_to_update_warning(100);
 //if the file is updated many times rapidly, get the most recently updated one
 constfile =/** @type {import('$lib/types').FileStub} */ (queue.pop());
 queue.length = 0

 await vm.mount(root);
 tree[basename] = to_file(file);

 current_stubs.set(file.name, file);
 // initialize warnings of this file
 $warnings[file.name] = [];
 schedule_to_update_warning(100);

 await vm.mount(root);

 if (will_restart) await wait_for_restart_vite();

 current_stubs.set(file.name, file);

 // we need to stagger sequential updates, just enough that the HMR
 // wires don't get crossed. 50ms seems to be enough of a delay
 // to avoid glitches without noticeably affecting update speed
 await new Promise((f) => setTimeout(f, 50));
 }

 // we need to stagger sequential updates, just enough that the HMR
 // wires don't get crossed. 50ms seems to be enough of a delay
 // to avoid glitches without noticeably affecting update speed
 await new Promise((f) => setTimeout(f, 50));
 q_per_file.delete(file.name)

 returnwill_restart_vite_dev_server(file);
 returnwill_restart;
 });
 }
 };
 /**
 * @param {import('$lib/types').Stub} file
 */
 function will_restart_vite_dev_server(file) {
 return (
 file.type === 'file' &&
 (file.name === '/vite.config.js' || file.name === '/svelte.config.js' || file.name === '/.env')
 );
 function is_config(file) {
 return file.type === 'file' && is_config_path(file.name);
 }

 /**
 * @param {string} path
 */
 function is_config_path(path) {
 return ['/vite.config.js', '/svelte.config.js', '/.env'].includes(path);
 }

 function wait_for_restart_vite() {
 return new Promise((fulfil, reject) => {
 const error_unsub = vm.on('error', (error) => {
 error_unsub();
 reject(new Error(error.message));
 });

 const ready_unsub = vm.on('server-ready', (port, base) => {
 ready_unsub();
 console.log(`server ready on port ${port} at ${performance.now()}: ${base}`);
 fulfil(undefined);
 });

 setTimeout(() => {
 reject(new Error('Timed out resetting WebContainer'));
 }, 10000);
 });
 }

 /**
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,6 +32,8 @@ export async function create(base, error, progress, logs, warnings) {
		progress.set({ value: 0, text: 'loading files' });

		const q = yootils.queue(1);
		/** @type {Map<string, Array<import('$lib/types').FileStub>>} */
		const q_per_file = new Map();

		/** Paths and contents of the currently loaded file stubs */
		let current_stubs = stubs_to_map([]);
Expand DownExpand Up		@@ -203,25 +205,9 @@ export async function create(base, error, progress, logs, warnings) {
		// For some reason, server-ready is fired again when the vite dev server is restarted.
		// We need to wait for it to finish before we can continue, else we might
		// request files from Vite before it's ready, leading to a timeout.
		const will_restart = launched && to_write.some(will_restart_vite_dev_server);
		const promise = will_restart
		? new Promise((fulfil, reject) => {
		const error_unsub = vm.on('error', (error) => {
		error_unsub();
		reject(new Error(error.message));
		});

		const ready_unsub = vm.on('server-ready', (port, base) => {
		ready_unsub();
		console.log(`server ready on port ${port} at ${performance.now()}: ${base}`);
		fulfil(undefined);
		});

		setTimeout(() => {
		reject(new Error('Timed out resetting WebContainer'));
		}, 10000);
		})
		: Promise.resolve();
		const will_restart = launched &&
		(to_write.some(is_config) \|\| to_delete.some(is_config_path));
		const promise = will_restart ? wait_for_restart_vite() : Promise.resolve();

		for (const file of to_delete) {
		await vm.fs.rm(file, { force: true, recursive: true });
Expand All		@@ -241,6 +227,15 @@ export async function create(base, error, progress, logs, warnings) {
		});
		},
		update: (file) => {

		let queue = q_per_file.get(file.name);
		if (queue) {
		queue.push(file);
		return Promise.resolve(false);
		}

		q_per_file.set(file.name, queue = [file]);

		return q.add(async () => {
		/** @type {import('@webcontainer/api').FileSystemTree} */
		const root = {};
Expand All		@@ -263,22 +258,35 @@ export async function create(base, error, progress, logs, warnings) {
		tree = /** @type {import('@webcontainer/api').DirectoryNode} */ (tree[part]).directory;
		}

		tree[basename] = to_file(file);
		const will_restart = is_config(file);

		while (queue && queue.length > 0) {

		//initialize warnings of this file
		$warnings[file.name] =[];
		schedule_to_update_warning(100);
		//if the file is updated many times rapidly, get the most recently updated one
		constfile =/** @type {import('$lib/types').FileStub} */ (queue.pop());
		queue.length = 0

		await vm.mount(root);
		tree[basename] = to_file(file);

		current_stubs.set(file.name, file);
		// initialize warnings of this file
		$warnings[file.name] = [];
		schedule_to_update_warning(100);

		await vm.mount(root);

		if (will_restart) await wait_for_restart_vite();

		current_stubs.set(file.name, file);

		// we need to stagger sequential updates, just enough that the HMR
		// wires don't get crossed. 50ms seems to be enough of a delay
		// to avoid glitches without noticeably affecting update speed
		await new Promise((f) => setTimeout(f, 50));
		}

		// we need to stagger sequential updates, just enough that the HMR
		// wires don't get crossed. 50ms seems to be enough of a delay
		// to avoid glitches without noticeably affecting update speed
		await new Promise((f) => setTimeout(f, 50));
		q_per_file.delete(file.name)

		returnwill_restart_vite_dev_server(file);
		returnwill_restart;
		});
		}
		};
Expand All		@@ -287,11 +295,34 @@ export async function create(base, error, progress, logs, warnings) {
		/**
		* @param {import('$lib/types').Stub} file
		*/
		function will_restart_vite_dev_server(file) {
		return (
		file.type === 'file' &&
		(file.name === '/vite.config.js' \|\| file.name === '/svelte.config.js' \|\| file.name === '/.env')
		);
		function is_config(file) {
		return file.type === 'file' && is_config_path(file.name);
		}

		/**
		* @param {string} path
		*/
		function is_config_path(path) {
		return ['/vite.config.js', '/svelte.config.js', '/.env'].includes(path);
		}

		function wait_for_restart_vite() {
		return new Promise((fulfil, reject) => {
		const error_unsub = vm.on('error', (error) => {
		error_unsub();
		reject(new Error(error.message));
		});

		const ready_unsub = vm.on('server-ready', (port, base) => {
		ready_unsub();
		console.log(`server ready on port ${port} at ${performance.now()}: ${base}`);
		fulfil(undefined);
		});

		setTimeout(() => {
		reject(new Error('Timed out resetting WebContainer'));
		}, 10000);
		});
		}

		/**
Expand Down