fix(gatsby): Partial hydration loader commented out directive case (g…

…atsbyjs#36941)
codemancers · Nov 1, 2022 · 8b26fa0 · 8b26fa0
1 parent 7dfa673
commit 8b26fa0
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/.../utils/webpack/loaders/__tests__/__snapshots__/partial-hydration-reference-loader.ts.snap b/.../utils/webpack/loaders/__tests__/__snapshots__/partial-hydration-reference-loader.ts.snap
@@ -15,6 +15,12 @@ export const c = {
 
 exports[`covers cases shown in fixtures/cjs-module-exports.js 1`] = `""`;
 
+exports[`covers cases shown in fixtures/commented-out-directive.js 1`] = `
+"// \\"use client\\"
+
+export default function () {}"
+`;
+
 exports[`covers cases shown in fixtures/esm-aggregation.js 1`] = `""`;
 
 exports[`covers cases shown in fixtures/esm-declaration.js 1`] = `
@@ -153,6 +159,14 @@ export default {
   }"
 `;
 
-exports[`covers cases shown in fixtures/no-client-export.js 1`] = `""`;
+exports[`covers cases shown in fixtures/no-directive.js 1`] = `
+"export function noClientExport() {
+  return \`No \\"use client\\" found in this file\`
+}"
+`;
 
-exports[`covers cases shown in fixtures/no-client-export-no-export.js 1`] = `""`;
+exports[`covers cases shown in fixtures/no-directive-and-no-export.js 1`] = `
+"function noClientExport() {
+  return \`No \\"use client\\" found in this file, and the function itself is not exported\`
+}"
+`;
diff --git a/packages/gatsby/src/utils/webpack/loaders/__tests__/fixtures/commented-out-directive.js b/packages/gatsby/src/utils/webpack/loaders/__tests__/fixtures/commented-out-directive.js
@@ -0,0 +1,3 @@
+// "use client"
+
+export default function () {}
diff --git a/...__/fixtures/no-client-export-no-export.js → ...__/fixtures/no-directive-and-no-export.js b/...__/fixtures/no-client-export-no-export.js → ...__/fixtures/no-directive-and-no-export.js
diff --git a/...rs/__tests__/fixtures/no-client-export.js → ...oaders/__tests__/fixtures/no-directive.js b/...rs/__tests__/fixtures/no-client-export.js → ...oaders/__tests__/fixtures/no-directive.js
diff --git a/packages/gatsby/src/utils/webpack/loaders/partial-hydration-reference-loader.ts b/packages/gatsby/src/utils/webpack/loaders/partial-hydration-reference-loader.ts
@@ -177,7 +177,7 @@ const partialHydrationReferenceLoader: LoaderDefinitionFunction<
     },
   })
 
-  return references.join(`\n`)
+  return hasClientExportDirective ? references.join(`\n`) : content
 }
 
 module.exports = partialHydrationReferenceLoader