From d5dab3c248421f57b28d82d6fa9c6be149c4470d Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Sat, 29 Aug 2020 23:17:08 -0700 Subject: [PATCH] fix: NativeClass decorator and es2017 build for ns 7 --- src-angular/index.ts | 1 - src-angular/package.json | 2 +- src-angular/references.d.ts | 4 ---- src/options-handlers/helpers/_helpers.common.d.ts | 4 ++++ .../plotLines/plotLines-handler.d.ts | 2 +- src/package.json | 10 ++++++---- src/tsconfig.json | 12 +++++++----- src/ui-charts.ios.ts | 1 + 8 files changed, 20 insertions(+), 16 deletions(-) delete mode 100644 src-angular/references.d.ts diff --git a/src-angular/index.ts b/src-angular/index.ts index e0d5491..4535fd9 100644 --- a/src-angular/index.ts +++ b/src-angular/index.ts @@ -1,4 +1,3 @@ -/// import { NgModule, Directive } from '@angular/core'; import { registerElement } from '@nativescript/angular'; import { UIChartsView } from '@nativescript/ui-charts'; diff --git a/src-angular/package.json b/src-angular/package.json index 5285a88..89af615 100644 --- a/src-angular/package.json +++ b/src-angular/package.json @@ -29,7 +29,7 @@ "@nativescript/angular": "rc", "@nativescript/core": "rc", "cpy-cli": "~3.1.1", - "@nativescript/ui-charts": "file:../src", + "@nativescript/ui-charts": "latest", "ng-packagr": "~10.0.0", "rxjs": "^6.6.0", "typescript": "~3.9.0", diff --git a/src-angular/references.d.ts b/src-angular/references.d.ts deleted file mode 100644 index 555f4c6..0000000 --- a/src-angular/references.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -/// -/// -/// -/// diff --git a/src/options-handlers/helpers/_helpers.common.d.ts b/src/options-handlers/helpers/_helpers.common.d.ts index b403ccd..268d044 100644 --- a/src/options-handlers/helpers/_helpers.common.d.ts +++ b/src/options-handlers/helpers/_helpers.common.d.ts @@ -62,6 +62,7 @@ export declare const typesMap: { HIDataLabels: (options: any) => java.util.ArrayList; HIExporting: (options: any) => any; HIFunction: (options: any) => com.highsoft.highcharts.core.HIFunction | HIFunction; + HIHover: (options: any) => any; HILabel: (options: any) => any; HILabels: (options: any) => any; HILayoutAlgorithm: (options: any) => any; @@ -74,6 +75,8 @@ export declare const typesMap: { HIPoint: (options: any) => any; HIPopup: (options: any) => any; HIPlotOptions: (options: any) => any; + HIPlotBands: (options: any) => any; + HIPlotLines: (options: any) => any; HIResetZoomButton: (options: any) => any; HIScrollablePlotArea: (options: any) => any; HISeries: (options: any) => any; @@ -81,6 +84,7 @@ export declare const typesMap: { HIStackLabels: (options: any) => any; HIStates: (options: any) => any; HISubtitle: (options: any) => any; + HITime: (options: any) => any; HITitle: (options: any) => any; HITheme: (options: any) => any; HITooltip: (options: any) => any; diff --git a/src/options-handlers/plotLines/plotLines-handler.d.ts b/src/options-handlers/plotLines/plotLines-handler.d.ts index f2bf56d..96577e1 100644 --- a/src/options-handlers/plotLines/plotLines-handler.d.ts +++ b/src/options-handlers/plotLines/plotLines-handler.d.ts @@ -1 +1 @@ -export declare function plotLinesHandler(plotLinesOptions: any): any; +export declare function plotLinesHandler(plotLineOptions: any): any; diff --git a/src/package.json b/src/package.json index 57f7bbc..00fb491 100644 --- a/src/package.json +++ b/src/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/ui-charts", - "version": "0.0.4", + "version": "0.0.5", "description": "Nativescript wrapper for Highcharts iOS and Android SDKs", "main": "ui-charts", "typings": "index.d.ts", @@ -15,7 +15,7 @@ "url": "git+https://github.com/NativeScript/nativescript-ui-charts.git" }, "scripts": { - "tsc": "npm i && tsc", + "tsc": "npm i && ts-patch install && tsc", "build": "npm run tsc && npm run build.native && npm run build.angular && mv \"$(npm pack | tail -n 1)\" nativescript-ui-charts.tgz", "build.angular": "cd ../src-angular && npm run build", "build.native": "node scripts/build-native.js", @@ -29,7 +29,7 @@ "demo-angular.android": "npm i && cd ../demo-angular && tns run android --no-hmr", "demo-angular.reset": "cd ../demo-angular && npx rimraf -- hooks node_modules platforms package-lock.json", "plugin.prepare": "npm run build && cd ../demo && tns plugin remove @nativescript/ui-charts && tns plugin add ../src && cd ../demo-angular && tns plugin remove @nativescript/ui-charts && tns plugin add ../src", - "clean": "npm run demo.reset && npm run demo-angular.reset && npx rimraf -- node_modules package-lock.json angular && npm i" + "clean": "npm run demo.reset && npm run demo-angular.reset && npx rimraf node_modules package-lock.json angular && npm run tsc" }, "keywords": [ "NativeScript", @@ -58,14 +58,16 @@ "homepage": "https://github.com/NativeScript/nativescript-ui-charts", "devDependencies": { "@nativescript/core": "rc", + "@nativescript/webpack": "~2.1.0", "nativescript-vue": "^2.7.0", "prompt": "^1.0.0", "rimraf": "^3.0.2", "semver": "^7.3.2", "@nativescript/types": "rc", "tslint": "^6.1.2", + "ts-node": "^9.0.0", + "ts-patch": "~1.3.0", "typescript": "~3.9.0" }, - "dependencies": {}, "bootstrapper": "nativescript-plugin-seed" } diff --git a/src/tsconfig.json b/src/tsconfig.json index 9548b5a..d74a297 100644 --- a/src/tsconfig.json +++ b/src/tsconfig.json @@ -1,8 +1,8 @@ { "compilerOptions": { "noEmitHelpers": true, - "target": "es5", - "module": "commonjs", + "target": "es2017", + "module": "esnext", "declaration": true, "noImplicitAny": false, "noImplicitUseStrict": true, @@ -17,12 +17,14 @@ "skipLibCheck": true, "skipDefaultLibCheck": true, "lib": [ - "es6", + "es2017", "dom" + ], + "plugins": [ + { "transform": "@nativescript/webpack/transformers/ns-transform-native-classes", "type": "raw" } ] }, "exclude": [ - "node_modules", - "node_modules/@nativescript/types" + "node_modules" ] } \ No newline at end of file diff --git a/src/ui-charts.ios.ts b/src/ui-charts.ios.ts index 6def0df..2e22958 100644 --- a/src/ui-charts.ios.ts +++ b/src/ui-charts.ios.ts @@ -71,6 +71,7 @@ export class UIChartsView extends UIChartsViewBase { } } +@NativeClass() class HighchartsViewDelegateImpl extends NSObject // native delegates mostly always extend NSObject implements HIChartViewDelegate {