rollup · lukastaegert · Jan 29, 2020 · Jan 21, 2020 · Jan 22, 2020 · Jan 22, 2020
diff --git a/cli/help.md b/cli/help.md
@@ -55,7 +55,6 @@ Basic options:
 --no-treeshake              Disable tree-shaking optimisations
 --no-treeshake.annotations  Ignore pure call annotations
 --no-treeshake.propertyReadSideEffects Ignore property access side-effects
---treeshake.pureExternalModules        Assume side-effect free externals
 
 Examples:
 

diff --git a/cli/run/index.ts b/cli/run/index.ts
@@ -1,7 +1,7 @@
 import { realpathSync } from 'fs';
 import relative from 'require-relative';
-import { WarningHandler } from '../../src/rollup/types';
-import mergeOptions, { GenericConfigObject } from '../../src/utils/mergeOptions';
+import { mergeOptions } from '../../src/utils/mergeOptions';
+import { GenericConfigObject } from '../../src/utils/parseOptions';
 import { getAliasName } from '../../src/utils/relativeId';
 import { handleError } from '../logging';
 import batchWarnings from './batchWarnings';
@@ -16,7 +16,7 @@ export default function runRollup(command: any) {
 		if (command.input) {
 			handleError({
 				code: 'DUPLICATE_IMPORT_OPTIONS',
-				message: 'use --input, or pass input path as argument'
+				message: 'Either use --input, or pass input path as argument'
 			});
 		}
 		inputSource = command._;
@@ -107,14 +107,8 @@ async function execute(
 	} else {
 		for (const config of configs) {
 			const warnings = batchWarnings();
-			const { inputOptions, outputOptions, optionError } = mergeOptions({
-				command,
-				config,
-				defaultOnWarnHandler: warnings.add
-			});
-			if (optionError) {
-				(inputOptions.onwarn as WarningHandler)({ code: 'UNKNOWN_OPTION', message: optionError });
-			}
+			const { inputOptions, outputOptions } = mergeOptions(config, command,
+				warnings.add);
 			if (command.stdin !== false) {
 				inputOptions.plugins!.push(stdinPlugin());
 			}

diff --git a/cli/run/loadConfigFile.ts b/cli/run/loadConfigFile.ts
@@ -2,7 +2,7 @@ import path from 'path';
 import tc from 'turbocolor';
 import * as rollup from '../../src/node-entry';
 import { RollupBuild, RollupOutput } from '../../src/rollup/types';
-import { GenericConfigObject } from '../../src/utils/mergeOptions';
+import { GenericConfigObject } from '../../src/utils/parseOptions';
 import relativeId from '../../src/utils/relativeId';
 import { handleError, stderr } from '../logging';
 import batchWarnings from './batchWarnings';
@@ -73,4 +73,4 @@ export default function loadConfigFile(
 					return Array.isArray(configs) ? configs : [configs];
 				});
 		});
-}
+}
diff --git a/cli/run/watch.ts b/cli/run/watch.ts
@@ -4,12 +4,9 @@ import ms from 'pretty-ms';
 import onExit from 'signal-exit';
 import tc from 'turbocolor';
 import * as rollup from '../../src/node-entry';
-import {
-	RollupWatcher,
-	RollupWatchOptions,
-	WarningHandler
-} from '../../src/rollup/types';
-import mergeOptions, { GenericConfigObject } from '../../src/utils/mergeOptions';
+import { RollupWatcher, RollupWatchOptions } from '../../src/rollup/types';
+import { mergeOptions } from '../../src/utils/mergeOptions';
+import { GenericConfigObject } from '../../src/utils/parseOptions';
 import relativeId from '../../src/utils/relativeId';
 import { handleError, stderr } from '../logging';
 import batchWarnings from './batchWarnings';
@@ -26,35 +23,20 @@ export default function watch(
 	const isTTY = Boolean(process.stderr.isTTY);
 	const warnings = batchWarnings();
 	const initialConfigs = processConfigs(configs);
-	const clearScreen = initialConfigs.every(
-		config => config.watch!.clearScreen !== false
-	);
+	const clearScreen = initialConfigs.every(config => config.watch!.clearScreen !== false);
 
 	const resetScreen = getResetScreen(isTTY && clearScreen);
 	let watcher: RollupWatcher;
 	let configWatcher: RollupWatcher;
 
 	function processConfigs(configs: GenericConfigObject[]): RollupWatchOptions[] {
 		return configs.map(options => {
-			const merged = mergeOptions({
-				command,
-				config: options,
-				defaultOnWarnHandler: warnings.add
-			});
-
+			const { inputOptions, outputOptions } = mergeOptions(options, command, warnings.add);
 			const result: RollupWatchOptions = {
-				...merged.inputOptions,
-				output: merged.outputOptions
+				...inputOptions,
+				output: outputOptions
 			};
-
 			if (!result.watch) result.watch = {};
-
-			if (merged.optionError)
-				(merged.inputOptions.onwarn as WarningHandler)({
-					code: 'UNKNOWN_OPTION',
-					message: merged.optionError
-				});
-
 			return result;
 		});
 	}
@@ -87,9 +69,7 @@ export default function watch(
 						}
 						stderr(
 							tc.cyan(
-								`bundles ${tc.bold(input)} → ${tc.bold(
-									event.output.map(relativeId).join(', ')
-								)}...`
+								`bundles ${tc.bold(input)} → ${tc.bold(event.output.map(relativeId).join(', '))}...`
 							)
 						);
 					}
@@ -100,9 +80,9 @@ export default function watch(
 					if (!silent)
 						stderr(
 							tc.green(
-								`created ${tc.bold(
-									event.output.map(relativeId).join(', ')
-								)} in ${tc.bold(ms(event.duration))}`
+								`created ${tc.bold(event.output.map(relativeId).join(', '))} in ${tc.bold(
+									ms(event.duration)
+								)}`
 							)
 						);
 					if (event.result && event.result.getTimings) {

diff --git a/docs/05-plugin-development.md b/docs/05-plugin-development.md
@@ -397,22 +397,9 @@ Called only at the end of `bundle.write()` once all files have been written. Sim
 
 ☢️ These hooks have been deprecated and may be removed in a future Rollup version.
 
-- `ongenerate` - _**Use [`generateBundle`](guide/en/#generatebundle)**_ - Function hook
-called when `bundle.generate()` is being executed.
-
-- `onwrite` - _**Use [`generateBundle`](guide/en/#generatebundle)**_ - Function hook
-called when `bundle.write()` is being executed, after the file has been written
-to disk.
-
 - `resolveAssetUrl` - _**Use [`resolveFileUrl`](guide/en/#resolvefileurl)**_ - Function hook that allows to customize the generated code for asset URLs.
 
-- `transformBundle` – _**Use [`renderChunk`](guide/en/#renderchunk)**_ - A `( source, { format } ) =>
-code` or `( source, { format } ) => { code, map }` bundle transformer function.
-
-- `transformChunk` – _**Use [`renderChunk`](guide/en/#renderchunk)**_ - A `( source, outputOptions,
-chunk ) => code | { code, map}` chunk transformer function.
-
-More properties may be supported in future, as and when they prove necessary.
+More properties may be supported in the future, as and when they prove necessary.
 
 ### Plugin Context
 

diff --git a/src/Chunk.ts b/src/Chunk.ts
@@ -733,7 +733,6 @@ export default class Chunk {
 		const chunkSourcemapChain: DecodedSourceMapOrMissing[] = [];
 
 		return renderChunk({
-			chunk: this,
 			code: prevCode,
 			options,
 			outputPluginDriver,

diff --git a/src/Graph.ts b/src/Graph.ts
@@ -30,17 +30,6 @@ import { PluginDriver } from './utils/PluginDriver';
 import relativeId from './utils/relativeId';
 import { timeEnd, timeStart } from './utils/timers';
 
-function makeOnwarn() {
-	const warned = Object.create(null);
-
-	return (warning: any) => {
-		const str = warning.toString();
-		if (str in warned) return;
-		console.error(str);
-		warned[str] = true;
-	};
-}
-
 function normalizeEntryModules(
 	entryModules: string | string[] | Record<string, string>
 ): UnresolvedModule[] {
@@ -84,7 +73,7 @@ export default class Graph {
 	private strictDeprecations: boolean;
 
 	constructor(options: InputOptions, watcher: RollupWatcher | null) {
-		this.onwarn = (options.onwarn as WarningHandler) || makeOnwarn();
+		this.onwarn = options.onwarn as WarningHandler;
 		this.deoptimizationTracker = new PathTracker();
 		this.cachedModules = new Map();
 		if (options.cache) {
@@ -126,7 +115,7 @@ export default class Graph {
 			if (typeof this.treeshakingOptions.pureExternalModules !== 'undefined') {
 				this.warnDeprecation(
 					`The "treeshake.pureExternalModules" option is deprecated. The "treeshake.moduleSideEffects" option should be used instead. "treeshake.pureExternalModules: true" is equivalent to "treeshake.moduleSideEffects: 'no-external'"`,
-					false
+					true
 				);
 			}
 		}
@@ -142,8 +131,7 @@ export default class Graph {
 			this,
 			options.plugins!,
 			this.pluginCache,
-			options.preserveSymlinks === true,
-			watcher
+			options.preserveSymlinks === true
 		);
 
 		if (watcher) {
@@ -240,13 +228,6 @@ export default class Graph {
 			// Phase 3 – marking. We include all statements that should be included
 			timeStart('mark included statements', 2);
 
-			if (inlineDynamicImports) {
-				if (entryModules.length > 1) {
-					throw new Error(
-						'Internal Error: can only inline dynamic imports for single-file builds.'
-					);
-				}
-			}
 			for (const module of entryModules) {
 				module.includeAllExports();
 			}

diff --git a/src/ast/nodes/MetaProperty.ts b/src/ast/nodes/MetaProperty.ts
@@ -80,14 +80,14 @@ export default class MetaProperty extends NodeBase {
 			} else if (metaProperty.startsWith(ASSET_PREFIX)) {
 				this.context.warnDeprecation(
 					`Using the "${ASSET_PREFIX}" prefix to reference files is deprecated. Use the "${FILE_PREFIX}" prefix instead.`,
-					false
+					true
 				);
 				assetReferenceId = metaProperty.substr(ASSET_PREFIX.length);
 				fileName = outputPluginDriver.getFileName(assetReferenceId);
 			} else {
 				this.context.warnDeprecation(
 					`Using the "${CHUNK_PREFIX}" prefix to reference files is deprecated. Use the "${FILE_PREFIX}" prefix instead.`,
-					false
+					true
 				);
 				chunkReferenceId = metaProperty.substr(CHUNK_PREFIX.length);
 				fileName = outputPluginDriver.getFileName(chunkReferenceId);