Merge branch 'develop' into render-org-teams

Author: vgeorge

next.config.js

@@ -1,4 +1,6 @@
-require('dotenv').config()
+const vercelUrl =
+  process.env.NEXT_PUBLIC_VERCEL_URL &&
+  `https://${process.env.NEXT_PUBLIC_VERCEL_URL}`
 
 module.exports = {
   serverRuntimeConfig: {
@@ -20,10 +22,7 @@ module.exports = {
   },
   basePath: process.env.BASE_PATH || '',
   env: {
-    APP_URL:
-      process.env.APP_URL ||
-      `https://${process.env.NEXT_PUBLIC_VERCEL_URL}` ||
-      'http://127.0.0.1:3000',
+    APP_URL: process.env.APP_URL || vercelUrl || 'http://127.0.0.1:3000',
     OSM_NAME: process.env.OSM_NAME || 'OSM',
     BASE_PATH: process.env.BASE_PATH || '',
   },

package.json

@@ -55,7 +55,6 @@
     "cors": "^2.8.5",
     "csurf": "^1.11.0",
     "date-fns": "^2.28.0",
-    "dotenv": "^6.2.0",
     "express": "^4.17.2",
     "express-boom": "^2.0.0",
     "express-pino-logger": "^4.0.0",

yarn.lock

@@ -3342,11 +3342,6 @@ dot-prop@^4.2.1:
   dependencies:
     is-obj "^1.0.0"
 
-dotenv@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
-  integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==
-
 drange@^1.0.2:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/drange/-/drange-1.1.1.tgz#b2aecec2aab82fcef11dbbd7b9e32b83f8f6c0b8"