Merge remote-tracking branch 'upstream/master' into feat/typed-test-c…

…onfig

CHANGELOG.md

@@ -1,5 +1,32 @@
 # rollup changelog
 
+## 3.21.2
+
+_2023-04-30_
+
+### Bug Fixes
+
+- Mark global functions that trigger iterators as impure for now (#4955)
+
+### Pull Requests
+
+- [#4955](https://github.com/rollup/rollup/pull/4955): fix: mark some known globals or their functions as impure (@TrickyPi)
+
+## 3.21.1
+
+_2023-04-29_
+
+### Bug Fixes
+
+- Make sure call arguments are properly deoptimized when a function uses the `arguments` variable (#4965)
+
+### Pull Requests
+
+- [#4957](https://github.com/rollup/rollup/pull/4957): Update dependencies (@lukastaegert)
+- [#4964](https://github.com/rollup/rollup/pull/4964): Fix REPL in dev (@lukastaegert)
+- [#4965](https://github.com/rollup/rollup/pull/4965): Ensure arguments are deoptimized when arguments variable is used (@lukastaegert)
+- [#4967](https://github.com/rollup/rollup/pull/4967): Log REPL output to console (@lukastaegert)
+
 ## 3.21.0
 
 _2023-04-23_

LICENSE.md

@@ -611,7 +611,7 @@ Repository: https://github.com/tapjs/signal-exit.git
 
 > The ISC License
 > 
-> Copyright (c) 2015, Contributors
+> Copyright (c) 2015-2023 Benjamin Coe, Isaac Z. Schlueter, and Contributors
 > 
 > Permission to use, copy, modify, and/or distribute this software
 > for any purpose with or without fee is hereby granted, provided

browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/browser",
-  "version": "3.21.0",
+  "version": "3.21.2",
   "description": "Next-generation ES module bundler browser build",
   "main": "dist/rollup.browser.js",
   "module": "dist/es/rollup.browser.js",

build-plugins/replace-browser-modules.ts

@@ -1,6 +1,6 @@
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import type { Plugin } from 'rollup';
+import type { Plugin } from 'vite';
 
 const resolve = (path: string) => fileURLToPath(new URL(`../${path}`, import.meta.url));
 
@@ -14,10 +14,10 @@ const REPLACED_MODULES = [
 	'resolveId'
 ];
 
-export const resolutions: ReadonlyMap<string, string> = new Map(
+const resolutions: ReadonlyMap<string, string> = new Map(
 	REPLACED_MODULES.flatMap(module => {
 		const originalId = resolve(`src/utils/${module}`);
-		const replacementId = resolve(`browser/src//${module}.ts`);
+		const replacementId = resolve(`browser/src/${module}.ts`);
 		return [
 			[originalId, replacementId],
 			[`${originalId}.ts`, replacementId]
@@ -27,11 +27,18 @@ export const resolutions: ReadonlyMap<string, string> = new Map(
 
 export default function replaceBrowserModules(): Plugin {
 	return {
+		apply: 'serve',
+		enforce: 'pre',
 		name: 'replace-browser-modules',
 		resolveId(source, importer) {
 			if (importer && source[0] === '.') {
 				return resolutions.get(join(dirname(importer), source));
 			}
+		},
+		transformIndexHtml(html) {
+			// Unfortunately, picomatch sneaks as a dedendency into the dev bundle.
+			// This fixes an error.
+			return html.replace('</head>', '<script>window.process={}</script></head>');
 		}
 	};
 }

cli/run/watch-cli.ts

@@ -4,7 +4,7 @@ import process from 'node:process';
 import chokidar from 'chokidar';
 import dateTime from 'date-time';
 import ms from 'pretty-ms';
-import onExit from 'signal-exit';
+import { onExit } from 'signal-exit';
 import * as rollup from '../../src/node-entry';
 import type { MergedRollupOptions, RollupWatcher } from '../../src/rollup/types';
 import { bold, cyan, green, underline } from '../../src/utils/colors';
@@ -146,7 +146,7 @@ export async function watch(command: Record<string, any>): Promise<void> {
 		});
 	}
 
-	async function close(code: number | null): Promise<void> {
+	async function close(code: number | null | undefined): Promise<void> {
 		process.removeListener('uncaughtException', close);
 		// removing a non-existent listener is a no-op
 		process.stdin.removeListener('end', close);

docs/.vitepress/config.ts

@@ -1,7 +1,7 @@
 import alias from '@rollup/plugin-alias';
 import { defineConfig } from 'vitepress';
 import { moduleAliases } from '../../build-plugins/aliases';
-import { resolutions } from '../../build-plugins/replace-browser-modules';
+import replaceBrowserModules from '../../build-plugins/replace-browser-modules';
 import '../declarations.d';
 import { examplesPlugin } from './create-examples';
 import { renderMermaidGraphsPlugin } from './mermaid';
@@ -135,21 +135,7 @@ export default defineConfig({
 	vite: {
 		plugins: [
 			renderMermaidGraphsPlugin(),
-			{
-				apply: 'serve',
-				enforce: 'pre',
-				name: 'replace-browser-modules',
-				resolveId(source, importer) {
-					if (importer && source.startsWith('/@fs')) {
-						return resolutions.get(source.slice(4));
-					}
-				},
-				transformIndexHtml(html) {
-					// Unfortunately, picomatch sneaks as a dedendency into the dev bundle.
-					// This fixes an error.
-					return html.replace('</head>', '<script>window.process={}</script></head>');
-				}
-			},
+			replaceBrowserModules(),
 			{
 				apply: 'build',
 				enforce: 'pre',

docs/repl/stores/options.ts

@@ -136,7 +136,7 @@ export const useOptions = defineStore('options2', () => {
 		name: 'output.amd.define'
 	});
 	const optionOutputAmdForceJsExtensionForImports = getBoolean({
-		available: () => isAmdFormat.value && outputHasMultipleChunks.value,
+		available: isAmdFormat,
 		name: 'output.amd.forceJsExtensionForImports'
 	});
 	const optionOutputAmdId = getString({
@@ -149,7 +149,7 @@ export const useOptions = defineStore('options2', () => {
 		name: 'output.banner'
 	});
 	const optionOutputChunkFileNames = getString({
-		available: outputHasMultipleChunks,
+		available: alwaysTrue,
 		defaultValue: '[name]-[hash].js',
 		name: 'output.chunkFileNames'
 	});
@@ -162,7 +162,7 @@ export const useOptions = defineStore('options2', () => {
 		name: 'output.dynamicImportInCjs'
 	});
 	const optionOutputEntryFileNames = getString({
-		available: outputHasMultipleChunks,
+		available: alwaysTrue,
 		defaultValue: '[name].js',
 		name: 'output.entryFileNames'
 	});
@@ -240,7 +240,7 @@ export const useOptions = defineStore('options2', () => {
 		required: () => true
 	});
 	const optionOutputHoistTransitiveImports = getBoolean({
-		available: outputHasMultipleChunks,
+		available: alwaysTrue,
 		defaultValue: true,
 		name: 'output.hoistTransitiveImports'
 	});
@@ -279,7 +279,7 @@ export const useOptions = defineStore('options2', () => {
 		name: 'output.intro'
 	});
 	const optionOutputMinifyInternalExports = getBoolean({
-		available: outputHasMultipleChunks,
+		available: alwaysTrue,
 		name: 'output.minifyInternalExports'
 	});
 	const optionOutputNoConflict = getBoolean({
@@ -315,7 +315,7 @@ export const useOptions = defineStore('options2', () => {
 		name: 'output.sourcemap'
 	});
 	const optionOutputSanitizeFileName = getBoolean({
-		available: outputHasMultipleChunks,
+		available: alwaysTrue,
 		defaultValue: true,
 		name: 'output.sanitizeFileName'
 	});
@@ -337,7 +337,7 @@ export const useOptions = defineStore('options2', () => {
 		name: 'output.validate'
 	});
 	const optionPreserveEntrySignatures = getSelect({
-		available: outputHasMultipleChunks,
+		available: alwaysTrue,
 		defaultValue: 'exports-only',
 		name: 'preserveEntrySignatures',
 		options: () => ['strict', 'allow-extension', 'exports-only', false]

docs/repl/stores/rollupOutput.ts

@@ -48,7 +48,7 @@ async function bundle({ rollup: { instance }, modules, options, setOutput }: Bun
 	if (import.meta.env.PROD) {
 		console.clear();
 	}
-	console.log(`running Rollup version %c${instance.VERSION}`, 'font-weight: bold');
+	console.group(`running Rollup version ${instance.VERSION}`);
 
 	const modulesById = new Map<string, Module>();
 	for (const module of modules) {
@@ -96,20 +96,29 @@ async function bundle({ rollup: { instance }, modules, options, setOutput }: Bun
 		]
 	};
 
+	console.log('%coptions:', 'font-weight: bold; color: blue', rollupOptions);
 	try {
 		const generated = await (
 			await instance.rollup(rollupOptions)
 		).generate((rollupOptions as { output?: OutputOptions }).output || {});
+		console.log('%coutput:', 'font-weight: bold; color: green', generated.output);
 		setOutput({
 			error: null,
 			externalImports: [...externalImports].sort((a, b) => (a < b ? -1 : 1)),
 			output: generated.output,
 			warnings
 		});
 	} catch (error) {
+		console.log(
+			'%cerror:',
+			'font-weight: bold; color: red',
+			error,
+			JSON.parse(JSON.stringify(error))
+		);
 		setOutput({ error: error as Error, externalImports: [], output: [], warnings });
 		logWarning(error as Error);
 	}
+	console.groupEnd();
 }
 
 export const useRollupOutput = defineStore('rollupOutput', () => {