@bleedingdev/modern-js-server 3.9.0-ultramodern.8 → 3.9.3-ultramodern.1

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-tools/watcher/dependencyTree.js

@@ -69,34 +69,28 @@ class DependencyTree {
         for (const treeNode of this.tree.values()){
             const { parent } = treeNode.module;
             const { children } = treeNode.module;
-            if (parent && !this.shouldIgnore(parent.filename)) {
+            if (parent) {
                 const parentTreeNode = this.tree.get(parent.filename);
                 if (parentTreeNode) treeNode.parent.add(parentTreeNode);
             }
             children?.forEach((child)=>{
-                if (!this.shouldIgnore(child.filename)) {
-                    const childTreeNode = this.tree.get(child.filename);
-                    if (childTreeNode) {
-                        treeNode.children.add(childTreeNode);
-                        childTreeNode.parent.add(treeNode);
-                    }
+                const childTreeNode = this.tree.get(child.filename);
+                if (childTreeNode) {
+                    treeNode.children.add(childTreeNode);
+                    childTreeNode.parent.add(treeNode);
                 }
             });
         }
     }
     shouldIgnore(path) {
         const matchPath = path && external_node_path_default().isAbsolute(path) ? external_node_path_default().relative(process.cwd(), path) : path;
-        return !matchPath || Boolean(this.ignore.find((rule)=>external_minimatch_namespaceObject.match([
-                matchPath
-            ], rule, {
-                dot: true
-            }).length > 0));
+        return !matchPath || this.ignore.some((rule)=>rule.match(matchPath));
     }
     constructor(){
         this.tree = new Map();
-        this.ignore = [
-            ...defaultIgnores
-        ];
+        this.ignore = defaultIgnores.map((rule)=>new external_minimatch_namespaceObject.Minimatch(rule, {
+                dot: true
+            }));
     }
 }
 exports.DependencyTree = __webpack_exports__.DependencyTree;

package/dist/cjs/dev-tools/watcher/index.js

@@ -49,7 +49,7 @@ const external_dependencyTree_js_namespaceObject = require("./dependencyTree.js"
 const external_statsCache_js_namespaceObject = require("./statsCache.js");
 const defaultWatchOptions = {
     ignoreInitial: true,
-    ignored: /api\/typings\/.*/
+    ignored: /api\/typings\/.*|(?:^|[/\\])node_modules(?:[/\\]|$)/
 };
 const getWatchedFiles = (watcher)=>{
     const watched = watcher.getWatched();

package/dist/cjs/dev.js

@@ -1,5 +1,14 @@
 "use strict";
 var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
 (()=>{
     __webpack_require__.d = (exports1, getters, values)=>{
         var define = (defs, kind)=>{
@@ -29,11 +38,26 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     devRuntimeMiddlewarePlugin: ()=>devRuntimeMiddlewarePlugin,
+    isServerTemplateRequest: ()=>isServerTemplateRequest,
     setupDevInfra: ()=>setupDevInfra
 });
+const external_node_path_namespaceObject = require("node:path");
+var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
 const node_namespaceObject = require("@modern-js/server-core/node");
 const utils_namespaceObject = require("@modern-js/utils");
 const index_js_namespaceObject = require("./helpers/index.js");
+function isServerTemplateRequest(pathname, routes) {
+    const templates = new Set((routes ?? []).flatMap((route)=>route.entryName && route.entryPath?.endsWith('.html') ? [
+            `/${route.entryPath.replace(/\\/g, '/').replace(/^\.?\//, '')}`
+        ] : []));
+    if (!templates.size) return false;
+    const candidates = [
+        pathname
+    ];
+    if (pathname.endsWith('/')) candidates.push(`${pathname}index.html`);
+    else if (!external_node_path_default().posix.extname(pathname)) candidates.push(`${pathname}.html`, `${pathname}/index.html`);
+    return candidates.some((candidate)=>templates.has(candidate));
+}
 const devRuntimeMiddlewarePlugin = (options, compiler)=>({
         name: '@modern-js/plugin-dev',
         setup (api) {
@@ -64,10 +88,14 @@ const devRuntimeMiddlewarePlugin = (options, compiler)=>({
                     name: 'mock-dev',
                     handler: mockMiddleware
                 });
-                builderMiddlewares && middlewares.push({
-                    name: 'rsbuild-dev',
-                    handler: (0, node_namespaceObject.connectMid2HonoMid)(builderMiddlewares)
-                });
+                if (builderMiddlewares) {
+                    const builderHandler = (0, node_namespaceObject.connectMid2HonoMid)(builderMiddlewares);
+                    const handler = (c, next)=>isServerTemplateRequest(c.req.path, api.getServerContext().routes) ? next() : builderHandler(c, next);
+                    middlewares.push({
+                        name: 'rsbuild-dev',
+                        handler
+                    });
+                }
                 after.forEach((middleware, index)=>{
                     middlewares.push({
                         name: `after-dev-server-${index}`,
@@ -81,7 +109,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 +119,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;
@@ -138,9 +166,11 @@ function setupDevInfra({ config, pwd, distDir, apiDir, sharedDir, builder, build
     };
 }
 exports.devRuntimeMiddlewarePlugin = __webpack_exports__.devRuntimeMiddlewarePlugin;
+exports.isServerTemplateRequest = __webpack_exports__.isServerTemplateRequest;
 exports.setupDevInfra = __webpack_exports__.setupDevInfra;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "devRuntimeMiddlewarePlugin",
+    "isServerTemplateRequest",
     "setupDevInfra"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/cjs/helpers/index.js

@@ -103,14 +103,22 @@ var __webpack_exports__ = {};
     ].indexOf(__rspack_import_key) < 0) __rspack_reexport[__rspack_import_key] = ()=>_repack__rspack_import_6[__rspack_import_key];
     __webpack_require__.d(__webpack_exports__, __rspack_reexport);
     function startWatcher({ pwd, distDir, apiDir, sharedDir, mockDir, watchOptions, onChange }) {
+        const loaderDirectory = path__rspack_import_1_default().resolve(pwd, distDir, _modern_js_utils__rspack_import_0.SERVER_BUNDLE_DIRECTORY);
         const defaultWatched = [
-            path__rspack_import_1_default().join((0, _mock__rspack_import_3.resolveMockDirectory)(pwd, mockDir), '**/*'),
-            `${_modern_js_utils__rspack_import_0.SERVER_DIR}/**/*`,
-            `${apiDir}/**`,
-            `${sharedDir}/**/*`,
-            `${distDir}/${_modern_js_utils__rspack_import_0.SERVER_BUNDLE_DIRECTORY}/*-server-loaders.js`
+            (0, _mock__rspack_import_3.resolveMockDirectory)(pwd, mockDir),
+            _modern_js_utils__rspack_import_0.SERVER_DIR,
+            apiDir,
+            sharedDir,
+            loaderDirectory
         ];
         const mergedWatchOptions = (0, _dev_tools_watcher__rspack_import_2.mergeWatchOptions)(watchOptions);
+        const ignored = mergedWatchOptions.ignored;
+        mergedWatchOptions.ignored = [
+            ...Array.isArray(ignored) ? ignored : ignored ? [
+                ignored
+            ] : [],
+            (file)=>file.startsWith(`${loaderDirectory}${path__rspack_import_1_default().sep}`) && !file.endsWith('-server-loaders.js')
+        ];
         const defaultWatchedPaths = defaultWatched.map((p)=>{
             const finalPath = path__rspack_import_1_default().isAbsolute(p) ? p : path__rspack_import_1_default().join(pwd, p);
             return path__rspack_import_1_default().normalize(finalPath);

package/dist/cjs/helpers/mock.js

@@ -129,7 +129,7 @@ async function getMockMiddleware(pwd, mockDir) {
         if (matchedMockAPI) {
             const { handler } = matchedMockAPI;
             if ('function' == typeof handler) return await (0, node_namespaceObject.connectMockMid2HonoMid)(handler)(c, next);
-            return c.json(handler);
+            else return c.json(handler);
         }
         return next();
     };

package/dist/cjs/helpers/repack.js

@@ -36,14 +36,17 @@ const cleanSSRCache = (distDir)=>{
         if (key.startsWith(distDir)) delete require.cache[key];
     });
 };
-const onRepack = (distDir, hooks)=>{
-    cleanSSRCache(distDir);
-    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);
+        fileReader_namespaceObject.fileReader.reset();
+    }
 };
 exports.onRepack = __webpack_exports__.onRepack;
 for(var __rspack_i in __webpack_exports__)if (-1 === [

package/dist/cjs/types/dev.js

@@ -0,0 +1,18 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+for(var __rspack_i in __webpack_exports__)exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

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-tools/watcher/dependencyTree.mjs

@@ -26,34 +26,28 @@ class DependencyTree {
         for (const treeNode of this.tree.values()){
             const { parent } = treeNode.module;
             const { children } = treeNode.module;
-            if (parent && !this.shouldIgnore(parent.filename)) {
+            if (parent) {
                 const parentTreeNode = this.tree.get(parent.filename);
                 if (parentTreeNode) treeNode.parent.add(parentTreeNode);
             }
             children?.forEach((child)=>{
-                if (!this.shouldIgnore(child.filename)) {
-                    const childTreeNode = this.tree.get(child.filename);
-                    if (childTreeNode) {
-                        treeNode.children.add(childTreeNode);
-                        childTreeNode.parent.add(treeNode);
-                    }
+                const childTreeNode = this.tree.get(child.filename);
+                if (childTreeNode) {
+                    treeNode.children.add(childTreeNode);
+                    childTreeNode.parent.add(treeNode);
                 }
             });
         }
     }
     shouldIgnore(path) {
         const matchPath = path && node_path.isAbsolute(path) ? node_path.relative(process.cwd(), path) : path;
-        return !matchPath || Boolean(this.ignore.find((rule)=>__rspack_external_minimatch.match([
-                matchPath
-            ], rule, {
-                dot: true
-            }).length > 0));
+        return !matchPath || this.ignore.some((rule)=>rule.match(matchPath));
     }
     constructor(){
         this.tree = new Map();
-        this.ignore = [
-            ...defaultIgnores
-        ];
+        this.ignore = defaultIgnores.map((rule)=>new __rspack_external_minimatch.Minimatch(rule, {
+                dot: true
+            }));
     }
 }
 export { DependencyTree, defaultIgnores };

package/dist/esm/dev-tools/watcher/index.mjs

@@ -4,7 +4,7 @@ import { DependencyTree } from "./dependencyTree.mjs";
 import { StatsCache } from "./statsCache.mjs";
 const defaultWatchOptions = {
     ignoreInitial: true,
-    ignored: /api\/typings\/.*/
+    ignored: /api\/typings\/.*|(?:^|[/\\])node_modules(?:[/\\]|$)/
 };
 const getWatchedFiles = (watcher)=>{
     const watched = watcher.getWatched();

package/dist/esm/dev.mjs

@@ -1,6 +1,19 @@
+import node_path from "node:path";
 import { connectMid2HonoMid } from "@modern-js/server-core/node";
 import { API_DIR, SHARED_DIR, logger } from "@modern-js/utils";
 import { getDevOptions, getMockMiddleware, initFileReader, isPathInsideDirectory, onRepack, resolveMockDirectory, startWatcher } from "./helpers/index.mjs";
+function isServerTemplateRequest(pathname, routes) {
+    const templates = new Set((routes ?? []).flatMap((route)=>route.entryName && route.entryPath?.endsWith('.html') ? [
+            `/${route.entryPath.replace(/\\/g, '/').replace(/^\.?\//, '')}`
+        ] : []));
+    if (!templates.size) return false;
+    const candidates = [
+        pathname
+    ];
+    if (pathname.endsWith('/')) candidates.push(`${pathname}index.html`);
+    else if (!node_path.posix.extname(pathname)) candidates.push(`${pathname}.html`, `${pathname}/index.html`);
+    return candidates.some((candidate)=>templates.has(candidate));
+}
 const devRuntimeMiddlewarePlugin = (options, compiler)=>({
         name: '@modern-js/plugin-dev',
         setup (api) {
@@ -31,10 +44,14 @@ const devRuntimeMiddlewarePlugin = (options, compiler)=>({
                     name: 'mock-dev',
                     handler: mockMiddleware
                 });
-                builderMiddlewares && middlewares.push({
-                    name: 'rsbuild-dev',
-                    handler: connectMid2HonoMid(builderMiddlewares)
-                });
+                if (builderMiddlewares) {
+                    const builderHandler = connectMid2HonoMid(builderMiddlewares);
+                    const handler = (c, next)=>isServerTemplateRequest(c.req.path, api.getServerContext().routes) ? next() : builderHandler(c, next);
+                    middlewares.push({
+                        name: 'rsbuild-dev',
+                        handler
+                    });
+                }
                 after.forEach((middleware, index)=>{
                     middlewares.push({
                         name: `after-dev-server-${index}`,
@@ -48,7 +65,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 +75,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;
@@ -104,4 +121,4 @@ function setupDevInfra({ config, pwd, distDir, apiDir, sharedDir, builder, build
         close: close$
     };
 }
-export { devRuntimeMiddlewarePlugin, setupDevInfra };
+export { devRuntimeMiddlewarePlugin, isServerTemplateRequest, setupDevInfra };

package/dist/esm/helpers/index.mjs

@@ -7,14 +7,22 @@ export * from "./fileReader.mjs";
 export * from "./mock.mjs";
 export * from "./repack.mjs";
 function startWatcher({ pwd, distDir, apiDir, sharedDir, mockDir, watchOptions, onChange }) {
+    const loaderDirectory = path.resolve(pwd, distDir, SERVER_BUNDLE_DIRECTORY);
     const defaultWatched = [
-        path.join(resolveMockDirectory(pwd, mockDir), '**/*'),
-        `${SERVER_DIR}/**/*`,
-        `${apiDir}/**`,
-        `${sharedDir}/**/*`,
-        `${distDir}/${SERVER_BUNDLE_DIRECTORY}/*-server-loaders.js`
+        resolveMockDirectory(pwd, mockDir),
+        SERVER_DIR,
+        apiDir,
+        sharedDir,
+        loaderDirectory
     ];
     const mergedWatchOptions = mergeWatchOptions(watchOptions);
+    const ignored = mergedWatchOptions.ignored;
+    mergedWatchOptions.ignored = [
+        ...Array.isArray(ignored) ? ignored : ignored ? [
+            ignored
+        ] : [],
+        (file)=>file.startsWith(`${loaderDirectory}${path.sep}`) && !file.endsWith('-server-loaders.js')
+    ];
     const defaultWatchedPaths = defaultWatched.map((p)=>{
         const finalPath = path.isAbsolute(p) ? p : path.join(pwd, p);
         return path.normalize(finalPath);

package/dist/esm/helpers/mock.mjs

@@ -83,7 +83,7 @@ async function getMockMiddleware(pwd, mockDir) {
         if (matchedMockAPI) {
             const { handler } = matchedMockAPI;
             if ('function' == typeof handler) return await connectMockMid2HonoMid(handler)(c, next);
-            return c.json(handler);
+            else return c.json(handler);
         }
         return next();
     };

package/dist/esm/helpers/repack.mjs

@@ -4,13 +4,16 @@ const cleanSSRCache = (distDir)=>{
         if (key.startsWith(distDir)) delete require.cache[key];
     });
 };
-const onRepack = (distDir, hooks)=>{
-    cleanSSRCache(distDir);
-    fileReader.reset();
-    hooks.onReset.call({
-        event: {
-            type: 'repack'
-        }
-    });
+const onRepack = async (distDir, hooks)=>{
+    try {
+        await hooks.onReset.call({
+            event: {
+                type: 'repack'
+            }
+        });
+    } finally{
+        cleanSSRCache(distDir);
+        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-tools/watcher/dependencyTree.mjs

@@ -27,34 +27,28 @@ class DependencyTree {
         for (const treeNode of this.tree.values()){
             const { parent } = treeNode.module;
             const { children } = treeNode.module;
-            if (parent && !this.shouldIgnore(parent.filename)) {
+            if (parent) {
                 const parentTreeNode = this.tree.get(parent.filename);
                 if (parentTreeNode) treeNode.parent.add(parentTreeNode);
             }
             children?.forEach((child)=>{
-                if (!this.shouldIgnore(child.filename)) {
-                    const childTreeNode = this.tree.get(child.filename);
-                    if (childTreeNode) {
-                        treeNode.children.add(childTreeNode);
-                        childTreeNode.parent.add(treeNode);
-                    }
+                const childTreeNode = this.tree.get(child.filename);
+                if (childTreeNode) {
+                    treeNode.children.add(childTreeNode);
+                    childTreeNode.parent.add(treeNode);
                 }
             });
         }
     }
     shouldIgnore(path) {
         const matchPath = path && node_path.isAbsolute(path) ? node_path.relative(process.cwd(), path) : path;
-        return !matchPath || Boolean(this.ignore.find((rule)=>__rspack_external_minimatch.match([
-                matchPath
-            ], rule, {
-                dot: true
-            }).length > 0));
+        return !matchPath || this.ignore.some((rule)=>rule.match(matchPath));
     }
     constructor(){
         this.tree = new Map();
-        this.ignore = [
-            ...defaultIgnores
-        ];
+        this.ignore = defaultIgnores.map((rule)=>new __rspack_external_minimatch.Minimatch(rule, {
+                dot: true
+            }));
     }
 }
 export { DependencyTree, defaultIgnores };

package/dist/esm-node/dev-tools/watcher/index.mjs

@@ -6,7 +6,7 @@ import { DependencyTree } from "./dependencyTree.mjs";
 import { StatsCache } from "./statsCache.mjs";
 const defaultWatchOptions = {
     ignoreInitial: true,
-    ignored: /api\/typings\/.*/
+    ignored: /api\/typings\/.*|(?:^|[/\\])node_modules(?:[/\\]|$)/
 };
 const getWatchedFiles = (watcher)=>{
     const watched = watcher.getWatched();

package/dist/esm-node/dev.mjs

@@ -1,7 +1,20 @@
 import "node:module";
+import node_path from "node:path";
 import { connectMid2HonoMid } from "@modern-js/server-core/node";
 import { API_DIR, SHARED_DIR, logger } from "@modern-js/utils";
 import { getDevOptions, getMockMiddleware, initFileReader, isPathInsideDirectory, onRepack, resolveMockDirectory, startWatcher } from "./helpers/index.mjs";
+function isServerTemplateRequest(pathname, routes) {
+    const templates = new Set((routes ?? []).flatMap((route)=>route.entryName && route.entryPath?.endsWith('.html') ? [
+            `/${route.entryPath.replace(/\\/g, '/').replace(/^\.?\//, '')}`
+        ] : []));
+    if (!templates.size) return false;
+    const candidates = [
+        pathname
+    ];
+    if (pathname.endsWith('/')) candidates.push(`${pathname}index.html`);
+    else if (!node_path.posix.extname(pathname)) candidates.push(`${pathname}.html`, `${pathname}/index.html`);
+    return candidates.some((candidate)=>templates.has(candidate));
+}
 const devRuntimeMiddlewarePlugin = (options, compiler)=>({
         name: '@modern-js/plugin-dev',
         setup (api) {
@@ -32,10 +45,14 @@ const devRuntimeMiddlewarePlugin = (options, compiler)=>({
                     name: 'mock-dev',
                     handler: mockMiddleware
                 });
-                builderMiddlewares && middlewares.push({
-                    name: 'rsbuild-dev',
-                    handler: connectMid2HonoMid(builderMiddlewares)
-                });
+                if (builderMiddlewares) {
+                    const builderHandler = connectMid2HonoMid(builderMiddlewares);
+                    const handler = (c, next)=>isServerTemplateRequest(c.req.path, api.getServerContext().routes) ? next() : builderHandler(c, next);
+                    middlewares.push({
+                        name: 'rsbuild-dev',
+                        handler
+                    });
+                }
                 after.forEach((middleware, index)=>{
                     middlewares.push({
                         name: `after-dev-server-${index}`,
@@ -49,7 +66,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 +76,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;
@@ -105,4 +122,4 @@ function setupDevInfra({ config, pwd, distDir, apiDir, sharedDir, builder, build
         close: close$
     };
 }
-export { devRuntimeMiddlewarePlugin, setupDevInfra };
+export { devRuntimeMiddlewarePlugin, isServerTemplateRequest, setupDevInfra };

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

@@ -9,14 +9,22 @@ export * from "./fileReader.mjs";
 export * from "./mock.mjs";
 export * from "./repack.mjs";
 function startWatcher({ pwd, distDir, apiDir, sharedDir, mockDir, watchOptions, onChange }) {
+    const loaderDirectory = path.resolve(pwd, distDir, SERVER_BUNDLE_DIRECTORY);
     const defaultWatched = [
-        path.join(resolveMockDirectory(pwd, mockDir), '**/*'),
-        `${SERVER_DIR}/**/*`,
-        `${apiDir}/**`,
-        `${sharedDir}/**/*`,
-        `${distDir}/${SERVER_BUNDLE_DIRECTORY}/*-server-loaders.js`
+        resolveMockDirectory(pwd, mockDir),
+        SERVER_DIR,
+        apiDir,
+        sharedDir,
+        loaderDirectory
     ];
     const mergedWatchOptions = mergeWatchOptions(watchOptions);
+    const ignored = mergedWatchOptions.ignored;
+    mergedWatchOptions.ignored = [
+        ...Array.isArray(ignored) ? ignored : ignored ? [
+            ignored
+        ] : [],
+        (file)=>file.startsWith(`${loaderDirectory}${path.sep}`) && !file.endsWith('-server-loaders.js')
+    ];
     const defaultWatchedPaths = defaultWatched.map((p)=>{
         const finalPath = path.isAbsolute(p) ? p : path.join(pwd, p);
         return path.normalize(finalPath);

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

@@ -84,7 +84,7 @@ async function getMockMiddleware(pwd, mockDir) {
         if (matchedMockAPI) {
             const { handler } = matchedMockAPI;
             if ('function' == typeof handler) return await connectMockMid2HonoMid(handler)(c, next);
-            return c.json(handler);
+            else return c.json(handler);
         }
         return next();
     };

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

@@ -6,13 +6,16 @@ const cleanSSRCache = (distDir)=>{
         if (key.startsWith(distDir)) delete require.cache[key];
     });
 };
-const onRepack = (distDir, hooks)=>{
-    cleanSSRCache(distDir);
-    fileReader.reset();
-    hooks.onReset.call({
-        event: {
-            type: 'repack'
-        }
-    });
+const onRepack = async (distDir, hooks)=>{
+    try {
+        await hooks.onReset.call({
+            event: {
+                type: 'repack'
+            }
+        });
+    } finally{
+        cleanSSRCache(distDir);
+        fileReader.reset();
+    }
 };
 export { onRepack };

package/dist/esm-node/types/dev.mjs

@@ -0,0 +1 @@
+import "node:module";

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

@@ -3,9 +3,12 @@ import type { Http2SecureServer } from 'node:http2';
 import type { Server as NodeHttpsServer } from 'node:https';
 import type { BuilderInstance, Rspack } from '@modern-js/builder';
 import type { ServerBase, ServerBaseOptions, ServerPlugin } from '@modern-js/server-core';
+import type { ServerRoute } from '@modern-js/types';
 import type { WatchEvent } from './dev-tools/watcher/index.js';
 import type { ModernDevServerOptions } from './types.js';
 type BuilderDevServer = Awaited<ReturnType<BuilderInstance['createDevServer']>>;
+/** Whether Rsbuild's asset lookup would answer `pathname` with a page template. */
+export declare function isServerTemplateRequest(pathname: string, routes: readonly ServerRoute[] | undefined): boolean;
 export type DevPluginOptions = ModernDevServerOptions<ServerBaseOptions> & {
     builderDevServer?: BuilderDevServer;
 };
@@ -35,6 +38,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 +72,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,17 @@
 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.
+ *
+ * Runtime state a rebuilt bundle keeps outside the require cache belongs to
+ * the plugin that owns it and is reset by that plugin's `onReset` handler:
+ * `@module-federation/modern-js-v3/server` resets the Module Federation
+ * runtime on `globalThis` there (module-federation/core#5152).
+ *
+ * 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/dist/types/index.d.ts

@@ -1,4 +1,3 @@
-import type { DevServerOptions } from './types.js';
 export { createDevServer } from './createDevServer.js';
 export type { ApplyPlugins, CorsOptions, ModernDevServerOptions, } from './types.js';
-export type SetupMiddlewares = DevServerOptions['setupMiddlewares'];
+export type { SetupMiddlewares } from './types/dev.js';

package/dist/types/types/dev.d.ts

@@ -0,0 +1,44 @@
+import type { DevServerHttpsOptions, ExposeServerApis, RequestHandler } from '@modern-js/types/server';
+export type { DevServerHttpsOptions };
+type StaticOrigin = boolean | string | RegExp | Array<boolean | string | RegExp>;
+type CustomOrigin = (requestOrigin: string | undefined, callback: (err: Error | null, origin?: StaticOrigin) => void) => void;
+export interface CorsOptions {
+    /**
+     * @default '*''
+     */
+    origin?: StaticOrigin | CustomOrigin | undefined;
+}
+export interface DevServerConfig {
+    /**
+     * Configure CORS for the dev server.
+     * - object: enable CORS with the specified options.
+     * - true: enable CORS with default options (allow all origins, not recommended).
+     * - false: disable CORS.
+     * @default
+     * ```js
+     * { origin: defaultAllowedOrigins }
+     * ```
+     * where `defaultAllowedOrigins` includes:
+     * - `localhost`
+     * - `127.0.0.1`
+     *
+     * @link https://github.com/expressjs/cors
+     */
+    cors?: boolean | CorsOptions;
+}
+export type DevServerOptions = {
+    /** Provides the ability to execute a custom function and apply custom middlewares */
+    setupMiddlewares?: Array<(
+    /** Order: `devServer.before` => `unshift` => internal middlewares => `push` => `devServer.after` */
+    middlewares: {
+        /** Use the `unshift` method if you want to run a middleware before all other middlewares */
+        unshift: (...handlers: RequestHandler[]) => void;
+        /** Use the `push` method if you want to run a middleware after all other middlewares */
+        push: (...handlers: RequestHandler[]) => void;
+    }, server: ExposeServerApis) => void>;
+    /** Whether to enable hot reload. */
+    https?: DevServerHttpsOptions;
+    /** Dev server specific options. */
+    server?: DevServerConfig;
+};
+export type SetupMiddlewares = DevServerOptions['setupMiddlewares'];

package/dist/types/types.d.ts

@@ -2,49 +2,8 @@ import type { Server as NodeServer } from 'node:http';
 import type { Http2SecureServer } from 'node:http2';
 import type { BuilderInstance } from '@modern-js/builder';
 import type { ServerBase, ServerBaseOptions, ServerPlugin } from '@modern-js/server-core';
-import type { DevServerHttpsOptions, ExposeServerApis, RequestHandler } from '@modern-js/types';
-export type { DevServerHttpsOptions };
-type StaticOrigin = boolean | string | RegExp | Array<boolean | string | RegExp>;
-type CustomOrigin = (requestOrigin: string | undefined, callback: (err: Error | null, origin?: StaticOrigin) => void) => void;
-export interface CorsOptions {
-    /**
-     * @default '*''
-     */
-    origin?: StaticOrigin | CustomOrigin | undefined;
-}
-export interface DevServerConfig {
-    /**
-     * Configure CORS for the dev server.
-     * - object: enable CORS with the specified options.
-     * - true: enable CORS with default options (allow all origins, not recommended).
-     * - false: disable CORS.
-     * @default
-     * ```js
-     * { origin: defaultAllowedOrigins }
-     * ```
-     * where `defaultAllowedOrigins` includes:
-     * - `localhost`
-     * - `127.0.0.1`
-     *
-     * @link https://github.com/expressjs/cors
-     */
-    cors?: boolean | CorsOptions;
-}
-export type DevServerOptions = {
-    /** Provides the ability to execute a custom function and apply custom middlewares */
-    setupMiddlewares?: Array<(
-    /** Order: `devServer.before` => `unshift` => internal middlewares => `push` => `devServer.after` */
-    middlewares: {
-        /** Use the `unshift` method if you want to run a middleware before all other middlewares */
-        unshift: (...handlers: RequestHandler[]) => void;
-        /** Use the `push` method if you want to run a middleware after all other middlewares */
-        push: (...handlers: RequestHandler[]) => void;
-    }, server: ExposeServerApis) => void>;
-    /** Whether to enable hot reload. */
-    https?: DevServerHttpsOptions;
-    /** Dev server specific options. */
-    server?: DevServerConfig;
-};
+import type { DevServerOptions } from './types/dev.js';
+export type { CorsOptions, DevServerConfig, DevServerHttpsOptions, DevServerOptions, } from './types/dev.js';
 export type ExtraOptions = {
     dev: DevServerOptions;
     runCompile?: boolean;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@bleedingdev/modern-js-server",
   "description": "A Progressive React Framework for modern web development.",
-  "homepage": "https://github.com/BleedingDev/ultramodern.js#readme",
+  "homepage": "https://github.com/ultramodernjs/ultramodern.js#readme",
   "bugs": {
-    "url": "https://github.com/BleedingDev/ultramodern.js/issues"
+    "url": "https://github.com/ultramodernjs/ultramodern.js/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/BleedingDev/ultramodern.js.git",
+    "url": "git+https://github.com/ultramodernjs/ultramodern.js.git",
     "directory": "packages/server/server"
   },
   "license": "MIT",
@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.9.0-ultramodern.8",
+  "version": "3.9.3-ultramodern.1",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -28,36 +28,42 @@
         "require": "./dist/cjs/index.js"
       },
       "default": "./dist/cjs/index.js"
+    },
+    "./config-types": {
+      "types": "./dist/types/types/dev.d.ts"
     }
   },
   "typesVersions": {
     "*": {
       ".": [
         "./dist/types/index.d.ts"
+      ],
+      "config-types": [
+        "./dist/types/types/dev.d.ts"
       ]
     }
   },
   "dependencies": {
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.8",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.8",
-    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.9.0-ultramodern.8",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.8",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.8",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.3-ultramodern.1",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.3-ultramodern.1",
+    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.9.3-ultramodern.1",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.3-ultramodern.1",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.3-ultramodern.1",
     "@swc/helpers": "^0.5.23",
     "connect-history-api-fallback": "^2.0.0",
     "http-compression": "1.1.3",
     "minimatch": "^10.2.6",
     "path-to-regexp": "^8.4.2",
-    "ws": "^8.21.3"
+    "ws": "^8.22.0"
   },
   "devDependencies": {
-    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.9.0-ultramodern.8",
-    "@rslib/core": "1.0.0",
+    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.9.3-ultramodern.1",
+    "@module-federation/runtime": "2.9.2",
+    "@rslib/core": "1.0.3",
     "@scripts/rstest-config": "2.66.0",
     "@types/connect-history-api-fallback": "^1.5.4",
-    "@types/node": "^26.4.1",
-    "@types/ws": "^8.18.1",
-    "@typescript/native-preview": "7.0.0-dev.20260707.2",
+    "@types/node": "^26.6.3",
+    "@types/ws": "^8.18.2",
     "node-mocks-http": "^1.18.1",
     "tsconfig-paths": "4.2.0",
     "websocket": "^1.0.35"
@@ -82,5 +88,8 @@
     "build": "rslib build",
     "dev": "rslib build --watch",
     "test": "rstest"
+  },
+  "ultramodern": {
+    "sourceName": "@modern-js/server"
   }
 }