Merge remote-tracking branch 'upstream/canary' into i18n/domain-redirect

vercel · Dec 29, 2020 · ab65feb · ab65feb
2 parents 3990850 + f2f9090
commit ab65feb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@ test/**/next-env.d.ts
 
 # Editors
 **/.idea
+**/.#*
 
 # examples
 examples/**/out

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -712,6 +712,8 @@ export default async function getBaseWebpackConfig(
     callback()
   }
 
+  const emacsLockfilePattern = '**/.#*'
+
   let webpackConfig: webpack.Configuration = {
     externals: !isServer
       ? // make sure importing "next" is handled gracefully for client
@@ -788,7 +790,13 @@ export default async function getBaseWebpackConfig(
       }
     },
     watchOptions: {
-      ignored: ['**/.git/**', '**/node_modules/**', '**/.next/**'],
+      ignored: [
+        '**/.git/**',
+        '**/node_modules/**',
+        '**/.next/**',
+        // can be removed after https://github.com/paulmillr/chokidar/issues/955 is released
+        emacsLockfilePattern,
+      ],
     },
     output: {
       ...(isWebpack5