Merge branch 'release-0.2.15' into main

.github/workflows/docker.yaml

@@ -2,6 +2,7 @@
 on:
   push:
     branches:
+      - experimental
       - develop
       - main
   release:

.gitignore

@@ -198,6 +198,7 @@ tags
 
 ### IDEA Editor settings ###
 .idea/*
+.gradle/*
 
 ### VisualStudioCode Patch ###
 # Ignore all local history of files

Dockerfile

@@ -1,25 +1,30 @@
-FROM node:alpine as clientBuilder
+FROM node:14-alpine as clientBuilder
 
 RUN mkdir /app
 WORKDIR /app
 COPY /client/package.json .
-RUN npm install
+COPY /client/package-lock.json .
+RUN npm ci
 COPY /client .
 
 RUN npm run build
 RUN echo package.json
 
-FROM node
+FROM node:14-alpine
+
+WORKDIR /
 
-COPY . /
 COPY --from=clientBuilder /app/build /client/build
+COPY ./server/package.json ./
+COPY ./server/package-lock.json ./
 
-WORKDIR /
+RUN npm ci
 
-RUN npm install
+COPY ./server/app ./app
+COPY ./server/middleware ./middleware
+COPY ./server/server.js ./
 
 EXPOSE 5000
-
-ENTRYPOINT ["/usr/local/bin/node", "server.js"]
+ENTRYPOINT ["/usr/local/bin/node", "./server.js"]
 
 

client/.eslintrc.json

@@ -2,12 +2,18 @@
   "env": {
     "browser": true,
     "es6": true,
+    "node": true,
     "jest/globals": true
   },
+  "globals": {
+    "process": true
+  },
   "extends": [
     "eslint:recommended",
+    "plugin:react/recommended",
     "plugin:jest/recommended",
-    "plugin:react/recommended"
+    "plugin:prettier/recommended",
+    "plugin:react-hooks/recommended"
   ],
   "parserOptions": {
     "ecmaFeatures": {
@@ -16,15 +22,17 @@
     "ecmaVersion": 2018,
     "sourceType": "module"
   },
-  "plugins": ["react", "jest"],
+  "plugins": ["react", "jest", "prettier", "eslint-plugin-react"],
   "rules": {
     "prettier/prettier": "error",
     "no-console": ["warn", { "allow": ["error"] }],
     "no-alert": "error"
   },
   "settings": {
+    // Settings for eslint-plugin-react
     "react": {
-      "createClass": "createReactClass", // Regex for Component Factory to use,
+      "createClass": "createReactClass",
+      // Regex for Component Factory to use,
       // default to "createReactClass"
       "pragma": "React", // Pragma to use, default to "React"
       "version": "detect" // React version. "detect" automatically picks the version you have installed.

.prettierrc.js → client/.prettierrc.js

@@ -4,5 +4,5 @@
 // using default prettier settings.
 module.exports = {
   trailingComma: "none", // deafult changed in prettier 2+
-  arrowParens: "avoid" // default changed in prettier 2+
+  arrowParens: "avoid", // default changed in prettier 2+
 };