review updates

e2e-tests/development-runtime/cypress/integration/gatsby-script/shimmed-req-idle-callback.js

@@ -1,25 +1,14 @@
-import { Script, scripts } from "../../scripts"
+import { Script, scripts } from "../../../gatsby-script-scripts"
 import { ResourceRecord } from "../../records"
 
 // The page that we will assert against
-const page = `/scripts-with-sources`
+const page = `/gatsby-script-scripts-with-sources`
 
 Cypress.on(`window:before:load`, win => {
   cy.spy(win, "requestIdleCallback").as("requestIdleCallback")
   win.requestIdleCallback = undefined
 })
 
-beforeEach(() => {
-  // @ts-ignore Object.values does exist, Cypress wants ES5 in tsconfig
-  for (const script of [...Object.values(scripts), new RegExp(`framework`)]) {
-    cy.intercept(script, { middleware: true }, req => {
-      req.on(`before:response`, res => {
-        res.headers[`cache-control`] = `no-store` // Do not cache responses
-      })
-    })
-  }
-})
-
 /*
  * Some browsers don't support the requestIdleCallback API, so we need to
  * shim it. Here we test that the idle behaviour remains the same with shimmed requestIdleCallback

e2e-tests/production-runtime/cypress/integration/shimmed-req-idle-callback.js

@@ -1,25 +1,14 @@
-import { Script, scripts } from "../../scripts"
+import { Script, scripts } from "../../gatsby-script-scripts"
 import { ResourceRecord } from "../../records"
 
 // The page that we will assert against
-const page = `/scripts-with-sources`
+const page = `/gatsby-script-scripts-with-sources`
 
 Cypress.on(`window:before:load`, win => {
   cy.spy(win, "requestIdleCallback").as("requestIdleCallback")
   win.requestIdleCallback = undefined
 })
 
-beforeEach(() => {
-  // @ts-ignore Object.values does exist, Cypress wants ES5 in tsconfig
-  for (const script of [...Object.values(scripts), new RegExp(`framework`)]) {
-    cy.intercept(script, { middleware: true }, req => {
-      req.on(`before:response`, res => {
-        res.headers[`cache-control`] = `no-store` // Do not cache responses
-      })
-    })
-  }
-})
-
 /*
  * Some browsers don't support the requestIdleCallback API, so we need to
  * shim it. Here we test that the idle behaviour remains the same with shimmed requestIdleCallback

packages/gatsby-script/src/gatsby-script.tsx

@@ -2,6 +2,7 @@ import React, { useEffect, useContext } from "react"
 import { PartytownContext } from "./partytown-context"
 import type { ReactElement, ScriptHTMLAttributes } from "react"
 import type { PartytownProps } from "@builder.io/partytown/react"
+import { requestIdleCallback } from "./request-idle-callback-shim"
 
 export enum ScriptStrategy {
   postHydrate = `post-hydrate`,