Merge branch 'master' into darind/v8-update

Author: rigor789

CHANGELOG.md

@@ -1,8 +1,26 @@
+7.1.1
+===
+
+- Reverted: Updated V8 to 8.9 (https://github.com/NativeScript/ns-v8ios-runtime/pull/84)
+
+This release should restore debugging in chrome-devtools.
+
+7.1.0
+===
+
+### Features
+- Updated V8 to 8.9 (https://github.com/NativeScript/ns-v8ios-runtime/pull/84)
+
+### Bug Fixes
+- XCode 12.3 support (https://github.com/NativeScript/ns-v8ios-runtime/pull/92)
+- DictionaryAdapter missing handle scopes and locks (https://github.com/NativeScript/ns-v8ios-runtime/pull/90)
+- PromiseProxy returns function regardless of underlying property type (https://github.com/NativeScript/ns-v8ios-runtime/pull/90)
+
 7.0.6
 ===
 
 ### Bug Fixes
-- Do not prematurely release blocks (https://github.com/NativeScript/ns-v8ios-runtime/pull5/83)
+- Do not prematurely release blocks (https://github.com/NativeScript/ns-v8ios-runtime/pull/83)
 
 
 7.0.5
@@ -113,4 +131,4 @@
 6.2.0-alpha.1-v8 (2019-09-18)
 =====
 
-Initial public release
+Initial public release

NativeScript/NativeScript-Prefix.pch

@@ -1,7 +1,7 @@
 #ifndef NativeScript_Prefix_pch
 #define NativeScript_Prefix_pch
 
-#define NATIVESCRIPT_VERSION "7.0.0"
+#define NATIVESCRIPT_VERSION "7.1.1"
 
 #ifdef DEBUG
 #define SIZEOF_OFF_T 8

NativeScript/runtime/DictionaryAdapter.mm

@@ -34,6 +34,10 @@ - (instancetype)initWithMap:(std::shared_ptr<Persistent<Value>>)map isolate:(Iso
 
 - (id)nextObject {
     Isolate* isolate = self->isolate_;
+    v8::Locker locker(isolate);
+    Isolate::Scope isolate_scope(isolate);
+    HandleScope handle_scope(isolate);
+
     Local<Context> context = self->cache_->GetContext();
     Local<v8::Array> array = self->map_->Get(isolate).As<Map>()->AsArray();
 
@@ -82,15 +86,23 @@ - (instancetype)initWithProperties:(std::shared_ptr<Persistent<Value>>)dictionar
 }
 
 - (Local<v8::Array>)getProperties {
+    v8::Locker locker(self->isolate_);
+    Isolate::Scope isolate_scope(self->isolate_);
+    EscapableHandleScope handle_scope(self->isolate_);
+
     Local<Context> context = self->cache_->GetContext();
     Local<v8::Array> properties;
     Local<Object> dictionary = self->dictionary_->Get(self->isolate_).As<Object>();
     tns::Assert(dictionary->GetOwnPropertyNames(context).ToLocal(&properties), self->isolate_);
-    return properties;
+    return handle_scope.Escape(properties);
 }
 
 - (id)nextObject {
     Isolate* isolate = self->isolate_;
+    v8::Locker locker(isolate);
+    Isolate::Scope isolate_scope(isolate);
+    HandleScope handle_scope(isolate);
+
     Local<Context> context = self->cache_->GetContext();
     Local<v8::Array> properties = [self getProperties];
     if (self->index_ < properties->Length()) {
@@ -107,6 +119,10 @@ - (id)nextObject {
 
 - (NSArray*)allObjects {
     Isolate* isolate = self->isolate_;
+    v8::Locker locker(isolate);
+    Isolate::Scope isolate_scope(isolate);
+    HandleScope handle_scope(isolate);
+
     Local<Context> context = self->cache_->GetContext();
     NSMutableArray* array = [NSMutableArray array];
     Local<v8::Array> properties = [self getProperties];
@@ -146,6 +162,10 @@ - (instancetype)initWithJSObject:(Local<Object>)jsObject isolate:(Isolate*)isola
 }
 
 - (NSUInteger)count {
+    v8::Locker locker(self->isolate_);
+    Isolate::Scope isolate_scope(self->isolate_);
+    HandleScope handle_scope(self->isolate_);
+
     Local<Object> obj = self->object_->Get(self->isolate_).As<Object>();
 
     if (obj->IsMap()) {
@@ -163,6 +183,10 @@ - (NSUInteger)count {
 
 - (id)objectForKey:(id)aKey {
     Isolate* isolate = self->isolate_;
+    v8::Locker locker(isolate);
+    Isolate::Scope isolate_scope(isolate);
+    HandleScope handle_scope(isolate);
+
     Local<Context> context = self->cache_->GetContext();
     Local<Object> obj = self->object_->Get(self->isolate_).As<Object>();
 
@@ -194,6 +218,10 @@ - (id)objectForKey:(id)aKey {
 }
 
 - (NSEnumerator*)keyEnumerator {
+    v8::Locker locker(self->isolate_);
+    Isolate::Scope isolate_scope(self->isolate_);
+    HandleScope handle_scope(self->isolate_);
+
     Local<Value> obj = self->object_->Get(self->isolate_);
 
     if (obj->IsMap()) {

NativeScript/runtime/PromiseProxy.cpp

@@ -28,14 +28,14 @@ void PromiseProxy::Init(v8::Local<v8::Context> context) {
                     return new Proxy(promise, {
                         get: function(target, name) {
                             let orig = target[name];
-                            if (name === "then" || name === "catch") {
+                            if (name === "then" || name === "catch" || name === "finally") {
                                 return orig.bind(target);
                             }
-                            return function(x) {
+                            return typeof orig === 'function' ? function(x) {
                                 CFRunLoopPerformBlock(runloop, kCFRunLoopDefaultMode, orig.bind(target, x));
                                 CFRunLoopWakeUp(runloop);
                                 return target;
-                            };
+                            } : orig;
                         }
                     });
                 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nativescript/ios",
   "description": "NativeScript Runtime for iOS",
-  "version": "7.0.6",
+  "version": "7.1.1",
   "keywords": [
     "NativeScript",
     "iOS",

project-template/internal/nativescript-build.xcconfig

@@ -21,4 +21,5 @@ LDPLUSPLUS = $SRCROOT/internal/nsld.sh
 // Xcode 12 
 EXCLUDED_ARCHS_x86_64 = arm64 arm64e
 EXCLUDED_ARCHS[sdk=iphonesimulator*] = i386 armv6 armv7 armv7s armv8 $(EXCLUDED_ARCHS_$(NATIVE_ARCH_64_BIT))
-EXCLUDED_ARCHS[sdk=iphoneos*] = i386 armv6 armv7 armv7s armv8 x86_64
+EXCLUDED_ARCHS[sdk=iphoneos*] = i386 armv6 armv7 armv7s armv8 x86_64
+VALIDATE_WORKSPACE = YES