Merge pull request #1401 from tidev/trimES6mods

feat: reduce empty lines in controllers

Author: hansemannn

.eslintrc.js

@@ -5,7 +5,8 @@ var ERROR = 2;
 module.exports = {
 	env: {
 		'node': true,
-		'es2017': true
+		'es2017': true,
+		'es2020': true
 	},
 
 	extends: 'eslint:recommended',

Alloy/commands/compile/ast/controller.js

@@ -6,16 +6,20 @@ var U = require('../../../utils'),
 
 var isBaseControllerExportExpression = types.buildMatchMemberExpression('exports.baseController');
 
-const GENCODE_OPTIONS = {
+let GENCODE_OPTIONS = {
 	retainLines: true
 };
 
-exports.processController = function(code, file) {
+exports.processController = function(code, file, isProduction = false) {
 	var baseController = '',
 		moduleCodes = '',
 		newCode = '',
 		exportSpecifiers = [];
 
+	if (isProduction) {
+		GENCODE_OPTIONS.retainLines = false;
+	}
+
 	try {
 		var ast = babylon.parse(code, { sourceFilename: file, sourceType: 'unambiguous' });
 

Alloy/commands/compile/compilerUtils.js

@@ -952,8 +952,9 @@ exports.loadController = function(file) {
 		U.die('Error reading controller file "' + file + '".', e);
 	}
 
+	var isProduction = compilerConfig.alloyConfig?.deploytype === 'production';
 	// get the base controller for this controller, also process import/export statements
-	var controller = astController.processController(contents, file);
+	var controller = astController.processController(contents, file, isProduction);
 	code.controller = controller.code;
 	code.parentControllerName = controller.base;
 	code.es6mods = controller.es6mods;