From 0275fad5dc2dcae0184eee0b0e1710a0b5b25b2e Mon Sep 17 00:00:00 2001
From: GatsbyJS Bot <core-team@gatsbyjs.com>
Date: Fri, 18 Mar 2022 11:42:02 -0600
Subject: [PATCH] fix(gatsby-plugin-preact): fix preact alias (#35156) (#35169)

Co-authored-by: Ward Peeters <ward@coding-tech.com>
---
 .../src/__tests__/gatsby-node.js              | 24 +++++++------------
 .../gatsby-plugin-preact/src/gatsby-node.js   | 12 ++++------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/packages/gatsby-plugin-preact/src/__tests__/gatsby-node.js b/packages/gatsby-plugin-preact/src/__tests__/gatsby-node.js
index 35aeee0e47010..3ab7bd41fea84 100644
--- a/packages/gatsby-plugin-preact/src/__tests__/gatsby-node.js
+++ b/packages/gatsby-plugin-preact/src/__tests__/gatsby-node.js
@@ -29,14 +29,10 @@ describe(`gatsby-plugin-preact`, () => {
       plugins: expect.arrayContaining([expect.any(PreactRefreshPlugin)]),
       resolve: {
         alias: {
-          react: expect.stringContaining(path.join(`preact`, `compat`)),
-          "react-dom": expect.stringContaining(path.join(`preact`, `compat`)),
-          "react-dom/server": expect.stringContaining(
-            path.join(`preact`, `compat`, `server`)
-          ),
-          "react/jsx-runtime": expect.stringContaining(
-            path.join(`preact`, `jsx-runtime`)
-          ),
+          react: `preact/compat`,
+          "react-dom/test-utils": `preact/test-utils`,
+          "react-dom": `preact/compat`,
+          "react/jsx-runtime": `preact/jsx-runtime`,
         },
       },
     })
@@ -100,14 +96,10 @@ describe(`gatsby-plugin-preact`, () => {
       plugins: [],
       resolve: {
         alias: {
-          react: expect.stringContaining(path.join(`preact`, `compat`)),
-          "react-dom": expect.stringContaining(path.join(`preact`, `compat`)),
-          "react-dom/server": expect.stringContaining(
-            path.join(`preact`, `compat`, `server`)
-          ),
-          "react/jsx-runtime": expect.stringContaining(
-            path.join(`preact`, `jsx-runtime`)
-          ),
+          react: `preact/compat`,
+          "react-dom/test-utils": `preact/test-utils`,
+          "react-dom": `preact/compat`,
+          "react/jsx-runtime": `preact/jsx-runtime`,
         },
       },
     })
diff --git a/packages/gatsby-plugin-preact/src/gatsby-node.js b/packages/gatsby-plugin-preact/src/gatsby-node.js
index 9adf25bba8d97..a1698b0221746 100644
--- a/packages/gatsby-plugin-preact/src/gatsby-node.js
+++ b/packages/gatsby-plugin-preact/src/gatsby-node.js
@@ -59,17 +59,13 @@ export function onCreateWebpackConfig({ stage, actions, getConfig }) {
 
   actions.replaceWebpackConfig(webpackConfig)
 
-  const extension =
-    stage === `build-javascript` || stage === `develop` ? `.module.js` : `.js`
   actions.setWebpackConfig({
     resolve: {
       alias: {
-        react: require.resolve(`preact/compat`).replace(`.js`, extension),
-        "react-dom/server": require.resolve(`preact/compat/server`),
-        "react-dom": require.resolve(`preact/compat`).replace(`.js`, extension),
-        "react/jsx-runtime": require
-          .resolve(`preact/jsx-runtime`)
-          .replace(`.js`, extension),
+        react: `preact/compat`,
+        "react-dom/test-utils": `preact/test-utils`,
+        "react-dom": `preact/compat`,
+        "react/jsx-runtime": `preact/jsx-runtime`,
       },
     },
     plugins: webpackPlugins,