Handle attempt to use non-initted cache

gatsbyjs · Jan 16, 2020 · d824c6c · d824c6c
1 parent 18243df
commit d824c6c
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/packages/gatsby/src/utils/cache.ts b/packages/gatsby/src/utils/cache.ts
@@ -53,8 +53,11 @@ export default class Cache {
 
   get<T = unknown>(key): Promise<T | undefined> {
     return new Promise(resolve => {
-      // eslint-disable-next-line no-unused-expressions
-      this.cache?.get<T>(key, (err, res) => {
+      if (!this.cache) {
+        resolve(undefined)
+        return
+      }
+      this.cache.get<T>(key, (err, res) => {
         resolve(err ? undefined : res)
       })
     })
@@ -66,8 +69,11 @@ export default class Cache {
     args: CachingConfig = { ttl: TTL }
   ): Promise<T | undefined> {
     return new Promise(resolve => {
-      // eslint-disable-next-line no-unused-expressions
-      this.cache?.set(key, value, args, err => {
+      if (!this.cache) {
+        resolve(undefined)
+        return
+      }
+      this.cache.set(key, value, args, err => {
         resolve(err ? undefined : value)
       })
     })