Skip to content
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

Jump to bottom

fix(android, ios): disable minifying of javascript #11206

Closed
wants to merge 8 commits into from
Closed

fix(android, ios): disable minifying of javascript #11206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
91e33c9
fix(android): disable minifying of javascript
Sep 9, 2019
ec6bd1e
fix(ios): disable minifying of javascript
Sep 9, 2019
7859ecd
fix(android, ios): allow minifying via cli flag --minify
Sep 9, 2019
da1ac9a
Merge branch 'master' into TIMOB-27377
garymathews Sep 9, 2019
4b10d3f
Merge branch 'master' into TIMOB-27377
sgtcoolguy Sep 9, 2019
55ff6cd
Merge branch 'master' into TIMOB-27377
garymathews Sep 9, 2019
a38983f
Merge branch 'master' into TIMOB-27377
garymathews Sep 10, 2019
d264cdb
Merge branch 'master' into TIMOB-27377
garymathews Sep 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions android/cli/commands/_build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,7 +941,7 @@ AndroidBuilder.prototype.validate = function validate(logger, config, cli) {
// manually inject the build profile settings into the tiapp.xml
switch (this.deployType) {
case 'production':
this.minifyJS = true;
this.minifyJS = false;
this.encryptJS = true;
this.minifyCSS = true;
this.allowDebugging = false;
Expand All @@ -951,7 +951,7 @@ AndroidBuilder.prototype.validate = function validate(logger, config, cli) {
break;

case 'test':
this.minifyJS = true;
this.minifyJS = false;
this.encryptJS = true;
this.minifyCSS = true;
this.allowDebugging = true;
Expand All @@ -975,8 +975,8 @@ AndroidBuilder.prototype.validate = function validate(logger, config, cli) {
logger.warn(__('The %s tiapp.xml property has been deprecated, please use the %s option to bypass JavaScript minification', 'ti.android.compilejs'.cyan, '--skip-js-minify'.cyan));
}

if (cli.argv['skip-js-minify']) {
this.minifyJS = false;
if (cli.argv['minify']) {
this.minifyJS = true;
}

// Do we write out process.env into a file in the app to use?
Expand Down
8 changes: 4 additions & 4 deletions iphone/cli/commands/_build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1781,7 +1781,7 @@ iOSBuilder.prototype.validate = function validate(logger, config, cli) {
switch (this.deployType) {
case 'production':
this.showErrorController = false;
this.minifyJS = true;
this.minifyJS = false;
this.encryptJS = true;
this.minifyCSS = true;
this.allowDebugging = false;
Expand All @@ -1791,7 +1791,7 @@ iOSBuilder.prototype.validate = function validate(logger, config, cli) {

case 'test':
this.showErrorController = true;
this.minifyJS = true;
this.minifyJS = false;
this.encryptJS = true;
this.minifyCSS = true;
this.allowDebugging = true;
Expand All @@ -1810,8 +1810,8 @@ iOSBuilder.prototype.validate = function validate(logger, config, cli) {
this.includeAllTiModules = true;
}

if (cli.argv['skip-js-minify']) {
this.minifyJS = false;
if (cli.argv['minify']) {
this.minifyJS = true;
}
if (cli.argv['hide-error-controller']) {
this.showErrorController = false;
Expand Down