merge AriaNg commit (mayswind/AriaNg@b97f7e7)

mayswind · Oct 24, 2021 · 086ff50 · 086ff50
1 parent 3582acc
commit 086ff50
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git 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
diff --git 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"