22
33const { spawn } = require ( "child_process" ) ;
44const { resolve : pathResolve } = require ( "path" ) ;
5+ const { existsSync } = require ( "fs" ) ;
56const { getPackageJson } = require ( "../projectHelpers" ) ;
67
78const PROJECT_DIR = pathResolve ( __dirname , "../../../" ) ;
@@ -16,11 +17,6 @@ const tnsArgs = getTnsArgs(npmArgs).map(escape);
1617const flags = npmArgs . filter ( a => a . startsWith ( "--" ) ) . map ( a => a . substring ( 2 ) ) ;
1718const options = getOptions ( flags ) ;
1819
19- let platformVersion ;
20- try {
21- platformVersion = packageJson . nativescript [ `tns-${ options . platform } ] . version ;
22- } catch ( e ) { }
23- 2420function getTnsArgs ( args ) {
2521 const other = [
2622 "run" ,
@@ -44,24 +40,52 @@ execute(options);
4440
4541function execute ( options ) {
4642 let commands = [ ] ;
43+ const platform = options . platform ;
4744
4845 if ( options . bundle ) {
49- commands . push ( ( ) => clearPlatform ( options . platform ) ) ;
50- commands . push ( ( ) => webpack ( options . platform ) ) ;
46+ commands . push ( ( ) => cleanApp ( platform ) ) ;
47+ commands . push ( ( ) => webpack ( platform ) ) ;
48+ }
49+ 50+ if ( platform === "android" ) {
51+ commands . push ( ( ) => gradlewClean ( ) ) ;
5152 }
5253
5354 // If "build-app" or "start-app" is specified,
5455 // the respective command should be run last.
5556 // Otherwise, the app should be just prepared.
5657 if ( options . command ) {
57- commands . push ( ( ) => runTns ( options . command , options . platform ) ) ;
58+ commands . push ( ( ) => runTns ( options . command , platform ) ) ;
5859 } else {
59- commands . shift ( ( ) => runTns ( "prepare" , options . platform ) )
60+ commands . shift ( ( ) => runTns ( "prepare" , platform ) )
6061 }
6162
6263 return commands . reduce ( ( current , next ) => current . then ( next ) , Promise . resolve ( ) ) ;
6364}
6465
66+ // Clear platform/**/app folder contents
67+ function cleanApp ( platform ) {
68+ return new Promise ( ( resolve , reject ) => {
69+ spawnChildProcess ( true , "tns" , "clean-app" , platform )
70+ . then ( resolve )
71+ . catch ( throwError )
72+ } ) ;
73+ }
74+ 75+ function gradlewClean ( ) {
76+ return new Promise ( ( resolve , reject ) => {
77+ const platformsPath = pathResolve ( PROJECT_DIR , "platforms" , "android" )
78+ const gradlew = pathResolve ( platformsPath , "gradlew" ) ;
79+ if ( ! existsSync ( gradlew ) ) {
80+ resolve ( ) ;
81+ }
82+ 83+ spawnChildProcess ( true , gradlew , "-p" , platformsPath , "clean" )
84+ . then ( resolve )
85+ . catch ( throwError ) ;
86+ } ) ;
87+ }
88+ 6589function webpack ( platform ) {
6690 return new Promise ( function ( resolve , reject ) {
6791 console . log ( `Running webpack for ${ platform } ) ;
@@ -81,32 +105,6 @@ function webpack(platform) {
81105 } ) ;
82106}
83107
84- function clearPlatform ( platform ) {
85- return removePlatform ( platform )
86- . then ( ( ) => addPlatform ( platform ) ) ;
87- }
88- 89- function removePlatform ( platform ) {
90- return new Promise ( function ( resolve , reject ) {
91- console . log ( `Removing platform ${ platform } ) ;
92- 93- spawnChildProcess ( false , "tns" , "platform" , "remove" , platform )
94- . then ( resolve )
95- . catch ( resolve ) ;
96- } ) ;
97- }
98- 99- function addPlatform ( platform ) {
100- return new Promise ( function ( resolve , reject ) {
101- const platformToAdd = platformVersion ? `${ platform } ${ platformVersion } : platform ;
102- console . log ( `Adding platform ${ platformToAdd } ) ;
103- 104- spawnChildProcess ( false , "tns" , "platform" , "add" , platformToAdd )
105- . then ( resolve )
106- . catch ( resolve ) ;
107- } ) ;
108- }
109- 110108function runTns ( command , platform ) {
111109 return new Promise ( ( resolve , reject ) => {
112110 console . log ( `Running tns ${ command } ) ;
0 commit comments