Skip to content

Commit

Permalink
Merge branch 'release/1.6.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanseifert committed Apr 30, 2024
2 parents 422ad2c + 41632e9 commit b92843a
Show file tree
Hide file tree
Showing 9 changed files with 1,714 additions and 1,469 deletions.
3,113 changes: 1,679 additions & 1,434 deletions package-lock.json

Large diffs are not rendered by default.

48 changes: 24 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@brdgm/brdgm-commons",
"version": "1.6.1",
"version": "1.6.2",
"private": true,
"description": "brdgm-commons",
"type": "module",
Expand All @@ -15,39 +15,39 @@
},
"dependencies": {
"@popperjs/core": "~2.11.8",
"bootstrap": "~5.3.2",
"core-js": "~3.35.1",
"bootstrap": "~5.3.3",
"core-js": "~3.37.0",
"lodash": "~4.17.21",
"set-interval-async": "^3.0.3",
"vue": "~3.4.15",
"vue-i18n": "~9.9.1",
"vue-router": "~4.2.5"
"vue": "~3.4.26",
"vue-i18n": "~9.13.1",
"vue-router": "~4.3.2"
},
"devDependencies": {
"@intlify/unplugin-vue-i18n": "^2.0.0",
"@intlify/unplugin-vue-i18n": "^4.0.0",
"@types/bootstrap": "^5.2.10",
"@types/chai": "^4.3.11",
"@types/chai": "^4.3.14",
"@types/jsdom": "^21.1.6",
"@types/lodash": "^4.14.202",
"@types/lodash": "^4.17.0",
"@types/mocha": "^10.0.6",
"@typescript-eslint/eslint-plugin": "^6.20.0",
"@typescript-eslint/parser": "^6.20.0",
"@vitejs/plugin-legacy": "^5.3.0",
"@vitejs/plugin-vue": "^5.0.3",
"@vitest/coverage-istanbul": "^1.2.2",
"@vue/eslint-config-typescript": "^12.0.0",
"@typescript-eslint/eslint-plugin": "^7.8.0",
"@typescript-eslint/parser": "^7.8.0",
"@vitejs/plugin-legacy": "^5.3.2",
"@vitejs/plugin-vue": "^5.0.4",
"@vitest/coverage-istanbul": "^1.5.3",
"@vue/eslint-config-typescript": "^13.0.0",
"babel-plugin-istanbul": "^6.1.1",
"chai": "^5.0.3",
"eslint": "^8.56.0",
"eslint-plugin-vue": "^9.21.1",
"chai": "^5.1.0",
"eslint": "^8.57.0",
"eslint-plugin-vue": "^9.25.0",
"jsdom": "^24.0.0",
"nodemon": "^3.0.3",
"sass": "^1.70.0",
"nodemon": "^3.1.0",
"sass": "^1.75.0",
"source-map-support": "^0.5.21",
"ts-node": "^10.9.2",
"typescript": "~5.3.3",
"vite": "^5.0.12",
"vite-plugin-pwa": "^0.17.5",
"vitest": "^1.2.2"
"typescript": "~5.4.5",
"vite": "^5.2.10",
"vite-plugin-pwa": "^0.20.0",
"vitest": "^1.5.3"
}
}
2 changes: 1 addition & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export default defineComponent({
},
methods: {
setLocale(lang: string) {
this.locale = lang;
this.locale = lang
},
zoomFontSize(payload: { baseFontSize: number }) {
this.baseFontSize = payload.baseFontSize
Expand Down
2 changes: 1 addition & 1 deletion src/components/structure/AppFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export default defineComponent({
},
emits: {
zoomFontSize(payload: { baseFontSize: number }) {
return payload.baseFontSize > 0;
return payload.baseFontSize > 0
}
},
data() {
Expand Down
2 changes: 1 addition & 1 deletion src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ import 'bootstrap'
createApp(App)
.use(router)
.use(i18n)
.mount('#app');
.mount('#app')
8 changes: 4 additions & 4 deletions src/util/error/TranslatableError.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ export default class TranslatableError extends Error {
private _named : Record<string, unknown>
private _plural : number

constructor(internalMessage : string, key : string);
constructor(internalMessage : string, key : string, named : Record<string, unknown>);
constructor(internalMessage : string, key : string, named : Record<string, unknown>, plural : number);
constructor(internalMessage : string, key : string)
constructor(internalMessage : string, key : string, named : Record<string, unknown>)
constructor(internalMessage : string, key : string, named : Record<string, unknown>, plural : number)
constructor(internalMessage : string, key : string, named? : Record<string, unknown>, plural? : number) {
super(internalMessage);
super(internalMessage)
this._key = key
this._named = named ?? {}
this._plural = plural ?? 0
Expand Down
4 changes: 2 additions & 2 deletions src/util/router/createRouterMatomoTracking.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { RouteRecordRaw, Router } from "vue-router"
import createRouter from "./createRouter"
import { RouteRecordRaw, Router } from 'vue-router'
import createRouter from './createRouter'

declare let _paq: any; // eslint-disable-line @typescript-eslint/no-explicit-any

Expand Down
2 changes: 1 addition & 1 deletion src/util/tab/enableTabLinksInContent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { Tab } from 'bootstrap'
export default function(parent : HTMLElement) : void {
parent.querySelectorAll('a[data-custom-toggle="tab"]').forEach(anchor => {
anchor.addEventListener('click', event => {
event.preventDefault();
event.preventDefault()
const target = anchor.getAttribute('href')
if (target) {
const tabElement = parent.querySelector(target)
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/util/router/createRouterMatomoTracking.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ describe('util/router/createRouter', () => {
name: 'AppHome',
component: defineComponent({})
}
], 'dummy-local-storage-key', 'dummy-app-deploy-name', 'AppHome')
], 'dummy-local-storage-key', 'dummy-app-deploy-name', '1.0.0', 'AppHome')

expect(router.getRoutes().length).to.eq(1)
})
Expand Down

0 comments on commit b92843a

Please sign in to comment.