fix(vercel, netlify): handle boolean values for route rule deprecation

unjs · Jun 27, 2023 · dfd8bbd · dfd8bbd
1 parent ccebe4e
commit dfd8bbd
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/presets/netlify.ts b/src/presets/netlify.ts
@@ -212,23 +212,27 @@ function deprecateSWR(nitro: Nitro) {
   }
   let hasLegacyOptions = false;
   for (const [key, value] of Object.entries(nitro.options.routeRules)) {
-    if ("isr" in value) {
+    if (_hasProp(value, "isr")) {
       continue;
     }
     if (value.cache === false) {
       value.isr = false;
     }
-    if ("static" in value) {
-      value.isr = !value.static;
+    if (_hasProp(value, "static")) {
+      value.isr = !(value as { static: boolean }).static;
     }
-    if (value.cache && "swr" in value.cache) {
+    if (value && value.cache && _hasProp(value.cache, "swr")) {
       value.isr = value.cache.swr;
     }
-    hasLegacyOptions = hasLegacyOptions || "isr" in value;
+    hasLegacyOptions = hasLegacyOptions || _hasProp(value, "isr");
   }
   if (hasLegacyOptions) {
     console.warn(
       "[nitro] Nitro now uses `isr` option to configure ISR behavior on Netlify. Backwards-compatible support for `static` and `swr` support with Builder Functions will be removed in the future versions. Set `future.nativeSWR: true` nitro config disable this warning."
     );
   }
 }
+
+function _hasProp(obj: any, prop: string) {
+  return obj && typeof obj === "object" && prop in obj;
+}
diff --git a/src/presets/vercel.ts b/src/presets/vercel.ts
@@ -268,23 +268,27 @@ function deprecateSWR(nitro: Nitro) {
   }
   let hasLegacyOptions = false;
   for (const [key, value] of Object.entries(nitro.options.routeRules)) {
-    if ("isr" in value) {
+    if (_hasProp(value, "isr")) {
       continue;
     }
     if (value.cache === false) {
       value.isr = false;
     }
-    if ("static" in value) {
-      value.isr = !value.static;
+    if (_hasProp(value, "static")) {
+      value.isr = !(value as { static: boolean }).static;
     }
-    if (value.cache && "swr" in value.cache) {
+    if (value.cache && _hasProp(value.cache, "swr")) {
       value.isr = value.cache.swr;
     }
-    hasLegacyOptions = hasLegacyOptions || "isr" in value;
+    hasLegacyOptions = hasLegacyOptions || _hasProp(value, "isr");
   }
   if (hasLegacyOptions) {
     console.warn(
       "[nitro] Nitro now uses `isr` option to configure ISR behavior on Vercel. Backwards-compatible support for `static` and `swr` options within the Vercel Build Options API will be removed in the future versions. Set `future.nativeSWR: true` nitro config disable this warning."
     );
   }
 }
+
+function _hasProp(obj: any, prop: string) {
+  return obj && typeof obj === "object" && prop in obj;
+}