nativescript 8.9.0-alpha.2 → 8.9.0-dev.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (345) hide show
  1. package/config/test-deps-versions-generated.json +1 -1
  2. package/lib/android-tools-info.js +9 -20
  3. package/lib/base-package-manager.js +47 -64
  4. package/lib/bun-package-manager.js +65 -88
  5. package/lib/color.js +2 -2
  6. package/lib/commands/add-platform.js +14 -30
  7. package/lib/commands/apple-login.js +18 -29
  8. package/lib/commands/appstore-list.js +34 -45
  9. package/lib/commands/appstore-upload.js +52 -65
  10. package/lib/commands/build.js +55 -87
  11. package/lib/commands/clean.js +161 -176
  12. package/lib/commands/command-base.js +14 -27
  13. package/lib/commands/config.js +48 -67
  14. package/lib/commands/create-project.js +211 -230
  15. package/lib/commands/debug.js +66 -88
  16. package/lib/commands/deploy.js +28 -44
  17. package/lib/commands/embedding/embed.js +33 -52
  18. package/lib/commands/extensibility/install-extension.js +5 -16
  19. package/lib/commands/extensibility/list-extensions.js +13 -24
  20. package/lib/commands/extensibility/uninstall-extension.js +4 -15
  21. package/lib/commands/fonts.js +30 -41
  22. package/lib/commands/generate-assets.js +13 -28
  23. package/lib/commands/generate-help.js +2 -13
  24. package/lib/commands/generate.js +12 -60
  25. package/lib/commands/info.js +2 -13
  26. package/lib/commands/install.js +34 -49
  27. package/lib/commands/list-platforms.js +14 -25
  28. package/lib/commands/migrate.js +15 -26
  29. package/lib/commands/native-add.js +23 -46
  30. package/lib/commands/platform-clean.js +19 -32
  31. package/lib/commands/plugin/add-plugin.js +12 -25
  32. package/lib/commands/plugin/build-plugin.js +31 -44
  33. package/lib/commands/plugin/create-plugin.js +110 -133
  34. package/lib/commands/plugin/list-plugins.js +22 -33
  35. package/lib/commands/plugin/remove-plugin.js +20 -33
  36. package/lib/commands/plugin/update-plugin.js +20 -33
  37. package/lib/commands/post-install.js +20 -33
  38. package/lib/commands/prepare.js +19 -35
  39. package/lib/commands/preview.js +49 -62
  40. package/lib/commands/remove-platform.js +7 -18
  41. package/lib/commands/resources/resources-update.js +13 -26
  42. package/lib/commands/run.js +55 -76
  43. package/lib/commands/start.js +6 -19
  44. package/lib/commands/test-init.js +123 -134
  45. package/lib/commands/test.js +66 -89
  46. package/lib/commands/typings.js +126 -142
  47. package/lib/commands/update-platform.js +22 -35
  48. package/lib/commands/update.js +30 -43
  49. package/lib/common/child-process.js +53 -72
  50. package/lib/common/codeGeneration/code-entity.js +1 -1
  51. package/lib/common/codeGeneration/code-printer.js +1 -1
  52. package/lib/common/command-params.js +7 -18
  53. package/lib/common/commands/analytics.js +27 -40
  54. package/lib/common/commands/autocompletion.js +39 -56
  55. package/lib/common/commands/device/device-log-stream.js +12 -23
  56. package/lib/common/commands/device/get-file.js +22 -33
  57. package/lib/common/commands/device/list-applications.js +12 -23
  58. package/lib/common/commands/device/list-devices.js +72 -87
  59. package/lib/common/commands/device/list-files.js +23 -34
  60. package/lib/common/commands/device/put-file.js +22 -33
  61. package/lib/common/commands/device/run-application.js +12 -25
  62. package/lib/common/commands/device/stop-application.js +11 -22
  63. package/lib/common/commands/device/uninstall-application.js +6 -17
  64. package/lib/common/commands/generate-messages.js +17 -28
  65. package/lib/common/commands/help.js +20 -33
  66. package/lib/common/commands/package-manager-get.js +6 -17
  67. package/lib/common/commands/package-manager-set.js +9 -20
  68. package/lib/common/commands/post-install.js +2 -13
  69. package/lib/common/commands/preuninstall.js +23 -38
  70. package/lib/common/commands/proxy/proxy-base.js +8 -19
  71. package/lib/common/commands/proxy/proxy-clear.js +4 -15
  72. package/lib/common/commands/proxy/proxy-get.js +3 -14
  73. package/lib/common/commands/proxy/proxy-set.js +87 -100
  74. package/lib/common/constants.js +11 -11
  75. package/lib/common/decorators.js +10 -22
  76. package/lib/common/dispatchers.js +79 -96
  77. package/lib/common/errors.js +89 -104
  78. package/lib/common/file-system.js +108 -130
  79. package/lib/common/header.js +1 -2
  80. package/lib/common/helpers.js +149 -178
  81. package/lib/common/host-info.js +37 -50
  82. package/lib/common/http-client.js +93 -108
  83. package/lib/common/logger/appenders/cli-appender.js +1 -2
  84. package/lib/common/logger/appenders/emit-appender.js +1 -2
  85. package/lib/common/logger/layouts/cli-layout.js +1 -2
  86. package/lib/common/logger/logger.js +4 -4
  87. package/lib/common/mobile/android/android-application-manager.js +121 -142
  88. package/lib/common/mobile/android/android-debug-bridge-result-handler.js +1 -1
  89. package/lib/common/mobile/android/android-debug-bridge.js +87 -112
  90. package/lib/common/mobile/android/android-device-file-system.js +98 -131
  91. package/lib/common/mobile/android/android-device-hash-service.js +50 -75
  92. package/lib/common/mobile/android/android-device.js +68 -85
  93. package/lib/common/mobile/android/android-emulator-services.js +105 -130
  94. package/lib/common/mobile/android/android-ini-file-parser.js +8 -6
  95. package/lib/common/mobile/android/android-log-filter.js +1 -1
  96. package/lib/common/mobile/android/android-virtual-device-service.js +76 -97
  97. package/lib/common/mobile/android/device-android-debug-bridge.js +13 -29
  98. package/lib/common/mobile/android/genymotion/genymotion-service.js +91 -118
  99. package/lib/common/mobile/android/genymotion/virtualbox-service.js +64 -81
  100. package/lib/common/mobile/android/logcat-helper.js +108 -127
  101. package/lib/common/mobile/application-manager-base.js +84 -107
  102. package/lib/common/mobile/device-log-provider-base.js +7 -18
  103. package/lib/common/mobile/ios/device/ios-application-manager.js +79 -108
  104. package/lib/common/mobile/ios/device/ios-device-file-system.js +78 -105
  105. package/lib/common/mobile/ios/device/ios-device-operations.js +105 -142
  106. package/lib/common/mobile/ios/device/ios-device.js +20 -36
  107. package/lib/common/mobile/ios/ios-device-base.js +58 -81
  108. package/lib/common/mobile/ios/simulator/ios-emulator-services.js +63 -92
  109. package/lib/common/mobile/ios/simulator/ios-sim-resolver.js +1 -1
  110. package/lib/common/mobile/ios/simulator/ios-simulator-application-manager.js +60 -89
  111. package/lib/common/mobile/ios/simulator/ios-simulator-device.js +27 -43
  112. package/lib/common/mobile/ios/simulator/ios-simulator-file-system.js +37 -62
  113. package/lib/common/mobile/ios/simulator/ios-simulator-log-provider.js +24 -35
  114. package/lib/common/mobile/mobile-core/android-device-discovery.js +43 -62
  115. package/lib/common/mobile/mobile-core/android-emulator-discovery.js +21 -32
  116. package/lib/common/mobile/mobile-core/android-process-service.js +143 -182
  117. package/lib/common/mobile/mobile-core/device-discovery.js +2 -13
  118. package/lib/common/mobile/mobile-core/devices-service.js +386 -436
  119. package/lib/common/mobile/mobile-core/ios-device-discovery.js +24 -35
  120. package/lib/common/mobile/mobile-core/ios-simulator-discovery.js +47 -62
  121. package/lib/common/mobile/mobile-helper.js +15 -26
  122. package/lib/common/mobile/wp8/wp8-emulator-services.js +25 -52
  123. package/lib/common/opener.js +2 -2
  124. package/lib/common/prompter.js +90 -105
  125. package/lib/common/queue.js +9 -20
  126. package/lib/common/services/auto-completion-service.js +39 -52
  127. package/lib/common/services/cancellation.js +17 -28
  128. package/lib/common/services/commands-service.js +146 -169
  129. package/lib/common/services/help-service.js +132 -157
  130. package/lib/common/services/hooks-service.js +93 -108
  131. package/lib/common/services/ios-notification-service.js +21 -34
  132. package/lib/common/services/json-file-settings-service.js +52 -71
  133. package/lib/common/services/lock-service.js +35 -52
  134. package/lib/common/services/message-contract-generator.js +35 -46
  135. package/lib/common/services/micro-templating-service.js +4 -15
  136. package/lib/common/services/net-service.js +90 -107
  137. package/lib/common/services/project-files-manager.js +10 -23
  138. package/lib/common/services/proxy-service.js +13 -24
  139. package/lib/common/services/qr.js +13 -24
  140. package/lib/common/services/settings-service.js +1 -1
  141. package/lib/common/services/xcode-select-service.js +20 -35
  142. package/lib/common/utils.js +2 -2
  143. package/lib/common/validators/project-name-validator.js +1 -1
  144. package/lib/common/validators/validation-result.js +1 -1
  145. package/lib/common/verify-node-version.js +2 -3
  146. package/lib/common/yok.js +23 -36
  147. package/lib/config.js +36 -51
  148. package/lib/constants.js +24 -24
  149. package/lib/controllers/build-controller.js +82 -99
  150. package/lib/controllers/debug-controller.js +107 -128
  151. package/lib/controllers/deploy-controller.js +15 -23
  152. package/lib/controllers/migrate-controller.js +722 -795
  153. package/lib/controllers/platform-controller.js +70 -85
  154. package/lib/controllers/prepare-controller.js +232 -261
  155. package/lib/controllers/run-controller.js +397 -411
  156. package/lib/controllers/update-controller-base.js +16 -29
  157. package/lib/controllers/update-controller.js +94 -119
  158. package/lib/data/prepare-data.js +4 -1
  159. package/lib/definitions/ios.d.ts +9 -1
  160. package/lib/detached-processes/cleanup-js-subprocess.js +3 -12
  161. package/lib/detached-processes/cleanup-process.js +16 -25
  162. package/lib/device-path-provider.js +23 -34
  163. package/lib/device-sockets/ios/app-debug-socket-proxy-factory.js +149 -164
  164. package/lib/device-sockets/ios/notification.js +1 -1
  165. package/lib/device-sockets/ios/socket-request-executor.js +24 -39
  166. package/lib/helpers/android-bundle-validator-helper.js +1 -1
  167. package/lib/helpers/deploy-command-helper.js +44 -49
  168. package/lib/helpers/key-command-helper.js +4 -13
  169. package/lib/helpers/livesync-command-helper.js +137 -152
  170. package/lib/helpers/network-connectivity-validator.js +6 -17
  171. package/lib/helpers/options-track-helper.js +6 -17
  172. package/lib/helpers/platform-command-helper.js +99 -120
  173. package/lib/key-commands/index.js +150 -200
  174. package/lib/nativescript-cli.js +5 -14
  175. package/lib/node-package-manager.js +81 -104
  176. package/lib/options.js +3 -12
  177. package/lib/package-installation-manager.js +130 -165
  178. package/lib/package-manager.js +63 -86
  179. package/lib/platform-command-param.js +4 -15
  180. package/lib/pnpm-package-manager.js +59 -78
  181. package/lib/project-data.js +1 -1
  182. package/lib/providers/project-files-provider.js +1 -1
  183. package/lib/services/analytics/analytics-broker-process.js +13 -22
  184. package/lib/services/analytics/analytics-broker.js +17 -30
  185. package/lib/services/analytics/analytics-service.js +163 -199
  186. package/lib/services/analytics/google-analytics-provider.js +41 -56
  187. package/lib/services/analytics-settings-service.js +15 -32
  188. package/lib/services/android/android-bundle-tool-service.js +43 -60
  189. package/lib/services/android/gradle-build-args-service.js +9 -20
  190. package/lib/services/android/gradle-build-service.js +22 -35
  191. package/lib/services/android/gradle-command-service.js +22 -35
  192. package/lib/services/android-device-debug-service.js +90 -117
  193. package/lib/services/android-plugin-build-service.js +205 -231
  194. package/lib/services/android-project-service.js +126 -171
  195. package/lib/services/android-resources-migration-service.js +51 -64
  196. package/lib/services/apple-portal/apple-portal-application-service.js +46 -63
  197. package/lib/services/apple-portal/apple-portal-session-service.js +195 -214
  198. package/lib/services/apple-portal/srp/srp-wrapper.js +43 -58
  199. package/lib/services/assets-generation/assets-generation-service.js +103 -117
  200. package/lib/services/build-artifacts-service.js +9 -20
  201. package/lib/services/build-info-file-service.js +20 -35
  202. package/lib/services/cleanup-service.js +47 -76
  203. package/lib/services/cocoapods-service.js +111 -132
  204. package/lib/services/device/device-install-app-service.js +54 -71
  205. package/lib/services/doctor-service.js +99 -118
  206. package/lib/services/extensibility-service.js +81 -100
  207. package/lib/services/files-hash-service.js +26 -43
  208. package/lib/services/hmr-status-service.js +1 -1
  209. package/lib/services/initialize-service.js +37 -50
  210. package/lib/services/ios/export-options-plist-service.js +38 -51
  211. package/lib/services/ios/ios-signing-service.js +168 -187
  212. package/lib/services/ios/spm-service.js +43 -53
  213. package/lib/services/ios/xcodebuild-args-service.js +77 -94
  214. package/lib/services/ios/xcodebuild-command-service.js +14 -25
  215. package/lib/services/ios/xcodebuild-service.js +52 -71
  216. package/lib/services/ios-debugger-port-service.js +24 -37
  217. package/lib/services/ios-device-debug-service.js +75 -102
  218. package/lib/services/ios-entitlements-service.js +31 -42
  219. package/lib/services/ios-extensions-service.js +18 -29
  220. package/lib/services/ios-project-service.js +419 -460
  221. package/lib/services/ios-provision-service.js +108 -129
  222. package/lib/services/ios-watch-app-service.js +21 -32
  223. package/lib/services/ip-service.js +38 -53
  224. package/lib/services/itmstransporter-service.js +129 -152
  225. package/lib/services/livesync/android-device-livesync-service-base.js +31 -48
  226. package/lib/services/livesync/android-device-livesync-service.js +120 -149
  227. package/lib/services/livesync/android-device-livesync-sockets-service.js +121 -152
  228. package/lib/services/livesync/android-livesync-service.js +14 -35
  229. package/lib/services/livesync/android-livesync-tool.js +90 -113
  230. package/lib/services/livesync/device-livesync-service-base.js +15 -28
  231. package/lib/services/livesync/ios-device-livesync-service.js +114 -143
  232. package/lib/services/livesync/ios-livesync-service.js +42 -58
  233. package/lib/services/livesync/platform-livesync-service-base.js +94 -119
  234. package/lib/services/log-parser-service.js +1 -1
  235. package/lib/services/log-source-map-service.js +30 -41
  236. package/lib/services/marking-mode-service.js +15 -28
  237. package/lib/services/npm-config-service.js +1 -1
  238. package/lib/services/pacote-service.js +51 -66
  239. package/lib/services/performance-service.js +1 -1
  240. package/lib/services/platform/add-platform-service.js +50 -71
  241. package/lib/services/platform/platform-validation-service.js +22 -33
  242. package/lib/services/platform/prepare-native-platform-service.js +49 -62
  243. package/lib/services/platform-environment-requirements.js +26 -37
  244. package/lib/services/plugins-service.js +122 -147
  245. package/lib/services/project-backup-service.js +1 -1
  246. package/lib/services/project-changes-service.js +124 -141
  247. package/lib/services/project-cleanup-service.js +64 -77
  248. package/lib/services/project-config-service.js +71 -80
  249. package/lib/services/project-data-service.js +101 -118
  250. package/lib/services/project-name-service.js +28 -43
  251. package/lib/services/project-service.js +84 -103
  252. package/lib/services/project-templates-service.js +52 -67
  253. package/lib/services/start-service.js +41 -59
  254. package/lib/services/temp-service.js +8 -21
  255. package/lib/services/terminal-spinner-service.js +15 -26
  256. package/lib/services/test-execution-service.js +59 -72
  257. package/lib/services/test-initialization-service.js +2 -2
  258. package/lib/services/timeline-profiler-service.js +1 -1
  259. package/lib/services/versions-service.js +119 -138
  260. package/lib/services/webpack/webpack-compiler-service.js +214 -234
  261. package/lib/services/xcconfig-service.js +8 -19
  262. package/lib/sys-info.js +45 -62
  263. package/lib/tools/node-modules/node-modules-builder.js +16 -27
  264. package/lib/yarn-package-manager.js +59 -78
  265. package/lib/yarn2-package-manager.js +60 -79
  266. package/package.json +66 -81
  267. package/node_modules/@npmcli/move-file/LICENSE.md +0 -22
  268. package/node_modules/@npmcli/move-file/README.md +0 -69
  269. package/node_modules/@npmcli/move-file/lib/index.js +0 -185
  270. package/node_modules/@npmcli/move-file/node_modules/mkdirp/CHANGELOG.md +0 -15
  271. package/node_modules/@npmcli/move-file/node_modules/mkdirp/LICENSE +0 -21
  272. package/node_modules/@npmcli/move-file/node_modules/mkdirp/bin/cmd.js +0 -68
  273. package/node_modules/@npmcli/move-file/node_modules/mkdirp/index.js +0 -31
  274. package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/find-made.js +0 -29
  275. package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/mkdirp-manual.js +0 -64
  276. package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/mkdirp-native.js +0 -39
  277. package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/opts-arg.js +0 -23
  278. package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/path-arg.js +0 -29
  279. package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/use-native.js +0 -10
  280. package/node_modules/@npmcli/move-file/node_modules/mkdirp/package.json +0 -44
  281. package/node_modules/@npmcli/move-file/node_modules/mkdirp/readme.markdown +0 -266
  282. package/node_modules/@npmcli/move-file/package.json +0 -47
  283. package/node_modules/balanced-match/.github/FUNDING.yml +0 -2
  284. package/node_modules/balanced-match/LICENSE.md +0 -21
  285. package/node_modules/balanced-match/README.md +0 -97
  286. package/node_modules/balanced-match/index.js +0 -62
  287. package/node_modules/balanced-match/package.json +0 -48
  288. package/node_modules/concat-map/.travis.yml +0 -4
  289. package/node_modules/concat-map/LICENSE +0 -18
  290. package/node_modules/concat-map/README.markdown +0 -62
  291. package/node_modules/concat-map/example/map.js +0 -6
  292. package/node_modules/concat-map/index.js +0 -13
  293. package/node_modules/concat-map/package.json +0 -43
  294. package/node_modules/concat-map/test/map.js +0 -39
  295. package/node_modules/fs.realpath/LICENSE +0 -43
  296. package/node_modules/fs.realpath/README.md +0 -33
  297. package/node_modules/fs.realpath/index.js +0 -66
  298. package/node_modules/fs.realpath/old.js +0 -303
  299. package/node_modules/fs.realpath/package.json +0 -26
  300. package/node_modules/inflight/LICENSE +0 -15
  301. package/node_modules/inflight/README.md +0 -37
  302. package/node_modules/inflight/inflight.js +0 -54
  303. package/node_modules/inflight/package.json +0 -29
  304. package/node_modules/inherits/LICENSE +0 -16
  305. package/node_modules/inherits/README.md +0 -42
  306. package/node_modules/inherits/inherits.js +0 -9
  307. package/node_modules/inherits/inherits_browser.js +0 -27
  308. package/node_modules/inherits/package.json +0 -29
  309. package/node_modules/once/LICENSE +0 -15
  310. package/node_modules/once/README.md +0 -79
  311. package/node_modules/once/once.js +0 -42
  312. package/node_modules/once/package.json +0 -33
  313. package/node_modules/path-is-absolute/index.js +0 -20
  314. package/node_modules/path-is-absolute/license +0 -21
  315. package/node_modules/path-is-absolute/package.json +0 -43
  316. package/node_modules/path-is-absolute/readme.md +0 -59
  317. package/node_modules/rimraf/CHANGELOG.md +0 -65
  318. package/node_modules/rimraf/LICENSE +0 -15
  319. package/node_modules/rimraf/README.md +0 -101
  320. package/node_modules/rimraf/bin.js +0 -68
  321. package/node_modules/rimraf/node_modules/brace-expansion/LICENSE +0 -21
  322. package/node_modules/rimraf/node_modules/brace-expansion/README.md +0 -129
  323. package/node_modules/rimraf/node_modules/brace-expansion/index.js +0 -201
  324. package/node_modules/rimraf/node_modules/brace-expansion/package.json +0 -47
  325. package/node_modules/rimraf/node_modules/glob/LICENSE +0 -21
  326. package/node_modules/rimraf/node_modules/glob/README.md +0 -378
  327. package/node_modules/rimraf/node_modules/glob/common.js +0 -238
  328. package/node_modules/rimraf/node_modules/glob/glob.js +0 -790
  329. package/node_modules/rimraf/node_modules/glob/package.json +0 -55
  330. package/node_modules/rimraf/node_modules/glob/sync.js +0 -486
  331. package/node_modules/rimraf/node_modules/minimatch/LICENSE +0 -15
  332. package/node_modules/rimraf/node_modules/minimatch/README.md +0 -230
  333. package/node_modules/rimraf/node_modules/minimatch/minimatch.js +0 -947
  334. package/node_modules/rimraf/node_modules/minimatch/package.json +0 -33
  335. package/node_modules/rimraf/package.json +0 -32
  336. package/node_modules/rimraf/rimraf.js +0 -360
  337. package/node_modules/stringify-package/CHANGELOG.md +0 -16
  338. package/node_modules/stringify-package/LICENSE +0 -13
  339. package/node_modules/stringify-package/README.md +0 -55
  340. package/node_modules/stringify-package/index.js +0 -18
  341. package/node_modules/stringify-package/package.json +0 -38
  342. package/node_modules/wrappy/LICENSE +0 -15
  343. package/node_modules/wrappy/README.md +0 -36
  344. package/node_modules/wrappy/package.json +0 -29
  345. package/node_modules/wrappy/wrappy.js +0 -33
@@ -5,15 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
5
5
  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
6
  return c > 3 && r && Object.defineProperty(target, key, r), r;
7
7
  };
8
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
9
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
10
- return new (P || (P = Promise))(function (resolve, reject) {
11
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
12
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
13
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
14
- step((generator = generator.apply(thisArg, _arguments || [])).next());
15
- });
16
- };
17
8
  Object.defineProperty(exports, "__esModule", { value: true });
18
9
  exports.CleanupService = void 0;
19
10
  const path = require("path");
@@ -26,89 +17,69 @@ class CleanupService {
26
17
  this.shouldDispose = true;
27
18
  this.pathToCleanupLogFile = $options.cleanupLogFile;
28
19
  }
29
- addCleanupCommand(commandInfo) {
30
- return __awaiter(this, void 0, void 0, function* () {
31
- const cleanupProcess = yield this.getCleanupProcess();
32
- cleanupProcess.send({
33
- messageType: "AddCleanCommand",
34
- commandInfo,
35
- });
20
+ async addCleanupCommand(commandInfo) {
21
+ const cleanupProcess = await this.getCleanupProcess();
22
+ cleanupProcess.send({
23
+ messageType: "AddCleanCommand",
24
+ commandInfo,
36
25
  });
37
26
  }
38
- removeCleanupCommand(commandInfo) {
39
- return __awaiter(this, void 0, void 0, function* () {
40
- const cleanupProcess = yield this.getCleanupProcess();
41
- cleanupProcess.send({
42
- messageType: "RemoveCleanCommand",
43
- commandInfo,
44
- });
27
+ async removeCleanupCommand(commandInfo) {
28
+ const cleanupProcess = await this.getCleanupProcess();
29
+ cleanupProcess.send({
30
+ messageType: "RemoveCleanCommand",
31
+ commandInfo,
45
32
  });
46
33
  }
47
- addRequest(requestInfo) {
48
- return __awaiter(this, void 0, void 0, function* () {
49
- const cleanupProcess = yield this.getCleanupProcess();
50
- cleanupProcess.send({
51
- messageType: "AddRequest",
52
- requestInfo,
53
- });
34
+ async addRequest(requestInfo) {
35
+ const cleanupProcess = await this.getCleanupProcess();
36
+ cleanupProcess.send({
37
+ messageType: "AddRequest",
38
+ requestInfo,
54
39
  });
55
40
  }
56
- removeRequest(requestInfo) {
57
- return __awaiter(this, void 0, void 0, function* () {
58
- const cleanupProcess = yield this.getCleanupProcess();
59
- cleanupProcess.send({
60
- messageType: "RemoveRequest",
61
- requestInfo,
62
- });
41
+ async removeRequest(requestInfo) {
42
+ const cleanupProcess = await this.getCleanupProcess();
43
+ cleanupProcess.send({
44
+ messageType: "RemoveRequest",
45
+ requestInfo,
63
46
  });
64
47
  }
65
- addCleanupDeleteAction(filePath) {
66
- return __awaiter(this, void 0, void 0, function* () {
67
- const cleanupProcess = yield this.getCleanupProcess();
68
- cleanupProcess.send({
69
- messageType: "AddDeleteFileAction",
70
- filePath,
71
- });
48
+ async addCleanupDeleteAction(filePath) {
49
+ const cleanupProcess = await this.getCleanupProcess();
50
+ cleanupProcess.send({
51
+ messageType: "AddDeleteFileAction",
52
+ filePath,
72
53
  });
73
54
  }
74
- removeCleanupDeleteAction(filePath) {
75
- return __awaiter(this, void 0, void 0, function* () {
76
- const cleanupProcess = yield this.getCleanupProcess();
77
- cleanupProcess.send({
78
- messageType: "RemoveDeleteFileAction",
79
- filePath,
80
- });
55
+ async removeCleanupDeleteAction(filePath) {
56
+ const cleanupProcess = await this.getCleanupProcess();
57
+ cleanupProcess.send({
58
+ messageType: "RemoveDeleteFileAction",
59
+ filePath,
81
60
  });
82
61
  }
83
- addCleanupJS(jsCommand) {
84
- return __awaiter(this, void 0, void 0, function* () {
85
- const cleanupProcess = yield this.getCleanupProcess();
86
- cleanupProcess.send({
87
- messageType: "AddJSFileToRequire",
88
- jsCommand,
89
- });
62
+ async addCleanupJS(jsCommand) {
63
+ const cleanupProcess = await this.getCleanupProcess();
64
+ cleanupProcess.send({
65
+ messageType: "AddJSFileToRequire",
66
+ jsCommand,
90
67
  });
91
68
  }
92
- removeCleanupJS(jsCommand) {
93
- return __awaiter(this, void 0, void 0, function* () {
94
- const cleanupProcess = yield this.getCleanupProcess();
95
- cleanupProcess.send({
96
- messageType: "RemoveJSFileToRequire",
97
- jsCommand,
98
- });
69
+ async removeCleanupJS(jsCommand) {
70
+ const cleanupProcess = await this.getCleanupProcess();
71
+ cleanupProcess.send({
72
+ messageType: "RemoveJSFileToRequire",
73
+ jsCommand,
99
74
  });
100
75
  }
101
- addKillProcess(pid) {
102
- return __awaiter(this, void 0, void 0, function* () {
103
- const killSpawnCommandInfo = this.getKillProcesSpawnInfo(pid);
104
- yield this.addCleanupCommand(killSpawnCommandInfo);
105
- });
76
+ async addKillProcess(pid) {
77
+ const killSpawnCommandInfo = this.getKillProcesSpawnInfo(pid);
78
+ await this.addCleanupCommand(killSpawnCommandInfo);
106
79
  }
107
- removeKillProcess(pid) {
108
- return __awaiter(this, void 0, void 0, function* () {
109
- const killSpawnCommandInfo = this.getKillProcesSpawnInfo(pid);
110
- yield this.removeCleanupCommand(killSpawnCommandInfo);
111
- });
80
+ async removeKillProcess(pid) {
81
+ const killSpawnCommandInfo = this.getKillProcesSpawnInfo(pid);
82
+ await this.removeCleanupCommand(killSpawnCommandInfo);
112
83
  }
113
84
  setCleanupLogFile(filePath) {
114
85
  this.pathToCleanupLogFile = filePath;
@@ -183,6 +154,7 @@ class CleanupService {
183
154
  };
184
155
  }
185
156
  }
157
+ exports.CleanupService = CleanupService;
186
158
  CleanupService.CLEANUP_PROCESS_START_TIMEOUT = 10 * 1000;
187
159
  __decorate([
188
160
  (0, decorators_1.exported)("cleanupService")
@@ -190,5 +162,4 @@ __decorate([
190
162
  __decorate([
191
163
  (0, decorators_1.cache)()
192
164
  ], CleanupService.prototype, "getCleanupProcess", null);
193
- exports.CleanupService = CleanupService;
194
165
  yok_1.injector.register("cleanupService", CleanupService);
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.CocoaPodsService = void 0;
13
4
  const os_1 = require("os");
@@ -38,71 +29,64 @@ class CocoaPodsService {
38
29
  getProjectPodfilePath(projectRoot) {
39
30
  return path.join(projectRoot, constants_1.PODFILE_NAME);
40
31
  }
41
- executePodInstall(projectRoot, xcodeProjPath) {
42
- return __awaiter(this, void 0, void 0, function* () {
43
- this.$logger.info("Installing pods...");
44
- let podTool = this.$config.USE_POD_SANDBOX ? "sandbox-pod" : "pod";
45
- const args = ["install"];
46
- if (process.platform === "darwin" && process.arch === "arm64") {
47
- const res = yield this.$childProcess
48
- .exec("arch -x86_64 pod --version", null, {
49
- showStderr: true,
50
- })
51
- .then((res) => res.stdout + " " + res.stderr)
52
- .catch((err) => err.message);
53
- if (!res.includes("Bad CPU type in executable")) {
54
- this.$logger.trace("Running on arm64 but pod is installed under rosetta2 - running pod through rosetta2");
55
- args.unshift(podTool);
56
- args.unshift("-x86_64");
57
- podTool = "arch";
58
- }
32
+ async executePodInstall(projectRoot, xcodeProjPath) {
33
+ this.$logger.info("Installing pods...");
34
+ let podTool = this.$config.USE_POD_SANDBOX ? "sandbox-pod" : "pod";
35
+ const args = ["install"];
36
+ if (process.platform === "darwin" && process.arch === "arm64") {
37
+ const res = await this.$childProcess
38
+ .exec("arch -x86_64 pod --version", null, {
39
+ showStderr: true,
40
+ })
41
+ .then((res) => res.stdout + " " + res.stderr)
42
+ .catch((err) => err.message);
43
+ if (!res.includes("Bad CPU type in executable")) {
44
+ this.$logger.trace("Running on arm64 but pod is installed under rosetta2 - running pod through rosetta2");
45
+ args.unshift(podTool);
46
+ args.unshift("-x86_64");
47
+ podTool = "arch";
59
48
  }
60
- const podInstallResult = yield this.$childProcess.spawnFromEvent(podTool, args, "close", { cwd: projectRoot, stdio: ["pipe", process.stdout, process.stdout] }, { throwError: false });
61
- if (podInstallResult.exitCode !== 0) {
62
- const versionResolutionHint = podInstallResult.exitCode === 31
63
- ? `For more information on resolving CocoaPod issues in NativeScript read.`
64
- : "";
65
- this.$errors.fail(`'${podTool} install' command failed.${podInstallResult.stderr ? " Error is: " + podInstallResult.stderr : ""}
49
+ }
50
+ const podInstallResult = await this.$childProcess.spawnFromEvent(podTool, args, "close", { cwd: projectRoot, stdio: ["pipe", process.stdout, process.stdout] }, { throwError: false });
51
+ if (podInstallResult.exitCode !== 0) {
52
+ const versionResolutionHint = podInstallResult.exitCode === 31
53
+ ? `For more information on resolving CocoaPod issues in NativeScript read.`
54
+ : "";
55
+ this.$errors.fail(`'${podTool} install' command failed.${podInstallResult.stderr ? " Error is: " + podInstallResult.stderr : ""}
66
56
  ${versionResolutionHint}`);
67
- }
68
- return podInstallResult;
69
- });
57
+ }
58
+ return podInstallResult;
70
59
  }
71
- mergePodXcconfigFile(projectData, platformData) {
72
- return __awaiter(this, void 0, void 0, function* () {
73
- const podFilesRootDirName = path.join("Pods", "Target Support Files", `Pods-${projectData.projectName}`);
74
- const podFolder = path.join(platformData.projectRoot, podFilesRootDirName);
75
- if (this.$fs.exists(podFolder)) {
76
- const pluginsXcconfigFilePaths = this.$xcconfigService.getPluginsXcconfigFilePaths(platformData.projectRoot);
77
- for (const configuration in pluginsXcconfigFilePaths) {
78
- const pluginsXcconfigFilePath = pluginsXcconfigFilePaths[configuration];
79
- const podXcconfigFilePath = path.join(podFolder, `Pods-${projectData.projectName}.${configuration}.xcconfig`);
80
- yield this.$xcconfigService.mergeFiles(podXcconfigFilePath, pluginsXcconfigFilePath);
81
- }
60
+ async mergePodXcconfigFile(projectData, platformData) {
61
+ const podFilesRootDirName = path.join("Pods", "Target Support Files", `Pods-${projectData.projectName}`);
62
+ const podFolder = path.join(platformData.projectRoot, podFilesRootDirName);
63
+ if (this.$fs.exists(podFolder)) {
64
+ const pluginsXcconfigFilePaths = this.$xcconfigService.getPluginsXcconfigFilePaths(platformData.projectRoot);
65
+ for (const configuration in pluginsXcconfigFilePaths) {
66
+ const pluginsXcconfigFilePath = pluginsXcconfigFilePaths[configuration];
67
+ const podXcconfigFilePath = path.join(podFolder, `Pods-${projectData.projectName}.${configuration}.xcconfig`);
68
+ await this.$xcconfigService.mergeFiles(podXcconfigFilePath, pluginsXcconfigFilePath);
82
69
  }
83
- });
70
+ }
84
71
  }
85
- applyPodfileFromAppResources(projectData, platformData) {
86
- return __awaiter(this, void 0, void 0, function* () {
87
- const { projectRoot, normalizedPlatformName } = platformData;
88
- const mainPodfilePath = path.join(projectData.appResourcesDirectoryPath, normalizedPlatformName, constants_1.PODFILE_NAME);
89
- const projectPodfilePath = this.getProjectPodfilePath(projectRoot);
90
- if (this.$fs.exists(projectPodfilePath) ||
91
- this.$fs.exists(mainPodfilePath)) {
92
- yield this.applyPodfileToProject(constants_1.NS_BASE_PODFILE, mainPodfilePath, projectData, platformData);
93
- }
94
- });
72
+ async applyPodfileFromAppResources(projectData, platformData) {
73
+ const { projectRoot, normalizedPlatformName } = platformData;
74
+ const mainPodfilePath = path.join(projectData.appResourcesDirectoryPath, normalizedPlatformName, constants_1.PODFILE_NAME);
75
+ const projectPodfilePath = this.getProjectPodfilePath(projectRoot);
76
+ if (this.$fs.exists(projectPodfilePath) ||
77
+ this.$fs.exists(mainPodfilePath)) {
78
+ await this.applyPodfileToProject(constants_1.NS_BASE_PODFILE, mainPodfilePath, projectData, platformData);
79
+ }
95
80
  }
96
- applyPodfileArchExclusions(projectData, platformData) {
97
- return __awaiter(this, void 0, void 0, function* () {
98
- const xcodeVersionData = yield this.$xcodeSelectService.getXcodeVersion();
99
- if (+xcodeVersionData.major !== 12) {
100
- return;
101
- }
102
- const { projectRoot } = platformData;
103
- const exclusionsPodfile = path.join(projectRoot, "Podfile-exclusions");
104
- if (!this.$fs.exists(exclusionsPodfile)) {
105
- const exclusions = `
81
+ async applyPodfileArchExclusions(projectData, platformData) {
82
+ const xcodeVersionData = await this.$xcodeSelectService.getXcodeVersion();
83
+ if (+xcodeVersionData.major !== 12) {
84
+ return;
85
+ }
86
+ const { projectRoot } = platformData;
87
+ const exclusionsPodfile = path.join(projectRoot, "Podfile-exclusions");
88
+ if (!this.$fs.exists(exclusionsPodfile)) {
89
+ const exclusions = `
106
90
  post_install do |installer|
107
91
  installer.pods_project.build_configurations.each do |config|
108
92
  config.build_settings.delete "VALID_ARCHS"
@@ -111,75 +95,70 @@ post_install do |installer|
111
95
  config.build_settings["EXCLUDED_ARCHS[sdk=iphoneos*]"] = "i386 armv6 armv7 armv7s armv8 x86_64"
112
96
  end
113
97
  end`.trim();
114
- this.$fs.writeFile(exclusionsPodfile, exclusions);
115
- }
116
- yield this.applyPodfileToProject("NativeScript-CLI-Architecture-Exclusions", exclusionsPodfile, projectData, platformData);
117
- this.$fs.deleteFile(exclusionsPodfile);
118
- });
98
+ this.$fs.writeFile(exclusionsPodfile, exclusions);
99
+ }
100
+ await this.applyPodfileToProject("NativeScript-CLI-Architecture-Exclusions", exclusionsPodfile, projectData, platformData);
101
+ this.$fs.deleteFile(exclusionsPodfile);
119
102
  }
120
- applyPodfileFromExtensions(projectData, platformData) {
121
- return __awaiter(this, void 0, void 0, function* () {
122
- const extensionFolderPath = path.join(projectData.getAppResourcesDirectoryPath(), constants.iOSAppResourcesFolderName, constants.NATIVE_EXTENSION_FOLDER);
123
- const projectPodfilePath = this.getProjectPodfilePath(platformData.projectRoot);
124
- if (!this.$fs.exists(extensionFolderPath) ||
125
- !this.$fs.exists(projectPodfilePath)) {
126
- return;
103
+ async applyPodfileFromExtensions(projectData, platformData) {
104
+ const extensionFolderPath = path.join(projectData.getAppResourcesDirectoryPath(), constants.iOSAppResourcesFolderName, constants.NATIVE_EXTENSION_FOLDER);
105
+ const projectPodfilePath = this.getProjectPodfilePath(platformData.projectRoot);
106
+ if (!this.$fs.exists(extensionFolderPath) ||
107
+ !this.$fs.exists(projectPodfilePath)) {
108
+ return;
109
+ }
110
+ let projectPodFileContent = this.$fs.readText(projectPodfilePath);
111
+ const extensionsPodfile = this.$fs
112
+ .readDirectory(extensionFolderPath)
113
+ .filter((name) => {
114
+ const extensionPath = path.join(extensionFolderPath, name);
115
+ const stats = this.$fs.getFsStats(extensionPath);
116
+ return stats.isDirectory() && !name.startsWith(".");
117
+ })
118
+ .map((name) => ({
119
+ targetName: name,
120
+ podfilePath: path.join(extensionFolderPath, name, constants.PODFILE_NAME),
121
+ }));
122
+ extensionsPodfile.forEach(({ targetName, podfilePath }) => {
123
+ const regExpToRemove = new RegExp(`${this.getExtensionPodfileHeader(podfilePath, targetName)}[\\s\\S]*?${this.getExtensionPodfileEnd()}`, "mg");
124
+ projectPodFileContent = projectPodFileContent.replace(regExpToRemove, "");
125
+ if (this.$fs.exists(podfilePath)) {
126
+ const podfileContentWithoutTarget = this.$fs.readText(podfilePath);
127
+ const podFileContent = this.getExtensionPodfileHeader(podfilePath, targetName) +
128
+ os_1.EOL +
129
+ podfileContentWithoutTarget +
130
+ os_1.EOL +
131
+ this.getExtensionPodfileEnd();
132
+ projectPodFileContent += os_1.EOL + podFileContent;
127
133
  }
128
- let projectPodFileContent = this.$fs.readText(projectPodfilePath);
129
- const extensionsPodfile = this.$fs
130
- .readDirectory(extensionFolderPath)
131
- .filter((name) => {
132
- const extensionPath = path.join(extensionFolderPath, name);
133
- const stats = this.$fs.getFsStats(extensionPath);
134
- return stats.isDirectory() && !name.startsWith(".");
135
- })
136
- .map((name) => ({
137
- targetName: name,
138
- podfilePath: path.join(extensionFolderPath, name, constants.PODFILE_NAME),
139
- }));
140
- extensionsPodfile.forEach(({ targetName, podfilePath }) => {
141
- const regExpToRemove = new RegExp(`${this.getExtensionPodfileHeader(podfilePath, targetName)}[\\s\\S]*?${this.getExtensionPodfileEnd()}`, "mg");
142
- projectPodFileContent = projectPodFileContent.replace(regExpToRemove, "");
143
- if (this.$fs.exists(podfilePath)) {
144
- const podfileContentWithoutTarget = this.$fs.readText(podfilePath);
145
- const podFileContent = this.getExtensionPodfileHeader(podfilePath, targetName) +
146
- os_1.EOL +
147
- podfileContentWithoutTarget +
148
- os_1.EOL +
149
- this.getExtensionPodfileEnd();
150
- projectPodFileContent += os_1.EOL + podFileContent;
151
- }
152
- });
153
- this.$fs.writeFile(projectPodfilePath, projectPodFileContent);
154
134
  });
135
+ this.$fs.writeFile(projectPodfilePath, projectPodFileContent);
155
136
  }
156
- applyPodfileToProject(moduleName, podfilePath, projectData, platformData) {
157
- return __awaiter(this, void 0, void 0, function* () {
158
- const nativeProjectPath = platformData.projectRoot;
159
- if (!this.$fs.exists(podfilePath)) {
160
- this.removePodfileFromProject(moduleName, podfilePath, projectData, nativeProjectPath);
161
- return;
162
- }
163
- const { podfileContent, replacedFunctions, podfilePlatformData } = this.buildPodfileContent(podfilePath, moduleName, projectData, platformData);
164
- const pathToProjectPodfile = this.getProjectPodfilePath(nativeProjectPath);
165
- const projectPodfileContent = this.$fs.exists(pathToProjectPodfile)
166
- ? this.$fs.readText(pathToProjectPodfile).trim()
137
+ async applyPodfileToProject(moduleName, podfilePath, projectData, platformData) {
138
+ const nativeProjectPath = platformData.projectRoot;
139
+ if (!this.$fs.exists(podfilePath)) {
140
+ this.removePodfileFromProject(moduleName, podfilePath, projectData, nativeProjectPath);
141
+ return;
142
+ }
143
+ const { podfileContent, replacedFunctions, podfilePlatformData } = this.buildPodfileContent(podfilePath, moduleName, projectData, platformData);
144
+ const pathToProjectPodfile = this.getProjectPodfilePath(nativeProjectPath);
145
+ const projectPodfileContent = this.$fs.exists(pathToProjectPodfile)
146
+ ? this.$fs.readText(pathToProjectPodfile).trim()
147
+ : "";
148
+ if (projectPodfileContent.indexOf(podfileContent) === -1) {
149
+ this.removePodfileFromProject(moduleName, podfilePath, projectData, nativeProjectPath);
150
+ let finalPodfileContent = this.$fs.exists(pathToProjectPodfile)
151
+ ? this.getPodfileContentWithoutTarget(projectData, this.$fs.readText(pathToProjectPodfile))
167
152
  : "";
168
- if (projectPodfileContent.indexOf(podfileContent) === -1) {
169
- this.removePodfileFromProject(moduleName, podfilePath, projectData, nativeProjectPath);
170
- let finalPodfileContent = this.$fs.exists(pathToProjectPodfile)
171
- ? this.getPodfileContentWithoutTarget(projectData, this.$fs.readText(pathToProjectPodfile))
172
- : "";
173
- if (podfileContent.indexOf(CocoaPodsService.PODFILE_POST_INSTALL_SECTION_NAME) !== -1) {
174
- finalPodfileContent = this.addPostInstallHook(replacedFunctions, finalPodfileContent, podfileContent);
175
- }
176
- if (podfilePlatformData) {
177
- finalPodfileContent = this.$cocoaPodsPlatformManager.addPlatformSection(projectData, podfilePlatformData, finalPodfileContent);
178
- }
179
- finalPodfileContent = `${finalPodfileContent.trim()}${os_1.EOL}${os_1.EOL}${podfileContent.trim()}${os_1.EOL}`;
180
- this.saveProjectPodfile(projectData, finalPodfileContent, nativeProjectPath);
153
+ if (podfileContent.indexOf(CocoaPodsService.PODFILE_POST_INSTALL_SECTION_NAME) !== -1) {
154
+ finalPodfileContent = this.addPostInstallHook(replacedFunctions, finalPodfileContent, podfileContent);
181
155
  }
182
- });
156
+ if (podfilePlatformData) {
157
+ finalPodfileContent = this.$cocoaPodsPlatformManager.addPlatformSection(projectData, podfilePlatformData, finalPodfileContent);
158
+ }
159
+ finalPodfileContent = `${finalPodfileContent.trim()}${os_1.EOL}${os_1.EOL}${podfileContent.trim()}${os_1.EOL}`;
160
+ this.saveProjectPodfile(projectData, finalPodfileContent, nativeProjectPath);
161
+ }
183
162
  }
184
163
  removePodfileFromProject(moduleName, podfilePath, projectData, projectRoot) {
185
164
  if (this.$fs.exists(this.getProjectPodfilePath(projectRoot))) {
@@ -348,7 +327,7 @@ end`.trim();
348
327
  return pods;
349
328
  }
350
329
  }
330
+ exports.CocoaPodsService = CocoaPodsService;
351
331
  CocoaPodsService.PODFILE_POST_INSTALL_SECTION_NAME = "post_install";
352
332
  CocoaPodsService.INSTALLER_BLOCK_PARAMETER_NAME = "installer";
353
- exports.CocoaPodsService = CocoaPodsService;
354
333
  yok_1.injector.register("cocoapodsService", CocoaPodsService);
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.DeviceInstallAppService = void 0;
13
4
  const constants_1 = require("../../constants");
@@ -24,72 +15,64 @@ class DeviceInstallAppService {
24
15
  this.$projectDataService = $projectDataService;
25
16
  this.$platformsDataService = $platformsDataService;
26
17
  }
27
- installOnDevice(device, buildData, packageFile) {
28
- return __awaiter(this, void 0, void 0, function* () {
29
- this.$logger.info(`Installing on device ${device.deviceInfo.identifier}...`);
30
- const platform = device.deviceInfo.platform.toLowerCase();
31
- const projectData = this.$projectDataService.getProjectData(buildData.projectDir);
32
- const platformData = this.$platformsDataService.getPlatformData(platform, projectData);
33
- yield this.$analyticsService.trackEventActionInGoogleAnalytics({
34
- action: "Deploy",
35
- device,
36
- projectDir: projectData.projectDir,
37
- });
38
- if (!packageFile) {
39
- packageFile = yield this.$buildArtifactsService.getLatestAppPackagePath(platformData, buildData);
40
- }
41
- yield platformData.platformProjectService.cleanDeviceTempFolder(device.deviceInfo.identifier, projectData);
42
- const appIdentifier = projectData.projectIdentifiers[platform];
43
- const outputFilePath = buildData.outputPath || platformData.getBuildOutputPath(buildData);
44
- yield device.applicationManager.reinstallApplication(appIdentifier, packageFile, buildData);
45
- yield this.updateHashesOnDevice({
46
- device,
47
- appIdentifier,
48
- outputFilePath,
49
- platformData,
50
- });
51
- if (!buildData.release) {
52
- yield this.$buildInfoFileService.saveDeviceBuildInfo(device, projectData, outputFilePath);
53
- }
54
- this.$logger.info(`Successfully installed on device with identifier '${device.deviceInfo.identifier}'.`);
18
+ async installOnDevice(device, buildData, packageFile) {
19
+ this.$logger.info(`Installing on device ${device.deviceInfo.identifier}...`);
20
+ const platform = device.deviceInfo.platform.toLowerCase();
21
+ const projectData = this.$projectDataService.getProjectData(buildData.projectDir);
22
+ const platformData = this.$platformsDataService.getPlatformData(platform, projectData);
23
+ await this.$analyticsService.trackEventActionInGoogleAnalytics({
24
+ action: "Deploy",
25
+ device,
26
+ projectDir: projectData.projectDir,
55
27
  });
56
- }
57
- installOnDeviceIfNeeded(device, buildData, packageFile) {
58
- return __awaiter(this, void 0, void 0, function* () {
59
- const shouldInstall = yield this.shouldInstall(device, buildData);
60
- if (shouldInstall) {
61
- yield this.installOnDevice(device, buildData, packageFile);
62
- }
28
+ if (!packageFile) {
29
+ packageFile = await this.$buildArtifactsService.getLatestAppPackagePath(platformData, buildData);
30
+ }
31
+ await platformData.platformProjectService.cleanDeviceTempFolder(device.deviceInfo.identifier, projectData);
32
+ const appIdentifier = projectData.projectIdentifiers[platform];
33
+ const outputFilePath = buildData.outputPath || platformData.getBuildOutputPath(buildData);
34
+ await device.applicationManager.reinstallApplication(appIdentifier, packageFile, buildData);
35
+ await this.updateHashesOnDevice({
36
+ device,
37
+ appIdentifier,
38
+ outputFilePath,
39
+ platformData,
63
40
  });
41
+ if (!buildData.release) {
42
+ await this.$buildInfoFileService.saveDeviceBuildInfo(device, projectData, outputFilePath);
43
+ }
44
+ this.$logger.info(`Successfully installed on device with identifier '${device.deviceInfo.identifier}'.`);
64
45
  }
65
- shouldInstall(device, buildData) {
66
- return __awaiter(this, void 0, void 0, function* () {
67
- const projectData = this.$projectDataService.getProjectData(buildData.projectDir);
68
- const platformData = this.$platformsDataService.getPlatformData(device.deviceInfo.platform, projectData);
69
- const platform = device.deviceInfo.platform;
70
- if (!(yield device.applicationManager.isApplicationInstalled(projectData.projectIdentifiers[platform.toLowerCase()]))) {
71
- return true;
72
- }
73
- const deviceBuildInfo = yield this.$buildInfoFileService.getDeviceBuildInfo(device, projectData);
74
- const localBuildInfo = this.$buildInfoFileService.getLocalBuildInfo(platformData, Object.assign(Object.assign({}, buildData), { buildForDevice: !device.isEmulator }));
75
- return (!localBuildInfo ||
76
- !deviceBuildInfo ||
77
- deviceBuildInfo.buildTime !== localBuildInfo.buildTime);
78
- });
46
+ async installOnDeviceIfNeeded(device, buildData, packageFile) {
47
+ const shouldInstall = await this.shouldInstall(device, buildData);
48
+ if (shouldInstall) {
49
+ await this.installOnDevice(device, buildData, packageFile);
50
+ }
79
51
  }
80
- updateHashesOnDevice(data) {
81
- return __awaiter(this, void 0, void 0, function* () {
82
- const { device, appIdentifier, platformData, outputFilePath } = data;
83
- if (!this.$mobileHelper.isAndroidPlatform(platformData.normalizedPlatformName)) {
84
- return;
85
- }
86
- let hashes = {};
87
- const hashesFilePath = path.join(outputFilePath, constants_1.HASHES_FILE_NAME);
88
- if (this.$fs.exists(hashesFilePath)) {
89
- hashes = this.$fs.readJson(hashesFilePath);
90
- }
91
- yield device.fileSystem.updateHashesOnDevice(hashes, appIdentifier);
92
- });
52
+ async shouldInstall(device, buildData) {
53
+ const projectData = this.$projectDataService.getProjectData(buildData.projectDir);
54
+ const platformData = this.$platformsDataService.getPlatformData(device.deviceInfo.platform, projectData);
55
+ const platform = device.deviceInfo.platform;
56
+ if (!(await device.applicationManager.isApplicationInstalled(projectData.projectIdentifiers[platform.toLowerCase()]))) {
57
+ return true;
58
+ }
59
+ const deviceBuildInfo = await this.$buildInfoFileService.getDeviceBuildInfo(device, projectData);
60
+ const localBuildInfo = this.$buildInfoFileService.getLocalBuildInfo(platformData, { ...buildData, buildForDevice: !device.isEmulator });
61
+ return (!localBuildInfo ||
62
+ !deviceBuildInfo ||
63
+ deviceBuildInfo.buildTime !== localBuildInfo.buildTime);
64
+ }
65
+ async updateHashesOnDevice(data) {
66
+ const { device, appIdentifier, platformData, outputFilePath } = data;
67
+ if (!this.$mobileHelper.isAndroidPlatform(platformData.normalizedPlatformName)) {
68
+ return;
69
+ }
70
+ let hashes = {};
71
+ const hashesFilePath = path.join(outputFilePath, constants_1.HASHES_FILE_NAME);
72
+ if (this.$fs.exists(hashesFilePath)) {
73
+ hashes = this.$fs.readJson(hashesFilePath);
74
+ }
75
+ await device.fileSystem.updateHashesOnDevice(hashes, appIdentifier);
93
76
  }
94
77
  }
95
78
  exports.DeviceInstallAppService = DeviceInstallAppService;