@bleedingdev/modern-js-server 3.9.0-ultramodern.16 → 3.9.0-ultramodern.18

package/dist/cjs/createDevServer.js

@@ -149,6 +149,7 @@ async function createDevServer(options, applyPlugins) {
         compiler,
         nodeServer,
         getRuntimeServer: ()=>currentRuntimeServer,
+        holdRequests: (task)=>reloadManager.hold(task),
         onFileChange: (filepath)=>{
             pendingReloadFiles.add(external_node_path_default().relative(pwd, filepath));
             reloadManager.schedule();

package/dist/cjs/dev-tools/reloadManager.js

@@ -108,13 +108,21 @@ const notReadyHandle = ()=>new Response('Dev server is starting…', {
             'content-type': 'text/plain; charset=utf-8'
         }
     });
-var _current = /*#__PURE__*/ new WeakMap(), _build = /*#__PURE__*/ new WeakMap(), _debounceMs = /*#__PURE__*/ new WeakMap(), _onReload = /*#__PURE__*/ new WeakMap(), _onError = /*#__PURE__*/ new WeakMap(), _onReloadError = /*#__PURE__*/ new WeakMap(), _debounceTimer = /*#__PURE__*/ new WeakMap(), _running = /*#__PURE__*/ new WeakMap(), _pending = /*#__PURE__*/ new WeakMap(), _runningPromise = /*#__PURE__*/ new WeakMap(), _closed = /*#__PURE__*/ new WeakMap(), _runLoop = /*#__PURE__*/ new WeakSet(), _reportBuildError = /*#__PURE__*/ new WeakSet(), _reportReloadCallbackError = /*#__PURE__*/ new WeakSet(), _dispose = /*#__PURE__*/ new WeakSet();
+var _current = /*#__PURE__*/ new WeakMap(), _build = /*#__PURE__*/ new WeakMap(), _debounceMs = /*#__PURE__*/ new WeakMap(), _onReload = /*#__PURE__*/ new WeakMap(), _onError = /*#__PURE__*/ new WeakMap(), _onReloadError = /*#__PURE__*/ new WeakMap(), _debounceTimer = /*#__PURE__*/ new WeakMap(), _running = /*#__PURE__*/ new WeakMap(), _pending = /*#__PURE__*/ new WeakMap(), _runningPromise = /*#__PURE__*/ new WeakMap(), _closed = /*#__PURE__*/ new WeakMap(), _held = /*#__PURE__*/ new WeakMap(), _holding = /*#__PURE__*/ new WeakMap(), _released = /*#__PURE__*/ new WeakSet(), _runLoop = /*#__PURE__*/ new WeakSet(), _reportBuildError = /*#__PURE__*/ new WeakSet(), _reportReloadCallbackError = /*#__PURE__*/ new WeakSet(), _dispose = /*#__PURE__*/ new WeakSet();
 class ReloadManager {
     setHandle(handle) {
         _class_private_field_set(this, _current, handle);
     }
     get handle() {
-        return (request, ...args)=>_class_private_field_get(this, _current).call(this, request, ...args);
+        return (request, ...args)=>0 === _class_private_field_get(this, _holding) ? _class_private_field_get(this, _current).call(this, request, ...args) : _class_private_method_get(this, _released, released).call(this).then(()=>_class_private_field_get(this, _current).call(this, request, ...args));
+    }
+    hold(task) {
+        _class_private_field_set(this, _holding, _class_private_field_get(this, _holding) + 1);
+        const run = _class_private_field_get(this, _held).then(task).finally(()=>{
+            _class_private_field_set(this, _holding, _class_private_field_get(this, _holding) - 1);
+        });
+        _class_private_field_set(this, _held, run.catch(()=>{}));
+        return run;
     }
     get currentHandle() {
         return _class_private_field_get(this, _current);
@@ -153,9 +161,11 @@ class ReloadManager {
             clearTimeout(_class_private_field_get(this, _debounceTimer));
             _class_private_field_set(this, _debounceTimer, null);
         }
-        _class_private_method_get(this, _dispose, reloadManager_dispose).call(this, _class_private_field_get(this, _current));
+        const current = _class_private_field_get(this, _current);
+        _class_private_method_get(this, _released, released).call(this).then(()=>_class_private_method_get(this, _dispose, reloadManager_dispose).call(this, current));
     }
     constructor(options){
+        _class_private_method_init(this, _released);
         _class_private_method_init(this, _runLoop);
         _class_private_method_init(this, _reportBuildError);
         _class_private_method_init(this, _reportReloadCallbackError);
@@ -204,11 +214,21 @@ class ReloadManager {
             writable: true,
             value: void 0
         });
+        _class_private_field_init(this, _held, {
+            writable: true,
+            value: void 0
+        });
+        _class_private_field_init(this, _holding, {
+            writable: true,
+            value: void 0
+        });
         _class_private_field_set(this, _debounceTimer, null);
         _class_private_field_set(this, _running, false);
         _class_private_field_set(this, _pending, false);
         _class_private_field_set(this, _runningPromise, null);
         _class_private_field_set(this, _closed, false);
+        _class_private_field_set(this, _held, Promise.resolve());
+        _class_private_field_set(this, _holding, 0);
         _class_private_field_set(this, _current, options.initialHandle ?? notReadyHandle);
         _class_private_field_set(this, _build, options.build);
         _class_private_field_set(this, _debounceMs, options.debounceMs ?? DEFAULT_DEBOUNCE_MS);
@@ -217,6 +237,9 @@ class ReloadManager {
         _class_private_field_set(this, _onReloadError, options.onReloadError);
     }
 }
+async function released() {
+    while(_class_private_field_get(this, _holding) > 0)await _class_private_field_get(this, _held);
+}
 async function runLoop() {
     var _this, _this1;
     do {
@@ -228,6 +251,7 @@ async function runLoop() {
             _class_private_method_get(this, _reportBuildError, reportBuildError).call(this, error);
             continue;
         }
+        await _class_private_method_get(this, _released, released).call(this);
         if (_class_private_field_get(this, _closed)) return void await _class_private_method_get(this, _dispose, reloadManager_dispose).call(this, next);
         const previous = _class_private_field_get(this, _current);
         _class_private_field_set(this, _current, next);

package/dist/cjs/dev.js

@@ -81,7 +81,7 @@ const devRuntimeMiddlewarePlugin = (options, compiler)=>({
             });
         }
     });
-function setupDevInfra({ config, pwd, distDir, apiDir, sharedDir, builder, builderDevServer, getRuntimeServer, onFileChange, onClose, nodeServer }) {
+function setupDevInfra({ config, pwd, distDir, apiDir, sharedDir, builder, builderDevServer, getRuntimeServer, holdRequests, onFileChange, onClose, nodeServer }) {
     const { close, connectWebSocket } = builderDevServer || {};
     const closeCb = [];
     close && closeCb.push(close);
@@ -91,10 +91,10 @@ function setupDevInfra({ config, pwd, distDir, apiDir, sharedDir, builder, build
     builder?.onDevCompileDone(({ stats })=>{
         if ('server' !== stats.toJson({
             all: false
-        }).name) {
+        }).name) holdRequests(async ()=>{
             const runtimeServer = getRuntimeServer();
-            if (runtimeServer) (0, index_js_namespaceObject.onRepack)(distDir, runtimeServer.hooks);
-        }
+            if (runtimeServer) await (0, index_js_namespaceObject.onRepack)(distDir, runtimeServer.hooks);
+        }).catch((error)=>utils_namespaceObject.logger.error(error));
     });
     const { watchOptions } = config.server;
     const mockDir = config.dev?.mockDir;

package/dist/cjs/helpers/repack.js

@@ -52,15 +52,18 @@ const cleanFederationRuntime = ()=>{
     const remoteEntries = runtime.__GLOBAL_LOADING_REMOTE_ENTRY__ ?? {};
     for (const key of Object.keys(remoteEntries))delete remoteEntries[key];
 };
-const onRepack = (distDir, hooks)=>{
-    cleanSSRCache(distDir);
-    cleanFederationRuntime();
-    fileReader_namespaceObject.fileReader.reset();
-    hooks.onReset.call({
-        event: {
-            type: 'repack'
-        }
-    });
+const onRepack = async (distDir, hooks)=>{
+    try {
+        await hooks.onReset.call({
+            event: {
+                type: 'repack'
+            }
+        });
+    } finally{
+        cleanSSRCache(distDir);
+        cleanFederationRuntime();
+        fileReader_namespaceObject.fileReader.reset();
+    }
 };
 exports.onRepack = __webpack_exports__.onRepack;
 for(var __rspack_i in __webpack_exports__)if (-1 === [

package/dist/esm/createDevServer.mjs

@@ -107,6 +107,7 @@ async function createDevServer(options, applyPlugins) {
         compiler,
         nodeServer,
         getRuntimeServer: ()=>currentRuntimeServer,
+        holdRequests: (task)=>reloadManager.hold(task),
         onFileChange: (filepath)=>{
             pendingReloadFiles.add(node_path.relative(pwd, filepath));
             reloadManager.schedule();

package/dist/esm/dev-tools/reloadManager.mjs

@@ -74,13 +74,21 @@ const notReadyHandle = ()=>new Response('Dev server is starting…', {
             'content-type': 'text/plain; charset=utf-8'
         }
     });
-var _current = /*#__PURE__*/ new WeakMap(), _build = /*#__PURE__*/ new WeakMap(), _debounceMs = /*#__PURE__*/ new WeakMap(), _onReload = /*#__PURE__*/ new WeakMap(), _onError = /*#__PURE__*/ new WeakMap(), _onReloadError = /*#__PURE__*/ new WeakMap(), _debounceTimer = /*#__PURE__*/ new WeakMap(), _running = /*#__PURE__*/ new WeakMap(), _pending = /*#__PURE__*/ new WeakMap(), _runningPromise = /*#__PURE__*/ new WeakMap(), _closed = /*#__PURE__*/ new WeakMap(), _runLoop = /*#__PURE__*/ new WeakSet(), _reportBuildError = /*#__PURE__*/ new WeakSet(), _reportReloadCallbackError = /*#__PURE__*/ new WeakSet(), _dispose = /*#__PURE__*/ new WeakSet();
+var _current = /*#__PURE__*/ new WeakMap(), _build = /*#__PURE__*/ new WeakMap(), _debounceMs = /*#__PURE__*/ new WeakMap(), _onReload = /*#__PURE__*/ new WeakMap(), _onError = /*#__PURE__*/ new WeakMap(), _onReloadError = /*#__PURE__*/ new WeakMap(), _debounceTimer = /*#__PURE__*/ new WeakMap(), _running = /*#__PURE__*/ new WeakMap(), _pending = /*#__PURE__*/ new WeakMap(), _runningPromise = /*#__PURE__*/ new WeakMap(), _closed = /*#__PURE__*/ new WeakMap(), _held = /*#__PURE__*/ new WeakMap(), _holding = /*#__PURE__*/ new WeakMap(), _released = /*#__PURE__*/ new WeakSet(), _runLoop = /*#__PURE__*/ new WeakSet(), _reportBuildError = /*#__PURE__*/ new WeakSet(), _reportReloadCallbackError = /*#__PURE__*/ new WeakSet(), _dispose = /*#__PURE__*/ new WeakSet();
 class ReloadManager {
     setHandle(handle) {
         _class_private_field_set(this, _current, handle);
     }
     get handle() {
-        return (request, ...args)=>_class_private_field_get(this, _current).call(this, request, ...args);
+        return (request, ...args)=>0 === _class_private_field_get(this, _holding) ? _class_private_field_get(this, _current).call(this, request, ...args) : _class_private_method_get(this, _released, released).call(this).then(()=>_class_private_field_get(this, _current).call(this, request, ...args));
+    }
+    hold(task) {
+        _class_private_field_set(this, _holding, _class_private_field_get(this, _holding) + 1);
+        const run = _class_private_field_get(this, _held).then(task).finally(()=>{
+            _class_private_field_set(this, _holding, _class_private_field_get(this, _holding) - 1);
+        });
+        _class_private_field_set(this, _held, run.catch(()=>{}));
+        return run;
     }
     get currentHandle() {
         return _class_private_field_get(this, _current);
@@ -119,9 +127,11 @@ class ReloadManager {
             clearTimeout(_class_private_field_get(this, _debounceTimer));
             _class_private_field_set(this, _debounceTimer, null);
         }
-        _class_private_method_get(this, _dispose, reloadManager_dispose).call(this, _class_private_field_get(this, _current));
+        const current = _class_private_field_get(this, _current);
+        _class_private_method_get(this, _released, released).call(this).then(()=>_class_private_method_get(this, _dispose, reloadManager_dispose).call(this, current));
     }
     constructor(options){
+        _class_private_method_init(this, _released);
         _class_private_method_init(this, _runLoop);
         _class_private_method_init(this, _reportBuildError);
         _class_private_method_init(this, _reportReloadCallbackError);
@@ -170,11 +180,21 @@ class ReloadManager {
             writable: true,
             value: void 0
         });
+        _class_private_field_init(this, _held, {
+            writable: true,
+            value: void 0
+        });
+        _class_private_field_init(this, _holding, {
+            writable: true,
+            value: void 0
+        });
         _class_private_field_set(this, _debounceTimer, null);
         _class_private_field_set(this, _running, false);
         _class_private_field_set(this, _pending, false);
         _class_private_field_set(this, _runningPromise, null);
         _class_private_field_set(this, _closed, false);
+        _class_private_field_set(this, _held, Promise.resolve());
+        _class_private_field_set(this, _holding, 0);
         _class_private_field_set(this, _current, options.initialHandle ?? notReadyHandle);
         _class_private_field_set(this, _build, options.build);
         _class_private_field_set(this, _debounceMs, options.debounceMs ?? DEFAULT_DEBOUNCE_MS);
@@ -183,6 +203,9 @@ class ReloadManager {
         _class_private_field_set(this, _onReloadError, options.onReloadError);
     }
 }
+async function released() {
+    while(_class_private_field_get(this, _holding) > 0)await _class_private_field_get(this, _held);
+}
 async function runLoop() {
     var _this, _this1;
     do {
@@ -194,6 +217,7 @@ async function runLoop() {
             _class_private_method_get(this, _reportBuildError, reportBuildError).call(this, error);
             continue;
         }
+        await _class_private_method_get(this, _released, released).call(this);
         if (_class_private_field_get(this, _closed)) return void await _class_private_method_get(this, _dispose, reloadManager_dispose).call(this, next);
         const previous = _class_private_field_get(this, _current);
         _class_private_field_set(this, _current, next);

package/dist/esm/dev.mjs

@@ -48,7 +48,7 @@ const devRuntimeMiddlewarePlugin = (options, compiler)=>({
             });
         }
     });
-function setupDevInfra({ config, pwd, distDir, apiDir, sharedDir, builder, builderDevServer, getRuntimeServer, onFileChange, onClose, nodeServer }) {
+function setupDevInfra({ config, pwd, distDir, apiDir, sharedDir, builder, builderDevServer, getRuntimeServer, holdRequests, onFileChange, onClose, nodeServer }) {
     const { close, connectWebSocket } = builderDevServer || {};
     const closeCb = [];
     close && closeCb.push(close);
@@ -58,10 +58,10 @@ function setupDevInfra({ config, pwd, distDir, apiDir, sharedDir, builder, build
     builder?.onDevCompileDone(({ stats })=>{
         if ('server' !== stats.toJson({
             all: false
-        }).name) {
+        }).name) holdRequests(async ()=>{
             const runtimeServer = getRuntimeServer();
-            if (runtimeServer) onRepack(distDir, runtimeServer.hooks);
-        }
+            if (runtimeServer) await onRepack(distDir, runtimeServer.hooks);
+        }).catch((error)=>logger.error(error));
     });
     const { watchOptions } = config.server;
     const mockDir = config.dev?.mockDir;

package/dist/esm/helpers/repack.mjs

@@ -20,14 +20,17 @@ const cleanFederationRuntime = ()=>{
     const remoteEntries = runtime.__GLOBAL_LOADING_REMOTE_ENTRY__ ?? {};
     for (const key of Object.keys(remoteEntries))delete remoteEntries[key];
 };
-const onRepack = (distDir, hooks)=>{
-    cleanSSRCache(distDir);
-    cleanFederationRuntime();
-    fileReader.reset();
-    hooks.onReset.call({
-        event: {
-            type: 'repack'
-        }
-    });
+const onRepack = async (distDir, hooks)=>{
+    try {
+        await hooks.onReset.call({
+            event: {
+                type: 'repack'
+            }
+        });
+    } finally{
+        cleanSSRCache(distDir);
+        cleanFederationRuntime();
+        fileReader.reset();
+    }
 };
 export { onRepack };

package/dist/esm-node/createDevServer.mjs

@@ -108,6 +108,7 @@ async function createDevServer(options, applyPlugins) {
         compiler,
         nodeServer,
         getRuntimeServer: ()=>currentRuntimeServer,
+        holdRequests: (task)=>reloadManager.hold(task),
         onFileChange: (filepath)=>{
             pendingReloadFiles.add(node_path.relative(pwd, filepath));
             reloadManager.schedule();

package/dist/esm-node/dev-tools/reloadManager.mjs

@@ -75,13 +75,21 @@ const notReadyHandle = ()=>new Response('Dev server is starting…', {
             'content-type': 'text/plain; charset=utf-8'
         }
     });
-var _current = /*#__PURE__*/ new WeakMap(), _build = /*#__PURE__*/ new WeakMap(), _debounceMs = /*#__PURE__*/ new WeakMap(), _onReload = /*#__PURE__*/ new WeakMap(), _onError = /*#__PURE__*/ new WeakMap(), _onReloadError = /*#__PURE__*/ new WeakMap(), _debounceTimer = /*#__PURE__*/ new WeakMap(), _running = /*#__PURE__*/ new WeakMap(), _pending = /*#__PURE__*/ new WeakMap(), _runningPromise = /*#__PURE__*/ new WeakMap(), _closed = /*#__PURE__*/ new WeakMap(), _runLoop = /*#__PURE__*/ new WeakSet(), _reportBuildError = /*#__PURE__*/ new WeakSet(), _reportReloadCallbackError = /*#__PURE__*/ new WeakSet(), _dispose = /*#__PURE__*/ new WeakSet();
+var _current = /*#__PURE__*/ new WeakMap(), _build = /*#__PURE__*/ new WeakMap(), _debounceMs = /*#__PURE__*/ new WeakMap(), _onReload = /*#__PURE__*/ new WeakMap(), _onError = /*#__PURE__*/ new WeakMap(), _onReloadError = /*#__PURE__*/ new WeakMap(), _debounceTimer = /*#__PURE__*/ new WeakMap(), _running = /*#__PURE__*/ new WeakMap(), _pending = /*#__PURE__*/ new WeakMap(), _runningPromise = /*#__PURE__*/ new WeakMap(), _closed = /*#__PURE__*/ new WeakMap(), _held = /*#__PURE__*/ new WeakMap(), _holding = /*#__PURE__*/ new WeakMap(), _released = /*#__PURE__*/ new WeakSet(), _runLoop = /*#__PURE__*/ new WeakSet(), _reportBuildError = /*#__PURE__*/ new WeakSet(), _reportReloadCallbackError = /*#__PURE__*/ new WeakSet(), _dispose = /*#__PURE__*/ new WeakSet();
 class ReloadManager {
     setHandle(handle) {
         _class_private_field_set(this, _current, handle);
     }
     get handle() {
-        return (request, ...args)=>_class_private_field_get(this, _current).call(this, request, ...args);
+        return (request, ...args)=>0 === _class_private_field_get(this, _holding) ? _class_private_field_get(this, _current).call(this, request, ...args) : _class_private_method_get(this, _released, released).call(this).then(()=>_class_private_field_get(this, _current).call(this, request, ...args));
+    }
+    hold(task) {
+        _class_private_field_set(this, _holding, _class_private_field_get(this, _holding) + 1);
+        const run = _class_private_field_get(this, _held).then(task).finally(()=>{
+            _class_private_field_set(this, _holding, _class_private_field_get(this, _holding) - 1);
+        });
+        _class_private_field_set(this, _held, run.catch(()=>{}));
+        return run;
     }
     get currentHandle() {
         return _class_private_field_get(this, _current);
@@ -120,9 +128,11 @@ class ReloadManager {
             clearTimeout(_class_private_field_get(this, _debounceTimer));
             _class_private_field_set(this, _debounceTimer, null);
         }
-        _class_private_method_get(this, _dispose, reloadManager_dispose).call(this, _class_private_field_get(this, _current));
+        const current = _class_private_field_get(this, _current);
+        _class_private_method_get(this, _released, released).call(this).then(()=>_class_private_method_get(this, _dispose, reloadManager_dispose).call(this, current));
     }
     constructor(options){
+        _class_private_method_init(this, _released);
         _class_private_method_init(this, _runLoop);
         _class_private_method_init(this, _reportBuildError);
         _class_private_method_init(this, _reportReloadCallbackError);
@@ -171,11 +181,21 @@ class ReloadManager {
             writable: true,
             value: void 0
         });
+        _class_private_field_init(this, _held, {
+            writable: true,
+            value: void 0
+        });
+        _class_private_field_init(this, _holding, {
+            writable: true,
+            value: void 0
+        });
         _class_private_field_set(this, _debounceTimer, null);
         _class_private_field_set(this, _running, false);
         _class_private_field_set(this, _pending, false);
         _class_private_field_set(this, _runningPromise, null);
         _class_private_field_set(this, _closed, false);
+        _class_private_field_set(this, _held, Promise.resolve());
+        _class_private_field_set(this, _holding, 0);
         _class_private_field_set(this, _current, options.initialHandle ?? notReadyHandle);
         _class_private_field_set(this, _build, options.build);
         _class_private_field_set(this, _debounceMs, options.debounceMs ?? DEFAULT_DEBOUNCE_MS);
@@ -184,6 +204,9 @@ class ReloadManager {
         _class_private_field_set(this, _onReloadError, options.onReloadError);
     }
 }
+async function released() {
+    while(_class_private_field_get(this, _holding) > 0)await _class_private_field_get(this, _held);
+}
 async function runLoop() {
     var _this, _this1;
     do {
@@ -195,6 +218,7 @@ async function runLoop() {
             _class_private_method_get(this, _reportBuildError, reportBuildError).call(this, error);
             continue;
         }
+        await _class_private_method_get(this, _released, released).call(this);
         if (_class_private_field_get(this, _closed)) return void await _class_private_method_get(this, _dispose, reloadManager_dispose).call(this, next);
         const previous = _class_private_field_get(this, _current);
         _class_private_field_set(this, _current, next);

package/dist/esm-node/dev.mjs

@@ -49,7 +49,7 @@ const devRuntimeMiddlewarePlugin = (options, compiler)=>({
             });
         }
     });
-function setupDevInfra({ config, pwd, distDir, apiDir, sharedDir, builder, builderDevServer, getRuntimeServer, onFileChange, onClose, nodeServer }) {
+function setupDevInfra({ config, pwd, distDir, apiDir, sharedDir, builder, builderDevServer, getRuntimeServer, holdRequests, onFileChange, onClose, nodeServer }) {
     const { close, connectWebSocket } = builderDevServer || {};
     const closeCb = [];
     close && closeCb.push(close);
@@ -59,10 +59,10 @@ function setupDevInfra({ config, pwd, distDir, apiDir, sharedDir, builder, build
     builder?.onDevCompileDone(({ stats })=>{
         if ('server' !== stats.toJson({
             all: false
-        }).name) {
+        }).name) holdRequests(async ()=>{
             const runtimeServer = getRuntimeServer();
-            if (runtimeServer) onRepack(distDir, runtimeServer.hooks);
-        }
+            if (runtimeServer) await onRepack(distDir, runtimeServer.hooks);
+        }).catch((error)=>logger.error(error));
     });
     const { watchOptions } = config.server;
     const mockDir = config.dev?.mockDir;

package/dist/esm-node/helpers/repack.mjs

@@ -22,14 +22,17 @@ const cleanFederationRuntime = ()=>{
     const remoteEntries = runtime.__GLOBAL_LOADING_REMOTE_ENTRY__ ?? {};
     for (const key of Object.keys(remoteEntries))delete remoteEntries[key];
 };
-const onRepack = (distDir, hooks)=>{
-    cleanSSRCache(distDir);
-    cleanFederationRuntime();
-    fileReader.reset();
-    hooks.onReset.call({
-        event: {
-            type: 'repack'
-        }
-    });
+const onRepack = async (distDir, hooks)=>{
+    try {
+        await hooks.onReset.call({
+            event: {
+                type: 'repack'
+            }
+        });
+    } finally{
+        cleanSSRCache(distDir);
+        cleanFederationRuntime();
+        fileReader.reset();
+    }
 };
 export { onRepack };

package/dist/types/dev-tools/reloadManager.d.ts

@@ -71,6 +71,15 @@ export declare class ReloadManager {
      * be recreated on reload.
      */
     get handle(): ReloadableHandle;
+    /**
+     * Run `task` after the previously held tasks, and make requests arriving
+     * through `handle` wait until it settles. A reload waits for it before it
+     * swaps the runtime. Requests already dispatched are not waited for: an SSR
+     * loader fetching its own dev server would deadlock. The task itself must
+     * not await a request to this handle, which waits for the task.
+     * Returns the task's own result, rejection included.
+     */
+    hold(task: () => Promise<void>): Promise<void>;
     /** The currently active resolved handle (introspection / tests). */
     get currentHandle(): ReloadableHandle;
     /** Whether a reload is currently running (introspection / tests). */

package/dist/types/dev.d.ts

@@ -35,6 +35,11 @@ export interface DevInfraOptions {
     nodeServer?: NodeServer | NodeHttpsServer | Http2SecureServer;
     /** Accessor for the currently-active runtime ServerBase (a mutable ref). */
     getRuntimeServer: () => ServerBase | undefined;
+    /**
+     * Run a repack task while new requests wait for it (`ReloadManager.hold`),
+     * so no request re-requires the server bundle mid-reset.
+     */
+    holdRequests: (task: () => Promise<void>) => Promise<void>;
     /**
      * Triggered when a watched user server file changes (require cache already
      * busted). Wired to the runtime reload scheduler.
@@ -64,5 +69,5 @@ export interface DevInfra {
  * runtime, so a later phase can swap the trigger to the reload scheduler
  * without leaking a stale closure to a dead runtime.
  */
-export declare function setupDevInfra({ config, pwd, distDir, apiDir, sharedDir, builder, builderDevServer, getRuntimeServer, onFileChange, onClose, nodeServer, }: DevInfraOptions): DevInfra;
+export declare function setupDevInfra({ config, pwd, distDir, apiDir, sharedDir, builder, builderDevServer, getRuntimeServer, holdRequests, onFileChange, onClose, nodeServer, }: DevInfraOptions): DevInfra;
 export {};

package/dist/types/helpers/repack.d.ts

@@ -1,2 +1,12 @@
 import type { ServerPluginHooks } from '@modern-js/server-core';
-export declare const onRepack: (distDir: string, hooks: ServerPluginHooks) => void;
+/**
+ * Reset the dev server after the server bundle is rebuilt.
+ *
+ * Contract: the `onReset({ event: { type: 'repack' } })` handlers run in
+ * registration order and are awaited before the previous generation is purged.
+ * The caller holds new requests until this promise settles, so no request
+ * re-requires the bundle while a handler is still running. As with every async
+ * server hook, a rejecting handler skips the handlers after it; the generation
+ * is still purged and the promise rejects with that error.
+ */
+export declare const onRepack: (distDir: string, hooks: ServerPluginHooks) => Promise<void>;

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.9.0-ultramodern.16",
+  "version": "3.9.0-ultramodern.18",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -38,11 +38,11 @@
     }
   },
   "dependencies": {
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.16",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.16",
-    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.9.0-ultramodern.16",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.16",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.16",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.18",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.18",
+    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.9.0-ultramodern.18",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.18",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.18",
     "@swc/helpers": "^0.5.23",
     "connect-history-api-fallback": "^2.0.0",
     "http-compression": "1.1.3",
@@ -51,7 +51,7 @@
     "ws": "^8.21.3"
   },
   "devDependencies": {
-    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.9.0-ultramodern.16",
+    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.9.0-ultramodern.18",
     "@module-federation/runtime": "npm:@bleedingdev/mf-runtime@2.9.1",
     "@rslib/core": "1.0.2",
     "@scripts/rstest-config": "2.66.0",