diff --git a/admin/package.json b/admin/package.json index 0068f5efd..82d5216ba 100644 --- a/admin/package.json +++ b/admin/package.json @@ -74,6 +74,7 @@ "eslint-plugin-prettier": "5.2.1", "eslint-plugin-promise": "^5.1.1", "eslint-plugin-vue": "8.7.1", + "gradido-config": "../config", "joi": "^17.13.3", "jsdom": "^25.0.0", "mock-apollo-client": "^1.2.1", diff --git a/admin/src/config/schema.js b/admin/src/config/schema.js index c992eddc7..d079d20b1 100644 --- a/admin/src/config/schema.js +++ b/admin/src/config/schema.js @@ -8,7 +8,7 @@ const { GRAPHQL_URI, NODE_ENV, PRODUCTION, -} = require('../../../config/common.schema') // from '../../../config/common.schema' +} = require('gradido-config') const Joi = require('joi') module.exports = Joi.object({ diff --git a/admin/vite.config.js b/admin/vite.config.js index 03c80acd3..ee005c3bc 100644 --- a/admin/vite.config.js +++ b/admin/vite.config.js @@ -7,7 +7,7 @@ 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 { validate } from '../config' +import { validate } from 'gradido-config' import dotenv from 'dotenv' diff --git a/admin/yarn.lock b/admin/yarn.lock index 7a0644174..3e3a8b8c4 100644 --- a/admin/yarn.lock +++ b/admin/yarn.lock @@ -4224,6 +4224,11 @@ graceful-fs@^4.1.6, graceful-fs@^4.2.0: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== +gradido-config@../config: + version "1.0.0" + dependencies: + joi "^17.13.3" + graphemer@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6" diff --git a/frontend/package.json b/frontend/package.json index 62dd7c94b..9a541845e 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -87,6 +87,7 @@ "eslint-plugin-promise": "^5.1.1", "eslint-plugin-vitest": "^0.5.4", "eslint-plugin-vue": "8.7.1", + "gradido-config": "../config", "joi": "^17.13.3", "jsdom": "^25.0.0", "mock-apollo-client": "^1.2.1", diff --git a/frontend/src/config/schema.js b/frontend/src/config/schema.js index 31eb9c737..ab58a31a0 100644 --- a/frontend/src/config/schema.js +++ b/frontend/src/config/schema.js @@ -15,7 +15,7 @@ const { HUMHUB_ACTIVE, NODE_ENV, PRODUCTION, -} = require('../../../config/common.schema') // from '../../../config/common.schema' +} = require('gradido-config') const Joi = require('joi') // console.log(commonSchema) diff --git a/frontend/vite.config.js b/frontend/vite.config.js index 3f3658b68..e4db5b2bf 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -8,7 +8,7 @@ import IconsResolve from 'unplugin-icons/resolver' import EnvironmentPlugin from 'vite-plugin-environment' import { createHtmlPlugin } from 'vite-plugin-html' import schema from './src/config/schema' -import { validate } from '../config' +import { validate } from 'gradido-config' import { BootstrapVueNextResolver } from 'bootstrap-vue-next' import dotenv from 'dotenv' diff --git a/frontend/yarn.lock b/frontend/yarn.lock index f2435177f..a5841387e 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -4101,6 +4101,11 @@ graceful-fs@^4.1.6, graceful-fs@^4.2.0: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== +gradido-config@../config: + version "1.0.0" + dependencies: + joi "^17.13.3" + graphemer@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"