Skip to content

Commit 770748d

Browse files
authored
fix(gatsby): [rendering engines] use results of exports removal if sourceMap was not generated alongside transformed code (#37282)
* fix(gatsby): [rendering engines] use results of exports removal if sourceMap was not generated alongside transformed code * chore: regenerate also page-ssr bundle in standalone-regenerate
1 parent 42a3034 commit 770748d

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

packages/gatsby/src/schema/graphql-engine/standalone-regenerate.ts

+16-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ node node_modules/gatsby/dist/schema/graphql-engine/standalone-regenerate.js
1818
*/
1919

2020
import { createGraphqlEngineBundle } from "./bundle-webpack"
21+
import { createPageSSRBundle } from "./../../utils/page-ssr-module/bundle-webpack"
2122
import reporter from "gatsby-cli/lib/reporter"
2223
import { loadConfigAndPlugins } from "../../utils/worker/child/load-config-and-plugins"
2324
import * as fs from "fs-extra"
25+
import { store } from "../../redux"
2426
import { validateEngines } from "../../utils/validate-engines"
2527

2628
async function run(): Promise<void> {
@@ -34,17 +36,30 @@ async function run(): Promise<void> {
3436
console.log(`clearing webpack cache\n\n`)
3537
// get rid of cache if it exist
3638
await fs.remove(process.cwd() + `/.cache/webpack/query-engine`)
39+
await fs.remove(process.cwd() + `/.cache/webpack/page-ssr`)
3740
} catch (e) {
3841
// eslint-disable no-empty
3942
}
4043

44+
const state = store.getState()
45+
4146
// recompile
4247
const buildActivityTimer = reporter.activityTimer(
4348
`Building Rendering Engines`
4449
)
4550
try {
4651
buildActivityTimer.start()
47-
await createGraphqlEngineBundle(process.cwd(), reporter, true)
52+
await Promise.all([
53+
createGraphqlEngineBundle(process.cwd(), reporter, true),
54+
createPageSSRBundle({
55+
rootDir: process.cwd(),
56+
components: store.getState().components,
57+
staticQueriesByTemplate: state.staticQueriesByTemplate,
58+
webpackCompilationHash: state.webpackCompilationHash, // we set webpackCompilationHash above
59+
reporter,
60+
isVerbose: state.program.verbose,
61+
}),
62+
])
4863
} catch (err) {
4964
buildActivityTimer.panic(err)
5065
} finally {

packages/gatsby/src/utils/webpack/loaders/webpack-remove-exports-loader.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ const webpackRemoveExportsLoader: LoaderDefinitionFunction<IOptions> =
4949
(err, result) => {
5050
if (err) {
5151
callback(err)
52-
} else if (result && result.code && result.map) {
53-
callback(null, result?.code, result?.map)
52+
} else if (result && result.code) {
53+
callback(null, result?.code, result?.map ?? undefined)
5454
} else {
5555
callback(null, source, sourceMap)
5656
}

0 commit comments

Comments
 (0)