Fix bug

vercel · Nov 2, 2021 · 34258bb · 34258bb
1 parent d13d1df
commit 34258bb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -1682,7 +1682,7 @@ export default async function getBaseWebpackConfig(
     productionBrowserSourceMaps: config.productionBrowserSourceMaps,
     future: config.future,
     experimental: config.experimental,
-    disableStaticImages: config.disableStaticImages,
+    disableStaticImages: config.images.disableStaticImages,
   })
 
   // @ts-ignore Cache exists

diff --git a/packages/next/build/webpack/config/index.ts b/packages/next/build/webpack/config/index.ts
@@ -55,9 +55,10 @@ export async function build(
     experimental,
   }
 
-  let fn = pipe(base(ctx), css(ctx))
+  let fns = [base(ctx), css(ctx)]
   if (!disableStaticImages) {
-    fn = pipe(fn, images(ctx))
+    fns.push(images(ctx))
   }
+  const fn = pipe(...fns)
   return fn(config)
 }
diff --git a/test/integration/invalid-document-image-import/test/index.test.js b/test/integration/invalid-document-image-import/test/index.test.js
@@ -22,15 +22,23 @@ describe('Invalid static image import in _document', () => {
     expect(stderr).toMatch(/Location:.*pages[\\/]_document\.js/)
   })
 
-  it('Should build without error when disableStaticImages in next.config.js', async () => {
+  it('Should fail to build when disableStaticImages in next.config.js', async () => {
     nextConfig.write(`
       module.exports = {
         images: {
           disableStaticImages: true
         }
       }
     `)
-    const { code } = await nextBuild(appDir, [], {})
-    expect(code).toBe(0)
+    const { code, stderr } = await nextBuild(appDir, [], {
+      stderr: true,
+    })
+    expect(code).not.toBe(0)
+    expect(stderr).toMatch(
+      /You may need an appropriate loader to handle this file type, currently no loaders are configured to process this file/
+    )
+    expect(stderr).not.toMatch(
+      /Images.*cannot.*be imported within.*pages[\\/]_document\.js/
+    )
   })
 })