Merge remote-tracking branch 'origin/master'

# Conflicts: # src/views/menu/menu.ts # src/views/menu/renderTools.ts
bennyluk · Nov 14, 2023 · f9d6fbe · f9d6fbe
2 parents b5a6375 + 5c7e18e
commit f9d6fbe
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 206 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
     "style-loader": "^3.3.2",
     "ts-loader": "^9.4.2",
     "typescript": "^5.0.4",
-    "webpack-cli": "^5.0.2"
+    "webpack-cli": "^5.1.4"
   },
   "dependencies": {
     "copy-webpack-plugin": "^11.0.0"