wrap in v4 tags

packages/gatsby/src/commands/build-html.ts

@@ -15,6 +15,7 @@ import { getPageData } from "../utils/get-page-data"
 
 import { Span } from "opentracing"
 import { IProgram, Stage } from "./types"
+import { ROUTES_DIRECTORY } from "../constants"
 import { PackageJson } from "../.."
 import type { GatsbyWorkerPool } from "../utils/worker/pool"
 import { IPageDataWithQueryResult } from "../utils/page-data"
@@ -125,7 +126,7 @@ const runWebpack = (
             } = require(`../utils/dev-ssr/render-dev-html`)
             // Make sure we use the latest version during development
             if (oldHash !== `` && newHash !== oldHash) {
-              restartWorker(`${directory}/.cache/_routes/render-page.js`)
+              restartWorker(`${directory}/${ROUTES_DIRECTORY}}render-page.js`)
             }
 
             oldHash = newHash
@@ -168,7 +169,7 @@ const doBuildRenderer = async (
 
   // render-page.js is hard coded in webpack.config
   return {
-    rendererPath: `${directory}/.cache/_routes/render-page.js`,
+    rendererPath: `${directory}/${ROUTES_DIRECTORY}render-page.js`,
     waitForCompilerClose,
   }
 }
@@ -186,6 +187,15 @@ export const buildRenderer = async (
   return doBuildRenderer(program, config, stage, parentSpan)
 }
 
+// TODO remove after v4 release and update cloud internals
+export const deleteRenderer = async (rendererPath: string): Promise<void> => {
+  try {
+    await fs.remove(rendererPath)
+    await fs.remove(`${rendererPath}.map`)
+  } catch (e) {
+    // This function will fail on Windows with no further consequences.
+  }
+}
 export interface IRenderHtmlResult {
   unsafeBuiltinsUsageByPagePath: Record<string, Array<string>>
 }
@@ -433,6 +443,14 @@ export async function buildHTMLPagesAndDeleteStaleArtifacts({
     reporter.info(`There are no new or changed html files to build.`)
   }
 
+  if (_CFLAGS_.GATSBY_MAJOR !== `4` && !program.keepPageRenderer) {
+    try {
+      await deleteRenderer(pageRenderer)
+    } catch (err) {
+      // pass through
+    }
+  }
+
   if (toDelete.length > 0) {
     const publicDir = path.join(program.directory, `public`)
     const deletePageDataActivityTimer = reporter.activityTimer(

packages/gatsby/src/constants.ts

@@ -0,0 +1,2 @@
+export const ROUTES_DIRECTORY =
+  _CFLAGS_.GATSBY_MAJOR === `4` ? `.cache/_routes/` : `public/`

packages/gatsby/src/utils/babel-loader-helpers.js

@@ -53,6 +53,18 @@ const prepareOptions = (babel, options = {}, resolve = require.resolve) => {
   ]
   const requiredPresets = []
 
+  // Stage specific plugins to add
+  if (
+    _CFLAGS_.GATSBY_MAJOR !== `4` &&
+    (stage === `build-html` || stage === `develop-html`)
+  ) {
+    requiredPlugins.push(
+      babel.createConfigItem([resolve(`babel-plugin-dynamic-import-node`)], {
+        type: `plugin`,
+      })
+    )
+  }
+
   if (stage === `develop`) {
     requiredPlugins.push(
       babel.createConfigItem([resolve(`react-refresh/babel`)], {

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

@@ -4,6 +4,7 @@ import nodePath from "path"
 import report from "gatsby-cli/lib/reporter"
 import { isCI } from "gatsby-core-utils"
 import { Stats } from "webpack"
+import { ROUTES_DIRECTORY } from "../../constants"
 import { startListener } from "../../bootstrap/requires-writer"
 import { findPageByPath } from "../find-page-by-path"
 import { getPageData as getPageDataExperimental } from "../get-page-data"
@@ -112,10 +113,11 @@ const ensurePathComponentInSSRBundle = async (
     report.panic(`page not found`, page)
   }
 
-  // Now check if it's written to .cache/_routes/render-page.js
+  // Now check if it's written to the correct path
   const htmlComponentRendererPath = nodePath.join(
     directory,
-    `.cache/_routes/render-page.js`
+    ROUTES_DIRECTORY,
+    `render-page.js`
   )
 
   // This search takes 1-10ms
@@ -232,7 +234,7 @@ export const renderDevHTML = ({
       })
     }
 
-    // Wait for .cache/_routes/render-page.js to update w/ the page component.
+    // Wait for html-renderer to update w/ the page component.
     const found = await ensurePathComponentInSSRBundle(pageObj, directory)
 
     // If we can't find the page, just force set isClientOnlyPage

packages/gatsby/src/utils/start-server.ts

@@ -52,6 +52,7 @@ import {
   writeVirtualLoadingIndicatorModule,
 } from "./loading-indicator"
 import { renderDevHTML } from "./dev-ssr/render-dev-html"
+import { ROUTES_DIRECTORY } from "../constants"
 
 type ActivityTracker = any // TODO: Replace this with proper type once reporter is typed
 
@@ -517,7 +518,7 @@ module.exports = {
           page: pathObj,
           skipSsr: req.query[`skip-ssr`] || false,
           store,
-          htmlComponentRendererPath: `${program.directory}/.cache/_routes/render-page.js`,
+          htmlComponentRendererPath: `${program.directory}/${ROUTES_DIRECTORY}render-page.js`,
           directory: program.directory,
         })
         res.status(200).send(renderResponse)
@@ -586,7 +587,7 @@ module.exports = {
             skipSsr: true,
             store,
             error: message,
-            htmlComponentRendererPath: `${program.directory}/.cache/_routes/render-page.js`,
+            htmlComponentRendererPath: `${program.directory}/${ROUTES_DIRECTORY}render-page.js`,
             directory: program.directory,
           })