From d625353a196bc9ecbbe2f8411d61f70021d2f0bb Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Tue, 21 Nov 2023 19:32:42 +0300 Subject: [PATCH] apps/web: use api requests as server actions --- apps/web/api/ius/query.ts | 1 + apps/web/config/urls.ts | 15 +++------------ apps/web/constants/urls.js | 3 --- apps/web/next.config.js | 9 +-------- 4 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 apps/web/constants/urls.js diff --git a/apps/web/api/ius/query.ts b/apps/web/api/ius/query.ts index 8f54471..aab99f4 100644 --- a/apps/web/api/ius/query.ts +++ b/apps/web/api/ius/query.ts @@ -1,3 +1,4 @@ +'use server'; import type * as t from './types'; import { getUrls } from '@/config/urls'; import type { CreateUrl } from '@/utils/url'; diff --git a/apps/web/config/urls.ts b/apps/web/config/urls.ts index 3df7e89..f44a44b 100644 --- a/apps/web/config/urls.ts +++ b/apps/web/config/urls.ts @@ -1,18 +1,9 @@ import { getEnv } from './env'; -import proxyUrls from '@/constants/urls'; -import { isServer } from '@/utils/common'; + +const { URL_IUS_DIRECT } = getEnv(); export function getUrls() { - if (isServer()) { - const env = getEnv(); - const { URL_IUS_DIRECT } = env; - - return { - URL_UIS: URL_IUS_DIRECT, - }; - } - return { - URL_UIS: proxyUrls.URL_IUS_PROXY, + URL_UIS: URL_IUS_DIRECT, }; } diff --git a/apps/web/constants/urls.js b/apps/web/constants/urls.js deleted file mode 100644 index c3e693d..0000000 --- a/apps/web/constants/urls.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - URL_IUS_PROXY: '/api/ius', -}; diff --git a/apps/web/next.config.js b/apps/web/next.config.js index 4465f25..296b3ee 100644 --- a/apps/web/next.config.js +++ b/apps/web/next.config.js @@ -1,7 +1,6 @@ const fs = require('fs'); const path = require('path'); const envSchema = require('./config/schema/env'); -const urls = require('./constants/urls'); const env = envSchema.parse(process.env); @@ -26,13 +25,7 @@ const nextConfig = { reactStrictMode: true, transpilePackages: ['ui'], async rewrites() { - return [ - { - destination: env.URL_IUS_DIRECT + '/:path*', - source: urls.URL_IUS_PROXY + '/:path*', - }, - ...favicons.map((fileName) => buildFaviconRewrite(`/${fileName}`)), - ]; + return [...favicons.map((fileName) => buildFaviconRewrite(`/${fileName}`))]; }, };