Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395171 )
Change subject: Chore: remove AnyRoute
......................................................................
Chore: remove AnyRoute
Route now only has one type parameter which makes `Route<any>` just as
readable as `AnyRoute`. This patch removes AnyRoute and replaces all
usages.
Change-Id: If85b0c33af3e9356cbff6745ef166c622a9653a0
---
M src/common/router/route.ts
M src/common/router/router.ts
M src/common/router/routes.ts
3 files changed, 4 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/71/395171/1
diff --git a/src/common/router/route.ts b/src/common/router/route.ts
index d36909b..9be7cb5 100644
--- a/src/common/router/route.ts
+++ b/src/common/router/route.ts
@@ -76,8 +76,6 @@
toPath(params?: undefined): string;
}
-export type AnyRoute = Route<any>;
-
/**
* Decompose a URL path into a Params map for use by
* PageModule.getInitialProps(). This method uses a path regular expression to
diff --git a/src/common/router/router.ts b/src/common/router/router.ts
index c4b8f45..828eac7 100644
--- a/src/common/router/router.ts
+++ b/src/common/router/router.ts
@@ -1,10 +1,5 @@
import { AnyComponent } from "preact";
-import {
- AnyRoute,
- PageComponent,
- PageModule,
- Route
-} from "../../common/router/route";
+import { PageComponent, PageModule, Route } from "../../common/router/route";
import HttpResponse from "../http/http-response";
import notFoundPage from "../pages/not-found";
@@ -72,7 +67,7 @@
}
export const newRouter = (
- routes: AnyRoute[],
+ routes: Route<any>[],
getPage: PageResolver = getChunk
) => {
return {
diff --git a/src/common/router/routes.ts b/src/common/router/routes.ts
index fa9c2fc..5ce6401 100644
--- a/src/common/router/routes.ts
+++ b/src/common/router/routes.ts
@@ -1,6 +1,6 @@
import { Params as WikiParams } from "../pages/wiki";
import { Params as SummaryParams } from "../pages/summary";
-import { AnyRoute, NoParamsRoute, Route, newRoute } from "./route";
+import { NoParamsRoute, Route, newRoute } from "./route";
export const home: NoParamsRoute = newRoute({
path: "/",
@@ -44,7 +44,7 @@
page: "style-guide"
});
-export const routes: AnyRoute[] = [
+export const routes: Route<any>[] = [
home,
about,
wiki,
--
To view, visit https://gerrit.wikimedia.org/r/395171
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If85b0c33af3e9356cbff6745ef166c622a9653a0
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
Gerrit-Reviewer: Sniedzielski <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
