Merge branch 'canary' into bugfix/middleware-windows

vercel · Oct 25, 2021 · 0a5b906 · 0a5b906
2 parents 4c76f37 + 467bf08
commit 0a5b906
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -543,6 +543,7 @@ export default async function getBaseWebpackConfig(
             util: require.resolve('util/'),
             vm: require.resolve('vm-browserify'),
             zlib: require.resolve('browserify-zlib'),
+            events: require.resolve('events'),
           },
         }
       : undefined),

diff --git a/packages/next/compiled/node-libs-browser/events.js b/packages/next/compiled/node-libs-browser/events.js
diff --git a/packages/next/package.json b/packages/next/package.json
@@ -85,6 +85,7 @@
     "domain-browser": "4.19.0",
     "encoding": "0.1.13",
     "etag": "1.8.1",
+    "events": "3.3.0",
     "find-cache-dir": "3.3.1",
     "get-orientation": "1.1.2",
     "https-browserify": "1.0.0",

diff --git a/yarn.lock b/yarn.lock
@@ -9136,15 +9136,15 @@ eventemitter3@^4.0.0, eventemitter3@^4.0.4:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
-events@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
-
-events@^3.2.0:
+events@3.3.0, events@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
+events@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
+
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"