nativescript 8.5.2 → 8.5.3

package/lib/common/services/hooks-service.js

@@ -307,7 +307,11 @@ class HooksService {
 }
 HooksService.HOOKS_DIRECTORY_NAME = "hooks";
 __decorate([
-    (0, decorators_1.cache)()
+    (0, decorators_1.memoize)({
+        shouldCache() {
+            return !!this.hooksDirectories.length;
+        },
+    })
 ], HooksService.prototype, "initialize", null);
 exports.HooksService = HooksService;
 yok_1.injector.register("hooksService", HooksService);

package/lib/services/project-cleanup-service.js

@@ -22,9 +22,9 @@ class ProjectCleanupService {
     clean(pathsToClean, options) {
         return __awaiter(this, void 0, void 0, function* () {
             this.spinner = this.$terminalSpinnerService.createSpinner({
-                isSilent: options.silent,
+                isSilent: options === null || options === void 0 ? void 0 : options.silent,
             });
-            let stats = options.stats ? new Map() : false;
+            let stats = (options === null || options === void 0 ? void 0 : options.stats) ? new Map() : false;
             let success = true;
             for (const pathToClean of pathsToClean) {
                 const cleanRes = yield this.cleanPath(pathToClean, options).catch((error) => {

package/lib/services/xcconfig-service.js

@@ -37,7 +37,13 @@ class XcconfigService {
             }
             const escapedDestinationFile = destinationFile.replace(/'/g, "\\'");
             const escapedSourceFile = sourceFile.replace(/'/g, "\\'");
-            const mergeScript = `require 'xcodeproj'; Xcodeproj::Config.new('${escapedDestinationFile}').merge(Xcodeproj::Config.new('${escapedSourceFile}')).save_as(Pathname.new('${escapedDestinationFile}'))`;
+            const mergeScript = `require 'xcodeproj';
+		sourceConfig = Xcodeproj::Config.new('${escapedDestinationFile}')
+		targetConfig = Xcodeproj::Config.new('${escapedSourceFile}')
+		if(sourceConfig.attributes.key?('IPHONEOS_DEPLOYMENT_TARGET') && targetConfig.attributes.key?('IPHONEOS_DEPLOYMENT_TARGET'))
+			sourceConfig.attributes.delete('IPHONEOS_DEPLOYMENT_TARGET')
+		end
+		sourceConfig.merge(targetConfig).save_as(Pathname.new('${escapedDestinationFile}'))`;
             yield this.$childProcess.exec(`ruby -e "${mergeScript}"`);
         });
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "8.5.2",
+  "version": "8.5.3",
   "author": "NativeScript <support@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {