refactor: use es6 imports for charts

frappe/core/page/dashboard/dashboard.js

@@ -3,6 +3,8 @@
 
 frappe.provide('frappe.dashboards');
 frappe.provide('frappe.dashboards.chart_sources');
+import { Chart } from 'node_modules/frappe-charts/dist/frappe-charts.esm.js';
+
 
 frappe.pages['dashboard'].on_page_load = function(wrapper) {
 	var page = frappe.ui.make_app_page({

frappe/desk/page/activity/activity.js

@@ -2,6 +2,7 @@
 // License: See license.txt
 
 frappe.provide("frappe.activity");
+import { Chart } from 'node_modules/frappe-charts/dist/frappe-charts.esm.js';
 
 frappe.pages['activity'].on_page_load = function(wrapper) {
 	var me = this;

frappe/public/build.json

@@ -7,7 +7,8 @@
 		"node_modules/highlight.js/styles/zenburn.css",
 		"public/less/form.less",
 		"public/less/chat.less",
-		"node_modules/frappe-datatable/dist/frappe-datatable.css"
+		"node_modules/frappe-datatable/dist/frappe-datatable.css",
+		"node_modules/frappe-charts/dist/frappe-charts.min.css"
 	],
 	"css/frappe-web-b4.css": [
 		"public/css/font-awesome.css",
@@ -93,7 +94,8 @@
 		"public/less/controls.less",
 		"public/less/chat.less",
 		"public/less/filters.less",
-		"public/less/social.less"
+		"public/less/social.less",
+		"node_modules/frappe-charts/dist/frappe-charts.min.css"
 	],
 	"css/frappe-rtl.css": [
 		"public/css/bootstrap-rtl.css",
@@ -118,7 +120,6 @@
 		"public/js/frappe/translate.js",
 		"public/js/lib/datepicker/datepicker.min.js",
 		"public/js/lib/datepicker/locale-all.js",
-		"public/js/lib/frappe-charts/frappe-charts.min.iife.js",
 		"public/js/lib/leaflet/leaflet.js",
 		"public/js/lib/leaflet/leaflet.draw.js",
 		"public/js/lib/leaflet/L.Control.Locate.js",
@@ -298,7 +299,8 @@
 		"public/less/report.less",
 		"node_modules/frappe-datatable/dist/frappe-datatable.css",
 		"public/less/frappe-datatable.less",
-		"public/css/tree_grid.css"
+		"public/css/tree_grid.css",
+		"node_modules/frappe-charts/dist/frappe-charts.min.css"
 	],
 	"js/report.min.js": [
 		"public/js/lib/clusterize.min.js",

frappe/public/js/frappe/views/reports/query_report.js

@@ -1,6 +1,7 @@
 // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 // MIT License. See license.txt
 import DataTable from 'frappe-datatable';
+import { Chart } from 'node_modules/frappe-charts/dist/frappe-charts.esm.js';
 
 frappe.provide('frappe.views');
 frappe.provide('frappe.query_reports');

frappe/public/js/frappe/views/reports/report_view.js

@@ -2,6 +2,7 @@
  * frappe.views.ReportView
  */
 import DataTable from 'frappe-datatable';
+import { Chart } from 'node_modules/frappe-charts/dist/frappe-charts.esm.js';
 
 frappe.provide('frappe.views');
 

package.json

@@ -24,6 +24,7 @@
     "cookie": "^0.3.1",
     "express": "^4.16.2",
     "fast-deep-equal": "^2.0.1",
+    "frappe-charts": "^1.2.0",
     "frappe-datatable": "^1.13.2",
     "frappe-gantt": "^0.1.0",
     "fuse.js": "^3.2.0",

yarn.lock

@@ -1753,6 +1753,11 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
+frappe-charts@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-1.2.0.tgz#05616e656825e6736b5f617a16c6e1a8ce76d0c2"
+  integrity sha512-yj47OIDaU9BCpV3gpcLE1rG5r0gCPPr3DUzwxG2DQj9vGLcLRHmNixmsF9pXZOOiOy1M/UeBrCL7l9I0JoGzMQ==
+
 frappe-datatable@^1.13.2:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.13.2.tgz#8b36c7cfc0ea660fc72eea8b1ae3c5dcc2a7d67d"