@alpaca-headless/alpaca-headless 1.0.4094 → 1.0.4095

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.
@@ -3,10 +3,10 @@ import { apiPostObject } from "../services/api";
3
3
  if (!globalThis.alpacaRouteDataCache) {
4
4
  globalThis.alpacaRouteDataCache = {};
5
5
  }
6
- const fetchRouteData = async ({ path, host, mode, itemId, language, version, options, apiConfig, editRev, siteName }) => {
6
+ const fetchRouteData = async ({ path, host, mode, itemId, language, version, options, apiConfig, editRev, siteName, urlSearchParams }) => {
7
7
  var _a;
8
8
  if ((mode === "edit" || mode === "preview") && !editRev) {
9
- return await doFetchRouteData(path, host, mode, itemId, language, version, options, apiConfig, siteName);
9
+ return await doFetchRouteData(path, host, mode, itemId, language, version, options, apiConfig, siteName, urlSearchParams);
10
10
  }
11
11
  const cache = globalThis.alpacaRouteDataCache;
12
12
  const cacheKey = itemId + language + version + siteName + path + host + editRev + mode;
@@ -19,12 +19,12 @@ const fetchRouteData = async ({ path, host, mode, itemId, language, version, opt
19
19
  return Object.assign({}, (await cache[cacheKey].result));
20
20
  }
21
21
  const cacheEntry = (cache[cacheKey] = {
22
- result: doFetchRouteData(path, host, mode, itemId, language, version, options, apiConfig, siteName),
22
+ result: doFetchRouteData(path, host, mode, itemId, language, version, options, apiConfig, siteName, urlSearchParams),
23
23
  expiresOn: new Date(Date.now() + 1000 * 5),
24
24
  });
25
25
  return Object.assign({}, (await cacheEntry.result));
26
26
  };
27
- const doFetchRouteData = async (path, host, mode, itemId, language, version, options, apiConfig, siteName) => {
27
+ const doFetchRouteData = async (path, host, mode, itemId, language, version, options, apiConfig, siteName, urlSearchParams) => {
28
28
  const request = {
29
29
  path,
30
30
  host,
@@ -34,6 +34,7 @@ const doFetchRouteData = async (path, host, mode, itemId, language, version, opt
34
34
  version,
35
35
  siteName,
36
36
  options,
37
+ urlSearchParams
37
38
  };
38
39
  console.log(`@Fetching page layout. Host:${request.host} Path: ${request.path}`, request);
39
40
  const startTime = performance.now();
@@ -124,6 +125,7 @@ export async function resolveRoute({ path, searchParams, host, renderOptions, re
124
125
  options: renderOptions,
125
126
  apiConfig,
126
127
  editRev: searchParams["edit_rev"],
128
+ urlSearchParams: new URLSearchParams(searchParams).toString()
127
129
  });
128
130
  return await createRouteData(result, renderings, renderOptions, mode, apiConfig, compileRendering);
129
131
  }
@@ -52,6 +52,7 @@ export async function apiPostObject(route, object, config) {
52
52
  console.log("apiPostObject: Posting to", url);
53
53
  try {
54
54
  const response = await axios.post(url, body, {
55
+ maxRedirects: 0,
55
56
  headers: requestHeaders,
56
57
  });
57
58
  return {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@alpaca-headless/alpaca-headless",
3
- "version": "1.0.4094",
3
+ "version": "1.0.4095",
4
4
  "type": "module",
5
5
  "description": "Alpaca Headless",
6
6
  "main": "dist/index.js",
@@ -40,7 +40,8 @@ const fetchRouteData = async (
40
40
  options,
41
41
  apiConfig,
42
42
  editRev,
43
- siteName
43
+ siteName,
44
+ urlSearchParams
44
45
  } : {
45
46
  path: string,
46
47
  host: string,
@@ -51,7 +52,8 @@ const fetchRouteData = async (
51
52
  options: RenderOptions,
52
53
  apiConfig?: ApiConfig,
53
54
  siteName?: string,
54
- editRev?: string
55
+ editRev?: string,
56
+ urlSearchParams?: string
55
57
  }
56
58
  ): Promise<Result> => {
57
59
 
@@ -65,7 +67,8 @@ const fetchRouteData = async (
65
67
  version,
66
68
  options,
67
69
  apiConfig,
68
- siteName
70
+ siteName,
71
+ urlSearchParams
69
72
  );
70
73
  }
71
74
 
@@ -94,7 +97,8 @@ const fetchRouteData = async (
94
97
  version,
95
98
  options,
96
99
  apiConfig,
97
- siteName
100
+ siteName,
101
+ urlSearchParams
98
102
  ),
99
103
  expiresOn: new Date(Date.now() + 1000 * 5),
100
104
  });
@@ -111,7 +115,8 @@ const doFetchRouteData = async (
111
115
  version: number,
112
116
  options: RenderOptions,
113
117
  apiConfig?: ApiConfig,
114
- siteName?: string
118
+ siteName?: string,
119
+ urlSearchParams?: string
115
120
  ): Promise<Result> => {
116
121
  const request = {
117
122
  path,
@@ -122,6 +127,7 @@ const doFetchRouteData = async (
122
127
  version,
123
128
  siteName,
124
129
  options,
130
+ urlSearchParams
125
131
  };
126
132
 
127
133
  console.log(
@@ -314,7 +320,8 @@ export async function resolveRoute({
314
320
  version: parseInt(searchParams["version"]),
315
321
  options: renderOptions,
316
322
  apiConfig,
317
- editRev: searchParams["edit_rev"],
323
+ editRev: searchParams["edit_rev"],
324
+ urlSearchParams: new URLSearchParams(searchParams).toString()
318
325
  });
319
326
 
320
327
  return await createRouteData(
@@ -86,6 +86,7 @@ export async function apiPostObject(
86
86
  console.log("apiPostObject: Posting to", url);
87
87
  try {
88
88
  const response: AxiosResponse = await axios.post(url, body, {
89
+ maxRedirects: 0,
89
90
  headers: requestHeaders,
90
91
  });
91
92