Merge branch 'master' into userscript-ratings

badges · Jul 21, 2022 · d867aee · d867aee
2 parents 93b0f73 + c64bb7e
commit d867aee
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 27 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -149,6 +149,8 @@ jobs:
   main@node-17:
     docker:
       - image: cimg/node:17.9
+    environment:
+      NPM_CONFIG_ENGINE_STRICT: 'false'
 
     <<: *main_steps
 
@@ -163,6 +165,8 @@ jobs:
     docker:
       - image: cimg/node:17.9
       - image: redis
+    environment:
+      NPM_CONFIG_ENGINE_STRICT: 'false'
 
     <<: *integration_steps
 
@@ -239,6 +243,8 @@ jobs:
   services@node-17:
     docker:
       - image: cimg/node:17.9
+    environment:
+      NPM_CONFIG_ENGINE_STRICT: 'false'
 
     <<: *services_steps
 

diff --git a/app.json b/app.json
@@ -35,6 +35,16 @@
     "WEBLATE_API_KEY": {
       "description": "Configure the API key to be used for the Weblate service.",
       "required": false
+    },
+    "METRICS_INFLUX_ENABLED": {
+      "description": "Disable influx metrics",
+      "value": "false",
+      "required": false
+    },
+    "REQUIRE_CLOUDFLARE": {
+      "description": "Allow direct traffic",
+      "value": "false",
+      "required": false
     }
   },
   "formation": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -241,7 +241,7 @@
     "url": "^0.11.0"
   },
   "engines": {
-    "node": ">=16.13.0",
+    "node": "^16.13.0",
     "npm": ">=8.0.0"
   },
   "type": "module",