Merge branch 'beta' into HK

package-lock.json

@@ -162,15 +162,6 @@
       }
     },
     "node_modules/@jridgewell/source-map": {
-<<<<<<< HEAD
-      "version": "0.3.5",
-      "resolved": "https://registry.npmmirror.com/@jridgewell/source-map/-/source-map-0.3.5.tgz",
-      "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
-      "peer": true,
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-=======
       "version": "0.3.6",
       "resolved": "https://registry.npmmirror.com/@jridgewell/source-map/-/source-map-0.3.6.tgz",
       "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
@@ -178,7 +169,6 @@
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25"
->>>>>>> beta
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
@@ -293,15 +283,9 @@
       }
     },
     "node_modules/@types/eslint": {
-<<<<<<< HEAD
-      "version": "8.56.5",
-      "resolved": "https://registry.npmmirror.com/@types/eslint/-/eslint-8.56.5.tgz",
-      "integrity": "sha512-u5/YPJHo1tvkSF2CE0USEkxon82Z5DBy2xR+qfyYNszpX9qcs4sT6uq2kBbj4BXY1+DBGDPnrhMZV3pKWGNukw==",
-=======
       "version": "8.56.10",
       "resolved": "https://registry.npmmirror.com/@types/eslint/-/eslint-8.56.10.tgz",
       "integrity": "sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==",
->>>>>>> beta
       "peer": true,
       "dependencies": {
         "@types/estree": "*",
@@ -330,15 +314,9 @@
       "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="
     },
     "node_modules/@types/node": {
-<<<<<<< HEAD
-      "version": "20.11.24",
-      "resolved": "https://registry.npmmirror.com/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
-=======
       "version": "20.12.7",
       "resolved": "https://registry.npmmirror.com/@types/node/-/node-20.12.7.tgz",
       "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==",
->>>>>>> beta
       "peer": true,
       "dependencies": {
         "undici-types": "~5.26.4"
@@ -16040,15 +16018,9 @@
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "node_modules/terser": {
-<<<<<<< HEAD
-      "version": "5.28.1",
-      "resolved": "https://registry.npmmirror.com/terser/-/terser-5.28.1.tgz",
-      "integrity": "sha512-wM+bZp54v/E9eRRGXb5ZFDvinrJIOaTapx3WUokyVGZu5ucVCK55zEgGd5Dl2fSr3jUo5sDiERErUWLY6QPFyA==",
-=======
       "version": "5.30.4",
       "resolved": "https://registry.npmmirror.com/terser/-/terser-5.30.4.tgz",
       "integrity": "sha512-xRdd0v64a8mFK9bnsKVdoNP9GQIKUAaJPTaqEQDL4w/J8WaW4sWXXoMZ+6SimPkfT5bElreXf8m9HnmPc3E1BQ==",
->>>>>>> beta
       "peer": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
@@ -18805,15 +18777,6 @@
       "peer": true
     },
     "@jridgewell/source-map": {
-<<<<<<< HEAD
-      "version": "0.3.5",
-      "resolved": "https://registry.npmmirror.com/@jridgewell/source-map/-/source-map-0.3.5.tgz",
-      "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
-      "peer": true,
-      "requires": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-=======
       "version": "0.3.6",
       "resolved": "https://registry.npmmirror.com/@jridgewell/source-map/-/source-map-0.3.6.tgz",
       "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
@@ -18821,7 +18784,6 @@
       "requires": {
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25"
->>>>>>> beta
       }
     },
     "@jridgewell/sourcemap-codec": {
@@ -18915,15 +18877,9 @@
       "dev": true
     },
     "@types/eslint": {
-<<<<<<< HEAD
-      "version": "8.56.5",
-      "resolved": "https://registry.npmmirror.com/@types/eslint/-/eslint-8.56.5.tgz",
-      "integrity": "sha512-u5/YPJHo1tvkSF2CE0USEkxon82Z5DBy2xR+qfyYNszpX9qcs4sT6uq2kBbj4BXY1+DBGDPnrhMZV3pKWGNukw==",
-=======
       "version": "8.56.10",
       "resolved": "https://registry.npmmirror.com/@types/eslint/-/eslint-8.56.10.tgz",
       "integrity": "sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==",
->>>>>>> beta
       "peer": true,
       "requires": {
         "@types/estree": "*",
@@ -18952,15 +18908,9 @@
       "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="
     },
     "@types/node": {
-<<<<<<< HEAD
-      "version": "20.11.24",
-      "resolved": "https://registry.npmmirror.com/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
-=======
       "version": "20.12.7",
       "resolved": "https://registry.npmmirror.com/@types/node/-/node-20.12.7.tgz",
       "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==",
->>>>>>> beta
       "peer": true,
       "requires": {
         "undici-types": "~5.26.4"
@@ -32158,15 +32108,9 @@
       }
     },
     "terser": {
-<<<<<<< HEAD
-      "version": "5.28.1",
-      "resolved": "https://registry.npmmirror.com/terser/-/terser-5.28.1.tgz",
-      "integrity": "sha512-wM+bZp54v/E9eRRGXb5ZFDvinrJIOaTapx3WUokyVGZu5ucVCK55zEgGd5Dl2fSr3jUo5sDiERErUWLY6QPFyA==",
-=======
       "version": "5.30.4",
       "resolved": "https://registry.npmmirror.com/terser/-/terser-5.30.4.tgz",
       "integrity": "sha512-xRdd0v64a8mFK9bnsKVdoNP9GQIKUAaJPTaqEQDL4w/J8WaW4sWXXoMZ+6SimPkfT5bElreXf8m9HnmPc3E1BQ==",
->>>>>>> beta
       "peer": true,
       "requires": {
         "@jridgewell/source-map": "^0.3.3",