Dispose and apply must run atomically.

lib/hmr/HotModuleReplacement.runtime.js

@@ -323,49 +323,51 @@ module.exports = function () {
 		}
 
 		// Now in "dispose" phase
-		return setStatus("dispose").then(function () {
-			results.forEach(function (result) {
-				if (result.dispose) result.dispose();
-			});
+		var disposePromise = setStatus("dispose");
 
-			// Now in "apply" phase
-			return setStatus("apply").then(function () {
-				var error;
-				var reportError = function (err) {
-					if (!error) error = err;
-				};
-
-				var outdatedModules = [];
-				results.forEach(function (result) {
-					if (result.apply) {
-						var modules = result.apply(reportError);
-						if (modules) {
-							for (var i = 0; i < modules.length; i++) {
-								outdatedModules.push(modules[i]);
-							}
-						}
-					}
-				});
+		results.forEach(function (result) {
+			if (result.dispose) result.dispose();
+		});
 
-				// handle errors in accept handlers and self accepted module load
-				if (error) {
-					return setStatus("fail").then(function () {
-						throw error;
-					});
-				}
+		// Now in "apply" phase
+		var applyPromise = setStatus("apply");
 
-				if (queuedInvalidatedModules) {
-					return internalApply(options).then(function (list) {
-						outdatedModules.forEach(function (moduleId) {
-							if (list.indexOf(moduleId) < 0) list.push(moduleId);
-						});
-						return list;
-					});
+		var error;
+		var reportError = function (err) {
+			if (!error) error = err;
+		};
+
+		var outdatedModules = [];
+		results.forEach(function (result) {
+			if (result.apply) {
+				var modules = result.apply(reportError);
+				if (modules) {
+					for (var i = 0; i < modules.length; i++) {
+						outdatedModules.push(modules[i]);
+					}
 				}
+			}
+		});
+
+		return Promise.all([disposePromise, applyPromise]).then(function () {
+			// handle errors in accept handlers and self accepted module load
+			if (error) {
+				return setStatus("fail").then(function () {
+					throw error;
+				});
+			}
 
-				return setStatus("idle").then(function () {
-					return outdatedModules;
+			if (queuedInvalidatedModules) {
+				return internalApply(options).then(function (list) {
+					outdatedModules.forEach(function (moduleId) {
+						if (list.indexOf(moduleId) < 0) list.push(moduleId);
+					});
+					return list;
 				});
+			}
+
+			return setStatus("idle").then(function () {
+				return outdatedModules;
 			});
 		});
 	}

test/hotCases/status/accept/index.js

@@ -2,20 +2,26 @@ var value = require("./file");
 
 it("should wait until promises returned by status handlers are fulfilled", (done) => {
 	var handler = jest.fn(status => {
-		return Promise.resolve().then(() => {
-			expect(status).toBe(module.hot.status());
+		var test = jest.fn(() => {
+			expect(module.hot.status()).toBe(status == "dispose" ? "apply" : status);
 		});
+
+		var promise = Promise.resolve().then(test);
+		promise.test = test;
+
+		return promise;
 	});
 	module.hot.addStatusHandler(handler);
 	module.hot.accept("./file", () => {
 		value = require("./file");
-		done();
 	});
 	NEXT(require("../../update")(done, undefined, () => {
+		expect(handler.mock.calls).toStrictEqual([['check'], ['prepare'], ['dispose'], ['apply'], ['idle']]);
+		for (let result of handler.mock.results)
+			expect(result.value.test).toHaveBeenCalledTimes(1);
+
 		expect(module.hot.status()).toBe("idle");
-
-		expect(handler.mock.calls).toBe([['check'], ['prepare'], ['dispose'], ['apply'], ['idle']]);
+
 		done();
-}));
+  }));
 });
-