From f7f8ffe689a6a475931355ae21897b8b48ca6ef3 Mon Sep 17 00:00:00 2001
From: Ty Hopp <tyhopp@users.noreply.github.com>
Date: Fri, 20 May 2022 20:46:09 +0800
Subject: [PATCH] refactor(gatsby,gatsby-script): Misc review comments (#35710)

refactor(gatsby,gatsby-script): Misc comments from Ward in #35403

Co-authored-by: Michal Piechowiak <misiek.piechowiak@gmail.com>
---
 packages/gatsby-script/.babelrc                             | 5 ++++-
 packages/gatsby-script/src/gatsby-script.tsx                | 6 ++----
 packages/gatsby/src/commands/serve.ts                       | 4 ++--
 .../src/internal-plugins/partytown/gatsby-browser.tsx       | 4 +++-
 .../gatsby/src/internal-plugins/partytown/gatsby-node.ts    | 6 +++---
 packages/gatsby/src/internal-plugins/partytown/proxy.ts     | 2 +-
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/packages/gatsby-script/.babelrc b/packages/gatsby-script/.babelrc
index 12f6f4d21375b..ff76a7a2f0f3b 100644
--- a/packages/gatsby-script/.babelrc
+++ b/packages/gatsby-script/.babelrc
@@ -1,3 +1,6 @@
 {
-  "presets": [["babel-preset-gatsby-package", { "browser": true }], "@babel/preset-typescript"]
+  "presets": [
+    ["babel-preset-gatsby-package", { "browser": true, "esm": true }],
+    "@babel/preset-typescript"
+  ]
 }
diff --git a/packages/gatsby-script/src/gatsby-script.tsx b/packages/gatsby-script/src/gatsby-script.tsx
index 29cb0a3b23381..1e99100026696 100644
--- a/packages/gatsby-script/src/gatsby-script.tsx
+++ b/packages/gatsby-script/src/gatsby-script.tsx
@@ -67,7 +67,7 @@ export function Script(props: ScriptProps): ReactElement | null {
         })
         break
       case ScriptStrategy.offMainThread:
-        if (typeof window !== `undefined` && collectScript) {
+        if (collectScript) {
           const attributes = resolveAttributes(props)
           collectScript(attributes)
         }
@@ -101,7 +101,6 @@ export function Script(props: ScriptProps): ReactElement | null {
       return (
         <script
           type="text/partytown"
-          async
           data-strategy={strategy}
           crossOrigin="anonymous"
           {...attributes}
@@ -112,7 +111,6 @@ export function Script(props: ScriptProps): ReactElement | null {
     return (
       <script
         type="text/partytown"
-        async
         src={proxyPartytownUrl(src)}
         data-strategy={strategy}
         crossOrigin="anonymous"
@@ -239,5 +237,5 @@ function proxyPartytownUrl(url: string | undefined): string | undefined {
   if (!url) {
     return undefined
   }
-  return `/__partytown-proxy?url=${encodeURIComponent(url)}`
+  return `/__third-party-proxy?url=${encodeURIComponent(url)}`
 }
diff --git a/packages/gatsby/src/commands/serve.ts b/packages/gatsby/src/commands/serve.ts
index 1913c07e6f01b..af5bae64a9790 100644
--- a/packages/gatsby/src/commands/serve.ts
+++ b/packages/gatsby/src/commands/serve.ts
@@ -26,7 +26,7 @@ import { configureTrailingSlash } from "../utils/express-middlewares"
 import { getDataStore, detectLmdbStore } from "../datastore"
 import { functionMiddlewares } from "../internal-plugins/functions/middleware"
 import {
-  partytownProxyPath,
+  thirdPartyProxyPath,
   partytownProxy,
 } from "../internal-plugins/partytown/proxy"
 
@@ -127,7 +127,7 @@ module.exports = async (program: IServeProgram): Promise<void> => {
   // Proxy gatsby-script using off-main-thread strategy
   const { partytownProxiedURLs = [] } = config || {}
 
-  app.use(partytownProxyPath, partytownProxy(partytownProxiedURLs))
+  app.use(thirdPartyProxyPath, partytownProxy(partytownProxiedURLs))
 
   // eslint-disable-next-line new-cap
   const router = express.Router()
diff --git a/packages/gatsby/src/internal-plugins/partytown/gatsby-browser.tsx b/packages/gatsby/src/internal-plugins/partytown/gatsby-browser.tsx
index 7e3c496abcf13..4c229a9f19b99 100644
--- a/packages/gatsby/src/internal-plugins/partytown/gatsby-browser.tsx
+++ b/packages/gatsby/src/internal-plugins/partytown/gatsby-browser.tsx
@@ -39,7 +39,9 @@ function PartytownProvider({ children }): ReactElement {
                 }
               }
             } else {
-              console.log(`unexpected shape of forward`, newScript)
+              if (process.env.NODE_ENV === `development`) {
+                console.log(`unexpected shape of forward`, newScript)
+              }
             }
           }
 
diff --git a/packages/gatsby/src/internal-plugins/partytown/gatsby-node.ts b/packages/gatsby/src/internal-plugins/partytown/gatsby-node.ts
index f8d81cbf3c6b7..000071eb8543b 100644
--- a/packages/gatsby/src/internal-plugins/partytown/gatsby-node.ts
+++ b/packages/gatsby/src/internal-plugins/partytown/gatsby-node.ts
@@ -1,7 +1,7 @@
 import path from "path"
 import { copyLibFiles } from "@builder.io/partytown/utils"
 import { CreateDevServerArgs } from "gatsby"
-import { partytownProxyPath, partytownProxy } from "./proxy"
+import { thirdPartyProxyPath, partytownProxy } from "./proxy"
 
 /**
  * Copy Partytown library files to public.
@@ -26,7 +26,7 @@ exports.createPages = ({ actions, store }): void => {
     const encodedURL: string = encodeURI(host)
 
     createRedirect({
-      fromPath: `${partytownProxyPath}?url=${encodedURL}`,
+      fromPath: `${thirdPartyProxyPath}?url=${encodedURL}`,
       toPath: encodedURL,
       statusCode: 200,
     })
@@ -40,5 +40,5 @@ export async function onCreateDevServer({
   const { config } = store.getState()
   const { partytownProxiedURLs = [] } = config || {}
 
-  app.use(partytownProxyPath, partytownProxy(partytownProxiedURLs))
+  app.use(thirdPartyProxyPath, partytownProxy(partytownProxiedURLs))
 }
diff --git a/packages/gatsby/src/internal-plugins/partytown/proxy.ts b/packages/gatsby/src/internal-plugins/partytown/proxy.ts
index 8bf597be2ca86..755eaadd17f77 100644
--- a/packages/gatsby/src/internal-plugins/partytown/proxy.ts
+++ b/packages/gatsby/src/internal-plugins/partytown/proxy.ts
@@ -1,7 +1,7 @@
 import proxy from "express-http-proxy"
 import type { RequestHandler } from "express"
 
-export const partytownProxyPath = `/__partytown-proxy`
+export const thirdPartyProxyPath = `/__third-party-proxy`
 
 export function partytownProxy(
   partytownProxiedURLs: Array<string>