From 39bd5ba9864837d8348331061b4056f579d1630e Mon Sep 17 00:00:00 2001 From: Mikael Karon Date: Sat, 19 Oct 2019 19:15:56 +0200 Subject: [PATCH] fix: fix optionsChanged watch and add more types also bump some deps --- package-lock.json | 34 +++++++++---------- package.json | 4 +-- src/components.d.ts | 11 +++--- src/components/apex-chart/apex-chart.tsx | 8 ++--- .../apex-chart/{apex-charts.ts => index.ts} | 0 5 files changed, 30 insertions(+), 27 deletions(-) rename src/components/apex-chart/{apex-charts.ts => index.ts} (100%) diff --git a/package-lock.json b/package-lock.json index 6392749..c7983e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,12 +5,12 @@ "requires": true, "dependencies": { "@stencil/core": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-1.3.2.tgz", - "integrity": "sha512-WHQDvW48TZvtor/NL832DZLWt2r+8t/eoJ6+Rix3MJlpnbCbKsJJtfpIL5goNCKOSwb6+0Bcg77ZrsQ3RHnOgg==", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-1.7.3.tgz", + "integrity": "sha512-3zfir9ndh0+bcIeetjJFPIGYmzgfZtV2SxYSTYOJNvBNaghn3r5mSo8Xtqwhbppkyni8CsGwWCf1WKDyFYkK4w==", "dev": true, "requires": { - "typescript": "3.5.3" + "typescript": "3.6.3" } }, "JSONStream": { @@ -133,9 +133,9 @@ "dev": true }, "commander": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", - "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true, "optional": true }, @@ -928,9 +928,9 @@ "dev": true }, "handlebars": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz", - "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.4.3.tgz", + "integrity": "sha512-B0W4A2U1ww3q7VVthTKfh+epHx+q4mCt6iK+zEAzbMBpWQAwxCeKxEGpj/1oQTpzPXDNSOG7hmG14TsISH50yw==", "dev": true, "requires": { "neo-async": "^2.6.0", @@ -1649,19 +1649,19 @@ "dev": true }, "typescript": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz", - "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==", + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.3.tgz", + "integrity": "sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==", "dev": true }, "uglify-js": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz", - "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==", + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.3.tgz", + "integrity": "sha512-KfQUgOqTkLp2aZxrMbCuKCDGW9slFYu2A23A36Gs7sGzTLcRBDORdOi5E21KWHFIfkY8kzgi/Pr1cXCh0yIp5g==", "dev": true, "optional": true, "requires": { - "commander": "~2.20.0", + "commander": "~2.20.3", "source-map": "~0.6.1" } }, diff --git a/package.json b/package.json index 3ad09ee..4d52efb 100644 --- a/package.json +++ b/package.json @@ -37,10 +37,10 @@ "release": "standard-version" }, "peerDependencies": { - "apexcharts": "^3.8.5" + "apexcharts": "^3.10.0" }, "devDependencies": { - "@stencil/core": "^1.3.2", + "@stencil/core": "^1.7.3", "standard-version": "^7.0.0" }, "license": "MIT", diff --git a/src/components.d.ts b/src/components.d.ts index 77971ab..8a53fe9 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -1,3 +1,4 @@ +/* eslint-disable */ /* tslint:disable */ /** * This is an autogenerated file created by the Stencil compiler. @@ -11,7 +12,7 @@ import { ApexChartType, ApexChartWidth, ApexOptionsSeries, -} from './components/apex-chart/apex-charts'; +} from './components/apex-chart'; import { ApexOptions, } from 'apexcharts'; @@ -57,7 +58,7 @@ declare global { interface HTMLApexChartElement extends Components.ApexChart, HTMLStencilElement {} - var HTMLApexChartElement: { + const HTMLApexChartElement: { prototype: HTMLApexChartElement; new (): HTMLApexChartElement; }; @@ -67,7 +68,7 @@ declare global { } declare namespace LocalJSX { - interface ApexChart extends JSXBase.HTMLAttributes { + interface ApexChart { /** * (optional) Height * @see https://apexcharts.com/docs/options/chart/height/ @@ -105,7 +106,9 @@ export { LocalJSX as JSX }; declare module "@stencil/core" { export namespace JSX { - interface IntrinsicElements extends LocalJSX.IntrinsicElements {} + interface IntrinsicElements { + 'apex-chart': LocalJSX.ApexChart & JSXBase.HTMLAttributes; + } } } diff --git a/src/components/apex-chart/apex-chart.tsx b/src/components/apex-chart/apex-chart.tsx index 6c120a4..09e2703 100644 --- a/src/components/apex-chart/apex-chart.tsx +++ b/src/components/apex-chart/apex-chart.tsx @@ -6,7 +6,7 @@ import { ApexChartHeight, ApexChartWidth, ApexOptionsSeries -} from './apex-charts'; +} from '.'; const config = ( options: ApexOptions, @@ -70,10 +70,10 @@ export class chart { @Prop({ mutable: true }) options?: ApexOptions; @Watch('options') - optionsChanged(options) { + optionsChanged(options: ApexOptions) { if (this.chartObj !== null) { return this.chartObj.updateOptions( - config(options, this.type, this.width, options, this.series) + config(options, this.type, this.width, this.height, this.series) ); } } @@ -85,7 +85,7 @@ export class chart { @Prop({ mutable: true }) series?: ApexOptionsSeries; @Watch('series') - seriesChanged(series) { + seriesChanged(series: ApexOptionsSeries) { if (this.chartObj !== null) { this.chartObj.updateSeries(series, true); } diff --git a/src/components/apex-chart/apex-charts.ts b/src/components/apex-chart/index.ts similarity index 100% rename from src/components/apex-chart/apex-charts.ts rename to src/components/apex-chart/index.ts