diff --git a/js/package.json b/js/package.json index 3e33158c5..71edda7a6 100644 --- a/js/package.json +++ b/js/package.json @@ -15,7 +15,7 @@ "@absinthe/socket": "^0.2.1", "@absinthe/socket-apollo-link": "^0.2.1", "@apollo/client": "^3.3.16", - "@mdi/font": "^5.0.45", + "@mdi/font": "^6.1.95", "@tiptap/core": "^2.0.0-beta.41", "@tiptap/extension-blockquote": "^2.0.0-beta.6", "@tiptap/extension-bubble-menu": "^2.0.0-beta.9", @@ -45,7 +45,7 @@ "lodash": "^4.17.11", "ngeohash": "^0.6.3", "p-debounce": "^4.0.0", - "phoenix": "^1.4.11", + "phoenix": "1.5", "register-service-worker": "^1.7.2", "tippy.js": "^6.2.3", "unfetch": "^4.2.0", @@ -61,49 +61,48 @@ "vuedraggable": "^2.24.3" }, "devDependencies": { - "@types/jest": "^26.0.18", + "@types/jest": "^27.0.2", "@types/leaflet": "^1.5.2", "@types/leaflet.locatecontrol": "^0.60.7", "@types/lodash": "^4.14.141", "@types/ngeohash": "^0.6.2", + "@types/phoenix": "^1.5.2", "@types/prosemirror-inputrules": "^1.0.2", "@types/prosemirror-model": "^1.7.2", "@types/prosemirror-state": "^1.2.4", "@types/prosemirror-view": "^1.11.4", "@typescript-eslint/eslint-plugin": "^4.18.0", "@typescript-eslint/parser": "^4.18.0", - "@vue/cli-plugin-babel": "~5.0.0-beta.3", - "@vue/cli-plugin-e2e-cypress": "~5.0.0-beta.3", - "@vue/cli-plugin-eslint": "~5.0.0-beta.3", - "@vue/cli-plugin-pwa": "~5.0.0-beta.3", - "@vue/cli-plugin-router": "~5.0.0-beta.3", - "@vue/cli-plugin-typescript": "~5.0.0-beta.3", - "@vue/cli-plugin-unit-jest": "~5.0.0-beta.3", - "@vue/cli-service": "~5.0.0-beta.3", + "@vue/cli-plugin-babel": "~5.0.0-beta.4", + "@vue/cli-plugin-e2e-cypress": "~5.0.0-beta.4", + "@vue/cli-plugin-eslint": "~5.0.0-beta.4", + "@vue/cli-plugin-pwa": "~5.0.0-beta.4", + "@vue/cli-plugin-router": "~5.0.0-beta.4", + "@vue/cli-plugin-typescript": "~5.0.0-beta.4", + "@vue/cli-plugin-unit-jest": "~5.0.0-beta.4", + "@vue/cli-service": "~5.0.0-beta.4", "@vue/eslint-config-prettier": "^6.0.0", "@vue/eslint-config-typescript": "^7.0.0", "@vue/test-utils": "^1.1.0", + "@vue/vue2-jest": "^27.0.0-alpha.2", + "cypress": "^8.3.0", "eslint": "^7.20.0", "eslint-plugin-cypress": "^2.10.3", "eslint-plugin-import": "^2.20.2", - "eslint-plugin-prettier": "^3.3.1", + "eslint-plugin-prettier": "^4.0.0", "eslint-plugin-vue": "^7.6.0", "flush-promises": "^1.0.2", - "jest": "^26.6.3", + "jest": "^27.1.0", "jest-junit": "^12.0.0", "mock-apollo-client": "^1.1.0", "prettier": "^2.2.1", "prettier-eslint": "^13.0.0", "sass": "^1.34.1", "sass-loader": "^12.0.0", - "ts-jest": "^26.5.3", - "typescript": "~4.1.5", + "ts-jest": "27", + "typescript": "~4.4.3", "vue-i18n-extract": "^1.0.2", - "vue-jest": "^4.0.1", "vue-template-compiler": "^2.6.11", "webpack-cli": "^4.7.0" - }, - "resolutions": { - "webpack": "5.44.0" } } diff --git a/js/src/components/Admin/Followers.vue b/js/src/components/Admin/Followers.vue index 828eaafde..d05b6d606 100644 --- a/js/src/components/Admin/Followers.vue +++ b/js/src/components/Admin/Followers.vue @@ -209,12 +209,14 @@ export default class Followers extends Mixins(RelayMixin) { }); await this.$apollo.queries.relayFollowers.refetch(); this.checkedRows = []; - } catch (e) { - Snackbar.open({ - message: e.message, - type: "is-danger", - position: "is-bottom", - }); + } catch (e: any) { + if (e.message) { + Snackbar.open({ + message: e.message, + type: "is-danger", + position: "is-bottom", + }); + } } } @@ -228,12 +230,14 @@ export default class Followers extends Mixins(RelayMixin) { }); await this.$apollo.queries.relayFollowers.refetch(); this.checkedRows = []; - } catch (e) { - Snackbar.open({ - message: e.message, - type: "is-danger", - position: "is-bottom", - }); + } catch (e: any) { + if (e.message) { + Snackbar.open({ + message: e.message, + type: "is-danger", + position: "is-bottom", + }); + } } } @@ -250,7 +254,7 @@ export default class Followers extends Mixins(RelayMixin) { limit: FOLLOWERS_PER_PAGE, }, }); - } catch (err) { + } catch (err: any) { console.error(err); } } diff --git a/js/src/components/Admin/Followings.vue b/js/src/components/Admin/Followings.vue index 46944e0cc..6739aba01 100644 --- a/js/src/components/Admin/Followings.vue +++ b/js/src/components/Admin/Followings.vue @@ -203,7 +203,7 @@ export default class Followings extends Mixins(RelayMixin) { limit: FOLLOWINGS_PER_PAGE, }, }); - } catch (err) { + } catch (err: any) { console.error(err); } } @@ -254,12 +254,14 @@ export default class Followings extends Mixins(RelayMixin) { }, }); this.newRelayAddress = ""; - } catch (err) { - Snackbar.open({ - message: err.message, - type: "is-danger", - position: "is-bottom", - }); + } catch (err: any) { + if (err.message) { + Snackbar.open({ + message: err.message, + type: "is-danger", + position: "is-bottom", + }); + } } } @@ -295,12 +297,14 @@ export default class Followings extends Mixins(RelayMixin) { }); await this.$apollo.queries.relayFollowings.refetch(); this.checkedRows = []; - } catch (e) { - Snackbar.open({ - message: e.message, - type: "is-danger", - position: "is-bottom", - }); + } catch (e: any) { + if (e.message) { + Snackbar.open({ + message: e.message, + type: "is-danger", + position: "is-bottom", + }); + } } } } diff --git a/js/src/components/Comment/Comment.vue b/js/src/components/Comment/Comment.vue index 00994462c..14d0a9be3 100644 --- a/js/src/components/Comment/Comment.vue +++ b/js/src/components/Comment/Comment.vue @@ -322,12 +322,14 @@ export default class Comment extends Vue { position: "is-bottom-right", duration: 5000, }); - } catch (e) { - Snackbar.open({ - message: e.message, - type: "is-danger", - position: "is-bottom", - }); + } catch (e: any) { + if (e.message) { + Snackbar.open({ + message: e.message, + type: "is-danger", + position: "is-bottom", + }); + } } } } @@ -398,6 +400,7 @@ a.comment-link { color: $white; .reply-btn, small, + span, strong, .icons button { color: $white; diff --git a/js/src/components/Comment/CommentTree.vue b/js/src/components/Comment/CommentTree.vue index 816e4073e..4d997bee0 100644 --- a/js/src/components/Comment/CommentTree.vue +++ b/js/src/components/Comment/CommentTree.vue @@ -12,7 +12,7 @@ >{{ $t("Comments are closed for everybody else.") }}
-
+
@@ -213,7 +213,7 @@ export default class CommentTree extends Vue { // and reset the new comment field this.newComment = new CommentModel(); - } catch (errors) { + } catch (errors: any) { console.error(errors); if (errors.graphQLErrors && errors.graphQLErrors.length > 0) { const error = errors.graphQLErrors[0]; @@ -295,7 +295,7 @@ export default class CommentTree extends Vue { }, }); // this.comments = this.comments.filter(commentItem => commentItem.id !== comment.id); - } catch (error) { + } catch (error: any) { console.error(error); if (error.graphQLErrors && error.graphQLErrors.length > 0) { this.$notifier.error(error.graphQLErrors[0].message); diff --git a/js/src/components/Editor.vue b/js/src/components/Editor.vue index a287cd987..1c9c49e43 100644 --- a/js/src/components/Editor.vue +++ b/js/src/components/Editor.vue @@ -331,7 +331,7 @@ export default class EditorComponent extends Vue { }) .run(); } - } catch (error) { + } catch (error: any) { console.error(error); if (error.graphQLErrors && error.graphQLErrors.length > 0) { this.$notifier.error(error.graphQLErrors[0].message); diff --git a/js/src/components/Event/ShareEventModal.vue b/js/src/components/Event/ShareEventModal.vue index 83ddf3b92..2b2fbbc7a 100644 --- a/js/src/components/Event/ShareEventModal.vue +++ b/js/src/components/Event/ShareEventModal.vue @@ -86,11 +86,13 @@ /> + > + +