From a1bc767a972babf67fce8035ae39a35389bf88ff Mon Sep 17 00:00:00 2001
From: Houssein Djirdeh <houssein@google.com>
Date: Wed, 20 Jul 2022 16:49:26 -0400
Subject: [PATCH 1/4] adds onReady prop to next/script

---
 docs/api-reference/next/script.md             | 35 +++++++++++++++++--
 docs/basic-features/script.md                 | 34 ++++++++++++++++--
 packages/next/client/script.tsx               | 22 +++++++++++-
 .../script-loader/base/pages/page8.js         | 24 +++++++++++++
 .../script-loader/base/pages/page9.js         | 11 ++++++
 .../script-loader/test/index.test.js          | 24 +++++++++++++
 6 files changed, 145 insertions(+), 5 deletions(-)
 create mode 100644 test/integration/script-loader/base/pages/page8.js
 create mode 100644 test/integration/script-loader/base/pages/page9.js

diff --git a/docs/api-reference/next/script.md b/docs/api-reference/next/script.md
index c1470361fcc1..8fe127a791bb 100644
--- a/docs/api-reference/next/script.md
+++ b/docs/api-reference/next/script.md
@@ -20,6 +20,7 @@ description: Optimize loading of third-party scripts with the built-in Script co
 
 | Version   | Changes                   |
 | --------- | ------------------------- |
+| `v12.2.3` | `onReady` prop added.     |
 | `v11.0.0` | `next/script` introduced. |
 
 </details>
@@ -47,9 +48,9 @@ The loading strategy of the script.
 
 ### onLoad
 
-A method that returns additional JavaScript that should be executed after the script has finished loading.
+A method that returns additional JavaScript that should be executed once after the script has finished loading.
 
-> **Note: `onLoad` can't be used with the `beforeInteractive` loading strategy.**
+> **Note: `onLoad` can't be used with the `beforeInteractive` loading strategy. Consider using `onReady` instead.**
 
 The following is an example of how to use the `onLoad` property:
 
@@ -74,6 +75,36 @@ export default function Home() {
 }
 ```
 
+### onReady
+
+A method that returns additional JavaScript that should be executed after the script has finished loading and every time the component is mounted.
+
+The following is an example of how to use the `onReady` property:
+
+```jsx
+import { useState } from 'react'
+import Script from 'next/script'
+
+export default function Home() {
+  const [stripe, setStripe] = useState(null)
+
+  return (
+    <>
+      <Script
+        id="google-maps"
+        src="https://maps.googleapis.com/maps/api/js"
+        onReady={() => {
+          new google.maps.Map(ref.current, {
+            center: { lat: -34.397, lng: 150.644 },
+            zoom: 8,
+          })
+        }}
+      />
+    </>
+  )
+}
+```
+
 ### onError
 
 A method that executes if the script fails to load.
diff --git a/docs/basic-features/script.md b/docs/basic-features/script.md
index 5790bde7c8de..89f70dc33298 100644
--- a/docs/basic-features/script.md
+++ b/docs/basic-features/script.md
@@ -21,6 +21,7 @@ description: Next.js helps you optimize loading third-party scripts with the bui
 
 | Version   | Changes                   |
 | --------- | ------------------------- |
+| `v12.2.3` | `onReady` prop added.     |
 | `v11.0.0` | `next/script` introduced. |
 
 </details>
@@ -249,9 +250,9 @@ The `id` property is required for **inline scripts** in order for Next.js to tra
 
 ### Executing Code After Loading (`onLoad`)
 
-> **Note: `onLoad` and `onError` cannot be used with the `beforeInteractive` loading strategy.**
+> **Note: `onLoad` cannot be used with the `beforeInteractive` loading strategy. Consider using `onReady` instead.**
 
-Some third-party scripts require users to run JavaScript code after the script has finished loading in order to instantiate content or call a function. If you are loading a script with either `afterInteractive` or `lazyOnload` as a loading strategy, you can execute code after it has loaded using the `onLoad` property:
+Some third-party scripts require users to run JavaScript code once after the script has finished loading in order to instantiate content or call a function. If you are loading a script with either `afterInteractive` or `lazyOnload` as a loading strategy, you can execute code after it has loaded using the `onLoad` property:
 
 ```jsx
 import { useState } from 'react'
@@ -274,6 +275,35 @@ export default function Home() {
 }
 ```
 
+### Executing Code After Mounting (`onReady`)
+
+Some third-party scripts require users to run JavaScript code after the script has finished loading and every time the component is mounted (after a route navigation for example). You can execute code after the script's `load` event when it first loads and then after every subsequent component re-mount using the `onReady` property:
+
+```jsx
+import Script from 'next/script'
+
+export default function Home() {
+  return (
+    <>
+      <Script
+        id="google-maps"
+        src="https://maps.googleapis.com/maps/api/js"
+        onReady={() => {
+          new google.maps.Map(ref.current, {
+            center: { lat: -34.397, lng: 150.644 },
+            zoom: 8,
+          })
+        }}
+      />
+    </>
+  )
+}
+```
+
+### Handling errors (`onError`)
+
+> **Note: `onError` cannot be used with the `beforeInteractive` loading strategy.**
+
 Sometimes it is helpful to catch when a script fails to load. These errors can be handled with the `onError` property:
 
 ```jsx
diff --git a/packages/next/client/script.tsx b/packages/next/client/script.tsx
index 01a295335c9a..33223afe0f32 100644
--- a/packages/next/client/script.tsx
+++ b/packages/next/client/script.tsx
@@ -11,6 +11,7 @@ export interface ScriptProps extends ScriptHTMLAttributes<HTMLScriptElement> {
   strategy?: 'afterInteractive' | 'lazyOnload' | 'beforeInteractive' | 'worker'
   id?: string
   onLoad?: (e: any) => void
+  onReady?: () => void | null
   onError?: (e: any) => void
   children?: React.ReactNode
 }
@@ -22,6 +23,7 @@ export type Props = ScriptProps
 
 const ignoreProps = [
   'onLoad',
+  'onReady',
   'dangerouslySetInnerHTML',
   'children',
   'onError',
@@ -33,6 +35,7 @@ const loadScript = (props: ScriptProps): void => {
     src,
     id,
     onLoad = () => {},
+    onReady = null,
     dangerouslySetInnerHTML,
     children = '',
     strategy = 'afterInteractive',
@@ -62,6 +65,10 @@ const loadScript = (props: ScriptProps): void => {
       if (onLoad) {
         onLoad.call(this, e)
       }
+      // Run onReady for the first time after load event
+      if (onReady) {
+        onReady()
+      }
     })
     el.addEventListener('error', function (e) {
       reject(e)
@@ -147,8 +154,10 @@ export function initScriptLoader(scriptLoaderItems: ScriptProps[]) {
 
 function Script(props: ScriptProps): JSX.Element | null {
   const {
+    id,
     src = '',
     onLoad = () => {},
+    onReady = null,
     strategy = 'afterInteractive',
     onError,
     ...restProps
@@ -157,6 +166,15 @@ function Script(props: ScriptProps): JSX.Element | null {
   // Context is available only during SSR
   const { updateScripts, scripts, getIsSsr } = useContext(HeadManagerContext)
 
+  useEffect(() => {
+    const cacheKey = id || src
+
+    // Run onReady if script has loaded before but component is re-mounted
+    if (onReady && cacheKey && LoadCache.has(cacheKey)) {
+      onReady()
+    }
+  }, [onReady, id, src])
+
   useEffect(() => {
     if (strategy === 'afterInteractive') {
       loadScript(props)
@@ -169,8 +187,10 @@ function Script(props: ScriptProps): JSX.Element | null {
     if (updateScripts) {
       scripts[strategy] = (scripts[strategy] || []).concat([
         {
+          id,
           src,
           onLoad,
+          onReady,
           onError,
           ...restProps,
         },
@@ -178,7 +198,7 @@ function Script(props: ScriptProps): JSX.Element | null {
       updateScripts(scripts)
     } else if (getIsSsr && getIsSsr()) {
       // Script has already loaded during SSR
-      LoadCache.add(restProps.id || src)
+      LoadCache.add(id || src)
     } else if (getIsSsr && !getIsSsr()) {
       loadScript(props)
     }
diff --git a/test/integration/script-loader/base/pages/page8.js b/test/integration/script-loader/base/pages/page8.js
new file mode 100644
index 000000000000..a00713c34b32
--- /dev/null
+++ b/test/integration/script-loader/base/pages/page8.js
@@ -0,0 +1,24 @@
+import Script from 'next/script'
+import Link from 'next/link'
+
+const url =
+  'https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.20/lodash.min.js'
+
+const Page = () => {
+  return (
+    <div class="container">
+      <Link href="/page9">Page 9</Link>
+      <div id="text"></div>
+      <Script
+        src={url}
+        id="script1"
+        onReady={() => {
+          // eslint-disable-next-line no-undef
+          document.getElementById('text').textContent += _.repeat('a', 3)
+        }}
+      ></Script>
+    </div>
+  )
+}
+
+export default Page
diff --git a/test/integration/script-loader/base/pages/page9.js b/test/integration/script-loader/base/pages/page9.js
new file mode 100644
index 000000000000..6e82d8627683
--- /dev/null
+++ b/test/integration/script-loader/base/pages/page9.js
@@ -0,0 +1,11 @@
+import Link from 'next/link'
+
+const Page = () => {
+  return (
+    <>
+      <Link href="/page8">Page 8</Link>
+    </>
+  )
+}
+
+export default Page
diff --git a/test/integration/script-loader/test/index.test.js b/test/integration/script-loader/test/index.test.js
index 0a5ca5d50440..cad3fc6bede1 100644
--- a/test/integration/script-loader/test/index.test.js
+++ b/test/integration/script-loader/test/index.test.js
@@ -190,6 +190,30 @@ describe('Next.js Script - Primary Strategies', () => {
     }
   })
 
+  it('onReady fires after load event and then on every subsequent re-mount', async () => {
+    let browser
+    try {
+      browser = await webdriver(appPort, '/page8')
+
+      const text = await browser.elementById('text').text()
+
+      expect(text).toBe('aaa')
+
+      // Navigate to different page and back
+      await browser.waitForElementByCss('[href="/page9"]')
+      await browser.click('[href="/page9"]')
+      await browser.waitForElementByCss('[href="/page8"]')
+      await browser.click('[href="/page8"]')
+
+      await browser.waitForElementByCss('.container')
+      const sameText = await browser.elementById('text').text()
+
+      expect(sameText).toBe('aaa') // onReady should fire again
+    } finally {
+      if (browser) await browser.close()
+    }
+  })
+
   it('priority beforeInteractive with inline script', async () => {
     const html = await renderViaHTTP(appPort, '/page5')
     const $ = cheerio.load(html)

From f2efd7d40cc406c80ed24c59715387152cd596c2 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Thu, 28 Jul 2022 15:06:35 -0500
Subject: [PATCH 2/4] Apply suggestions from code review

---
 docs/api-reference/next/script.md | 2 +-
 docs/basic-features/script.md     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/api-reference/next/script.md b/docs/api-reference/next/script.md
index 8fe127a791bb..a9f8db31c25a 100644
--- a/docs/api-reference/next/script.md
+++ b/docs/api-reference/next/script.md
@@ -20,7 +20,7 @@ description: Optimize loading of third-party scripts with the built-in Script co
 
 | Version   | Changes                   |
 | --------- | ------------------------- |
-| `v12.2.3` | `onReady` prop added.     |
+| `v12.2.4` | `onReady` prop added.     |
 | `v11.0.0` | `next/script` introduced. |
 
 </details>
diff --git a/docs/basic-features/script.md b/docs/basic-features/script.md
index 89f70dc33298..5cc30b220305 100644
--- a/docs/basic-features/script.md
+++ b/docs/basic-features/script.md
@@ -21,7 +21,7 @@ description: Next.js helps you optimize loading third-party scripts with the bui
 
 | Version   | Changes                   |
 | --------- | ------------------------- |
-| `v12.2.3` | `onReady` prop added.     |
+| `v12.2.4` | `onReady` prop added.     |
 | `v11.0.0` | `next/script` introduced. |
 
 </details>

From f3bccd24c27043dd8fe557b66f9b5ab663863234 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Thu, 28 Jul 2022 15:18:33 -0500
Subject: [PATCH 3/4] Apply suggestions from code review

---
 docs/api-reference/next/script.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/api-reference/next/script.md b/docs/api-reference/next/script.md
index a9f8db31c25a..48d29b99e3a7 100644
--- a/docs/api-reference/next/script.md
+++ b/docs/api-reference/next/script.md
@@ -86,7 +86,6 @@ import { useState } from 'react'
 import Script from 'next/script'
 
 export default function Home() {
-  const [stripe, setStripe] = useState(null)
 
   return (
     <>

From de291c0cb5d7d721a69654c09975ace0913b1e73 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Thu, 28 Jul 2022 15:18:47 -0500
Subject: [PATCH 4/4] Apply suggestions from code review

---
 docs/api-reference/next/script.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/api-reference/next/script.md b/docs/api-reference/next/script.md
index 48d29b99e3a7..e6bed4fa6389 100644
--- a/docs/api-reference/next/script.md
+++ b/docs/api-reference/next/script.md
@@ -86,7 +86,6 @@ import { useState } from 'react'
 import Script from 'next/script'
 
 export default function Home() {
-
   return (
     <>
       <Script