Rename registerCustomResolver to registerCustomImageLoader

vercel · Dec 2, 2020 · f0e7dc0 · f0e7dc0
1 parent 6c3234a
commit f0e7dc0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/packages/next/client/image.tsx b/packages/next/client/image.tsx
@@ -61,7 +61,7 @@ export type ImageProps = Omit<
 
 const config =
   ((process.env.__NEXT_IMAGE_OPTS as any) as ImageConfig) || imageConfigDefault
-const configLoader = config.loader || config.resolver
+const configLoader = config.loader || 'default'
 const {
   deviceSizes: configDeviceSizes,
   imageSizes: configImageSizes,
@@ -102,24 +102,24 @@ type CallLoaderProps = {
 }
 type URLResolver = (resolverProps: CallLoaderProps) => string
 
-let customResolver: URLResolver
-let resolverError = false
-export function registerCustomResolver(resolver: URLResolver): void {
+let customLoader: URLResolver
+let loaderError = false
+export function registerCustomImageLoader(loader: URLResolver): void {
   if (configLoader !== 'custom') {
-    resolverError = true
+    loaderError = true
   }
-  customResolver = resolver
+  customLoader = loader
 }
 
 function callLoader(loaderProps: CallLoaderProps) {
   if (configLoader === 'custom') {
-    if (process.env.NODE_ENV !== 'production' && !customResolver) {
+    if (process.env.NODE_ENV !== 'production' && !customLoader) {
       throw new Error(
         `imageLoader has been set to 'custom' in next.config.js but no custom loader is defined. 
-        You must call registerCustomResolver in your _app.js file.`
+        You must call registerCustomImageLoader in your _app.js file.`
       )
     }
-    return customResolver(loaderProps)
+    return customLoader(loaderProps)
   }
 
   const load = loaders.get(configLoader)
@@ -253,9 +253,9 @@ export default function Image({
         `Image with src "${src}" has deprecated "unsized" property, which was removed in favor of the "layout='fill'" property`
       )
     }
-    if (resolverError) {
+    if (loaderError) {
       throw new Error(
-        `registerCustomResolver can only be used if image loader is set to 'custom' in next.config.js`
+        `registerCustomImageLoader can only be used if image loader is set to 'custom' in next.config.js`
       )
     }
   }

diff --git a/test/integration/image-component/custom-resolver/custom-app-not-config/pages/_app.js b/test/integration/image-component/custom-resolver/custom-app-not-config/pages/_app.js
@@ -1,6 +1,6 @@
-import { registerCustomResolver } from 'next/image'
+import { registerCustomImageLoader } from 'next/image'
 
-registerCustomResolver(({ src, width, quality }) => {
+registerCustomImageLoader(({ src, width, quality }) => {
   return `https://customresolver.com/${src}?w~~${width},q~~${quality}`
 })
 

diff --git a/test/integration/image-component/custom-resolver/custom-app-not-config/test/index.test.js b/test/integration/image-component/custom-resolver/custom-app-not-config/test/index.test.js
@@ -28,7 +28,7 @@ describe('Custom Resolver Tests', () => {
   it('should show "custom resolver registered but not in config" error', async () => {
     await hasRedbox(browser)
     expect(await getRedboxHeader(browser)).toContain(
-      `registerCustomResolver can only be used if image loader is set to 'custom' in next.config.js`
+      `registerCustomImageLoader can only be used if image loader is set to 'custom' in next.config.js`
     )
   })
 })
diff --git a/test/integration/image-component/custom-resolver/pages/_app.js b/test/integration/image-component/custom-resolver/pages/_app.js
@@ -1,6 +1,6 @@
-import { registerCustomResolver } from 'next/image'
+import { registerCustomImageLoader } from 'next/image'
 
-registerCustomResolver(({ src, width, quality }) => {
+registerCustomImageLoader(({ src, width, quality }) => {
   return `https://customresolver.com/${src}?w~~${width},q~~${quality}`
 })