Merge remote-tracking branch 'upstream/master' into tree-shake-handle…

…-assignments-in-dead-code

CHANGELOG.md

@@ -1,5 +1,14 @@
 # rollup changelog
 
+## 1.27.13
+*2019-12-14*
+
+### Bug Fixes
+* Do not truncate environment variable values at the first colon when using the `--environment` option (#3283)
+
+### Pull Requests
+* [#3283](https://github.com/rollup/rollup/pull/3283): Allow environment variables to contain colons (@tlaverdure)
+
 ## 1.27.12
 *2019-12-13*
 

cli/run/index.ts

@@ -9,7 +9,7 @@ import build from './build';
 import loadConfigFile from './loadConfigFile';
 import watch from './watch';
 
-export default function runRollup(command: any) {
+export default function runRollup (command: any) {
 	let inputSource;
 	if (command._.length > 0) {
 		if (command.input) {
@@ -47,9 +47,9 @@ export default function runRollup(command: any) {
 
 		environment.forEach((arg: string) => {
 			arg.split(',').forEach((pair: string) => {
-				const [key, value] = pair.split(':');
-				if (value) {
-					process.env[key] = value;
+				const [key, ...value] = pair.split(':');
+				if (value.length) {
+					process.env[key] = value.join(':');
 				} else {
 					process.env[key] = String(true);
 				}
@@ -93,7 +93,7 @@ export default function runRollup(command: any) {
 	}
 }
 
-function execute(configFile: string, configs: GenericConfigObject[], command: any) {
+function execute (configFile: string, configs: GenericConfigObject[], command: any) {
 	if (command.watch) {
 		watch(configFile, configs, command, command.silent);
 	} else {

package.json

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

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

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

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

@@ -1,2 +1,3 @@
 assert.equal( '__ENVIRONMENT__', 'production' );
 assert.equal( '__FOO__', 'bar' );
+assert.equal( '__HOST__', 'http://localhost:4000' );

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

@@ -8,7 +8,8 @@ module.exports = {
 	plugins: [
 		replace( {
 			__ENVIRONMENT__: process.env.PRODUCTION ? 'production' : 'development',
-			__FOO__: process.env.FOO
+			__FOO__: process.env.FOO,
+			__HOST__: process.env.HOST
 		} )
 	]
 };