From 9341cd95547f3ecf3b94477c7925f84f06383e17 Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Thu, 2 Jul 2020 23:44:00 -0700 Subject: [PATCH] chore: cleanup reexporting and TS 3.9 support --- nativescript-core/index.d.ts | 6 +-- nativescript-core/index.ts | 5 +-- .../bottom-navigation.android.ts | 5 --- .../bottom-navigation/bottom-navigation.d.ts | 5 --- .../bottom-navigation.ios.ts | 5 --- nativescript-core/ui/button/button-common.ts | 2 - .../ui/content-view/content-view.ts | 2 - .../ui/core/bindable/bindable.ts | 5 --- .../ui/core/properties/properties.ts | 2 - .../ui/core/view-base/view-base.ts | 13 ++----- nativescript-core/ui/core/view/view-common.ts | 4 -- .../ui/date-picker/date-picker-common.ts | 2 - .../editable-text-base-common.ts | 2 - nativescript-core/ui/frame/frame-common.ts | 1 - .../ui/html-view/html-view-common.ts | 6 +-- nativescript-core/ui/index.ts | 2 +- nativescript-core/ui/styling/style/style.d.ts | 2 +- .../ui/text-field/text-field-common.ts | 2 - .../ui/time-picker/time-picker-common.ts | 2 - .../ui/web-view/web-view-common.ts | 1 - .../ui/web-view/web-view.android.ts | 23 ++++++------ nativescript-core/ui/web-view/web-view.ios.ts | 23 ++++++------ package.json | 37 ++++++++++--------- 23 files changed, 55 insertions(+), 102 deletions(-) diff --git a/nativescript-core/index.d.ts b/nativescript-core/index.d.ts index 9caf9a3af..7fab07b92 100644 --- a/nativescript-core/index.d.ts +++ b/nativescript-core/index.d.ts @@ -1,7 +1,7 @@ /// export { ApplicationEventData, LaunchEventData, OrientationChangedEventData, UnhandledErrorEventData, DiscardedErrorEventData, CssChangedEventData, LoadAppCSSEventData, iOSApplication, AndroidApplication, AndroidActivityEventData, AndroidActivityBundleEventData, AndroidActivityRequestPermissionsEventData, AndroidActivityResultEventData, AndroidActivityNewIntentEventData, AndroidActivityBackPressedEventData, } from "./application"; -import { getMainEntry, getRootView, setResources, setCssFileName, getCssFileName, loadAppCss, addCss, on, off, run, orientation, getNativeApplication, hasLaunched } from "./application"; +import { getMainEntry, getRootView, setResources, setCssFileName, getCssFileName, loadAppCss, addCss, on, off, run, orientation, getNativeApplication, hasLaunched, AndroidApplication, iOSApplication } from "./application"; export declare const Application: { launchEvent: string; displayedEvent: string; @@ -25,8 +25,8 @@ export declare const Application: { orientation: typeof orientation; getNativeApplication: typeof getNativeApplication; hasLaunched: typeof hasLaunched; - android: import("./application/application").AndroidApplication; - ios: import("./application/application").iOSApplication; + android: AndroidApplication; + ios: iOSApplication; }; import { setString, getString, clear, flush, getAllKeys, getBoolean, getNumber, hasKey, remove, setBoolean, setNumber } from "./application-settings"; export declare const ApplicationSettings: { diff --git a/nativescript-core/index.ts b/nativescript-core/index.ts index aab8e0a03..bfe4cb255 100644 --- a/nativescript-core/index.ts +++ b/nativescript-core/index.ts @@ -9,7 +9,7 @@ export { AndroidActivityEventData, AndroidActivityBundleEventData, AndroidActivityRequestPermissionsEventData, AndroidActivityResultEventData, - AndroidActivityNewIntentEventData, AndroidActivityBackPressedEventData, + AndroidActivityNewIntentEventData, AndroidActivityBackPressedEventData } from "./application"; // Export all methods and fields from "application" as Application @@ -19,7 +19,6 @@ import { getMainEntry, getRootView, setResources, setCssFileName, getCssFileName, loadAppCss, addCss, on, off, run, orientation, getNativeApplication, hasLaunched, - android, ios, } from "./application"; export const Application = { @@ -29,7 +28,7 @@ export const Application = { getMainEntry, getRootView, setResources, setCssFileName, getCssFileName, loadAppCss, addCss, on, off, run, orientation, getNativeApplication, hasLaunched, - android, ios, + android: android, ios: ios, }; // Export all methods from "application-settings" as ApplicationSettings diff --git a/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts b/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts index 26e4a4989..091a1a5eb 100644 --- a/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts +++ b/nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts @@ -19,11 +19,6 @@ import { getTransformedText } from "../text-base"; // TODO: Impl trace // import { isEnabled as traceEnabled, write as traceWrite } from "../../../trace"; -export * from "../tab-navigation-base/tab-content-item"; -export * from "../tab-navigation-base/tab-navigation-base"; -export * from "../tab-navigation-base/tab-strip"; -export * from "../tab-navigation-base/tab-strip-item"; - const PRIMARY_COLOR = "colorPrimary"; const DEFAULT_ELEVATION = 8; diff --git a/nativescript-core/ui/bottom-navigation/bottom-navigation.d.ts b/nativescript-core/ui/bottom-navigation/bottom-navigation.d.ts index 5f25dee5f..c417292ad 100644 --- a/nativescript-core/ui/bottom-navigation/bottom-navigation.d.ts +++ b/nativescript-core/ui/bottom-navigation/bottom-navigation.d.ts @@ -8,11 +8,6 @@ import { TabContentItem } from "../tab-navigation-base/tab-content-item"; import { TabStrip } from "../tab-navigation-base/tab-strip"; import { Property, CoercibleProperty, EventData } from "../core/view"; -export * from "../tab-navigation-base/tab-content-item"; -export * from "../tab-navigation-base/tab-navigation-base"; -export * from "../tab-navigation-base/tab-strip"; -export * from "../tab-navigation-base/tab-strip-item"; - /** * Defines the data for the TabView.selectedIndexChanged event. */ diff --git a/nativescript-core/ui/bottom-navigation/bottom-navigation.ios.ts b/nativescript-core/ui/bottom-navigation/bottom-navigation.ios.ts index 73fc214b2..9d7eeeeff 100644 --- a/nativescript-core/ui/bottom-navigation/bottom-navigation.ios.ts +++ b/nativescript-core/ui/bottom-navigation/bottom-navigation.ios.ts @@ -20,11 +20,6 @@ import { getTransformedText } from "../text-base"; // TODO: // import { profile } from "../../profiling"; -export * from "../tab-navigation-base/tab-content-item"; -export * from "../tab-navigation-base/tab-navigation-base"; -export * from "../tab-navigation-base/tab-strip"; -export * from "../tab-navigation-base/tab-strip-item"; - const maxTabsCount = 5; const majorVersion = iosUtils.MajorVersion; const isPhone = device.deviceType === "Phone"; diff --git a/nativescript-core/ui/button/button-common.ts b/nativescript-core/ui/button/button-common.ts index a66f37f19..a891d7c1d 100644 --- a/nativescript-core/ui/button/button-common.ts +++ b/nativescript-core/ui/button/button-common.ts @@ -1,8 +1,6 @@ import { Button as ButtonDefinition } from "."; import { TextBase, booleanConverter, CSSType } from "../text-base"; -export * from "../text-base"; - @CSSType("Button") export abstract class ButtonBase extends TextBase implements ButtonDefinition { public static tapEvent = "tap"; diff --git a/nativescript-core/ui/content-view/content-view.ts b/nativescript-core/ui/content-view/content-view.ts index 99e0172ba..4bcbfe650 100644 --- a/nativescript-core/ui/content-view/content-view.ts +++ b/nativescript-core/ui/content-view/content-view.ts @@ -1,8 +1,6 @@ import { ContentView as ContentViewDefinition } from "."; import { View, CustomLayoutView, AddChildFromBuilder, layout, isIOS } from "../core/view"; -export * from "../core/view"; - export class ContentView extends CustomLayoutView implements ContentViewDefinition, AddChildFromBuilder { private _content: View; diff --git a/nativescript-core/ui/core/bindable/bindable.ts b/nativescript-core/ui/core/bindable/bindable.ts index 0ce92d63b..645d5968b 100644 --- a/nativescript-core/ui/core/bindable/bindable.ts +++ b/nativescript-core/ui/core/bindable/bindable.ts @@ -21,11 +21,6 @@ import * as types from "../../../utils/types"; import * as bindableResources from "./bindable-resources"; import * as polymerExpressions from "../../../js-libs/polymer-expressions"; -export { - Observable, WrappedValue, PropertyChangeData, EventData, - traceEnabled, traceWrite, traceError, traceCategories, traceNotifyEvent, traceMessageType, isCategorySet -}; - const contextKey = "context"; // this regex is used to get parameters inside [] for example: // from $parents['ListView'] will return 'ListView' diff --git a/nativescript-core/ui/core/properties/properties.ts b/nativescript-core/ui/core/properties/properties.ts index 8ecaeaab9..a3e2e7ad4 100644 --- a/nativescript-core/ui/core/properties/properties.ts +++ b/nativescript-core/ui/core/properties/properties.ts @@ -16,8 +16,6 @@ import { Style } from "../../styling/style"; import { profile } from "../../../profiling"; -export { Style }; - export const unsetValue: any = new Object(); let cssPropertyNames: string[] = []; diff --git a/nativescript-core/ui/core/view-base/view-base.ts b/nativescript-core/ui/core/view-base/view-base.ts index 77bdb0e11..644156b9d 100644 --- a/nativescript-core/ui/core/view-base/view-base.ts +++ b/nativescript-core/ui/core/view-base/view-base.ts @@ -10,21 +10,14 @@ import { Property, CssProperty, CssAnimationProperty, InheritedProperty, Style, import { getSystemCssClasses, MODAL_ROOT_VIEW_CSS_CLASS, ROOT_VIEW_CSS_CLASS } from "../../../css/system-classes"; import { Source } from "../../../utils/debug"; import { Binding, BindingOptions, Observable, WrappedValue, PropertyChangeData, traceEnabled, traceWrite, traceCategories } from "../bindable"; -import { isIOS, isAndroid } from "../../../platform"; -import { layout } from "../../../utils/utils"; +import { isAndroid } from "../../../platform"; import { Length, paddingTopProperty, paddingRightProperty, paddingBottomProperty, paddingLeftProperty } from "../../styling/style-properties"; // TODO: Remove this import! -import * as types from "../../../utils/types"; - -import { Color } from "../../../color"; +import { getClass } from "../../../utils/types"; import { profile } from "../../../profiling"; -export { isIOS, isAndroid, layout, Color }; -export * from "../bindable"; -export * from "../properties"; - import * as dnm from "../../../debugger/dom-node"; import * as ssm from "../../styling/style-scope"; @@ -278,7 +271,7 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition // TODO: Use Type.prototype.typeName instead. get typeName(): string { - return types.getClass(this); + return getClass(this); } get style(): Style { diff --git a/nativescript-core/ui/core/view/view-common.ts b/nativescript-core/ui/core/view/view-common.ts index 8a8cea523..0c5da3b62 100644 --- a/nativescript-core/ui/core/view/view-common.ts +++ b/nativescript-core/ui/core/view/view-common.ts @@ -28,10 +28,6 @@ import { LinearGradient } from "../../styling/linear-gradient"; import { BackgroundRepeat } from "../../styling/style-properties"; import { TextTransform } from "../../text-base"; -export * from "../../styling/style-properties"; -export * from "../view-base"; -export { LinearGradient }; - import * as am from "../../animation"; let animationModule: typeof am; diff --git a/nativescript-core/ui/date-picker/date-picker-common.ts b/nativescript-core/ui/date-picker/date-picker-common.ts index 8faf3b923..46d2b28da 100644 --- a/nativescript-core/ui/date-picker/date-picker-common.ts +++ b/nativescript-core/ui/date-picker/date-picker-common.ts @@ -1,8 +1,6 @@ import { DatePicker as DatePickerDefinition } from "."; import { View, Property, CSSType } from "../core/view"; -export * from "../core/view"; - const defaultDate = new Date(); const dateComparer = (x: Date, y: Date): boolean => (x <= y && x >= y); diff --git a/nativescript-core/ui/editable-text-base/editable-text-base-common.ts b/nativescript-core/ui/editable-text-base/editable-text-base-common.ts index 46d6d306e..c059b48eb 100644 --- a/nativescript-core/ui/editable-text-base/editable-text-base-common.ts +++ b/nativescript-core/ui/editable-text-base/editable-text-base-common.ts @@ -1,8 +1,6 @@ import { EditableTextBase as EditableTextBaseDefinition, KeyboardType, ReturnKeyType, UpdateTextTrigger, AutocapitalizationType } from "."; import { TextBase, Property, CssProperty, Style, Color, booleanConverter, makeValidator, makeParser, PseudoClassHandler } from "../text-base"; -export * from "../text-base"; - export abstract class EditableTextBase extends TextBase implements EditableTextBaseDefinition { public static blurEvent = "blur"; public static focusEvent = "focus"; diff --git a/nativescript-core/ui/frame/frame-common.ts b/nativescript-core/ui/frame/frame-common.ts index dbfe3a8b5..d29671b46 100644 --- a/nativescript-core/ui/frame/frame-common.ts +++ b/nativescript-core/ui/frame/frame-common.ts @@ -12,7 +12,6 @@ import { sanitizeModuleName } from "../builder/module-name-sanitizer"; import { profile } from "../../profiling"; export * from "./frame-interfaces"; -export * from "../core/view"; function buildEntryFromArgs(arg: any): NavigationEntry { let entry: NavigationEntry; diff --git a/nativescript-core/ui/html-view/html-view-common.ts b/nativescript-core/ui/html-view/html-view-common.ts index 9c7df2d50..85045bc18 100644 --- a/nativescript-core/ui/html-view/html-view-common.ts +++ b/nativescript-core/ui/html-view/html-view-common.ts @@ -1,10 +1,8 @@ -import { Color } from "../../color"; -import { Style, CssProperty } from "../core/properties"; +import { Style, CssProperty } from "../core/properties"; import { View, Property, CSSType } from "../core/view"; +import { Color } from "../../color"; import { HtmlView as HtmlViewDefinition } from "."; -export * from "../core/view"; - @CSSType("HtmlView") export class HtmlViewBase extends View implements HtmlViewDefinition { public html: string; diff --git a/nativescript-core/ui/index.ts b/nativescript-core/ui/index.ts index f657063c7..75c1b5df7 100644 --- a/nativescript-core/ui/index.ts +++ b/nativescript-core/ui/index.ts @@ -13,7 +13,7 @@ export { DatePicker } from "./date-picker"; // import { action, alert, confirm, login, prompt } from "./dialogs"; // export const nsDialogs = { action, alert, confirm, login, prompt }; -export { EditableTextBase } from "./editable-text-base"; +export * from "./editable-text-base"; export { Frame, NavigationEntry, NavigationContext, NavigationTransition, BackstackEntry, ViewEntry } from "./frame"; export { diff --git a/nativescript-core/ui/styling/style/style.d.ts b/nativescript-core/ui/styling/style/style.d.ts index e8711846a..962979ba5 100644 --- a/nativescript-core/ui/styling/style/style.d.ts +++ b/nativescript-core/ui/styling/style/style.d.ts @@ -2,8 +2,8 @@ * @module "ui/styling/style" */ /** */ -import { Length, PercentLength, ViewBase, Observable, BackgroundRepeat, Visibility, HorizontalAlignment, VerticalAlignment, dip } from "../../core/view"; import { Color } from "../../../color"; +import { Length, PercentLength, ViewBase, Observable, BackgroundRepeat, Visibility, HorizontalAlignment, VerticalAlignment, dip } from "../../core/view"; import { Background } from "../background"; import { Font, FontStyle, FontWeight } from "../font"; import { TextAlignment, TextDecoration, TextTransform, WhiteSpace } from "../../text-base"; diff --git a/nativescript-core/ui/text-field/text-field-common.ts b/nativescript-core/ui/text-field/text-field-common.ts index 787bb9ba8..49dffe571 100644 --- a/nativescript-core/ui/text-field/text-field-common.ts +++ b/nativescript-core/ui/text-field/text-field-common.ts @@ -1,8 +1,6 @@ import { TextField as TextFieldDefinition } from "."; import { EditableTextBase, Property, booleanConverter, CSSType } from "../editable-text-base"; -export * from "../editable-text-base"; - @CSSType("TextField") export class TextFieldBase extends EditableTextBase implements TextFieldDefinition { public static returnPressEvent = "returnPress"; diff --git a/nativescript-core/ui/time-picker/time-picker-common.ts b/nativescript-core/ui/time-picker/time-picker-common.ts index ad09c5b60..b0c6b38fa 100644 --- a/nativescript-core/ui/time-picker/time-picker-common.ts +++ b/nativescript-core/ui/time-picker/time-picker-common.ts @@ -1,8 +1,6 @@ import { TimePicker as TimePickerDefinition } from "."; import { View, Property, CSSType } from "../core/view"; -export * from "../core/view"; - interface Time { hour: number; minute: number; diff --git a/nativescript-core/ui/web-view/web-view-common.ts b/nativescript-core/ui/web-view/web-view-common.ts index bced3983b..25bcfb057 100644 --- a/nativescript-core/ui/web-view/web-view-common.ts +++ b/nativescript-core/ui/web-view/web-view-common.ts @@ -5,7 +5,6 @@ import { File, knownFolders, path } from "../../file-system"; export { File, knownFolders, path }; export * from "./web-view-interfaces"; -export * from "../core/view"; export const srcProperty = new Property({ name: "src" }); diff --git a/nativescript-core/ui/web-view/web-view.android.ts b/nativescript-core/ui/web-view/web-view.android.ts index 3b3aacdec..762538f33 100644 --- a/nativescript-core/ui/web-view/web-view.android.ts +++ b/nativescript-core/ui/web-view/web-view.android.ts @@ -1,4 +1,5 @@ -import { WebViewBase, knownFolders, traceEnabled, traceWrite, traceCategories, WebViewClient } from "./web-view-common"; +import { WebViewBase, knownFolders, WebViewClient } from "./web-view-common"; +import { isEnabled, write, categories } from '../../trace'; export * from "./web-view-common"; @@ -18,8 +19,8 @@ function initializeWebViewClient(): void { } public shouldOverrideUrlLoading(view: android.webkit.WebView, url: string) { - if (traceEnabled()) { - traceWrite("WebViewClientClass.shouldOverrideUrlLoading(" + url + ")", traceCategories.Debug); + if (isEnabled()) { + write("WebViewClientClass.shouldOverrideUrlLoading(" + url + ")", categories.Debug); } return false; @@ -29,8 +30,8 @@ function initializeWebViewClient(): void { super.onPageStarted(view, url, favicon); const owner = this.owner; if (owner) { - if (traceEnabled()) { - traceWrite("WebViewClientClass.onPageStarted(" + url + ", " + favicon + ")", traceCategories.Debug); + if (isEnabled()) { + write("WebViewClientClass.onPageStarted(" + url + ", " + favicon + ")", categories.Debug); } owner._onLoadStarted(url, undefined); } @@ -40,8 +41,8 @@ function initializeWebViewClient(): void { super.onPageFinished(view, url); const owner = this.owner; if (owner) { - if (traceEnabled()) { - traceWrite("WebViewClientClass.onPageFinished(" + url + ")", traceCategories.Debug); + if (isEnabled()) { + write("WebViewClientClass.onPageFinished(" + url + ")", categories.Debug); } owner._onLoadFinished(url, undefined); } @@ -59,8 +60,8 @@ function initializeWebViewClient(): void { const owner = this.owner; if (owner) { - if (traceEnabled()) { - traceWrite("WebViewClientClass.onReceivedError(" + errorCode + ", " + description + ", " + failingUrl + ")", traceCategories.Debug); + if (isEnabled()) { + write("WebViewClientClass.onReceivedError(" + errorCode + ", " + description + ", " + failingUrl + ")", categories.Debug); } owner._onLoadFinished(failingUrl, description + "(" + errorCode + ")"); } @@ -75,8 +76,8 @@ function initializeWebViewClient(): void { const owner = this.owner; if (owner) { - if (traceEnabled()) { - traceWrite("WebViewClientClass.onReceivedError(" + error.getErrorCode() + ", " + error.getDescription() + ", " + (error.getUrl && error.getUrl()) + ")", traceCategories.Debug); + if (isEnabled()) { + write("WebViewClientClass.onReceivedError(" + error.getErrorCode() + ", " + error.getDescription() + ", " + (error.getUrl && error.getUrl()) + ")", categories.Debug); } owner._onLoadFinished(error.getUrl && error.getUrl(), error.getDescription() + "(" + error.getErrorCode() + ")"); } diff --git a/nativescript-core/ui/web-view/web-view.ios.ts b/nativescript-core/ui/web-view/web-view.ios.ts index 534cd7497..dd93a7895 100644 --- a/nativescript-core/ui/web-view/web-view.ios.ts +++ b/nativescript-core/ui/web-view/web-view.ios.ts @@ -1,6 +1,7 @@ import { NavigationType } from "."; -import { WebViewBase, knownFolders, traceWrite, traceEnabled, traceCategories } from "./web-view-common"; +import { WebViewBase, knownFolders } from "./web-view-common"; import { profile } from "../../profiling"; +import { isEnabled, write, categories } from '../../trace'; export * from "./web-view-common"; class WKNavigationDelegateImpl extends NSObject @@ -38,22 +39,22 @@ class WKNavigationDelegateImpl extends NSObject } decisionHandler(WKNavigationActionPolicy.Allow); - if (traceEnabled()) { - traceWrite("WKNavigationDelegateClass.webViewDecidePolicyForNavigationActionDecisionHandler(" + navigationAction.request.URL.absoluteString + ", " + navigationAction.navigationType + ")", traceCategories.Debug); + if (isEnabled()) { + write("WKNavigationDelegateClass.webViewDecidePolicyForNavigationActionDecisionHandler(" + navigationAction.request.URL.absoluteString + ", " + navigationAction.navigationType + ")", categories.Debug); } owner._onLoadStarted(navigationAction.request.URL.absoluteString, navType); } } public webViewDidStartProvisionalNavigation(webView: WKWebView, navigation: WKNavigation): void { - if (traceEnabled()) { - traceWrite("WKNavigationDelegateClass.webViewDidStartProvisionalNavigation(" + webView.URL + ")", traceCategories.Debug); + if (isEnabled()) { + write("WKNavigationDelegateClass.webViewDidStartProvisionalNavigation(" + webView.URL + ")", categories.Debug); } } public webViewDidFinishNavigation(webView: WKWebView, navigation: WKNavigation): void { - if (traceEnabled()) { - traceWrite("WKNavigationDelegateClass.webViewDidFinishNavigation(" + webView.URL + ")", traceCategories.Debug); + if (isEnabled()) { + write("WKNavigationDelegateClass.webViewDidFinishNavigation(" + webView.URL + ")", categories.Debug); } const owner = this._owner.get(); if (owner) { @@ -72,8 +73,8 @@ class WKNavigationDelegateImpl extends NSObject if (webView.URL) { src = webView.URL.absoluteString; } - if (traceEnabled()) { - traceWrite("WKNavigationDelegateClass.webViewDidFailNavigationWithError(" + error.localizedDescription + ")", traceCategories.Debug); + if (isEnabled()) { + write("WKNavigationDelegateClass.webViewDidFailNavigationWithError(" + error.localizedDescription + ")", categories.Debug); } owner._onLoadFinished(src, error.localizedDescription); } @@ -86,8 +87,8 @@ class WKNavigationDelegateImpl extends NSObject if (webView.URL) { src = webView.URL.absoluteString; } - if (traceEnabled()) { - traceWrite("WKNavigationDelegateClass.webViewDidFailProvisionalNavigationWithError(" + error.localizedDescription + ")", traceCategories.Debug); + if (isEnabled()) { + write("WKNavigationDelegateClass.webViewDidFailProvisionalNavigationWithError(" + error.localizedDescription + ")", categories.Debug); } owner._onLoadFinished(src, error.localizedDescription); } diff --git a/package.json b/package.json index 578970b6a..2887b9561 100644 --- a/package.json +++ b/package.json @@ -9,38 +9,39 @@ }, "license": "Apache-2.0", "devDependencies": { - "@microsoft/api-extractor": "7.6.1", + "@microsoft/api-extractor": "~7.9.0", "@nativescript/tslint-rules": "0.0.5", - "@types/chai": "^4.0.4", - "@types/mocha": "^2.2.42", - "@types/node": "~10.12.18", - "chai": "^4.1.2", + "@types/chai": "^4.2.11", + "@types/mocha": "^7.0.2", + "@types/node": "~14.0.14", + "chai": "^4.2.0", "conventional-changelog-cli": "^2.0.34", - "css": "^2.2.1", - "css-tree": "^1.0.0-alpha.37", + "css": "^3.0.0", + "css-tree": "^1.0.0-alpha.39", "gonzales": "^1.0.7", - "madge": "^2.2.0", - "markdown-snippet-injector": "0.2.2", - "mocha": "^3.5.0", + "madge": "^3.9.2", + "markdown-snippet-injector": "~0.2.2", + "mocha": "^8.0.1", "mocha-typescript": "^1.1.9", - "module-alias": "^2.0.1", + "module-alias": "^2.2.2", "nativescript-typedoc-theme": "git://github.com/NativeScript/nativescript-typedoc-theme.git#master", "ncp": "^2.0.0", "parse-css": "git+https://github.com/tabatkins/parse-css.git", "parserlib": "^1.1.1", - "readdirp": "3.1.3", + "readdirp": "~3.4.0", "reduce-css-calc": "^2.1.6", - "rimraf": "^2.5.0", + "rimraf": "^3.0.2", "shady-css-parser": "^0.1.0", - "source-map-support": "^0.4.17", - "ts-node": "^8.3.0", - "tslib": "1.10.0", - "tslint": "^5.4.3", + "source-map-support": "^0.5.19", + "ts-node": "^8.10.0", + "tslib": "~2.0.0", + "tslint": "^6.1.2", "typedoc": "^0.13.0", "typedoc-plugin-external-module-name": "git://github.com/PanayotCankov/typedoc-plugin-external-module-name.git#with-js", - "typescript": "~3.8.3" + "typescript": "~3.9.0" }, "scripts": { + "clean": "npx rimraf node_modules package-lock.json && npm i", "setup": "npm run build-core && npm run build-compat && npm run setup-link", "setup-link": "(cd nativescript-core && npm link) && (cd dist/tns-core-modules && npm uninstall @nativescript/core -S)", "setup-widgets": "(cd tns-core-modules-widgets && sh build.sh) && npm run dev-link-tns-core-modules-widgets",