@angular/router 6.0.3 → 6.0.7

package/bundles/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @license Angular v6.0.3
+ * @license Angular v6.0.7
  * (c) 2010-2018 Google, Inc. https://angular.io/
  * License: MIT
  */
@@ -120,8 +120,10 @@ function __spread() {
  * @experimental
  */
 var RouterEvent = /** @class */ (function () {
-    function RouterEvent(/** @docsNotRequired */
-    id, /** @docsNotRequired */
+    function RouterEvent(
+    /** @docsNotRequired */
+    id, 
+    /** @docsNotRequired */
     url) {
         this.id = id;
         this.url = url;
@@ -137,13 +139,13 @@ var RouterEvent = /** @class */ (function () {
  */
 var NavigationStart = /** @class */ (function (_super) {
     __extends(NavigationStart, _super);
-    function NavigationStart(/** @docsNotRequired */
+    function NavigationStart(
     /** @docsNotRequired */
-    id, /** @docsNotRequired */
+    id, 
     /** @docsNotRequired */
-    url, /** @docsNotRequired */
+    url, 
     /** @docsNotRequired */
-    navigationTrigger, /** @docsNotRequired */
+    navigationTrigger, 
     /** @docsNotRequired */
     restoredState) {
         /** @docsNotRequired */
@@ -156,9 +158,7 @@ var NavigationStart = /** @class */ (function (_super) {
         return _this;
     }
     /** @docsNotRequired */
-    /** @docsNotRequired */
-    NavigationStart.prototype.toString = /** @docsNotRequired */
-    function () { return "NavigationStart(id: " + this.id + ", url: '" + this.url + "')"; };
+    NavigationStart.prototype.toString = function () { return "NavigationStart(id: " + this.id + ", url: '" + this.url + "')"; };
     return NavigationStart;
 }(RouterEvent));
 /**
@@ -170,20 +170,19 @@ var NavigationStart = /** @class */ (function (_super) {
  */
 var NavigationEnd = /** @class */ (function (_super) {
     __extends(NavigationEnd, _super);
-    function NavigationEnd(/** @docsNotRequired */
+    function NavigationEnd(
+    /** @docsNotRequired */
+    id, 
     /** @docsNotRequired */
-    id, /** @docsNotRequired */
+    url, 
     /** @docsNotRequired */
-    url, /** @docsNotRequired */
     urlAfterRedirects) {
         var _this = _super.call(this, id, url) || this;
         _this.urlAfterRedirects = urlAfterRedirects;
         return _this;
     }
     /** @docsNotRequired */
-    /** @docsNotRequired */
-    NavigationEnd.prototype.toString = /** @docsNotRequired */
-    function () {
+    NavigationEnd.prototype.toString = function () {
         return "NavigationEnd(id: " + this.id + ", url: '" + this.url + "', urlAfterRedirects: '" + this.urlAfterRedirects + "')";
     };
     return NavigationEnd;
@@ -197,20 +196,19 @@ var NavigationEnd = /** @class */ (function (_super) {
  */
 var NavigationCancel = /** @class */ (function (_super) {
     __extends(NavigationCancel, _super);
-    function NavigationCancel(/** @docsNotRequired */
+    function NavigationCancel(
+    /** @docsNotRequired */
+    id, 
     /** @docsNotRequired */
-    id, /** @docsNotRequired */
+    url, 
     /** @docsNotRequired */
-    url, /** @docsNotRequired */
     reason) {
         var _this = _super.call(this, id, url) || this;
         _this.reason = reason;
         return _this;
     }
     /** @docsNotRequired */
-    /** @docsNotRequired */
-    NavigationCancel.prototype.toString = /** @docsNotRequired */
-    function () { return "NavigationCancel(id: " + this.id + ", url: '" + this.url + "')"; };
+    NavigationCancel.prototype.toString = function () { return "NavigationCancel(id: " + this.id + ", url: '" + this.url + "')"; };
     return NavigationCancel;
 }(RouterEvent));
 /**
@@ -222,20 +220,19 @@ var NavigationCancel = /** @class */ (function (_super) {
  */
 var NavigationError = /** @class */ (function (_super) {
     __extends(NavigationError, _super);
-    function NavigationError(/** @docsNotRequired */
+    function NavigationError(
+    /** @docsNotRequired */
+    id, 
     /** @docsNotRequired */
-    id, /** @docsNotRequired */
+    url, 
     /** @docsNotRequired */
-    url, /** @docsNotRequired */
     error) {
         var _this = _super.call(this, id, url) || this;
         _this.error = error;
         return _this;
     }
     /** @docsNotRequired */
-    /** @docsNotRequired */
-    NavigationError.prototype.toString = /** @docsNotRequired */
-    function () {
+    NavigationError.prototype.toString = function () {
         return "NavigationError(id: " + this.id + ", url: '" + this.url + "', error: " + this.error + ")";
     };
     return NavigationError;
@@ -249,12 +246,14 @@ var NavigationError = /** @class */ (function (_super) {
  */
 var RoutesRecognized = /** @class */ (function (_super) {
     __extends(RoutesRecognized, _super);
-    function RoutesRecognized(/** @docsNotRequired */
+    function RoutesRecognized(
+    /** @docsNotRequired */
+    id, 
     /** @docsNotRequired */
-    id, /** @docsNotRequired */
+    url, 
+    /** @docsNotRequired */
+    urlAfterRedirects, 
     /** @docsNotRequired */
-    url, /** @docsNotRequired */
-    urlAfterRedirects, /** @docsNotRequired */
     state) {
         var _this = _super.call(this, id, url) || this;
         _this.urlAfterRedirects = urlAfterRedirects;
@@ -262,9 +261,7 @@ var RoutesRecognized = /** @class */ (function (_super) {
         return _this;
     }
     /** @docsNotRequired */
-    /** @docsNotRequired */
-    RoutesRecognized.prototype.toString = /** @docsNotRequired */
-    function () {
+    RoutesRecognized.prototype.toString = function () {
         return "RoutesRecognized(id: " + this.id + ", url: '" + this.url + "', urlAfterRedirects: '" + this.urlAfterRedirects + "', state: " + this.state + ")";
     };
     return RoutesRecognized;
@@ -278,12 +275,14 @@ var RoutesRecognized = /** @class */ (function (_super) {
  */
 var GuardsCheckStart = /** @class */ (function (_super) {
     __extends(GuardsCheckStart, _super);
-    function GuardsCheckStart(/** @docsNotRequired */
+    function GuardsCheckStart(
     /** @docsNotRequired */
-    id, /** @docsNotRequired */
+    id, 
+    /** @docsNotRequired */
+    url, 
+    /** @docsNotRequired */
+    urlAfterRedirects, 
     /** @docsNotRequired */
-    url, /** @docsNotRequired */
-    urlAfterRedirects, /** @docsNotRequired */
     state) {
         var _this = _super.call(this, id, url) || this;
         _this.urlAfterRedirects = urlAfterRedirects;
@@ -304,13 +303,16 @@ var GuardsCheckStart = /** @class */ (function (_super) {
  */
 var GuardsCheckEnd = /** @class */ (function (_super) {
     __extends(GuardsCheckEnd, _super);
-    function GuardsCheckEnd(/** @docsNotRequired */
+    function GuardsCheckEnd(
+    /** @docsNotRequired */
+    id, 
     /** @docsNotRequired */
-    id, /** @docsNotRequired */
+    url, 
+    /** @docsNotRequired */
+    urlAfterRedirects, 
+    /** @docsNotRequired */
+    state, 
     /** @docsNotRequired */
-    url, /** @docsNotRequired */
-    urlAfterRedirects, /** @docsNotRequired */
-    state, /** @docsNotRequired */
     shouldActivate) {
         var _this = _super.call(this, id, url) || this;
         _this.urlAfterRedirects = urlAfterRedirects;
@@ -335,12 +337,14 @@ var GuardsCheckEnd = /** @class */ (function (_super) {
  */
 var ResolveStart = /** @class */ (function (_super) {
     __extends(ResolveStart, _super);
-    function ResolveStart(/** @docsNotRequired */
+    function ResolveStart(
+    /** @docsNotRequired */
+    id, 
+    /** @docsNotRequired */
+    url, 
     /** @docsNotRequired */
-    id, /** @docsNotRequired */
+    urlAfterRedirects, 
     /** @docsNotRequired */
-    url, /** @docsNotRequired */
-    urlAfterRedirects, /** @docsNotRequired */
     state) {
         var _this = _super.call(this, id, url) || this;
         _this.urlAfterRedirects = urlAfterRedirects;
@@ -362,12 +366,14 @@ var ResolveStart = /** @class */ (function (_super) {
  */
 var ResolveEnd = /** @class */ (function (_super) {
     __extends(ResolveEnd, _super);
-    function ResolveEnd(/** @docsNotRequired */
+    function ResolveEnd(
     /** @docsNotRequired */
-    id, /** @docsNotRequired */
+    id, 
+    /** @docsNotRequired */
+    url, 
+    /** @docsNotRequired */
+    urlAfterRedirects, 
     /** @docsNotRequired */
-    url, /** @docsNotRequired */
-    urlAfterRedirects, /** @docsNotRequired */
     state) {
         var _this = _super.call(this, id, url) || this;
         _this.urlAfterRedirects = urlAfterRedirects;
@@ -387,7 +393,8 @@ var ResolveEnd = /** @class */ (function (_super) {
  * @experimental
  */
 var RouteConfigLoadStart = /** @class */ (function () {
-    function RouteConfigLoadStart(/** @docsNotRequired */
+    function RouteConfigLoadStart(
+    /** @docsNotRequired */
     route) {
         this.route = route;
     }
@@ -402,7 +409,8 @@ var RouteConfigLoadStart = /** @class */ (function () {
  * @experimental
  */
 var RouteConfigLoadEnd = /** @class */ (function () {
-    function RouteConfigLoadEnd(/** @docsNotRequired */
+    function RouteConfigLoadEnd(
+    /** @docsNotRequired */
     route) {
         this.route = route;
     }
@@ -418,7 +426,8 @@ var RouteConfigLoadEnd = /** @class */ (function () {
  * @experimental
  */
 var ChildActivationStart = /** @class */ (function () {
-    function ChildActivationStart(/** @docsNotRequired */
+    function ChildActivationStart(
+    /** @docsNotRequired */
     snapshot) {
         this.snapshot = snapshot;
     }
@@ -437,7 +446,8 @@ var ChildActivationStart = /** @class */ (function () {
  * @experimental
  */
 var ChildActivationEnd = /** @class */ (function () {
-    function ChildActivationEnd(/** @docsNotRequired */
+    function ChildActivationEnd(
+    /** @docsNotRequired */
     snapshot) {
         this.snapshot = snapshot;
     }
@@ -456,7 +466,8 @@ var ChildActivationEnd = /** @class */ (function () {
  * @experimental
  */
 var ActivationStart = /** @class */ (function () {
-    function ActivationStart(/** @docsNotRequired */
+    function ActivationStart(
+    /** @docsNotRequired */
     snapshot) {
         this.snapshot = snapshot;
     }
@@ -475,7 +486,8 @@ var ActivationStart = /** @class */ (function () {
  * @experimental
  */
 var ActivationEnd = /** @class */ (function () {
-    function ActivationEnd(/** @docsNotRequired */
+    function ActivationEnd(
+    /** @docsNotRequired */
     snapshot) {
         this.snapshot = snapshot;
     }
@@ -486,6 +498,31 @@ var ActivationEnd = /** @class */ (function () {
     return ActivationEnd;
 }());
 
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+/**
+ * This component is used internally within the router to be a placeholder when an empty
+ * router-outlet is needed. For example, with a config such as:
+ *
+ * `{path: 'parent', outlet: 'nav', children: [...]}`
+ *
+ * In order to render, there needs to be a component on this config, which will default
+ * to this `EmptyOutletComponent`.
+ */
+var EmptyOutletComponent = /** @class */ (function () {
+    function EmptyOutletComponent() {
+    }
+    EmptyOutletComponent.decorators = [
+        { type: core.Component, args: [{ template: "<router-outlet></router-outlet>" }] }
+    ];
+    return EmptyOutletComponent;
+}());
+
 /**
  * @license
  * Copyright Google Inc. All Rights Reserved.
@@ -603,8 +640,9 @@ function validateNode(route, fullPath) {
     if (Array.isArray(route)) {
         throw new Error("Invalid configuration of route '" + fullPath + "': Array cannot be specified");
     }
-    if (!route.component && (route.outlet && route.outlet !== PRIMARY_OUTLET)) {
-        throw new Error("Invalid configuration of route '" + fullPath + "': a componentless route cannot have a named outlet set");
+    if (!route.component && !route.children && !route.loadChildren &&
+        (route.outlet && route.outlet !== PRIMARY_OUTLET)) {
+        throw new Error("Invalid configuration of route '" + fullPath + "': a componentless route without children or loadChildren cannot have a named outlet set");
     }
     if (route.redirectTo && route.children) {
         throw new Error("Invalid configuration of route '" + fullPath + "': redirectTo and children cannot be used together");
@@ -658,9 +696,16 @@ function getFullPath(parentPath, currentRoute) {
         return parentPath + "/" + currentRoute.path;
     }
 }
-function copyConfig(r) {
-    var children = r.children && r.children.map(copyConfig);
-    return children ? __assign({}, r, { children: children }) : __assign({}, r);
+/**
+ * Makes a copy of the config and adds any default required properties.
+ */
+function standardizeConfig(r) {
+    var children = r.children && r.children.map(standardizeConfig);
+    var c = children ? __assign({}, r, { children: children }) : __assign({}, r);
+    if (!c.component && (children || c.loadChildren) && (c.outlet && c.outlet !== PRIMARY_OUTLET)) {
+        c.component = EmptyOutletComponent;
+    }
+    return c;
 }
 
 /**
@@ -858,9 +903,12 @@ function containsSegmentGroupHelper(container, containee, containeePaths) {
  */
 var UrlTree = /** @class */ (function () {
     /** @internal */
-    function UrlTree(/** The root segment group of the URL tree */
-    root, /** The query params of the URL */
-    queryParams, /** The fragment of the URL */
+    function UrlTree(
+    /** The root segment group of the URL tree */
+    root, 
+    /** The query params of the URL */
+    queryParams, 
+    /** The fragment of the URL */
     fragment) {
         this.root = root;
         this.queryParams = queryParams;
@@ -877,9 +925,7 @@ var UrlTree = /** @class */ (function () {
         configurable: true
     });
     /** @docsNotRequired */
-    /** @docsNotRequired */
-    UrlTree.prototype.toString = /** @docsNotRequired */
-    function () { return DEFAULT_SERIALIZER.serialize(this); };
+    UrlTree.prototype.toString = function () { return DEFAULT_SERIALIZER.serialize(this); };
     return UrlTree;
 }());
 /**
@@ -892,8 +938,10 @@ var UrlTree = /** @class */ (function () {
  *
  */
 var UrlSegmentGroup = /** @class */ (function () {
-    function UrlSegmentGroup(/** The URL segments of this group. See `UrlSegment` for more information */
-    segments, /** The list of children of this group */
+    function UrlSegmentGroup(
+    /** The URL segments of this group. See `UrlSegment` for more information */
+    segments, 
+    /** The list of children of this group */
     children) {
         var _this = this;
         this.segments = segments;
@@ -903,20 +951,15 @@ var UrlSegmentGroup = /** @class */ (function () {
         forEach(children, function (v, k) { return v.parent = _this; });
     }
     /** Whether the segment has child segments */
-    /** Whether the segment has child segments */
-    UrlSegmentGroup.prototype.hasChildren = /** Whether the segment has child segments */
-    function () { return this.numberOfChildren > 0; };
+    UrlSegmentGroup.prototype.hasChildren = function () { return this.numberOfChildren > 0; };
     Object.defineProperty(UrlSegmentGroup.prototype, "numberOfChildren", {
         /** Number of child segments */
-        get: /** Number of child segments */
-        function () { return Object.keys(this.children).length; },
+        get: function () { return Object.keys(this.children).length; },
         enumerable: true,
         configurable: true
     });
     /** @docsNotRequired */
-    /** @docsNotRequired */
-    UrlSegmentGroup.prototype.toString = /** @docsNotRequired */
-    function () { return serializePaths(this); };
+    UrlSegmentGroup.prototype.toString = function () { return serializePaths(this); };
     return UrlSegmentGroup;
 }());
 /**
@@ -945,8 +988,10 @@ var UrlSegmentGroup = /** @class */ (function () {
  *
  */
 var UrlSegment = /** @class */ (function () {
-    function UrlSegment(/** The path part of a URL segment */
-    path, /** The matrix parameters associated with a segment */
+    function UrlSegment(
+    /** The path part of a URL segment */
+    path, 
+    /** The matrix parameters associated with a segment */
     parameters) {
         this.path = path;
         this.parameters = parameters;
@@ -962,9 +1007,7 @@ var UrlSegment = /** @class */ (function () {
         configurable: true
     });
     /** @docsNotRequired */
-    /** @docsNotRequired */
-    UrlSegment.prototype.toString = /** @docsNotRequired */
-    function () { return serializePath(this); };
+    UrlSegment.prototype.toString = function () { return serializePath(this); };
     return UrlSegment;
 }());
 function equalSegments(as, bs) {
@@ -1028,19 +1071,15 @@ var DefaultUrlSerializer = /** @class */ (function () {
     function DefaultUrlSerializer() {
     }
     /** Parses a url into a `UrlTree` */
-    /** Parses a url into a `UrlTree` */
-    DefaultUrlSerializer.prototype.parse = /** Parses a url into a `UrlTree` */
-    function (url) {
+    DefaultUrlSerializer.prototype.parse = function (url) {
         var p = new UrlParser(url);
         return new UrlTree(p.parseRootSegment(), p.parseQueryParams(), p.parseFragment());
     };
     /** Converts a `UrlTree` into a url */
-    /** Converts a `UrlTree` into a url */
-    DefaultUrlSerializer.prototype.serialize = /** Converts a `UrlTree` into a url */
-    function (tree) {
+    DefaultUrlSerializer.prototype.serialize = function (tree) {
         var segment = "/" + serializeSegment(tree.root, true);
         var query = serializeQueryParams(tree.queryParams);
-        var fragment = typeof tree.fragment === "string" ? "#" + encodeUriFragment((tree.fragment)) : '';
+        var fragment = typeof tree.fragment === "string" ? "#" + encodeUriFragment(tree.fragment) : '';
         return "" + segment + query + fragment;
     };
     return DefaultUrlSerializer;
@@ -1212,12 +1251,7 @@ var UrlParser = /** @class */ (function () {
     };
     // parse a segment with its matrix parameters
     // ie `name;k1=v1;k2`
-    // parse a segment with its matrix parameters
-    // ie `name;k1=v1;k2`
-    UrlParser.prototype.parseSegment = 
-    // parse a segment with its matrix parameters
-    // ie `name;k1=v1;k2`
-    function () {
+    UrlParser.prototype.parseSegment = function () {
         var path = matchSegments(this.remaining);
         if (path === '' && this.peekStartsWith(';')) {
             throw new Error("Empty path url segment cannot have parameters: '" + this.remaining + "'.");
@@ -1249,10 +1283,7 @@ var UrlParser = /** @class */ (function () {
         params[decode(key)] = decode(value);
     };
     // Parse a single query parameter `name[=value]`
-    // Parse a single query parameter `name[=value]`
-    UrlParser.prototype.parseQueryParam = 
-    // Parse a single query parameter `name[=value]`
-    function (params) {
+    UrlParser.prototype.parseQueryParam = function (params) {
         var key = matchQueryParams(this.remaining);
         if (!key) {
             return;
@@ -1283,10 +1314,7 @@ var UrlParser = /** @class */ (function () {
         }
     };
     // parse `(a/b//outlet_name:c/d)`
-    // parse `(a/b//outlet_name:c/d)`
-    UrlParser.prototype.parseParens = 
-    // parse `(a/b//outlet_name:c/d)`
-    function (allowPrimary) {
+    UrlParser.prototype.parseParens = function (allowPrimary) {
         var segments = {};
         this.capture('(');
         while (!this.consumeOptional(')') && this.remaining.length > 0) {
@@ -1297,7 +1325,7 @@ var UrlParser = /** @class */ (function () {
             if (next !== '/' && next !== ')' && next !== ';') {
                 throw new Error("Cannot parse url '" + this.url + "'");
             }
-            var outletName = (undefined);
+            var outletName = undefined;
             if (path.indexOf(':') > -1) {
                 outletName = path.substr(0, path.indexOf(':'));
                 this.capture(outletName);
@@ -1315,10 +1343,7 @@ var UrlParser = /** @class */ (function () {
     };
     UrlParser.prototype.peekStartsWith = function (str) { return this.remaining.startsWith(str); };
     // Consumes the prefix when it is present and returns whether it has been consumed
-    // Consumes the prefix when it is present and returns whether it has been consumed
-    UrlParser.prototype.consumeOptional = 
-    // Consumes the prefix when it is present and returns whether it has been consumed
-    function (str) {
+    UrlParser.prototype.consumeOptional = function (str) {
         if (this.peekStartsWith(str)) {
             this.remaining = this.remaining.substring(str.length);
             return true;
@@ -1359,14 +1384,10 @@ function absoluteRedirect(newTree) {
     return new rxjs.Observable(function (obs) { return obs.error(new AbsoluteRedirect(newTree)); });
 }
 function namedOutletsRedirect(redirectTo) {
-    return new rxjs.Observable(function (obs) {
-        return obs.error(new Error("Only absolute redirects can have named outlets. redirectTo: '" + redirectTo + "'"));
-    });
+    return new rxjs.Observable(function (obs) { return obs.error(new Error("Only absolute redirects can have named outlets. redirectTo: '" + redirectTo + "'")); });
 }
 function canLoadFails(route) {
-    return new rxjs.Observable(function (obs) {
-        return obs.error(navigationCancelingError("Cannot load children because the guard of the route \"path: '" + route.path + "'\" returned false"));
-    });
+    return new rxjs.Observable(function (obs) { return obs.error(navigationCancelingError("Cannot load children because the guard of the route \"path: '" + route.path + "'\" returned false")); });
 }
 /**
  * Returns the `UrlTree` with the redirection applied.
@@ -1388,12 +1409,9 @@ var ApplyRedirects = /** @class */ (function () {
     ApplyRedirects.prototype.apply = function () {
         var _this = this;
         var expanded$ = this.expandSegmentGroup(this.ngModule, this.config, this.urlTree.root, PRIMARY_OUTLET);
-        var urlTrees$ = expanded$.pipe(operators.map(function (rootSegmentGroup) {
-            return _this.createUrlTree(rootSegmentGroup, _this.urlTree.queryParams, (_this.urlTree.fragment));
-        }));
+        var urlTrees$ = expanded$.pipe(operators.map(function (rootSegmentGroup) { return _this.createUrlTree(rootSegmentGroup, _this.urlTree.queryParams, _this.urlTree.fragment); }));
         return urlTrees$.pipe(operators.catchError(function (e) {
             if (e instanceof AbsoluteRedirect) {
-                // after an absolute redirect we do not apply any more redirects!
                 // after an absolute redirect we do not apply any more redirects!
                 _this.allowRedirects = false;
                 // we need to run matching, so we can fetch all lazy-loaded modules
@@ -1409,7 +1427,7 @@ var ApplyRedirects = /** @class */ (function () {
         var _this = this;
         var expanded$ = this.expandSegmentGroup(this.ngModule, this.config, tree.root, PRIMARY_OUTLET);
         var mapped$ = expanded$.pipe(operators.map(function (rootSegmentGroup) {
-            return _this.createUrlTree(rootSegmentGroup, tree.queryParams, (tree.fragment));
+            return _this.createUrlTree(rootSegmentGroup, tree.queryParams, tree.fragment);
         }));
         return mapped$.pipe(operators.catchError(function (e) {
             if (e instanceof NoMatch) {
@@ -1436,10 +1454,7 @@ var ApplyRedirects = /** @class */ (function () {
         return this.expandSegment(ngModule, segmentGroup, routes, segmentGroup.segments, outlet, true);
     };
     // Recursively expand segment groups for all the child outlets
-    // Recursively expand segment groups for all the child outlets
-    ApplyRedirects.prototype.expandChildren = 
-    // Recursively expand segment groups for all the child outlets
-    function (ngModule, routes, segmentGroup) {
+    ApplyRedirects.prototype.expandChildren = function (ngModule, routes, segmentGroup) {
         var _this = this;
         return waitForMap(segmentGroup.children, function (childOutlet, child) { return _this.expandSegmentGroup(ngModule, routes, child, childOutlet); });
     };
@@ -1488,7 +1503,7 @@ var ApplyRedirects = /** @class */ (function () {
     };
     ApplyRedirects.prototype.expandWildCardWithParamsAgainstRouteUsingRedirect = function (ngModule, routes, route, outlet) {
         var _this = this;
-        var newTree = this.applyRedirectCommands([], (route.redirectTo), {});
+        var newTree = this.applyRedirectCommands([], route.redirectTo, {});
         if (route.redirectTo.startsWith('/')) {
             return absoluteRedirect(newTree);
         }
@@ -1502,7 +1517,7 @@ var ApplyRedirects = /** @class */ (function () {
         var _a = match(segmentGroup, route, segments), matched = _a.matched, consumedSegments = _a.consumedSegments, lastChild = _a.lastChild, positionalParamSegments = _a.positionalParamSegments;
         if (!matched)
             return noMatch(segmentGroup);
-        var newTree = this.applyRedirectCommands(consumedSegments, (route.redirectTo), positionalParamSegments);
+        var newTree = this.applyRedirectCommands(consumedSegments, route.redirectTo, positionalParamSegments);
         if (route.redirectTo.startsWith('/')) {
             return absoluteRedirect(newTree);
         }
@@ -1577,7 +1592,7 @@ var ApplyRedirects = /** @class */ (function () {
                 return rxjs.of(res);
             }
             if (c.numberOfChildren > 1 || !c.children[PRIMARY_OUTLET]) {
-                return namedOutletsRedirect((route.redirectTo));
+                return namedOutletsRedirect(route.redirectTo);
             }
             c = c.children[PRIMARY_OUTLET];
         }
@@ -1614,10 +1629,8 @@ var ApplyRedirects = /** @class */ (function () {
     };
     ApplyRedirects.prototype.createSegments = function (redirectTo, redirectToSegments, actualSegments, posParams) {
         var _this = this;
-        return redirectToSegments.map(function (s) {
-            return s.path.startsWith(':') ? _this.findPosParam(redirectTo, s, posParams) :
-                _this.findOrReturn(s, actualSegments);
-        });
+        return redirectToSegments.map(function (s) { return s.path.startsWith(':') ? _this.findPosParam(redirectTo, s, posParams) :
+            _this.findOrReturn(s, actualSegments); });
     };
     ApplyRedirects.prototype.findPosParam = function (redirectTo, redirectToUrlSegment, posParams) {
         var pos = posParams[redirectToUrlSegment.path.substring(1)];
@@ -1678,9 +1691,9 @@ function match(segmentGroup, route, segments) {
     }
     return {
         matched: true,
-        consumedSegments: (res.consumed),
-        lastChild: (res.consumed.length),
-        positionalParamSegments: (res.posParams),
+        consumedSegments: res.consumed,
+        lastChild: res.consumed.length,
+        positionalParamSegments: res.posParams,
     };
 }
 function split(segmentGroup, consumedSegments, slicedSegments, config) {
@@ -1779,52 +1792,28 @@ var Tree = /** @class */ (function () {
     /**
      * @internal
      */
-    /**
-       * @internal
-       */
-    Tree.prototype.parent = /**
-       * @internal
-       */
-    function (t) {
+    Tree.prototype.parent = function (t) {
         var p = this.pathFromRoot(t);
         return p.length > 1 ? p[p.length - 2] : null;
     };
     /**
      * @internal
      */
-    /**
-       * @internal
-       */
-    Tree.prototype.children = /**
-       * @internal
-       */
-    function (t) {
+    Tree.prototype.children = function (t) {
         var n = findNode(t, this._root);
         return n ? n.children.map(function (t) { return t.value; }) : [];
     };
     /**
      * @internal
      */
-    /**
-       * @internal
-       */
-    Tree.prototype.firstChild = /**
-       * @internal
-       */
-    function (t) {
+    Tree.prototype.firstChild = function (t) {
         var n = findNode(t, this._root);
         return n && n.children.length > 0 ? n.children[0].value : null;
     };
     /**
      * @internal
      */
-    /**
-       * @internal
-       */
-    Tree.prototype.siblings = /**
-       * @internal
-       */
-    function (t) {
+    Tree.prototype.siblings = function (t) {
         var p = findPath(t, this._root);
         if (p.length < 2)
             return [];
@@ -1834,13 +1823,7 @@ var Tree = /** @class */ (function () {
     /**
      * @internal
      */
-    /**
-       * @internal
-       */
-    Tree.prototype.pathFromRoot = /**
-       * @internal
-       */
-    function (t) { return findPath(t, this._root).map(function (s) { return s.value; }); };
+    Tree.prototype.pathFromRoot = function (t) { return findPath(t, this._root).map(function (s) { return s.value; }); };
     return Tree;
 }());
 // DFS for the node matching the value
@@ -1943,7 +1926,8 @@ function nodeChildrenAsMap(node) {
 var RouterState = /** @class */ (function (_super) {
     __extends(RouterState, _super);
     /** @internal */
-    function RouterState(root, /** The current snapshot of the router state */
+    function RouterState(root, 
+    /** The current snapshot of the router state */
     snapshot) {
         var _this = _super.call(this, root) || this;
         _this.snapshot = snapshot;
@@ -1994,13 +1978,20 @@ function createEmptyStateSnapshot(urlTree, rootComponent) {
  */
 var ActivatedRoute = /** @class */ (function () {
     /** @internal */
-    function ActivatedRoute(/** An observable of the URL segments matched by this route */
-    url, /** An observable of the matrix parameters scoped to this route */
-    params, /** An observable of the query parameters shared by all the routes */
-    queryParams, /** An observable of the URL fragment shared by all the routes */
-    fragment, /** An observable of the static and resolved data of this route. */
-    data, /** The outlet name of the route. It's a constant */
-    outlet, /** The component of the route. It's a constant */
+    function ActivatedRoute(
+    /** An observable of the URL segments matched by this route */
+    url, 
+    /** An observable of the matrix parameters scoped to this route */
+    params, 
+    /** An observable of the query parameters shared by all the routes */
+    queryParams, 
+    /** An observable of the URL fragment shared by all the routes */
+    fragment, 
+    /** An observable of the static and resolved data of this route. */
+    data, 
+    /** The outlet name of the route. It's a constant */
+    outlet, 
+    /** The component of the route. It's a constant */
     // TODO(vsavkin): remove |string
     component, futureSnapshot) {
         this.url = url;
@@ -2014,43 +2005,37 @@ var ActivatedRoute = /** @class */ (function () {
     }
     Object.defineProperty(ActivatedRoute.prototype, "routeConfig", {
         /** The configuration used to match this route */
-        get: /** The configuration used to match this route */
-        function () { return this._futureSnapshot.routeConfig; },
+        get: function () { return this._futureSnapshot.routeConfig; },
         enumerable: true,
         configurable: true
     });
     Object.defineProperty(ActivatedRoute.prototype, "root", {
         /** The root of the router state */
-        get: /** The root of the router state */
-        function () { return this._routerState.root; },
+        get: function () { return this._routerState.root; },
         enumerable: true,
         configurable: true
     });
     Object.defineProperty(ActivatedRoute.prototype, "parent", {
         /** The parent of this route in the router state tree */
-        get: /** The parent of this route in the router state tree */
-        function () { return this._routerState.parent(this); },
+        get: function () { return this._routerState.parent(this); },
         enumerable: true,
         configurable: true
     });
     Object.defineProperty(ActivatedRoute.prototype, "firstChild", {
         /** The first child of this route in the router state tree */
-        get: /** The first child of this route in the router state tree */
-        function () { return this._routerState.firstChild(this); },
+        get: function () { return this._routerState.firstChild(this); },
         enumerable: true,
         configurable: true
     });
     Object.defineProperty(ActivatedRoute.prototype, "children", {
         /** The children of this route in the router state tree */
-        get: /** The children of this route in the router state tree */
-        function () { return this._routerState.children(this); },
+        get: function () { return this._routerState.children(this); },
         enumerable: true,
         configurable: true
     });
     Object.defineProperty(ActivatedRoute.prototype, "pathFromRoot", {
         /** The path from the root of the router state tree to this route */
-        get: /** The path from the root of the router state tree to this route */
-        function () { return this._routerState.pathFromRoot(this); },
+        get: function () { return this._routerState.pathFromRoot(this); },
         enumerable: true,
         configurable: true
     });
@@ -2140,13 +2125,20 @@ function flattenInherited(pathFromRoot) {
  */
 var ActivatedRouteSnapshot = /** @class */ (function () {
     /** @internal */
-    function ActivatedRouteSnapshot(/** The URL segments matched by this route */
-    url, /** The matrix parameters scoped to this route */
-    params, /** The query parameters shared by all the routes */
-    queryParams, /** The URL fragment shared by all the routes */
-    fragment, /** The static and resolved data of this route */
-    data, /** The outlet name of the route */
-    outlet, /** The component of the route */
+    function ActivatedRouteSnapshot(
+    /** The URL segments matched by this route */
+    url, 
+    /** The matrix parameters scoped to this route */
+    params, 
+    /** The query parameters shared by all the routes */
+    queryParams, 
+    /** The URL fragment shared by all the routes */
+    fragment, 
+    /** The static and resolved data of this route */
+    data, 
+    /** The outlet name of the route */
+    outlet, 
+    /** The component of the route */
     component, routeConfig, urlSegment, lastPathIndex, resolve) {
         this.url = url;
         this.params = params;
@@ -2162,36 +2154,31 @@ var ActivatedRouteSnapshot = /** @class */ (function () {
     }
     Object.defineProperty(ActivatedRouteSnapshot.prototype, "root", {
         /** The root of the router state */
-        get: /** The root of the router state */
-        function () { return this._routerState.root; },
+        get: function () { return this._routerState.root; },
         enumerable: true,
         configurable: true
     });
     Object.defineProperty(ActivatedRouteSnapshot.prototype, "parent", {
         /** The parent of this route in the router state tree */
-        get: /** The parent of this route in the router state tree */
-        function () { return this._routerState.parent(this); },
+        get: function () { return this._routerState.parent(this); },
         enumerable: true,
         configurable: true
     });
     Object.defineProperty(ActivatedRouteSnapshot.prototype, "firstChild", {
         /** The first child of this route in the router state tree */
-        get: /** The first child of this route in the router state tree */
-        function () { return this._routerState.firstChild(this); },
+        get: function () { return this._routerState.firstChild(this); },
         enumerable: true,
         configurable: true
     });
     Object.defineProperty(ActivatedRouteSnapshot.prototype, "children", {
         /** The children of this route in the router state tree */
-        get: /** The children of this route in the router state tree */
-        function () { return this._routerState.children(this); },
+        get: function () { return this._routerState.children(this); },
         enumerable: true,
         configurable: true
     });
     Object.defineProperty(ActivatedRouteSnapshot.prototype, "pathFromRoot", {
         /** The path from the root of the router state tree to this route */
-        get: /** The path from the root of the router state tree to this route */
-        function () { return this._routerState.pathFromRoot(this); },
+        get: function () { return this._routerState.pathFromRoot(this); },
         enumerable: true,
         configurable: true
     });
@@ -2251,7 +2238,8 @@ var ActivatedRouteSnapshot = /** @class */ (function () {
 var RouterStateSnapshot = /** @class */ (function (_super) {
     __extends(RouterStateSnapshot, _super);
     /** @internal */
-    function RouterStateSnapshot(/** The url from which this snapshot was created */
+    function RouterStateSnapshot(
+    /** The url from which this snapshot was created */
     url, root) {
         var _this = _super.call(this, root) || this;
         _this.url = url;
@@ -2298,7 +2286,6 @@ function advanceActivatedRoute(route) {
     else {
         route.snapshot = route._futureSnapshot;
         // this is for resolved data
-        // this is for resolved data
         route.data.next(route._futureSnapshot.data);
     }
 }
@@ -2306,7 +2293,7 @@ function equalParamsAndUrlSegments(a, b) {
     var equalUrlParams = shallowEqual(a.params, b.params) && equalSegments(a.url, b.url);
     var parentsMismatch = !a.parent !== !b.parent;
     return equalUrlParams && !parentsMismatch &&
-        (!a.parent || equalParamsAndUrlSegments(a.parent, (b.parent)));
+        (!a.parent || equalParamsAndUrlSegments(a.parent, b.parent));
 }
 
 /**
@@ -2475,11 +2462,9 @@ function computeNavigation(commands) {
                     // skip './a'
                 }
                 else if (partIndex == 0 && urlPart === '') {
-                    //  '/a'
                     isAbsolute = true;
                 }
                 else if (urlPart === '..') {
-                    //  '../a'
                     numberOfDoubleDots++;
                 }
                 else if (urlPart != '') {
@@ -2517,7 +2502,7 @@ function createPositionApplyingDoubleDots(group, index, numberOfDoubleDots) {
     var dd = numberOfDoubleDots;
     while (dd > ci) {
         dd -= ci;
-        g = (g.parent);
+        g = g.parent;
         if (!g) {
             throw new Error('Invalid number of \'../\'');
         }
@@ -2718,15 +2703,7 @@ var PreActivation = /** @class */ (function () {
      * Iterates over child routes and calls recursive `setupRouteGuards` to get `this` instance in
      * proper state to run `checkGuards()` method.
      */
-    /**
-       * Iterates over child routes and calls recursive `setupRouteGuards` to get `this` instance in
-       * proper state to run `checkGuards()` method.
-       */
-    PreActivation.prototype.setupChildRouteGuards = /**
-       * Iterates over child routes and calls recursive `setupRouteGuards` to get `this` instance in
-       * proper state to run `checkGuards()` method.
-       */
-    function (futureNode, currNode, contexts, futurePath) {
+    PreActivation.prototype.setupChildRouteGuards = function (futureNode, currNode, contexts, futurePath) {
         var _this = this;
         var prevChildren = nodeChildrenAsMap(currNode);
         // Process the children of the future route
@@ -2743,15 +2720,7 @@ var PreActivation = /** @class */ (function () {
      * Iterates over child routes and calls recursive `setupRouteGuards` to get `this` instance in
      * proper state to run `checkGuards()` method.
      */
-    /**
-       * Iterates over child routes and calls recursive `setupRouteGuards` to get `this` instance in
-       * proper state to run `checkGuards()` method.
-       */
-    PreActivation.prototype.setupRouteGuards = /**
-       * Iterates over child routes and calls recursive `setupRouteGuards` to get `this` instance in
-       * proper state to run `checkGuards()` method.
-       */
-    function (futureNode, currNode, parentContexts, futurePath) {
+    PreActivation.prototype.setupRouteGuards = function (futureNode, currNode, parentContexts, futurePath) {
         var future = futureNode.value;
         var curr = currNode ? currNode.value : null;
         var context = parentContexts ? parentContexts.getContext(futureNode.value.outlet) : null;
@@ -2775,7 +2744,7 @@ var PreActivation = /** @class */ (function () {
                 this.setupChildRouteGuards(futureNode, currNode, parentContexts, futurePath);
             }
             if (shouldRunGuardsAndResolvers) {
-                var outlet = (context.outlet);
+                var outlet = context.outlet;
                 this.canDeactivateChecks.push(new CanDeactivate(outlet.component, curr));
             }
         }
@@ -2839,13 +2808,11 @@ var PreActivation = /** @class */ (function () {
     PreActivation.prototype.runCanActivateChecks = function () {
         var _this = this;
         return rxjs.from(this.canActivateChecks)
-            .pipe(operators.concatMap(function (check) {
-            return andObservables(rxjs.from([
-                _this.fireChildActivationStart(check.route.parent),
-                _this.fireActivationStart(check.route), _this.runCanActivateChild(check.path),
-                _this.runCanActivate(check.route)
-            ]));
-        }), operators.every(function (result) { return result === true; }));
+            .pipe(operators.concatMap(function (check) { return andObservables(rxjs.from([
+            _this.fireChildActivationStart(check.route.parent),
+            _this.fireActivationStart(check.route), _this.runCanActivateChild(check.path),
+            _this.runCanActivate(check.route)
+        ])); }), operators.every(function (result) { return result === true; }));
         // this.fireChildActivationStart(check.path),
     };
     /**
@@ -2856,23 +2823,7 @@ var PreActivation = /** @class */ (function () {
      * return
      * `true` so checks continue to run.
      */
-    /**
-       * This should fire off `ActivationStart` events for each route being activated at this
-       * level.
-       * In other words, if you're activating `a` and `b` below, `path` will contain the
-       * `ActivatedRouteSnapshot`s for both and we will fire `ActivationStart` for both. Always
-       * return
-       * `true` so checks continue to run.
-       */
-    PreActivation.prototype.fireActivationStart = /**
-       * This should fire off `ActivationStart` events for each route being activated at this
-       * level.
-       * In other words, if you're activating `a` and `b` below, `path` will contain the
-       * `ActivatedRouteSnapshot`s for both and we will fire `ActivationStart` for both. Always
-       * return
-       * `true` so checks continue to run.
-       */
-    function (snapshot) {
+    PreActivation.prototype.fireActivationStart = function (snapshot) {
         if (snapshot !== null && this.forwardEvent) {
             this.forwardEvent(new ActivationStart(snapshot));
         }
@@ -2886,23 +2837,7 @@ var PreActivation = /** @class */ (function () {
      * return
      * `true` so checks continue to run.
      */
-    /**
-       * This should fire off `ChildActivationStart` events for each route being activated at this
-       * level.
-       * In other words, if you're activating `a` and `b` below, `path` will contain the
-       * `ActivatedRouteSnapshot`s for both and we will fire `ChildActivationStart` for both. Always
-       * return
-       * `true` so checks continue to run.
-       */
-    PreActivation.prototype.fireChildActivationStart = /**
-       * This should fire off `ChildActivationStart` events for each route being activated at this
-       * level.
-       * In other words, if you're activating `a` and `b` below, `path` will contain the
-       * `ActivatedRouteSnapshot`s for both and we will fire `ChildActivationStart` for both. Always
-       * return
-       * `true` so checks continue to run.
-       */
-    function (snapshot) {
+    PreActivation.prototype.fireChildActivationStart = function (snapshot) {
         if (snapshot !== null && this.forwardEvent) {
             this.forwardEvent(new ChildActivationStart(snapshot));
         }
@@ -3055,7 +2990,7 @@ var Recognizer = /** @class */ (function () {
         try {
             var rootSegmentGroup = split$1(this.urlTree.root, [], [], this.config).segmentGroup;
             var children = this.processSegmentGroup(this.config, rootSegmentGroup, PRIMARY_OUTLET);
-            var root = new ActivatedRouteSnapshot([], Object.freeze({}), Object.freeze(__assign({}, this.urlTree.queryParams)), (this.urlTree.fragment), {}, PRIMARY_OUTLET, this.rootComponentType, null, this.urlTree.root, -1, {});
+            var root = new ActivatedRouteSnapshot([], Object.freeze({}), Object.freeze(__assign({}, this.urlTree.queryParams)), this.urlTree.fragment, {}, PRIMARY_OUTLET, this.rootComponentType, null, this.urlTree.root, -1, {});
             var rootNode = new TreeNode(root, children);
             var routeState = new RouterStateSnapshot(this.url, rootNode);
             this.inheritParamsAndData(routeState._root);
@@ -3125,13 +3060,13 @@ var Recognizer = /** @class */ (function () {
         var rawSlicedSegments = [];
         if (route.path === '**') {
             var params = segments.length > 0 ? last$1(segments).parameters : {};
-            snapshot = new ActivatedRouteSnapshot(segments, params, Object.freeze(__assign({}, this.urlTree.queryParams)), (this.urlTree.fragment), getData(route), outlet, (route.component), route, getSourceSegmentGroup(rawSegment), getPathIndexShift(rawSegment) + segments.length, getResolve(route));
+            snapshot = new ActivatedRouteSnapshot(segments, params, Object.freeze(__assign({}, this.urlTree.queryParams)), this.urlTree.fragment, getData(route), outlet, route.component, route, getSourceSegmentGroup(rawSegment), getPathIndexShift(rawSegment) + segments.length, getResolve(route));
         }
         else {
             var result = match$1(rawSegment, route, segments);
             consumedSegments = result.consumedSegments;
             rawSlicedSegments = segments.slice(result.lastChild);
-            snapshot = new ActivatedRouteSnapshot(consumedSegments, result.parameters, Object.freeze(__assign({}, this.urlTree.queryParams)), (this.urlTree.fragment), getData(route), outlet, (route.component), route, getSourceSegmentGroup(rawSegment), getPathIndexShift(rawSegment) + consumedSegments.length, getResolve(route));
+            snapshot = new ActivatedRouteSnapshot(consumedSegments, result.parameters, Object.freeze(__assign({}, this.urlTree.queryParams)), this.urlTree.fragment, getData(route), outlet, route.component, route, getSourceSegmentGroup(rawSegment), getPathIndexShift(rawSegment) + consumedSegments.length, getResolve(route));
         }
         var childConfig = getChildConfig(route);
         var _a = split$1(rawSegment, consumedSegments, rawSlicedSegments, childConfig), segmentGroup = _a.segmentGroup, slicedSegments = _a.slicedSegments;
@@ -3177,7 +3112,7 @@ function match$1(segmentGroup, route, segments) {
     if (!res)
         throw new NoMatch$1();
     var posParams = {};
-    forEach((res.posParams), function (v, k) { posParams[k] = v.path; });
+    forEach(res.posParams, function (v, k) { posParams[k] = v.path; });
     var parameters = res.consumed.length > 0 ? __assign({}, posParams, res.consumed[res.consumed.length - 1].parameters) :
         posParams;
     return { consumedSegments: res.consumed, lastChild: res.consumed.length, parameters: parameters };
@@ -3343,6 +3278,7 @@ var DefaultRouteReuseStrategy = /** @class */ (function () {
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+// TODO(i): switch to fromPromise once it's expored in rxjs
 /**
  * @docsNotRequired
  * @experimental
@@ -3360,13 +3296,13 @@ var RouterConfigLoader = /** @class */ (function () {
         if (this.onLoadStartListener) {
             this.onLoadStartListener(route);
         }
-        var moduleFactory$ = this.loadModuleFactory((route.loadChildren));
+        var moduleFactory$ = this.loadModuleFactory(route.loadChildren);
         return moduleFactory$.pipe(operators.map(function (factory) {
             if (_this.onLoadEndListener) {
                 _this.onLoadEndListener(route);
             }
             var module = factory.create(parentInjector);
-            return new LoadedRouterConfig(flatten(module.injector.get(ROUTES)).map(copyConfig), module);
+            return new LoadedRouterConfig(flatten(module.injector.get(ROUTES)).map(standardizeConfig), module);
         }));
     };
     RouterConfigLoader.prototype.loadModuleFactory = function (loadChildren) {
@@ -3458,49 +3394,49 @@ var Router = /** @class */ (function () {
         this.rootContexts = rootContexts;
         this.location = location;
         this.config = config;
-        this.navigations = new rxjs.BehaviorSubject((null));
+        this.navigations = new rxjs.BehaviorSubject(null);
         this.navigationId = 0;
         this.events = new rxjs.Subject();
         /**
-           * Error handler that is invoked when a navigation errors.
-           *
-           * See `ErrorHandler` for more information.
-           */
+         * Error handler that is invoked when a navigation errors.
+         *
+         * See `ErrorHandler` for more information.
+         */
         this.errorHandler = defaultErrorHandler;
         /**
-           * Indicates if at least one navigation happened.
-           */
+         * Indicates if at least one navigation happened.
+         */
         this.navigated = false;
         this.lastSuccessfulId = -1;
         /**
-           * Used by RouterModule. This allows us to
-           * pause the navigation either before preactivation or after it.
-           * @internal
-           */
+         * Used by RouterModule. This allows us to
+         * pause the navigation either before preactivation or after it.
+         * @internal
+         */
         this.hooks = {
             beforePreactivation: defaultRouterHook,
             afterPreactivation: defaultRouterHook
         };
         /**
-           * Extracts and merges URLs. Used for AngularJS to Angular migrations.
-           */
+         * Extracts and merges URLs. Used for AngularJS to Angular migrations.
+         */
         this.urlHandlingStrategy = new DefaultUrlHandlingStrategy();
         this.routeReuseStrategy = new DefaultRouteReuseStrategy();
         /**
-           * Define what the router should do if it receives a navigation request to the current URL.
-           * By default, the router will ignore this navigation. However, this prevents features such
-           * as a "refresh" button. Use this option to configure the behavior when navigating to the
-           * current URL. Default is 'ignore'.
-           */
+         * Define what the router should do if it receives a navigation request to the current URL.
+         * By default, the router will ignore this navigation. However, this prevents features such
+         * as a "refresh" button. Use this option to configure the behavior when navigating to the
+         * current URL. Default is 'ignore'.
+         */
         this.onSameUrlNavigation = 'ignore';
         /**
-           * Defines how the router merges params, data and resolved data from parent to child
-           * routes. Available options are:
-           *
-           * - `'emptyOnly'`, the default, only inherits parent params for path-less or component-less
-           *   routes.
-           * - `'always'`, enables unconditional inheritance of parent params.
-           */
+         * Defines how the router merges params, data and resolved data from parent to child
+         * routes. Available options are:
+         *
+         * - `'emptyOnly'`, the default, only inherits parent params for path-less or component-less
+         *   routes.
+         * - `'always'`, enables unconditional inheritance of parent params.
+         */
         this.paramsInheritanceStrategy = 'emptyOnly';
         var onLoadStart = function (r) { return _this.triggerEvent(new RouteConfigLoadStart(r)); };
         var onLoadEnd = function (r) { return _this.triggerEvent(new RouteConfigLoadEnd(r)); };
@@ -3516,15 +3452,7 @@ var Router = /** @class */ (function () {
      * @internal
      * TODO: this should be removed once the constructor of the router made internal
      */
-    /**
-       * @internal
-       * TODO: this should be removed once the constructor of the router made internal
-       */
-    Router.prototype.resetRootComponentType = /**
-       * @internal
-       * TODO: this should be removed once the constructor of the router made internal
-       */
-    function (rootComponentType) {
+    Router.prototype.resetRootComponentType = function (rootComponentType) {
         this.rootComponentType = rootComponentType;
         // TODO: vsavkin router 4.0 should make the root component set to null
         // this will simplify the lifecycle of the router.
@@ -3533,13 +3461,7 @@ var Router = /** @class */ (function () {
     /**
      * Sets up the location change listener and performs the initial navigation.
      */
-    /**
-       * Sets up the location change listener and performs the initial navigation.
-       */
-    Router.prototype.initialNavigation = /**
-       * Sets up the location change listener and performs the initial navigation.
-       */
-    function () {
+    Router.prototype.initialNavigation = function () {
         this.setUpLocationChangeListener();
         if (this.navigationId === 0) {
             this.navigateByUrl(this.location.path(true), { replaceUrl: true });
@@ -3548,13 +3470,7 @@ var Router = /** @class */ (function () {
     /**
      * Sets up the location change listener.
      */
-    /**
-       * Sets up the location change listener.
-       */
-    Router.prototype.setUpLocationChangeListener = /**
-       * Sets up the location change listener.
-       */
-    function () {
+    Router.prototype.setUpLocationChangeListener = function () {
         var _this = this;
         // Don't need to use Zone.wrap any more, because zone.js
         // already patch onPopState, so location change callback will
@@ -3572,15 +3488,12 @@ var Router = /** @class */ (function () {
     };
     Object.defineProperty(Router.prototype, "url", {
         /** The current url */
-        get: /** The current url */
-        function () { return this.serializeUrl(this.currentUrlTree); },
+        get: function () { return this.serializeUrl(this.currentUrlTree); },
         enumerable: true,
         configurable: true
     });
     /** @internal */
-    /** @internal */
-    Router.prototype.triggerEvent = /** @internal */
-    function (e) { this.events.next(e); };
+    Router.prototype.triggerEvent = function (e) { this.events.next(e); };
     /**
      * Resets the configuration used for navigation and generating links.
      *
@@ -3595,51 +3508,19 @@ var Router = /** @class */ (function () {
      * ]);
      * ```
      */
-    /**
-       * Resets the configuration used for navigation and generating links.
-       *
-       * ### Usage
-       *
-       * ```
-       * router.resetConfig([
-       *  { path: 'team/:id', component: TeamCmp, children: [
-       *    { path: 'simple', component: SimpleCmp },
-       *    { path: 'user/:name', component: UserCmp }
-       *  ]}
-       * ]);
-       * ```
-       */
-    Router.prototype.resetConfig = /**
-       * Resets the configuration used for navigation and generating links.
-       *
-       * ### Usage
-       *
-       * ```
-       * router.resetConfig([
-       *  { path: 'team/:id', component: TeamCmp, children: [
-       *    { path: 'simple', component: SimpleCmp },
-       *    { path: 'user/:name', component: UserCmp }
-       *  ]}
-       * ]);
-       * ```
-       */
-    function (config) {
+    Router.prototype.resetConfig = function (config) {
         validateConfig(config);
-        this.config = config.map(copyConfig);
+        this.config = config.map(standardizeConfig);
         this.navigated = false;
         this.lastSuccessfulId = -1;
     };
     /** @docsNotRequired */
-    /** @docsNotRequired */
-    Router.prototype.ngOnDestroy = /** @docsNotRequired */
-    function () { this.dispose(); };
+    Router.prototype.ngOnDestroy = function () { this.dispose(); };
     /** Disposes of the router */
-    /** Disposes of the router */
-    Router.prototype.dispose = /** Disposes of the router */
-    function () {
+    Router.prototype.dispose = function () {
         if (this.locationSubscription) {
             this.locationSubscription.unsubscribe();
-            this.locationSubscription = (null);
+            this.locationSubscription = null;
         }
     };
     /**
@@ -3683,89 +3564,7 @@ var Router = /** @class */ (function () {
      * router.createUrlTree(['../../team/44/user/22'], {relativeTo: route});
      * ```
      */
-    /**
-       * Applies an array of commands to the current url tree and creates a new url tree.
-       *
-       * When given an activate route, applies the given commands starting from the route.
-       * When not given a route, applies the given command starting from the root.
-       *
-       * ### Usage
-       *
-       * ```
-       * // create /team/33/user/11
-       * router.createUrlTree(['/team', 33, 'user', 11]);
-       *
-       * // create /team/33;expand=true/user/11
-       * router.createUrlTree(['/team', 33, {expand: true}, 'user', 11]);
-       *
-       * // you can collapse static segments like this (this works only with the first passed-in value):
-       * router.createUrlTree(['/team/33/user', userId]);
-       *
-       * // If the first segment can contain slashes, and you do not want the router to split it, you
-       * // can do the following:
-       *
-       * router.createUrlTree([{segmentPath: '/one/two'}]);
-       *
-       * // create /team/33/(user/11//right:chat)
-       * router.createUrlTree(['/team', 33, {outlets: {primary: 'user/11', right: 'chat'}}]);
-       *
-       * // remove the right secondary node
-       * router.createUrlTree(['/team', 33, {outlets: {primary: 'user/11', right: null}}]);
-       *
-       * // assuming the current url is `/team/33/user/11` and the route points to `user/11`
-       *
-       * // navigate to /team/33/user/11/details
-       * router.createUrlTree(['details'], {relativeTo: route});
-       *
-       * // navigate to /team/33/user/22
-       * router.createUrlTree(['../22'], {relativeTo: route});
-       *
-       * // navigate to /team/44/user/22
-       * router.createUrlTree(['../../team/44/user/22'], {relativeTo: route});
-       * ```
-       */
-    Router.prototype.createUrlTree = /**
-       * Applies an array of commands to the current url tree and creates a new url tree.
-       *
-       * When given an activate route, applies the given commands starting from the route.
-       * When not given a route, applies the given command starting from the root.
-       *
-       * ### Usage
-       *
-       * ```
-       * // create /team/33/user/11
-       * router.createUrlTree(['/team', 33, 'user', 11]);
-       *
-       * // create /team/33;expand=true/user/11
-       * router.createUrlTree(['/team', 33, {expand: true}, 'user', 11]);
-       *
-       * // you can collapse static segments like this (this works only with the first passed-in value):
-       * router.createUrlTree(['/team/33/user', userId]);
-       *
-       * // If the first segment can contain slashes, and you do not want the router to split it, you
-       * // can do the following:
-       *
-       * router.createUrlTree([{segmentPath: '/one/two'}]);
-       *
-       * // create /team/33/(user/11//right:chat)
-       * router.createUrlTree(['/team', 33, {outlets: {primary: 'user/11', right: 'chat'}}]);
-       *
-       * // remove the right secondary node
-       * router.createUrlTree(['/team', 33, {outlets: {primary: 'user/11', right: null}}]);
-       *
-       * // assuming the current url is `/team/33/user/11` and the route points to `user/11`
-       *
-       * // navigate to /team/33/user/11/details
-       * router.createUrlTree(['details'], {relativeTo: route});
-       *
-       * // navigate to /team/33/user/22
-       * router.createUrlTree(['../22'], {relativeTo: route});
-       *
-       * // navigate to /team/44/user/22
-       * router.createUrlTree(['../../team/44/user/22'], {relativeTo: route});
-       * ```
-       */
-    function (commands, navigationExtras) {
+    Router.prototype.createUrlTree = function (commands, navigationExtras) {
         if (navigationExtras === void 0) { navigationExtras = {}; }
         var relativeTo = navigationExtras.relativeTo, queryParams = navigationExtras.queryParams, fragment = navigationExtras.fragment, preserveQueryParams = navigationExtras.preserveQueryParams, queryParamsHandling = navigationExtras.queryParamsHandling, preserveFragment = navigationExtras.preserveFragment;
         if (core.isDevMode() && preserveQueryParams && console && console.warn) {
@@ -3792,7 +3591,7 @@ var Router = /** @class */ (function () {
         if (q !== null) {
             q = this.removeEmptyProps(q);
         }
-        return createUrlTree(a, this.currentUrlTree, commands, (q), (f));
+        return createUrlTree(a, this.currentUrlTree, commands, q, f);
     };
     /**
      * Navigate based on the provided url. This navigation is always absolute.
@@ -3814,47 +3613,7 @@ var Router = /** @class */ (function () {
      * In opposite to `navigate`, `navigateByUrl` takes a whole URL
      * and does not apply any delta to the current one.
      */
-    /**
-       * Navigate based on the provided url. This navigation is always absolute.
-       *
-       * Returns a promise that:
-       * - resolves to 'true' when navigation succeeds,
-       * - resolves to 'false' when navigation fails,
-       * - is rejected when an error happens.
-       *
-       * ### Usage
-       *
-       * ```
-       * router.navigateByUrl("/team/33/user/11");
-       *
-       * // Navigate without updating the URL
-       * router.navigateByUrl("/team/33/user/11", { skipLocationChange: true });
-       * ```
-       *
-       * In opposite to `navigate`, `navigateByUrl` takes a whole URL
-       * and does not apply any delta to the current one.
-       */
-    Router.prototype.navigateByUrl = /**
-       * Navigate based on the provided url. This navigation is always absolute.
-       *
-       * Returns a promise that:
-       * - resolves to 'true' when navigation succeeds,
-       * - resolves to 'false' when navigation fails,
-       * - is rejected when an error happens.
-       *
-       * ### Usage
-       *
-       * ```
-       * router.navigateByUrl("/team/33/user/11");
-       *
-       * // Navigate without updating the URL
-       * router.navigateByUrl("/team/33/user/11", { skipLocationChange: true });
-       * ```
-       *
-       * In opposite to `navigate`, `navigateByUrl` takes a whole URL
-       * and does not apply any delta to the current one.
-       */
-    function (url, extras) {
+    Router.prototype.navigateByUrl = function (url, extras) {
         if (extras === void 0) { extras = { skipLocationChange: false }; }
         var urlTree = url instanceof UrlTree ? url : this.parseUrl(url);
         var mergedTree = this.urlHandlingStrategy.merge(urlTree, this.rawUrlTree);
@@ -3881,65 +3640,17 @@ var Router = /** @class */ (function () {
      * In opposite to `navigateByUrl`, `navigate` always takes a delta that is applied to the current
      * URL.
      */
-    /**
-       * Navigate based on the provided array of commands and a starting point.
-       * If no starting route is provided, the navigation is absolute.
-       *
-       * Returns a promise that:
-       * - resolves to 'true' when navigation succeeds,
-       * - resolves to 'false' when navigation fails,
-       * - is rejected when an error happens.
-       *
-       * ### Usage
-       *
-       * ```
-       * router.navigate(['team', 33, 'user', 11], {relativeTo: route});
-       *
-       * // Navigate without updating the URL
-       * router.navigate(['team', 33, 'user', 11], {relativeTo: route, skipLocationChange: true});
-       * ```
-       *
-       * In opposite to `navigateByUrl`, `navigate` always takes a delta that is applied to the current
-       * URL.
-       */
-    Router.prototype.navigate = /**
-       * Navigate based on the provided array of commands and a starting point.
-       * If no starting route is provided, the navigation is absolute.
-       *
-       * Returns a promise that:
-       * - resolves to 'true' when navigation succeeds,
-       * - resolves to 'false' when navigation fails,
-       * - is rejected when an error happens.
-       *
-       * ### Usage
-       *
-       * ```
-       * router.navigate(['team', 33, 'user', 11], {relativeTo: route});
-       *
-       * // Navigate without updating the URL
-       * router.navigate(['team', 33, 'user', 11], {relativeTo: route, skipLocationChange: true});
-       * ```
-       *
-       * In opposite to `navigateByUrl`, `navigate` always takes a delta that is applied to the current
-       * URL.
-       */
-    function (commands, extras) {
+    Router.prototype.navigate = function (commands, extras) {
         if (extras === void 0) { extras = { skipLocationChange: false }; }
         validateCommands(commands);
         return this.navigateByUrl(this.createUrlTree(commands, extras), extras);
     };
     /** Serializes a `UrlTree` into a string */
-    /** Serializes a `UrlTree` into a string */
-    Router.prototype.serializeUrl = /** Serializes a `UrlTree` into a string */
-    function (url) { return this.urlSerializer.serialize(url); };
+    Router.prototype.serializeUrl = function (url) { return this.urlSerializer.serialize(url); };
     /** Parses a string into a `UrlTree` */
-    /** Parses a string into a `UrlTree` */
-    Router.prototype.parseUrl = /** Parses a string into a `UrlTree` */
-    function (url) { return this.urlSerializer.parse(url); };
-    /** Returns whether the url is activated */
+    Router.prototype.parseUrl = function (url) { return this.urlSerializer.parse(url); };
     /** Returns whether the url is activated */
-    Router.prototype.isActive = /** Returns whether the url is activated */
-    function (url, exact) {
+    Router.prototype.isActive = function (url, exact) {
         if (url instanceof UrlTree) {
             return containsTree(this.currentUrlTree, url, exact);
         }
@@ -4016,9 +3727,7 @@ var Router = /** @class */ (function () {
             this.events
                 .next(new NavigationStart(id, this.serializeUrl(url), source, state));
             Promise.resolve()
-                .then(function (_) {
-                return _this.runNavigate(url, rawUrl, !!extras.skipLocationChange, !!extras.replaceUrl, id, null);
-            })
+                .then(function (_) { return _this.runNavigate(url, rawUrl, !!extras.skipLocationChange, !!extras.replaceUrl, id, null); })
                 .then(resolve, reject);
             // we cannot process the current URL, but we could process the previous one =>
             // we need to do some cleanup
@@ -4028,9 +3737,7 @@ var Router = /** @class */ (function () {
             this.events
                 .next(new NavigationStart(id, this.serializeUrl(url), source, state));
             Promise.resolve()
-                .then(function (_) {
-                return _this.runNavigate(url, rawUrl, false, false, id, createEmptyState(url, _this.rootComponentType).snapshot);
-            })
+                .then(function (_) { return _this.runNavigate(url, rawUrl, false, false, id, createEmptyState(url, _this.rootComponentType).snapshot); })
                 .then(resolve, reject);
         }
         else {
@@ -4130,15 +3837,7 @@ var Router = /** @class */ (function () {
      * Performs the logic of activating routes. This is a synchronous process by default. While this
      * is a private method, it could be overridden to make activation asynchronous.
      */
-    /**
-       * Performs the logic of activating routes. This is a synchronous process by default. While this
-       * is a private method, it could be overridden to make activation asynchronous.
-       */
-    Router.prototype.activateRoutes = /**
-       * Performs the logic of activating routes. This is a synchronous process by default. While this
-       * is a private method, it could be overridden to make activation asynchronous.
-       */
-    function (state, storedState, storedUrl, id, url, rawUrl, skipLocationChange, replaceUrl, resolvePromise, rejectPromise) {
+    Router.prototype.activateRoutes = function (state, storedState, storedUrl, id, url, rawUrl, skipLocationChange, replaceUrl, resolvePromise, rejectPromise) {
         var _this = this;
         // applied the new router state
         // this operation has side effects
@@ -4227,10 +3926,7 @@ var ActivateRoutes = /** @class */ (function () {
         this.activateChildRoutes(futureRoot, currRoot, parentContexts);
     };
     // De-activate the child route that are not re-used for the future state
-    // De-activate the child route that are not re-used for the future state
-    ActivateRoutes.prototype.deactivateChildRoutes = 
-    // De-activate the child route that are not re-used for the future state
-    function (futureNode, currNode, contexts) {
+    ActivateRoutes.prototype.deactivateChildRoutes = function (futureNode, currNode, contexts) {
         var _this = this;
         var children = nodeChildrenAsMap(currNode);
         // Recurse on the routes active in the future state to de-activate deeper children
@@ -4489,10 +4185,10 @@ var RouterLink = /** @class */ (function () {
         configurable: true
     });
     Object.defineProperty(RouterLink.prototype, "preserveQueryParams", {
-        set: /**
-           * @deprecated 4.0.0 use `queryParamsHandling` instead.
-           */
-        function (value) {
+        /**
+         * @deprecated 4.0.0 use `queryParamsHandling` instead.
+         */
+        set: function (value) {
             if (core.isDevMode() && console && console.warn) {
                 console.warn('preserveQueryParams is deprecated!, use queryParamsHandling instead.');
             }
@@ -4528,22 +4224,22 @@ var RouterLink = /** @class */ (function () {
     ];
     /** @nocollapse */
     RouterLink.ctorParameters = function () { return [
-        { type: Router, },
-        { type: ActivatedRoute, },
-        { type: undefined, decorators: [{ type: core.Attribute, args: ['tabindex',] },] },
-        { type: core.Renderer2, },
-        { type: core.ElementRef, },
+        { type: Router },
+        { type: ActivatedRoute },
+        { type: String, decorators: [{ type: core.Attribute, args: ['tabindex',] }] },
+        { type: core.Renderer2 },
+        { type: core.ElementRef }
     ]; };
     RouterLink.propDecorators = {
-        "queryParams": [{ type: core.Input },],
-        "fragment": [{ type: core.Input },],
-        "queryParamsHandling": [{ type: core.Input },],
-        "preserveFragment": [{ type: core.Input },],
-        "skipLocationChange": [{ type: core.Input },],
-        "replaceUrl": [{ type: core.Input },],
-        "routerLink": [{ type: core.Input },],
-        "preserveQueryParams": [{ type: core.Input },],
-        "onClick": [{ type: core.HostListener, args: ['click',] },],
+        queryParams: [{ type: core.Input }],
+        fragment: [{ type: core.Input }],
+        queryParamsHandling: [{ type: core.Input }],
+        preserveFragment: [{ type: core.Input }],
+        skipLocationChange: [{ type: core.Input }],
+        replaceUrl: [{ type: core.Input }],
+        routerLink: [{ type: core.Input }],
+        preserveQueryParams: [{ type: core.Input }],
+        onClick: [{ type: core.HostListener, args: ['click',] }]
     };
     return RouterLink;
 }());
@@ -4631,22 +4327,22 @@ var RouterLinkWithHref = /** @class */ (function () {
     ];
     /** @nocollapse */
     RouterLinkWithHref.ctorParameters = function () { return [
-        { type: Router, },
-        { type: ActivatedRoute, },
-        { type: common.LocationStrategy, },
+        { type: Router },
+        { type: ActivatedRoute },
+        { type: common.LocationStrategy }
     ]; };
     RouterLinkWithHref.propDecorators = {
-        "target": [{ type: core.HostBinding, args: ['attr.target',] }, { type: core.Input },],
-        "queryParams": [{ type: core.Input },],
-        "fragment": [{ type: core.Input },],
-        "queryParamsHandling": [{ type: core.Input },],
-        "preserveFragment": [{ type: core.Input },],
-        "skipLocationChange": [{ type: core.Input },],
-        "replaceUrl": [{ type: core.Input },],
-        "href": [{ type: core.HostBinding },],
-        "routerLink": [{ type: core.Input },],
-        "preserveQueryParams": [{ type: core.Input },],
-        "onClick": [{ type: core.HostListener, args: ['click', ['$event.button', '$event.ctrlKey', '$event.metaKey', '$event.shiftKey'],] },],
+        target: [{ type: core.HostBinding, args: ['attr.target',] }, { type: core.Input }],
+        queryParams: [{ type: core.Input }],
+        fragment: [{ type: core.Input }],
+        queryParamsHandling: [{ type: core.Input }],
+        preserveFragment: [{ type: core.Input }],
+        skipLocationChange: [{ type: core.Input }],
+        replaceUrl: [{ type: core.Input }],
+        href: [{ type: core.HostBinding }],
+        routerLink: [{ type: core.Input }],
+        preserveQueryParams: [{ type: core.Input }],
+        onClick: [{ type: core.HostListener, args: ['click', ['$event.button', '$event.ctrlKey', '$event.metaKey', '$event.shiftKey'],] }]
     };
     return RouterLinkWithHref;
 }());
@@ -4787,16 +4483,16 @@ var RouterLinkActive = /** @class */ (function () {
     ];
     /** @nocollapse */
     RouterLinkActive.ctorParameters = function () { return [
-        { type: Router, },
-        { type: core.ElementRef, },
-        { type: core.Renderer2, },
-        { type: core.ChangeDetectorRef, },
+        { type: Router },
+        { type: core.ElementRef },
+        { type: core.Renderer2 },
+        { type: core.ChangeDetectorRef }
     ]; };
     RouterLinkActive.propDecorators = {
-        "links": [{ type: core.ContentChildren, args: [RouterLink, { descendants: true },] },],
-        "linksWithHrefs": [{ type: core.ContentChildren, args: [RouterLinkWithHref, { descendants: true },] },],
-        "routerLinkActiveOptions": [{ type: core.Input },],
-        "routerLinkActive": [{ type: core.Input },],
+        links: [{ type: core.ContentChildren, args: [RouterLink, { descendants: true },] }],
+        linksWithHrefs: [{ type: core.ContentChildren, args: [RouterLinkWithHref, { descendants: true },] }],
+        routerLinkActiveOptions: [{ type: core.Input }],
+        routerLinkActive: [{ type: core.Input }]
     };
     return RouterLinkActive;
 }());
@@ -4834,9 +4530,7 @@ var ChildrenOutletContexts = /** @class */ (function () {
         this.contexts = new Map();
     }
     /** Called when a `RouterOutlet` directive is instantiated */
-    /** Called when a `RouterOutlet` directive is instantiated */
-    ChildrenOutletContexts.prototype.onChildOutletCreated = /** Called when a `RouterOutlet` directive is instantiated */
-    function (childName, outlet) {
+    ChildrenOutletContexts.prototype.onChildOutletCreated = function (childName, outlet) {
         var context = this.getOrCreateContext(childName);
         context.outlet = outlet;
         this.contexts.set(childName, context);
@@ -4846,17 +4540,7 @@ var ChildrenOutletContexts = /** @class */ (function () {
      * We need to keep the context as the outlet could be destroyed inside a NgIf and might be
      * re-created later.
      */
-    /**
-       * Called when a `RouterOutlet` directive is destroyed.
-       * We need to keep the context as the outlet could be destroyed inside a NgIf and might be
-       * re-created later.
-       */
-    ChildrenOutletContexts.prototype.onChildOutletDestroyed = /**
-       * Called when a `RouterOutlet` directive is destroyed.
-       * We need to keep the context as the outlet could be destroyed inside a NgIf and might be
-       * re-created later.
-       */
-    function (childName) {
+    ChildrenOutletContexts.prototype.onChildOutletDestroyed = function (childName) {
         var context = this.getContext(childName);
         if (context) {
             context.outlet = null;
@@ -4866,15 +4550,7 @@ var ChildrenOutletContexts = /** @class */ (function () {
      * Called when the corresponding route is deactivated during navigation.
      * Because the component get destroyed, all children outlet are destroyed.
      */
-    /**
-       * Called when the corresponding route is deactivated during navigation.
-       * Because the component get destroyed, all children outlet are destroyed.
-       */
-    ChildrenOutletContexts.prototype.onOutletDeactivated = /**
-       * Called when the corresponding route is deactivated during navigation.
-       * Because the component get destroyed, all children outlet are destroyed.
-       */
-    function () {
+    ChildrenOutletContexts.prototype.onOutletDeactivated = function () {
         var contexts = this.contexts;
         this.contexts = new Map();
         return contexts;
@@ -4989,13 +4665,7 @@ var RouterOutlet = /** @class */ (function () {
     /**
      * Called when the `RouteReuseStrategy` instructs to detach the subtree
      */
-    /**
-       * Called when the `RouteReuseStrategy` instructs to detach the subtree
-       */
-    RouterOutlet.prototype.detach = /**
-       * Called when the `RouteReuseStrategy` instructs to detach the subtree
-       */
-    function () {
+    RouterOutlet.prototype.detach = function () {
         if (!this.activated)
             throw new Error('Outlet is not activated');
         this.location.detach();
@@ -5007,13 +4677,7 @@ var RouterOutlet = /** @class */ (function () {
     /**
      * Called when the `RouteReuseStrategy` instructs to re-attach a previously detached subtree
      */
-    /**
-       * Called when the `RouteReuseStrategy` instructs to re-attach a previously detached subtree
-       */
-    RouterOutlet.prototype.attach = /**
-       * Called when the `RouteReuseStrategy` instructs to re-attach a previously detached subtree
-       */
-    function (ref, activatedRoute) {
+    RouterOutlet.prototype.attach = function (ref, activatedRoute) {
         this.activated = ref;
         this._activatedRoute = activatedRoute;
         this.location.insert(ref.hostView);
@@ -5049,15 +4713,15 @@ var RouterOutlet = /** @class */ (function () {
     ];
     /** @nocollapse */
     RouterOutlet.ctorParameters = function () { return [
-        { type: ChildrenOutletContexts, },
-        { type: core.ViewContainerRef, },
-        { type: core.ComponentFactoryResolver, },
-        { type: undefined, decorators: [{ type: core.Attribute, args: ['name',] },] },
-        { type: core.ChangeDetectorRef, },
+        { type: ChildrenOutletContexts },
+        { type: core.ViewContainerRef },
+        { type: core.ComponentFactoryResolver },
+        { type: String, decorators: [{ type: core.Attribute, args: ['name',] }] },
+        { type: core.ChangeDetectorRef }
     ]; };
     RouterOutlet.propDecorators = {
-        "activateEvents": [{ type: core.Output, args: ['activate',] },],
-        "deactivateEvents": [{ type: core.Output, args: ['deactivate',] },],
+        activateEvents: [{ type: core.Output, args: ['activate',] }],
+        deactivateEvents: [{ type: core.Output, args: ['deactivate',] }]
     };
     return RouterOutlet;
 }());
@@ -5167,14 +4831,7 @@ var RouterPreloader = /** @class */ (function () {
     // TODO(jasonaden): This class relies on code external to the class to call setUpPreloading. If
     // this hasn't been done, ngOnDestroy will fail as this.subscription will be undefined. This
     // should be refactored.
-    // TODO(jasonaden): This class relies on code external to the class to call setUpPreloading. If
-    // this hasn't been done, ngOnDestroy will fail as this.subscription will be undefined. This
-    // should be refactored.
-    RouterPreloader.prototype.ngOnDestroy = 
-    // TODO(jasonaden): This class relies on code external to the class to call setUpPreloading. If
-    // this hasn't been done, ngOnDestroy will fail as this.subscription will be undefined. This
-    // should be refactored.
-    function () { this.subscription.unsubscribe(); };
+    RouterPreloader.prototype.ngOnDestroy = function () { this.subscription.unsubscribe(); };
     RouterPreloader.prototype.processRoutes = function (ngModule, routes) {
         var res = [];
         try {
@@ -5220,11 +4877,11 @@ var RouterPreloader = /** @class */ (function () {
     ];
     /** @nocollapse */
     RouterPreloader.ctorParameters = function () { return [
-        { type: Router, },
-        { type: core.NgModuleFactoryLoader, },
-        { type: core.Compiler, },
-        { type: core.Injector, },
-        { type: PreloadingStrategy, },
+        { type: Router },
+        { type: core.NgModuleFactoryLoader },
+        { type: core.Compiler },
+        { type: core.Injector },
+        { type: PreloadingStrategy }
     ]; };
     return RouterPreloader;
 }());
@@ -5243,7 +4900,7 @@ var RouterPreloader = /** @class */ (function () {
  *
  *
  */
-var ROUTER_DIRECTIVES = [RouterOutlet, RouterLink, RouterLinkWithHref, RouterLinkActive];
+var ROUTER_DIRECTIVES = [RouterOutlet, RouterLink, RouterLinkWithHref, RouterLinkActive, EmptyOutletComponent];
 /**
  * @description
  *
@@ -5348,35 +5005,7 @@ var RouterModule = /** @class */ (function () {
      * * `onSameUrlNavigation` configures how the router handles navigation to the current URL. See
      * `ExtraOptions` for more details.
      */
-    /**
-       * Creates a module with all the router providers and directives. It also optionally sets up an
-       * application listener to perform an initial navigation.
-       *
-       * Options (see `ExtraOptions`):
-       * * `enableTracing` makes the router log all its internal events to the console.
-       * * `useHash` enables the location strategy that uses the URL fragment instead of the history
-       * API.
-       * * `initialNavigation` disables the initial navigation.
-       * * `errorHandler` provides a custom error handler.
-       * * `preloadingStrategy` configures a preloading strategy (see `PreloadAllModules`).
-       * * `onSameUrlNavigation` configures how the router handles navigation to the current URL. See
-       * `ExtraOptions` for more details.
-       */
-    RouterModule.forRoot = /**
-       * Creates a module with all the router providers and directives. It also optionally sets up an
-       * application listener to perform an initial navigation.
-       *
-       * Options (see `ExtraOptions`):
-       * * `enableTracing` makes the router log all its internal events to the console.
-       * * `useHash` enables the location strategy that uses the URL fragment instead of the history
-       * API.
-       * * `initialNavigation` disables the initial navigation.
-       * * `errorHandler` provides a custom error handler.
-       * * `preloadingStrategy` configures a preloading strategy (see `PreloadAllModules`).
-       * * `onSameUrlNavigation` configures how the router handles navigation to the current URL. See
-       * `ExtraOptions` for more details.
-       */
-    function (routes, config) {
+    RouterModule.forRoot = function (routes, config) {
         return {
             ngModule: RouterModule,
             providers: [
@@ -5408,22 +5037,20 @@ var RouterModule = /** @class */ (function () {
     /**
      * Creates a module with all the router directives and a provider registering routes.
      */
-    /**
-       * Creates a module with all the router directives and a provider registering routes.
-       */
-    RouterModule.forChild = /**
-       * Creates a module with all the router directives and a provider registering routes.
-       */
-    function (routes) {
+    RouterModule.forChild = function (routes) {
         return { ngModule: RouterModule, providers: [provideRoutes(routes)] };
     };
     RouterModule.decorators = [
-        { type: core.NgModule, args: [{ declarations: ROUTER_DIRECTIVES, exports: ROUTER_DIRECTIVES },] }
+        { type: core.NgModule, args: [{
+                    declarations: ROUTER_DIRECTIVES,
+                    exports: ROUTER_DIRECTIVES,
+                    entryComponents: [EmptyOutletComponent]
+                },] }
     ];
     /** @nocollapse */
     RouterModule.ctorParameters = function () { return [
-        { type: undefined, decorators: [{ type: core.Optional }, { type: core.Inject, args: [ROUTER_FORROOT_GUARD,] },] },
-        { type: Router, decorators: [{ type: core.Optional },] },
+        { type: undefined, decorators: [{ type: core.Optional }, { type: core.Inject, args: [ROUTER_FORROOT_GUARD,] }] },
+        { type: Router, decorators: [{ type: core.Optional }] }
     ]; };
     return RouterModule;
 }());
@@ -5514,7 +5141,7 @@ var RouterInitializer = /** @class */ (function () {
         var _this = this;
         var p = this.injector.get(common.LOCATION_INITIALIZED, Promise.resolve(null));
         return p.then(function () {
-            var resolve = (null);
+            var resolve = null;
             var res = new Promise(function (r) { return resolve = r; });
             var router = _this.injector.get(Router);
             var opts = _this.injector.get(ROUTER_CONFIGURATION);
@@ -5562,7 +5189,7 @@ var RouterInitializer = /** @class */ (function () {
         }
         preloader.setUpPreloading();
         router.resetRootComponentType(ref.componentTypes[0]);
-        this.resultOfPreactivationDone.next((null));
+        this.resultOfPreactivationDone.next(null);
         this.resultOfPreactivationDone.complete();
     };
     RouterInitializer.prototype.isLegacyEnabled = function (opts) {
@@ -5577,7 +5204,7 @@ var RouterInitializer = /** @class */ (function () {
     ];
     /** @nocollapse */
     RouterInitializer.ctorParameters = function () { return [
-        { type: core.Injector, },
+        { type: core.Injector }
     ]; };
     return RouterInitializer;
 }());
@@ -5614,7 +5241,12 @@ function provideRouterInitializer() {
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-var VERSION = new core.Version('6.0.3');
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of the common package.
+ */
+var VERSION = new core.Version('6.0.7');
 
 /**
  * @license
@@ -5639,6 +5271,11 @@ var VERSION = new core.Version('6.0.3');
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of this package.
+ */
 
 // This file only reexports content of the `src` folder. Keep it that way.
 
@@ -5649,6 +5286,10 @@ var VERSION = new core.Version('6.0.3');
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+// This file is not used to build this module. It is only used during editing
+// by the TypeScript language service and during build for verification. `ngc`
+// replaces this file with production index.ts when it rewrites private symbol
+// names.
 
 /**
  * Generated bundle index. Do not edit.
@@ -5712,6 +5353,7 @@ exports.UrlSegmentGroup = UrlSegmentGroup;
 exports.UrlSerializer = UrlSerializer;
 exports.UrlTree = UrlTree;
 exports.VERSION = VERSION;
+exports.ɵEmptyOutletComponent = EmptyOutletComponent;
 exports.ɵROUTER_PROVIDERS = ROUTER_PROVIDERS;
 exports.ɵflatten = flatten;