From 1eb1ba7468a8dbde0d606f48a089c023d5aa9fbb Mon Sep 17 00:00:00 2001
From: Dan Onoshko <danon0404@gmail.com>
Date: Mon, 19 Dec 2022 15:09:53 +0400
Subject: [PATCH] feat: restore CommonJS bundle (#980)

---
 package.json     |  7 ++++---
 pnpm-lock.yaml   | 14 ++++++++++----
 rollup.config.js | 17 ++++++++++++-----
 src/props.ts     | 10 ++++++++--
 4 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 39599822..b3e772a5 100644
--- a/package.json
+++ b/package.json
@@ -42,8 +42,9 @@
   "exports": "./src/index.ts",
   "publishConfig": {
     "exports": {
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "require": "./dist/index.cjs"
     },
     "directory": "package"
   },
@@ -71,7 +72,7 @@
     "updateGitHooks": "simple-git-hooks"
   },
   "peerDependencies": {
-    "chart.js": "^4.0.0",
+    "chart.js": "^4.1.1",
     "vue": "^3.0.0-0 || ^2.6.0"
   },
   "devDependencies": {
@@ -94,7 +95,7 @@
     "@vue/eslint-config-typescript": "^11.0.0",
     "@vue/test-utils": "^2.0.0-rc.17",
     "browserslist": "^4.19.1",
-    "chart.js": "^4.0.0",
+    "chart.js": "^4.1.1",
     "clean-publish": "^4.0.0",
     "commitizen": "^4.2.4",
     "cross-env": "^7.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4581d754..0a47bf57 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -20,7 +20,7 @@ specifiers:
   '@vue/eslint-config-typescript': ^11.0.0
   '@vue/test-utils': ^2.0.0-rc.17
   browserslist: ^4.19.1
-  chart.js: ^4.0.0
+  chart.js: ^4.1.1
   clean-publish: ^4.0.0
   commitizen: ^4.2.4
   cross-env: ^7.0.0
@@ -74,7 +74,7 @@ devDependencies:
   '@vue/eslint-config-typescript': 11.0.2_eh2oupyoc3mviptu6zovyv6md4
   '@vue/test-utils': 2.2.4_vue@3.2.45
   browserslist: 4.21.4
-  chart.js: 4.0.1
+  chart.js: 4.1.1
   clean-publish: 4.0.1
   commitizen: 4.2.5_@swc+core@1.3.23
   cross-env: 7.0.3
@@ -4053,6 +4053,10 @@ packages:
       '@jridgewell/sourcemap-codec': 1.4.14
     dev: true
 
+  /@kurkle/color/0.3.1:
+    resolution: {integrity: sha512-hW0GwZj06z/ZFUW2Espl7toVDjghJN+EKqyXzPSV8NV89d5BYp5rRMBJoc+aUN0x5OXDMeRQHazejr2Xmqj2tw==}
+    dev: true
+
   /@mdx-js/mdx/1.6.22:
     resolution: {integrity: sha512-AMxuLxPz2j5/6TpF/XSdKpQP1NlG0z11dFOlq+2IP/lSgl11GY8ji6S/rgsViN/L0BDvHvUMruRb7ub+24LUYA==}
     dependencies:
@@ -7993,9 +7997,11 @@ packages:
     resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}
     dev: true
 
-  /chart.js/4.0.1:
-    resolution: {integrity: sha512-5/8/9eBivwBZK81mKvmIwTb2Pmw4D/5h1RK9fBWZLLZ8mCJ+kfYNmV9rMrGoa5Hgy2/wVDBMLSUDudul2/9ihA==}
+  /chart.js/4.1.1:
+    resolution: {integrity: sha512-P0pCosNXp+LR8zO/QTkZKT6Hb7p0DPFtypEeVOf+6x06hX13NIb75R0DXUA4Ksx/+48chDQKtCCmRCviQRTqsA==}
     engines: {pnpm: ^7.0.0}
+    dependencies:
+      '@kurkle/color': 0.3.1
     dev: true
 
   /check-error/1.0.2:
diff --git a/rollup.config.js b/rollup.config.js
index d2d47531..1cd95c6a 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -24,9 +24,16 @@ export default {
   input: pkg.exports,
   plugins: plugins('defaults and supports es6-module'),
   external,
-  output: {
-    format: 'es',
-    file: pkg.publishConfig.exports.import,
-    sourcemap: true
-  }
+  output: [
+    {
+      file: pkg.publishConfig.exports.import,
+      format: 'es',
+      sourcemap: true
+    },
+    {
+      file: pkg.publishConfig.exports.require,
+      format: 'cjs',
+      sourcemap: true
+    }
+  ]
 }
diff --git a/src/props.ts b/src/props.ts
index 930ae24e..877b243e 100644
--- a/src/props.ts
+++ b/src/props.ts
@@ -1,5 +1,11 @@
 import type { PropType } from 'vue'
-import type { ChartType, ChartData, Plugin, UpdateMode } from 'chart.js'
+import type {
+  ChartType,
+  ChartData,
+  ChartOptions,
+  Plugin,
+  UpdateMode
+} from 'chart.js'
 
 export const CommonProps = {
   data: {
@@ -7,7 +13,7 @@ export const CommonProps = {
     required: true
   },
   options: {
-    type: Object, // as PropType<ChartOptions>, restore after Chart.js update
+    type: Object as PropType<ChartOptions>,
     default: () => ({})
   },
   plugins: {