Add isDevfallback to cache name to create a separate cache for the fa…

…llback compiler (#30227)
vercel · Oct 24, 2021 · 417ad95 · 417ad95
1 parent 5d8f155
commit 417ad95
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -316,6 +316,7 @@ export default async function getBaseWebpackConfig(
           options: {
             isServer,
             pagesDir,
+            hasReactRefresh,
           },
         }
       : {
@@ -1513,6 +1514,11 @@ export default async function getBaseWebpackConfig(
     isCraCompat: config.experimental.craCompat,
   })
 
+  // @ts-ignore Cache exists
+  webpackConfig.cache.name = `${webpackConfig.name}-${webpackConfig.mode}${
+    isDevFallback ? '-fallback' : ''
+  }`
+
   let originalDevtool = webpackConfig.devtool
   if (typeof config.webpack === 'function') {
     webpackConfig = config.webpack(webpackConfig, {

diff --git a/packages/next/build/webpack/loaders/next-swc-loader.js b/packages/next/build/webpack/loaders/next-swc-loader.js
@@ -39,6 +39,7 @@ function getSWCOptions({
   isPageFile,
   pagesDir,
   isNextDist,
+  hasReactRefresh,
   isCommonJS,
 }) {
   const jsc = {
@@ -56,7 +57,7 @@ function getSWCOptions({
         throwIfNamespace: true,
         development: development,
         useBuiltins: true,
-        refresh: development && !isServer,
+        refresh: hasReactRefresh,
       },
       optimizer: {
         simplify: false,
@@ -122,7 +123,7 @@ async function loaderTransform(parentTrace, source, inputSourceMap) {
 
   let loaderOptions = getOptions(this) || {}
 
-  const { isServer, pagesDir } = loaderOptions
+  const { isServer, pagesDir, hasReactRefresh } = loaderOptions
   const isPageFile = filename.startsWith(pagesDir)
 
   const isNextDist = nextDistPath.test(filename)
@@ -136,6 +137,7 @@ async function loaderTransform(parentTrace, source, inputSourceMap) {
     development: this.mode === 'development',
     isNextDist,
     isCommonJS,
+    hasReactRefresh,
   })
 
   const programmaticOptions = {