diff --git a/admin/src/config/index.js b/admin/src/config/index.js index d64ba6f5f..37d98c606 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 -import pkg from '../../package' +const pkg = require('../../package') const version = { ADMIN_MODULE_PROTOCOL: process.env.ADMIN_MODULE_PROTOCOL ?? 'http', diff --git a/admin/vite.config.mjs b/admin/vite.config.mjs index 992626334..3474b2032 100644 --- a/admin/vite.config.mjs +++ b/admin/vite.config.mjs @@ -6,18 +6,22 @@ import Components from 'unplugin-vue-components/vite' 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 { createRequire } from 'node:module' import dotenv from 'dotenv' - dotenv.config() // load env vars from .env +const require = createRequire(import.meta.url) +const CONFIG = require('./src/config') + export default defineConfig(async ({ command }) => { const { vitePluginGraphqlLoader } = await import('vite-plugin-graphql-loader') if (command === 'serve') { diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js index 727760353..0ee64509e 100644 --- a/frontend/src/config/index.js +++ b/frontend/src/config/index.js @@ -2,7 +2,7 @@ // The whole contents is exposed to the client // Load Package Details for some default values -import pkg from '../../package' +const pkg = require('../../package') const constants = { DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0 diff --git a/frontend/vite.config.mjs b/frontend/vite.config.mjs index 5becc8ad3..ca640fea3 100644 --- a/frontend/vite.config.mjs +++ b/frontend/vite.config.mjs @@ -10,17 +10,20 @@ import { createHtmlPlugin } from 'vite-plugin-html' import schema from './src/config/schema' import { execSync } from 'node:child_process' import { existsSync, constants } from 'node:fs' -import CONFIG from './src/config' + import { validate, browserUrls } from 'config-schema' import { BootstrapVueNextResolver } from 'bootstrap-vue-next' import { createRequire } from 'node:module' +import dotenv from 'dotenv' +dotenv.config() // load env vars from .env import dotenv from 'dotenv' dotenv.config() // load env vars from .env const require = createRequire(import.meta.url) +const CONFIG = require('./src/config') // https://vitejs.dev/config/ export default defineConfig(async ({ command }) => {