npm - @paroicms/server - Versions diffs - 4.7.0 → 5.0.1 - Mend

@paroicms/server 4.7.0 → 5.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (108) hide show

package/dist/helpers/url-helpers.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { ResizeRule, ScSiteSchema, SizeName } from "@paroicms/public-anywhere-lib";
-import type { BackendPluginService } from "@paroicms/public-server-lib";
+import type { BackendPluginService, PaUrlQuery } from "@paroicms/public-server-lib";
 export interface UrlOfMediaFileValues {
     mediaId: string;
     mediaType: string;
@@ -43,5 +43,9 @@ export declare function makeUrlOfUnversionedImageVariant(service: Pick<BackendPl
     filename: string;
 };
 export declare function makeFeedUrl(service: Pick<BackendPluginService, "siteSchema" | "siteUrl">, language: string): string;
+export declare function joinUrlPath(basePath: string, subPath: string | undefined): string;
+export declare function escapePathForSubstitution(path: string): string;
+export declare function pickDeclaredUrlQuery(rawQuery: string, declaredNames: string[]): string;
+export declare function pickDeclaredUrlQueryObject(query: PaUrlQuery, declaredNames: string[]): PaUrlQuery | undefined;
 export declare function shouldPrefixWithLanguage(siteSchema: ScSiteSchema, language: string): boolean;
 //# sourceMappingURL=url-helpers.d.ts.map

package/dist/helpers/url-helpers.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"url-helpers.d.ts","sourceRoot":"","sources":["../../src/helpers/url-helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACxF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;~~AAGxE~~,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC9C,MAAM,EAAE,oBAAoB,GAC3B,MAAM,CAAC;AACV,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC9C,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE;IAAE,SAAS,EAAE,IAAI,CAAA;CAAE,GAC3B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAoBrC,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,QAAQ,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC9C,MAAM,EAAE,uBAAuB,GAC9B,MAAM,CAAC;AACV,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC9C,MAAM,EAAE,uBAAuB,EAC/B,OAAO,EAAE;IAAE,SAAS,EAAE,IAAI,CAAA;CAAE,GAC3B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAiBrC,MAAM,WAAW,kCAAkC;IACjD,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,UAAU,CAAC;IACvB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC9C,MAAM,EAAE,kCAAkC,GACzC,MAAM,CAAC;AACV,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,EAC9C,MAAM,EAAE,kCAAkC,EAC1C,OAAO,EAAE;IAAE,SAAS,EAAE,IAAI,CAAA;CAAE,GAC3B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAqBrC,wBAAgB,WAAW,CACzB,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,YAAY,GAAG,SAAS,CAAC,EAC7D,QAAQ,EAAE,MAAM,GACf,MAAM,CAKR;AAED,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAM5F"}
1	+ {"version":3,"file":"url-helpers.d.ts","sourceRoot":"","sources":["../../src/helpers/url-helpers.ts"],"names":[],"mappings":"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"}

package/dist/helpers/url-helpers.js CHANGED Viewed

@@ -35,6 +35,28 @@ function fileExtensionOf(mediaType) {
 export function makeFeedUrl(service, language) {
     return toAbsoluteUrl(service, shouldPrefixWithLanguage(service.siteSchema, language) ? `/${language}/feed` : "/feed");
 }
+export function joinUrlPath(basePath, subPath) {
+    if (subPath === undefined || subPath === "/")
+        return basePath;
+    return `${basePath === "/" ? "" : basePath}${subPath}`;
+}
+export function escapePathForSubstitution(path) {
+    return path.replace(/[&<>"'\\$`]/g, (char) => `%${char.charCodeAt(0).toString(16).toUpperCase()}`);
+}
+export function pickDeclaredUrlQuery(rawQuery, declaredNames) {
+    const kept = [...new URLSearchParams(rawQuery)].filter(([name]) => declaredNames.includes(baseQueryParamName(name)));
+    return new URLSearchParams(kept).toString();
+}
+export function pickDeclaredUrlQueryObject(query, declaredNames) {
+    const entries = Object.entries(query).filter(([name]) => declaredNames.includes(baseQueryParamName(name)));
+    if (entries.length === 0)
+        return;
+    return Object.fromEntries(entries);
+}
+function baseQueryParamName(name) {
+    const index = name.indexOf("[");
+    return index === -1 ? name : name.substring(0, index);
+}
 export function shouldPrefixWithLanguage(siteSchema, language) {
     const { languageRoutingMode, defaultLanguage } = siteSchema;
     return (languageRoutingMode === "prefixAll" ||

package/dist/helpers/url-helpers.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"url-helpers.js","sourceRoot":"","sources":["../../src/helpers/url-helpers.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"url-helpers.js","sourceRoot":"","sources":["../../src/helpers/url-helpers.ts"],"names":[],"mappings":"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"}

package/dist/rendered-site/page-route/make-url.js CHANGED Viewed

@@ -2,7 +2,7 @@ import { getDocumentTypeByName, makePreviewUrl } from "@paroicms/internal-anywhe
 import { toAbsoluteUrl } from "@paroicms/internal-server-lib";
 import { getNodeAncestorsWithSlug, } from "../../admin-backend/node/node-cte.queries.js";
 import { makeCacheDependencyKey, makeCacheKey } from "../../common/text-cache.js";
-import { shouldPrefixWithLanguage } from "../../helpers/url-helpers.js";
+import { joinUrlPath, shouldPrefixWithLanguage } from "../../helpers/url-helpers.js";
 export function getHomeUrl(siteContext, language, options) {
     const url = shouldPrefixWithLanguage(siteContext.siteSchema, language) ? `/${language}` : "/";
     return options?.absoluteUrl ? toAbsoluteUrl(siteContext, url) : url;
@@ -97,7 +97,7 @@ export function makeDirectChildDocumentUrl(siteContext, parentTypeName, parentUr
         throw new Error(`Invalid publish date for document '${document.nodeId}'`);
     }
     const segments = makeDocumentRouteSegments(documentType, { ...document, publishDate }, document.language);
-    return `${parentUrl === "/" ? "" : parentUrl}/${segments.join("/")}`;
+    return joinUrlPath(parentUrl, `/${segments.join("/")}`);
 }
 function makeDocumentRouteSegments(documentType, document, language) {
     if (documentType.documentKind === "routing") {

package/dist/rendered-site/page-route/make-url.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"make-url.js","sourceRoot":"","sources":["../../../src/rendered-site/page-route/make-url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACxF,OAAO,EAAE,aAAa,EAAgB,MAAM,+BAA+B,CAAC;AAG5E,OAAO,EACL,wBAAwB,GAEzB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAClF,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;~~AAGxE~~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~~GAAG~~,~~SAAS,KAAK,GAAG,~~CAAC,~~CAAC~~,~~CAAC,~~EAAE,~~CAAC,CAAC,CAAC,SAAS,~~IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;~~AACvE~~,CAAC;AAED,SAAS,yBAAyB,CAChC,YAA4B,EAC5B,QAEC,EACD,QAAgB;IAEhB,IAAI,YAAY,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QAC5C,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,oBAAoB,QAAQ,wBAAwB,YAAY,CAAC,QAAQ,GAAG,CAAC,CAAC;QAChG,CAAC;QACD,OAAO,CAAC,SAAS,CAAC,CAAC;IACrB,CAAC;IACD,IAAI,YAAY,CAAC,KAAK,KAAK,mBAAmB,EAAE,CAAC;QAC/C,OAAO,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,YAAY,CAAC,KAAK,KAAK,iCAAiC,EAAE,CAAC;QAC7D,MAAM,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC;QACjC,OAAO;YACL,MAAM,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;YAClD,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;YACnD,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;YAC9C,yBAAyB,CAAC,QAAQ,CAAC;SACpC,CAAC;IACJ,CAAC;IACD,IAAI,YAAY,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,oBAAoB,YAAY,CAAC,QAAQ,qBAAqB,CAAC,CAAC;QAClF,CAAC;QACD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IACD,IAAI,YAAY,CAAC,KAAK,KAAK,aAAa;QAAE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IACvE,MAAM,IAAI,KAAK,CACb,OAAO,YAAY,CAAC,QAAQ,gCAAgC,YAAY,CAAC,KAAK,GAAG,CAClF,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,SAAiC,EAAE,QAAgB;IAChF,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC5B,sBAAsB,CAAC;QACrB,UAAU,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE;QAC7C,SAAS,EAAE,MAAM;KAClB,CAAC,CACH,CAAC;AACJ,CAAC;AAED,SAAS,yBAAyB,CAAC,IAAuD;IACxF,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC;AACzE,CAAC"}
1	+ {"version":3,"file":"make-url.js","sourceRoot":"","sources":["../../../src/rendered-site/page-route/make-url.ts"],"names":[],"mappings":"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"}

package/dist/rendered-site/page-route/page-route-parser.d.ts CHANGED Viewed

@@ -3,10 +3,12 @@ import type { SiteContext } from "../../site-context/site-context.types.js";
 export interface ParsedPageRoute {
     language: string;
     redirectTo: "parent" | undefined;
-    frontendAppPath?: string;
+    spaPath?: string;
+    documentPath: string;
     urlCacheKey: string;
     documentHierarchy: DocumentHierarchyEntry[];
 }
+export type ParentPageRoute = Omit<ParsedPageRoute, "documentPath" | "spaPath">;
 export type DocumentHierarchyEntry = RoutingDocumentHierarchyEntry | RegularDocumentHierarchyEntry;
 export interface RoutingDocumentHierarchyEntry {
     entryKind: "routing";
@@ -27,6 +29,6 @@ export interface SlugHierarchyEntry extends RegularDocumentHierarchyEntryBase {
     slug: string;
 }
 export declare function parsePageRoute(siteContext: Pick<SiteContext, "siteSchema">, urlPath: string): ParsedPageRoute | undefined;
-export declare function findParentParsedRouteWithDocument(parsedRoute: ParsedPageRoute): ParsedPageRoute | undefined;
+export declare function findParentParsedRouteWithDocument(parsedRoute: ParentPageRoute): ParentPageRoute | undefined;
 export {};
 //# sourceMappingURL=page-route-parser.d.ts.map

package/dist/rendered-site/page-route/page-route-parser.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"page-route-parser.d.ts","sourceRoot":"","sources":["../../../src/rendered-site/page-route/page-route-parser.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEV,qBAAqB,EACrB,qBAAqB,EAEtB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAE5E,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,QAAQ,GAAG,SAAS,CAAC;IACjC,~~eAAe~~,CAAC,EAAE,MAAM,CAAC;~~IACzB~~,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,sBAAsB,EAAE,CAAC;CAC7C;AAED,MAAM,MAAM,sBAAsB,GAAG,6BAA6B,GAAG,6BAA6B,CAAC;AAEnG,MAAM,WAAW,6BAA6B;IAC5C,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,qBAAqB,CAAC;CACrC;AAED,MAAM,MAAM,6BAA6B,GAAG,wBAAwB,GAAG,kBAAkB,CAAC;AAE1F,UAAU,iCAAiC;IACzC,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,qBAAqB,EAAE,CAAC;IACxC,aAAa,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,wBAAyB,SAAQ,iCAAiC;IACjF,UAAU,EAAE,YAAY,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,kBAAmB,SAAQ,iCAAiC;IAC3E,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,cAAc,CAC5B,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,EAC5C,OAAO,EAAE,MAAM,GACd,eAAe,GAAG,SAAS,~~CA6B7B~~;~~AA8mBD~~,wBAAgB,iCAAiC,CAC/C,WAAW,EAAE,eAAe,GAC3B,eAAe,GAAG,SAAS,CAO7B"}
1	+ {"version":3,"file":"page-route-parser.d.ts","sourceRoot":"","sources":["../../../src/rendered-site/page-route/page-route-parser.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEV,qBAAqB,EACrB,qBAAqB,EAEtB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAE5E,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,QAAQ,GAAG,SAAS,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IAKjB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,sBAAsB,EAAE,CAAC;CAC7C;AAED,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,EAAE,cAAc,GAAG,SAAS,CAAC,CAAC;AAEhF,MAAM,MAAM,sBAAsB,GAAG,6BAA6B,GAAG,6BAA6B,CAAC;AAEnG,MAAM,WAAW,6BAA6B;IAC5C,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,qBAAqB,CAAC;CACrC;AAED,MAAM,MAAM,6BAA6B,GAAG,wBAAwB,GAAG,kBAAkB,CAAC;AAE1F,UAAU,iCAAiC;IACzC,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,qBAAqB,EAAE,CAAC;IACxC,aAAa,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,wBAAyB,SAAQ,iCAAiC;IACjF,UAAU,EAAE,YAAY,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,kBAAmB,SAAQ,iCAAiC;IAC3E,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,cAAc,CAC5B,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,EAC5C,OAAO,EAAE,MAAM,GACd,eAAe,GAAG,SAAS,CAmC7B;AAwlBD,wBAAgB,iCAAiC,CAC/C,WAAW,EAAE,eAAe,GAC3B,eAAe,GAAG,SAAS,CAO7B"}

package/dist/rendered-site/page-route/page-route-parser.js CHANGED Viewed

@@ -12,15 +12,19 @@ export function parsePageRoute(siteContext, urlPath) {
         return;
     const { language, urlSegments } = languageResult;
     const urlCacheKey = [];
-    if (shouldPrefixWithLanguage(siteSchema, language))
+    const withLanguagePrefix = shouldPrefixWithLanguage(siteSchema, language);
+    if (withLanguagePrefix)
         urlCacheKey.push(language);
     const hierarchyResult = parseDocumentHierarchy(siteSchema, urlSegments, language, urlCacheKey);
     if (!hierarchyResult)
         return;
+    const { spaStartIndex } = hierarchyResult;
+    const documentSegments = urlSegments.slice(0, spaStartIndex ?? urlSegments.length);
     return {
         language,
         redirectTo: hierarchyResult.redirectTo,
-        frontendAppPath: hierarchyResult.frontendAppPath,
+        spaPath: spaStartIndex === undefined ? undefined : `/${urlSegments.slice(spaStartIndex).join("/")}`,
+        documentPath: `/${(withLanguagePrefix ? [language, ...documentSegments] : documentSegments).join("/")}`,
         urlCacheKey: urlCacheKey.join("/"),
         documentHierarchy: hierarchyResult.documentHierarchy,
     };
@@ -62,12 +66,12 @@ function parseDocumentHierarchy(siteSchema, urlSegments, language, urlCacheKey)
         entryKind: "routing",
         documentType: homeDocument,
     });
-    const homeFrontendAppResult = checkFrontendAppWithRoutingPrecedence(homeDocument, urlSegments, 0, siteSchema, language);
-    if (homeFrontendAppResult.shouldUseFrontendApp) {
+    const homeSpaResult = checkSpaWithRoutingPrecedence(homeDocument, urlSegments, 0, siteSchema, language);
+    if (homeSpaResult.shouldUseSpa) {
         return {
             documentHierarchy,
             redirectTo: homeDocument.redirectTo,
-            frontendAppPath: `/${urlSegments.join("/")}`,
+            spaStartIndex: 0,
         };
     }
     return parseDocumentHierarchyRecursive({
@@ -90,11 +94,11 @@ function parseDocumentHierarchyRecursive({ siteSchema, urlSegments, language, ur
         currentParent,
         index,
     });
-    if (routingResult.frontendAppPath || routingResult.index >= urlSegments.length) {
+    if (routingResult.spaStartIndex !== undefined || routingResult.index >= urlSegments.length) {
         return {
             documentHierarchy,
             redirectTo: routingResult.redirectTo,
-            frontendAppPath: routingResult.frontendAppPath,
+            spaStartIndex: routingResult.spaStartIndex,
         };
     }
     return parseRegularDocuments({
@@ -128,13 +132,13 @@ function parseRoutingDocuments({ siteSchema, urlSegments, language, urlCacheKey,
         urlCacheKey.push(urlSegment);
         parent = routingDocument;
         currentIndex++;
-        const frontendAppResult = checkFrontendAppWithRoutingPrecedence(routingDocument, urlSegments, currentIndex, siteSchema, language);
-        if (frontendAppResult.shouldUseFrontendApp) {
+        const spaResult = checkSpaWithRoutingPrecedence(routingDocument, urlSegments, currentIndex, siteSchema, language);
+        if (spaResult.shouldUseSpa) {
             return {
                 currentParent: parent,
                 index: currentIndex,
                 redirectTo: routingDocument.redirectTo,
-                frontendAppPath: `/${urlSegments.slice(currentIndex).join("/")}`,
+                spaStartIndex: currentIndex,
             };
         }
     }
@@ -142,7 +146,7 @@ function parseRoutingDocuments({ siteSchema, urlSegments, language, urlCacheKey,
         currentParent: parent,
         index: currentIndex,
         redirectTo: parent.redirectTo,
-        frontendAppPath: undefined,
+        spaStartIndex: undefined,
     };
 }
 function parseRegularDocuments({ siteSchema, urlSegments, language, urlCacheKey, documentHierarchy, parentCandidates, index, redirectTo, }) {
@@ -153,7 +157,7 @@ function parseRegularDocuments({ siteSchema, urlSegments, language, urlCacheKey,
         return {
             documentHierarchy,
             redirectTo: lastRedirectTo,
-            frontendAppPath: undefined,
+            spaStartIndex: undefined,
         };
     }
     while (currentIndex < urlSegments.length) {
@@ -179,18 +183,18 @@ function parseRegularDocuments({ siteSchema, urlSegments, language, urlCacheKey,
         lastRedirectTo = undefined;
         currentIndex += found.skipUrlSegments;
         candidates = found.candidateTypes;
-        const frontendAppResult = checkRegularDocumentFrontendApp({
+        const spaResult = checkRegularDocumentSpa({
             candidateTypes: found.candidateTypes,
             urlSegments,
             index: currentIndex,
             siteSchema,
             language,
         });
-        if (frontendAppResult.shouldUseFrontendApp) {
+        if (spaResult.shouldUseSpa) {
             return {
                 documentHierarchy,
                 redirectTo: lastRedirectTo,
-                frontendAppPath: `/${urlSegments.slice(currentIndex).join("/")}`,
+                spaStartIndex: currentIndex,
             };
         }
         if (isClusterRoot && currentIndex < urlSegments.length) {
@@ -209,7 +213,7 @@ function parseRegularDocuments({ siteSchema, urlSegments, language, urlCacheKey,
     return {
         documentHierarchy,
         redirectTo: lastRedirectTo,
-        frontendAppPath: undefined,
+        spaStartIndex: undefined,
     };
 }
 function parseClusterDocuments({ siteSchema, urlSegments, language, urlCacheKey, documentHierarchy, regularCandidates, index, }) {
@@ -247,7 +251,7 @@ function parseClusterDocuments({ siteSchema, urlSegments, language, urlCacheKey,
             return {
                 documentHierarchy,
                 redirectTo: lastRedirectTo,
-                frontendAppPath: undefined,
+                spaStartIndex: undefined,
             };
         }
         documentHierarchy.push({
@@ -257,12 +261,12 @@ function parseClusterDocuments({ siteSchema, urlSegments, language, urlCacheKey,
         urlCacheKey.push(urlSegment);
         currentIndex++;
         lastRedirectTo = routingDocument.redirectTo;
-        const frontendAppResult = checkFrontendAppWithRoutingPrecedence(routingDocument, urlSegments, currentIndex, siteSchema, language);
-        if (frontendAppResult.shouldUseFrontendApp) {
+        const spaResult = checkSpaWithRoutingPrecedence(routingDocument, urlSegments, currentIndex, siteSchema, language);
+        if (spaResult.shouldUseSpa) {
             return {
                 documentHierarchy,
                 redirectTo: routingDocument.redirectTo,
-                frontendAppPath: `/${urlSegments.slice(currentIndex).join("/")}`,
+                spaStartIndex: currentIndex,
             };
         }
         if (routingDocument.regularChildren && currentIndex < urlSegments.length) {
@@ -280,13 +284,13 @@ function parseClusterDocuments({ siteSchema, urlSegments, language, urlCacheKey,
     return {
         documentHierarchy,
         redirectTo: lastRedirectTo,
-        frontendAppPath: undefined,
+        spaStartIndex: undefined,
     };
 }
-function checkRegularDocumentFrontendApp({ candidateTypes, urlSegments, index, siteSchema, language, }) {
-    const hasFrontendApp = candidateTypes.some((type) => type.hasFrontendApp);
-    if (!hasFrontendApp) {
-        return { shouldUseFrontendApp: false };
+function checkRegularDocumentSpa({ candidateTypes, urlSegments, index, siteSchema, language, }) {
+    const hasSpa = candidateTypes.some((type) => type.isSpa);
+    if (!hasSpa) {
+        return { shouldUseSpa: false };
     }
     const hasRoutingPrecedence = index < urlSegments.length &&
         candidateTypes.some((type) => {
@@ -298,14 +302,14 @@ function checkRegularDocumentFrontendApp({ candidateTypes, urlSegments, index, s
                 return childType.route && nextUrlSegment === childType.route[language];
             });
         });
-    return { shouldUseFrontendApp: !hasRoutingPrecedence };
+    return { shouldUseSpa: !hasRoutingPrecedence };
 }
-function checkFrontendAppWithRoutingPrecedence(document, urlSegments, currentIndex, siteSchema, language) {
-    if (!document.hasFrontendApp) {
-        return { shouldUseFrontendApp: false };
+function checkSpaWithRoutingPrecedence(document, urlSegments, currentIndex, siteSchema, language) {
+    if (!document.isSpa) {
+        return { shouldUseSpa: false };
     }
     if (currentIndex >= urlSegments.length) {
-        return { shouldUseFrontendApp: true };
+        return { shouldUseSpa: true };
     }
     const nextUrlSegment = urlSegments[currentIndex];
     const hasRoutingMatch = (document.routingChildren ?? []).some((childTypeName) => {
@@ -313,9 +317,9 @@ function checkFrontendAppWithRoutingPrecedence(document, urlSegments, currentInd
         return childType.route && nextUrlSegment === childType.route[language];
     });
     if (hasRoutingMatch) {
-        return { shouldUseFrontendApp: false };
+        return { shouldUseSpa: false };
     }
-    return { shouldUseFrontendApp: true };
+    return { shouldUseSpa: true };
 }
 function findRoutingDocumentByUrlPath({ siteSchema, parent, urlSegment, language, }) {
     for (const typeName of parent.routingChildren ?? []) {
@@ -439,7 +443,6 @@ function findParentParsedRoute(parsedRoute) {
         documentHierarchy,
         redirectTo,
         urlCacheKey: urlCacheKey.join("/"),
-        frontendAppPath: undefined,
     };
 }
 //# sourceMappingURL=page-route-parser.js.map

package/dist/rendered-site/page-route/page-route-parser.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"page-route-parser.js","sourceRoot":"","sources":["../../../src/rendered-site/page-route/page-route-parser.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"page-route-parser.js","sourceRoot":"","sources":["../../../src/rendered-site/page-route/page-route-parser.ts"],"names":[],"mappings":"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"}

package/dist/rendered-site/page-route/raw-document-payload.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { TpDocValues } from "@paroicms/public-server-lib";
 import type { SiteContext } from "../../site-context/site-context.types.js";
-import type { ParsedPageRoute } from "./page-route-parser.js";
-export declare function fetchRawDocPayload(siteContext: SiteContext, parsedRoute: ParsedPageRoute): Promise<TpDocValues | undefined>;
+import type { ParentPageRoute } from "./page-route-parser.js";
+export declare function fetchRawDocPayload(siteContext: SiteContext, parsedRoute: ParentPageRoute): Promise<TpDocValues | undefined>;
 //# sourceMappingURL=raw-document-payload.d.ts.map

package/dist/rendered-site/preview.req-handler.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"preview.req-handler.d.ts","sourceRoot":"","sources":["../../src/rendered-site/preview.req-handler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;~~AAWjE~~,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAMzE,wBAAsB,iBAAiB,CACrC,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,aAAa,GACzB,OAAO,CAAC,OAAO,CAAC,CA+ElB"}
1	+ {"version":3,"file":"preview.req-handler.d.ts","sourceRoot":"","sources":["../../src/rendered-site/preview.req-handler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAYjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAMzE,wBAAsB,iBAAiB,CACrC,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,aAAa,GACzB,OAAO,CAAC,OAAO,CAAC,CA+ElB"}

package/dist/rendered-site/preview.req-handler.js CHANGED Viewed

@@ -5,6 +5,7 @@ import { serve404SimpleHtml, serveTextContent } from "../express/http-helpers.js
 import { renderLiquidTemplate } from "../liquidjs-tools/liquidjs-rendering/render-liquidjs.js";
 import { createRenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 import { ADMIN_TOKEN_COOKIE, validateAdminUiToken, } from "../protected-site/protected-access-token.js";
+import { pickDeclaredUrlQueryObject } from "../helpers/url-helpers.js";
 import { getDocItem } from "../rendering-payload/doc-values.queries.js";
 import { makeRegularTemplatePayload } from "../rendering-payload/make-public-payload.js";
 import { getUrlOfDocument } from "./page-route/make-url.js";
@@ -55,8 +56,8 @@ export async function previewReqHandler(siteContext, httpContext) {
             templateNames: [...documentType.templateNames, "default"],
             payload: makeRegularTemplatePayload(renderingContext, docValues, {
                 url: docUrl,
-                urlQuery: req.query,
-                frontendAppPath: undefined,
+                canonicalUrl: undefined,
+                urlQuery: pickDeclaredUrlQueryObject(req.query, documentType.useUrlQuery ?? []),
             }),
         });
         serveTextContent(httpContext, { text: html });

package/dist/rendered-site/preview.req-handler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"preview.req-handler.js","sourceRoot":"","sources":["../../src/rendered-site/preview.req-handler.ts"],"names":[],"mappings":"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~~;gBACnB~~,~~eAAe~~,EAAE,~~SAAS~~;~~aAC3B~~,CAAC;SACH,CAAC,CAAC;QAEH,gBAAgB,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAChD,CAAC;YAAS,CAAC;QACT,MAAM,gBAAgB,CAAC,KAAK,EAAE,CAAC;IACjC,CAAC;IAED,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,WAAW,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC5F,OAAO,IAAI,CAAC;AACd,CAAC"}
1	+ {"version":3,"file":"preview.req-handler.js","sourceRoot":"","sources":["../../src/rendered-site/preview.req-handler.ts"],"names":[],"mappings":"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"}

package/dist/rendered-site/serve-document/serve-document.d.ts CHANGED Viewed

@@ -1,22 +1,22 @@
 import type { Tracker } from "@paroicms/internal-server-lib";
-import type { PaHttpContext } from "@paroicms/public-server-lib";
+import type { PaUrlQuery } from "@paroicms/public-server-lib";
 import type { SiteContext } from "../../site-context/site-context.types.js";
 import { type ParsedPageRoute } from "../page-route/page-route-parser.js";
+export declare const spaCanonicalPathPlaceholder = "/__paroicms-spa-canonical-path__";
 export type GeneratedDocumentHtml = {
     status: 200;
     html: string;
     dependencyKeys: string[];
-    cacheKey: string;
 } | {
     status: 404;
 } | {
     status: 301;
-    url: string;
+    path: string;
     dependencyKeys: string[];
 };
-export declare function generateDocumentHtml(siteContext: SiteContext, httpContext: PaHttpContext, options: {
+export declare function generateDocumentHtml(siteContext: SiteContext, options: {
     parsedRoute: ParsedPageRoute;
-    cacheKeyWithQuery: string;
-    cacheKeyWithPath: string;
+    cacheKey: string;
+    urlQuery: PaUrlQuery | undefined;
 }, tracker: Tracker): Promise<GeneratedDocumentHtml>;
 //# sourceMappingURL=serve-document.d.ts.map

package/dist/rendered-site/serve-document/serve-document.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"serve-document.d.ts","sourceRoot":"","sources":["../../../src/rendered-site/serve-document/serve-document.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,EAAE,~~aAAa~~,EAAE,MAAM,6BAA6B,CAAC;~~AAKjE~~,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAE5E,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,oCAAoC,CAAC;~~AAI5C~~,MAAM,MAAM,qBAAqB,GAC7B;IACE,MAAM,EAAE,GAAG,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,EAAE,CAAC;~~IACzB~~,~~QAAQ,EAAE,MAAM,CAAC;CAClB,~~GACD;IACE,MAAM,EAAE,GAAG,CAAC;CACb,GACD;IACE,MAAM,EAAE,GAAG,CAAC;IACZ,~~GAAG~~,EAAE,MAAM,CAAC;~~IACZ~~,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AAEN,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,WAAW,EACxB,~~WAAW,EAAE,aAAa,EAC1B,~~OAAO,EAAE;IACP,WAAW,EAAE,eAAe,CAAC;IAC7B,~~iBAAiB~~,EAAE,MAAM,CAAC;~~IAC1B~~,~~gBAAgB~~,EAAE,~~MAAM~~,CAAC;~~CAC1B~~,EACD,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,qBAAqB,CAAC,~~CA0EhC~~"}
1	+ {"version":3,"file":"serve-document.d.ts","sourceRoot":"","sources":["../../../src/rendered-site/serve-document/serve-document.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAK9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAE5E,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,oCAAoC,CAAC;AAQ5C,eAAO,MAAM,2BAA2B,qCAAqC,CAAC;AAE9E,MAAM,MAAM,qBAAqB,GAC7B;IACE,MAAM,EAAE,GAAG,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,GACD;IACE,MAAM,EAAE,GAAG,CAAC;CACb,GACD;IACE,MAAM,EAAE,GAAG,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AAEN,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE;IACP,WAAW,EAAE,eAAe,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,UAAU,GAAG,SAAS,CAAC;CAClC,EACD,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,qBAAqB,CAAC,CAkEhC"}

package/dist/rendered-site/serve-document/serve-document.js CHANGED Viewed

@@ -7,8 +7,9 @@ import { getUrlOfDocument } from "../page-route/make-url.js";
 import { findParentParsedRouteWithDocument, } from "../page-route/page-route-parser.js";
 import { fetchRawDocPayload } from "../page-route/raw-document-payload.js";
 import { createPluginRenderedDocument } from "./serve-document-helpers.js";
-export async function generateDocumentHtml(siteContext, httpContext, options, tracker) {
-    const { parsedRoute, cacheKeyWithQuery, cacheKeyWithPath } = options;
+export const spaCanonicalPathPlaceholder = "/__paroicms-spa-canonical-path__";
+export async function generateDocumentHtml(siteContext, options, tracker) {
+    const { parsedRoute, cacheKey } = options;
     if (parsedRoute.redirectTo === "parent") {
         const parentRoute = findParentParsedRouteWithDocument(parsedRoute);
         const docValues = parentRoute ? await fetchRawDocPayload(siteContext, parentRoute) : undefined;
@@ -17,7 +18,7 @@ export async function generateDocumentHtml(siteContext, httpContext, options, tr
                 language: parentRoute.language,
                 nodeId: docValues.nodeId,
             }, { returnUrlDependencyKeys: true });
-            return { status: 301, url, dependencyKeys };
+            return { status: 301, path: url, dependencyKeys };
         }
         return { status: 404 };
     }
@@ -28,16 +29,10 @@ export async function generateDocumentHtml(siteContext, httpContext, options, tr
         language: parsedRoute.language,
         nodeId: docValues.nodeId,
     }, { returnUrlDependencyKeys: true });
-    const frontendAppPath = parsedRoute.frontendAppPath && parsedRoute.frontendAppPath !== "/"
-        ? parsedRoute.frontendAppPath
-        : "";
-    const urlQuery = extractUrlQueryAsString(httpContext.req.relativeUrl) ?? "";
-    const canonicalUrl = `${docUrl}${frontendAppPath}${urlQuery}`;
-    if (canonicalUrl !== httpContext.req.relativeUrl) {
-        return { status: 301, url: canonicalUrl, dependencyKeys: urlDependencyKeys };
+    if (docUrl !== parsedRoute.documentPath) {
+        return { status: 301, path: docUrl, dependencyKeys: urlDependencyKeys };
     }
     const documentType = getDocumentTypeByName(siteContext.siteSchema, docValues.type);
-    const cacheKey = documentType.useUrlQuery ? cacheKeyWithQuery : cacheKeyWithPath;
     const renderingContext = await createRenderingContext(siteContext, {
         cacheKey,
         language: parsedRoute.language,
@@ -49,8 +44,8 @@ export async function generateDocumentHtml(siteContext, httpContext, options, tr
         templateNames: [...documentType.templateNames, "default"],
         payload: makeRegularTemplatePayload(renderingContext, docValues, {
             url: docUrl,
-            urlQuery: httpContext.req.query,
-            frontendAppPath: parsedRoute.frontendAppPath,
+            canonicalUrl: parsedRoute.spaPath === undefined ? docUrl : spaCanonicalPathPlaceholder,
+            urlQuery: options.urlQuery,
         }),
     });
     const dependencyKeys = renderingContext.getDependencyKeys();
@@ -59,11 +54,6 @@ export async function generateDocumentHtml(siteContext, httpContext, options, tr
         status: 200,
         html,
         dependencyKeys,
-        cacheKey,
     };
 }
-function extractUrlQueryAsString(relativeUrl) {
-    const result = relativeUrl.match(/\?(.*)$/);
-    return result ? `?${result[1]}` : undefined;
-}
 //# sourceMappingURL=serve-document.js.map

package/dist/rendered-site/serve-document/serve-document.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"serve-document.js","sourceRoot":"","sources":["../../../src/rendered-site/serve-document/serve-document.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAGxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4DAA4D,CAAC;AAClG,OAAO,EAAE,sBAAsB,EAAE,MAAM,8DAA8D,CAAC;AACtG,OAAO,EAAE,0BAA0B,EAAE,MAAM,gDAAgD,CAAC;AAE5F,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EACL,iCAAiC,GAElC,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,4BAA4B,EAAE,MAAM,6BAA6B,CAAC;~~AAkB3E~~,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,WAAwB,EACxB,~~WAA0B,EAC1B,~~OAIC,EACD,OAAgB;IAEhB,MAAM,EAAE,WAAW,EAAE,~~iBAAiB~~,EAAE,~~gBAAgB,EAAE,~~GAAG,OAAO,CAAC;~~IAErE~~,IAAI,WAAW,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;QACxC,MAAM,WAAW,GAAG,iCAAiC,CAAC,WAAW,CAAC,CAAC;QACnE,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,MAAM,kBAAkB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE/F,IAAI,SAAS,IAAI,WAAW,EAAE,CAAC;YAC7B,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,MAAM,gBAAgB,CACpD,WAAW,EACX,OAAO,EACP;gBACE,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,MAAM,EAAE,SAAS,CAAC,MAAM;aACzB,EACD,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAClC,CAAC;YACF,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC;~~QAC9C~~,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IACrE,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IAEvC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,iBAAiB,EAAE,GAAG,MAAM,gBAAgB,CAC/E,WAAW,EACX,OAAO,EACP;QACE,QAAQ,EAAE,WAAW,CAAC,QAAQ;QAC9B,MAAM,EAAE,SAAS,CAAC,MAAM;KACzB,EACD,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAClC,CAAC;IAEF,~~MAAM,eAAe,GACnB,WAAW,CAAC,eAAe,~~IAAI,~~WAAW~~,~~CAAC,eAAe,~~KAAK,~~GAAG;QAChE,CAAC,CAAC,~~WAAW,CAAC,~~eAAe;QAC7B,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,QAAQ,GAAG,uBAAuB,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IAC5E,MAAM,~~YAAY,~~GAAG,GAAG,MAAM,GAAG,eAAe,GAAG,QAAQ,~~EAAE,CAAC;~~IAC9D~~,~~IAAI,YAAY,KAAK,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QACjD,~~OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,~~GAAG~~,EAAE,~~YAAY~~,EAAE,cAAc,EAAE,iBAAiB,EAAE,CAAC;~~IAC/E~~,CAAC;IAED,MAAM,YAAY,GAAG,qBAAqB,CAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;~~IACnF~~,MAAM,~~QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,~~gBAAgB,~~CAAC;IAEjF,MAAM,gBAAgB,~~GAAG,MAAM,sBAAsB,CAAC,WAAW,EAAE;QACjE,QAAQ;QACR,QAAQ,EAAE,WAAW,CAAC,QAAQ;QAC9B,OAAO;QACP,aAAa,EAAE,sBAAsB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;QAChE,YAAY,EAAE,4BAA4B,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;KACvE,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,gBAAgB,EAAE;QACxD,aAAa,EAAE,CAAC,GAAG,YAAY,CAAC,aAAa,EAAE,SAAS,CAAC;QACzD,OAAO,EAAE,0BAA0B,CAAC,gBAAgB,EAAE,SAAS,EAAE;YAC/D,GAAG,EAAE,MAAM;YACX,~~QAAQ~~,EAAE,WAAW,CAAC,~~GAAG~~,CAAC,~~KAAK~~;~~YAC/B~~,~~eAAe~~,EAAE,~~WAAW~~,CAAC,~~eAAe~~;~~SAC7C~~,CAAC;KACH,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,gBAAgB,CAAC,iBAAiB,EAAE,CAAC;IAC5D,MAAM,gBAAgB,CAAC,KAAK,EAAE,CAAC;IAE/B,OAAO;QACL,MAAM,EAAE,GAAG;QACX,IAAI;QACJ,cAAc;~~QACd~~,~~QAAQ;KACT,~~CAAC;AACJ,CAAC~~;AAED,SAAS,uBAAuB,CAAC,WAAmB;IAClD,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC5C,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AAC9C,CAAC~~"}
1	+ {"version":3,"file":"serve-document.js","sourceRoot":"","sources":["../../../src/rendered-site/serve-document/serve-document.ts"],"names":[],"mappings":"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"}

package/dist/rendered-site/serve-index-page.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"serve-index-page.d.ts","sourceRoot":"","sources":["../../src/rendered-site/serve-index-page.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAMjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAEzE,wBAAsB,0BAA0B,CAC9C,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,aAAa,EAC1B,OAAO,EAAE,OAAO,~~iBAyBjB~~;AAED,wBAAsB,cAAc,CAClC,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,aAAa,GACzB,OAAO,CAAC,OAAO,CAAC,CAIlB"}
1	+ {"version":3,"file":"serve-index-page.d.ts","sourceRoot":"","sources":["../../src/rendered-site/serve-index-page.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAMjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAEzE,wBAAsB,0BAA0B,CAC9C,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,aAAa,EAC1B,OAAO,EAAE,OAAO,iBAsBjB;AAED,wBAAsB,cAAc,CAClC,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,aAAa,GACzB,OAAO,CAAC,OAAO,CAAC,CAIlB"}