chore: resolve merge conflicts

CHANGELOG.md

@@ -3,6 +3,48 @@
 All notable changes to this project will be documented in this file. See
 [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.23](https://github.com/scratchfoundation/scratch-storage/compare/v4.0.22...v4.0.23) (2024-12-20)
+
+
+### Bug Fixes
+
+* **deps:** buffer is a runtime dependency ([3616355](https://github.com/scratchfoundation/scratch-storage/commit/361635522767fdbbf2816e9ddc943bdd2d59fca4))
+
+## [4.0.22](https://github.com/scratchfoundation/scratch-storage/compare/v4.0.21...v4.0.22) (2024-12-10)
+
+
+### Bug Fixes
+
+* **deps:** lock file maintenance ([ca84557](https://github.com/scratchfoundation/scratch-storage/commit/ca84557ec72679bd039fc315d38a6a63e4ee431b))
+
+## [4.0.21](https://github.com/scratchfoundation/scratch-storage/compare/v4.0.20...v4.0.21) (2024-12-08)
+
+
+### Bug Fixes
+
+* **deps:** lock file maintenance ([578d4e0](https://github.com/scratchfoundation/scratch-storage/commit/578d4e0166ff0c64220735d375ad80a32b01f863))
+
+## [4.0.20](https://github.com/scratchfoundation/scratch-storage/compare/v4.0.19...v4.0.20) (2024-12-08)
+
+
+### Bug Fixes
+
+* **deps:** lock file maintenance ([1ec15b8](https://github.com/scratchfoundation/scratch-storage/commit/1ec15b823c8c403770efd5ab43815990fc66bb74))
+
+## [4.0.19](https://github.com/scratchfoundation/scratch-storage/compare/v4.0.18...v4.0.19) (2024-12-07)
+
+
+### Bug Fixes
+
+* **deps:** lock file maintenance ([eda0fbb](https://github.com/scratchfoundation/scratch-storage/commit/eda0fbb26f7c45fa46609650b787586dff510a7d))
+
+## [4.0.18](https://github.com/scratchfoundation/scratch-storage/compare/v4.0.17...v4.0.18) (2024-12-07)
+
+
+### Bug Fixes
+
+* **deps:** lock file maintenance ([4be8838](https://github.com/scratchfoundation/scratch-storage/commit/4be8838f76930f3ec06411874c3c1cd8b56a4a3c))
+
 ## [4.0.17](https://github.com/scratchfoundation/scratch-storage/compare/v4.0.16...v4.0.17) (2024-12-06)
 
 

package.json

@@ -1,13 +1,13 @@
 {
   "name": "scratch-storage",
-  "version": "4.0.17",
+  "version": "4.0.23",
   "description": "Load and store project and asset files for Scratch 3.0",
   "license": "AGPL-3.0-only",
   "homepage": "https://github.com/scratchfoundation/scratch-storage#readme",
   "repository": {
     "type": "git",
     "url": "https://github.com/scratchfoundation/scratch-storage.git",
-    "sha": "16b931c8d12b271481ce59941f842d898b113e82"
+    "sha": "361635522767fdbbf2816e9ddc943bdd2d59fca4"
   },
   "main": "./dist/node/scratch-storage.js",
   "browser": "./dist/web/scratch-storage.js",
@@ -33,6 +33,7 @@
     "@babel/runtime": "^7.21.0",
     "arraybuffer-loader": "^1.0.3",
     "base64-js": "^1.3.0",
+    "buffer": "6.0.3",
     "cross-fetch": "^4.1.0",
     "fastestsmallesttextencoderdecoder": "^1.0.7",
     "js-md5": "^0.7.3",
@@ -49,11 +50,10 @@
     "@types/jest": "29.5.14",
     "@typescript-eslint/eslint-plugin": "7.18.0",
     "babel-loader": "9.2.1",
-    "buffer": "6.0.3",
     "eslint": "8.57.1",
     "eslint-config-scratch": "9.0.9",
     "eslint-plugin-jest": "27.9.0",
-    "eslint-plugin-react": "7.37.2",
+    "eslint-plugin-react": "7.37.3",
     "file-loader": "6.2.0",
     "husky": "8.0.3",
     "jest": "29.7.0",
@@ -65,7 +65,7 @@
     "ts-jest": "29.2.5",
     "ts-jest-mock-import-meta": "1.2.1",
     "ts-loader": "9.5.1",
-    "webpack": "5.96.1",
+    "webpack": "5.97.1",
     "webpack-cli": "5.1.4"
   },
   "config": {