Merge branch 'photoswipe' into beta

CHANGELOG.md

@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Experimental
+### Changed
+- Use the latest (v5) version of PhotoSwipe library.
 
 ## [1.126.0] - 2023-12-21
 ### Added

package.json

@@ -1,51 +1,52 @@
 {
   "name": "reactive-pepyatka",
-  "version": "1.126.0",
+  "version": "1.127.0",
   "description": "",
   "main": "index.js",
   "dependencies": {
     "@fortawesome/free-brands-svg-icons": "~5.15.4",
     "@fortawesome/free-regular-svg-icons": "~5.15.4",
     "@fortawesome/free-solid-svg-icons": "~5.15.4",
-    "@sentry/react": "~7.90.0",
+    "@sentry/react": "~7.91.0",
     "autotrack": "~2.4.1",
-    "classnames": "~2.3.2",
+    "classnames": "~2.4.0",
     "custom-event": "~1.0.1",
-    "date-fns": "~2.30.0",
+    "date-fns": "~3.0.6",
     "debug": "~4.3.4",
     "events": "~3.3.0",
-    "filesize": "~8.0.7",
+    "filesize": "~10.1.0",
     "final-form": "~4.20.10",
-    "focus-trap-react": "~8.9.2",
+    "focus-trap-react": "~10.2.3",
     "focus-visible": "~5.2.0",
-    "iso-639-1": "~2.1.15",
+    "iso-639-1": "~3.1.0",
     "keycode-js": "~3.1.0",
     "local-storage-fallback": "~4.1.2",
     "lodash-es": "~4.17.21",
-    "lru-cache": "~7.14.1",
+    "lru-cache": "~10.1.0",
     "memoize-one": "~6.0.0",
     "mousetrap": "~1.6.5",
+    "photoswipe": "~5.4.3",
     "porter-stemmer": "~0.9.1",
     "prop-types": "~15.8.1",
     "react": "~17.0.2",
     "react-dom": "~17.0.2",
     "react-final-form-hooks": "~2.0.2",
-    "react-google-recaptcha": "~2.1.0",
+    "react-google-recaptcha": "~3.1.0",
     "react-helmet": "~6.1.0",
-    "react-photoswipe": "~1.3.0",
     "react-portal": "~4.2.2",
-    "react-redux": "~7.2.9",
+    "react-redux": "~8.1.3",
     "react-router": "~3.2.6",
     "react-router-redux": "~4.0.8",
     "react-select": "~5.8.0",
-    "react-sortablejs": "~2.0.11",
+    "react-sortablejs": "~6.1.4",
     "react-textarea-autosize": "~8.5.3",
     "recharts": "~2.10.3",
-    "redux": "~4.2.1",
+    "redux": "~5.0.1",
     "snarkdown": "~2.0.0",
     "social-text-tokenizer": "~3.0.0",
     "socket.io-client": "~2.3.1",
-    "tabbable": "~5.2.1",
+    "sortablejs": "~1.15.1",
+    "tabbable": "~6.2.0",
     "ua-parser-js": "~1.0.37",
     "use-subscription": "~1.8.0",
     "validator": "~13.11.0",
@@ -57,9 +58,9 @@
     "@babel/eslint-parser": "~7.23.3",
     "@babel/preset-react": "~7.23.3",
     "@gfx/zopfli": "~1.0.15",
-    "@testing-library/jest-dom": "~5.16.5",
+    "@testing-library/jest-dom": "~6.1.5",
     "@testing-library/react": "~12.1.5",
-    "@testing-library/react-hooks": "~7.0.2",
+    "@testing-library/react-hooks": "~8.0.1",
     "@testing-library/user-event": "~14.5.1",
     "@vitejs/plugin-legacy": "~5.2.0",
     "@vitejs/plugin-react-swc": "^3.5.0",
@@ -70,42 +71,37 @@
     "eslint-plugin-babel": "~5.3.1",
     "eslint-plugin-import": "~2.29.1",
     "eslint-plugin-lodash": "~7.4.0",
-    "eslint-plugin-prettier": "~5.1.1",
+    "eslint-plugin-prettier": "~5.1.2",
     "eslint-plugin-promise": "~6.1.1",
     "eslint-plugin-react": "~7.33.2",
     "eslint-plugin-react-hooks": "~4.6.0",
-    "eslint-plugin-unicorn": "~48.0.1",
+    "eslint-plugin-unicorn": "~50.0.1",
     "eslint-plugin-you-dont-need-lodash-underscore": "~6.13.0",
     "husky": "~8.0.3",
-    "jsdom": "~22.1.0",
-    "lint-staged": "~12.4.3",
-    "node-html-parser": "~6.1.11",
+    "jsdom": "~23.0.1",
+    "lint-staged": "~15.2.0",
+    "node-html-parser": "~6.1.12",
     "npm-run-all": "~4.1.5",
     "prettier": "~3.1.1",
     "querystring": "~0.2.1",
     "react-test-renderer": "~17.0.2",
     "rimraf": "~5.0.5",
     "sass": "^1.69.5",
-    "sinon": "~13.0.2",
-    "stylelint": "~15.11.0",
+    "sinon": "~17.0.1",
+    "stylelint": "~16.1.0",
     "stylelint-config-prettier": "~9.0.5",
-    "stylelint-config-standard-scss": "~11.1.0",
-    "stylelint-prettier": "~4.0.2",
-    "stylelint-scss": "~5.3.2",
+    "stylelint-config-standard-scss": "~12.0.0",
+    "stylelint-prettier": "~5.0.0",
+    "stylelint-scss": "~6.0.0",
     "terser": "~5.26.0",
-    "unexpected": "~13.1.0",
+    "unexpected": "~13.2.1",
     "unexpected-react": "~6.0.2",
     "unexpected-sinon": "~11.1.0",
     "url": "~0.11.3",
     "vite": "~5.0.10",
     "vite-plugin-compression": "~0.5.1",
     "vite-plugin-generate-file": "~0.1.1",
-    "vitest": "~0.34.6"
-  },
-  "resolutions": {
-    "debug": "~4.3.4",
-    "focus-trap": "~6.7.3",
-    "tabbable": "~5.2.1"
+    "vitest": "~1.1.0"
   },
   "scripts": {
     "start": "vite",

src/app.jsx

@@ -57,15 +57,6 @@ import { HomeAux } from './components/home-aux';
 import { NotFound } from './components/not-found';
 import { DialogProvider } from './components/dialog/context';
 
-// Set initial history state.
-// Without this, there can be problems with third-party
-// modules using history API (specifically, PhotoSwipe).
-browserHistory.replace({
-  pathname: location.pathname,
-  search: location.search,
-  hash: location.hash,
-});
-
 const boundRouteActions = bindRouteActions(store.dispatch);
 
 const history = syncHistoryWithStore(browserHistory, store);

src/components/color-theme-setter.jsx

@@ -7,7 +7,10 @@ import { darkTheme as selectDarkTheme } from './select-utils';
 export function ColorSchemeSetter() {
   const darkTheme = useSelector(selectDarkTheme);
 
-  useEffect(() => document.documentElement.classList.toggle('dark-theme', darkTheme), [darkTheme]);
+  useEffect(
+    () => void document.documentElement.classList.toggle('dark-theme', darkTheme),
+    [darkTheme],
+  );
 
   return (
     <Helmet defer={false}>

src/components/discussions.jsx

@@ -18,7 +18,6 @@ const FeedHandler = (props) => {
       createPost={props.createPost}
       resetPostCreateForm={props.resetPostCreateForm}
       addAttachmentResponse={props.addAttachmentResponse}
-      showMedia={props.showMedia}
     />
   );