Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(gatsby): add webpack file to export same version #33126

Merged
merged 2 commits into from
Sep 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions packages/gatsby-plugin-netlify-cms/src/gatsby-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,11 @@ exports.onCreateWebpackConfig = (
}),

// Pass in needed Gatsby config values.
new webpack.DefinePlugin({
plugins.define({
__PATH__PREFIX__: pathPrefix,
CMS_PUBLIC_PATH: JSON.stringify(publicPath),
CMS_MANUAL_INIT: JSON.stringify(manualInit),
PRODUCTION: JSON.stringify(stage !== `develop`),
}),

new CopyPlugin({
Expand All @@ -225,11 +227,6 @@ exports.onCreateWebpackConfig = (
tags: externals.map(({ assetName }) => assetName),
append: false,
}),

new webpack.DefinePlugin({
CMS_MANUAL_INIT: JSON.stringify(manualInit),
PRODUCTION: JSON.stringify(stage !== `develop`),
}),
].filter(p => p),

// Remove common chunks style optimizations from Gatsby's default
Expand Down Expand Up @@ -281,7 +278,7 @@ exports.onCreateWebpackConfig = (
plugins: enableIdentityWidget
? []
: [
new webpack.IgnorePlugin({
plugins.ignore({
resourceRegExp: /^netlify-identity-widget$/,
}),
],
Expand Down
3 changes: 3 additions & 0 deletions packages/gatsby/webpack.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import webpack from "webpack"

export = webpack
3 changes: 3 additions & 0 deletions packages/gatsby/webpack.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
"use strict"

module.exports = require('webpack');
58 changes: 58 additions & 0 deletions patches/v4/5-plugins-use-webpack-from-gatsby.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
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"