Revert week format to 'PP', fix isoWeek

chartjs · Nov 18, 2019 · 19ee80b · 19ee80b
1 parent 9770b8e
commit 19ee80b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -1,10 +1,11 @@
 extends: chartjs
 
 parserOptions:
-  ecmaVersion: 5
+  ecmaVersion: 6
   sourceType: module
 
 env:
+  es6: true
   browser: true
   node: true
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "chartjs-adapter-date-fns",
   "homepage": "https://www.chartjs.org",
   "description": "Chart.js adapter to use date-fns for time functionalities",
-  "version": "1.0.0-alpha2",
+  "version": "1.0.0-alpha3",
   "license": "MIT",
   "main": "dist/chartjs-adapter-date-fns.js",
   "repository": {
@@ -30,6 +30,6 @@
   },
   "peerDependencies": {
     "chart.js": ">= 2.8.0 < 3",
-    "date-fns": "^2.0.0-alpha"
+    "date-fns": "^2.0.0"
   }
 }
diff --git a/src/index.js b/src/index.js
@@ -19,7 +19,7 @@ var FORMATS = {
 	minute: 'h:mm aaaa',
 	hour: 'ha',
 	day: 'MMM d',
-	week: 'w',
+	week: 'PP',
 	month: 'MMM yyyy',
 	quarter: 'qqq - yyyy',
 	year: 'yyyy'
@@ -90,7 +90,7 @@ _adapters._date.override({
 		case 'hour': return startOfHour(time);
 		case 'day': return startOfDay(time);
 		case 'week': return startOfWeek(time);
-		case 'isoWeek': return startOfWeek(time, { weekStartsOn: weekday });
+		case 'isoWeek': return startOfWeek(time, { weekStartsOn: +weekday });
 		case 'month': return startOfMonth(time);
 		case 'quarter': return startOfQuarter(time);
 		case 'year': return startOfYear(time);