Merge branch 'master' of https://github.com/rollup/rollup into sync-7759f568

Author: docschina-bot

test/cli/index.js

@@ -59,18 +59,18 @@ async function runTest(config) {
 			killSignal: 'SIGKILL'
 		};
 		const childProcess = config.spawnArgs
-			? spawn('node', [rollupBinary, ...config.spawnArgs], spawnOptions)
+			? spawn('node', [config.spawnScript || rollupBinary, ...config.spawnArgs], spawnOptions)
 			: exec(config.command.replace(/(^| )rollup($| )/g, ` node ${rollupBinary} `), spawnOptions);
 
 		childProcess.stdout.on('data', data => {
-			stdout += data;
+			stdout += String(data);
 		});
 
 		childProcess.stderr.on('data', async data => {
-			stderr += data;
+			stderr += String(data);
 			if (config.abortOnStderr) {
 				try {
-					if (await config.abortOnStderr(data)) {
+					if (await config.abortOnStderr(String(data))) {
 						childProcess.kill('SIGTERM');
 					}
 				} catch (error) {

test/cli/samples/allow-output-prefix/_config.js

@@ -1,4 +1,4 @@
 module.exports = defineTest({
 	description: 'allows output options to be prefixed with "output."',
-	command: 'rollup main.js --output.format es --output.footer "console.log(\'Rollup!\')"'
+	spawnArgs: ['main.js', '--output.format', 'es', '--output.footer', "console.log('Rollup!')"]
 });

test/cli/samples/amd/_config.js

@@ -1,4 +1,4 @@
 module.exports = defineTest({
 	description: 'sets AMD module ID and define function',
-	command: 'rollup -i main.js -f amd --amd.id foo --amd.define defn'
+	spawnArgs: ['-i', 'main.js', '-f', 'amd', '--amd.id', 'foo', '--amd.define', 'defn']
 });

test/cli/samples/banner-intro-outro-footer/_config.js

@@ -1,5 +1,18 @@
 module.exports = defineTest({
 	description: 'adds banner/intro/outro/footer',
-	command:
-		'rollup -i main.js -f iife --indent --banner "// banner" --intro "// intro" --outro "// outro" --footer "// footer"'
+	spawnArgs: [
+		'-i',
+		'main.js',
+		'-f',
+		'iife',
+		'--indent',
+		'--banner',
+		'// banner',
+		'--intro',
+		'// intro',
+		'--outro',
+		'// outro',
+		'--footer',
+		'// footer'
+	]
 });

test/cli/samples/code-splitting-named-default-inputs/_config.js

@@ -2,8 +2,15 @@ const assert = require('node:assert');
 
 module.exports = defineTest({
 	description: 'allows defining names via CLI',
-	command:
-		'rollup entry1=main1.js "Entry 2"="main 2.js" "main3.js" --entryFileNames [name]-[hash].js -f es',
+	spawnArgs: [
+		'entry1=main1.js',
+		'Entry 2=main 2.js',
+		'main3.js',
+		'--entryFileNames',
+		'[name]-[hash].js',
+		'-f',
+		'es'
+	],
 	result(code) {
 		assert.equal(
 			code,

test/cli/samples/code-splitting-named-inputs/_config.js

@@ -2,8 +2,18 @@ const assert = require('node:assert');
 
 module.exports = defineTest({
 	description: 'allows defining names via CLI',
-	command:
-		'rollup --entryFileNames [name]-[hash].js --input entry1=main1.js -i "Entry 2"="main 2.js" -i "main3.js"  -f es',
+	spawnArgs: [
+		'--entryFileNames',
+		'[name]-[hash].js',
+		'--input',
+		'entry1=main1.js',
+		'-i',
+		'Entry 2=main 2.js',
+		'-i',
+		'main3.js',
+		'-f',
+		'es'
+	],
 	result(code) {
 		assert.equal(
 			code,

test/cli/samples/config-async-function/_config.js

@@ -1,4 +1,4 @@
 module.exports = defineTest({
 	description: 'supports using an async function as config',
-	command: 'rollup -c'
+	spawnArgs: ['-c']
 });

test/cli/samples/config-cjs-dirname/_config.js

@@ -1,4 +1,4 @@
 module.exports = defineTest({
 	description: 'does not transpile cjs configs and provides correct __filename',
-	command: 'rollup -c'
+	spawnArgs: ['-c']
 });

test/cli/samples/config-cwd-case-insensitive-es6/_config.js

@@ -5,7 +5,7 @@ function toggleCase(s) {
 module.exports = defineTest({
 	onlyWindows: true,
 	description: "can load ES6 config with cwd that doesn't match realpath",
-	command: 'rollup -c',
+	spawnArgs: ['-c'],
 	cwd: __dirname.replace(/^[a-z]:\\/i, toggleCase),
 	execute: true
 });

test/cli/samples/config-cwd-case-insensitive/_config.js

@@ -5,7 +5,7 @@ function toggleCase(s) {
 module.exports = defineTest({
 	onlyWindows: true,
 	description: "can load config with cwd that doesn't match realpath",
-	command: 'rollup -c',
+	spawnArgs: ['-c'],
 	cwd: __dirname.replace(/^[a-z]:\\/i, toggleCase),
 	execute: true
 });