Skip to content

Commit d8772ec

Browse files
authored
fix(DEV_SSR): set NODE_ENV to production for render-html worker process instead of pointing externals to production react (#29620)
* fix(gatsby): fix DEV_SSR by only setting react-dom/server to use prod version * Just set NODE_ENV to production
1 parent 4d4a7ab commit d8772ec

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

packages/gatsby/src/utils/dev-ssr/render-dev-html.ts

+10-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import JestWorker from "jest-worker"
22
import fs from "fs-extra"
33
import { joinPath } from "gatsby-core-utils"
44
import report from "gatsby-cli/lib/reporter"
5+
import { isCI } from "gatsby-core-utils"
56

67
import { startListener } from "../../bootstrap/requires-writer"
78
import { findPageByPath } from "../find-page-by-path"
@@ -13,7 +14,15 @@ const startWorker = (): any => {
1314
const newWorker = new JestWorker(require.resolve(`./render-dev-html-child`), {
1415
exposedMethods: [`renderHTML`, `deleteModuleCache`, `warmup`],
1516
numWorkers: 1,
16-
forkOptions: { silent: false },
17+
forkOptions: {
18+
silent: false,
19+
env: {
20+
...process.env,
21+
NODE_ENV: isCI() ? `production` : `development`,
22+
forceColors: true,
23+
GATSBY_EXPERIMENTAL_DEV_SSR: true,
24+
},
25+
},
1726
})
1827

1928
// jest-worker is lazy with forking but we want to fork immediately so the user

packages/gatsby/src/utils/webpack.config.js

+1-13
Original file line numberDiff line numberDiff line change
@@ -692,20 +692,8 @@ module.exports = async (
692692
// User modules that do not need to be part of the bundle
693693
if (userExternalList.some(item => checkItem(item, request))) {
694694
// TODO figure out to make preact work with this too
695-
let modifiedRequest = request
696-
if (
697-
stage === `develop-html` &&
698-
isCI() &&
699-
process.env.GATSBY_EXPERIMENTAL_DEV_SSR
700-
) {
701-
if (request === `react`) {
702-
modifiedRequest = `react/cjs/react.production.min.js`
703-
} else if (request === `react-dom/server`) {
704-
modifiedRequest = `react-dom/cjs/react-dom-server.node.production.min.js`
705-
}
706-
}
707695

708-
resolver(context, modifiedRequest, (err, newRequest) => {
696+
resolver(context, request, (err, newRequest) => {
709697
if (err) {
710698
callback(err)
711699
return

0 commit comments

Comments
 (0)