From 5ecee5d6a4db01ceb051da743be1e2b906c4c18d Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Thu, 7 Jan 2021 09:29:32 -0800
Subject: [PATCH] Remove moment.js from build (#839)

---
 frontend/package-lock.json      | 31 +++++++++++++++++++++++--------
 frontend/package.json           |  2 +-
 frontend/src/options/options.js |  4 ++--
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 7ac7445dd..3f652eb6e 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1988,6 +1988,15 @@
       "integrity": "sha512-Zx869zlNoujFOclKIoYmkh8ES2RcS/+Jn546yOiPyZ+3+Ejivnr+fb8l+DdXUEFjo+iVDNR3KyLzg03aBFfZ4Q==",
       "optional": true
     },
+    "@vvo/tzdb": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@vvo/tzdb/-/tzdb-6.4.1.tgz",
+      "integrity": "sha512-zPURHhpB2kwtgkDzH9SPlNziIxAGcKma2+8OKdN3ZbVoh8Oo+8NVXRi2LaczdjX6tAMsR3Cu0C++Paxofmd4Uw==",
+      "requires": {
+        "luxon": "1.25.0",
+        "sort-on": "^4.1.0"
+      }
+    },
     "@webassemblyjs/ast": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
@@ -2408,6 +2417,11 @@
       "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
       "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog=="
     },
+    "arrify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
+      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug=="
+    },
     "asap": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
@@ -8553,14 +8567,6 @@
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
       "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
     },
-    "moment-timezone": {
-      "version": "0.5.32",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.32.tgz",
-      "integrity": "sha512-Z8QNyuQHQAmWucp8Knmgei8YNo28aLjJq6Ma+jy1ZSpSk5nyfRT8xgUbSQvD2+2UajISfenndwvFuH3NGS+nvA==",
-      "requires": {
-        "moment": ">= 2.9.0"
-      }
-    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
@@ -12127,6 +12133,15 @@
         "is-plain-obj": "^1.0.0"
       }
     },
+    "sort-on": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/sort-on/-/sort-on-4.1.0.tgz",
+      "integrity": "sha512-HStto6jwVlc3PL/cJplRMS1jiAwoqkH+BD375uDZU5hyYne5G2wlj7d1ggPVm0SVu7B6MxCjMQFlzDlzqmBOWg==",
+      "requires": {
+        "arrify": "^2.0.1",
+        "dot-prop": "^5.0.0"
+      }
+    },
     "source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index d9e184267..4074e1451 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -27,6 +27,7 @@
     "@babel/register": "^7.12.10",
     "@babel/runtime": "^7.12.5",
     "@fortawesome/fontawesome-free": "^5.15.1",
+    "@vvo/tzdb": "^6.4.1",
     "acorn": "^6.4.2",
     "ajv": "^6.12.6",
     "autoprefixer": "^9.8.6",
@@ -83,7 +84,6 @@
     "mini-css-extract-plugin": "^0.7.0",
     "minimist": ">=1.2.5",
     "mocha": "^8.2.1",
-    "moment-timezone": "^0.5.32",
     "node-storage-shim": "^2.0.1",
     "optimize-css-assets-webpack-plugin": "^5.0.4",
     "ora": "^4.1.1",
diff --git a/frontend/src/options/options.js b/frontend/src/options/options.js
index 3e0190390..9756c3fe7 100644
--- a/frontend/src/options/options.js
+++ b/frontend/src/options/options.js
@@ -1,10 +1,10 @@
+import { timeZonesNames } from "@vvo/tzdb";
 import { $gettext } from "common/vm";
-import moment from "moment-timezone";
 import { Info } from "luxon";
 import { config } from "../session";
 import { TypeVideo, TypeImage, TypeLive, TypeRaw } from "../model/photo";
 
-export const TimeZones = () => moment.tz.names();
+export const TimeZones = () => timeZonesNames;
 
 export const Days = () => {
   let result = [];