diff --git a/packages/rspack-test-tools/etc/api.md b/packages/rspack-test-tools/etc/api.md
index 58d6dc37098..1f51e670b37 100644
--- a/packages/rspack-test-tools/etc/api.md
+++ b/packages/rspack-test-tools/etc/api.md
@@ -179,7 +179,7 @@ export function createHookCase(name: string, src: string, dist: string, source:
 export function createHotCase(name: string, src: string, dist: string, target: TCompilerOptions<ECompilerType.Rspack>["target"]): void;
 
 // @public (undocumented)
-export function createHotNewIncrementalCase(name: string, src: string, dist: string, target: TCompilerOptions<ECompilerType.Rspack>["target"]): void;
+export function createHotNewIncrementalCase(name: string, src: string, dist: string, target: TCompilerOptions<ECompilerType.Rspack>["target"], documentType: EDocumentType): void;
 
 // @public (undocumented)
 export function createHotStepCase(name: string, src: string, dist: string, target: TCompilerOptions<ECompilerType.Rspack>["target"]): void;
@@ -463,9 +463,13 @@ export class HookTaskProcessor<T extends ECompilerType> extends SnapshotProcesso
 export class HotNewIncrementalProcessor<T extends ECompilerType> extends HotProcessor<T> {
     constructor(_hotOptions: IHotNewIncrementalProcessorOptions<T>);
     // (undocumented)
+    afterAll(context: ITestContext): Promise<void>;
+    // (undocumented)
     static defaultOptions<T extends ECompilerType>(this: HotNewIncrementalProcessor<T>, context: ITestContext): TCompilerOptions<T>;
     // (undocumented)
     protected _hotOptions: IHotNewIncrementalProcessorOptions<T>;
+    // (undocumented)
+    run(env: ITestEnv, context: ITestContext): Promise<void>;
 }
 
 // @public (undocumented)
@@ -750,6 +754,8 @@ export interface IHookProcessorOptions<T extends ECompilerType> extends ISnapsho
 
 // @public (undocumented)
 export interface IHotNewIncrementalProcessorOptions<T extends ECompilerType> extends Omit<IBasicProcessorOptions<T>, "runable"> {
+    // (undocumented)
+    documentType?: EDocumentType;
     // (undocumented)
     target: TCompilerOptions<T>["target"];
 }
diff --git a/packages/rspack-test-tools/src/case/new-incremental.ts b/packages/rspack-test-tools/src/case/new-incremental.ts
index a3678a455a6..461bea45cef 100644
--- a/packages/rspack-test-tools/src/case/new-incremental.ts
+++ b/packages/rspack-test-tools/src/case/new-incremental.ts
@@ -5,19 +5,24 @@ import { HotNewIncrementalProcessor } from "../processor/hot-new-incremental";
 import { WatchProcessor, WatchStepProcessor } from "../processor/watch";
 import { HotRunnerFactory, WatchRunnerFactory } from "../runner";
 import { BasicCaseCreator } from "../test/creator";
-import { ECompilerType, type TCompilerOptions } from "../type";
+import {
+	ECompilerType,
+	type EDocumentType,
+	type TCompilerOptions
+} from "../type";
 
 type TTarget = TCompilerOptions<ECompilerType.Rspack>["target"];
 
 const hotCreators: Map<
-	TTarget,
+	string,
 	BasicCaseCreator<ECompilerType.Rspack>
 > = new Map();
 
-function getHotCreator(target: TTarget) {
-	if (!hotCreators.has(target)) {
+function getHotCreator(target: TTarget, documentType: EDocumentType) {
+	const key = JSON.stringify({ target, documentType });
+	if (!hotCreators.has(key)) {
 		hotCreators.set(
-			target,
+			key,
 			new BasicCaseCreator({
 				clean: true,
 				describe: true,
@@ -27,23 +32,25 @@ function getHotCreator(target: TTarget) {
 						name,
 						target: target as TTarget,
 						compilerType: ECompilerType.Rspack,
-						configFiles: ["rspack.config.js", "webpack.config.js"]
+						configFiles: ["rspack.config.js", "webpack.config.js"],
+						documentType
 					})
 				],
 				runner: HotRunnerFactory
 			})
 		);
 	}
-	return hotCreators.get(target)!;
+	return hotCreators.get(key)!;
 }
 
 export function createHotNewIncrementalCase(
 	name: string,
 	src: string,
 	dist: string,
-	target: TCompilerOptions<ECompilerType.Rspack>["target"]
+	target: TCompilerOptions<ECompilerType.Rspack>["target"],
+	documentType: EDocumentType
 ) {
-	const creator = getHotCreator(target);
+	const creator = getHotCreator(target, documentType);
 	creator.create(name, src, dist);
 }
 
diff --git a/packages/rspack-test-tools/src/processor/hot-new-incremental.ts b/packages/rspack-test-tools/src/processor/hot-new-incremental.ts
index a2c1207cbe6..dbf7f51f78f 100644
--- a/packages/rspack-test-tools/src/processor/hot-new-incremental.ts
+++ b/packages/rspack-test-tools/src/processor/hot-new-incremental.ts
@@ -1,6 +1,8 @@
 import {
 	ECompilerType,
+	EDocumentType,
 	type ITestContext,
+	type ITestEnv,
 	type TCompilerOptions
 } from "../type";
 import type { IBasicProcessorOptions } from "./basic";
@@ -9,6 +11,7 @@ import { HotProcessor } from "./hot";
 export interface IHotNewIncrementalProcessorOptions<T extends ECompilerType>
 	extends Omit<IBasicProcessorOptions<T>, "runable"> {
 	target: TCompilerOptions<T>["target"];
+	documentType?: EDocumentType;
 }
 
 export class HotNewIncrementalProcessor<
@@ -18,6 +21,27 @@ export class HotNewIncrementalProcessor<
 		super(_hotOptions);
 	}
 
+	async run(env: ITestEnv, context: ITestContext) {
+		context.setValue(
+			this._options.name,
+			"documentType",
+			this._hotOptions.documentType
+		);
+		await super.run(env, context);
+	}
+
+	async afterAll(context: ITestContext) {
+		try {
+			await super.afterAll(context);
+		} catch (e: any) {
+			const isFake =
+				context.getValue(this._options.name, "documentType") ===
+				EDocumentType.Fake;
+			if (isFake && /Should run all hot steps/.test(e.message)) return;
+			throw e;
+		}
+	}
+
 	static defaultOptions<T extends ECompilerType>(
 		this: HotNewIncrementalProcessor<T>,
 		context: ITestContext
diff --git a/packages/rspack-test-tools/tests/NewIncremental.test.js b/packages/rspack-test-tools/tests/NewIncremental.test.js
index c9738827f5a..b99ef38778a 100644
--- a/packages/rspack-test-tools/tests/NewIncremental.test.js
+++ b/packages/rspack-test-tools/tests/NewIncremental.test.js
@@ -4,38 +4,41 @@ process.env.RSPACK_CONFIG_VALIDATE = 'loose-silent';
 const path = require("path");
 const { describeByWalk, createHotNewIncrementalCase, createWatchNewIncrementalCase } = require("../dist");
 
-function postfixName(name) {
-  return `${name} (newIncremental)`
+function v(name) {
+	return path.join(__dirname, `new-incremental ${name}`)
 }
 
-describeByWalk(__filename, (name, src, dist) => {
-	createHotNewIncrementalCase(postfixName(name), src, dist, "async-node");
+// Run tests rspack-test-tools/tests/hotCases in target async-node
+describeByWalk(v("hot async-node"), (name, src, dist) => {
+	createHotNewIncrementalCase(name, src, dist, "async-node", "jsdom");
 }, {
 	source: path.resolve(__dirname, "./hotCases"),
-	dist: path.resolve(__dirname, `./js/new-incremental/hot-node`),
+	dist: path.resolve(__dirname, `./js/new-incremental/hot-async-node`),
 	exclude: [/^css$/]
 });
 
-describeByWalk(__filename, (name, src, dist) => {
-	createHotNewIncrementalCase(postfixName(name), src, dist, "web");
+// Run tests rspack-test-tools/tests/hotCases in target web
+describeByWalk(v("hot web"), (name, src, dist) => {
+	createHotNewIncrementalCase(name, src, dist, "web", "jsdom");
 }, {
 	source: path.resolve(__dirname, "./hotCases"),
 	dist: path.resolve(__dirname, `./js/new-incremental/hot-web`)
 });
 
-describeByWalk(__filename, (name, src, dist) => {
-	createHotNewIncrementalCase(postfixName(name), src, dist, "webworker");
+// Run tests rspack-test-tools/tests/hotCases in target webworker
+describeByWalk(v("hot webworker"), (name, src, dist) => {
+	createHotNewIncrementalCase(name, src, dist, "webworker", "jsdom");
 }, {
 	source: path.resolve(__dirname, "./hotCases"),
 	dist: path.resolve(__dirname, `./js/new-incremental/hot-worker`),
 	exclude: [/^css$/]
 });
 
-// Run tests in rspack-test-tools/tests/watchCases
-describeByWalk(__filename, (name, src, dist) => {
+// Run tests rspack-test-tools/tests/watchCases
+describeByWalk(v("watch"), (name, src, dist) => {
 	const tempDir = path.resolve(__dirname, `./js/new-incremental/temp`);
 	createWatchNewIncrementalCase(
-		postfixName(name),
+		name,
 		src,
 		dist,
 		path.join(tempDir, name),
@@ -45,11 +48,55 @@ describeByWalk(__filename, (name, src, dist) => {
 	dist: path.resolve(__dirname, `./js/new-incremental/watch`),
 });
 
-// Run tests in webpack-test/watchCases
-describeByWalk(__filename, (name, src, dist) => {
-	const tempDir = path.resolve(__dirname, `./js/new-incremental/temp`);
+// Run tests webpack-test/hotCases in target async-node
+describeByWalk(v("hot async-node (webpack-test)"), (name, src, dist) => {
+	createHotNewIncrementalCase(name, src, dist, "async-node", "fake");
+}, {
+	source: path.resolve(__dirname, "../../../tests/webpack-test/hotCases"),
+	dist: path.resolve(__dirname, `./js/new-incremental/webpack-test/hot-async-node`),
+	exclude: [
+		/move-between-runtime/,
+	]
+});
+
+// Run tests webpack-test/hotCases in target node
+describeByWalk(v("hot node (webpack-test)"), (name, src, dist) => {
+	createHotNewIncrementalCase(name, src, dist, "node", "fake");
+}, {
+	source: path.resolve(__dirname, "../../../tests/webpack-test/hotCases"),
+	dist: path.resolve(__dirname, `./js/new-incremental/webpack-test/hot-node`),
+	exclude: [
+		/move-between-runtime/,
+	]
+});
+
+// Run tests webpack-test/hotCases in target web
+describeByWalk(v("hot web (webpack-test)"), (name, src, dist) => {
+	createHotNewIncrementalCase(name, src, dist, "web", "fake");
+}, {
+	source: path.resolve(__dirname, "../../../tests/webpack-test/hotCases"),
+	dist: path.resolve(__dirname, `./js/new-incremental/webpack-test/hot-web`),
+	exclude: [
+		/move-between-runtime/,
+	]
+});
+
+// Run tests webpack-test/hotCases in target webworker
+describeByWalk(v("hot webworker (webpack-test)"), (name, src, dist) => {
+	createHotNewIncrementalCase(name, src, dist, "webworker", "fake");
+}, {
+	source: path.resolve(__dirname, "../../../tests/webpack-test/hotCases"),
+	dist: path.resolve(__dirname, `./js/new-incremental/webpack-test/hot-webworker`),
+	exclude: [
+		/move-between-runtime/,
+	]
+});
+
+// Run tests webpack-test/watchCases
+describeByWalk(v("watch (webpack-test)"), (name, src, dist) => {
+	const tempDir = path.resolve(__dirname, `./js/new-incremental/webpack-test/temp`);
 	createWatchNewIncrementalCase(
-		postfixName(name),
+		name,
 		src,
 		dist,
 		path.join(tempDir, name),
@@ -57,11 +104,11 @@ describeByWalk(__filename, (name, src, dist) => {
 }, {
 	source: path.resolve(__dirname, "../../../tests/webpack-test/watchCases"),
 	dist: path.resolve(__dirname, `./js/new-incremental/webpack-test/watch`),
-  exclude: [
-    /module-concatenation-plugin/,
-    /missing-module/,
-    /caching-inner-source/,
-    /production/,
-    /warnings-contribute-to-hash/,
-  ]
+	exclude: [
+		/module-concatenation-plugin/,
+		/missing-module/,
+		/caching-inner-source/,
+		/production/,
+		/warnings-contribute-to-hash/,
+	]
 });
diff --git a/tests/webpack-test/hotCases/child-compiler/issue-9706/report-child-assets-loader.js b/tests/webpack-test/hotCases/child-compiler/issue-9706/report-child-assets-loader.js
index 47bfc3a664c..86c30ed2d84 100644
--- a/tests/webpack-test/hotCases/child-compiler/issue-9706/report-child-assets-loader.js
+++ b/tests/webpack-test/hotCases/child-compiler/issue-9706/report-child-assets-loader.js
@@ -1,5 +1,5 @@
 const {
-	SingleEntryPlugin,
+	EntryPlugin: SingleEntryPlugin,
 	node: { NodeTemplatePlugin }
 } = require("@rspack/core");
 
diff --git a/tests/webpack-test/hotCases/child-compiler/issue-9706/test.filter.js b/tests/webpack-test/hotCases/child-compiler/issue-9706/test.filter.js
deleted file mode 100644
index ebef3d82732..00000000000
--- a/tests/webpack-test/hotCases/child-compiler/issue-9706/test.filter.js
+++ /dev/null
@@ -1,2 +0,0 @@
-
-module.exports = () => {return false}
diff --git a/tests/webpack-test/hotCases/chunks/accept-system-import-webpackhot/test.filter.js b/tests/webpack-test/hotCases/chunks/accept-system-import-webpackhot/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/chunks/accept-system-import-webpackhot/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/chunks/accept-system-import/test.filter.js b/tests/webpack-test/hotCases/chunks/accept-system-import/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/chunks/accept-system-import/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/chunks/dynamic-system-import/test.filter.js b/tests/webpack-test/hotCases/chunks/dynamic-system-import/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/chunks/dynamic-system-import/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/chunks/system-import/test.filter.js b/tests/webpack-test/hotCases/chunks/system-import/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/chunks/system-import/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/code-generation/this-in-accept-webpackhot/test.filter.js b/tests/webpack-test/hotCases/code-generation/this-in-accept-webpackhot/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/code-generation/this-in-accept-webpackhot/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/code-generation/this-in-accept/test.filter.js b/tests/webpack-test/hotCases/code-generation/this-in-accept/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/code-generation/this-in-accept/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/concat/reload-compat-flag/test.filter.js b/tests/webpack-test/hotCases/concat/reload-compat-flag/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/concat/reload-compat-flag/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/concat/reload-external/test.filter.js b/tests/webpack-test/hotCases/concat/reload-external/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/concat/reload-external/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/determinism/issue-10174/test.filter.js b/tests/webpack-test/hotCases/determinism/issue-10174/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/determinism/issue-10174/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/disposing/remove-chunk-with-shared-in-other-runtime/test.filter.js b/tests/webpack-test/hotCases/disposing/remove-chunk-with-shared-in-other-runtime/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/disposing/remove-chunk-with-shared-in-other-runtime/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/disposing/remove-chunk-with-shared/test.filter.js b/tests/webpack-test/hotCases/disposing/remove-chunk-with-shared/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/disposing/remove-chunk-with-shared/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/errors/decline-webpackhot/test.filter.js b/tests/webpack-test/hotCases/errors/decline-webpackhot/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/errors/decline-webpackhot/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/errors/decline/test.filter.js b/tests/webpack-test/hotCases/errors/decline/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/errors/decline/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/errors/events/test.filter.js b/tests/webpack-test/hotCases/errors/events/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/errors/events/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/errors/self-decline/test.filter.js b/tests/webpack-test/hotCases/errors/self-decline/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/errors/self-decline/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/errors/unaccepted-ignored/test.filter.js b/tests/webpack-test/hotCases/errors/unaccepted-ignored/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/errors/unaccepted-ignored/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/errors/unaccepted/test.filter.js b/tests/webpack-test/hotCases/errors/unaccepted/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/errors/unaccepted/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/esm-dependency-import/import-meta-webpack-hot/node_modules/dep1/exports.js b/tests/webpack-test/hotCases/esm-dependency-import/import-meta-webpack-hot/node_modules/dep1/exports.js
new file mode 100644
index 00000000000..5309d4e57ca
--- /dev/null
+++ b/tests/webpack-test/hotCases/esm-dependency-import/import-meta-webpack-hot/node_modules/dep1/exports.js
@@ -0,0 +1 @@
+export {value} from "./file";
diff --git a/tests/webpack-test/hotCases/esm-dependency-import/import-meta-webpack-hot/node_modules/dep1/file.js b/tests/webpack-test/hotCases/esm-dependency-import/import-meta-webpack-hot/node_modules/dep1/file.js
new file mode 100644
index 00000000000..5b2c52ba4bd
--- /dev/null
+++ b/tests/webpack-test/hotCases/esm-dependency-import/import-meta-webpack-hot/node_modules/dep1/file.js
@@ -0,0 +1,3 @@
+export var value = 1;
+---
+export var value = 2;
diff --git a/tests/webpack-test/hotCases/esm-dependency-import/import-meta-webpack-hot/node_modules/dep1/main.js b/tests/webpack-test/hotCases/esm-dependency-import/import-meta-webpack-hot/node_modules/dep1/main.js
new file mode 100644
index 00000000000..d4321ac5bf5
--- /dev/null
+++ b/tests/webpack-test/hotCases/esm-dependency-import/import-meta-webpack-hot/node_modules/dep1/main.js
@@ -0,0 +1,5 @@
+(() => {
+	throw new Error("should not resolve");
+})();
+
+export default 1;
diff --git a/tests/webpack-test/hotCases/esm-dependency-import/import-meta-webpack-hot/node_modules/dep1/package.json b/tests/webpack-test/hotCases/esm-dependency-import/import-meta-webpack-hot/node_modules/dep1/package.json
new file mode 100644
index 00000000000..0f01e7fa4f2
--- /dev/null
+++ b/tests/webpack-test/hotCases/esm-dependency-import/import-meta-webpack-hot/node_modules/dep1/package.json
@@ -0,0 +1,6 @@
+{
+  "exports": {
+    "import": "./exports.js",
+    "default": "./main.js"
+  }
+}
diff --git a/tests/webpack-test/hotCases/esm-dependency-import/import-meta-webpack-hot/test.filter.js b/tests/webpack-test/hotCases/esm-dependency-import/import-meta-webpack-hot/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/esm-dependency-import/import-meta-webpack-hot/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/esm-dependency-import/module-hot/node_modules/dep1/exports.js b/tests/webpack-test/hotCases/esm-dependency-import/module-hot/node_modules/dep1/exports.js
new file mode 100644
index 00000000000..5309d4e57ca
--- /dev/null
+++ b/tests/webpack-test/hotCases/esm-dependency-import/module-hot/node_modules/dep1/exports.js
@@ -0,0 +1 @@
+export {value} from "./file";
diff --git a/tests/webpack-test/hotCases/esm-dependency-import/module-hot/node_modules/dep1/file.js b/tests/webpack-test/hotCases/esm-dependency-import/module-hot/node_modules/dep1/file.js
new file mode 100644
index 00000000000..5b2c52ba4bd
--- /dev/null
+++ b/tests/webpack-test/hotCases/esm-dependency-import/module-hot/node_modules/dep1/file.js
@@ -0,0 +1,3 @@
+export var value = 1;
+---
+export var value = 2;
diff --git a/tests/webpack-test/hotCases/esm-dependency-import/module-hot/node_modules/dep1/main.js b/tests/webpack-test/hotCases/esm-dependency-import/module-hot/node_modules/dep1/main.js
new file mode 100644
index 00000000000..d4321ac5bf5
--- /dev/null
+++ b/tests/webpack-test/hotCases/esm-dependency-import/module-hot/node_modules/dep1/main.js
@@ -0,0 +1,5 @@
+(() => {
+	throw new Error("should not resolve");
+})();
+
+export default 1;
diff --git a/tests/webpack-test/hotCases/esm-dependency-import/module-hot/node_modules/dep1/package.json b/tests/webpack-test/hotCases/esm-dependency-import/module-hot/node_modules/dep1/package.json
new file mode 100644
index 00000000000..0f01e7fa4f2
--- /dev/null
+++ b/tests/webpack-test/hotCases/esm-dependency-import/module-hot/node_modules/dep1/package.json
@@ -0,0 +1,6 @@
+{
+  "exports": {
+    "import": "./exports.js",
+    "default": "./main.js"
+  }
+}
diff --git a/tests/webpack-test/hotCases/esm-dependency-import/module-hot/test.filter.js b/tests/webpack-test/hotCases/esm-dependency-import/module-hot/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/esm-dependency-import/module-hot/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/harmony/auto-import-default/test.filter.js b/tests/webpack-test/hotCases/harmony/auto-import-default/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/harmony/auto-import-default/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/harmony/auto-import-multiple/test.filter.js b/tests/webpack-test/hotCases/harmony/auto-import-multiple/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/harmony/auto-import-multiple/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/harmony/auto-import/test.filter.js b/tests/webpack-test/hotCases/harmony/auto-import/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/harmony/auto-import/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/harmony/auto-reexport/test.filter.js b/tests/webpack-test/hotCases/harmony/auto-reexport/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/harmony/auto-reexport/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/hashing/exports-info-influence/test.filter.js b/tests/webpack-test/hotCases/hashing/exports-info-influence/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/hashing/exports-info-influence/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/hashing/full-hash-main/test.filter.js b/tests/webpack-test/hotCases/hashing/full-hash-main/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/hashing/full-hash-main/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/invalidate/conditional-accept/test.filter.js b/tests/webpack-test/hotCases/invalidate/conditional-accept/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/invalidate/conditional-accept/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/invalidate/during-idle/test.filter.js b/tests/webpack-test/hotCases/invalidate/during-idle/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/invalidate/during-idle/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/numeric-ids/production/test.filter.js b/tests/webpack-test/hotCases/numeric-ids/production/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/numeric-ids/production/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/parsing/hot-api-optional-chaining/test.filter.js b/tests/webpack-test/hotCases/parsing/hot-api-optional-chaining/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/parsing/hot-api-optional-chaining/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/runtime/accept/test.filter.js b/tests/webpack-test/hotCases/runtime/accept/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/runtime/accept/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/runtime/bubble-async/test.filter.js b/tests/webpack-test/hotCases/runtime/bubble-async/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/runtime/bubble-async/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/runtime/bubble-update/test.filter.js b/tests/webpack-test/hotCases/runtime/bubble-update/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/runtime/bubble-update/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/runtime/circular/test.filter.js b/tests/webpack-test/hotCases/runtime/circular/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/runtime/circular/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/runtime/dispose-removed-chunk/test.filter.js b/tests/webpack-test/hotCases/runtime/dispose-removed-chunk/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/runtime/dispose-removed-chunk/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/runtime/dispose-removed-module/test.filter.js b/tests/webpack-test/hotCases/runtime/dispose-removed-module/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/runtime/dispose-removed-module/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/runtime/import-after-download/test.filter.js b/tests/webpack-test/hotCases/runtime/import-after-download/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/runtime/import-after-download/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/runtime/replace-runtime-module/test.filter.js b/tests/webpack-test/hotCases/runtime/replace-runtime-module/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/runtime/replace-runtime-module/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/runtime/require-disposed-module-warning/test.filter.js b/tests/webpack-test/hotCases/runtime/require-disposed-module-warning/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/runtime/require-disposed-module-warning/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/runtime/self-accept-and-dispose/test.filter.js b/tests/webpack-test/hotCases/runtime/self-accept-and-dispose/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/runtime/self-accept-and-dispose/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/runtime/self-accept-factory/test.filter.js b/tests/webpack-test/hotCases/runtime/self-accept-factory/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/runtime/self-accept-factory/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/runtime/update-multiple-modules/test.filter.js b/tests/webpack-test/hotCases/runtime/update-multiple-modules/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/runtime/update-multiple-modules/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/runtime/update-multiple-times/test.filter.js b/tests/webpack-test/hotCases/runtime/update-multiple-times/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/runtime/update-multiple-times/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/sharing/share-plugin/test.filter.js b/tests/webpack-test/hotCases/sharing/share-plugin/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/sharing/share-plugin/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/status/accept/test.filter.js b/tests/webpack-test/hotCases/status/accept/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/status/accept/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/status/check/test.filter.js b/tests/webpack-test/hotCases/status/check/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/status/check/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file
diff --git a/tests/webpack-test/hotCases/unexpected-invalidation/used-exports/test.filter.js b/tests/webpack-test/hotCases/unexpected-invalidation/used-exports/test.filter.js
deleted file mode 100644
index 5c32e24f1f8..00000000000
--- a/tests/webpack-test/hotCases/unexpected-invalidation/used-exports/test.filter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module.exports = () => {return false}
-						
\ No newline at end of file