prepare next version

sgratzl · Jul 19, 2020 · c5724f6 · c5724f6
1 parent 5f5aa0e
commit c5724f6
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 31 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "chartjs-chart-geo",
   "description": "Chart.js module for charting maps",
-  "version": "3.0.0-alpha.4",
+  "version": "3.0.0-alpha.19",
   "author": {
     "name": "Samuel Gratzl",
     "email": "[email protected]",
@@ -21,7 +21,7 @@
     "src/**/*.js"
   ],
   "peerDependencies": {
-    "@sgratzl/chartjs-esm-facade": "^3.0.0-alpha.1",
+    "@sgratzl/chartjs-esm-facade": "^3.0.0-alpha.2",
     "chart.js": "^3.0.0-alpha.2"
   },
   "dependencies": {
@@ -38,7 +38,7 @@
     "@rollup/plugin-babel": "^5.1.0",
     "@rollup/plugin-commonjs": "^14.0.0",
     "@rollup/plugin-node-resolve": "^8.4.0",
-    "@sgratzl/chartjs-esm-facade": "^3.0.0-alpha.1",
+    "@sgratzl/chartjs-esm-facade": "^3.0.0-alpha.2",
     "@yarnpkg/pnpify": "^2.1.0",
     "babel-jest": "^26.1.0",
     "canvas": "^2.6.1",
@@ -75,10 +75,5 @@
     "prepublishOnly": "npm run build:prod",
     "release": "release-it --disable-metrics --npm.skipChecks",
     "release:pre": "release-it --disable-metrics --npm.skipChecks --preRelease=alpha --npm.tag=next"
-  },
-  "dependenciesMeta": {
-    "chart.js": {
-      "unplugged": true
-    }
   }
 }
diff --git a/samples/albers.html b/samples/albers.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/[email protected]/dist/Chart.js"></script>
+    <script src="https://unpkg.com/[email protected]/dist/chart.js"></script>
+    <script src="https://unpkg.com/@sgratzl/[email protected]"></script>
     <script src="../build/Chart.Geo.js"></script>
   </head>
 

diff --git a/samples/albersLog.html b/samples/albersLog.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/[email protected]/dist/Chart.js"></script>
+    <script src="https://unpkg.com/[email protected]/dist/chart.js"></script>
+    <script src="https://unpkg.com/@sgratzl/[email protected]"></script>
     <script src="../build/Chart.Geo.js"></script>
   </head>
 

diff --git a/samples/bubbleMap.html b/samples/bubbleMap.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/[email protected]/dist/Chart.js"></script>
+    <script src="https://unpkg.com/[email protected]/dist/chart.js"></script>
+    <script src="https://unpkg.com/@sgratzl/[email protected]"></script>
     <!-- <script src="https://unpkg.com/chartjs-plugin-datalabels"></script> -->
     <script src="../build/Chart.Geo.js"></script>
     <script src="https://unpkg.com/papaparse"></script>

diff --git a/samples/bubbleMapArea.html b/samples/bubbleMapArea.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/[email protected]/dist/Chart.js"></script>
+    <script src="https://unpkg.com/[email protected]/dist/chart.js"></script>
+    <script src="https://unpkg.com/@sgratzl/[email protected]"></script>
     <!-- <script src="https://unpkg.com/chartjs-plugin-datalabels"></script> -->
     <script src="../build/Chart.Geo.js"></script>
     <script src="https://unpkg.com/papaparse"></script>

diff --git a/samples/bubbleMapLog.html b/samples/bubbleMapLog.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/[email protected]/dist/Chart.js"></script>
+    <script src="https://unpkg.com/[email protected]/dist/chart.js"></script>
+    <script src="https://unpkg.com/@sgratzl/[email protected]"></script>
     <!-- <script src="https://unpkg.com/chartjs-plugin-datalabels"></script> -->
     <script src="../build/Chart.Geo.js"></script>
     <script src="https://unpkg.com/papaparse"></script>

diff --git a/samples/default_esm.html b/samples/default_esm.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Box Plot Chart</title>
+    <title>Chart</title>
   </head>
   <body>
     <div id="container" style="width: 75%;">
@@ -11,7 +11,7 @@
     <script type="importmap-shim">
       {
         "imports": {
-          "chart.js": "https://unpkg.com/chart.js@3.0.0-alpha/dist/Chart.esm.js",
+          "@sgratzl/chartjs-esm-facade": "https://unpkg.com/@sgratzl/chartjs-esm-facade@3.0.0-alpha.2?module",
           "chartjs-chart-geo": "../build/Chart.Geo.esm.js",
           "d3-geo": "https://unpkg.com/d3-geo?module",
           "d3-scale-chromatic": "https://unpkg.com/d3-scale-chromatic?module",

diff --git a/samples/earth.html b/samples/earth.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/[email protected]/dist/Chart.js"></script>
+    <script src="https://unpkg.com/[email protected]/dist/chart.js"></script>
+    <script src="https://unpkg.com/@sgratzl/[email protected]"></script>
     <script src="../build/Chart.Geo.js"></script>
   </head>
 

diff --git a/samples/earth_click.html b/samples/earth_click.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/[email protected]/dist/Chart.js"></script>
+    <script src="https://unpkg.com/[email protected]/dist/chart.js"></script>
+    <script src="https://unpkg.com/@sgratzl/[email protected]"></script>
     <script src="../build/Chart.Geo.js"></script>
   </head>
 

diff --git a/samples/germany.html b/samples/germany.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/[email protected]/dist/Chart.js"></script>
+    <script src="https://unpkg.com/[email protected]/dist/chart.js"></script>
+    <script src="https://unpkg.com/@sgratzl/[email protected]"></script>
     <script src="../build/Chart.Geo.js"></script>
   </head>
 

diff --git a/src/controllers/bubbleMap.js b/src/controllers/bubbleMap.js
@@ -1,7 +1,8 @@
 import { Chart, Point, BubbleController, merge } from '@sgratzl/chartjs-esm-facade';
 import { geoDefaults, GeoController } from './geo';
-import { SizeScale } from '../scales';
+import { SizeScale, ProjectionScale } from '../scales';
 import { GeoFeature } from '../elements';
+import patchController from './patchController';
 
 export class BubbleMapController extends GeoController {
   linkScales() {
@@ -111,7 +112,7 @@ BubbleMapController.defaults = merge({}, [
 
 export class BubbleMapChart extends Chart {
   constructor(item, config) {
-    super(item, patchController(config, BubbleMapController, GeoFeature, SizeScale));
+    super(item, patchController(config, BubbleMapController, GeoFeature, [SizeScale, ProjectionScale]));
   }
 }
 BubbleMapChart.id = BubbleMapController.id;
diff --git a/src/controllers/choropleth.js b/src/controllers/choropleth.js
@@ -1,7 +1,8 @@
 import { Chart, merge } from '@sgratzl/chartjs-esm-facade';
 import { geoDefaults, GeoController } from './geo';
 import { GeoFeature } from '../elements';
-import { ColorScale } from '../scales';
+import { ColorScale, ProjectionScale } from '../scales';
+import patchController from './patchController';
 
 export class ChoroplethController extends GeoController {
   linkScales() {
@@ -100,7 +101,7 @@ ChoroplethController.defaults = /*#__PURE__*/ merge({}, [
 
 export class ChoroplethChart extends Chart {
   constructor(item, config) {
-    super(item, patchController(config, ChoroplethController, GeoFeature, ColorScale));
+    super(item, patchController(config, ChoroplethController, GeoFeature, [ColorScale, ProjectionScale]));
   }
 }
 ChoroplethChart.id = ChoroplethController.id;
diff --git a/yarn.lock b/yarn.lock
@@ -1915,15 +1915,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sgratzl/chartjs-esm-facade@npm:^3.0.0-alpha.1":
-  version: 3.0.0-alpha.1
-  resolution: "@sgratzl/chartjs-esm-facade@npm:3.0.0-alpha.1"
+"@sgratzl/chartjs-esm-facade@npm:^3.0.0-alpha.2":
+  version: 3.0.0-alpha.2
+  resolution: "@sgratzl/chartjs-esm-facade@npm:3.0.0-alpha.2"
+  dependencies:
+    "@types/chart.js": ^2.9.23
   peerDependencies:
     chart.js: ^3.0.0-alpha.2
   dependenciesMeta:
     chart.js:
       unplugged: true
-  checksum: 7ad43bf60bac1f14cd8f48f59845fdd1037e256901256db89ea9a0eb2999e9abbcb948133a78abbbdcf3f1e2214a6f314fcb6b342cf1b39483954b018a1c354e
+  checksum: c6dc456567c914f2a45ad2480ea8c6386edbbcec10bb86bd294dd96ee0147a93c8e26c3c328299e5af0d5d061feb0192f5f9a426e7677db2fa804856f7bc98dd
   languageName: node
   linkType: hard
 
@@ -2030,6 +2032,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/chart.js@npm:^2.9.23":
+  version: 2.9.23
+  resolution: "@types/chart.js@npm:2.9.23"
+  dependencies:
+    moment: ^2.10.2
+  checksum: 6ba0c6fc96be0cf762ef9c11a227b50933b34dc681d04cb463ee7130cb72116670cc53c180dc38c6307398aea83a439ec599f82c9ae4a1d78e5cd5c15a6d36c9
+  languageName: node
+  linkType: hard
+
 "@types/color-name@npm:^1.1.1":
   version: 1.1.1
   resolution: "@types/color-name@npm:1.1.1"
@@ -3075,7 +3086,7 @@ __metadata:
     "@rollup/plugin-babel": ^5.1.0
     "@rollup/plugin-commonjs": ^14.0.0
     "@rollup/plugin-node-resolve": ^8.4.0
-    "@sgratzl/chartjs-esm-facade": ^3.0.0-alpha.1
+    "@sgratzl/chartjs-esm-facade": ^3.0.0-alpha.2
     "@yarnpkg/pnpify": ^2.1.0
     babel-jest: ^26.1.0
     canvas: ^2.6.1
@@ -3098,11 +3109,8 @@ __metadata:
     us-atlas: ^3.0.0
     world-atlas: ^2.0.2
   peerDependencies:
-    "@sgratzl/chartjs-esm-facade": ^3.0.0-alpha.1
+    "@sgratzl/chartjs-esm-facade": ^3.0.0-alpha.2
     chart.js: ^3.0.0-alpha.2
-  dependenciesMeta:
-    chart.js:
-      unplugged: true
   languageName: unknown
   linkType: soft
 
@@ -6471,6 +6479,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"moment@npm:^2.10.2":
+  version: 2.27.0
+  resolution: "moment@npm:2.27.0"
+  checksum: 72d9a7d8dba59e3d538440cdc0b59fa895b123361e370be231896478aaf157a484355ce32bd8daf6f731d6d1636d3a67ecb67531e536e093ca18b43e0cbae194
+  languageName: node
+  linkType: hard
+
 "ms@npm:2.0.0":
   version: 2.0.0
   resolution: "ms@npm:2.0.0"