@uniformdev/next-app-router 20.7.1-alpha.121 → 20.7.1-alpha.122

package/dist/cache.js

@@ -1845,7 +1845,8 @@ var DefaultDataClient = class {
       path: options.pageState.routePath,
       state: options.pageState.compositionState,
       withComponentIDs: true,
-      releaseId: options.pageState.releaseId
+      releaseId: options.pageState.releaseId,
+      locale: options.pageState.locale
     };
     const resolvedRoute = await this.getRouteFromApi({
       source: "pageState",

package/dist/cache.mjs

@@ -1834,7 +1834,8 @@ var DefaultDataClient = class {
       path: options.pageState.routePath,
       state: options.pageState.compositionState,
       withComponentIDs: true,
-      releaseId: options.pageState.releaseId
+      releaseId: options.pageState.releaseId,
+      locale: options.pageState.locale
     };
     const resolvedRoute = await this.getRouteFromApi({
       source: "pageState",

package/dist/index.d.mts

@@ -214,6 +214,7 @@ type CreateStaticParamsOptions = {
     rewrite?: (options: {
         path: string;
     }) => Promise<RewriteRequestPathResult | undefined>;
+    locale?: string;
 };
 /**
  * Function to generate all possible page states for the given paths in playground mode.

package/dist/index.d.ts

@@ -214,6 +214,7 @@ type CreateStaticParamsOptions = {
     rewrite?: (options: {
         path: string;
     }) => Promise<RewriteRequestPathResult | undefined>;
+    locale?: string;
 };
 /**
  * Function to generate all possible page states for the given paths in playground mode.

package/dist/index.esm.js

@@ -3356,7 +3356,8 @@ var createUniformPlaygroundStaticParams = async (options) => {
     runnables,
     path: route.compositionApiResponse.composition._id,
     keys: void 0,
-    state: route.compositionApiResponse.state
+    state: route.compositionApiResponse.state,
+    locale: options.locale
   });
   return (_a = choices == null ? void 0 : choices.map((code) => {
     return {
@@ -3369,7 +3370,7 @@ var createUniformStaticParams = async (options) => {
   const { paths, rewrite } = options;
   const codes = [];
   for (const path of paths) {
-    const pageStates = await processRoutePath({ path, rewrite });
+    const pageStates = await processRoutePath({ path, rewrite, locale: options.locale });
     if (pageStates) {
       codes.push(...pageStates);
     }
@@ -3382,7 +3383,8 @@ var createUniformStaticParams = async (options) => {
 };
 async function processRoutePath({
   path,
-  rewrite
+  rewrite,
+  locale
 }) {
   var _a;
   const routeClient = getRouteClient({
@@ -3403,7 +3405,8 @@ async function processRoutePath({
     runnables,
     path: resolvedPath,
     keys: rewrittenPath == null ? void 0 : rewrittenPath.keys,
-    state: CANVAS_PUBLISHED_STATE
+    state: CANVAS_PUBLISHED_STATE,
+    locale
   });
   return choices;
 }
@@ -3521,7 +3524,8 @@ var generatePossiblePageStates = ({
   runnables,
   path,
   keys,
-  state
+  state,
+  locale
 }) => {
   const dependencyMap = buildDependencyMap(runnables);
   const initialState = {
@@ -3532,7 +3536,8 @@ var generatePossiblePageStates = ({
     components: {},
     defaultConsent: void 0,
     previewMode: void 0,
-    rules: void 0
+    rules: void 0,
+    locale
   };
   const allStates = generateStatesRecursively(dependencyMap, void 0, initialState);
   return allStates.map((payload) => serializeEvaluationResult({ payload }));
@@ -3702,7 +3707,8 @@ var DefaultDataClient = class {
       path: options.pageState.routePath,
       state: options.pageState.compositionState,
       withComponentIDs: true,
-      releaseId: options.pageState.releaseId
+      releaseId: options.pageState.releaseId,
+      locale: options.pageState.locale
     };
     const resolvedRoute = await this.getRouteFromApi({
       source: "pageState",

package/dist/index.js

@@ -3377,7 +3377,8 @@ var createUniformPlaygroundStaticParams = async (options) => {
     runnables,
     path: route.compositionApiResponse.composition._id,
     keys: void 0,
-    state: route.compositionApiResponse.state
+    state: route.compositionApiResponse.state,
+    locale: options.locale
   });
   return (_a = choices == null ? void 0 : choices.map((code) => {
     return {
@@ -3390,7 +3391,7 @@ var createUniformStaticParams = async (options) => {
   const { paths, rewrite } = options;
   const codes = [];
   for (const path of paths) {
-    const pageStates = await processRoutePath({ path, rewrite });
+    const pageStates = await processRoutePath({ path, rewrite, locale: options.locale });
     if (pageStates) {
       codes.push(...pageStates);
     }
@@ -3403,7 +3404,8 @@ var createUniformStaticParams = async (options) => {
 };
 async function processRoutePath({
   path,
-  rewrite
+  rewrite,
+  locale
 }) {
   var _a;
   const routeClient = getRouteClient({
@@ -3424,7 +3426,8 @@ async function processRoutePath({
     runnables,
     path: resolvedPath,
     keys: rewrittenPath == null ? void 0 : rewrittenPath.keys,
-    state: CANVAS_PUBLISHED_STATE
+    state: CANVAS_PUBLISHED_STATE,
+    locale
   });
   return choices;
 }
@@ -3542,7 +3545,8 @@ var generatePossiblePageStates = ({
   runnables,
   path,
   keys,
-  state
+  state,
+  locale
 }) => {
   const dependencyMap = buildDependencyMap(runnables);
   const initialState = {
@@ -3553,7 +3557,8 @@ var generatePossiblePageStates = ({
     components: {},
     defaultConsent: void 0,
     previewMode: void 0,
-    rules: void 0
+    rules: void 0,
+    locale
   };
   const allStates = generateStatesRecursively(dependencyMap, void 0, initialState);
   return allStates.map((payload) => (0, import_next_app_router_shared8.serializeEvaluationResult)({ payload }));
@@ -3723,7 +3728,8 @@ var DefaultDataClient = class {
       path: options.pageState.routePath,
       state: options.pageState.compositionState,
       withComponentIDs: true,
-      releaseId: options.pageState.releaseId
+      releaseId: options.pageState.releaseId,
+      locale: options.pageState.locale
     };
     const resolvedRoute = await this.getRouteFromApi({
       source: "pageState",

package/dist/index.mjs

@@ -3356,7 +3356,8 @@ var createUniformPlaygroundStaticParams = async (options) => {
     runnables,
     path: route.compositionApiResponse.composition._id,
     keys: void 0,
-    state: route.compositionApiResponse.state
+    state: route.compositionApiResponse.state,
+    locale: options.locale
   });
   return (_a = choices == null ? void 0 : choices.map((code) => {
     return {
@@ -3369,7 +3370,7 @@ var createUniformStaticParams = async (options) => {
   const { paths, rewrite } = options;
   const codes = [];
   for (const path of paths) {
-    const pageStates = await processRoutePath({ path, rewrite });
+    const pageStates = await processRoutePath({ path, rewrite, locale: options.locale });
     if (pageStates) {
       codes.push(...pageStates);
     }
@@ -3382,7 +3383,8 @@ var createUniformStaticParams = async (options) => {
 };
 async function processRoutePath({
   path,
-  rewrite
+  rewrite,
+  locale
 }) {
   var _a;
   const routeClient = getRouteClient({
@@ -3403,7 +3405,8 @@ async function processRoutePath({
     runnables,
     path: resolvedPath,
     keys: rewrittenPath == null ? void 0 : rewrittenPath.keys,
-    state: CANVAS_PUBLISHED_STATE
+    state: CANVAS_PUBLISHED_STATE,
+    locale
   });
   return choices;
 }
@@ -3521,7 +3524,8 @@ var generatePossiblePageStates = ({
   runnables,
   path,
   keys,
-  state
+  state,
+  locale
 }) => {
   const dependencyMap = buildDependencyMap(runnables);
   const initialState = {
@@ -3532,7 +3536,8 @@ var generatePossiblePageStates = ({
     components: {},
     defaultConsent: void 0,
     previewMode: void 0,
-    rules: void 0
+    rules: void 0,
+    locale
   };
   const allStates = generateStatesRecursively(dependencyMap, void 0, initialState);
   return allStates.map((payload) => serializeEvaluationResult({ payload }));
@@ -3702,7 +3707,8 @@ var DefaultDataClient = class {
       path: options.pageState.routePath,
       state: options.pageState.compositionState,
       withComponentIDs: true,
-      releaseId: options.pageState.releaseId
+      releaseId: options.pageState.releaseId,
+      locale: options.pageState.locale
     };
     const resolvedRoute = await this.getRouteFromApi({
       source: "pageState",

package/dist/middleware.d.mts

@@ -57,6 +57,10 @@ type HandleOptions = {
      * If not provided, middleware will use the server config default consent or false if not set.
      */
     defaultConsent?: boolean | undefined;
+    /**
+     * If provided, the middleware will use this locale to resolve the route.
+     */
+    locale?: string;
 };
 declare const uniformMiddleware: (options?: HandleOptions) => (request: NextRequest) => Promise<NextResponse<unknown>>;
 declare const handleUniformRoute: ({ request, dataClient, ...options }: HandleOptions & {

package/dist/middleware.d.ts

@@ -57,6 +57,10 @@ type HandleOptions = {
      * If not provided, middleware will use the server config default consent or false if not set.
      */
     defaultConsent?: boolean | undefined;
+    /**
+     * If provided, the middleware will use this locale to resolve the route.
+     */
+    locale?: string;
 };
 declare const uniformMiddleware: (options?: HandleOptions) => (request: NextRequest) => Promise<NextResponse<unknown>>;
 declare const handleUniformRoute: ({ request, dataClient, ...options }: HandleOptions & {

package/dist/middleware.js

@@ -5015,7 +5015,8 @@ var DefaultDataClient = class {
       path: options.pageState.routePath,
       state: options.pageState.compositionState,
       withComponentIDs: true,
-      releaseId: options.pageState.releaseId
+      releaseId: options.pageState.releaseId,
+      locale: options.pageState.locale
     };
     const resolvedRoute = await this.getRouteFromApi({
       source: "pageState",
@@ -5324,32 +5325,6 @@ var calculateScoreChanges = ({
   return changes;
 };
 
-// src/middleware/generateETag.ts
-var generateETag = ({ pageState, modified }) => {
-  const pieces = [modified.valueOf().toString()];
-  const shortKeys = {};
-  const sortedComponentKeys = Object.keys(pageState.components).sort();
-  sortedComponentKeys.forEach((key) => {
-    const value = pageState.components[key];
-    for (let i = 0; i < key.length; i++) {
-      const shortKey = key.slice(0, i + 1);
-      if (!shortKeys[shortKey]) {
-        shortKeys[shortKey] = true;
-        pieces.push(shortKey);
-        break;
-      }
-    }
-    if (value.indexes) {
-      pieces.push(...value.indexes.map((index) => index.toString()));
-    }
-    if (typeof value.visibility === "boolean") {
-      pieces.push(value.visibility ? "0" : "1");
-    }
-  });
-  const eTag = pieces.join("-");
-  return eTag;
-};
-
 // src/middleware/resolveRoute.ts
 var resolveRoute = async ({
   path,
@@ -5357,7 +5332,8 @@ var resolveRoute = async ({
   searchParams,
   draftModeEnabled,
   dataClient,
-  releaseId
+  releaseId,
+  locale
 }) => {
   var _a;
   let result;
@@ -5370,7 +5346,8 @@ var resolveRoute = async ({
         searchParams,
         draftModeEnabled,
         dataClient,
-        releaseId
+        releaseId,
+        locale
       });
     } catch (e) {
       console.warn(`Failed to retrieve route by path: ${path} with state ${state}`, e);
@@ -5387,7 +5364,8 @@ var retrieveRouteByPath = async ({
   searchParams,
   draftModeEnabled,
   dataClient,
-  releaseId
+  releaseId,
+  locale
 }) => {
   var _a;
   return await dataClient.getRoute({
@@ -5400,7 +5378,8 @@ var retrieveRouteByPath = async ({
       dataSourceVariant: getDataSourceVariantFromRouteGetParams({}, state),
       withComponentIDs: true,
       withContentSourceMap: (_a = getServerConfig().experimental) == null ? void 0 : _a.vercelVisualEditing,
-      releaseId
+      releaseId,
+      locale
     }
   });
 };
@@ -5559,7 +5538,8 @@ var handlePlaygroundRequest = async ({
       isDraftModeEnabled: true
       // this is checked above
     }),
-    rules
+    rules,
+    locale: options.locale
   };
   const code = (0, import_next_app_router_shared5.serializeEvaluationResult)({
     payload: pageState
@@ -5595,7 +5575,8 @@ var handleRouteRequest = async ({
       searchParams: request.nextUrl.searchParams,
       draftModeEnabled,
       dataClient,
-      releaseId: (_c = options.release) == null ? void 0 : _c.id
+      releaseId: (_c = options.release) == null ? void 0 : _c.id,
+      locale: options.locale
     }),
     createOnDemandContext({
       cookies: request.cookies,
@@ -5682,24 +5663,9 @@ var handleRouteRequest = async ({
       defaultConsent: options.defaultConsent
     }),
     previewMode,
-    rules
+    rules,
+    locale: options.locale
   };
-  const eTagsConfig = serverConfig2.eTags;
-  const generateETags = typeof (eTagsConfig == null ? void 0 : eTagsConfig.generateETags) === "boolean" ? eTagsConfig.generateETags : false;
-  let eTag = void 0;
-  if (state === CANVAS_PUBLISHED_STATE && generateETags) {
-    eTag = generateETag({ pageState, modified: new Date(route.compositionApiResponse.modified) });
-    const ifNoneMatch = request.headers.get("If-None-Match");
-    const quotedETag = `"${eTag}"`;
-    if (ifNoneMatch === quotedETag) {
-      return new import_server.NextResponse(null, {
-        status: 304,
-        headers: {
-          ETag: quotedETag
-        }
-      });
-    }
-  }
   const code = (0, import_next_app_router_shared5.serializeEvaluationResult)({
     payload: pageState
   });
@@ -5708,13 +5674,6 @@ var handleRouteRequest = async ({
     pathToRewriteTo = `/uniform/${code}`;
   }
   const headers = new Headers();
-  if (eTag) {
-    const eTagCacheControl = typeof (eTagsConfig == null ? void 0 : eTagsConfig.cacheControl) !== "undefined" ? eTagsConfig.cacheControl : "no-cache, must-revalidate";
-    headers.append("ETag", `"${eTag}"`);
-    if (eTagCacheControl) {
-      headers.append("Cache-Control", eTagCacheControl);
-    }
-  }
   if (serializedScoreCookie) {
     headers.append(
       "Set-Cookie",
@@ -5763,7 +5722,8 @@ var extractAndEvaluateRunnables = async ({
         releaseId,
         defaultConsent,
         previewMode,
-        rules: void 0
+        rules: void 0,
+        locale: void 0
       }
     }
   });

package/dist/middleware.mjs

@@ -5005,7 +5005,8 @@ var DefaultDataClient = class {
       path: options.pageState.routePath,
       state: options.pageState.compositionState,
       withComponentIDs: true,
-      releaseId: options.pageState.releaseId
+      releaseId: options.pageState.releaseId,
+      locale: options.pageState.locale
     };
     const resolvedRoute = await this.getRouteFromApi({
       source: "pageState",
@@ -5319,32 +5320,6 @@ var calculateScoreChanges = ({
   return changes;
 };
 
-// src/middleware/generateETag.ts
-var generateETag = ({ pageState, modified }) => {
-  const pieces = [modified.valueOf().toString()];
-  const shortKeys = {};
-  const sortedComponentKeys = Object.keys(pageState.components).sort();
-  sortedComponentKeys.forEach((key) => {
-    const value = pageState.components[key];
-    for (let i = 0; i < key.length; i++) {
-      const shortKey = key.slice(0, i + 1);
-      if (!shortKeys[shortKey]) {
-        shortKeys[shortKey] = true;
-        pieces.push(shortKey);
-        break;
-      }
-    }
-    if (value.indexes) {
-      pieces.push(...value.indexes.map((index) => index.toString()));
-    }
-    if (typeof value.visibility === "boolean") {
-      pieces.push(value.visibility ? "0" : "1");
-    }
-  });
-  const eTag = pieces.join("-");
-  return eTag;
-};
-
 // src/middleware/resolveRoute.ts
 var resolveRoute = async ({
   path,
@@ -5352,7 +5327,8 @@ var resolveRoute = async ({
   searchParams,
   draftModeEnabled,
   dataClient,
-  releaseId
+  releaseId,
+  locale
 }) => {
   var _a;
   let result;
@@ -5365,7 +5341,8 @@ var resolveRoute = async ({
         searchParams,
         draftModeEnabled,
         dataClient,
-        releaseId
+        releaseId,
+        locale
       });
     } catch (e) {
       console.warn(`Failed to retrieve route by path: ${path} with state ${state}`, e);
@@ -5382,7 +5359,8 @@ var retrieveRouteByPath = async ({
   searchParams,
   draftModeEnabled,
   dataClient,
-  releaseId
+  releaseId,
+  locale
 }) => {
   var _a;
   return await dataClient.getRoute({
@@ -5395,7 +5373,8 @@ var retrieveRouteByPath = async ({
       dataSourceVariant: getDataSourceVariantFromRouteGetParams({}, state),
       withComponentIDs: true,
       withContentSourceMap: (_a = getServerConfig().experimental) == null ? void 0 : _a.vercelVisualEditing,
-      releaseId
+      releaseId,
+      locale
     }
   });
 };
@@ -5554,7 +5533,8 @@ var handlePlaygroundRequest = async ({
       isDraftModeEnabled: true
       // this is checked above
     }),
-    rules
+    rules,
+    locale: options.locale
   };
   const code = serializeEvaluationResult({
     payload: pageState
@@ -5590,7 +5570,8 @@ var handleRouteRequest = async ({
       searchParams: request.nextUrl.searchParams,
       draftModeEnabled,
       dataClient,
-      releaseId: (_c = options.release) == null ? void 0 : _c.id
+      releaseId: (_c = options.release) == null ? void 0 : _c.id,
+      locale: options.locale
     }),
     createOnDemandContext({
       cookies: request.cookies,
@@ -5677,24 +5658,9 @@ var handleRouteRequest = async ({
       defaultConsent: options.defaultConsent
     }),
     previewMode,
-    rules
+    rules,
+    locale: options.locale
   };
-  const eTagsConfig = serverConfig2.eTags;
-  const generateETags = typeof (eTagsConfig == null ? void 0 : eTagsConfig.generateETags) === "boolean" ? eTagsConfig.generateETags : false;
-  let eTag = void 0;
-  if (state === CANVAS_PUBLISHED_STATE && generateETags) {
-    eTag = generateETag({ pageState, modified: new Date(route.compositionApiResponse.modified) });
-    const ifNoneMatch = request.headers.get("If-None-Match");
-    const quotedETag = `"${eTag}"`;
-    if (ifNoneMatch === quotedETag) {
-      return new NextResponse(null, {
-        status: 304,
-        headers: {
-          ETag: quotedETag
-        }
-      });
-    }
-  }
   const code = serializeEvaluationResult({
     payload: pageState
   });
@@ -5703,13 +5669,6 @@ var handleRouteRequest = async ({
     pathToRewriteTo = `/uniform/${code}`;
   }
   const headers = new Headers();
-  if (eTag) {
-    const eTagCacheControl = typeof (eTagsConfig == null ? void 0 : eTagsConfig.cacheControl) !== "undefined" ? eTagsConfig.cacheControl : "no-cache, must-revalidate";
-    headers.append("ETag", `"${eTag}"`);
-    if (eTagCacheControl) {
-      headers.append("Cache-Control", eTagCacheControl);
-    }
-  }
   if (serializedScoreCookie) {
     headers.append(
       "Set-Cookie",
@@ -5758,7 +5717,8 @@ var extractAndEvaluateRunnables = async ({
         releaseId,
         defaultConsent,
         previewMode,
-        rules: void 0
+        rules: void 0,
+        locale: void 0
       }
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/next-app-router",
-  "version": "20.7.1-alpha.121+a4f284458c",
+  "version": "20.7.1-alpha.122+165bd517ae",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -86,12 +86,12 @@
     "typescript": "5.9.2"
   },
   "dependencies": {
-    "@uniformdev/canvas-react": "20.7.1-alpha.121+a4f284458c",
-    "@uniformdev/next-app-router-client": "20.7.1-alpha.121+a4f284458c",
-    "@uniformdev/next-app-router-shared": "20.7.1-alpha.121+a4f284458c",
-    "@uniformdev/redirect": "20.7.1-alpha.121+a4f284458c",
-    "@uniformdev/richtext": "20.7.1-alpha.121+a4f284458c",
-    "@uniformdev/webhooks": "20.7.1-alpha.121+a4f284458c",
+    "@uniformdev/canvas-react": "20.7.1-alpha.122+165bd517ae",
+    "@uniformdev/next-app-router-client": "20.7.1-alpha.122+165bd517ae",
+    "@uniformdev/next-app-router-shared": "20.7.1-alpha.122+165bd517ae",
+    "@uniformdev/redirect": "20.7.1-alpha.122+165bd517ae",
+    "@uniformdev/richtext": "20.7.1-alpha.122+165bd517ae",
+    "@uniformdev/webhooks": "20.7.1-alpha.122+165bd517ae",
     "@vercel/functions": "^2.2.2",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
@@ -108,5 +108,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a4f284458cffb24442299a5210bdad47c05aada3"
+  "gitHead": "165bd517ae4be47e55ffc82dbbcfa5f116eed371"
 }