diff --git a/admin/src/config/index.js b/admin/src/config/index.js index 37d98c606..d64ba6f5f 100644 --- a/admin/src/config/index.js +++ b/admin/src/config/index.js @@ -2,7 +2,7 @@ // The whole contents is exposed to the client // Load Package Details for some default values -const pkg = require('../../package') +import pkg from '../../package' const version = { ADMIN_MODULE_PROTOCOL: process.env.ADMIN_MODULE_PROTOCOL ?? 'http', diff --git a/admin/src/config/schema.js b/admin/src/config/schema.js index 2d0617122..d461a7cb4 100644 --- a/admin/src/config/schema.js +++ b/admin/src/config/schema.js @@ -1,4 +1,4 @@ -const { +import { APP_VERSION, BUILD_COMMIT, BUILD_COMMIT_SHORT, @@ -10,8 +10,8 @@ const { NODE_ENV, OPENAI_ACTIVE, PRODUCTION, -} = require('config-schema') -const Joi = require('joi') +} from 'config-schema' +import Joi from 'joi' module.exports = Joi.object({ APP_VERSION, diff --git a/admin/vite.config.js b/admin/vite.config.mjs similarity index 98% rename from admin/vite.config.js rename to admin/vite.config.mjs index 1499b2090..992626334 100644 --- a/admin/vite.config.js +++ b/admin/vite.config.mjs @@ -7,18 +7,17 @@ import IconsResolve from 'unplugin-icons/resolver' import { BootstrapVueNextResolver } from 'bootstrap-vue-next' import EnvironmentPlugin from 'vite-plugin-environment' import schema from './src/config/schema' +import CONFIG from './src/config' import { execSync } from 'node:child_process' import { existsSync, constants } from 'node:fs' import { validate, browserUrls } from 'config-schema' -import path from 'node:path' +import path from 'node:path' import dotenv from 'dotenv' dotenv.config() // load env vars from .env -const CONFIG = require('./src/config') - export default defineConfig(async ({ command }) => { const { vitePluginGraphqlLoader } = await import('vite-plugin-graphql-loader') if (command === 'serve') {