@epic-web/workshop-app 4.2.1 → 4.2.3

package/node_modules/@epic-web/client-hints/dist/index.js

@@ -36,32 +36,44 @@ export function getHintUtils(hints) {
      */
     function getClientHintCheckScript() {
         return `
-const cookies = document.cookie.split(';').map(c => c.trim()).reduce((acc, cur) => {
-	const [key, value] = cur.split('=');
-	acc[key] = value;
-	return acc;
-}, {});
-let cookieChanged = false;
-const hints = [
-${Object.values(hints)
+// This block of code allows us to check if the client hints have changed and
+// force a reload of the page with updated hints if they have so you don't get
+// a flash of incorrect content.
+function checkClientHints() {
+	if (!navigator.cookieEnabled) return;
+
+	// set a short-lived cookie to make sure we can set cookies
+	document.cookie = "canSetCookies=1; Max-Age=60; SameSite=Lax";
+	const canSetCookies = document.cookie.includes("canSetCookies=1");
+	document.cookie = "canSetCookies=; Max-Age=-1; path=/";
+	if (!canSetCookies) return;
+
+	const cookies = document.cookie.split(';').map(c => c.trim()).reduce((acc, cur) => {
+		const [key, value] = cur.split('=');
+		acc[key] = value;
+		return acc;
+	}, {});
+
+	let cookieChanged = false;
+	const hints = [
+	${Object.values(hints)
             .map((hint) => {
             const cookieName = JSON.stringify(hint.cookieName);
-            return `{ name: ${cookieName}, actual: String(${hint.getValueCode}), value: cookies[${cookieName}] ?? encodeURIComponent("${hint.fallback}") }`;
+            return `{ name: ${cookieName}, actual: String(${hint.getValueCode}), value: cookies[${cookieName}] != null ? cookies[${cookieName}] : encodeURIComponent("${hint.fallback}") }`;
         })
             .join(',\n')}
-];
-for (const hint of hints) {
-	document.cookie = encodeURIComponent(hint.name) + '=' + encodeURIComponent(hint.actual) + '; Max-Age=31536000; path=/';
-	if (decodeURIComponent(hint.value) !== hint.actual) {
-		cookieChanged = true;
+	];
+	for (const hint of hints) {
+		document.cookie = encodeURIComponent(hint.name) + '=' + encodeURIComponent(hint.actual) + '; Max-Age=31536000; path=/';
+		if (decodeURIComponent(hint.value) !== hint.actual) {
+			cookieChanged = true;
+		}
 	}
+	if (cookieChanged) window.location.reload();
 }
-// if the cookie changed, reload the page, unless the browser doesn't support
-// cookies (in which case we would enter an infinite loop of reloads)
-if (cookieChanged && navigator.cookieEnabled) {
-	window.location.reload();
-}
-			`;
+
+checkClientHints();
+`;
     }
     return { getHints, getClientHintCheckScript };
 }

package/node_modules/@epic-web/client-hints/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@epic-web/client-hints",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Server-render browser-based user preferences (like theme preference and timezone).",
   "publishConfig": {
     "access": "public"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@epic-web/workshop-app",
-  "version": "4.2.1",
+  "version": "4.2.3",
   "sideEffects": false,
   "publishConfig": {
     "access": "public"
@@ -38,12 +38,12 @@
     "@conform-to/react": "^1.0.3",
     "@conform-to/zod": "^1.0.3",
     "@epic-web/cachified": "^5.1.2",
-    "@epic-web/client-hints": "^1.3.0",
+    "@epic-web/client-hints": "^1.3.2",
     "@epic-web/invariant": "^1.0.0",
     "@epic-web/remember": "^1.0.2",
     "@epic-web/restore-scroll": "^1.0.1",
-    "@epic-web/workshop-presence": "4.2.1",
-    "@epic-web/workshop-utils": "4.2.1",
+    "@epic-web/workshop-presence": "4.2.3",
+    "@epic-web/workshop-utils": "4.2.3",
     "@mdx-js/mdx": "^3.0.1",
     "@mux/mux-player-react": "^2.3.3",
     "@paralleldrive/cuid2": "^2.2.2",