Merge branch 'release/3.3.0'

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.3.0] - 2021-12-04
+
+### Added
+
+- Docker support for linux/arm64 and linux/arm/v7 (#298)
+
 ## [3.2.0] - 2021-09-18
 
 ### Changed

Dockerfile

@@ -6,7 +6,7 @@ WORKDIR /srv/app/
 # Add dependencies first so that Docker can use the cache as long as the dependencies stay unchanged
 
 COPY package.json yarn.lock /srv/app/
-RUN yarn install --production --frozen-lockfile
+RUN yarn install --production --frozen-lockfile --network-timeout 120000
 
 # Copy source after the dependency step as it's more likely that the source changes
 

docs/Upgrade guide.md

@@ -6,15 +6,15 @@
 
 > This change is relevant for you when using a wildcard as the Access-Control-Allow-Origin.
 
-Using a wildcard (`*`) for the `Access-Control-Allow-Origin` header was never recommended as it's neither a secure solution nor does it allow Ackee to ignore your own visits. Please disable the `ignoreOwnVisits` option in ackee-tracker if you're currently using a wildcard. The [SSL and HTTPS](docs/SSL%20and%20HTTPS.md) guide contains better alternatives.
+Using a wildcard (`*`) for the `Access-Control-Allow-Origin` header was never recommended as it's neither a secure solution nor does it allow Ackee to ignore your own visits. Please disable the `ignoreOwnVisits` option in ackee-tracker if you're currently using a wildcard. The [SSL and HTTPS](SSL%20and%20HTTPS.md) guide contains better alternatives.
 
 `ignoreOwnVisits` is now enabled by default and won't work when using a wildcard.
 
 ### New `Access-Control-Allow-Credentials` header
 
 > This change is relevant for everyone.
 
-Ackee requires [a new `Access-Control-Allow-Credentials` header](docs/CORS%20headers.md#credentials) which was previously optional. Make sure to add this header in your server or reverse proxy configuration.
+Ackee requires [a new `Access-Control-Allow-Credentials` header](CORS%20headers.md#credentials) which was previously optional. Make sure to add this header in your server or reverse proxy configuration.
 
 ### ackee-tracker with new `.create` and `.record` syntax
 
@@ -32,4 +32,4 @@ A new parameter is required when requesting referrers via the GraphQL API. The p
 
 > This change is relevant for you when using the GraphQL API.
 
-The `id` of requested referrers was always a URL, but has been changed to a string. That's because [referrers can now include parameters](docs/Enhancing%20referrers.md) (e.g. `source` when using `ackee-tracker`).
+The `id` of requested referrers was always a URL, but has been changed to a string. That's because [referrers can now include parameters](Enhancing%20referrers.md) (e.g. `source` when using `ackee-tracker`).

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ackee",
   "private": true,
-  "version": "3.2.0",
+  "version": "3.3.0",
   "authors": [
     "Tobias Reich <[email protected]>"
   ],
@@ -58,30 +58,24 @@
   },
   "devDependencies": {
     "@apollo/client": "^3.4.12",
-    "@electerious/eslint-config": "^2.0.5",
+    "@electerious/eslint-config": "^3.0.0",
     "ava": "3.15.0",
     "classnames": "^2.3.1",
     "coveralls": "^3.1.1",
-    "eslint": "^7.32.0",
-    "eslint-plugin-ava": "^12.0.0",
-    "eslint-plugin-import": "^2.24.2",
-    "eslint-plugin-react": "^7.25.2",
-    "eslint-plugin-react-hooks": "^4.2.0",
-    "eslint-plugin-unicorn": "^36.0.0",
     "formbase": "^12.0.2",
-    "history": "^5.0.1",
+    "history": "^5.1.0",
     "human-number": "^1.0.6",
     "mocked-env": "^1.3.5",
-    "mongodb-memory-server": "^7.4.0",
-    "nodemon": "^2.0.12",
+    "mongodb-memory-server": "^8.0.4",
+    "nodemon": "^2.0.15",
     "normalize.css": "^8.0.1",
     "nyc": "^15.1.0",
     "prop-types": "^15.7.2",
     "react": "^17.0.2",
     "react-apollo-network-status": "^5.0.1",
     "react-dom": "^17.0.2",
     "react-fast-compare": "^3.2.0",
-    "react-hotkeys-hook": "^3.4.0",
+    "react-hotkeys-hook": "^3.4.4",
     "react-use": "^17.3.1",
     "rosid-handler-js-next": "^1.0.1",
     "rosid-handler-sass": "^8.0.0",