refactor(router): remove deprecated apis (angular#10658)

Author: vsavkin

modules/@angular/router/index.ts

@@ -7,16 +7,14 @@
  */
 
 
-export {ExtraOptions, provideRouterConfig, provideRoutes} from './src/common_router_providers';
-export {Data, LoadChildren, LoadChildrenCallback, ResolveData, Route, RouterConfig, Routes} from './src/config';
+export {Data, LoadChildren, LoadChildrenCallback, ResolveData, Route, Routes} from './src/config';
 export {RouterLink, RouterLinkWithHref} from './src/directives/router_link';
 export {RouterLinkActive} from './src/directives/router_link_active';
 export {RouterOutlet} from './src/directives/router_outlet';
 export {CanActivate, CanActivateChild, CanDeactivate, CanLoad, Resolve} from './src/interfaces';
 export {Event, NavigationCancel, NavigationEnd, NavigationError, NavigationExtras, NavigationStart, Router, RoutesRecognized} from './src/router';
-export {ROUTER_DIRECTIVES, RouterModule} from './src/router_module';
+export {ExtraOptions, ROUTER_DIRECTIVES, RouterModule, provideRoutes} from './src/router_module';
 export {RouterOutletMap} from './src/router_outlet_map';
-export {provideRouter} from './src/router_providers';
 export {ActivatedRoute, ActivatedRouteSnapshot, RouterState, RouterStateSnapshot} from './src/router_state';
 export {PRIMARY_OUTLET, Params} from './src/shared';
 export {DefaultUrlSerializer, UrlSegment, UrlSerializer, UrlTree} from './src/url_tree';

modules/@angular/router/src/apply_redirects.ts

@@ -285,8 +285,7 @@ function match(segmentGroup: UrlSegmentGroup, route: Route, segments: UrlSegment
   const noMatch =
       {matched: false, consumedSegments: <any[]>[], lastChild: 0, positionalParamSegments: {}};
   if (route.path === '') {
-    if ((route.terminal || route.pathMatch === 'full') &&
-        (segmentGroup.hasChildren() || segments.length > 0)) {
+    if ((route.pathMatch === 'full') && (segmentGroup.hasChildren() || segments.length > 0)) {
       return {matched: false, consumedSegments: [], lastChild: 0, positionalParamSegments: {}};
     } else {
       return {matched: true, consumedSegments: [], lastChild: 0, positionalParamSegments: {}};
@@ -315,7 +314,8 @@ function match(segmentGroup: UrlSegmentGroup, route: Route, segments: UrlSegment
     currentIndex++;
   }
 
-  if (route.terminal && (segmentGroup.hasChildren() || currentIndex < segments.length)) {
+  if (route.pathMatch === 'full' &&
+      (segmentGroup.hasChildren() || currentIndex < segments.length)) {
     return {matched: false, consumedSegments: [], lastChild: 0, positionalParamSegments: {}};
   }
 
@@ -434,8 +434,7 @@ function containsEmptyPathRedirects(
 
 function emptyPathRedirect(
     segmentGroup: UrlSegmentGroup, slicedSegments: UrlSegment[], r: Route): boolean {
-  if ((segmentGroup.hasChildren() || slicedSegments.length > 0) &&
-      (r.terminal || r.pathMatch === 'full'))
+  if ((segmentGroup.hasChildren() || slicedSegments.length > 0) && r.pathMatch === 'full')
     return false;
   return r.path === '' && r.redirectTo !== undefined;
 }