From 9d67e44cdf640a4707a74bd0279dec45006d9c7a Mon Sep 17 00:00:00 2001 From: Hristo Deshev Date: Mon, 20 Mar 2017 14:48:14 +0200 Subject: [PATCH] Work around an issue with webpack's extension resolution. Not resolving ../utils imports. --- tns-core-modules/ui/frame/frame.ios.ts | 4 +++- tns-core-modules/ui/page/page.ios.ts | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tns-core-modules/ui/frame/frame.ios.ts b/tns-core-modules/ui/frame/frame.ios.ts index 05d17f23f..646f24f09 100644 --- a/tns-core-modules/ui/frame/frame.ios.ts +++ b/tns-core-modules/ui/frame/frame.ios.ts @@ -5,7 +5,9 @@ import { Page } from "../page"; //Types. import { FrameBase, View, application, layout, traceEnabled, traceWrite, traceCategories, isCategorySet } from "./frame-common"; import { _createIOSAnimatedTransitioning } from "../transition"; -import * as uiUtils from "../utils"; +// HACK: Webpack. Use a fully-qualified import to allow resolve.extensions(.ios.js) to +// kick in. `../utils` doesn't seem to trigger the webpack extensions mechanism. +import * as uiUtils from "tns-core-modules/ui/utils"; import * as utils from "../../utils/utils"; export * from "./frame-common"; diff --git a/tns-core-modules/ui/page/page.ios.ts b/tns-core-modules/ui/page/page.ios.ts index 1face8b13..4f9bf148b 100644 --- a/tns-core-modules/ui/page/page.ios.ts +++ b/tns-core-modules/ui/page/page.ios.ts @@ -5,7 +5,9 @@ } from "./page-common"; import { ios as iosApp } from "../../application"; import { device } from "../../platform"; -import * as uiUtils from "../utils"; +// HACK: Webpack. Use a fully-qualified import to allow resolve.extensions(.ios.js) to +// kick in. `../utils` doesn't seem to trigger the webpack extensions mechanism. +import * as uiUtils from "tns-core-modules/ui/utils"; export * from "./page-common";