@@ -145,8 +148,8 @@ const SettingsBillingUsage = () => {
disabled={isLoadingPlan || !isOrganizationOwner}
onClick={() =>
checkout(
- process.env.NEXT_PUBLIC_STRIPE_PRO_PLAN_PRICE_ID as string,
- process.env.NEXT_PUBLIC_STRIPE_PRO_PLAN_PRICE_ID_METERED as string,
+ publicRuntimeConfig.STRIPE_PRO_PLAN_PRICE_ID as string,
+ publicRuntimeConfig.STRIPE_PRO_PLAN_PRICE_ID_METERED as string,
)
}
>
diff --git a/packages/dashboard/lib/pages/settings/SettingsGeneral.tsx b/packages/dashboard/lib/pages/settings/SettingsGeneral.tsx
index 44aca4c5b..00f34bdd6 100644
--- a/packages/dashboard/lib/pages/settings/SettingsGeneral.tsx
+++ b/packages/dashboard/lib/pages/settings/SettingsGeneral.tsx
@@ -2,7 +2,7 @@ import { useSession } from 'next-auth/react';
import toast from 'react-hot-toast';
import { composeValidators, maxLengthValidator, minLengthValidator, requiredValidator } from 'lib/form/validators';
import { useRouter } from 'next/router';
-import { Button, Card, Form, Input, Dialog, Textarea } from '@lagon/ui';
+import { Button, Card, Form, Input, Dialog, Textarea } from '@lagoss/ui';
import {
ORGANIZATION_DESCRIPTION_MAX_LENGTH,
ORGANIZATION_NAME_MAX_LENGTH,
diff --git a/packages/dashboard/lib/pages/settings/SettingsMembers.tsx b/packages/dashboard/lib/pages/settings/SettingsMembers.tsx
index 76abdcc32..440167b22 100644
--- a/packages/dashboard/lib/pages/settings/SettingsMembers.tsx
+++ b/packages/dashboard/lib/pages/settings/SettingsMembers.tsx
@@ -1,4 +1,4 @@
-import { Card, Text, Input, Button, Form, Dialog, Divider, Skeleton } from '@lagon/ui';
+import { Card, Text, Input, Button, Form, Dialog, Divider, Skeleton } from '@lagoss/ui';
import { composeValidators, emailValidator, requiredValidator } from 'lib/form/validators';
import useOrganizationMembers from 'lib/hooks/useOrganizationMembers';
import { trpc } from 'lib/trpc';
diff --git a/packages/dashboard/lib/plans.ts b/packages/dashboard/lib/plans.ts
index b3dd069aa..54538fc5f 100644
--- a/packages/dashboard/lib/plans.ts
+++ b/packages/dashboard/lib/plans.ts
@@ -1,3 +1,5 @@
+import getConfig from 'next/config';
+
export type Plan = {
type: 'personal' | 'pro';
id?: string;
@@ -21,9 +23,11 @@ export const PERSONAL_PLAN: Plan = {
maxAssetsPerFunction: 100,
};
+const { publicRuntimeConfig } = getConfig();
+
export const PRO_PLAN: Plan = {
type: 'pro',
- id: process.env.NEXT_PUBLIC_STRIPE_PRO_PLAN_PRICE_ID,
+ id: publicRuntimeConfig.STRIPE_PRO_PLAN_PRICE_ID,
expired: false,
maxFunctions: 50,
freeRequests: 5000000,
diff --git a/packages/dashboard/lib/posthog.tsx b/packages/dashboard/lib/posthog.tsx
index 3d8d1eba5..941cc1c03 100644
--- a/packages/dashboard/lib/posthog.tsx
+++ b/packages/dashboard/lib/posthog.tsx
@@ -2,10 +2,12 @@ import { ReactNode, useEffect } from 'react';
import { useRouter } from 'next/router';
import { PostHogProvider as OriginalPostHogProvider } from 'posthog-js/react';
import posthog from 'posthog-js';
+import getConfig from 'next/config';
if (typeof window !== 'undefined' && process.env.NODE_ENV !== 'development') {
- posthog.init(process.env.NEXT_PUBLIC_POSTHOG_KEY ?? '', {
- api_host: process.env.NEXT_PUBLIC_POSTHOG_HOST || 'https://app.posthog.com',
+ const { publicRuntimeConfig } = getConfig();
+ posthog.init(publicRuntimeConfig.POSTHOG_KEY ?? '', {
+ api_host: publicRuntimeConfig.POSTHOG_HOST || 'https://app.posthog.com',
});
}
diff --git a/packages/dashboard/lib/smtp/Welcome.tsx b/packages/dashboard/lib/smtp/Welcome.tsx
index 30efee036..5e66c58d9 100644
--- a/packages/dashboard/lib/smtp/Welcome.tsx
+++ b/packages/dashboard/lib/smtp/Welcome.tsx
@@ -17,29 +17,29 @@ export function Welcome({ name }: WelcomeProps) {
- Welcome to Lagon, an open-source runtime and platform that allows developers to run TypeScript and JavaScript
+ Welcome to Lagoss, an open-source runtime and platform that allows developers to run TypeScript and JavaScript
Serverless Functions at the Edge, close to users.
- 
+ 
Hi {name},
- Welcome to Lagon, an open-source runtime and platform that allows developers to run TypeScript and
+ Welcome to Lagoss, an open-source runtime and platform that allows developers to run TypeScript and
JavaScript Serverless Functions at the Edge, close to users.
We are excited to have you on board! Start your journey by deploying your first Function:
See you soon,
- Tom from Lagon
+ Tom from Lagoss
diff --git a/packages/dashboard/lib/smtp/index.tsx b/packages/dashboard/lib/smtp/index.tsx
index 7f33d6b16..d92bd1897 100644
--- a/packages/dashboard/lib/smtp/index.tsx
+++ b/packages/dashboard/lib/smtp/index.tsx
@@ -1,7 +1,6 @@
import { createTransport } from 'nodemailer';
import { ReactElement } from 'react';
import { render } from '@react-email/render';
-import * as Sentry from '@sentry/nextjs';
import { Welcome } from './Welcome';
const createTransporter = () => {
@@ -29,7 +28,6 @@ const sendEmail = async ({ to, subject, email }: { to: string; subject: string;
html: render(email),
});
} catch (error) {
- Sentry.captureException(error);
console.error(error);
}
};
@@ -37,6 +35,6 @@ const sendEmail = async ({ to, subject, email }: { to: string; subject: string;
export const sendWelcomeEmail = async ({ to, name }: { to: string; name: string }) =>
sendEmail({
to,
- subject: 'Welcome to Lagon',
+ subject: 'Welcome to Lagoss',
email:
,
});
diff --git a/packages/dashboard/lib/trpc/functionsRouter.ts b/packages/dashboard/lib/trpc/functionsRouter.ts
index e82c0dafd..658e3a571 100644
--- a/packages/dashboard/lib/trpc/functionsRouter.ts
+++ b/packages/dashboard/lib/trpc/functionsRouter.ts
@@ -11,7 +11,7 @@ import {
FUNCTION_NAME_MAX_LENGTH,
FUNCTION_NAME_MIN_LENGTH,
} from 'lib/constants';
-import { LOGS_LEVELS } from '@lagon/ui';
+import { LOGS_LEVELS } from '@lagoss/ui';
import { TRPCError } from '@trpc/server';
import { T } from 'pages/api/trpc/[trpc]';
import {
diff --git a/packages/dashboard/lib/utils.ts b/packages/dashboard/lib/utils.ts
index 55d696620..9643d3fcf 100644
--- a/packages/dashboard/lib/utils.ts
+++ b/packages/dashboard/lib/utils.ts
@@ -1,24 +1,30 @@
import cronstrue from 'cronstrue';
+import getConfig from 'next/config';
/**
* Example:
*
- * NEXT_PUBLIC_LAGON_ROOT_SCHEM=https
- * NEXT_PUBLIC_LAGON_ROOT_DOMAIN=lagon.dev
+ * LAGOSS_ROOT_SCHEM=https
+ * LAGOSS_ROOT_DOMAIN=lagoss.com
* name=hello-world
*
- * -> https://hello-world.lagon.dev
+ * -> https://hello-world.lagoss.com
*/
+
export function getFullCurrentDomain({ name }: { name: string }): string {
- return `${process.env.NEXT_PUBLIC_LAGON_ROOT_SCHEM}://${getCurrentDomain({ name })}`;
+ const { publicRuntimeConfig } = getConfig();
+ return `${publicRuntimeConfig.LAGOSS_ROOT_SCHEM}://${getCurrentDomain({ name })}`;
}
export function getCurrentDomain({ name }: { name: string }): string {
- return `${name}.${process.env.NEXT_PUBLIC_LAGON_ROOT_DOMAIN}`;
+ const { publicRuntimeConfig } = getConfig();
+ return `${name}.${publicRuntimeConfig.LAGOSS_ROOT_DOMAIN}`;
}
export function getFullDomain(domain: string): string {
- return `${process.env.NEXT_PUBLIC_LAGON_ROOT_SCHEM}://${domain}`;
+ const { publicRuntimeConfig } = getConfig();
+ console.log(publicRuntimeConfig);
+ return `${publicRuntimeConfig.LAGOSS_ROOT_SCHEM}://${domain}`;
}
export function reloadSession() {
diff --git a/packages/dashboard/locales/en.ts b/packages/dashboard/locales/en.ts
index 729edac53..7df8fc3ef 100644
--- a/packages/dashboard/locales/en.ts
+++ b/packages/dashboard/locales/en.ts
@@ -83,7 +83,7 @@ export default {
'settings.transfer.success': 'Ownership of this Organization transferred successfully.',
'settings.transfer.notAvailable': 'Not available yet.',
'settings.transfer.notAvailable.description':
- 'Please email contact@lagon.app if you want to transfer your Organization.',
+ 'Please email lagoss[at]ju60.de if you want to transfer your Organization.',
'settings.usage.title': 'Usage',
'settings.usage.description':
@@ -133,7 +133,7 @@ export default {
'profile.delete.modal.confirm': 'Confirm with your email',
'profile.delete.modal.submit': 'Delete Account',
'profile.delete.notAvailable': 'Not available yet.',
- 'profile.delete.notAvailable.description': 'Please email contact@lagon.app if you want to delete your Account.',
+ 'profile.delete.notAvailable.description': 'Please email lagoss[at]ju60.de if you want to delete your Account.',
'cli.title': 'Log in to the CLI',
'cli.description': 'This is your verification code to login in the CLI. Copy it and paste it in your terminal.',
diff --git a/packages/dashboard/locales/fr.ts b/packages/dashboard/locales/fr.ts
index 298f53965..2d2061ad5 100644
--- a/packages/dashboard/locales/fr.ts
+++ b/packages/dashboard/locales/fr.ts
@@ -87,7 +87,7 @@ export default defineLocale({
'settings.transfer.success': "La propriété de l'Organisation a été transférée.",
'settings.transfer.notAvailable': 'Non disponible.',
'settings.transfer.notAvailable.description':
- "Merci d'envoyer un email à contact@lagon.app si vous voulez transférer votre Organisation.",
+ "Merci d'envoyer un email à lagoss[at]ju60.de si vous voulez transférer votre Organisation.",
'settings.usage.title': 'Utilisation',
'settings.usage.description':
@@ -139,7 +139,7 @@ export default defineLocale({
'profile.delete.modal.submit': 'Supprimer ce Compte',
'profile.delete.notAvailable': 'Non disponible.',
'profile.delete.notAvailable.description':
- "Merci d'envoyer un email à contact@lagon.app si vous voulez supprimer votre Compte.",
+ "Merci d'envoyer un email à lagoss[at]ju60.de si vous voulez supprimer votre Compte.",
'cli.title': 'Connexion à la CLI',
'cli.description':
diff --git a/packages/dashboard/next.config.js b/packages/dashboard/next.config.js
index 4f2dea7dd..6d5587904 100644
--- a/packages/dashboard/next.config.js
+++ b/packages/dashboard/next.config.js
@@ -1,28 +1,23 @@
-const { withSentryConfig } = require('@sentry/nextjs');
-
/** @type {import('next').NextConfig} */
-const nextConfig = {
+module.exports = {
reactStrictMode: true,
swcMinify: true,
i18n: {
locales: ['en', 'fr'],
defaultLocale: 'en',
},
- transpilePackages: ['@lagon/ui'],
+ transpilePackages: ['@lagoss/ui'],
eslint: {
ignoreDuringBuilds: true,
},
typescript: {
ignoreBuildErrors: true,
},
- sentry: {
- tunnelRoute: '/monitoring-tunnel',
- },
output: process.env.NEXTJS_OUTPUT,
+ publicRuntimeConfig: {
+ STRIPE_PRO_PLAN_PRICE_ID: process.env.STRIPE_PRO_PLAN_PRICE_ID,
+ STRIPE_PRO_PLAN_PRICE_ID_METERED: process.env.STRIPE_PRO_PLAN_PRICE_ID_METERED,
+ LAGOSS_ROOT_SCHEM: process.env.LAGOSS_ROOT_SCHEM,
+ LAGOSS_ROOT_DOMAIN: process.env.LAGOSS_ROOT_DOMAIN,
+ },
};
-
-const sentryWebpackPluginOptions = {
- silent: true,
-};
-
-module.exports = withSentryConfig(nextConfig, sentryWebpackPluginOptions);
diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json
index a2c38bf08..09610f6e4 100644
--- a/packages/dashboard/package.json
+++ b/packages/dashboard/package.json
@@ -1,6 +1,6 @@
{
- "name": "@lagon/dashboard",
- "version": "0.3.13",
+ "name": "@lagoss/dashboard",
+ "version": "0.4.1",
"private": true,
"scripts": {
"dev": "next dev",
@@ -17,7 +17,7 @@
"@aws-sdk/s3-request-presigner": "^3.186.0",
"@headlessui/react": "^1.6.4",
"@heroicons/react": "^2.0.0",
- "@lagon/ui": "workspace:*",
+ "@lagoss/ui": "workspace:*",
"@monaco-editor/react": "^4.5.1",
"@next-auth/prisma-adapter": "^1.0.6",
"@prisma/client": "^5.0.0",
@@ -34,7 +34,6 @@
"@react-email/section": "^0.0.9",
"@react-email/text": "^0.0.5",
"@scaleway/use-random-name": "^0.3.0",
- "@sentry/nextjs": "^7.57.0",
"@tanstack/react-query": "^4.6.1",
"@trpc/client": "^10.18.0",
"@trpc/next": "^10.18.0",
diff --git a/packages/dashboard/pages/_app.tsx b/packages/dashboard/pages/_app.tsx
index 71451e459..8b039f65e 100644
--- a/packages/dashboard/pages/_app.tsx
+++ b/packages/dashboard/pages/_app.tsx
@@ -1,7 +1,7 @@
import { AppProps } from 'next/app';
import { SessionProvider } from 'next-auth/react';
import AuthGuard from 'lib/components/AuthGuard';
-import '@lagon/ui/src/styles/globals.css';
+import '@lagoss/ui/src/styles/globals.css';
import { Toaster } from 'react-hot-toast';
import Layout from 'lib/components/Layout';
import { I18nProvider, usePersistLocale } from 'locales';
diff --git a/packages/dashboard/pages/_error.js b/packages/dashboard/pages/_error.js
index 09c7ec078..7c03d05ca 100644
--- a/packages/dashboard/pages/_error.js
+++ b/packages/dashboard/pages/_error.js
@@ -1,13 +1,11 @@
import NextErrorComponent from 'next/error';
-import * as Sentry from '@sentry/nextjs';
-
const MyError = ({ statusCode, hasGetInitialPropsRun, err }) => {
if (!hasGetInitialPropsRun && err) {
// getInitialProps is not called in case of
// https://github.com/vercel/next.js/issues/8592. As a workaround, we pass
// err via _app.js so it can be captured
- Sentry.captureException(err);
+ console.error(err); // eslint-disable-line no-console
// Flushing is not required in this case as it only happens on the client
}
@@ -17,13 +15,13 @@ const MyError = ({ statusCode, hasGetInitialPropsRun, err }) => {
MyError.getInitialProps = async context => {
const errorInitialProps = await NextErrorComponent.getInitialProps(context);
- const { res, err, asPath } = context;
+ const { res, err } = context;
// Workaround for https://github.com/vercel/next.js/issues/8592, mark when
// getInitialProps has run
errorInitialProps.hasGetInitialPropsRun = true;
- // Returning early because we don't want to log 404 errors to Sentry.
+ // Returning early because we don't want to log 404 errors.
if (res?.statusCode === 404) {
return errorInitialProps;
}
@@ -42,21 +40,12 @@ MyError.getInitialProps = async context => {
// Boundaries: https://reactjs.org/docs/error-boundaries.html
if (err) {
- Sentry.captureException(err);
-
- // Flushing before returning is necessary if deploying to Vercel, see
- // https://vercel.com/docs/platform/limits#streaming-responses
- await Sentry.flush(2000);
-
return errorInitialProps;
}
// If this point is reached, getInitialProps was called without any
// information about what the error might be. This is unexpected and may
- // indicate a bug introduced in Next.js, so record it in Sentry
- Sentry.captureException(new Error(`_error.js getInitialProps missing data at path: ${asPath}`));
- await Sentry.flush(2000);
-
+ // indicate a bug introduced in Next.js
return errorInitialProps;
};
diff --git a/packages/dashboard/pages/api/auth/[...nextauth].ts b/packages/dashboard/pages/api/auth/[...nextauth].ts
index 9e575012b..748dfbc4f 100644
--- a/packages/dashboard/pages/api/auth/[...nextauth].ts
+++ b/packages/dashboard/pages/api/auth/[...nextauth].ts
@@ -3,7 +3,6 @@ import GithubProvider from 'next-auth/providers/github';
import GoogleProvider from 'next-auth/providers/google';
import { PrismaAdapter } from '@next-auth/prisma-adapter';
import prisma from 'lib/prisma';
-import * as Sentry from '@sentry/nextjs';
import { createOrAssignDefaultOrganization } from 'lib/api/users';
import { sendWelcomeEmail } from 'lib/smtp';
@@ -34,7 +33,7 @@ export const authOptions: NextAuthOptions = {
return false;
}
- if (process.env.LAGON_RESTRICT_LOGIN === 'false') {
+ if (process.env.LAGOSS_RESTRICT_LOGIN === 'false') {
return true;
}
@@ -48,11 +47,6 @@ export const authOptions: NextAuthOptions = {
return true;
}
- Sentry.captureMessage('User is not authorized to sign in', {
- user: {
- email: user.email,
- },
- });
console.log('User is not authorized to sign in:', user.email);
return false;
@@ -100,12 +94,6 @@ export const authOptions: NextAuthOptions = {
},
});
- Sentry.setUser({
- id: userFromDB.id,
- username: userFromDB.name ?? 'Unknown',
- email: userFromDB.email ?? 'Unknown',
- });
-
return {
...session,
user: {
diff --git a/packages/dashboard/pages/api/trpc/[trpc].ts b/packages/dashboard/pages/api/trpc/[trpc].ts
index 06ab3c243..c06ae8a12 100644
--- a/packages/dashboard/pages/api/trpc/[trpc].ts
+++ b/packages/dashboard/pages/api/trpc/[trpc].ts
@@ -7,7 +7,6 @@ import { tokensRouter } from 'lib/trpc/tokensRouter';
import { deploymentsRouter } from 'lib/trpc/deploymentsRouter';
import prisma from 'lib/prisma';
import { Session } from 'next-auth';
-import * as Sentry from '@sentry/nextjs';
import { accountsRouter } from 'lib/trpc/accountsRouter';
import { NextApiRequest, NextApiResponse } from 'next';
import { authOptions } from '../auth/[...nextauth]';
@@ -21,8 +20,8 @@ const createContext = async ({
res: NextApiResponse
;
session: Session;
}> => {
- const tokenValue = req.headers['x-lagon-token'] as string;
- const organizationId = req.headers['x-lagon-organization-id'] as string | undefined;
+ const tokenValue = req.headers['x-lagoss-token'] as string;
+ const organizationId = req.headers['x-lagoss-organization-id'] as string | undefined;
// tokensAuthenticate needs to skip authentication
if (req.query.trpc === 'tokensAuthenticate') {
@@ -73,12 +72,6 @@ const createContext = async ({
},
});
- Sentry.setUser({
- id: token.user.id,
- username: token.user.name ?? 'Unknown',
- email: token.user.email ?? 'Unknown',
- });
-
return {
req,
res,
@@ -137,9 +130,5 @@ export default trpcNext.createNextApiHandler({
createContext,
onError: ({ error }) => {
console.error(error);
-
- if (error.code === 'INTERNAL_SERVER_ERROR') {
- Sentry.captureException(error);
- }
},
});
diff --git a/packages/dashboard/pages/api/webhooks/stripe.ts b/packages/dashboard/pages/api/webhooks/stripe.ts
index ce8513f60..83aab50be 100644
--- a/packages/dashboard/pages/api/webhooks/stripe.ts
+++ b/packages/dashboard/pages/api/webhooks/stripe.ts
@@ -1,5 +1,4 @@
import { NextApiRequest, NextApiResponse } from 'next';
-import * as Sentry from '@sentry/nextjs';
import { stripe } from 'lib/stripe';
import type Stripe from 'stripe';
import prisma from 'lib/prisma';
@@ -39,8 +38,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
);
} catch (err) {
console.log(err);
- Sentry.captureException(err);
-
return res.status(400).end();
}
diff --git a/packages/dashboard/pages/auth/error.tsx b/packages/dashboard/pages/auth/error.tsx
index d71bacd31..2f9621cbd 100644
--- a/packages/dashboard/pages/auth/error.tsx
+++ b/packages/dashboard/pages/auth/error.tsx
@@ -1,6 +1,5 @@
-import { Text, Card, Button } from '@lagon/ui';
+import { Text, Card, Button } from '@lagoss/ui';
import { GitHubIcon } from 'lib/components/GitHubIcon';
-import { GoogleIcon } from 'lib/components/GoogleIcon';
import { useScopedI18n } from 'locales';
import { signIn, useSession } from 'next-auth/react';
import { useRouter } from 'next/router';
@@ -32,7 +31,7 @@ const Error = () => {
{error === 'AccessDenied' ? (
- 
+ 