rebuildjs 0.27.0 → 0.27.2

package/browser/index.js

@@ -1,5 +1,5 @@
-import { file_exists_ } from 'ctx-core/fs'
-import { nullish__none_, waitfor } from 'ctx-core/function'
+import { file_exists__waitfor } from 'ctx-core/fs'
+import { Cancel, nullish__none_, sleep, waitfor } from 'ctx-core/function'
 import { be_lock_memosig_triple_, be_memo_pair_ } from 'ctx-core/rmemo'
 import { mkdir, readFile, writeFile } from 'node:fs/promises'
 import { join, relative } from 'path'
@@ -18,20 +18,52 @@ export const [
 	browser__metafile_,
 	browser__metafile__set
 ] = /** @type {be_lock_memosig_triple_T<rebuildjs_metafile_T>} */
-	be_lock_memosig_triple_(()=>undefined,
+	be_lock_memosig_triple_(
+		()=>undefined,
 		async (ctx, browser__metafile$)=>{
 			browser__metafile__waitfor_promise?.cancel?.()
-			let metafile_path
-			if (!browser__metafile$.lock) {
-				metafile_path = browser__metafile_path_(ctx)
-				browser__metafile__waitfor_promise = waitfor(
-					()=>file_exists_(metafile_path),
-					200
-				).catch(()=>false)
-				if (await browser__metafile__waitfor_promise && metafile_path === browser__metafile_path_(ctx)) {
-					browser__metafile$._ = await readFile(metafile_path).then(buf=>JSON.parse(buf + ''))
-				}
-			}
+			if (browser__metafile$.lock) return
+			nullish__none_([browser__metafile_path_(ctx)],
+				async browser__metafile_path=>{
+					try {
+						if (await cmd(
+							browser__metafile__waitfor_promise =
+								file_exists__waitfor(
+									browser__metafile_path,
+									1000,
+									()=>cmd(sleep(0))))
+						) {
+							browser__metafile$._ = await cmd(
+								waitfor(async ()=>{
+									const buf = await cmd(readFile(browser__metafile_path))
+									const json = buf + ''
+									try {
+										return JSON.parse(json)
+									} catch {
+										return undefined
+									}
+								}, 1000))
+						}
+					} catch (err) {
+						if (err instanceof Cancel) return
+						throw err
+					}
+					async function cmd(promise) {
+						if (cancel_()) throw new Cancel()
+						const rv = await promise
+						if (cancel_()) {
+							promise.cancel?.()
+							throw new Cancel()
+						}
+						return rv
+					}
+					function cancel_() {
+						return (
+							browser__metafile$.lock
+							|| browser__metafile_path !== browser__metafile_path_(ctx)
+						)
+					}
+				})
 		}, { ns: 'app', id: 'browser__metafile' })
 export function browser__metafile__persist() {
 	return nullish__none_([

package/browser/index.test.ts

@@ -48,7 +48,7 @@ test('browser__metafile_path', ()=>{
 	throws(()=>browser__metafile_path_(ctx_()))
 })
 test('browser__metafile', async ()=>{
-	let file_exists__path:string|undefined = undefined
+	let file_exists__waitfor__path:string|undefined = undefined
 	let readFile_path:string|undefined = undefined
 	let _browser__metafile$_:typeof browser__metafile$_
 	let _browser__metafile_:typeof browser__metafile_
@@ -62,14 +62,15 @@ test('browser__metafile', async ()=>{
 			browser__metafile__set: _browser__metafile__set,
 		} = await esmock.p('./index.js', import.meta.url, {}, {
 			'ctx-core/rmemo': rmemo,
+			// TODO: remove with https://github.com/iambumblehead/esmock/issues/281
 			'ctx-core/fs': {
-				file_exists_: async (path:string)=>{
-					file_exists__path = path
+				file_exists__waitfor: async (path:string)=>{
+					file_exists__waitfor__path = path
 					return true
 				}
 			},
 			'node:fs/promises': {
-				// TODO: use this when https://github.com/iambumblehead/esmock/issues/281 is addressed
+				// TODO: https://github.com/iambumblehead/esmock/issues/281
 				// access: async ()=>{},
 				readFile: async (path:string)=>{
 					readFile_path = path
@@ -79,6 +80,7 @@ test('browser__metafile', async ()=>{
 						case '/cwd/dist1/browser/metafile.json':
 							return Buffer.from(JSON.stringify(browser__metafile1), 'utf-8')
 					}
+					return undefined
 				}
 			},
 		}))
@@ -91,7 +93,7 @@ test('browser__metafile', async ()=>{
 		100)
 	equal(_browser__metafile$_(app_ctx)._, browser__metafile0)
 	equal(_browser__metafile_(app_ctx), browser__metafile0)
-	equal(file_exists__path, '/cwd/dist0/browser/metafile.json')
+	equal(file_exists__waitfor__path, '/cwd/dist0/browser/metafile.json')
 	equal(readFile_path, '/cwd/dist0/browser/metafile.json')
 	equal(_browser__metafile$_(app_ctx)._, browser__metafile0)
 	equal(_browser__metafile_(app_ctx), browser__metafile0)
@@ -102,7 +104,7 @@ test('browser__metafile', async ()=>{
 		100)
 	equal(_browser__metafile$_(app_ctx)._, browser__metafile1)
 	equal(_browser__metafile_(app_ctx), browser__metafile1)
-	equal(file_exists__path, '/cwd/dist1/browser/metafile.json')
+	equal(file_exists__waitfor__path, '/cwd/dist1/browser/metafile.json')
 	equal(readFile_path, '/cwd/dist1/browser/metafile.json')
 	dist_path__set(app_ctx, '/cwd/dist0')
 	await rmemo__wait(
@@ -111,7 +113,7 @@ test('browser__metafile', async ()=>{
 		100)
 	equal(_browser__metafile$_(app_ctx)._, browser__metafile0)
 	equal(_browser__metafile_(app_ctx), browser__metafile0)
-	equal(file_exists__path, '/cwd/dist0/browser/metafile.json')
+	equal(file_exists__waitfor__path, '/cwd/dist0/browser/metafile.json')
 	equal(readFile_path, '/cwd/dist0/browser/metafile.json')
 	_browser__metafile__set(app_ctx, browser__metafile2)
 	equal(_browser__metafile$_(app_ctx)._, browser__metafile2)

package/build/index.js

@@ -6,8 +6,8 @@ import { be, be_memo_pair_, be_sig_triple_, memo_, off, rmemo__wait } from 'ctx-
 import { short_uuid_ } from 'ctx-core/uuid'
 import { context } from 'esbuild'
 import { fdir } from 'fdir'
-import { link, mkdir, readFile, rm } from 'node:fs/promises'
-import { join, relative, resolve } from 'path'
+import { cp, link, mkdir, readFile, rm } from 'node:fs/promises'
+import { basename, dirname, extname, join, relative, resolve } from 'path'
 import { app_path_, browser_path_, cwd_, is_prod_, server__relative_path_, server_path_ } from '../app/index.js'
 import {
 	browser__metafile_,
@@ -268,25 +268,26 @@ export function rebuildjs_plugin_() {
 			})
 		}
 		// Prevent GC
-		setup.rebuildjs__assets__link$ = rebuildjs__assets__link$_()
+		setup.rebuildjs_plugin__postprocess$ = rebuildjs_plugin__postprocess$_()
 		return setup
 		/**
 		 *
 		 * @returns {memo_T<void>}
 		 * @private
 		 */
-		function rebuildjs__assets__link$_() {
+		function rebuildjs_plugin__postprocess$_() {
 			return (
 				be(app_ctx, ctx=>
-					run(memo_(assets__link$=>{
+					run(memo_(rebuildjs__assets__link$=>{
 						r()
-						return assets__link$
+						return rebuildjs__assets__link$
 						function r() {
 							if (!persist__metafile__ready_(ctx)) return
 							nullish__none_([
 								build_id_(ctx),
 								metafile__build_id_(ctx),
 								server__metafile_(ctx),
+								browser__metafile_(ctx),
 								cwd_(ctx),
 								browser_path_(ctx),
 								server__relative_path_(ctx),
@@ -294,6 +295,7 @@ export function rebuildjs_plugin_() {
 								build_id,
 								metafile__build_id,
 								server__metafile,
+								browser__metafile,
 								cwd,
 								browser_path,
 								server__relative_path,
@@ -301,20 +303,8 @@ export function rebuildjs_plugin_() {
 								if (build_id === metafile__build_id) {
 									run(async ()=>{
 										try {
-											const outputs = server__metafile.outputs ?? {}
-											for (let output__relative_path in outputs) {
-												if (/(\.js|\.mjs)(\.map)?$/.test(output__relative_path)) continue
-												const server_asset_path = join(cwd, output__relative_path)
-												const browser_asset_path = join(
-													browser_path,
-													relative(server__relative_path, output__relative_path))
-												await cmd(
-													rm(browser_asset_path, { force: true }))
-												await cmd(
-													file_exists__waitfor(server_asset_path))
-												await cmd(
-													link(server_asset_path, browser_asset_path))
-											}
+											await esbuild_cssBundle__cp()
+											await rebuildjs__assets__link()
 										} catch (err) {
 											if (err instanceof Cancel) return
 											throw err
@@ -322,6 +312,51 @@ export function rebuildjs_plugin_() {
 										rebuildjs__build_id__set(ctx, build_id)
 									})
 								}
+								async function esbuild_cssBundle__cp() {
+									for (const metafile of [server__metafile, browser__metafile]) {
+										for (let output__relative_path in metafile.outputs) {
+											let cssBundle, esbuild_cssBundle
+											switch (extname(output__relative_path)) {
+												case '.js':
+												case '.mjs':
+													({ cssBundle, esbuild_cssBundle } = metafile.outputs[output__relative_path])
+													if (cssBundle && esbuild_cssBundle) {
+														const cssBundle_path = join(cwd_(ctx), cssBundle)
+														const esbuild_cssBundle_path = join(cwd_(ctx), esbuild_cssBundle)
+														await cmd(
+															file_exists__waitfor(cssBundle_path))
+														await cmd(
+															cp(cssBundle_path, esbuild_cssBundle_path))
+														await cmd(
+															file_exists__waitfor(cssBundle_path + '.map'))
+														await cmd(
+															cp(cssBundle_path + '.map', esbuild_cssBundle_path + '.map'))
+													}
+											}
+										}
+									}
+								}
+								async function rebuildjs__assets__link() {
+									const outputs= server__metafile.outputs ?? {}
+									for (let output__relative_path in outputs) {
+										switch (extname(output__relative_path)) {
+											case '.js':
+											case '.mjs':
+											case '.map':
+												continue
+										}
+										const server_asset_path = join(cwd, output__relative_path)
+										const browser_asset_path = join(
+											browser_path,
+											relative(server__relative_path, output__relative_path))
+										await cmd(
+											rm(browser_asset_path, { force: true }))
+										await cmd(
+											file_exists__waitfor(server_asset_path))
+										await cmd(
+											link(server_asset_path, browser_asset_path))
+									}
+								}
 								async function cmd(promise) {
 									if (cancel_()) throw new Cancel()
 									promise.rebuildjs_cancel$ = run(memo_(rebuildjs_cancel$=>{
@@ -340,6 +375,7 @@ export function rebuildjs_plugin_() {
 										build_id_(ctx) !== build_id
 											|| metafile__build_id_(ctx) !== metafile__build_id
 											|| server__metafile_(ctx) !== server__metafile
+											|| browser__metafile_(ctx) !== browser__metafile
 											|| cwd_(ctx) !== cwd
 											|| browser_path_(ctx) !== browser_path
 											|| server__relative_path_(ctx) !== server__relative_path
@@ -368,7 +404,7 @@ async function server__metafile__update(server__metafile, build_id) {
 		const output = server__metafile.outputs[server__output__relative_path]
 		const { cssBundle } = output
 		if (cssBundle) {
-			output.esbuild_cssBundle = cssBundle
+			output.esbuild_cssBundle = esbuild_cssBundle_(cssBundle)
 			output.cssBundle_content = [
 				server__output__relative_path,
 				...(
@@ -394,10 +430,15 @@ async function browser__metafile__update(browser__metafile, build_id) {
 			const output = browser__metafile.outputs[browser__output__relative_path]
 			const { cssBundle } = output
 			if (cssBundle) {
-				output.esbuild_cssBundle = cssBundle
+				output.esbuild_cssBundle = esbuild_cssBundle_(cssBundle)
 				output.cssBundle_content = [browser__output__relative_path]
 			}
 		}
 	}
 	await browser__metafile__persist()
 }
+function esbuild_cssBundle_(cssBundle) {
+	return join(
+		dirname(cssBundle),
+		basename(cssBundle, '.css') + '_esbuild.css')
+}

package/build/index.test.ts

@@ -2,12 +2,13 @@ import { ctx_ } from 'ctx-core/be'
 import { file_exists_ } from 'ctx-core/fs'
 import { sleep } from 'ctx-core/function'
 import { BuildContext } from 'esbuild'
+import { readFile } from 'fs/promises'
 import { rm } from 'node:fs/promises'
-import { dirname, join } from 'path'
+import { basename, dirname, join } from 'path'
 import { test } from 'uvu'
 import { equal, throws } from 'uvu/assert'
 import { browser__metafile0, browser__metafile1, server__metafile0, server__metafile1 } from '../_fixtures/metafiles.js'
-import { cwd__set } from '../app/index.js'
+import { cwd_, cwd__set } from '../app/index.js'
 import { browser__metafile_, browser__metafile__set } from '../browser/index.js'
 import { app_ctx } from '../ctx/index.js'
 import { server__metafile_, server__metafile__set } from '../server/index.js'
@@ -130,6 +131,7 @@ test('browser__build|server__build|rebuildjs_plugin_|metafile', async ()=>{
 		equal(await file_exists_(join(cwd, 'dist')), true)
 		equal(await file_exists_(join(cwd, 'dist', 'browser--dev')), true)
 		equal(await file_exists_(join(cwd, 'dist', 'server--dev')), true)
+		await rebuildjs__ready__wait()
 		const server__metafile = server__metafile_(app_ctx)!
 		equal(server__metafile.rebuildjs_target, 'server')
 		const browser__metafile = browser__metafile_(app_ctx)!
@@ -145,7 +147,10 @@ test('browser__build|server__build|rebuildjs_plugin_|metafile', async ()=>{
 			server__metafile.outputs[server__output__relative_path]
 		equal(server__entryPoint__output != null, true)
 		equal(server__entryPoint__output.cssBundle != null, true)
-		equal(server__entryPoint__output.esbuild_cssBundle, server__entryPoint__output.cssBundle)
+		equal(server__entryPoint__output.esbuild_cssBundle,
+			join(
+				dirname(server__entryPoint__output.cssBundle!),
+				basename(server__entryPoint__output.cssBundle!, '.css') + '_esbuild.css'))
 		const browser__output__relative_path =
 			Object.keys(browser__metafile.outputs)
 				.find(browser__output__relative_path=>
@@ -155,7 +160,10 @@ test('browser__build|server__build|rebuildjs_plugin_|metafile', async ()=>{
 			browser__metafile.outputs[browser__output__relative_path]
 		equal(browser__entryPoint__output != null, true)
 		equal(browser__entryPoint__output.cssBundle != null, true)
-		equal(browser__entryPoint__output.esbuild_cssBundle, browser__entryPoint__output.cssBundle)
+		equal(browser__entryPoint__output.esbuild_cssBundle,
+			join(
+				dirname(browser__entryPoint__output.cssBundle!),
+				basename(browser__entryPoint__output.cssBundle!, '.css') + '_esbuild.css'))
 		equal(server__entryPoint__output.cssBundle_content, [
 			server__output__relative_path,
 			browser__output__relative_path
@@ -164,7 +172,60 @@ test('browser__build|server__build|rebuildjs_plugin_|metafile', async ()=>{
 			browser__output__relative_path
 		])
 	} finally {
-		await sleep(100)
+		await rebuildjs__ready__wait()
+		server__build_context?.dispose?.()
+		browser__build_context?.dispose?.()
+	}
+})
+test('browser__build|server__build|rebuildjs_plugin_|css', async ()=>{
+	const test_dir = dirname(new URL(import.meta.url).pathname)
+	const cwd = join(test_dir, '../_fixtures')
+	cwd__set(app_ctx, cwd)
+	await rm(join(cwd, 'dist'), { recursive: true, force: true })
+	let server__build_context:BuildContext|undefined = undefined
+	let browser__build_context:BuildContext|undefined = undefined
+	try {
+		server__build_context = await server__build()
+		browser__build_context = await browser__build()
+		await rebuildjs__ready__wait()
+		const server__metafile = server__metafile_(app_ctx)!
+		const server__output__relative_path =
+			Object.keys(server__metafile.outputs)
+				.find(server__output__relative_path=>
+					server__metafile.outputs[server__output__relative_path].entryPoint)!
+		const server__entryPoint__output =
+			server__metafile.outputs[server__output__relative_path]
+		const browser__metafile = browser__metafile_(app_ctx)!
+		const browser__output__relative_path =
+			Object.keys(browser__metafile.outputs)
+				.find(browser__output__relative_path=>
+					browser__metafile.outputs[browser__output__relative_path].entryPoint)!
+		const browser__entryPoint__output =
+			browser__metafile.outputs[browser__output__relative_path]
+		equal(typeof server__entryPoint__output.cssBundle, 'string')
+		equal(typeof browser__entryPoint__output.cssBundle, 'string')
+		equal(typeof server__entryPoint__output.esbuild_cssBundle, 'string')
+		equal(typeof browser__entryPoint__output.esbuild_cssBundle, 'string')
+		equal(server__entryPoint__output.cssBundle !== server__entryPoint__output.esbuild_cssBundle, true)
+		equal(browser__entryPoint__output.cssBundle !== browser__entryPoint__output.esbuild_cssBundle, true)
+		equal(
+			await readFile(join(cwd_(app_ctx), server__entryPoint__output.cssBundle + '.map')).then(buf=>buf + '')
+			=== await readFile(join(cwd_(app_ctx), server__entryPoint__output.esbuild_cssBundle + '.map')).then(buf=>buf + ''),
+			true)
+		equal(
+			await readFile(join(cwd_(app_ctx), browser__entryPoint__output.cssBundle + '.map')).then(buf=>buf + '')
+			=== await readFile(join(cwd_(app_ctx), browser__entryPoint__output.esbuild_cssBundle + '.map')).then(buf=>buf + ''),
+			true)
+		equal(
+			await readFile(join(cwd_(app_ctx), server__entryPoint__output.cssBundle + '.map')).then(buf=>buf + '')
+			=== await readFile(join(cwd_(app_ctx), server__entryPoint__output.esbuild_cssBundle + '.map')).then(buf=>buf + ''),
+			true)
+		equal(
+			await readFile(join(cwd_(app_ctx), browser__entryPoint__output.cssBundle + '.map')).then(buf=>buf + '')
+			=== await readFile(join(cwd_(app_ctx), browser__entryPoint__output.esbuild_cssBundle + '.map')).then(buf=>buf + ''),
+			true)
+	} finally {
+		await rebuildjs__ready__wait()
 		server__build_context?.dispose?.()
 		browser__build_context?.dispose?.()
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rebuildjs",
-  "version": "0.27.0",
+  "version": "0.27.2",
   "description": "Reactive esbuild...simple hackable alternative to vite for Multi Page Apps",
   "keywords": [
     "reactive",
@@ -54,7 +54,7 @@
   },
   "dependencies": {
     "ctx-core": "^5.9.0",
-    "elysia": "^0.8.6",
+    "elysia": "^0.8.8",
     "esbuild": "^0.19.11",
     "fdir": "^6.1.1",
     "picomatch": "^3.0.1"

package/server/index.js

@@ -1,5 +1,5 @@
-import { file_exists_ } from 'ctx-core/fs'
-import { nullish__none_, tup, waitfor } from 'ctx-core/function'
+import { file_exists__waitfor } from 'ctx-core/fs'
+import { Cancel, nullish__none_, sleep, tup, waitfor } from 'ctx-core/function'
 import { be_lock_memosig_triple_, be_memo_pair_, be_sig_triple_ } from 'ctx-core/rmemo'
 import { mkdir, readFile, writeFile } from 'node:fs/promises'
 import { join, relative } from 'path'
@@ -17,22 +17,52 @@ export const [
 	server__metafile_,
 	server__metafile__set
 ] = /** @type {be_lock_memosig_triple_T<rebuildjs_metafile_T>} */
-	be_lock_memosig_triple_(()=>
-		undefined,
-	async (ctx, server__metafile$)=>{
-		server__metafile__waitfor_promise?.cancel?.()
-		let metafile_path
-		if (!server__metafile$.lock) {
-			metafile_path = server__metafile_path_(ctx)
-			server__metafile__waitfor_promise = waitfor(
-				()=>file_exists_(metafile_path),
-				200
-			).catch(()=>false)
-			if (await server__metafile__waitfor_promise && metafile_path === server__metafile_path_(ctx)) {
-				server__metafile$._ = await readFile(metafile_path).then(buf=>JSON.parse(buf + ''))
-			}
-		}
-	}, { ns: 'app', id: 'server__metafile' })
+	be_lock_memosig_triple_(
+		()=>undefined,
+		async (ctx, server__metafile$)=>{
+			server__metafile__waitfor_promise?.cancel?.()
+			if (server__metafile$.lock) return
+			nullish__none_([server__metafile_path_(ctx)],
+				async server__metafile_path=>{
+					try {
+						if (await cmd(
+							server__metafile__waitfor_promise =
+								file_exists__waitfor(
+									server__metafile_path,
+									1000,
+									()=>cmd(sleep(0))))
+						) {
+							server__metafile$._ = await cmd(
+								waitfor(async ()=>{
+									const buf = await cmd(readFile(server__metafile_path))
+									const json = buf + ''
+									try {
+										return JSON.parse(json)
+									} catch {
+										return undefined
+									}
+								}, 1000))
+						}
+					} catch (err) {
+						if (err instanceof Cancel) return
+						throw err
+					}
+					async function cmd(promise) {
+						if (cancel_()) throw new Cancel()
+						const rv = await promise
+						if (cancel_()) {
+							promise.cancel?.()
+							throw new Cancel()
+						}
+						return rv
+					}
+					function cancel_() {
+						return (
+							server__metafile$.lock
+							|| server__metafile_path !== server__metafile_path_(ctx))
+					}
+				})
+		}, { ns: 'app', id: 'server__metafile' })
 export function server__metafile__persist() {
 	return nullish__none_([
 		server__metafile_path_(app_ctx),

package/server/index.test.ts

@@ -51,13 +51,11 @@ test('server__metafile_path', ()=>{
 	throws(()=>server__metafile_path_(ctx_()))
 })
 test('server__metafile', async ()=>{
-	let file_exists__path:string|undefined = undefined
+	let file_exists__waitfor__path:string|undefined = undefined
 	let readFile_path:string|undefined = undefined
 	let _server__metafile$_:typeof server__metafile$_
 	let _server__metafile_:typeof server__metafile_
 	let _server__metafile__set:typeof server__metafile__set
-	is_prod__set(app_ctx, true)
-	dist_path__set(app_ctx, '/cwd/dist0')
 	{
 		({
 			server__metafile$_: _server__metafile$_,
@@ -65,13 +63,16 @@ test('server__metafile', async ()=>{
 			server__metafile__set: _server__metafile__set,
 		} = await esmock('./index.js', {}, {
 			'ctx-core/rmemo': rmemo,
+			// TODO: remove with https://github.com/iambumblehead/esmock/issues/281
 			'ctx-core/fs': {
-				file_exists_: async (path:string)=>{
-					file_exists__path = path
+				file_exists__waitfor: async (path:string)=>{
+					file_exists__waitfor__path = path
 					return true
 				}
 			},
 			'node:fs/promises': {
+				// TODO: https://github.com/iambumblehead/esmock/issues/281
+				// access: async ()=>{},
 				readFile: async (path:string)=>{
 					readFile_path = path
 					switch (path) {
@@ -80,16 +81,24 @@ test('server__metafile', async ()=>{
 						case '/cwd/dist1/server/metafile.json':
 							return Buffer.from(JSON.stringify(server__metafile1), 'utf-8')
 					}
+					return undefined
 				}
 			}
 		}))
 	}
 	equal(_server__metafile$_(app_ctx)._, undefined)
 	equal(_server__metafile_(app_ctx), undefined)
-	await rmemo__wait(_server__metafile$_(app_ctx), m=>m, 100)
+	is_prod__set(app_ctx, true)
+	dist_path__set(app_ctx, '/cwd/dist0')
+	equal(_server__metafile$_(app_ctx)._, undefined)
+	equal(_server__metafile_(app_ctx), undefined)
+	await rmemo__wait(
+		_server__metafile$_(app_ctx),
+		m=>m,
+		100)
 	equal(_server__metafile$_(app_ctx)._, server__metafile0)
 	equal(_server__metafile_(app_ctx), server__metafile0)
-	equal(file_exists__path, '/cwd/dist0/server/metafile.json')
+	equal(file_exists__waitfor__path, '/cwd/dist0/server/metafile.json')
 	equal(readFile_path, '/cwd/dist0/server/metafile.json')
 	equal(_server__metafile$_(app_ctx)._, server__metafile0)
 	equal(_server__metafile_(app_ctx), server__metafile0)
@@ -97,13 +106,13 @@ test('server__metafile', async ()=>{
 	await rmemo__wait(_server__metafile$_(app_ctx), m=>deep_equal(m, server__metafile1), 100)
 	equal(_server__metafile$_(app_ctx)._, server__metafile1)
 	equal(_server__metafile_(app_ctx), server__metafile1)
-	equal(file_exists__path, '/cwd/dist1/server/metafile.json')
+	equal(file_exists__waitfor__path, '/cwd/dist1/server/metafile.json')
 	equal(readFile_path, '/cwd/dist1/server/metafile.json')
 	dist_path__set(app_ctx, '/cwd/dist0')
 	await rmemo__wait(_server__metafile$_(app_ctx), m=>deep_equal(m, server__metafile0), 100)
 	equal(_server__metafile$_(app_ctx)._, server__metafile0)
 	equal(_server__metafile_(app_ctx), server__metafile0)
-	equal(file_exists__path, '/cwd/dist0/server/metafile.json')
+	equal(file_exists__waitfor__path, '/cwd/dist0/server/metafile.json')
 	equal(readFile_path, '/cwd/dist0/server/metafile.json')
 	_server__metafile__set(app_ctx, server__metafile2)
 	equal(_server__metafile$_(app_ctx)._, server__metafile2)