Merge branch 'main' into bugfix/include-zoom-location
commit
7ec36bde63
|
@ -1,9 +1,12 @@
|
||||||
/* eslint-disable @typescript-eslint/no-var-requires */
|
/* eslint-disable @typescript-eslint/no-var-requires */
|
||||||
const withTM = require("next-transpile-modules")(["react-timezone-select"]);
|
const withTM = require("next-transpile-modules")(["react-timezone-select"]);
|
||||||
|
|
||||||
// TODO: Revisit this later with getStaticProps in App
|
// So we can test deploy previews preview
|
||||||
if (process.env.NEXTAUTH_URL) {
|
if (process.env.VERCEL_URL && !process.env.BASE_URL) {
|
||||||
process.env.BASE_URL = process.env.NEXTAUTH_URL.replace("/api/auth", "");
|
process.env.BASE_URL = process.env.VERCEL_URL;
|
||||||
|
}
|
||||||
|
if (process.env.BASE_URL) {
|
||||||
|
process.env.NEXTAUTH_URL = process.env.BASE_URL + "/api/auth";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!process.env.EMAIL_FROM) {
|
if (!process.env.EMAIL_FROM) {
|
||||||
|
@ -13,9 +16,6 @@ if (!process.env.EMAIL_FROM) {
|
||||||
"EMAIL_FROM environment variable is not set, this may indicate mailing is currently disabled. Please refer to the .env.example file."
|
"EMAIL_FROM environment variable is not set, this may indicate mailing is currently disabled. Please refer to the .env.example file."
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (process.env.BASE_URL) {
|
|
||||||
process.env.NEXTAUTH_URL = process.env.BASE_URL + "/api/auth";
|
|
||||||
}
|
|
||||||
|
|
||||||
const validJson = (jsonString) => {
|
const validJson = (jsonString) => {
|
||||||
try {
|
try {
|
||||||
|
|
Loading…
Reference in New Issue