Skip to content

feat: reduce empty lines in controllers #1401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Apr 28, 2025
Merged

feat: reduce empty lines in controllers #1401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9ca4cd6
feat: reduce empty lines in controllers
m1ga May 18, 2024
30effaf
workflow
m1ga May 18, 2024
0f04444
workflow
m1ga May 18, 2024
6dac614
Merge branch 'master' into trimES6mods
m1ga Dec 19, 2024
fa8d93b
Merge branch 'master' into trimES6mods
m1ga Mar 22, 2025
8c7abb5
remove newlines only for production build
m1ga Apr 28, 2025
b73e9b6
Merge branch 'master' into trimES6mods
m1ga Apr 28, 2025
a4591fe
missing semicolon
m1ga Apr 28, 2025
1d98908
Merge branch 'trimES6mods' of https://github.com/tidev/alloy into tri…
m1ga Apr 28, 2025
fe846c0
don't change this line
m1ga Apr 28, 2025
296376c
keep spaces
m1ga Apr 28, 2025
795685c
final push
m1ga Apr 28, 2025
ffdcd3b
opt.chaining
m1ga Apr 28, 2025
d4444bc
Update Alloy/commands/compile/ast/controller.js
m1ga Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ var ERROR = 2;
module.exports = {
env: {
'node': true,
'es2017': true
'es2017': true,
'es2020': true
},

extends: 'eslint:recommended',
Expand Down
8 changes: 6 additions & 2 deletions Alloy/commands/compile/ast/controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' });

Expand Down
3 changes: 2 additions & 1 deletion Alloy/commands/compile/compilerUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down