From d57e18862a8986cf57c1536bb6069077f3edac80 Mon Sep 17 00:00:00 2001 From: MateuszMichalowski <79852198+MateuszMichalowski@users.noreply.github.com> Date: Wed, 24 Jul 2024 14:25:33 +0200 Subject: [PATCH] feat(admin) - fix import in node server (#3330) --- admin/components.d.ts | 1 - admin/run/server.js | 2 +- admin/vite.config.js | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/admin/components.d.ts b/admin/components.d.ts index 955df4bd2..16c738904 100644 --- a/admin/components.d.ts +++ b/admin/components.d.ts @@ -34,7 +34,6 @@ declare module 'vue' { IPhCaretDown: typeof import('~icons/ph/caret-down')['default'] IPhCaretUpFill: typeof import('~icons/ph/caret-up-fill')['default'] IPhEnvelope: typeof import('~icons/ph/envelope')['default'] - IPhXCircle: typeof import('~icons/ph/x-circle')['default'] NavBar: typeof import('./src/components/NavBar.vue')['default'] NotFoundPage: typeof import('./src/components/NotFoundPage.vue')['default'] OpenCreationsTable: typeof import('./src/components/Tables/OpenCreationsTable.vue')['default'] diff --git a/admin/run/server.js b/admin/run/server.js index 730fa03b5..b5078a0cf 100644 --- a/admin/run/server.js +++ b/admin/run/server.js @@ -4,7 +4,7 @@ const path = require('path') // Host & Port const hostname = '127.0.0.1' -const port = import.meta.env.PORT || 8080 +const port = process.env.PORT || 8080 // Express Server const app = express() diff --git a/admin/vite.config.js b/admin/vite.config.js index 0b95ddc81..9ed5ed28a 100644 --- a/admin/vite.config.js +++ b/admin/vite.config.js @@ -4,11 +4,10 @@ import commonjs from 'vite-plugin-commonjs' import Icons from 'unplugin-icons/vite' import Components from 'unplugin-vue-components/vite' import IconsResolve from 'unplugin-icons/resolver' - const path = require('path') export default defineConfig({ - base: '/admin/', + base: process.env.NODE_ENV === 'production' ? './' : '/admin', server: { port: 8080, }, @@ -40,6 +39,7 @@ export default defineConfig({ commonjs(), ], build: { - outDir: 'build', + outDir: path.resolve(__dirname, './build'), }, + publicDir: '/admin', })