From 843e1f0278b76cd79720fe93016dc82596e33487 Mon Sep 17 00:00:00 2001
From: David Poindexter <dpoindexter@nvisionative.com>
Date: Sun, 7 Feb 2021 18:19:32 -0500
Subject: [PATCH 1/2] Migrate moment to dayjs for Pages.Web

---
 Dnn.AdminExperience/ClientSide/Pages.Web/package.json | 4 ++--
 Dnn.AdminExperience/ClientSide/Pages.Web/src/utils.js | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/package.json b/Dnn.AdminExperience/ClientSide/Pages.Web/package.json
index 491b89a0c20..e2da36888bb 100644
--- 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"
   }
-}
\ No newline at end of file
+}
diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/utils.js b/Dnn.AdminExperience/ClientSide/Pages.Web/src/utils.js
index 8b331582a7e..cd956084438 100644
--- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/utils.js
+++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/utils.js
@@ -1,4 +1,4 @@
-import Moment from "moment";
+import * as dayjs from "dayjs";
 import UrlParse from "url-parse";
 let utilities = null;
 let config = null;
@@ -190,7 +190,9 @@ function formatDate(dateValue, longformat) {
         return "-";
     }
 
-    return Moment(dateValue).locale(utilities.getCulture()).format(longformat === true ? "LLL" : "L");
+    const localizedFormat = require('dayjs/plugin/localizedFormat');
+    dayjs.extend(localizedFormat);
+    return dayjs(dateValue).locale(utilities.getCulture()).format(longformat === true ? "LLL" : "L");
 }
 function getUserMode() {
     return config.userMode;

From 09416937983abe3d2a218363a42fb5c87c331ff2 Mon Sep 17 00:00:00 2001
From: David Poindexter <dpoindexter@nvisionative.com>
Date: Sun, 7 Feb 2021 22:35:35 -0500
Subject: [PATCH 2/2] Move dayjs extension near imports

Move const for dayjs extension to just after imports section.
---
 Dnn.AdminExperience/ClientSide/Pages.Web/src/utils.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/utils.js b/Dnn.AdminExperience/ClientSide/Pages.Web/src/utils.js
index cd956084438..702e5be5b7e 100644
--- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/utils.js
+++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/utils.js
@@ -1,5 +1,6 @@
-import * as dayjs from "dayjs";
 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,6 @@ function formatDate(dateValue, longformat) {
         return "-";
     }
 
-    const localizedFormat = require('dayjs/plugin/localizedFormat');
     dayjs.extend(localizedFormat);
     return dayjs(dateValue).locale(utilities.getCulture()).format(longformat === true ? "LLL" : "L");
 }
@@ -241,4 +241,4 @@ const utils = {
     url
 };
 
-export default utils;
\ No newline at end of file
+export default utils;