diff --git a/packages/core/ui/gestures/index.android.ts b/packages/core/ui/gestures/index.android.ts index aef28d4218..31ddf9d331 100644 --- a/packages/core/ui/gestures/index.android.ts +++ b/packages/core/ui/gestures/index.android.ts @@ -1,6 +1,6 @@ // Definitions. import { GestureEventData, TapGestureEventData, SwipeGestureEventData, PanGestureEventData, RotationGestureEventData, GestureEventDataWithState } from '.'; -import { View } from '../core/view'; +import type { View } from '../core/view'; import { EventData } from '../../data/observable'; // Types. diff --git a/packages/core/ui/gestures/index.ios.ts b/packages/core/ui/gestures/index.ios.ts index 5a401cd0b6..93696c026d 100644 --- a/packages/core/ui/gestures/index.ios.ts +++ b/packages/core/ui/gestures/index.ios.ts @@ -1,7 +1,7 @@ // Definitions. import { GestureEventData, TapGestureEventData, GestureEventDataWithState, SwipeGestureEventData, PanGestureEventData, RotationGestureEventData, PinchGestureEventData } from '.'; -import { View } from '../core/view'; +import type { View } from '../core/view'; import { EventData } from '../../data/observable'; // Types. diff --git a/packages/core/ui/gestures/touch-manager.ts b/packages/core/ui/gestures/touch-manager.ts index dd89b3ffa0..726be7e28b 100644 --- a/packages/core/ui/gestures/touch-manager.ts +++ b/packages/core/ui/gestures/touch-manager.ts @@ -5,7 +5,7 @@ import { GestureEventData, GestureEventDataWithState, TouchGestureEventData } from '.'; import { Animation } from '../animation'; import { AnimationDefinition } from '../animation/animation-interfaces'; -import { View } from '../core/view'; +import type { View } from '../core/view'; import { isObject, isFunction } from '../../utils/types'; import { GestureEvents, GestureStateTypes, GestureTypes } from './gestures-common'; @@ -169,7 +169,7 @@ export class TouchManager { } } - view.on(View.disposeNativeViewEvent, (args) => { + view.on('disposeNativeView', (args) => { const index = TouchManager.touchHandlers?.findIndex((handler) => handler.view === args.object); if (index > -1) { TouchManager.touchHandlers.splice(index, 1); diff --git a/packages/core/ui/styling/style/index.ts b/packages/core/ui/styling/style/index.ts index 29bffe392a..2090d3efe8 100644 --- a/packages/core/ui/styling/style/index.ts +++ b/packages/core/ui/styling/style/index.ts @@ -43,7 +43,7 @@ export class Style extends Observable implements StyleDefinition { super(); // HACK: Could not find better way for cross platform WeakRef type checking. - if (ownerView.constructor.toString().indexOf('[native code]') !== -1) { + if (ownerView.constructor.toString().indexOf('[native code]') !== -1 || ownerView.toString() == '[object WeakRef]') { this.viewRef = >ownerView; } else { this.viewRef = new WeakRef(ownerView); diff --git a/packages/webpack5/package-lock.json b/packages/webpack5/package-lock.json index d0236d14c8..55d74bcbe9 100644 --- a/packages/webpack5/package-lock.json +++ b/packages/webpack5/package-lock.json @@ -1,12 +1,12 @@ { "name": "@nativescript/webpack", - "version": "5.0.22", + "version": "5.0.23-napi.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@nativescript/webpack", - "version": "5.0.22", + "version": "5.0.23-napi.0", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.0.0", diff --git a/packages/webpack5/src/loaders/nativescript-hot-loader/hmr.runtime.ts b/packages/webpack5/src/loaders/nativescript-hot-loader/hmr.runtime.ts index bb8a315d1d..b36d405ce2 100644 --- a/packages/webpack5/src/loaders/nativescript-hot-loader/hmr.runtime.ts +++ b/packages/webpack5/src/loaders/nativescript-hot-loader/hmr.runtime.ts @@ -59,14 +59,15 @@ if (module.hot) { }, }; - const checkAndApply = async () => { + // Important: Keep as function and not fat arrow; at the moment hermes does not support them + const checkAndApply = async function () { hash = __webpack_require__.h(); const modules = await module.hot.check().catch((error) => { return setStatus( hash, 'failure', 'Failed to check.', - error.message || error.stack + error.message || error.stack, ); }); @@ -82,7 +83,7 @@ if (module.hot) { hash, 'failure', 'Failed to apply.', - error.message || error.stack + error.message || error.stack, ); });