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

Author: docschina-bot

test/chunking-form/index.js

@@ -5,7 +5,11 @@ const path = require('node:path');
 // @ts-expect-error not included in types
 const { rollup } = require('../../dist/rollup');
 const { compareLogs } = require('../testHelpers');
-const { runTestSuiteWithSamples, assertDirectoriesAreEqual } = require('../testHelpers.js');
+const {
+	runTestSuiteWithSamples,
+	assertDirectoriesAreEqual,
+	shuffle
+} = require('../testHelpers.js');
 
 const FORMATS = ['es', 'cjs', 'amd', 'system'];
 
@@ -25,12 +29,12 @@ runTestSuiteWithSamples(
 					after(config.after);
 				}
 				const logs = [];
+				const warnings = [];
 				after(() => config.logs && compareLogs(logs, config.logs));
 
-				for (const format of config.formats || FORMATS) {
+				for (const format of shuffle(config.formats || FORMATS)) {
 					it('generates ' + format, async () => {
 						process.chdir(directory);
-						const warnings = [];
 						bundle =
 							bundle ||
 							(await rollup({
@@ -62,10 +66,10 @@ runTestSuiteWithSamples(
 							for (const { code } of warnings) {
 								codes.add(code);
 							}
+							const messages = warnings.map(({ message }) => `${message}\n\n`).join('');
+							warnings.length = 0;
 							throw new Error(
-								`Unexpected warnings (${[...codes].join(', ')}): \n${warnings
-									.map(({ message }) => `${message}\n\n`)
-									.join('')}` +
+								`Unexpected warnings (${[...codes].join(', ')}): \n${messages}` +
 									'If you expect warnings, list their codes in config.expectedWarnings'
 							);
 						}

test/form/index.js

@@ -8,8 +8,10 @@ const path = require('node:path');
 const { rollup } = require('../../dist/rollup');
 const {
 	compareLogs,
+	getRandomElement,
 	normaliseOutput,
 	runTestSuiteWithSamples,
+	shuffle,
 	verifyAstPlugin
 } = require('../testHelpers.js');
 
@@ -29,9 +31,9 @@ runTestSuiteWithSamples(
 			() => {
 				let bundle;
 				const logs = [];
+				const warnings = [];
 
 				const runRollupTest = async (inputFile, bundleFile, format, fromCache) => {
-					const warnings = [];
 					if (config.before) {
 						await config.before();
 					}
@@ -83,10 +85,11 @@ runTestSuiteWithSamples(
 						for (const { code } of warnings) {
 							codes.add(code);
 						}
+						const messages = warnings.map(({ message }) => `${message}\n\n`).join('');
+						warnings.length = 0;
 						throw new Error(
-							`Unexpected warnings (${[...codes].join(', ')}): \n${warnings
-								.map(({ message }) => `${message}\n\n`)
-								.join('')}` + 'If you expect warnings, list their codes in config.expectedWarnings'
+							`Unexpected warnings (${[...codes].join(', ')}): \n${messages}` +
+								'If you expect warnings, list their codes in config.expectedWarnings'
 						);
 					}
 				};
@@ -101,7 +104,8 @@ runTestSuiteWithSamples(
 						.then(() => config.logs && compareLogs(logs, config.logs));
 				}
 
-				for (const format of config.formats || FORMATS) {
+				const formats = shuffle(config.formats || FORMATS);
+				for (const format of formats) {
 					after(() => config.logs && compareLogs(logs, config.logs));
 
 					it(`generates ${format}`, () =>
@@ -113,13 +117,13 @@ runTestSuiteWithSamples(
 						));
 				}
 
-				const format = (config.formats || FORMATS)[0];
+				const format = getRandomElement(formats);
 				it(`generates ${format} from the cache`, () =>
 					runRollupTest(
 						`${directory}/_actual/${format}.js`,
 						`${directory}/_expected/${format}.js`,
 						format,
-						false
+						true
 					));
 			}
 		);

test/form/samples/amd-keep-extension/_config.js

@@ -2,6 +2,10 @@ module.exports = defineTest({
 	description: 'keep extension for AMD modules',
 	options: {
 		external: ['./relative', 'abso/lute', './relative.js', 'abso/lute.js'],
-		output: { amd: { forceJsExtensionForImports: true }, interop: 'default' }
+		output: {
+			amd: { forceJsExtensionForImports: true },
+			globals: id => id.split(/[/\\]/).pop().replace('.', '_'),
+			interop: 'default'
+		}
 	}
 });

test/form/samples/amd-keep-extension/_expected/iife.js

@@ -3,4 +3,4 @@
 
 	console.log(relative, absolute, relativeExtension, absoluteExtension);
 
-})(relative, absolute, relativeExtension, absoluteExtension);
+})(relative, lute, relative_js, lute_js);

test/form/samples/amd-keep-extension/_expected/umd.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('./relative'), require('abso/lute'), require('./relative.js'), require('abso/lute.js')) :
 	typeof define === 'function' && define.amd ? define(['./relative.js', 'abso/lute', './relative.js', 'abso/lute.js'], factory) :
-	(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.relative, global.absolute, global.relativeExtension, global.absoluteExtension));
+	(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.relative, global.lute, global.relative_js, global.lute_js));
 })(this, (function (relative, absolute, relativeExtension, absoluteExtension) { 'use strict';
 
 	console.log(relative, absolute, relativeExtension, absoluteExtension);

test/form/samples/arbitrary-module-namespace-identifiers/_config.js

@@ -4,6 +4,9 @@ module.exports = defineTest({
 	expectedWarnings: ['CIRCULAR_DEPENDENCY'],
 	options: {
 		external: ['external'],
-		output: { name: 'bundle' }
+		output: {
+			globals: { external: 'external' },
+			name: 'bundle'
+		}
 	}
 });

test/form/samples/arbitrary-module-namespace-identifiers2/_config.js

@@ -4,6 +4,7 @@ module.exports = defineTest({
 	options: {
 		external: ['external'],
 		output: {
+			globals: { external: 'external' },
 			name: 'myBundle'
 		}
 	}

test/form/samples/dynamic-import-this-arrow/_config.js

@@ -3,9 +3,10 @@ module.exports = defineTest({
 	options: {
 		external: ['input', 'output'],
 		output: {
+			dynamicImportInCjs: false,
 			generatedCode: { arrowFunctions: true },
-			name: 'bundle',
-			dynamicImportInCjs: false
+			globals: { input: 'input', output: 'output' },
+			name: 'bundle'
 		}
 	}
 });

test/form/samples/dynamic-import-this-function/_config.js

@@ -3,9 +3,10 @@ module.exports = defineTest({
 	options: {
 		external: ['input', 'output'],
 		output: {
+			dynamicImportInCjs: false,
 			generatedCode: { arrowFunctions: false },
-			name: 'bundle',
-			dynamicImportInCjs: false
+			globals: { input: 'input', output: 'output' },
+			name: 'bundle'
 		}
 	}
 });

test/form/samples/generated-code-compact/arrow-functions-false/_config.js

@@ -11,6 +11,7 @@ module.exports = defineTest({
 		strictDeprecations: false,
 		output: {
 			compact: true,
+			dynamicImportInCjs: false,
 			generatedCode: { arrowFunctions: false },
 			interop(id) {
 				if (id === 'externalDefault') {
@@ -24,9 +25,9 @@ module.exports = defineTest({
 				}
 				return 'compat';
 			},
+			globals: id => id,
 			name: 'bundle',
 			noConflict: true,
-			dynamicImportInCjs: false,
 			systemNullSetters: false
 		}
 	},