[TIMOB-26015] Android/iOS: Refactored "app.js" launch handling

android/cli/commands/_build.js

@@ -2327,6 +2327,7 @@ AndroidBuilder.prototype.copyResources = function copyResources(next) {
 		drawableResources = {},
 		jsFiles = {},
 		jsFilesToEncrypt = this.jsFilesToEncrypt = [],
+		jsBootstrapFiles = [],
 		htmlJsFiles = this.htmlJsFiles = {},
 		symlinkFiles = process.platform !== 'win32' && this.config.get('android.symlinkResources', true),
 		_t = this;
@@ -2518,6 +2519,13 @@ AndroidBuilder.prototype.copyResources = function copyResources(next) {
 
 						if (!jsFiles[id] || !opts || !opts.onJsConflict || opts.onJsConflict(from, to, id)) {
 							jsFiles[id] = from;
+
+							// JS files that end with "*.bootstrap.js" are loaded before the "app.js".
+							// Add it as a require() compatible string to bootstrap array if it's a match.
+							const bootstrapPath = id.substr(0, id.length - 3);  // Remove the ".js" extension.
+							if (bootstrapPath.endsWith('.bootstrap')) {
+								jsBootstrapFiles.push(bootstrapPath);
+							}
 						}
 
 						next();
@@ -2559,8 +2567,20 @@ AndroidBuilder.prototype.copyResources = function copyResources(next) {
 	}
 
 	const tasks = [
-		// first task is to copy all files in the Resources directory, but ignore
-		// any directory that is the name of a known platform
+		// First copy all of the Titanium SDK's core JS files shared by all platforms.
+		function (cb) {
+			const src = path.join(this.titaniumSdkPath, 'common', 'Resources');
+			warnDupeDrawableFolders.call(this, src);
+			_t.logger.debug(__('Copying %s', src.cyan));
+			copyDir.call(this, {
+				src: src,
+				dest: this.buildBinAssetsResourcesDir,
+				ignoreRootDirs: ti.allPlatformNames
+			}, cb);
+		},
+
+		// Next, copy all files in the project's Resources directory,
+		// but ignore any directory that is the name of a known platform.
 		function (cb) {
 			const src = path.join(this.projectDir, 'Resources');
 			warnDupeDrawableFolders.call(this, src);
@@ -2572,7 +2592,7 @@ AndroidBuilder.prototype.copyResources = function copyResources(next) {
 			}, cb);
 		},
 
-		// next copy all files from the Android specific Resources directory
+		// Last, copy all files from the Android specific Resources directory.
 		function (cb) {
 			const src = path.join(this.projectDir, 'Resources', 'android');
 			warnDupeDrawableFolders.call(this, src);
@@ -2774,7 +2794,8 @@ AndroidBuilder.prototype.copyResources = function copyResources(next) {
 			};
 		}), function () {
 			// write the properties file
-			const appPropsFile = path.join(this.encryptJS ? this.buildAssetsDir : this.buildBinAssetsResourcesDir, '_app_props_.json'),
+			const buildAssetsPath = this.encryptJS ? this.buildAssetsDir : this.buildBinAssetsResourcesDir,
+				appPropsFile = path.join(buildAssetsPath, '_app_props_.json'),
 				props = {};
 			Object.keys(this.tiapp.properties).forEach(function (prop) {
 				props[prop] = this.tiapp.properties[prop].value;
@@ -2786,6 +2807,14 @@ AndroidBuilder.prototype.copyResources = function copyResources(next) {
 			this.encryptJS && jsFilesToEncrypt.push('_app_props_.json');
 			delete this.lastBuildFiles[appPropsFile];
 
+			// Write the "bootstrap.json" file, even if the bootstrap array is empty.
+			// Note: An empty array indicates the app has no bootstrap files.
+			const bootstrapJsonRelativePath = path.join('ti.internal', 'bootstrap.json'),
+				bootstrapJsonAbsolutePath = path.join(buildAssetsPath, bootstrapJsonRelativePath);
+			fs.writeFileSync(bootstrapJsonAbsolutePath, JSON.stringify({ scripts: jsBootstrapFiles }));
+			this.encryptJS && jsFilesToEncrypt.push(bootstrapJsonRelativePath);
+			delete this.lastBuildFiles[bootstrapJsonAbsolutePath];
+
 			if (!jsFilesToEncrypt.length) {
 				// nothing to encrypt, continue
 				return next();
@@ -3991,6 +4020,7 @@ AndroidBuilder.prototype.packageApp = function packageApp(next) {
 			'-S', this.buildResDir,
 			'-I', this.androidCompileSDK.androidJar,
 			'-F', this.ap_File,
+			'--ignore-assets', '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~',
 			'--output-text-symbols', bundlesPath,
 			'--no-version-vectors'
 		];

android/modules/app/src/java/ti/modules/titanium/app/AppModule.java

@@ -16,6 +16,7 @@
 import org.appcelerator.titanium.ITiAppInfo;
 import org.appcelerator.titanium.TiApplication;
 import org.appcelerator.titanium.TiBaseActivity;
+import org.appcelerator.titanium.TiRootActivity;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.util.TiConvert;
 import org.appcelerator.titanium.util.TiPlatformHelper;
@@ -54,8 +55,6 @@ public class AppModule extends KrollModule implements SensorEventListener
 	private boolean proximityState;
 	private int proximityEventListenerCount = 0;
 
-	private static final String APP_PATH = "Resources/app.js";
-
 	public AppModule()
 	{
 		super("App");
@@ -219,7 +218,18 @@ public boolean getAccessibilityEnabled()
 	@Kroll.method(name = "_restart")
 	public void restart()
 	{
-		KrollRuntime runtime = KrollRuntime.getInstance();
+		// Fetch the root activity hosting the JavaScript runtime.
+		TiRootActivity rootActivity = TiApplication.getInstance().getRootActivity();
+		if (rootActivity == null) {
+			return;
+		}
+
+		// Fetch a path to the main script that was last loaded.
+		String appPath = rootActivity.getUrl();
+		if (appPath == null) {
+			return;
+		}
+		appPath = "Resources/" + appPath;
 
 		// prevent termination of root activity via TiBaseActivity.shouldFinishRootActivity()
 		TiBaseActivity.canFinishRoot = false;
@@ -231,11 +241,12 @@ public void restart()
 		TiBaseActivity.canFinishRoot = true;
 
 		// restart kroll runtime
+		KrollRuntime runtime = KrollRuntime.getInstance();
 		runtime.doDispose();
 		runtime.initRuntime();
 
 		// manually re-launch app
-		runtime.doRunModule(KrollAssetHelper.readAsset(APP_PATH), APP_PATH, getActivityProxy());
+		runtime.doRunModule(KrollAssetHelper.readAsset(appPath), appPath, getActivityProxy());
 	}
 
 	@Kroll.method