Wire up --context CLI flag (#3134)

Fixes #3121
rollup · Sep 26, 2019 · 4b69c09 · 4b69c09
1 parent a261cad
commit 4b69c09
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/src/utils/mergeOptions.ts b/src/utils/mergeOptions.ts
@@ -213,7 +213,7 @@ function getInputOptions(
 		acornInjectPlugins: config.acornInjectPlugins as any,
 		cache: getOption('cache'),
 		chunkGroupingSize: getOption('chunkGroupingSize', 5000),
-		context: config.context as any,
+		context: getOption('context'),
 		experimentalCacheExpiry: getOption('experimentalCacheExpiry', 10),
 		experimentalOptimizeChunks: getOption('experimentalOptimizeChunks'),
 		experimentalTopLevelAwait: getOption('experimentalTopLevelAwait'),

diff --git a/test/cli/samples/context/_config.js b/test/cli/samples/context/_config.js
@@ -0,0 +1,4 @@
+module.exports = {
+	description: 'Uses --context to set `this` value',
+	command: 'rollup main.js --format commonjs --context window'
+};
diff --git a/test/cli/samples/context/_expected.js b/test/cli/samples/context/_expected.js
@@ -0,0 +1,6 @@
+'use strict';
+
+console.log(window);
+var main = 42;
+
+module.exports = main;
diff --git a/test/cli/samples/context/main.js b/test/cli/samples/context/main.js
@@ -0,0 +1,2 @@
+console.log(this);
+export default 42;