Merge pull request #608 from finos/highcharts

Restore highchairs on phosphor/jlab until d3 is complete
finos · Jun 6, 2019 · e98254e · e98254e
2 parents a2b1cdc + 7a8f755
commit e98254e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/packages/perspective-phosphor/package.json b/packages/perspective-phosphor/package.json
@@ -30,6 +30,7 @@
         "@finos/perspective-viewer": "^0.3.0-rc.4",
         "@finos/perspective-viewer-d3fc": "^0.3.0-rc.4",
         "@finos/perspective-viewer-hypergrid": "^0.3.0-rc.4",
+        "@finos/perspective-viewer-highcharts": "^0.3.0-rc.4",
         "@phosphor/application": "^1.5.0",
         "@phosphor/widgets": "^1.6.0"
     },

diff --git a/packages/perspective-phosphor/src/ts/widget.ts b/packages/perspective-phosphor/src/ts/widget.ts
@@ -11,6 +11,7 @@
 import "@finos/perspective-viewer";
 import "@finos/perspective-viewer-hypergrid";
 import "@finos/perspective-viewer-d3fc";
+import "@finos/perspective-viewer-highcharts";
 
 import { Message } from '@phosphor/messaging';
 import { Widget } from '@phosphor/widgets';

diff --git a/packages/perspective-webpack-plugin/package.json b/packages/perspective-webpack-plugin/package.json
@@ -20,6 +20,7 @@
     "license": "Apache-2.0",
     "dependencies": {
         "@webpack-contrib/schema-utils": "^1.0.0-beta.0",
+        "acorn": "^6.1.1",
         "arraybuffer-loader": "^1.0.2",
         "base64-font-loader": "0.0.4",
         "clean-css-cli": "4.2.1",

diff --git a/yarn.lock b/yarn.lock
@@ -1789,7 +1789,7 @@ acorn@^5.0.0, acorn@^5.5.0, acorn@^5.5.3:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
-acorn@^6.0.1, acorn@^6.0.5:
+acorn@^6.0.1, acorn@^6.0.5, acorn@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
   integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==