Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions web-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@esbuild-plugins/node-modules-polyfill": "^0.2.2",
"@typescript-eslint/eslint-plugin": "^8.11.0",
"@typescript-eslint/parser": "^8.11.0",
"@vitejs/plugin-vue": "^5.1.4",
"@vitejs/plugin-vue": "^5.2.4",
"@vue/eslint-config-typescript": "^13.0.0",
"agent-base": "^6.0.2",
"autoprefixer": "^10.4.23",
Expand All @@ -65,8 +65,8 @@
"tsc-alias": "^1.8.6",
"typescript": "^5.6.3",
"unplugin-vue-components": "^0.27.1",
"vite": "^5.4.21",
"vite-plugin-static-copy": "^2.0.0",
"vite": "^6.4.3",
"vite-plugin-static-copy": "^2.3.2",
"vue-tsc": "^2.1.6"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion web-app/packages/admin-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"dependencies": {
"@tabler/icons-webfont": "^2.42.0",
"axios": "^0.30.0",
"axios": "^0.34.0",
"lodash": "^4.17.21",
"pinia": "^2.1.7",
"primeflex": "^3.3.1",
Expand Down
4 changes: 2 additions & 2 deletions web-app/packages/admin-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@
"lint": "eslint . --ext .js,.vue,.ts"
},
"dependencies": {
"axios": "^0.30.0",
"axios": "^0.34.0",
"axios-retry": "^3.2.4",
"lodash": "^4.17.21",
"pinia": "^2.1.7",
"primeflex": "^3.3.1",
"primevue": "3.43.0",
"universal-cookie": "^4.0.4",
"universal-cookie": "^7.2.2",
"vue": "3.5.12"
},
"peerDependencies": {
Expand Down
8 changes: 6 additions & 2 deletions web-app/packages/admin-lib/src/modules/admin/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,10 @@ export const useAdminStore = defineStore('adminModule', {
},

async getCheckUpdateFromCookies() {
const currentCheckForUpdatesCookie = cookies.get('checkUpdates')
// doNotParse keeps raw 'true' / 'false' strings (universal-cookie >= 7 parses JSON by default)
const currentCheckForUpdatesCookie = cookies.get('checkUpdates', {
doNotParse: true
})
await this.setCheckUpdatesToCookies({
value:
currentCheckForUpdatesCookie === undefined
Expand All @@ -248,7 +251,8 @@ export const useAdminStore = defineStore('adminModule', {

async getServerConfiguredCookies() {
const currentHideServerConfiguredBannerCookie = cookies.get(
COOKIES_HIDE_SERVER_CONFIGURED_BANNER
COOKIES_HIDE_SERVER_CONFIGURED_BANNER,
{ doNotParse: true }
)
if (currentHideServerConfiguredBannerCookie === 'true') {
this.setIsServerConfigHidden(true)
Expand Down
4 changes: 3 additions & 1 deletion web-app/packages/admin-lib/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ export default defineConfig(({ mode }) => ({
entry: resolve(__dirname, 'src/main.ts'),
name: 'admin-lib',
// the proper extensions will be added
fileName: 'admin-lib'
fileName: 'admin-lib',
// keep Vite 5 name, apps import dist/style.css
cssFileName: 'style'
},
rollupOptions: {
// make sure to externalize deps that shouldn't be bundled
Expand Down
2 changes: 1 addition & 1 deletion web-app/packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"dependencies": {
"@tabler/icons-webfont": "^2.42.0",
"axios": "^0.30.0",
"axios": "^0.34.0",
"lodash": "^4.17.21",
"pinia": "^2.1.7",
"primeflex": "^3.3.1",
Expand Down
2 changes: 1 addition & 1 deletion web-app/packages/lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"lint": "eslint . --ext .js,.vue,.ts"
},
"dependencies": {
"axios": "^0.30.0",
"axios": "^0.34.0",
"axios-retry": "^3.2.4",
"crypto-js": "^4.2.0",
"date-fns": "^2.28.0",
Expand Down
4 changes: 3 additions & 1 deletion web-app/packages/lib/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ export default defineConfig({
formats: ['es'],
entry: resolve(__dirname, 'src/main.ts'),
name: 'lib',
fileName: 'lib'
fileName: 'lib',
// keep Vite 5 name, apps import dist/style.css
cssFileName: 'style'
},
rollupOptions: {
external: ['vue', 'pinia', ...Object.keys(packageJson.dependencies)],
Expand Down
911 changes: 491 additions & 420 deletions web-app/yarn.lock

Large diffs are not rendered by default.

Loading