Fix build lags
This commit is contained in:
+210
-136
@@ -1,10 +1,12 @@
|
||||
import { watch, existsSync, statSync, glob } from "fs";
|
||||
import chokidar from "chokidar";
|
||||
import path from "path";
|
||||
import { existsSync } from "fs";
|
||||
import grabDirNames from "../../utils/grab-dir-names";
|
||||
import fullRebuild from "./full-rebuild";
|
||||
import { AppData } from "../../data/app-data";
|
||||
import checkExcludedPatterns from "../../utils/check-excluded-patterns";
|
||||
import pagesSSRBundler from "../bundler/pages-ssr-bundler";
|
||||
import allPagesESBuildContextBundler from "../bundler/all-pages-esbuild-context-bundler";
|
||||
import serverPostBuildFn from "./server-post-build-fn";
|
||||
import { log } from "../../utils/log";
|
||||
import { logBuildErrorsOnce } from "../../utils/build-error-log";
|
||||
const { ROOT_DIR, BUNX_BUNDLER_ERROR_EXIT_FILE } = grabDirNames();
|
||||
@@ -21,7 +23,10 @@ export function restartWatcher() {
|
||||
return;
|
||||
if (Date.now() - last_watcher_restart < 1000)
|
||||
return;
|
||||
global.BUNEXT_PAGES_SRC_WATCHER.close();
|
||||
try {
|
||||
global.BUNEXT_PAGES_SRC_WATCHER.close();
|
||||
}
|
||||
catch (error) { }
|
||||
global.BUNEXT_PAGES_SRC_WATCHER = undefined;
|
||||
last_watcher_restart = Date.now();
|
||||
watcherEsbuildCTX();
|
||||
@@ -33,151 +38,220 @@ export function restartWatcher() {
|
||||
export function watcherRestartAvailable() {
|
||||
return Date.now() - last_watcher_restart > 6000;
|
||||
}
|
||||
export default async function watcherEsbuildCTX() {
|
||||
const pages_src_watcher = watch(ROOT_DIR, {
|
||||
recursive: true,
|
||||
persistent: true,
|
||||
}, async (event, filename) => {
|
||||
let owns_recompile = false;
|
||||
const TARGET_FILES_MATCH = /\.(tsx?|jsx?|css)$/;
|
||||
// Rebuild coalescing: editors emit bursts of events per save (change +
|
||||
// atomic-swap noise), and edits can land while a rebuild is running.
|
||||
// Events are debounced into a single runner; the runner loops until the
|
||||
// event queue drains, so a mid-build edit is never silently dropped.
|
||||
const REBUILD_DEBOUNCE_MS = 200;
|
||||
let pending_structural = false;
|
||||
let pending_content_file = undefined;
|
||||
let debounce_timer = undefined;
|
||||
function scheduleRebuild() {
|
||||
if (debounce_timer) {
|
||||
clearTimeout(debounce_timer);
|
||||
}
|
||||
debounce_timer = setTimeout(async () => {
|
||||
debounce_timer = undefined;
|
||||
try {
|
||||
if (!filename)
|
||||
return;
|
||||
const full_file_path = path.join(ROOT_DIR, filename);
|
||||
if (global.BUNEXT_CONFIG.exclude_watch_patterns) {
|
||||
for (let i = 0; i < global.BUNEXT_CONFIG.exclude_watch_patterns.length; i++) {
|
||||
const watch_pattern = global.BUNEXT_CONFIG.exclude_watch_patterns[i];
|
||||
if (watch_pattern instanceof RegExp) {
|
||||
const is_path_excluded = watch_pattern.test(filename);
|
||||
if (is_path_excluded) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
else {
|
||||
const excluded_path = path.resolve(ROOT_DIR, watch_pattern);
|
||||
if (excluded_path == full_file_path) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (existsSync(BUNX_BUNDLER_ERROR_EXIT_FILE)) {
|
||||
await fullRebuild();
|
||||
return;
|
||||
}
|
||||
if (filename.match(/^\.\w+/)) {
|
||||
return;
|
||||
}
|
||||
if (global.BUNEXT_BUNDLER_CTX_DISPOSED) {
|
||||
await fullRebuild({ msg: `Restarting Bundler ...` });
|
||||
return;
|
||||
}
|
||||
if (global.BUNEXT_SSR_BUNDLER_CTX_DISPOSED) {
|
||||
await pagesSSRBundler().catch((error) => {
|
||||
log.error(`SSR Bundler Error: ${error}`);
|
||||
});
|
||||
}
|
||||
if (filename.endsWith(AppData["BunextTmpFileExt"])) {
|
||||
return;
|
||||
}
|
||||
const does_file_exist = existsSync(full_file_path);
|
||||
const file_stat = does_file_exist
|
||||
? statSync(full_file_path)
|
||||
: undefined;
|
||||
if (full_file_path.match(/\/styles$/)) {
|
||||
owns_recompile = true;
|
||||
global.BUNEXT_RECOMPILING = true;
|
||||
await Bun.sleep(1000);
|
||||
await fullRebuild({
|
||||
msg: `Detected new \`styles\` directory. Rebuilding ...`,
|
||||
});
|
||||
return;
|
||||
}
|
||||
const excluded_match = /node_modules\/|^public\/|^\.bunext\/|^\.git\/|^\.?dist\/|bun\.lockb$/;
|
||||
if (filename.match(excluded_match))
|
||||
return;
|
||||
if (filename.match(/bunext.config\.ts/)) {
|
||||
await fullRebuild({
|
||||
msg: `bunext.config.ts file changed. Rebuilding server ...`,
|
||||
});
|
||||
return;
|
||||
}
|
||||
const target_files_match = /\.(tsx?|jsx?|css)$/;
|
||||
if (event !== "rename") {
|
||||
if (filename.match(target_files_match)) {
|
||||
if (global.BUNEXT_RECOMPILING)
|
||||
return;
|
||||
owns_recompile = true;
|
||||
global.BUNEXT_RECOMPILING = true;
|
||||
if (filename.match(/.*\.server\.tsx?/)) {
|
||||
global.BUNEXT_IS_SERVER_COMPONENT = true;
|
||||
}
|
||||
if (global.BUNEXT_BUNDLER_CTX &&
|
||||
!global.BUNEXT_BUNDLER_CTX_DISPOSED) {
|
||||
await global.BUNEXT_BUNDLER_CTX.rebuild();
|
||||
}
|
||||
else if (global.BUNEXT_BUNDLER_CTX_DISPOSED) {
|
||||
await fullRebuild({
|
||||
msg: `Restarting Bundler ...`,
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (filename.match(/(404|500)\.tsx?/)) {
|
||||
for (let i = global.BUNEXT_HMR_CONTROLLERS.length - 1; i >= 0; i--) {
|
||||
const controller = global.BUNEXT_HMR_CONTROLLERS[i];
|
||||
try {
|
||||
controller?.controller?.enqueue(`event: update\ndata: ${JSON.stringify({ reload: true })}\n\n`);
|
||||
}
|
||||
catch {
|
||||
global.BUNEXT_HMR_CONTROLLERS.splice(i, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
const is_file_of_interest = Boolean(filename.match(target_files_match)) ||
|
||||
file_stat?.isDirectory();
|
||||
if (!is_file_of_interest) {
|
||||
return;
|
||||
}
|
||||
if (!filename.match(/^src\/pages\/|\.css$/))
|
||||
return reloadWatcher();
|
||||
if (checkExcludedPatterns({ path: filename }))
|
||||
return reloadWatcher();
|
||||
if (filename.match(/ /))
|
||||
return reloadWatcher();
|
||||
if (global.BUNEXT_RECOMPILING)
|
||||
return;
|
||||
owns_recompile = true;
|
||||
const action = does_file_exist ? "created" : "deleted";
|
||||
const type = filename.match(/\.css$/)
|
||||
? "Sylesheet"
|
||||
: file_stat?.isDirectory()
|
||||
? "Directory"
|
||||
: filename.match(/\/pages\/api\//)
|
||||
? "API Route"
|
||||
: "Page";
|
||||
await fullRebuild({
|
||||
msg: `${type} ${action}: ${filename}. Rebuilding ...`,
|
||||
});
|
||||
await runRebuilds();
|
||||
}
|
||||
catch (error) {
|
||||
// A "Build failed with N errors" rejection is the same
|
||||
// failure the tracker's onEnd already reported (deduped).
|
||||
const msg = String(error?.message || error || "");
|
||||
if (!msg.startsWith("Build failed with")) {
|
||||
logBuildErrorsOnce([{ text: `Watcher rebuild failed: ${msg}` }], (line) => log.error(line));
|
||||
}
|
||||
}
|
||||
finally {
|
||||
if (owns_recompile) {
|
||||
global.BUNEXT_RECOMPILING = false;
|
||||
global.BUNEXT_IS_SERVER_COMPONENT = false;
|
||||
global.BUNEXT_RECOMPILING = false;
|
||||
global.BUNEXT_IS_SERVER_COMPONENT = false;
|
||||
}
|
||||
}, REBUILD_DEBOUNCE_MS);
|
||||
}
|
||||
/**
|
||||
* Processes the pending event batch. Structural changes go through the
|
||||
* all-pages bundler (which re-creates esbuild contexts only when the entry
|
||||
* set really changed, so atomic-swap saves resolve to incremental rebuilds).
|
||||
* Content changes rebuild the hydration context incrementally; its artifact
|
||||
* tracker then queues the single-flighted SSR rebuild and pushes HMR updates.
|
||||
*/
|
||||
async function runRebuilds() {
|
||||
if (global.BUNEXT_RECOMPILING) {
|
||||
return;
|
||||
}
|
||||
global.BUNEXT_RECOMPILING = true;
|
||||
global.BUNEXT_IS_SERVER_COMPONENT = false;
|
||||
try {
|
||||
while (true) {
|
||||
const structural = pending_structural;
|
||||
const content_file = pending_content_file;
|
||||
pending_structural = false;
|
||||
pending_content_file = undefined;
|
||||
if (!structural && !content_file) {
|
||||
break;
|
||||
}
|
||||
if (structural) {
|
||||
global.BUNEXT_ROUTER.reload();
|
||||
await allPagesESBuildContextBundler({
|
||||
post_build_fn: async (params) => {
|
||||
await serverPostBuildFn(params);
|
||||
},
|
||||
});
|
||||
}
|
||||
else if (content_file) {
|
||||
if (global.BUNEXT_BUNDLER_CTX &&
|
||||
!global.BUNEXT_BUNDLER_CTX_DISPOSED) {
|
||||
await global.BUNEXT_BUNDLER_CTX.rebuild();
|
||||
}
|
||||
else if (global.BUNEXT_BUNDLER_CTX_DISPOSED) {
|
||||
await fullRebuild({
|
||||
msg: `Restarting Bundler ...`,
|
||||
});
|
||||
break;
|
||||
}
|
||||
if (content_file.match(/(404|500)\.tsx?$/)) {
|
||||
for (let i = global.BUNEXT_HMR_CONTROLLERS.length - 1; i >= 0; i--) {
|
||||
const controller = global.BUNEXT_HMR_CONTROLLERS[i];
|
||||
try {
|
||||
controller?.controller?.enqueue(`event: update\ndata: ${JSON.stringify({ reload: true })}\n\n`);
|
||||
}
|
||||
catch {
|
||||
global.BUNEXT_HMR_CONTROLLERS.splice(i, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
finally {
|
||||
global.BUNEXT_RECOMPILING = false;
|
||||
global.BUNEXT_IS_SERVER_COMPONENT = false;
|
||||
}
|
||||
}
|
||||
function isPathExcluded(filename, full_file_path) {
|
||||
const user_patterns = global.BUNEXT_CONFIG?.exclude_watch_patterns;
|
||||
if (!user_patterns)
|
||||
return false;
|
||||
for (let i = 0; i < user_patterns.length; i++) {
|
||||
const watch_pattern = user_patterns[i];
|
||||
if (watch_pattern instanceof RegExp) {
|
||||
if (watch_pattern.test(filename))
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
const excluded_path = path.resolve(ROOT_DIR, watch_pattern);
|
||||
if (excluded_path == full_file_path)
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
// Heavy directories are filtered at the watcher level so inotify doesn't
|
||||
// install watches (and deliver events) for trees the bundler never reads.
|
||||
function buildIgnoredPatterns() {
|
||||
const ignored = [
|
||||
/(^|[\/\\])\../,
|
||||
/(^|[\/\\])node_modules([\/\\]|$)/,
|
||||
/(^|[\/\\])public([\/\\]|$)/,
|
||||
/(^|[\/\\])\.bunext([\/\\]|$)/,
|
||||
/(^|[\/\\])\.git([\/\\]|$)/,
|
||||
/(^|[\/\\])dist([\/\\]|$)/,
|
||||
/bun\.lockb$/,
|
||||
(p) => p.endsWith(AppData["BunextTmpFileExt"]),
|
||||
];
|
||||
const user_patterns = global.BUNEXT_CONFIG?.exclude_watch_patterns;
|
||||
if (user_patterns) {
|
||||
for (let i = 0; i < user_patterns.length; i++) {
|
||||
const pattern = user_patterns[i];
|
||||
if (pattern instanceof RegExp) {
|
||||
ignored.push((p) => pattern.test(path.relative(ROOT_DIR, p)));
|
||||
}
|
||||
else {
|
||||
const excluded_path = path.resolve(ROOT_DIR, pattern);
|
||||
ignored.push((p) => p === excluded_path);
|
||||
}
|
||||
}
|
||||
}
|
||||
return ignored;
|
||||
}
|
||||
export default async function watcherEsbuildCTX() {
|
||||
const pages_src_watcher = chokidar.watch(ROOT_DIR, {
|
||||
ignored: buildIgnoredPatterns(),
|
||||
persistent: true,
|
||||
ignoreInitial: true,
|
||||
});
|
||||
watcherHandlers(pages_src_watcher, (event, filePath) => handleEvent(event, filePath));
|
||||
global.BUNEXT_PAGES_SRC_WATCHER = pages_src_watcher;
|
||||
}
|
||||
function reloadWatcher() {
|
||||
restartWatcher();
|
||||
function handleEvent(event, filePath) {
|
||||
try {
|
||||
const filename = path.relative(ROOT_DIR, filePath);
|
||||
const full_file_path = filePath;
|
||||
if (isPathExcluded(filename, full_file_path)) {
|
||||
return;
|
||||
}
|
||||
if (existsSync(BUNX_BUNDLER_ERROR_EXIT_FILE)) {
|
||||
fullRebuild();
|
||||
return;
|
||||
}
|
||||
if (filename.endsWith(AppData["BunextTmpFileExt"])) {
|
||||
return;
|
||||
}
|
||||
if (full_file_path.match(/\/styles$/)) {
|
||||
pending_structural = false;
|
||||
pending_content_file = undefined;
|
||||
if (debounce_timer)
|
||||
clearTimeout(debounce_timer);
|
||||
setTimeout(() => {
|
||||
fullRebuild({
|
||||
msg: `Detected new \`styles\` directory. Rebuilding ...`,
|
||||
});
|
||||
}, 1000);
|
||||
return;
|
||||
}
|
||||
if (filename.match(/bunext\.config\.ts/)) {
|
||||
pending_structural = false;
|
||||
pending_content_file = undefined;
|
||||
if (debounce_timer)
|
||||
clearTimeout(debounce_timer);
|
||||
fullRebuild({
|
||||
msg: `bunext.config.ts file changed. Rebuilding server ...`,
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (event === "change") {
|
||||
if (filename.match(TARGET_FILES_MATCH)) {
|
||||
pending_content_file = full_file_path;
|
||||
scheduleRebuild();
|
||||
}
|
||||
return;
|
||||
}
|
||||
// add / unlink / addDir / unlinkDir
|
||||
const is_dir_event = event === "addDir" || event === "unlinkDir";
|
||||
const is_file_of_interest = Boolean(filename.match(TARGET_FILES_MATCH)) || is_dir_event;
|
||||
if (!is_file_of_interest) {
|
||||
return;
|
||||
}
|
||||
// Only page routes and stylesheets are structural; anything else
|
||||
// (e.g. a component being added) is covered by the next content
|
||||
// rebuild and needs no context recreation.
|
||||
if (!filename.match(/^src\/pages\/|\.css$/) ||
|
||||
checkExcludedPatterns({ path: filename }) ||
|
||||
filename.match(/ /)) {
|
||||
return;
|
||||
}
|
||||
pending_structural = true;
|
||||
scheduleRebuild();
|
||||
}
|
||||
catch (error) {
|
||||
logBuildErrorsOnce([{ text: `Watcher error: ${error?.message || error}` }], (line) => log.error(line));
|
||||
}
|
||||
}
|
||||
function watcherHandlers(watcher, handleEvent) {
|
||||
watcher
|
||||
.on("add", (p) => handleEvent("add", p))
|
||||
.on("change", (p) => handleEvent("change", p))
|
||||
.on("unlink", (p) => handleEvent("unlink", p))
|
||||
.on("addDir", (p) => handleEvent("addDir", p))
|
||||
.on("unlinkDir", (p) => handleEvent("unlinkDir", p));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user