@analogjs/platform 2.8.0-beta.10 → 2.8.0-beta.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@analogjs/platform",
-  "version": "2.8.0-beta.10",
+  "version": "2.8.0-beta.12",
   "description": "The fullstack meta-framework for Angular",
   "type": "module",
   "author": "Brandon Roberts <robertsbt@gmail.com>",
@@ -29,8 +29,8 @@
   },
   "dependencies": {
     "nitropack": "^2.13.1",
-    "@analogjs/vite-plugin-angular": "^2.8.0-beta.10",
-    "@analogjs/vite-plugin-nitro": "^2.8.0-beta.10",
+    "@analogjs/vite-plugin-angular": "^2.8.0-beta.12",
+    "@analogjs/vite-plugin-nitro": "^2.8.0-beta.12",
     "oxc-parser": "^0.121.0",
     "vitefu": "^1.1.2"
   },

package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.d.ts

@@ -1,10 +1,10 @@
 export declare const V18_X_NX_DEVKIT = "^20.0.0";
 export declare const V18_X_NX_ANGULAR = "^20.0.0";
-export declare const V18_X_ANALOG_JS_CONTENT = "^2.8.0-beta.10";
-export declare const V18_X_ANALOG_JS_ROUTER = "^2.8.0-beta.10";
+export declare const V18_X_ANALOG_JS_CONTENT = "^2.8.0-beta.12";
+export declare const V18_X_ANALOG_JS_ROUTER = "^2.8.0-beta.12";
 export declare const V18_X_ANALOG_JS_TRPC = "~0.4.0";
-export declare const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.8.0-beta.10";
-export declare const V18_X_ANALOG_JS_VITEST_ANGULAR = "^2.8.0-beta.10";
+export declare const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.8.0-beta.12";
+export declare const V18_X_ANALOG_JS_VITEST_ANGULAR = "^2.8.0-beta.12";
 export declare const V18_X_TRPC_CLIENT = "^10.25.0";
 export declare const V18_X_TRPC_SERVER = "^10.25.0";
 export declare const V18_X_ISOMORPHIC_FETCH = "^3.0.0";
@@ -20,7 +20,7 @@ export declare const V18_X_TAILWINDCSS = "^4.1.4";
 export declare const V18_X_TAILWINDCSS_VITE = "^4.1.4";
 export declare const V18_X_POSTCSS = "^8.5.3";
 export declare const V18_X_AUTOPREFIXER = "^10.4.0";
-export declare const V18_X_ANALOG_JS_PLATFORM = "^2.8.0-beta.10";
+export declare const V18_X_ANALOG_JS_PLATFORM = "^2.8.0-beta.12";
 export declare const V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR = "^19.0.0";
 export declare const V18_X_NX_VITE = "^21.0.0";
 export declare const V18_X_NX_LINTER = "^21.0.0";

package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.js

@@ -5,11 +5,11 @@ exports.V18_X_ZOD = exports.V18_X_VITEST = exports.V18_X_VITE_TSCONFIG_PATHS = e
 // dependencies
 exports.V18_X_NX_DEVKIT = '^20.0.0';
 exports.V18_X_NX_ANGULAR = '^20.0.0';
-exports.V18_X_ANALOG_JS_CONTENT = '^2.8.0-beta.10';
-exports.V18_X_ANALOG_JS_ROUTER = '^2.8.0-beta.10';
+exports.V18_X_ANALOG_JS_CONTENT = '^2.8.0-beta.12';
+exports.V18_X_ANALOG_JS_ROUTER = '^2.8.0-beta.12';
 exports.V18_X_ANALOG_JS_TRPC = '~0.4.0';
-exports.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.8.0-beta.10';
-exports.V18_X_ANALOG_JS_VITEST_ANGULAR = '^2.8.0-beta.10';
+exports.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.8.0-beta.12';
+exports.V18_X_ANALOG_JS_VITEST_ANGULAR = '^2.8.0-beta.12';
 exports.V18_X_TRPC_CLIENT = '^10.25.0';
 exports.V18_X_TRPC_SERVER = '^10.25.0';
 exports.V18_X_ISOMORPHIC_FETCH = '^3.0.0';
@@ -26,7 +26,7 @@ exports.V18_X_TAILWINDCSS_VITE = '^4.1.4';
 exports.V18_X_POSTCSS = '^8.5.3';
 exports.V18_X_AUTOPREFIXER = '^10.4.0';
 // devDependencies
-exports.V18_X_ANALOG_JS_PLATFORM = '^2.8.0-beta.10';
+exports.V18_X_ANALOG_JS_PLATFORM = '^2.8.0-beta.12';
 exports.V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR = '^19.0.0';
 exports.V18_X_NX_VITE = '^21.0.0';
 exports.V18_X_NX_LINTER = '^21.0.0';

package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.d.ts

@@ -1,13 +1,13 @@
-export declare const V19_X_ANALOG_JS_ROUTER = "^2.8.0-beta.10";
-export declare const V19_X_ANALOG_JS_CONTENT = "^2.8.0-beta.10";
+export declare const V19_X_ANALOG_JS_ROUTER = "^2.8.0-beta.12";
+export declare const V19_X_ANALOG_JS_CONTENT = "^2.8.0-beta.12";
 export declare const V19_X_MARKED = "^15.0.7";
 export declare const V19_X_MARKED_GFM_HEADING_ID = "^4.1.1";
 export declare const V19_X_MARKED_HIGHLIGHT = "^2.2.1";
 export declare const V19_X_MARKED_MANGLE = "^1.1.10";
 export declare const V19_X_PRISMJS = "^1.29.0";
-export declare const V19_X_ANALOG_JS_PLATFORM = "^2.8.0-beta.10";
-export declare const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.8.0-beta.10";
-export declare const V19_X_ANALOG_JS_VITEST_ANGULAR = "^2.8.0-beta.10";
+export declare const V19_X_ANALOG_JS_PLATFORM = "^2.8.0-beta.12";
+export declare const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.8.0-beta.12";
+export declare const V19_X_ANALOG_JS_VITEST_ANGULAR = "^2.8.0-beta.12";
 export declare const V19_X_NX_ANGULAR = "^22.0.0";
 export declare const V19_X_NX_VITE = "^22.0.0";
 export declare const V19_X_JSDOM = "^22.0.0";

package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.js

@@ -2,17 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NX_X_LATEST_NX = exports.NX_X_LATEST_VITEST = exports.NX_X_LATEST_VITE = exports.V19_X_VITE = exports.V19_X_VITEST = exports.V19_X_VITE_TSCONFIG_PATHS = exports.V19_X_JSDOM = exports.V19_X_NX_VITE = exports.V19_X_NX_ANGULAR = exports.V19_X_ANALOG_JS_VITEST_ANGULAR = exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = exports.V19_X_ANALOG_JS_PLATFORM = exports.V19_X_PRISMJS = exports.V19_X_MARKED_MANGLE = exports.V19_X_MARKED_HIGHLIGHT = exports.V19_X_MARKED_GFM_HEADING_ID = exports.V19_X_MARKED = exports.V19_X_ANALOG_JS_CONTENT = exports.V19_X_ANALOG_JS_ROUTER = void 0;
 // V19_X
-exports.V19_X_ANALOG_JS_ROUTER = '^2.8.0-beta.10';
-exports.V19_X_ANALOG_JS_CONTENT = '^2.8.0-beta.10';
+exports.V19_X_ANALOG_JS_ROUTER = '^2.8.0-beta.12';
+exports.V19_X_ANALOG_JS_CONTENT = '^2.8.0-beta.12';
 exports.V19_X_MARKED = '^15.0.7';
 exports.V19_X_MARKED_GFM_HEADING_ID = '^4.1.1';
 exports.V19_X_MARKED_HIGHLIGHT = '^2.2.1';
 exports.V19_X_MARKED_MANGLE = '^1.1.10';
 exports.V19_X_PRISMJS = '^1.29.0';
 // devDependencies
-exports.V19_X_ANALOG_JS_PLATFORM = '^2.8.0-beta.10';
-exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.8.0-beta.10';
-exports.V19_X_ANALOG_JS_VITEST_ANGULAR = '^2.8.0-beta.10';
+exports.V19_X_ANALOG_JS_PLATFORM = '^2.8.0-beta.12';
+exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.8.0-beta.12';
+exports.V19_X_ANALOG_JS_VITEST_ANGULAR = '^2.8.0-beta.12';
 exports.V19_X_NX_ANGULAR = '^22.0.0';
 exports.V19_X_NX_VITE = '^22.0.0';
 exports.V19_X_JSDOM = '^22.0.0';

package/src/lib/ssr/defer-streaming-plugin.d.ts

@@ -1,13 +1,5 @@
 import type { Plugin } from 'vite';
-/**
- * Minimum Angular major whose compiled `@angular/core` FESM matches the
- * streaming patch anchors. Incremental hydration is a stable public API from
- * v20 (`withIncrementalHydration`, `@publicApi 20.0`), but v20's FESM inlines
- * the injection anchor's `DeferBlockStateEnd` profiler event to its numeric
- * ordinal, whereas v21+ keeps the symbolic `ProfilerEvent.DeferBlockStateEnd`
- * form the anchor matches on. Keying on the literal ordinal would be fragile
- * (enum values shift between versions), so v21 is the floor.
- */
+/** Minimum Angular major qualified for streaming; the actual runtime shape is checked below. */
 export declare const MIN_STREAMING_ANGULAR_MAJOR = 21;
 /**
  * Whether the streaming SSR patch can be applied to the installed Angular.
@@ -16,33 +8,9 @@ export declare const MIN_STREAMING_ANGULAR_MAJOR = 21;
  * build time and falls back to buffered rendering.
  */
 export declare function streamingSupportedOnAngular(major: number | null): boolean;
-/**
- * Pure transform that injects the streaming-SSR per-block resolution hook into
- * `@angular/core`'s compiled output. It is the same class of transform as
- * `i18nDefRegistryPlugin` in ./ssr-build-plugin — a string patch of Angular's
- * bundle applied only to SSR builds. Exported separately so it can be unit
- * tested against a bundle string.
- *
- * Two edits, both keyed on single-occurrence anchors in the module that holds
- * the defer runtime:
- *   1. Inside `applyDeferBlockState`, fire `globalThis.__analogSsrDeferCapture`
- *      when a `@defer` block reaches `Complete` on the server, passing the
- *      block's live `lContainer` — this is the per-block resolution signal a
- *      streaming renderer consumes.
- *   2. Expose `collectNativeNodesInLContainer` via `globalThis.__analogSsrInternals`
- *      so the renderer can serialize a block's subtree.
- *
- * Returns `null` when the module is not the one carrying the defer runtime, so
- * it is a no-op on every other Angular module.
- */
+/** Inject capture before the named defer function's final profiler call, preserving its original source. */
 export declare function injectDeferStreamingHook(code: string): string | null;
-/**
- * Classify an `@angular/core` module for the streaming patch. The patch anchors
- * on internal symbol names, so when Angular changes those the transform would
- * otherwise become a silent no-op and streaming would degrade to buffered with
- * no signal. This distinguishes "not the target module" (skip quietly) from
- * "this IS the `@defer` runtime module but the anchors drifted" (worth warning).
- */
+/** Inspect the named function's final profiler call without depending on enum ordinals. */
 export declare function inspectAngularCoreModule(code: string): {
     kind: 'not-target';
 } | {

package/src/lib/ssr/defer-streaming-plugin.js

@@ -1,12 +1,5 @@
-/**
- * Minimum Angular major whose compiled `@angular/core` FESM matches the
- * streaming patch anchors. Incremental hydration is a stable public API from
- * v20 (`withIncrementalHydration`, `@publicApi 20.0`), but v20's FESM inlines
- * the injection anchor's `DeferBlockStateEnd` profiler event to its numeric
- * ordinal, whereas v21+ keeps the symbolic `ProfilerEvent.DeferBlockStateEnd`
- * form the anchor matches on. Keying on the literal ordinal would be fragile
- * (enum values shift between versions), so v21 is the floor.
- */
+import { parseSync } from 'oxc-parser';
+/** Minimum Angular major qualified for streaming; the actual runtime shape is checked below. */
 export const MIN_STREAMING_ANGULAR_MAJOR = 21;
 /**
  * Whether the streaming SSR patch can be applied to the installed Angular.
@@ -17,66 +10,80 @@ export const MIN_STREAMING_ANGULAR_MAJOR = 21;
 export function streamingSupportedOnAngular(major) {
     return major === null || major >= MIN_STREAMING_ANGULAR_MAJOR;
 }
-/**
- * Pure transform that injects the streaming-SSR per-block resolution hook into
- * `@angular/core`'s compiled output. It is the same class of transform as
- * `i18nDefRegistryPlugin` in ./ssr-build-plugin — a string patch of Angular's
- * bundle applied only to SSR builds. Exported separately so it can be unit
- * tested against a bundle string.
- *
- * Two edits, both keyed on single-occurrence anchors in the module that holds
- * the defer runtime:
- *   1. Inside `applyDeferBlockState`, fire `globalThis.__analogSsrDeferCapture`
- *      when a `@defer` block reaches `Complete` on the server, passing the
- *      block's live `lContainer` — this is the per-block resolution signal a
- *      streaming renderer consumes.
- *   2. Expose `collectNativeNodesInLContainer` via `globalThis.__analogSsrInternals`
- *      so the renderer can serialize a block's subtree.
- *
- * Returns `null` when the module is not the one carrying the defer runtime, so
- * it is a no-op on every other Angular module.
- */
-export function injectDeferStreamingHook(code) {
-    const END_ANCHOR = 'profiler(ProfilerEvent.DeferBlockStateEnd);';
-    if (!code.includes('function applyDeferBlockState(') ||
-        !code.includes(END_ANCHOR)) {
-        return null;
-    }
-    // Wrap the entire guard — not just the call — so a drifted Angular runtime
-    // that still matches the anchors but renamed these locals fails as a silent
-    // no-op instead of throwing a ReferenceError inside applyDeferBlockState.
+function analyzeDeferRuntime(code) {
+    if (!code.includes('function applyDeferBlockState('))
+        return { kind: 'not-target' };
+    const parsed = parseSync('angular-core.mjs', code);
+    if (parsed.errors.length)
+        return { kind: 'drifted', reason: 'invalid Angular core JavaScript' };
+    const fn = parsed.program.body.find((node) => node.type === 'FunctionDeclaration' &&
+        node.id?.name === 'applyDeferBlockState');
+    if (!fn || fn.type !== 'FunctionDeclaration' || !fn.body)
+        return { kind: 'not-target' };
+    const names = fn.params
+        .map((param) => (param.type === 'Identifier' ? param.name : ''))
+        .join(',');
+    if (names !== 'newState,lDetails,lContainer,tNode,hostLView')
+        return {
+            kind: 'drifted',
+            reason: 'changed applyDeferBlockState parameters',
+        };
+    const collector = parsed.program.body.some((node) => node.type === 'FunctionDeclaration' &&
+        node.id?.name === 'collectNativeNodesInLContainer');
+    if (!collector)
+        return {
+            kind: 'drifted',
+            reason: 'missing collectNativeNodesInLContainer',
+        };
+    const offset = profilerEndOffset(fn.body.body[fn.body.body.length - 1]);
+    return offset === undefined
+        ? { kind: 'drifted', reason: 'missing DeferBlockStateEnd profiler anchor' }
+        : { kind: 'patchable', offset };
+}
+function profilerEndOffset(statement) {
+    if (statement?.type !== 'ExpressionStatement' ||
+        statement.expression.type !== 'CallExpression')
+        return;
+    const call = statement.expression;
+    if (call.callee.type !== 'Identifier' ||
+        call.callee.name !== 'profiler' ||
+        call.arguments.length !== 1)
+        return;
+    return isEndEvent(call.arguments[0]) ? statement.start : undefined;
+}
+function isEndEvent(event) {
+    if (event?.type === 'Literal')
+        return typeof event.value === 'number';
+    return (event?.type === 'MemberExpression' &&
+        !event.computed &&
+        event.object.type === 'Identifier' &&
+        event.object.name === 'ProfilerEvent' &&
+        event.property.type === 'Identifier' &&
+        event.property.name === 'DeferBlockStateEnd');
+}
+function patchDeferRuntime(code, offset) {
+    if (code.includes('globalThis.__analogSsrDeferCapture({'))
+        return code;
     const capture = `try { if (newState === DeferBlockState.Complete && ` +
         `typeof ngServerMode !== 'undefined' && ngServerMode && ` +
         `typeof globalThis.__analogSsrDeferCapture === 'function') { ` +
         `globalThis.__analogSsrDeferCapture({ ssrUniqueId: lDetails[SSR_UNIQUE_ID], lContainer, hostLView }); } } catch (e) {}\n  `;
-    let out = code.replace(END_ANCHOR, capture + END_ANCHOR);
-    if (code.includes('function collectNativeNodesInLContainer(')) {
-        out +=
-            '\nglobalThis.__analogSsrInternals = Object.assign(globalThis.__analogSsrInternals || {}, { collectNativeNodesInLContainer });\n';
-    }
-    return out;
+    return (code.slice(0, offset) +
+        capture +
+        code.slice(offset) +
+        '\nglobalThis.__analogSsrInternals = Object.assign(globalThis.__analogSsrInternals || {}, { collectNativeNodesInLContainer });\n');
 }
-/**
- * Classify an `@angular/core` module for the streaming patch. The patch anchors
- * on internal symbol names, so when Angular changes those the transform would
- * otherwise become a silent no-op and streaming would degrade to buffered with
- * no signal. This distinguishes "not the target module" (skip quietly) from
- * "this IS the `@defer` runtime module but the anchors drifted" (worth warning).
- */
+/** Inject capture before the named defer function's final profiler call, preserving its original source. */
+export function injectDeferStreamingHook(code) {
+    const info = analyzeDeferRuntime(code);
+    return info.kind === 'patchable'
+        ? patchDeferRuntime(code, info.offset)
+        : null;
+}
+/** Inspect the named function's final profiler call without depending on enum ordinals. */
 export function inspectAngularCoreModule(code) {
-    if (!code.includes('function applyDeferBlockState(')) {
-        return { kind: 'not-target' };
-    }
-    const missing = [];
-    if (!code.includes('profiler(ProfilerEvent.DeferBlockStateEnd);')) {
-        missing.push('DeferBlockStateEnd profiler anchor');
-    }
-    if (!code.includes('function collectNativeNodesInLContainer(')) {
-        missing.push('collectNativeNodesInLContainer');
-    }
-    return missing.length === 0
-        ? { kind: 'patchable' }
-        : { kind: 'drifted', reason: `missing ${missing.join(', ')}` };
+    const info = analyzeDeferRuntime(code);
+    return info.kind === 'patchable' ? { kind: 'patchable' } : info;
 }
 /**
  * Vite plugin that applies {@link injectDeferStreamingHook} to `@angular/core`
@@ -90,11 +97,17 @@ export function inspectAngularCoreModule(code) {
  * that falls back to buffered rendering.
  */
 export function deferStreamingPlugin() {
-    let applied = false;
-    let warnedDrift = false;
+    const applied = new Set();
+    const warnedDrift = new Set();
     return {
         name: 'analogjs-defer-streaming',
         enforce: 'post',
+        config() {
+            return {
+                ssr: { noExternal: ['@angular/core'] },
+                environments: { ssr: { optimizeDeps: { exclude: ['@angular/core'] } } },
+            };
+        },
         transform: {
             filter: {
                 id: /\/@angular\/core\//,
@@ -102,12 +115,13 @@ export function deferStreamingPlugin() {
             handler(code, _id, options) {
                 if (!options?.ssr)
                     return;
-                const info = inspectAngularCoreModule(code);
+                const environment = this.environment.name;
+                const info = analyzeDeferRuntime(code);
                 if (info.kind === 'not-target')
                     return;
                 if (info.kind === 'drifted') {
-                    if (!warnedDrift) {
-                        warnedDrift = true;
+                    if (!warnedDrift.has(environment)) {
+                        warnedDrift.add(environment);
                         this.warn(`experimental streaming SSR: found @angular/core's @defer runtime ` +
                             `but could not apply the resolution hook (${info.reason}). The ` +
                             `installed Angular version likely changed internals the patch ` +
@@ -115,15 +129,18 @@ export function deferStreamingPlugin() {
                     }
                     return;
                 }
-                const out = injectDeferStreamingHook(code);
-                if (!out)
-                    return;
-                applied = true;
+                const out = patchDeferRuntime(code, info.offset);
+                applied.add(environment);
                 return { code: out };
             },
         },
         buildEnd() {
-            if (!applied && !warnedDrift) {
+            // Require coverage from the SSR service. A later Nitro rebundle may
+            // also encounter Angular modules imported by endpoint handlers.
+            const environment = this.environment.name;
+            if (environment !== 'ssr')
+                return;
+            if (!applied.has(environment) && !warnedDrift.has(environment)) {
                 this.warn(`experimental streaming SSR is enabled but @angular/core's @defer ` +
                     `runtime module was never encountered during the SSR build, so the ` +
                     `resolution hook was not injected. Streaming will fall back to ` +
@@ -132,4 +149,4 @@ export function deferStreamingPlugin() {
         },
     };
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmZXItc3RyZWFtaW5nLXBsdWdpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL3BsYXRmb3JtL3NyYy9saWIvc3NyL2RlZmVyLXN0cmVhbWluZy1wbHVnaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUE7Ozs7Ozs7O0dBUUc7QUFDSCxNQUFNLENBQUMsTUFBTSwyQkFBMkIsR0FBRyxFQUFFLENBQUM7QUFFOUM7Ozs7O0dBS0c7QUFDSCxNQUFNLFVBQVUsMkJBQTJCLENBQUMsS0FBb0I7SUFDOUQsT0FBTyxLQUFLLEtBQUssSUFBSSxJQUFJLEtBQUssSUFBSSwyQkFBMkIsQ0FBQztBQUNoRSxDQUFDO0FBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQWtCRztBQUNILE1BQU0sVUFBVSx3QkFBd0IsQ0FBQyxJQUFZO0lBQ25ELE1BQU0sVUFBVSxHQUFHLDZDQUE2QyxDQUFDO0lBQ2pFLElBQ0UsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLGdDQUFnQyxDQUFDO1FBQ2hELENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsRUFDMUIsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELDJFQUEyRTtJQUMzRSw0RUFBNEU7SUFDNUUsMEVBQTBFO0lBQzFFLE1BQU0sT0FBTyxHQUNYLHFEQUFxRDtRQUNyRCx5REFBeUQ7UUFDekQsOERBQThEO1FBQzlELDJIQUEySCxDQUFDO0lBRTlILElBQUksR0FBRyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLE9BQU8sR0FBRyxVQUFVLENBQUMsQ0FBQztJQUV6RCxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsMENBQTBDLENBQUMsRUFBRSxDQUFDO1FBQzlELEdBQUc7WUFDRCxpSUFBaUksQ0FBQztJQUN0SSxDQUFDO0lBRUQsT0FBTyxHQUFHLENBQUM7QUFDYixDQUFDO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsTUFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmZXItc3RyZWFtaW5nLXBsdWdpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL3BsYXRmb3JtL3NyYy9saWIvc3NyL2RlZmVyLXN0cmVhbWluZy1wbHVnaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFNBQVMsRUFBaUMsTUFBTSxZQUFZLENBQUM7QUFFdEUsZ0dBQWdHO0FBQ2hHLE1BQU0sQ0FBQyxNQUFNLDJCQUEyQixHQUFHLEVBQUUsQ0FBQztBQUU5Qzs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSwyQkFBMkIsQ0FBQyxLQUFvQjtJQUM5RCxPQUFPLEtBQUssS0FBSyxJQUFJLElBQUksS0FBSyxJQUFJLDJCQUEyQixDQUFDO0FBQ2hFLENBQUM7QUFPRCxTQUFTLG1CQUFtQixDQUFDLElBQVk7SUFDdkMsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsZ0NBQWdDLENBQUM7UUFDbEQsT0FBTyxFQUFFLElBQUksRUFBRSxZQUFZLEVBQUUsQ0FBQztJQUNoQyxNQUFNLE1BQU0sR0FBRyxTQUFTLENBQUMsa0JBQWtCLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDbkQsSUFBSSxNQUFNLENBQUMsTUFBTSxDQUFDLE1BQU07UUFDdEIsT0FBTyxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLGlDQUFpQyxFQUFFLENBQUM7SUFDeEUsTUFBTSxFQUFFLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUNqQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQ1AsSUFBSSxDQUFDLElBQUksS0FBSyxxQkFBcUI7UUFDbkMsSUFBSSxDQUFDLEVBQUUsRUFBRSxJQUFJLEtBQUssc0JBQXNCLENBQzNDLENBQUM7SUFDRixJQUFJLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxJQUFJLEtBQUsscUJBQXFCLElBQUksQ0FBQyxFQUFFLENBQUMsSUFB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