Updated dependencies.

Dockerfile

@@ -1,7 +1,7 @@
 # We do a multi-stage build (requires Docker >= 17.05) to install everything, then copy it all
 # to the final target image.
 
-FROM rockylinux:8 AS base
+FROM rockylinux:8.5 AS base
 
 # update packages and install Python
 RUN dnf -y upgrade-minimal && \

requirements-dev.txt

@@ -1,5 +1,5 @@
-pytest==6.2.5
-selenium==4.1.0
-pylint==2.12.2
+pytest==7.1.2
+selenium==4.2.0
+pylint==2.14.1
 pylint-flask-sqlalchemy==0.2.0
 pytest-pylint==0.18.0

requirements.txt

@@ -1,13 +1,9 @@
-# python 3.8.7
+# python 3.10.4
 
-flask==2.0.3
-# NOTE: Newer versions of SQLAlchemy contain a change that breaks Flask-SQLALchemy :-/
-#   https://stackoverflow.com/a/66652728
-# This wasn't a problem on vm-linux-dev, but manifested itself on the rPi4 (probably because
-# the virtualenv on vm-linux-dev was built before this became a problem).
+flask==2.1.2
 flask-sqlalchemy==2.5.1
 psycopg2-binary==2.9.3
-alembic==1.7.6
+alembic==1.8.0
 pyyaml==6.0
-lxml==4.8.0
-waitress==2.0.0
+lxml==4.9.0
+waitress==2.1.2

web/Dockerfile

@@ -1,10 +1,10 @@
 # NOTE: Multi-stage builds require Docker v17.05 or later.
 
 # create the build environment
-FROM node:8.16.2-alpine AS build
+FROM node:18-alpine3.15 AS build
 WORKDIR /app
 ENV PATH /app/node_modules/.bin:$PATH
-RUN npm install react-scripts@3.2.0 -g
+RUN npm install react-scripts@5.0.1 --location=global
 COPY package.json /app/package.json
 RUN npm install
 COPY . /app/
@@ -14,7 +14,7 @@ RUN if [ -n "$ENABLE_TESTS" ]; then echo -e "\nREACT_APP_TEST_MODE=1" >>/app/.en
 RUN npm run build
 
 # create the final target image
-FROM nginx:1.17.5-alpine
+FROM nginx:1.21.6-alpine
 COPY docker/nginx-default.conf /etc/nginx/conf.d/default.conf
 COPY --from=build /app/build /usr/share/nginx/html
 EXPOSE 80

web/package.json

@@ -6,17 +6,19 @@
     "@material-ui/core": "^4.7.0",
     "@reach/menu-button": "^0.7.2",
     "axios": "^0.19.0",
+    "babel-runtime": "^6.26.0",
     "http-proxy-middleware": "^0.20.0",
     "jquery": "^3.4.1",
     "lodash.clone": "^4.5.0",
     "lodash.clonedeep": "^4.5.0",
     "lodash.isequal": "^4.5.0",
+    "query-string": "^7.1.1",
     "react": "^16.11.0",
     "react-dom": "^16.11.0",
     "react-drag-listview": "^0.1.6",
     "react-draggable": "^4.1.0",
     "react-router-dom": "^5.1.2",
-    "react-scripts": "3.2.0",
+    "react-scripts": "5.0.1",
     "react-select": "^3.0.8",
     "react-tabs": "^3.2.3",
     "react-toastify": "^5.4.1"

web/src/App.css

@@ -8,7 +8,7 @@
 
 #menu-button--app { position: absolute ; top: 10px ; right: 10px ;
     width: 30px ; height: 30px ;
-    background: url("/images/main-menu.png") transparent no-repeat ; background-size: 100% ; border: none ;
+    background: url("/public/images/main-menu.png") transparent no-repeat ; background-size: 100% ; border: none ;
     cursor: pointer ;
 }
 [data-reach-menu] { z-index: 999 ; }

web/src/DbReport.css

@@ -13,7 +13,7 @@
 #db-report .db-links .check-links-frame { display: inline-block ; position: absolute ; right: 1em ; text-align: center ; }
 #db-report .db-links button.check-links { margin-bottom: 0.2em ; padding: 0.25em 0.5em ; }
 #db-report .db-links .check-links-frame .status-msg { font-size: 60% ; font-style: italic ; }
-#db-report .db-links .link-errors { font-size: 80% ; list-style-image: url("/images/link-error-bullet.png") ; }
+#db-report .db-links .link-errors { font-size: 80% ; list-style-image: url("/public/images/link-error-bullet.png") ; }
 #db-report .db-links .link-errors .status { font-family: monospace ; font-style: italic ; }
 
 #db-report .db-images .dupe-analysis .collapsible { margin-bottom: 0.5em ; }

web/src/SearchForm.css

@@ -2,5 +2,5 @@
 #search-form .caption { line-height: 22px ; }
 #search-form .query { flex: 1 ; min-width: 5em ; max-width: 30em ; margin: 0 0.25em 0 0.5em ; }
 #search-form button[type="submit"] { width: 28px ; height: 28px ;
-    background: url("/images/search.png") transparent no-repeat 2px 2px ; background-size: 20px ;
+    background: url("/public/images/search.png") transparent no-repeat 2px 2px ; background-size: 20px ;
 }

web/src/SearchResults.css

@@ -6,7 +6,7 @@
 
 .search-result button.sr-menu {
     width: 1em ; height: 1em ; float: right ; margin-right: -3px ;
-    background: url("/images/menu.png") transparent no-repeat ; background-size: 100% ; border: none ;
+    background: url("/public/images/menu.png") transparent no-repeat ; background-size: 100% ; border: none ;
     cursor: pointer ;
 }
 

web/src/index.css

@@ -9,8 +9,8 @@ body {
 
 h1:not(:first-child), h2:not(:first-child), h3:not(:first-child), h4:not(:first-child), h5:not(:first-child), h6:not(:first-child) { margin-top: 0.25em ; }
 ul, ol { margin: 0 0 0 1.25em ; }
-ul { list-style-image: url("/images/bullet.png") }
-ul ul, ol ul { list-style-image: url("/images/bullet2.png") }
+ul { list-style-image: url("/public/images/bullet.png") }
+ul ul, ol ul { list-style-image: url("/public/images/bullet2.png") }
 input[type="text"] { height: 22px ; border: 1px solid #c5c5c5 ; padding: 2px 5px ; }
 label { height: 1.25em ; margin-top: -3px ; }
 textarea { padding: 2px 5px ; resize: vertical ; }
@@ -18,7 +18,7 @@ pre { font-size: 90% ; }
 blockquote {
     margin: .5em 1em .75em 1em ; padding: 5px 5px 5px 15px ;
     border: 1px solid #ddd ; background: #fffff0 ;
-    background-image: url( "/images/blockquote.png" ) ; background-position: 2px 5px ; background-repeat: no-repeat ;
+    background-image: url( "/public/images/blockquote.png" ) ; background-position: 2px 5px ; background-repeat: no-repeat ;
     font-style: italic ;
 }