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
 });

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

@@ -1,5 +1,5 @@
 module.exports = defineTest({
 	description: 'uses cjs config file which return config wrapped by defineConfig',
-	command: 'rollup --config rollup.config.js',
+	spawnArgs: ['--config', 'rollup.config.js'],
 	execute: true
 });

test/cli/samples/config-defineConfig-mjs/_config.js

@@ -4,6 +4,6 @@ const { hasEsBuild } = require('../../../testHelpers');
 module.exports = defineTest({
 	skip: !hasEsBuild,
 	description: 'uses mjs config file which return config wrapped by defineConfig',
-	command: 'rollup --config rollup.config.mjs',
+	spawnArgs: ['--config', 'rollup.config.mjs'],
 	execute: true
 });

test/cli/samples/config-env-multiple/_config.js

@@ -1,6 +1,13 @@
 module.exports = defineTest({
 	description: 'passes environment variables to config file via multiple --environment values',
-	command:
-		'rollup --config --environment PRODUCTION,FOO:bar --environment SECOND,KEY:value --environment FOO:foo',
+	spawnArgs: [
+		'--config',
+		'--environment',
+		'PRODUCTION,FOO:bar',
+		'--environment',
+		'SECOND,KEY:value',
+		'--environment',
+		'FOO:foo'
+	],
 	execute: true
 });

test/cli/samples/config-env/_config.js

@@ -1,5 +1,5 @@
 module.exports = defineTest({
 	description: 'passes environment variables to config file',
-	command: 'rollup --config --environment PRODUCTION,FOO:bar,HOST:http://localhost:4000',
+	spawnArgs: ['--config', '--environment', 'PRODUCTION,FOO:bar,HOST:http://localhost:4000'],
 	execute: true
 });

test/cli/samples/config-es6/_config.js

@@ -1,5 +1,5 @@
 module.exports = defineTest({
 	description: 'uses ES6 module config file',
-	command: 'rollup --config rollup.config.js --bundleConfigAsCjs',
+	spawnArgs: ['--config', 'rollup.config.js', '--bundleConfigAsCjs'],
 	execute: true
 });

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

@@ -1,4 +1,4 @@
 module.exports = defineTest({
 	description: 'external option gets passed from config',
-	command: 'rollup -c -e assert,external-module'
+	spawnArgs: ['-c', '-e', 'assert,external-module']
 });

test/cli/samples/config-external/_config.js

@@ -1,4 +1,4 @@
 module.exports = defineTest({
 	description: 'external option gets passed from config',
-	command: 'rollup -c'
+	spawnArgs: ['-c']
 });

test/cli/samples/config-function-modify-command/_config.js

@@ -1,5 +1,5 @@
 module.exports = defineTest({
 	description: 'allows cleaning up and modifying the command args in the config file',
-	command: 'rollup --config rollup.config.mjs --some-option="foo" --another-option=42',
+	spawnArgs: ['--config', 'rollup.config.mjs', '--some-option="foo"', '--another-option=42'],
 	execute: true
 });

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

@@ -1,6 +1,6 @@
 module.exports = defineTest({
 	description:
 		'if the config file returns a function then this will be called with the command args',
-	command: 'rollup --config rollup.config.mjs --silent',
+	spawnArgs: ['--config', 'rollup.config.mjs', '--silent'],
 	execute: true
 });

test/cli/samples/config-import-attributes-key/_config.js

@@ -1,6 +1,12 @@
 module.exports = defineTest({
 	description: 'supports modify the import attributes key in the config file',
-	command:
-		'rollup --config rollup.config.ts --configPlugin typescript --configImportAttributesKey with',
+	spawnArgs: [
+		'--config',
+		'rollup.config.ts',
+		'--configPlugin',
+		'typescript',
+		'--configImportAttributesKey',
+		'with'
+	],
 	minNodeVersion: 22
 });

test/cli/samples/config-import-meta/_config.js

@@ -1,4 +1,4 @@
 module.exports = defineTest({
 	description: 'uses correct import.meta.{url,filename,dirname} in config files',
-	command: 'rollup -c --bundleConfigAsCjs'
+	spawnArgs: ['-c', '--bundleConfigAsCjs']
 });

test/cli/samples/config-json/_config.js

@@ -1,5 +1,5 @@
 module.exports = defineTest({
 	description: 'allows config file to import json',
-	command: 'rollup --config rollup.config.js --bundleConfigAsCjs',
+	spawnArgs: ['--config', 'rollup.config.js', '--bundleConfigAsCjs'],
 	execute: true
 });

test/cli/samples/config-missing-export/_config.js

@@ -2,7 +2,7 @@ const assert = require('node:assert');
 
 module.exports = defineTest({
 	description: 'throws error if config does not export an object',
-	command: 'rollup -c',
+	spawnArgs: ['-c'],
 	error(error) {
 		assert.ok(/Config file must export an options object/.test(error.message));
 	}

test/cli/samples/config-mjs-plugins/_config.js

@@ -1,4 +1,4 @@
 module.exports = defineTest({
 	description: 'supports native esm as well as CJS plugins when using .mjs in Node 13+',
-	command: 'rollup -c'
+	spawnArgs: ['-c']
 });

test/cli/samples/config-mjs/_config.js

@@ -1,5 +1,5 @@
 module.exports = defineTest({
 	description: 'uses config file (.mjs)',
-	command: 'rollup --config rollup.config.mjs',
+	spawnArgs: ['--config', 'rollup.config.mjs'],
 	execute: true
 });

test/cli/samples/config-multiple-getfilename/_config.js

@@ -1,4 +1,4 @@
 module.exports = defineTest({
 	description: 'returns correct file names for multiple outputs (#3467)',
-	command: 'rollup -c'
+	spawnArgs: ['-c']
 });

test/cli/samples/config-multiple-source-maps/_config.js

@@ -1,4 +1,4 @@
 module.exports = defineTest({
 	description: 'correctly generates sourcemaps for multiple outputs',
-	command: 'rollup -c --bundleConfigAsCjs'
+	spawnArgs: ['-c', '--bundleConfigAsCjs']
 });

test/cli/samples/config-no-output/_config.js

@@ -3,7 +3,7 @@ const { readFileSync, unlinkSync } = require('node:fs');
 
 module.exports = defineTest({
 	description: 'uses -o from CLI',
-	command: 'rollup -c -o output.js',
+	spawnArgs: ['-c', '-o', 'output.js'],
 	test() {
 		const output = readFileSync('output.js', 'utf8');
 		assert.equal(output.trim(), 'console.log(42);');

test/cli/samples/config-override/_config.js

@@ -1,5 +1,5 @@
 module.exports = defineTest({
 	description: 'overrides config file with command line arguments',
-	command: 'rollup -c -i main.js -f cjs',
+	spawnArgs: ['-c', '-i', 'main.js', '-f', 'cjs'],
 	execute: true
 });

test/cli/samples/config-plugin-entry/_config.js

@@ -1,4 +1,4 @@
 module.exports = defineTest({
 	description: 'allows plugins to set options.entry',
-	command: 'rollup -c --bundleConfigAsCjs'
+	spawnArgs: ['-c', '--bundleConfigAsCjs']
 });

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

@@ -1,5 +1,5 @@
 module.exports = defineTest({
 	description: 'uses cjs config file which returns a Promise',
-	command: 'rollup --config rollup.config.cjs',
+	spawnArgs: ['--config', 'rollup.config.cjs'],
 	execute: true
 });

test/cli/samples/config-promise-mjs/_config.js

@@ -1,5 +1,5 @@
 module.exports = defineTest({
 	description: 'uses mjs config file which returns a Promise',
-	command: 'rollup --config rollup.config.mjs',
+	spawnArgs: ['--config', 'rollup.config.mjs'],
 	execute: true
 });

test/cli/samples/config-promise/_config.js

@@ -1,5 +1,5 @@
 module.exports = defineTest({
 	description: 'uses config file which returns a Promise',
-	command: 'rollup --config rollup.config.mjs',
+	spawnArgs: ['--config', 'rollup.config.mjs'],
 	execute: true
 });

test/cli/samples/config-true/_config.js

@@ -1,5 +1,5 @@
 module.exports = defineTest({
 	description: 'defaults to rollup.config.js',
-	command: 'rollup -c --bundleConfigAsCjs',
+	spawnArgs: ['-c', '--bundleConfigAsCjs'],
 	execute: true
 });

test/cli/samples/config-ts/_config.js

@@ -1,5 +1,5 @@
 module.exports = defineTest({
 	description: 'supports loading TypeScript config files via plugin option',
-	command: 'rollup --config rollup.config.ts --configPlugin typescript',
+	spawnArgs: ['--config', 'rollup.config.ts', '--configPlugin', 'typescript'],
 	execute: true
 });

test/cli/samples/config-warnings/_config.js

@@ -2,7 +2,7 @@ const { assertIncludes } = require('../../../testHelpers.js');
 
 module.exports = defineTest({
 	description: 'displays warnings when a config is loaded',
-	command: 'rollup -c --bundleConfigAsCjs',
+	spawnArgs: ['-c', '--bundleConfigAsCjs'],
 	stderr: stderr =>
 		assertIncludes(
 			stderr,

test/cli/samples/config/_config.js

@@ -1,5 +1,5 @@
 module.exports = defineTest({
 	description: 'uses config file',
-	command: 'rollup --config rollup.config.js',
+	spawnArgs: ['--config', 'rollup.config.js'],
 	execute: true
 });

test/cli/samples/context/_config.js

@@ -1,4 +1,4 @@
 module.exports = defineTest({
 	description: 'Uses --context to set `this` value',
-	command: 'rollup main.js --format commonjs --context window'
+	spawnArgs: ['main.js', '--format', 'commonjs', '--context', 'window']
 });

test/cli/samples/custom-frame-with-pos/_config.js

@@ -2,7 +2,7 @@ const { assertIncludes } = require('../../../testHelpers.js');
 
 module.exports = defineTest({
 	description: 'custom (plugin generated) code frame taking priority over pos generated one',
-	command: 'rollup -c',
+	spawnArgs: ['-c'],
 	error: () => true,
 	stderr: stderr =>
 		assertIncludes(

test/cli/samples/custom-frame/_config.js

@@ -2,7 +2,7 @@ const { assertIncludes } = require('../../../testHelpers.js');
 
 module.exports = defineTest({
 	description: 'errors with plugin generated code frames also contain stack',
-	command: 'rollup -c',
+	spawnArgs: ['-c'],
 	error: () => true,
 	stderr: stderr => {
 		assertIncludes(

test/cli/samples/deconflict-entry-point-in-subdir/_config.js

@@ -1,4 +1,4 @@
 module.exports = defineTest({
 	description: 'deconflict entry points with the same name in different directories',
-	command: 'rollup --input main.js --input sub/main.js --format es --dir _actual'
+	spawnArgs: ['--input', 'main.js', '--input', 'sub/main.js', '--format', 'es', '--dir', '_actual']
 });

test/cli/samples/duplicate-import-options/_config.js

@@ -2,7 +2,7 @@ const { assertIncludes } = require('../../../testHelpers.js');
 
 module.exports = defineTest({
 	description: 'throws if different types of entries are combined',
-	command: 'rollup main.js --format es --input main.js',
+	spawnArgs: ['main.js', '--format', 'es', '--input', 'main.js'],
 	error: () => true,
 	stderr(stderr) {
 		assertIncludes(stderr, '[!] Either use --input, or pass input path as argument');

test/cli/samples/emit-file-multiple-dirs/_config.js

@@ -1,4 +1,4 @@
 module.exports = defineTest({
 	description: 'writes files emitted by plugins in different output dirs',
-	command: 'rollup -c'
+	spawnArgs: ['-c']
 });

test/cli/samples/empty-chunk-multiple/_config.js

@@ -2,7 +2,7 @@ const { assertIncludes } = require('../../../testHelpers.js');
 
 module.exports = defineTest({
 	description: 'shows warning when multiple chunks empty',
-	command: 'rollup -c',
+	spawnArgs: ['-c'],
 	error: () => true,
 	stderr: stderr => assertIncludes(stderr, '(!) Generated empty chunks\n"main1" and "main2"')
 });

test/cli/samples/empty-chunk/_config.js

@@ -2,7 +2,7 @@ const { assertIncludes } = require('../../../testHelpers.js');
 
 module.exports = defineTest({
 	description: 'shows warning when chunk empty',
-	command: 'rollup -c',
+	spawnArgs: ['-c'],
 	error: () => true,
 	stderr: stderr => assertIncludes(stderr, '(!) Generated an empty chunk\n"main"')
 });