From 6c0e5033194f46032786f92ca47f198c605aacf7 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 16 Jun 2021 14:39:43 +0200 Subject: [PATCH] Upgrade types for Vue async component in router Signed-off-by: Thomas Citharel --- js/src/router/actor.ts | 8 +++---- js/src/router/discussion.ts | 8 +++---- js/src/router/error.ts | 4 ++-- js/src/router/event.ts | 22 +++++++++---------- js/src/router/groups.ts | 32 ++++++++++++++-------------- js/src/router/index.ts | 24 ++++++++++----------- js/src/router/settings.ts | 42 ++++++++++++++++++------------------- js/src/router/user.ts | 18 ++++++++-------- 8 files changed, 79 insertions(+), 79 deletions(-) diff --git a/js/src/router/actor.ts b/js/src/router/actor.ts index f0a74f92d..f6173c055 100644 --- a/js/src/router/actor.ts +++ b/js/src/router/actor.ts @@ -1,5 +1,5 @@ import { RouteConfig } from "vue-router"; -import { EsModuleComponent } from "vue/types/options"; +import { ImportedComponent } from "vue/types/options"; export enum ActorRouteName { GROUP = "Group", @@ -12,14 +12,14 @@ export const actorRoutes: RouteConfig[] = [ { path: "/groups/create", name: ActorRouteName.CREATE_GROUP, - component: (): Promise => + component: (): Promise => import(/* webpackChunkName: "CreateGroup" */ "@/views/Group/Create.vue"), meta: { requiredAuth: true }, }, { path: "/@:preferredUsername", name: ActorRouteName.GROUP, - component: (): Promise => + component: (): Promise => import(/* webpackChunkName: "Group" */ "@/views/Group/Group.vue"), props: true, meta: { requiredAuth: false }, @@ -27,7 +27,7 @@ export const actorRoutes: RouteConfig[] = [ { path: "/groups/me", name: ActorRouteName.MY_GROUPS, - component: (): Promise => + component: (): Promise => import(/* webpackChunkName: "MyGroups" */ "@/views/Group/MyGroups.vue"), meta: { requiredAuth: true }, }, diff --git a/js/src/router/discussion.ts b/js/src/router/discussion.ts index 3f1211e50..7627aed19 100644 --- a/js/src/router/discussion.ts +++ b/js/src/router/discussion.ts @@ -1,5 +1,5 @@ import { RouteConfig } from "vue-router"; -import { EsModuleComponent } from "vue/types/options"; +import { ImportedComponent } from "vue/types/options"; export enum DiscussionRouteName { DISCUSSION_LIST = "DISCUSSION_LIST", @@ -11,7 +11,7 @@ export const discussionRoutes: RouteConfig[] = [ { path: "/@:preferredUsername/discussions", name: DiscussionRouteName.DISCUSSION_LIST, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "DiscussionsList" */ "@/views/Discussions/DiscussionsList.vue" ), @@ -21,7 +21,7 @@ export const discussionRoutes: RouteConfig[] = [ { path: "/@:preferredUsername/discussions/new", name: DiscussionRouteName.CREATE_DISCUSSION, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "CreateDiscussion" */ "@/views/Discussions/Create.vue" ), @@ -31,7 +31,7 @@ export const discussionRoutes: RouteConfig[] = [ { path: "/@:preferredUsername/c/:slug/:comment_id?", name: DiscussionRouteName.DISCUSSION, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "Discussion" */ "@/views/Discussions/Discussion.vue" ), diff --git a/js/src/router/error.ts b/js/src/router/error.ts index bd7b8f465..9c48407d3 100644 --- a/js/src/router/error.ts +++ b/js/src/router/error.ts @@ -1,5 +1,5 @@ import { RouteConfig } from "vue-router"; -import { EsModuleComponent } from "vue/types/options"; +import { ImportedComponent } from "vue/types/options"; export enum ErrorRouteName { ERROR = "Error", @@ -9,7 +9,7 @@ export const errorRoutes: RouteConfig[] = [ { path: "/error", name: ErrorRouteName.ERROR, - component: (): Promise => + component: (): Promise => import(/* webpackChunkName: "Error" */ "../views/Error.vue"), }, ]; diff --git a/js/src/router/event.ts b/js/src/router/event.ts index 460714dc3..0bb7df3e1 100644 --- a/js/src/router/event.ts +++ b/js/src/router/event.ts @@ -1,15 +1,15 @@ import { RouteConfig, Route } from "vue-router"; -import { EsModuleComponent } from "vue/types/options"; +import { ImportedComponent } from "vue/types/options"; -const participations = (): Promise => +const participations = (): Promise => import( /* webpackChunkName: "participations" */ "@/views/Event/Participants.vue" ); -const editEvent = (): Promise => +const editEvent = (): Promise => import(/* webpackChunkName: "edit-event" */ "@/views/Event/Edit.vue"); -const event = (): Promise => +const event = (): Promise => import(/* webpackChunkName: "event" */ "@/views/Event/Event.vue"); -const myEvents = (): Promise => +const myEvents = (): Promise => import(/* webpackChunkName: "my-events" */ "@/views/Event/MyEvents.vue"); export enum EventRouteName { @@ -31,7 +31,7 @@ export const eventRoutes: RouteConfig[] = [ { path: "/events/list/:location?", name: EventRouteName.EVENT_LIST, - component: (): Promise => + component: (): Promise => import(/* webpackChunkName: "EventList" */ "@/views/Event/EventList.vue"), meta: { requiredAuth: false }, }, @@ -83,35 +83,35 @@ export const eventRoutes: RouteConfig[] = [ { path: "/events/:uuid/participate", name: EventRouteName.EVENT_PARTICIPATE_LOGGED_OUT, - component: (): Promise => + component: (): Promise => import("../components/Participation/UnloggedParticipation.vue"), props: true, }, { path: "/events/:uuid/participate/with-account", name: EventRouteName.EVENT_PARTICIPATE_WITH_ACCOUNT, - component: (): Promise => + component: (): Promise => import("../components/Participation/ParticipationWithAccount.vue"), props: true, }, { path: "/events/:uuid/participate/without-account", name: EventRouteName.EVENT_PARTICIPATE_WITHOUT_ACCOUNT, - component: (): Promise => + component: (): Promise => import("../components/Participation/ParticipationWithoutAccount.vue"), props: true, }, { path: "/participation/email/confirm/:token", name: EventRouteName.EVENT_PARTICIPATE_CONFIRM, - component: (): Promise => + component: (): Promise => import("../components/Participation/ConfirmParticipation.vue"), props: true, }, { path: "/tag/:tag", name: EventRouteName.TAG, - component: (): Promise => + component: (): Promise => import(/* webpackChunkName: "Search" */ "@/views/Search.vue"), props: true, meta: { requiredAuth: false }, diff --git a/js/src/router/groups.ts b/js/src/router/groups.ts index bb933d40d..c6f370d1c 100644 --- a/js/src/router/groups.ts +++ b/js/src/router/groups.ts @@ -1,5 +1,5 @@ import { RouteConfig, Route } from "vue-router"; -import { EsModuleComponent } from "vue/types/options"; +import { ImportedComponent } from "vue/types/options"; export enum GroupsRouteName { TODO_LISTS = "TODO_LISTS", @@ -21,16 +21,16 @@ export enum GroupsRouteName { TIMELINE = "TIMELINE", } -const resourceFolder = (): Promise => +const resourceFolder = (): Promise => import("@/views/Resources/ResourceFolder.vue"); -const groupEvents = (): Promise => +const groupEvents = (): Promise => import(/* webpackChunkName: "groupEvents" */ "@/views/Event/GroupEvents.vue"); export const groupsRoutes: RouteConfig[] = [ { path: "/@:preferredUsername/todo-lists", name: GroupsRouteName.TODO_LISTS, - component: (): Promise => + component: (): Promise => import("@/views/Todos/TodoLists.vue"), props: true, meta: { requiredAuth: true }, @@ -38,7 +38,7 @@ export const groupsRoutes: RouteConfig[] = [ { path: "/todo-lists/:id", name: GroupsRouteName.TODO_LIST, - component: (): Promise => + component: (): Promise => import("@/views/Todos/TodoList.vue"), props: true, meta: { requiredAuth: true }, @@ -46,7 +46,7 @@ export const groupsRoutes: RouteConfig[] = [ { path: "/todo/:todoId", name: GroupsRouteName.TODO, - component: (): Promise => + component: (): Promise => import("@/views/Todos/Todo.vue"), props: true, meta: { requiredAuth: true }, @@ -67,7 +67,7 @@ export const groupsRoutes: RouteConfig[] = [ }, { path: "/@:preferredUsername/settings", - component: (): Promise => + component: (): Promise => import("@/views/Group/Settings.vue"), props: true, meta: { requiredAuth: true }, @@ -77,20 +77,20 @@ export const groupsRoutes: RouteConfig[] = [ { path: "public", name: GroupsRouteName.GROUP_PUBLIC_SETTINGS, - component: (): Promise => + component: (): Promise => import("../views/Group/GroupSettings.vue"), }, { path: "members", name: GroupsRouteName.GROUP_MEMBERS_SETTINGS, - component: (): Promise => + component: (): Promise => import("../views/Group/GroupMembers.vue"), props: true, }, { path: "followers", name: GroupsRouteName.GROUP_FOLLOWERS_SETTINGS, - component: (): Promise => + component: (): Promise => import("../views/Group/GroupFollowers.vue"), props: true, }, @@ -98,7 +98,7 @@ export const groupsRoutes: RouteConfig[] = [ }, { path: "/@:preferredUsername/p/new", - component: (): Promise => + component: (): Promise => import("@/views/Posts/Edit.vue"), props: true, name: GroupsRouteName.POST_CREATE, @@ -106,7 +106,7 @@ export const groupsRoutes: RouteConfig[] = [ }, { path: "/p/:slug/edit", - component: (): Promise => + component: (): Promise => import("@/views/Posts/Edit.vue"), props: (route: Route): Record => ({ ...route.params, @@ -117,7 +117,7 @@ export const groupsRoutes: RouteConfig[] = [ }, { path: "/p/:slug", - component: (): Promise => + component: (): Promise => import("@/views/Posts/Post.vue"), props: true, name: GroupsRouteName.POST, @@ -125,7 +125,7 @@ export const groupsRoutes: RouteConfig[] = [ }, { path: "/@:preferredUsername/p", - component: (): Promise => + component: (): Promise => import("@/views/Posts/List.vue"), props: true, name: GroupsRouteName.POSTS, @@ -140,7 +140,7 @@ export const groupsRoutes: RouteConfig[] = [ }, { path: "/@:preferredUsername/join", - component: (): Promise => + component: (): Promise => import("@/components/Group/JoinGroupWithAccount.vue"), props: true, name: GroupsRouteName.GROUP_JOIN, @@ -149,7 +149,7 @@ export const groupsRoutes: RouteConfig[] = [ { path: "/@:preferredUsername/timeline", name: GroupsRouteName.TIMELINE, - component: (): Promise => + component: (): Promise => import("@/views/Group/Timeline.vue"), props: true, meta: { requiredAuth: true }, diff --git a/js/src/router/index.ts b/js/src/router/index.ts index 992d10626..c26374ec4 100644 --- a/js/src/router/index.ts +++ b/js/src/router/index.ts @@ -2,7 +2,7 @@ import Vue from "vue"; import Router, { Route } from "vue-router"; import VueScrollTo from "vue-scrollto"; import { PositionResult } from "vue-router/types/router.d"; -import { EsModuleComponent } from "vue/types/options"; +import { ImportedComponent } from "vue/types/options"; import Home from "../views/Home.vue"; import { eventRoutes } from "./event"; import { actorRoutes } from "./actor"; @@ -46,7 +46,7 @@ export const routes = [ { path: "/search", name: RouteName.SEARCH, - component: (): Promise => + component: (): Promise => import(/* webpackChunkName: "Search" */ "@/views/Search.vue"), props: true, meta: { requiredAuth: false }, @@ -60,7 +60,7 @@ export const routes = [ { path: "/about", name: RouteName.ABOUT, - component: (): Promise => + component: (): Promise => import(/* webpackChunkName: "about" */ "@/views/About.vue"), meta: { requiredAuth: false }, redirect: { name: RouteName.ABOUT_INSTANCE }, @@ -68,7 +68,7 @@ export const routes = [ { path: "instance", name: RouteName.ABOUT_INSTANCE, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "about" */ "@/views/About/AboutInstance.vue" ), @@ -76,28 +76,28 @@ export const routes = [ { path: "/terms", name: RouteName.TERMS, - component: (): Promise => + component: (): Promise => import(/* webpackChunkName: "cookies" */ "@/views/About/Terms.vue"), meta: { requiredAuth: false }, }, { path: "/privacy", name: RouteName.PRIVACY, - component: (): Promise => + component: (): Promise => import(/* webpackChunkName: "cookies" */ "@/views/About/Privacy.vue"), meta: { requiredAuth: false }, }, { path: "/rules", name: RouteName.RULES, - component: (): Promise => + component: (): Promise => import(/* webpackChunkName: "cookies" */ "@/views/About/Rules.vue"), meta: { requiredAuth: false }, }, { path: "/glossary", name: RouteName.GLOSSARY, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "cookies" */ "@/views/About/Glossary.vue" ), @@ -108,14 +108,14 @@ export const routes = [ { path: "/interact", name: RouteName.INTERACT, - component: (): Promise => + component: (): Promise => import(/* webpackChunkName: "interact" */ "@/views/Interact.vue"), meta: { requiredAuth: false }, }, { path: "/auth/:provider/callback", name: "auth-callback", - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "ProviderValidation" */ "@/views/User/ProviderValidation.vue" ), @@ -123,7 +123,7 @@ export const routes = [ { path: "/welcome/:step?", name: RouteName.WELCOME_SCREEN, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "WelcomeScreen" */ "@/views/User/SettingsOnboard.vue" ), @@ -139,7 +139,7 @@ export const routes = [ { path: "/404", name: RouteName.PAGE_NOT_FOUND, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "PageNotFound" */ "../views/PageNotFound.vue" ), diff --git a/js/src/router/settings.ts b/js/src/router/settings.ts index 26b453a04..b118dd5c6 100644 --- a/js/src/router/settings.ts +++ b/js/src/router/settings.ts @@ -1,5 +1,5 @@ import { Route, RouteConfig } from "vue-router"; -import { EsModuleComponent } from "vue/types/options"; +import { ImportedComponent } from "vue/types/options"; export enum SettingsRouteName { SETTINGS = "SETTINGS", @@ -31,7 +31,7 @@ export enum SettingsRouteName { export const settingsRoutes: RouteConfig[] = [ { path: "/settings", - component: (): Promise => + component: (): Promise => import(/* webpackChunkName: "Settings" */ "@/views/Settings.vue"), props: true, meta: { requiredAuth: true }, @@ -47,7 +47,7 @@ export const settingsRoutes: RouteConfig[] = [ { path: "account/general", name: SettingsRouteName.ACCOUNT_SETTINGS_GENERAL, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "AccountSettings" */ "@/views/Settings/AccountSettings.vue" ), @@ -57,7 +57,7 @@ export const settingsRoutes: RouteConfig[] = [ { path: "preferences", name: SettingsRouteName.PREFERENCES, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "Preferences" */ "@/views/Settings/Preferences.vue" ), @@ -67,7 +67,7 @@ export const settingsRoutes: RouteConfig[] = [ { path: "notifications", name: SettingsRouteName.NOTIFICATIONS, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "Notifications" */ "@/views/Settings/Notifications.vue" ), @@ -83,7 +83,7 @@ export const settingsRoutes: RouteConfig[] = [ { path: "admin/dashboard", name: SettingsRouteName.ADMIN_DASHBOARD, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "Dashboard" */ "@/views/Admin/Dashboard.vue" ), @@ -92,7 +92,7 @@ export const settingsRoutes: RouteConfig[] = [ { path: "admin/settings", name: SettingsRouteName.ADMIN_SETTINGS, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "AdminSettings" */ "@/views/Admin/Settings.vue" ), @@ -102,7 +102,7 @@ export const settingsRoutes: RouteConfig[] = [ { path: "admin/users", name: SettingsRouteName.USERS, - component: (): Promise => + component: (): Promise => import(/* webpackChunkName: "Users" */ "@/views/Admin/Users.vue"), props: true, meta: { requiredAuth: true }, @@ -110,7 +110,7 @@ export const settingsRoutes: RouteConfig[] = [ { path: "admin/users/:id", name: SettingsRouteName.ADMIN_USER_PROFILE, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "AdminUserProfile" */ "@/views/Admin/AdminUserProfile.vue" ), @@ -120,7 +120,7 @@ export const settingsRoutes: RouteConfig[] = [ { path: "admin/profiles", name: SettingsRouteName.PROFILES, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "AdminProfiles" */ "@/views/Admin/Profiles.vue" ), @@ -130,7 +130,7 @@ export const settingsRoutes: RouteConfig[] = [ { path: "admin/profiles/:id", name: SettingsRouteName.ADMIN_PROFILE, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "AdminProfile" */ "@/views/Admin/AdminProfile.vue" ), @@ -140,7 +140,7 @@ export const settingsRoutes: RouteConfig[] = [ { path: "admin/groups", name: SettingsRouteName.ADMIN_GROUPS, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "GroupProfiles" */ "@/views/Admin/GroupProfiles.vue" ), @@ -150,7 +150,7 @@ export const settingsRoutes: RouteConfig[] = [ { path: "admin/groups/:id", name: SettingsRouteName.ADMIN_GROUP_PROFILE, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "AdminGroupProfile" */ "@/views/Admin/AdminGroupProfile.vue" ), @@ -161,14 +161,14 @@ export const settingsRoutes: RouteConfig[] = [ path: "admin/relays", name: SettingsRouteName.RELAYS, redirect: { name: SettingsRouteName.RELAY_FOLLOWINGS }, - component: (): Promise => + component: (): Promise => import(/* webpackChunkName: "Follows" */ "@/views/Admin/Follows.vue"), meta: { requiredAuth: true }, children: [ { path: "followings", name: SettingsRouteName.RELAY_FOLLOWINGS, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "Followings" */ "@/components/Admin/Followings.vue" ), @@ -177,7 +177,7 @@ export const settingsRoutes: RouteConfig[] = [ { path: "followers", name: SettingsRouteName.RELAY_FOLLOWERS, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "Followers" */ "@/components/Admin/Followers.vue" ), @@ -195,7 +195,7 @@ export const settingsRoutes: RouteConfig[] = [ { path: "/moderation/reports/:filter?", name: SettingsRouteName.REPORTS, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "ReportList" */ "@/views/Moderation/ReportList.vue" ), @@ -205,7 +205,7 @@ export const settingsRoutes: RouteConfig[] = [ { path: "/moderation/report/:reportId", name: SettingsRouteName.REPORT, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "Report" */ "@/views/Moderation/Report.vue" ), @@ -215,7 +215,7 @@ export const settingsRoutes: RouteConfig[] = [ { path: "/moderation/logs", name: SettingsRouteName.REPORT_LOGS, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "ModerationLogs" */ "@/views/Moderation/Logs.vue" ), @@ -231,7 +231,7 @@ export const settingsRoutes: RouteConfig[] = [ { path: "/identity/create", name: SettingsRouteName.CREATE_IDENTITY, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "EditIdentity" */ "@/views/Account/children/EditIdentity.vue" ), @@ -244,7 +244,7 @@ export const settingsRoutes: RouteConfig[] = [ { path: "/identity/update/:identityName?", name: SettingsRouteName.UPDATE_IDENTITY, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "EditIdentity" */ "@/views/Account/children/EditIdentity.vue" ), diff --git a/js/src/router/user.ts b/js/src/router/user.ts index f58de04e1..51079b869 100644 --- a/js/src/router/user.ts +++ b/js/src/router/user.ts @@ -1,6 +1,6 @@ import { beforeRegisterGuard } from "@/router/guards/register-guard"; import { Route, RouteConfig } from "vue-router"; -import { EsModuleComponent } from "vue/types/options"; +import { ImportedComponent } from "vue/types/options"; export enum UserRouteName { REGISTER = "Register", @@ -17,7 +17,7 @@ export const userRoutes: RouteConfig[] = [ { path: "/register/user", name: UserRouteName.REGISTER, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "RegisterUser" */ "@/views/User/Register.vue" ), @@ -28,7 +28,7 @@ export const userRoutes: RouteConfig[] = [ { path: "/register/profile", name: UserRouteName.REGISTER_PROFILE, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "RegisterProfile" */ "@/views/Account/Register.vue" ), @@ -42,7 +42,7 @@ export const userRoutes: RouteConfig[] = [ { path: "/resend-instructions", name: UserRouteName.RESEND_CONFIRMATION, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "ResendConfirmation" */ "@/views/User/ResendConfirmation.vue" ), @@ -52,7 +52,7 @@ export const userRoutes: RouteConfig[] = [ { path: "/password-reset/send", name: UserRouteName.SEND_PASSWORD_RESET, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "SendPasswordReset" */ "@/views/User/SendPasswordReset.vue" ), @@ -62,7 +62,7 @@ export const userRoutes: RouteConfig[] = [ { path: "/password-reset/:token", name: UserRouteName.PASSWORD_RESET, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "PasswordReset" */ "@/views/User/PasswordReset.vue" ), @@ -72,7 +72,7 @@ export const userRoutes: RouteConfig[] = [ { path: "/validate/email/:token", name: UserRouteName.EMAIL_VALIDATE, - component: (): Promise => + component: (): Promise => import( /* webpackChunkName: "EmailValidate" */ "@/views/User/EmailValidate.vue" ), @@ -82,7 +82,7 @@ export const userRoutes: RouteConfig[] = [ { path: "/validate/:token", name: UserRouteName.VALIDATE, - component: (): Promise => + component: (): Promise => import(/* webpackChunkName: "Validate" */ "@/views/User/Validate.vue"), props: true, meta: { requiresAuth: false }, @@ -90,7 +90,7 @@ export const userRoutes: RouteConfig[] = [ { path: "/login", name: UserRouteName.LOGIN, - component: (): Promise => + component: (): Promise => import(/* webpackChunkName: "Login" */ "@/views/User/Login.vue"), props: true, meta: { requiredAuth: false },