@angular/platform-server 18.0.0-next.4 → 18.0.0-next.6

package/fesm2022/platform-server.mjs

@@ -1,12 +1,12 @@
 /**
- * @license Angular v18.0.0-next.4
+ * @license Angular v18.0.0-next.6
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */
 
 import { ɵsetRootDomAdapter, DOCUMENT, PlatformLocation, XhrFactory, ɵgetDOM, ɵPLATFORM_SERVER_ID, ViewportScroller, ɵNullViewportScroller } from '@angular/common';
 import * as i0 from '@angular/core';
-import { Injectable, Inject, inject, InjectionToken, Optional, APP_ID, TransferState, Injector, PLATFORM_ID, PLATFORM_INITIALIZER, ɵALLOW_MULTIPLE_PLATFORMS, Testability, ɵTESTABILITY, NgModule, ɵsetDocument, createPlatformFactory, platformCore, makeEnvironmentProviders, ɵSSR_CONTENT_INTEGRITY_MARKER, Renderer2, ɵwhenStable, ɵIS_HYDRATION_DOM_REUSE_ENABLED, ɵannotateForHydration, ApplicationRef, Version } from '@angular/core';
+import { Injectable, Inject, inject, InjectionToken, Optional, APP_ID, TransferState, Injector, PLATFORM_ID, PLATFORM_INITIALIZER, ɵALLOW_MULTIPLE_PLATFORMS, Testability, ɵTESTABILITY, NgModule, ɵsetDocument, createPlatformFactory, platformCore, makeEnvironmentProviders, ɵSSR_CONTENT_INTEGRITY_MARKER, Renderer2, ɵwhenStable, ɵIS_HYDRATION_DOM_REUSE_ENABLED, ɵannotateForHydration, CSP_NONCE, ApplicationRef, Version } from '@angular/core';
 import { ɵBrowserDomAdapter, EventManagerPlugin, EVENT_MANAGER_PLUGINS, BrowserModule } from '@angular/platform-browser';
 import { NoopAnimationsModule, provideNoopAnimations } from '@angular/platform-browser/animations';
 import { ɵHTTP_ROOT_INTERCEPTOR_FNS, HttpClientModule } from '@angular/common/http';
@@ -5032,7 +5032,7 @@ var require_CSSStyleDeclaration = __commonJS({
             delete styles.priority[property];
           }
         } else {
-          if (value.indexOf(";") !== -1)
+          if (value.includes(";") && !value.includes("data:"))
             return;
           var newprops = parseStyles(property + ":" + value);
           if (Object.getOwnPropertyNames(newprops.property).length === 0) {
@@ -16216,10 +16216,10 @@ class PlatformState {
     getDocument() {
         return this._doc;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.0-next.4", ngImport: i0, type: PlatformState, deps: [{ token: DOCUMENT }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.0.0-next.4", ngImport: i0, type: PlatformState }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.0-next.6", ngImport: i0, type: PlatformState, deps: [{ token: DOCUMENT }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.0.0-next.6", ngImport: i0, type: PlatformState }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.0-next.4", ngImport: i0, type: PlatformState, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.0-next.6", ngImport: i0, type: PlatformState, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
@@ -16244,10 +16244,10 @@ class ServerXhr {
         }
         return new impl.XMLHttpRequest();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.0-next.4", ngImport: i0, type: ServerXhr, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.0.0-next.4", ngImport: i0, type: ServerXhr }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.0-next.6", ngImport: i0, type: ServerXhr, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.0.0-next.6", ngImport: i0, type: ServerXhr }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.0-next.4", ngImport: i0, type: ServerXhr, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.0-next.6", ngImport: i0, type: ServerXhr, decorators: [{
             type: Injectable
         }] });
 function relativeUrlsTransformerInterceptorFn(request, next) {
@@ -16352,7 +16352,12 @@ class ServerPlatformLocation {
         }
         this.hash = value;
         const newUrl = this.url;
-        queueMicrotask(() => this._hashUpdate.next({ type: 'hashchange', state: null, oldUrl, newUrl }));
+        queueMicrotask(() => this._hashUpdate.next({
+            type: 'hashchange',
+            state: null,
+            oldUrl,
+            newUrl,
+        }));
     }
     replaceState(state, title, newUrl) {
         const oldUrl = this.url;
@@ -16374,10 +16379,10 @@ class ServerPlatformLocation {
     getState() {
         return undefined;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.0-next.4", ngImport: i0, type: ServerPlatformLocation, deps: [{ token: DOCUMENT }, { token: INITIAL_CONFIG, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.0.0-next.4", ngImport: i0, type: ServerPlatformLocation }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.0-next.6", ngImport: i0, type: ServerPlatformLocation, deps: [{ token: DOCUMENT }, { token: INITIAL_CONFIG, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.0.0-next.6", ngImport: i0, type: ServerPlatformLocation }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.0-next.4", ngImport: i0, type: ServerPlatformLocation, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.0-next.6", ngImport: i0, type: ServerPlatformLocation, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
@@ -16401,10 +16406,10 @@ class ServerEventManagerPlugin extends EventManagerPlugin {
     addEventListener(element, eventName, handler) {
         return ɵgetDOM().onAndCancel(element, eventName, handler);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.0-next.4", ngImport: i0, type: ServerEventManagerPlugin, deps: [{ token: DOCUMENT }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.0.0-next.4", ngImport: i0, type: ServerEventManagerPlugin }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.0-next.6", ngImport: i0, type: ServerEventManagerPlugin, deps: [{ token: DOCUMENT }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.0.0-next.6", ngImport: i0, type: ServerEventManagerPlugin }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.0-next.4", ngImport: i0, type: ServerEventManagerPlugin, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.0-next.6", ngImport: i0, type: ServerEventManagerPlugin, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
@@ -16419,6 +16424,15 @@ const TRANSFER_STATE_SERIALIZATION_PROVIDERS = [
         multi: true,
     },
 ];
+/** TODO: Move this to a utils folder and convert to use SafeValues. */
+function createScript(doc, textContent, nonce) {
+    const script = doc.createElement('script');
+    script.textContent = textContent;
+    if (nonce) {
+        script.setAttribute('nonce', nonce);
+    }
+    return script;
+}
 function serializeTransferStateFactory(doc, appId, transferStore) {
     return () => {
         // The `.toJSON` here causes the `onSerialize` callbacks to be called.
@@ -16429,10 +16443,14 @@ function serializeTransferStateFactory(doc, appId, transferStore) {
             // avoid creating an extra `<script>` tag in this case.
             return;
         }
-        const script = doc.createElement('script');
+        const script = createScript(doc, content, 
+        /**
+         * `nonce` is not required for 'application/json'
+         * See: https://html.spec.whatwg.org/multipage/scripting.html#attr-script-type
+         */
+        null);
         script.id = appId + '-state';
         script.setAttribute('type', 'application/json');
-        script.textContent = content;
         // It is intentional that we add the script at the very bottom. Angular CLI script tags for
         // bundles are always `type="module"`. These are deferred by default and cause the transfer
         // transfer data to be queried only after the browser has finished parsing the DOM.
@@ -16443,14 +16461,15 @@ function serializeTransferStateFactory(doc, appId, transferStore) {
 const INTERNAL_SERVER_PLATFORM_PROVIDERS = [
     { provide: DOCUMENT, useFactory: _document, deps: [Injector] },
     { provide: PLATFORM_ID, useValue: ɵPLATFORM_SERVER_ID },
-    { provide: PLATFORM_INITIALIZER, useFactory: initDominoAdapter, multi: true }, {
+    { provide: PLATFORM_INITIALIZER, useFactory: initDominoAdapter, multi: true },
+    {
         provide: PlatformLocation,
         useClass: ServerPlatformLocation,
-        deps: [DOCUMENT, [Optional, INITIAL_CONFIG]]
+        deps: [DOCUMENT, [Optional, INITIAL_CONFIG]],
     },
     { provide: PlatformState, deps: [DOCUMENT] },
     // Add special provider that allows multiple instances of platformServer* to be created.
-    { provide: ɵALLOW_MULTIPLE_PLATFORMS, useValue: true }
+    { provide: ɵALLOW_MULTIPLE_PLATFORMS, useValue: true },
 ];
 function initDominoAdapter() {
     return () => {
@@ -16474,11 +16493,11 @@ const PLATFORM_SERVER_PROVIDERS = [
  * @publicApi
  */
 class ServerModule {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.0-next.4", ngImport: i0, type: ServerModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "18.0.0-next.4", ngImport: i0, type: ServerModule, imports: [HttpClientModule, NoopAnimationsModule], exports: [BrowserModule] }); }
-    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "18.0.0-next.4", ngImport: i0, type: ServerModule, providers: PLATFORM_SERVER_PROVIDERS, imports: [HttpClientModule, NoopAnimationsModule, BrowserModule] }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.0-next.6", ngImport: i0, type: ServerModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "18.0.0-next.6", ngImport: i0, type: ServerModule, imports: [HttpClientModule, NoopAnimationsModule], exports: [BrowserModule] }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "18.0.0-next.6", ngImport: i0, type: ServerModule, providers: PLATFORM_SERVER_PROVIDERS, imports: [HttpClientModule, NoopAnimationsModule, BrowserModule] }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.0-next.4", ngImport: i0, type: ServerModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.0-next.6", ngImport: i0, type: ServerModule, decorators: [{
             type: NgModule,
             args: [{
                     exports: [BrowserModule],
@@ -16490,8 +16509,10 @@ function _document(injector) {
     const config = injector.get(INITIAL_CONFIG, null);
     let document;
     if (config && config.document) {
-        document = typeof config.document === 'string' ? parseDocument(config.document, config.url) :
-            config.document;
+        document =
+            typeof config.document === 'string'
+                ? parseDocument(config.document, config.url)
+                : config.document;
     }
     else {
         document = ɵgetDOM().createHtmlDocument();
@@ -16521,12 +16542,18 @@ const platformServer = createPlatformFactory(platformCore, 'server', INTERNAL_SE
  * @returns A set of providers to setup the server.
  */
 function provideServerRendering() {
-    return makeEnvironmentProviders([
-        provideNoopAnimations(),
-        ...PLATFORM_SERVER_PROVIDERS,
-    ]);
+    return makeEnvironmentProviders([provideNoopAnimations(), ...PLATFORM_SERVER_PROVIDERS]);
 }
 
+/**
+ * Event dispatch (JSAction) script is inlined into the HTML by the build
+ * process to avoid extra blocking request on a page. The script looks like this:
+ * ```
+ * <script type="text/javascript" id="ng-event-dispatch-contract">...</script>
+ * ```
+ * This const represents the "id" attribute value.
+ */
+const EVENT_DISPATCH_SCRIPT_ID = 'ng-event-dispatch-contract';
 /**
  * Creates an instance of a server platform (with or without JIT compiler support
  * depending on the `ngJitMode` global const value), using provided options.
@@ -16535,9 +16562,23 @@ function createServerPlatform(options) {
     const extraProviders = options.platformProviders ?? [];
     return platformServer([
         { provide: INITIAL_CONFIG, useValue: { document: options.document, url: options.url } },
-        extraProviders
+        extraProviders,
     ]);
 }
+/**
+ * Finds and returns inlined event dispatch script if it exists.
+ * See the `EVENT_DISPATCH_SCRIPT_ID` const docs for additional info.
+ */
+function findEventDispatchScript(doc) {
+    return doc.getElementById(EVENT_DISPATCH_SCRIPT_ID);
+}
+/**
+ * Removes inlined event dispatch script if it exists.
+ * See the `EVENT_DISPATCH_SCRIPT_ID` const docs for additional info.
+ */
+function removeEventDispatchScript(doc) {
+    findEventDispatchScript(doc)?.remove();
+}
 /**
  * Creates a marker comment node and append it into the `<body>`.
  * Some CDNs have mechanisms to remove all comment node from HTML.
@@ -16545,10 +16586,11 @@ function createServerPlatform(options) {
  * marker comment is still available or else throw an error
  */
 function appendSsrContentIntegrityMarker(doc) {
-    // Adding a ng hydration marken comment
+    // Adding a ng hydration marker comment
     const comment = doc.createComment(ɵSSR_CONTENT_INTEGRITY_MARKER);
-    doc.body.firstChild ? doc.body.insertBefore(comment, doc.body.firstChild) :
-        doc.body.append(comment);
+    doc.body.firstChild
+        ? doc.body.insertBefore(comment, doc.body.firstChild)
+        : doc.body.append(comment);
 }
 /**
  * Adds the `ng-server-context` attribute to host elements of all bootstrapped components
@@ -16557,7 +16599,7 @@ function appendSsrContentIntegrityMarker(doc) {
 function appendServerContextInfo(applicationRef) {
     const injector = applicationRef.injector;
     let serverContext = sanitizeServerContext(injector.get(SERVER_CONTEXT, DEFAULT_SERVER_CONTEXT));
-    applicationRef.components.forEach(componentRef => {
+    applicationRef.components.forEach((componentRef) => {
         const renderer = componentRef.injector.get(Renderer2);
         const element = componentRef.location.nativeElement;
         if (element) {
@@ -16565,15 +16607,35 @@ function appendServerContextInfo(applicationRef) {
         }
     });
 }
+function insertEventRecordScript(appId, doc, eventTypesToBeReplayed, nonce) {
+    const eventDispatchScript = findEventDispatchScript(doc);
+    if (eventDispatchScript) {
+        const events = Array.from(eventTypesToBeReplayed);
+        // This is defined in packages/core/primitives/event-dispatch/contract_binary.ts
+        const replayScriptContents = `window.__jsaction_bootstrap('ngContracts', document.body, ${JSON.stringify(appId)}, ${JSON.stringify(events)});`;
+        const replayScript = createScript(doc, replayScriptContents, nonce);
+        // Insert replay script right after inlined event dispatch script, since it
+        // relies on `__jsaction_bootstrap` to be defined in the global scope.
+        eventDispatchScript.after(replayScript);
+    }
+}
 async function _render(platformRef, applicationRef) {
     const environmentInjector = applicationRef.injector;
     // Block until application is stable.
     await ɵwhenStable(applicationRef);
     const platformState = platformRef.injector.get(PlatformState);
-    if (applicationRef.injector.get(ɵIS_HYDRATION_DOM_REUSE_ENABLED, false)) {
+    if (environmentInjector.get(ɵIS_HYDRATION_DOM_REUSE_ENABLED, false)) {
         const doc = platformState.getDocument();
         appendSsrContentIntegrityMarker(doc);
-        ɵannotateForHydration(applicationRef, doc);
+        const eventTypesToBeReplayed = ɵannotateForHydration(applicationRef, doc);
+        if (eventTypesToBeReplayed) {
+            insertEventRecordScript(environmentInjector.get(APP_ID), doc, eventTypesToBeReplayed, environmentInjector.get(CSP_NONCE, null));
+        }
+        else {
+            // No events to replay, we should remove inlined event dispatch script
+            // (which was injected by the build process) from the HTML.
+            removeEventDispatchScript(doc);
+        }
     }
     // Run any BEFORE_APP_SERIALIZED callbacks just before rendering to string.
     const callbacks = environmentInjector.get(BEFORE_APP_SERIALIZED, null);
@@ -16683,7 +16745,7 @@ async function renderApplication(bootstrap, options) {
 /**
  * @publicApi
  */
-const VERSION = new Version('18.0.0-next.4');
+const VERSION = new Version('18.0.0-next.6');
 
 /// <reference types="node" />
 // This file only reexports content of the `src` folder. Keep it that way.