Merge pull request #4463 from david-poindexter/issue-3875-pages

Migrate moment to dayjs for Pages.Web
dnnsoftware · Feb 8, 2021 · eca8bc2 · eca8bc2
2 parents a305a95 + 0941693
commit eca8bc2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/package.json b/Dnn.AdminExperience/ClientSide/Pages.Web/package.json
@@ -66,11 +66,11 @@
     "webpack-dev-server": "^3.1.14"
   },
   "dependencies": {
-    "moment": "^2.22.2",
+    "dayjs": "^1.10.4",
     "promise": "^8.0.2",
     "prop-types": "^15.6.2",
     "react": "^16.6.3",
     "react-day-picker": "^7.2.4",
     "url-parse": "^1.2.0"
   }
-}
+}
diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/utils.js b/Dnn.AdminExperience/ClientSide/Pages.Web/src/utils.js
@@ -1,5 +1,6 @@
-import Moment from "moment";
 import UrlParse from "url-parse";
+import * as dayjs from "dayjs";
+const localizedFormat = require('dayjs/plugin/localizedFormat');
 let utilities = null;
 let config = null;
 let moduleName = null;
@@ -190,7 +191,8 @@ function formatDate(dateValue, longformat) {
         return "-";
     }
 
-    return Moment(dateValue).locale(utilities.getCulture()).format(longformat === true ? "LLL" : "L");
+    dayjs.extend(localizedFormat);
+    return dayjs(dateValue).locale(utilities.getCulture()).format(longformat === true ? "LLL" : "L");
 }
 function getUserMode() {
     return config.userMode;
@@ -239,4 +241,4 @@ const utils = {
     url
 };
 
-export default utils;
+export default utils;