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
13 changes: 5 additions & 8 deletions web-app/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
module.exports = {
root: true,
env: {
es2021: true,
browser: true
es2022: true,
browser: true,
node: true
},
extends: [
'plugin:vue/essential',
'@vue/standard',
'plugin:prettier/recommended'
],
plugins: ['@typescript-eslint'],
extends: ['plugin:vue/vue3-essential', 'plugin:prettier/recommended'],
plugins: ['@typescript-eslint', 'eslint-plugin-import'],
rules: {
'prettier/prettier': 'warn',
'@typescript-eslint/no-unused-vars': [
Expand Down
28 changes: 13 additions & 15 deletions web-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,36 +40,34 @@
"lint:no-legacy": "yarn workspace @mergin/lib lint && yarn workspace @mergin/app lint"
},
"devDependencies": {
"@babel/core": "^7.17.9",
"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
"@esbuild-plugins/node-modules-polyfill": "^0.2.2",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"@vitejs/plugin-vue": "^4.6.2",
"@vue/eslint-config-standard": "^8.0.1",
"@vue/eslint-config-typescript": "^11.0.2",
"@typescript-eslint/eslint-plugin": "^8.11.0",
"@typescript-eslint/parser": "^8.11.0",
"@vitejs/plugin-vue": "^5.1.4",
"@vue/eslint-config-typescript": "^13.0.0",
"agent-base": "^6.0.2",
"autoprefixer": "^10.4.14",
"concurrently": "^8.0.1",
"eslint": "^8.37.0",
"eslint": "^8.57.1",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-vue": "^9.10.0",
"eslint-plugin-vue": "^9.29.1",
"npm-run-all": "^4.1.5",
"postcss": "^8.4.21",
"postcss": "^8.4.47",
"prettier": "2.6.0",
"purgecss": "^5.0.0",
"rimraf": "^3.0.2",
"sass": "^1.69.5",
"tsc-alias": "^1.8.6",
"typescript": "^5.0.4",
"unplugin-vue-components": "^0.25.1",
"vite": "^4.5.3",
"vite-plugin-static-copy": "^0.17.0",
"vue-tsc": "^1.6.5"
"typescript": "^5.6.3",
"unplugin-vue-components": "^0.27.1",
"vite": "^5.4.10",
"vite-plugin-static-copy": "^2.0.0",
"vue-tsc": "^2.1.6"
},
"engines": {
"node": ">=18"
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 @@ -24,7 +24,7 @@
"pinia": "^2.1.7",
"primeflex": "^3.3.1",
"primevue": "3.43.0",
"vue": "3.3.8",
"vue": "3.5.12",
"vue-meta": "^3.0.0-alpha.10",
"vue-router": "4.2.5"
}
Expand Down
2 changes: 1 addition & 1 deletion web-app/packages/admin-app/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"target": "ES5",
"target": "ES2022",
"module": "ESNext",
// setting strict to false
"strict": true,
Expand Down
2 changes: 1 addition & 1 deletion web-app/packages/admin-lib/components.d.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* eslint-disable */
/* prettier-ignore */
// @ts-nocheck
// Generated by unplugin-vue-components
// Read more: https://github.com/vuejs/core/pull/3399
export {}

/* prettier-ignore */
declare module 'vue' {
export interface GlobalComponents {
PAvatar: typeof import('primevue/avatar')['default']
Expand Down
2 changes: 1 addition & 1 deletion web-app/packages/admin-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"primeflex": "^3.3.1",
"primevue": "3.43.0",
"universal-cookie": "^4.0.4",
"vue": "3.3.8"
"vue": "3.5.12"
},
"peerDependencies": {
"pinia": ">=2.x",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export default defineComponent({
return this.getErrorByComponentId(this.merginComponentUuid) ?? {}
}
},
beforeDestroy() {
beforeUnmount() {
this.clearErrors({
componentId: this.merginComponentUuid,
keepNotification: true
Expand Down
2 changes: 1 addition & 1 deletion web-app/packages/admin-lib/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"target": "ES5",
"target": "ES2022",
"module": "ESNext",
"strict": true,
"noImplicitAny": false,
Expand Down
2 changes: 1 addition & 1 deletion web-app/packages/app/components.d.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* eslint-disable */
/* prettier-ignore */
// @ts-nocheck
// Generated by unplugin-vue-components
// Read more: https://github.com/vuejs/core/pull/3399
export {}

/* prettier-ignore */
declare module 'vue' {
export interface GlobalComponents {
PDivider: typeof import('primevue/divider')['default']
Expand Down
3 changes: 1 addition & 2 deletions web-app/packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@
"dependencies": {
"@tabler/icons-webfont": "^2.42.0",
"axios": "^0.28.1",
"crypto-js": "^3.1.9-1",
"lodash": "^4.17.21",
"pinia": "^2.1.7",
"primeflex": "^3.3.1",
"primevue": "3.43.0",
"vue": "3.3.8",
"vue": "3.5.12",
"vue-meta": "^3.0.0-alpha.10",
"vue-router": "4.2.5"
}
Expand Down
2 changes: 1 addition & 1 deletion web-app/packages/app/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"target": "ES6",
"target": "ES2022",
"module": "ESNext",
"strict": true,
"noImplicitAny": false,
Expand Down
1 change: 0 additions & 1 deletion web-app/packages/lib/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
module.exports = {
extends: [
'plugin:vue/essential',
'eslint:recommended',
'@vue/typescript/recommended',
'../../.eslintrc.cjs'
Expand Down
2 changes: 1 addition & 1 deletion web-app/packages/lib/components.d.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* eslint-disable */
/* prettier-ignore */
// @ts-nocheck
// Generated by unplugin-vue-components
// Read more: https://github.com/vuejs/core/pull/3399
export {}

/* prettier-ignore */
declare module 'vue' {
export interface GlobalComponents {
PAccordion: typeof import('primevue/accordion')['default']
Expand Down
3 changes: 2 additions & 1 deletion web-app/packages/lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,14 @@
"dependencies": {
"axios": "^0.28.1",
"axios-retry": "^3.2.4",
"crypto-js": "^4.2.0",
"date-fns": "^2.28.0",
"file-saver": "^2.0.5",
"lodash": "^4.17.21",
"pinia": "^2.1.7",
"primeflex": "^3.3.1",
"primevue": "3.43.0",
"vue": "3.3.8",
"vue": "3.5.12",
"vue-router": "4.2.5"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion web-app/packages/lib/src/common/components/AppMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { ref } from 'vue'
withDefaults(
defineProps<{
items: MenuItem[]
icon: string
icon?: string
}>(),
{ icon: 'ti ti-sort-descending' }
)
Expand Down
2 changes: 1 addition & 1 deletion web-app/packages/lib/src/common/route_utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export function isAuthenticatedGuard(
/** Handles redirect to /login when user is not superUser and authenticated.
*
* Usage in admin routes
*/
*/
export function isSuperUser(
to: RouteLocationNormalized,
from: RouteLocationNormalized,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ defineProps<{ item: SideBarItemModel }>()
const layoutStore = useLayoutStore()

function closeDrawer() {
layoutStore.isUnderOverlayBreakpoint &&
if (layoutStore.isUnderOverlayBreakpoint) {
layoutStore.setDrawer({ drawer: false })
}
}
</script>

Expand All @@ -25,7 +26,7 @@ function closeDrawer() {
item.active && 'sidebar-item__link--active'
]"
:to="item.to"
@click.native="closeDrawer"
@click="closeDrawer"
><div class="mr-2 flex align-items-center">
<i :class="['paragraph-p3', item.icon]"></i>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export default defineComponent({
created() {
this.newProjectName = this.project
},
beforeDestroy() {
beforeUnmount() {
this.clearErrors({
componentId: this.merginComponentUuid,
keepNotification: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export default defineComponent({
return this.getErrorByComponentId(this.merginComponentUuid) ?? {}
}
},
beforeDestroy() {
beforeUnmount() {
this.clearErrors({
componentId: this.merginComponentUuid,
keepNotification: true
Expand Down Expand Up @@ -112,7 +112,7 @@ export default defineComponent({
this.$emit('error', err, dialogData)
}
},
beforeDestroy() {
beforeUnmount() {
this.clearErrors({
componentId: this.merginComponentUuid,
keepNotification: true
Expand Down
6 changes: 3 additions & 3 deletions web-app/packages/lib/src/modules/project/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export interface ProjectState {
accessSearch: string
accessSorting: SortingParams
availablePermissions: DropdownOption<ProjectPermissionName>[]
availableRoles: DropdownOption<ProjectRoleName>[],
availableRoles: DropdownOption<ProjectRoleName>[]
versionsChangesetLoading: boolean
}

Expand Down Expand Up @@ -465,7 +465,7 @@ export const useProjectStore = defineStore('projectModule', {
payload.projectName
)
this.setProject({ project: projectResponse.data })
} catch (e) {
} catch {
await notificationStore.error({ text: 'Failed to load project data' })
}
},
Expand Down Expand Up @@ -545,7 +545,7 @@ export const useProjectStore = defineStore('projectModule', {
)
this.versions = response.data?.versions
this.versionsCount = response.data?.count
} catch (e) {
} catch {
await notificationStore.error({
text: 'Failed to fetch project versions'
})
Expand Down
Loading