Merge branch 'beta' into stable

Author: MonkeyDo

.github/workflows/ci.yml

@@ -60,6 +60,7 @@ jobs:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: bookbrainz_test
+          POSTGRES_HOST: localhost
 
       - name: Set up node
         uses: actions/setup-node@v1

.gitignore

@@ -9,6 +9,9 @@
 /config/config.json
 /config/config.local.json
 
+# Directory designated to store local compose overrides and related files
+/local/
+
 # react-hot-loader files
 /static/hot
 *.hot-update.js

DEPENDENCIES_MANUAL_INSTALL.md

@@ -42,7 +42,7 @@ ARG BB_ROOT=/home/bookbrainz/bookbrainz-site
 WORKDIR $BB_ROOT
 RUN chown bookbrainz:bookbrainz $BB_ROOT
 
-RUN echo $GIT_COMMIT_SHA > .git-version
+ENV GIT_COMMIT_SHA=$GIT_COMMIT_SHA
 
 # Files necessary to complete the JavaScript build
 COPY --chown=bookbrainz scripts/ scripts/

Dockerfile

@@ -36,7 +36,7 @@
     "@fortawesome/free-solid-svg-icons": "^6.1.1",
     "@fortawesome/react-fontawesome": "^0.1.11",
     "array-move": "^3.0.1",
-    "bookbrainz-data": "3.0.0",
+    "bookbrainz-data": "4.0.0",
     "chart.js": "^2.9.4",
     "chartjs-adapter-date-fns": "^1.0.0",
     "classnames": "^2.3.2",
@@ -103,7 +103,7 @@
     "@babel/register": "^7.17.0",
     "@faker-js/faker": "^7.2.0",
     "@types/express": "^4.17.15",
-    "@types/lodash": "^4.14.164",
+    "@types/lodash": "^4.14.191",
     "@types/react-select": "^4.0.18",
     "@typescript-eslint/eslint-plugin": "^4.28.3",
     "@typescript-eslint/parser": "^4.6.1",
@@ -131,18 +131,18 @@
     "file-loader": "^6.2.0",
     "jsdom": "20.0.0",
     "jsdom-global": "3.0.2",
-    "mini-css-extract-plugin": "^2.5.3",
+    "mini-css-extract-plugin": "^2.7.4",
     "mocha": "^9.1.3",
     "nodemon": "^2.0.2",
     "redux-mock-store": "^1.5.4",
     "resolve-url-loader": "^5.0.0",
     "rewire": "^5.0.0",
-    "sass": "^1.49.0",
+    "sass": "^1.59.2",
     "sass-loader": "^13.2.0",
     "sinon": "^14.0.0",
     "typescript": "^4.0.5",
     "uuid": "^8.3.2",
-    "webpack": "^5.69.1",
+    "webpack": "^5.76.0",
     "webpack-bundle-analyzer": "^4.3.0",
     "webpack-cli": "^4.10.0",
     "webpack-dev-middleware": "^5.3.1",

INSTALLATION_TROUBLESHOOTING.md

@@ -1,10 +1,10 @@
 #!/bin/bash
 
 # set up variables with defaults
-: "${POSTGRES_USER:=postgres}"
+: "${POSTGRES_USER:=bookbrainz}"
 : "${POSTGRES_PASSWORD:=}"
 : "${POSTGRES_DB:=bookbrainz_test}"
-: "${POSTGRES_HOST:=localhost}"
+: "${POSTGRES_HOST:=postgres}"
 
 export PGPASSWORD=$POSTGRES_PASSWORD