Skip to content

F
frontend
Commit 32f7acb7 authored by tom's avatar tom
Browse files
Options

remove vercel

parent 945042fa
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 15 deletions
configs/app/config.ts
View file @ 32f7acb7
...@@ -13,7 +13,7 @@ const parseEnvJson = <DataType>(env: string | undefined): DataType | null => { ...@@ -13,7 +13,7 @@ const parseEnvJson = <DataType>(env: string | undefined): DataType | null => {
}; };
const stripTrailingSlash = (str: string) => str[str.length - 1] === '/' ? str.slice(0, -1) : str; const stripTrailingSlash = (str: string) => str[str.length - 1] === '/' ? str.slice(0, -1) : str;
const env = process.env.VERCEL_ENV || process.env.NODE_ENV; const env = process.env.NODE_ENV;
const isDev = env === 'development'; const isDev = env === 'development';
const appPort = getEnvValue(process.env.NEXT_PUBLIC_APP_PORT); const appPort = getEnvValue(process.env.NEXT_PUBLIC_APP_PORT);
...@@ -22,7 +22,7 @@ const appHost = getEnvValue(process.env.NEXT_PUBLIC_APP_HOST); ...@@ -22,7 +22,7 @@ const appHost = getEnvValue(process.env.NEXT_PUBLIC_APP_HOST);
const baseUrl = [ const baseUrl = [
appSchema || 'https', appSchema || 'https',
'://', '://',
process.env.NEXT_PUBLIC_VERCEL_URL || appHost, appHost,
appPort && ':' + appPort, appPort && ':' + appPort,
].filter(Boolean).join(''); ].filter(Boolean).join('');
const authUrl = getEnvValue(process.env.NEXT_PUBLIC_AUTH_URL) || baseUrl; const authUrl = getEnvValue(process.env.NEXT_PUBLIC_AUTH_URL) || baseUrl;
......
configs/sentry/nextjs.ts
View file @ 32f7acb7
import type { NextjsOptions } from '@sentry/nextjs/types/utils/nextjsOptions'; import type { NextjsOptions } from '@sentry/nextjs/types/utils/nextjsOptions';
const config: NextjsOptions = { const config: NextjsOptions = {
environment: process.env.VERCEL_ENV || process.env.NODE_ENV, environment: process.env.NODE_ENV,
dsn: process.env.NEXT_PUBLIC_SENTRY_DSN, dsn: process.env.NEXT_PUBLIC_SENTRY_DSN,
release: process.env.NEXT_PUBLIC_GIT_COMMIT_SHA || process.env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_SHA, release: process.env.NEXT_PUBLIC_GIT_COMMIT_SHA,
// We recommend adjusting this value in production, or using tracesSampler // We recommend adjusting this value in production, or using tracesSampler
// for finer control // for finer control
tracesSampleRate: 1.0, tracesSampleRate: 1.0,
......
configs/sentry/react.ts
View file @ 32f7acb7
...@@ -2,9 +2,9 @@ import type * as Sentry from '@sentry/react'; ...@@ -2,9 +2,9 @@ import type * as Sentry from '@sentry/react';
import { BrowserTracing } from '@sentry/tracing'; import { BrowserTracing } from '@sentry/tracing';
export const config: Sentry.BrowserOptions = { export const config: Sentry.BrowserOptions = {
environment: process.env.VERCEL_ENV || process.env.NEXT_PUBLIC_APP_ENV || process.env.NODE_ENV, environment: process.env.NEXT_PUBLIC_APP_ENV || process.env.NODE_ENV,
dsn: process.env.NEXT_PUBLIC_SENTRY_DSN, dsn: process.env.NEXT_PUBLIC_SENTRY_DSN,
release: process.env.NEXT_PUBLIC_GIT_COMMIT_SHA || process.env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_SHA, release: process.env.NEXT_PUBLIC_GIT_COMMIT_SHA,
integrations: [ new BrowserTracing() ], integrations: [ new BrowserTracing() ],
// We recommend adjusting this value in production, or using tracesSampler // We recommend adjusting this value in production, or using tracesSampler
// for finer control // for finer control
......
deploy/values/main/values.yaml
View file @ 32f7acb7
...@@ -454,6 +454,7 @@ frontend: ...@@ -454,6 +454,7 @@ frontend:
- "/tx" - "/tx"
- "/blocks" - "/blocks"
- "/block" - "/block"
- "/address"
resources: resources:
limits: limits:
memory: memory:
......
deploy/values/review/values.yaml
View file @ 32f7acb7
...@@ -316,6 +316,8 @@ frontend: ...@@ -316,6 +316,8 @@ frontend:
- "/tx" - "/tx"
- "/blocks" - "/blocks"
- "/block" - "/block"
- "/login"
- "/address"
resources: resources:
limits: limits:
memory: memory:
......
package.json
View file @ 32f7acb7
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
"dev:poa_core": "./node_modules/.bin/dotenv -e ./configs/envs/.env.poa_core -e ./configs/envs/.env.common -e ./configs/envs/.env.secrets next dev | ./node_modules/.bin/pino-pretty", "dev:poa_core": "./node_modules/.bin/dotenv -e ./configs/envs/.env.poa_core -e ./configs/envs/.env.common -e ./configs/envs/.env.secrets next dev | ./node_modules/.bin/pino-pretty",
"dev:goerli": "./node_modules/.bin/dotenv -e ./configs/envs/.env.goerli -e ./configs/envs/.env.common -e ./configs/envs/.env.secrets next dev | ./node_modules/.bin/pino-pretty", "dev:goerli": "./node_modules/.bin/dotenv -e ./configs/envs/.env.goerli -e ./configs/envs/.env.common -e ./configs/envs/.env.secrets next dev | ./node_modules/.bin/pino-pretty",
"build": "next build", "build": "next build",
"build:vercel": "./node_modules/.bin/dotenv -e ./configs/envs/.env.poa_core -e ./configs/envs/.env.common next build",
"build:docker": "docker build --build-arg GIT_COMMIT_SHA=$(git rev-parse HEAD) -t blockscout ./", "build:docker": "docker build --build-arg GIT_COMMIT_SHA=$(git rev-parse HEAD) -t blockscout ./",
"start": "next start", "start": "next start",
"start:docker:poa_core": "docker run -p 3000:3000 --env-file ./configs/envs/.env.common --env-file ./configs/envs/.env.poa_core --env-file ./configs/envs/.env.secrets blockscout", "start:docker:poa_core": "docker run -p 3000:3000 --env-file ./configs/envs/.env.common --env-file ./configs/envs/.env.poa_core --env-file ./configs/envs/.env.secrets blockscout",
......
pages/vercel.tsx → pages/login.tsx
View file @ 32f7acb7
...@@ -2,17 +2,17 @@ import type { NextPage } from 'next'; ...@@ -2,17 +2,17 @@ import type { NextPage } from 'next';
import Head from 'next/head'; import Head from 'next/head';
import React from 'react'; import React from 'react';
import Vercel from 'ui/pages/Vercel'; import Login from 'ui/pages/Login';
const VercelPage: NextPage = () => { const LoginPage: NextPage = () => {
return ( return (
<> <>
<Head><title>Vercel Page</title></Head> <Head><title>Login Page</title></Head>
<Vercel/> <Login/>
</> </>
); );
}; };
export default VercelPage; export default LoginPage;
export { getServerSideProps } from 'lib/next/getServerSideProps'; export { getServerSideProps } from 'lib/next/getServerSideProps';
ui/pages/Vercel.tsx → ui/pages/Login.tsx
View file @ 32f7acb7
...@@ -10,8 +10,8 @@ import useToast from 'lib/hooks/useToast'; ...@@ -10,8 +10,8 @@ import useToast from 'lib/hooks/useToast';
import Page from 'ui/shared/Page/Page'; import Page from 'ui/shared/Page/Page';
import PageTitle from 'ui/shared/Page/PageTitle'; import PageTitle from 'ui/shared/Page/PageTitle';
{ /* will be deleted when we move to new CI */ } { /* will be deleted when we fix login in preview CI stands */ }
const Vercel = () => { const Login = () => {
const toast = useToast(); const toast = useToast();
const [ num, setNum ] = useGradualIncrement(0); const [ num, setNum ] = useGradualIncrement(0);
...@@ -86,4 +86,4 @@ const Vercel = () => { ...@@ -86,4 +86,4 @@ const Vercel = () => {
}; };
export default Vercel; export default Login;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment