Merge pull request #7060 from feons/TIMOB-18199

[TIMOB-18199] iOS: iOS modules can not build if there any JS files inside assets folder

support/iphone/compiler.py

@@ -218,9 +218,6 @@ def __init__(self, project_dir, appid, name, deploytype):
 		self.classes_dir = os.path.join(self.iphone_dir,'Classes')
 		self.assets_dir = os.path.join(self.iphone_dir,'assets')
 
-		if deploytype == 'commonjs':
-			self.assets_dir = os.path.join(self.iphone_dir, '..', 'assets')
-
 		self.modules = []
 		self.modules_metadata = []
 		self.exports = []
@@ -432,7 +429,11 @@ def compileProject(self,xcode=False,devicefamily='ios',iphone_version='iphoneos'
 			softlink_for_simulator(self.project_dir,app_dir)
 
 	def compile_module(self):
-		root_asset = self.compile_commonjs_file(self.appid+'.js', os.path.join(self.assets_dir, self.appid+'.js'))
+		appid_js_file = os.path.join(self.assets_dir, self.appid+'.js')
+		if not os.path.exists(appid_js_file):
+			appid_js_file = os.path.join(self.project_dir, '..', 'assets', self.appid+'.js')
+
+		root_asset = self.compile_commonjs_file(self.appid+'.js', appid_js_file)
 
 		js_files = []
 		for root, dirs, files in os.walk(self.assets_dir, True, None, True):