From 5c4180fb455a97a21fcc609d8956e686b5984168 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Sat, 15 Jul 2023 01:09:09 +0800
Subject: [PATCH] Merge conflicts

---
 package-lock.json | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index ad26942e2..6b9b937ba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -116,6 +116,7 @@
                 "typescript": "~4.4.4",
                 "v-pagination-3": "~0.1.7",
                 "vite": "~4.4.1",
+                "vite-plugin-commonjs": "^0.8.0",
                 "vite-plugin-compression": "^0.5.1",
                 "vue": "~3.3.4",
                 "vue-chartjs": "~5.2.0",
@@ -8751,6 +8752,12 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/es-module-lexer": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
+            "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==",
+            "dev": true
+        },
         "node_modules/es-set-tostringtag": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
@@ -18020,6 +18027,18 @@
                 }
             }
         },
+        "node_modules/vite-plugin-commonjs": {
+            "version": "0.8.1",
+            "resolved": "https://registry.npmjs.org/vite-plugin-commonjs/-/vite-plugin-commonjs-0.8.1.tgz",
+            "integrity": "sha512-hL2wwqgSiLBcrmCH7z+H468Z9uyBnKXX5OAwoYmWd/i03PBGCqkOBR3rjeojyWOoGmWgDVB7lj6Xn5pVw3Fwyg==",
+            "dev": true,
+            "dependencies": {
+                "acorn": "^8.8.2",
+                "fast-glob": "^3.2.12",
+                "magic-string": "^0.30.1",
+                "vite-plugin-dynamic-import": "^1.5.0"
+            }
+        },
         "node_modules/vite-plugin-compression": {
             "version": "0.5.1",
             "resolved": "https://registry.npmjs.org/vite-plugin-compression/-/vite-plugin-compression-0.5.1.tgz",
@@ -18118,6 +18137,18 @@
                 "node": ">=8"
             }
         },
+        "node_modules/vite-plugin-dynamic-import": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/vite-plugin-dynamic-import/-/vite-plugin-dynamic-import-1.5.0.tgz",
+            "integrity": "sha512-Qp85c+AVJmLa8MLni74U4BDiWpUeFNx7NJqbGZyR2XJOU7mgW0cb7nwlAMucFyM4arEd92Nfxp4j44xPi6Fu7g==",
+            "dev": true,
+            "dependencies": {
+                "acorn": "^8.8.2",
+                "es-module-lexer": "^1.2.1",
+                "fast-glob": "^3.2.12",
+                "magic-string": "^0.30.1"
+            }
+        },
         "node_modules/vue": {
             "version": "3.3.4",
             "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.4.tgz",