5-plugins-use-webpack-from-gatsby.patch

diff --git a/packages/gatsby-plugin-mdx/package.json b/packages/gatsby-plugin-mdx/package.json
index 4fa83e356f..4e18ac3fa0 100644
--- a/packages/gatsby-plugin-mdx/package.json
+++ b/packages/gatsby-plugin-mdx/package.json
@@ -14,6 +14,7 @@
     "directory": "packages/gatsby-plugin-mdx"
   },
   "peerDependencies": {
+    "gatsby": "^4.0.0-alpha-9689ff",
     "@mdx-js/mdx": "^1.0.0",
     "@mdx-js/react": "^1.0.0",
     "react": "^16.9.0 || ^17.0.0",
diff --git a/packages/gatsby-plugin-mdx/utils/render-html.js b/packages/gatsby-plugin-mdx/utils/render-html.js
index 16d1080b21..ab390241b3 100644
--- a/packages/gatsby-plugin-mdx/utils/render-html.js
+++ b/packages/gatsby-plugin-mdx/utils/render-html.js
@@ -1,4 +1,4 @@
-const webpack = require(`webpack`)
+const webpack = require(`gatsby/webpack`)
 const path = require(`path`)
 const evaluate = require(`eval`)
 const debug = require(`debug`)(`gatsby-plugin-mdx:render-html`)
diff --git a/packages/gatsby-plugin-netlify-cms/package.json b/packages/gatsby-plugin-netlify-cms/package.json
index cdd3644243..c84c97d074 100644
--- a/packages/gatsby-plugin-netlify-cms/package.json
+++ b/packages/gatsby-plugin-netlify-cms/package.json
@@ -15,8 +15,7 @@
     "html-webpack-tags-plugin": "^3.0.1",
     "lodash": "^4.17.21",
     "mini-css-extract-plugin": "1.6.2",
-    "netlify-identity-widget": "^1.9.2",
-    "webpack": "^5.35.0"
+    "netlify-identity-widget": "^1.9.2"
   },
   "devDependencies": {
     "@babel/cli": "^7.15.4",
@@ -40,7 +39,8 @@
     "gatsby": "^4.0.0-alpha-9689ff",
     "netlify-cms-app": "^2.9.0",
     "react": "^16.9.0 || ^17.0.0",
-    "react-dom": "^16.9.0 || ^17.0.0"
+    "react-dom": "^16.9.0 || ^17.0.0",
+    "webpack": "^5.0.0"
   },
   "repository": {
     "type": "git",
diff --git a/packages/gatsby-plugin-netlify-cms/src/gatsby-node.js b/packages/gatsby-plugin-netlify-cms/src/gatsby-node.js
index 3f060702bb..bb04a2a389 100644
--- a/packages/gatsby-plugin-netlify-cms/src/gatsby-node.js
+++ b/packages/gatsby-plugin-netlify-cms/src/gatsby-node.js
@@ -1,6 +1,6 @@
 import path from "path"
 import { mapValues, isPlainObject, trim } from "lodash"
-import webpack from "webpack"
+import webpack from "gatsby/webpack"
 import HtmlWebpackPlugin from "html-webpack-plugin"
 import { HtmlWebpackSkipAssetsPlugin } from "html-webpack-skip-assets-plugin"
 import MiniCssExtractPlugin from "mini-css-extract-plugin"