@angular/core 17.3.5 → 17.3.6

package/fesm2022/core.mjs

@@ -1,5 +1,5 @@
 /**
- * @license Angular v17.3.5
+ * @license Angular v17.3.6
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -16022,7 +16022,7 @@ function createRootComponent(componentView, rootComponentDef, rootDirectives, ho
 function setRootNodeAttributes(hostRenderer, componentDef, hostRNode, rootSelectorOrNode) {
     if (rootSelectorOrNode) {
         // The placeholder will be replaced with the actual version at build time.
-        setUpAttributes(hostRenderer, hostRNode, ['ng-version', '17.3.5']);
+        setUpAttributes(hostRenderer, hostRNode, ['ng-version', '17.3.6']);
     }
     else {
         // If host element is created as a part of this function call (i.e. `rootSelectorOrNode`
@@ -19667,8 +19667,10 @@ function renderDeferBlockState(newState, tNode, lContainer, skipTimerScheduling
     const currentState = lDetails[DEFER_BLOCK_STATE];
     if (isValidStateChange(currentState, newState) &&
         isValidStateChange(lDetails[NEXT_DEFER_BLOCK_STATE] ?? -1, newState)) {
+        const injector = hostLView[INJECTOR];
         const tDetails = getTDeferBlockDetails(hostTView, tNode);
-        const needsScheduling = !skipTimerScheduling &&
+        // Skips scheduling on the server since it can delay the server response.
+        const needsScheduling = !skipTimerScheduling && isPlatformBrowser(injector) &&
             (getLoadingBlockAfter(tDetails) !== null ||
                 getMinimumDurationForState(tDetails, DeferBlockState.Loading) !== null ||
                 getMinimumDurationForState(tDetails, DeferBlockState.Placeholder));
@@ -19690,7 +19692,20 @@ function renderDeferBlockState(newState, tNode, lContainer, skipTimerScheduling
  */
 function isRouterOutletInjector(currentInjector) {
     return (currentInjector instanceof ChainedInjector) &&
-        (currentInjector.injector.__ngOutletInjector);
+        (typeof currentInjector.injector.__ngOutletInjector === 'function');
+}
+/**
+ * Creates an instance of the `OutletInjector` using a private factory
+ * function available on the `OutletInjector` class.
+ *
+ * @param parentOutletInjector Parent OutletInjector, which should be used
+ *                             to produce a new instance.
+ * @param parentInjector An Injector, which should be used as a parent one
+ *                       for a newly created `OutletInjector` instance.
+ */
+function createRouterOutletInjector(parentOutletInjector, parentInjector) {
+    const outletInjector = parentOutletInjector.injector;
+    return outletInjector.__ngOutletInjector(parentInjector);
 }
 /**
  * Applies changes to the DOM to reflect a given state.
@@ -19723,11 +19738,18 @@ function applyDeferBlockState(newState, lDetails, lContainer, tNode, hostLView)
                 // we can't inject it. Once the `OutletInjector` is replaced
                 // with the `EnvironmentInjector` in Router's code, this special
                 // handling can be removed.
-                const parentEnvInjector = isRouterOutletInjector(parentInjector) ?
-                    parentInjector :
-                    parentInjector.get(EnvironmentInjector);
+                const isParentOutletInjector = isRouterOutletInjector(parentInjector);
+                const parentEnvInjector = isParentOutletInjector ? parentInjector : parentInjector.get(EnvironmentInjector);
                 injector = parentEnvInjector.get(CachedInjectorService)
                     .getOrCreateInjector(tDetails, parentEnvInjector, providers, ngDevMode ? 'DeferBlock Injector' : '');
+                // Note: this is a continuation of the special case for Router's `OutletInjector`.
+                // Since the `OutletInjector` handles `ActivatedRoute` and `ChildrenOutletContexts`
+                // dynamically (i.e. their values are not really stored statically in an injector),
+                // we need to "wrap" a defer injector into another `OutletInjector`, so we retain
+                // the dynamic resolution of the mentioned tokens.
+                if (isParentOutletInjector) {
+                    injector = createRouterOutletInjector(parentInjector, injector);
+                }
             }
         }
         const dehydratedView = findMatchingDehydratedView(lContainer, activeBlockTNode.tView.ssrId);
@@ -19831,7 +19853,7 @@ function triggerResourceLoading(tDetails, lView, tNode) {
         // If the loading status is different from initial one, it means that
         // the loading of dependencies is in progress and there is nothing to do
         // in this function. All details can be obtained from the `tDetails` object.
-        return;
+        return tDetails.loadingPromise ?? Promise.resolve();
     }
     const lDetails = getLDeferBlockDetails(lView, tNode);
     const primaryBlockTNode = getPrimaryBlockTNode(tView, tDetails);
@@ -19859,7 +19881,7 @@ function triggerResourceLoading(tDetails, lView, tNode) {
             tDetails.loadingState = DeferDependenciesLoadingState.COMPLETE;
             pendingTasks.remove(taskId);
         });
-        return;
+        return tDetails.loadingPromise;
     }
     // Start downloading of defer block dependencies.
     tDetails.loadingPromise = Promise.allSettled(dependenciesFn()).then(results => {
@@ -19919,6 +19941,7 @@ function triggerResourceLoading(tDetails, lView, tNode) {
             }
         }
     });
+    return tDetails.loadingPromise;
 }
 /** Utility function to render placeholder content (if present) */
 function renderPlaceholder(lView, tNode) {
@@ -29830,7 +29853,7 @@ class Version {
 /**
  * @publicApi
  */
-const VERSION = new Version('17.3.5');
+const VERSION = new Version('17.3.6');
 
 class Console {
     log(message) {