@alpaca-headless/alpaca-headless 1.0.541 → 1.0.542

package/dist/components/Placeholder.js

@@ -109,7 +109,7 @@ export function renderPlaceholder(wrap, componentsWithProps, placeholderData, co
     return wrap(_jsxs(_Fragment, { children: [context.isEditing && (_jsx("script", { "data-placeholder-start": placeholderData.key, "data-description": description })), componentsWithProps.map(({ Component, data, props }) => {
                 var _a, _b, _c, _d, _e;
                 return (_jsx(_Fragment, { children: _jsxs(ErrorBoundary, { FallbackComponent: ErrorFallback, children: [context.isEditing && (_jsx("script", { "data-component-start": data.id, "data-itemid": ((_b = (_a = data._editor) === null || _a === void 0 ? void 0 : _a.linkedComponentItem) === null || _b === void 0 ? void 0 : _b.id) ||
-                                    data.id, "data-layoutid": (_d = (_c = data._editor) === null || _c === void 0 ? void 0 : _c.hostingPageItem) === null || _d === void 0 ? void 0 : _d.id })), _createElement(Component, Object.assign({}, props, { key: data.id })), context.isEditing && (_jsx("script", { "data-component-end": data.id }))] }, "EB" + data.id + ((_e = data.rendering) === null || _e === void 0 ? void 0 : _e.revision)) }));
+                                    data.id, "data-typeid": data.templateId, "data-layoutid": (_d = (_c = data._editor) === null || _c === void 0 ? void 0 : _c.hostingPageItem) === null || _d === void 0 ? void 0 : _d.id })), _createElement(Component, Object.assign({}, props, { key: data.id })), context.isEditing && (_jsx("script", { "data-component-end": data.id }))] }, "EB" + data.id + ((_e = data.rendering) === null || _e === void 0 ? void 0 : _e.revision)) }));
             }), placeholderData.hasMore && (_jsx(Suspense, { children: _jsx(LazyPlaceholder, { placeholder: placeholderData, context: context }) })), context.isEditing && (_jsx("script", { "data-placeholder-end": placeholderData.key }))] }));
 }
 function ComponentNotFound({ component }) {

package/dist/route-data/resolve-route.d.ts

@@ -27,7 +27,7 @@ export type GetPageParams = {
     searchParams: any;
     apiConfig?: ApiConfig;
 };
-export declare function getPage({ itemId, language, version, siteName, renderOptions, renderings, compileRendering, mode, searchParams, apiConfig, }: GetPageParams): Promise<RouteData>;
+export declare function getPage({ itemId, language, version, siteName, renderOptions, renderings, compileRendering, mode, apiConfig, }: GetPageParams): Promise<RouteData>;
 export type ResolveRouteParams = {
     path: string[] | string;
     searchParams: any;

package/dist/route-data/resolve-route.js

@@ -3,10 +3,13 @@ import { apiPostObject } from "../services/api";
 if (!globalThis.alpacaRouteDataCache) {
     globalThis.alpacaRouteDataCache = {};
 }
-const fetchRouteData = async (path, host, mode, itemId, language, version, options, apiConfig, editRevision, siteName) => {
+const fetchRouteData = async (path, host, mode, itemId, language, version, options, apiConfig, siteName) => {
     var _a;
+    if (mode === "edit" || mode === "preview") {
+        return await doFetchRouteData(path, host, mode, itemId, language, version, options, apiConfig, siteName);
+    }
     const cache = globalThis.alpacaRouteDataCache;
-    const cacheKey = editRevision + itemId + language + version + siteName + path + host + mode;
+    const cacheKey = itemId + language + version + siteName + path + host;
     if (cacheKey && ((_a = cache[cacheKey]) === null || _a === void 0 ? void 0 : _a.expiresOn) > new Date()) {
         Object.keys(cache).forEach((key) => {
             if (cache[key].expiresOn < new Date()) {
@@ -72,8 +75,8 @@ const doFetchRouteData = async (path, host, mode, itemId, language, version, opt
         duration,
     };
 };
-export async function getPage({ itemId, language, version, siteName, renderOptions, renderings, compileRendering, mode, searchParams, apiConfig, }) {
-    const result = await fetchRouteData("", "", mode || "normal", itemId, language, version, renderOptions, apiConfig, searchParams["edit_rev"], siteName);
+export async function getPage({ itemId, language, version, siteName, renderOptions, renderings, compileRendering, mode, apiConfig, }) {
+    const result = await fetchRouteData("", "", mode || "normal", itemId, language, version, renderOptions, apiConfig, siteName);
     return await createRouteData(result, renderings, renderOptions, mode, apiConfig, compileRendering);
 }
 async function createRouteData(result, renderings, renderOptions, mode, apiConfig, compileRendering) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alpaca-headless/alpaca-headless",
-  "version": "1.0.541",
+  "version": "1.0.542",
   "type": "module",
   "description": "Alpaca Headless",
   "main": "dist/index.js",

package/src/components/Placeholder.tsx

@@ -221,6 +221,7 @@ export function renderPlaceholder(
                     (data as ComponentData)._editor?.linkedComponentItem?.id ||
                     data.id
                   }
+                  data-typeid={ (data as ComponentData).templateId}
                   data-layoutid={
                     (data as ComponentData)._editor?.hostingPageItem?.id
                   }

package/src/route-data/resolve-route.ts

@@ -37,14 +37,28 @@ const fetchRouteData = async (
   language: string,
   version: number,
   options: RenderOptions,
-  apiConfig?: ApiConfig,
-  editRevision?: string,
+  apiConfig?: ApiConfig,  
   siteName?: string
 ): Promise<Result> => {
-  const cache = globalThis.alpacaRouteDataCache;
-  const cacheKey =
-    editRevision + itemId + language + version + siteName + path + host + mode;
 
+  if(mode === "edit" || mode === "preview") {
+    return await doFetchRouteData(
+      path,
+      host,
+      mode,
+      itemId,
+      language,
+      version,
+      options,
+      apiConfig,
+      siteName
+    );
+  }
+
+  const cache = globalThis.alpacaRouteDataCache;
+  
+  const cacheKey = itemId + language + version + siteName + path + host;
+    
   if (cacheKey && cache[cacheKey]?.expiresOn > new Date()) {
     Object.keys(cache).forEach((key) => {
       if (cache[key].expiresOn < new Date()) {
@@ -180,7 +194,6 @@ export async function getPage({
   renderings,
   compileRendering,
   mode,
-  searchParams,
   apiConfig,
 }: GetPageParams): Promise<RouteData> {
   const result = await fetchRouteData(
@@ -191,8 +204,7 @@ export async function getPage({
     language,
     version,
     renderOptions,
-    apiConfig,
-    searchParams["edit_rev"],
+    apiConfig,    
     siteName
   );