Merge remote-tracking branch 'upstream/canary' into update/polyfill-test

packages/next/build/babel/loader/get-config.ts

@@ -6,6 +6,7 @@ import loadConfig from 'next/dist/compiled/babel/core-lib-config'
 
 import { NextBabelLoaderOptions, NextJsLoaderContext } from './types'
 import { consumeIterator } from './util'
+import * as Log from '../../output/log'
 
 const nextDistPath = /(next[\\/]dist[\\/]next-server[\\/]lib)|(next[\\/]dist[\\/]client)|(next[\\/]dist[\\/]pages)/
 
@@ -181,11 +182,6 @@ function getFreshConfig(
     configFile,
   } = loaderOptions
 
-  // Ensures webpack invalidates the cache for this loader when the config file changes
-  if (configFile) {
-    this.addDependency(configFile)
-  }
-
   let customConfig: any = configFile
     ? getCustomBabelConfig(configFile)
     : undefined
@@ -329,6 +325,11 @@ export default function getConfig(
     filename
   )
 
+  if (loaderOptions.configFile) {
+    // Ensures webpack invalidates the cache for this loader when the config file changes
+    this.addDependency(loaderOptions.configFile)
+  }
+
   const cacheKey = getCacheKey(cacheCharacteristics)
   if (configCache.has(cacheKey)) {
     const cachedConfig = configCache.get(cacheKey)
@@ -345,6 +346,12 @@ export default function getConfig(
     }
   }
 
+  if (loaderOptions.configFile) {
+    Log.info(
+      `Using external babel configuration from ${loaderOptions.configFile}`
+    )
+  }
+
   const freshConfig = getFreshConfig.call(
     this,
     cacheCharacteristics,

packages/next/lib/typescript/writeAppTypeDeclarations.ts

@@ -17,6 +17,10 @@ export async function writeAppTypeDeclarations(
       os.EOL +
       (imageImportsEnabled
         ? '/// <reference types="next/image-types/global" />' + os.EOL
-        : '')
+        : '') +
+      os.EOL +
+      '// NOTE: This file should not be edited' +
+      os.EOL +
+      '// see https://nextjs.org/docs/basic-features/typescript for more information.'
   )
 }