From 086ff50d0a47ffb57ca2a1d34795bb13e5b3b4b8 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Sun, 24 Oct 2021 21:34:04 +0800
Subject: [PATCH] merge AriaNg commit
 (https://github.com/mayswind/AriaNg/commit/b97f7e7985f8d443bb9d3db1ff1f73d63e8bb1ab)

---
 app/index.html    |  1 -
 package-lock.json | 14 +++-----------
 package.json      |  3 +--
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/app/index.html b/app/index.html
index 6e05761..3368d8b 100644
--- a/app/index.html
+++ b/app/index.html
@@ -349,7 +349,6 @@ <h3 translate>Create New Task</h3>
 <script src="../node_modules/moment/min/moment.min.js"></script>
 <script src="../node_modules/moment/locale/zh-cn.js"></script>
 <script src="../node_modules/moment/locale/zh-tw.js"></script>
-<script src="../node_modules/moment-timezone/builds/moment-timezone-with-data.min.js"></script>
 <script src="../node_modules/echarts/dist/echarts.common.min.js"></script>
 <script src="../node_modules/admin-lte/dist/js/adminlte.js"></script>
 <script src="../node_modules/jquery-slimscroll/jquery.slimscroll.min.js"></script>
diff --git a/package-lock.json b/package-lock.json
index 2bab45c..077167b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2831,17 +2831,9 @@
       }
     },
     "moment": {
-      "version": "2.24.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
-      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
-    },
-    "moment-timezone": {
-      "version": "0.5.28",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.28.tgz",
-      "integrity": "sha512-TDJkZvAyKIVWg5EtVqRzU97w0Rb0YVbfpqyjgu6GwXCAohVRqwZjf4fOzDE6p1Ch98Sro/8hQQi65WDXW5STPw==",
-      "requires": {
-        "moment": ">= 2.9.0"
-      }
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
     },
     "morris.js": {
       "version": "0.5.0",
diff --git a/package.json b/package.json
index d201c06..f50b75d 100644
--- a/package.json
+++ b/package.json
@@ -75,8 +75,7 @@
     "font-awesome": "^4.7.0",
     "jquery": "3.4.1",
     "jquery-slimscroll": "^1.3.8",
-    "moment": "2.24.0",
-    "moment-timezone": "0.5.28",
+    "moment": "2.29.1",
     "natural-compare": "1.4.0",
     "sweetalert": "^1.1.3",
     "yargs": "^15.3.1"