diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
index 1e2dec27b00c06c81425ee276242fe5b74dd569f..d1f536f9a434132df4f6a855c46f5733ce2d8b25 100644
--- a/.github/workflows/build_test_deploy.yml
+++ b/.github/workflows/build_test_deploy.yml
@@ -148,7 +148,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - run: cat package.json | jq '.resolutions.webpack = "^5.0.0-beta.30"' > package.json.tmp && mv package.json.tmp package.json
+      - run: cat package.json | jq '.resolutions.webpack = "^5.11.1"' > package.json.tmp && mv package.json.tmp package.json
       - run: cat package.json | jq '.resolutions.react = "^17.0.1"' > package.json.tmp && mv package.json.tmp package.json
       - run: cat package.json | jq '.resolutions."react-dom" = "^17.0.1"' > package.json.tmp && mv package.json.tmp package.json
       - run: yarn install --check-files
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
index d8bebe133b5ee40cb4abd5ce58d89d6cd8d84b98..d3b6eed4742c121bdb564d5906130d68fc087a55 100644
--- a/packages/next/build/webpack-config.ts
+++ b/packages/next/build/webpack-config.ts
@@ -1131,6 +1131,7 @@ export default async function getBaseWebpackConfig(
       if (!webpackConfig.optimization) {
         webpackConfig.optimization = {}
       }
+      webpackConfig.optimization.providedExports = false
       webpackConfig.optimization.usedExports = false
     }
 
diff --git a/packages/next/build/webpack/plugins/font-stylesheet-gathering-plugin.ts b/packages/next/build/webpack/plugins/font-stylesheet-gathering-plugin.ts
index 183355eab31d4b6406a5603c216a8fb64205e176..f53e832985e5c3c5cd0d734aef8f7cfc571392db 100644
--- a/packages/next/build/webpack/plugins/font-stylesheet-gathering-plugin.ts
+++ b/packages/next/build/webpack/plugins/font-stylesheet-gathering-plugin.ts
@@ -71,12 +71,12 @@ export class FontStylesheetGatheringPlugin {
                 return
               }
               let result
-              if (node.name === '__jsx') {
+              if (node.name === '_jsx' || node.name === '__jsx') {
                 result = new BasicEvaluatedExpression()
                 // @ts-ignore
                 result.setRange(node.range)
                 result.setExpression(node)
-                result.setIdentifier('__jsx')
+                result.setIdentifier(node.name)
 
                 // This was added webpack 5.
                 if (isWebpack5) {
@@ -86,44 +86,50 @@ export class FontStylesheetGatheringPlugin {
               return result
             })
 
-          parser.hooks.call
-            .for('__jsx')
-            .tap(this.constructor.name, (node: namedTypes.CallExpression) => {
-              if (node.arguments.length !== 2) {
-                // A font link tag has only two arguments rel=stylesheet and href='...'
-                return
-              }
-              if (!isNodeCreatingLinkElement(node)) {
+          const jsxNodeHandler = (node: namedTypes.CallExpression) => {
+            if (node.arguments.length !== 2) {
+              // A font link tag has only two arguments rel=stylesheet and href='...'
+              return
+            }
+            if (!isNodeCreatingLinkElement(node)) {
+              return
+            }
+
+            // node.arguments[0] is the name of the tag and [1] are the props.
+            const propsNode = node.arguments[1] as namedTypes.ObjectExpression
+            const props: { [key: string]: string } = {}
+            propsNode.properties.forEach((prop) => {
+              if (prop.type !== 'Property') {
                 return
               }
-
-              // node.arguments[0] is the name of the tag and [1] are the props.
-              const propsNode = node.arguments[1] as namedTypes.ObjectExpression
-              const props: { [key: string]: string } = {}
-              propsNode.properties.forEach((prop) => {
-                if (prop.type !== 'Property') {
-                  return
-                }
-                if (
-                  prop.key.type === 'Identifier' &&
-                  prop.value.type === 'Literal'
-                ) {
-                  props[prop.key.name] = prop.value.value as string
-                }
-              })
               if (
-                !props.rel ||
-                props.rel !== 'stylesheet' ||
-                !props.href ||
-                !OPTIMIZED_FONT_PROVIDERS.some((url) =>
-                  props.href.startsWith(url)
-                )
+                prop.key.type === 'Identifier' &&
+                prop.value.type === 'Literal'
               ) {
-                return false
+                props[prop.key.name] = prop.value.value as string
               }
-
-              this.gatheredStylesheets.push(props.href)
             })
+            if (
+              !props.rel ||
+              props.rel !== 'stylesheet' ||
+              !props.href ||
+              !OPTIMIZED_FONT_PROVIDERS.some((url) =>
+                props.href.startsWith(url)
+              )
+            ) {
+              return false
+            }
+
+            this.gatheredStylesheets.push(props.href)
+          }
+          // React JSX transform:
+          parser.hooks.call
+            .for('_jsx')
+            .tap(this.constructor.name, jsxNodeHandler)
+          // Next.js JSX transform:
+          parser.hooks.call
+            .for('__jsx')
+            .tap(this.constructor.name, jsxNodeHandler)
         })
     }
   }
@@ -213,6 +219,10 @@ function isNodeCreatingLinkElement(node: namedTypes.CallExpression) {
   if (componentNode.type !== 'Literal') {
     return false
   }
+  // React has pragma: _jsx.
   // Next has pragma: __jsx.
-  return callee.name === '__jsx' && componentNode.value === 'link'
+  return (
+    (callee.name === '_jsx' || callee.name === '__jsx') &&
+    componentNode.value === 'link'
+  )
 }