Ensure --forceExit works without warning (#5245)

Ensure force-exit actually works
rollup · Nov 11, 2023 · ae249cb · ae249cb
1 parent ef3be44
commit ae249cb
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/src/utils/options/mergeOptions.ts b/src/utils/options/mergeOptions.ts
@@ -79,6 +79,7 @@ export async function mergeOptions(
 			'environment',
 			'failAfterWarnings',
 			'filterLogs',
+			'forceExit',
 			'plugin',
 			'silent',
 			'stdin',

diff --git a/test/cli/samples/force-exit/_config.js b/test/cli/samples/force-exit/_config.js
@@ -1,5 +1,4 @@
 module.exports = defineTest({
 	description: 'force exits even with open handles',
-	command: 'rollup --config rollup.config.js --forceExit',
-	execute: true
+	command: 'rollup --config rollup.config.js --forceExit'
 });
diff --git a/test/cli/samples/force-exit/_expected.js b/test/cli/samples/force-exit/_expected.js
@@ -0,0 +1,2 @@
+console.log('ok');
+
diff --git a/test/cli/samples/force-exit/main.js b/test/cli/samples/force-exit/main.js
@@ -0,0 +1 @@
+console.log('ok');
diff --git a/test/cli/samples/force-exit/rollup.config.js b/test/cli/samples/force-exit/rollup.config.js
@@ -1,7 +1,7 @@
 module.exports = {
 	input: 'main.js',
-	output: {
-		format: 'cjs'
+	onwarn(warning) {
+		throw new Error(`Unexpected warning: ${warning.message}`);
 	},
 	plugins: [
 		{

diff --git a/test/misc/optionList.js b/test/misc/optionList.js