updates per review comments

vercel · Apr 26, 2022 · 3f29ac0 · 3f29ac0
1 parent fbc3d07
commit 3f29ac0
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 18 deletions.
diff --git a/errors/invalid-script.md b/errors/invalid-script.md
@@ -0,0 +1,38 @@
+# Invalid Script
+
+#### Why This Error Occurred
+
+Somewhere in your application, you are using the `next/script` component without including an inline script or `src` attribute.
+
+#### Possible Ways to Fix It
+
+Look for any usage of the `next/script` component and make sure that `src` is provided or an inline script is used.
+
+**Compatible `src` attribute**
+
+```jsx
+<Script src="https://example.com/analytics.js" />
+```
+
+**Compatible inline script with curly braces**
+
+```jsx
+<Script id="show-banner">
+  {`document.getElementById('banner').classList.remove('hidden')`}
+</Script>
+```
+
+**Compatible inline script with `dangerouslySetInnerHtml`**
+
+```jsx
+<Script
+  id="show-banner"
+  dangerouslySetInnerHTML={{
+    __html: `document.getElementById('banner').classList.remove('hidden')`,
+  }}
+/>
+```
+
+### Useful Links
+
+- [Script Component in Documentation](https://nextjs.org/docs/basic-features/script)
diff --git a/errors/manifest.json b/errors/manifest.json
@@ -657,6 +657,10 @@
         {
           "title": "no-assign-module-variable",
           "path": "/errors/no-assign-module-variable.md"
+        },
+        {
+          "title": "invalid-script",
+          "path": "/errors/invalid-script.md"
         }
       ]
     }

diff --git a/packages/next/pages/_document.tsx b/packages/next/pages/_document.tsx
@@ -139,23 +139,28 @@ function getPreNextWorkerScripts(context: HtmlProps, props: OriginProps) {
           if (src) {
             // Use external src if provided
             srcProps.src = src
-          } else {
+          } else if (
+            dangerouslySetInnerHTML &&
+            dangerouslySetInnerHTML.__html
+          ) {
             // Embed inline script if provided with dangerouslySetInnerHTML
-            if (dangerouslySetInnerHTML && dangerouslySetInnerHTML.__html) {
-              srcProps.dangerouslySetInnerHTML = {
-                __html: dangerouslySetInnerHTML.__html,
-              }
-            } else if (scriptChildren) {
-              // Embed inline script if provided with children
-              srcProps.dangerouslySetInnerHTML = {
-                __html:
-                  typeof scriptChildren === 'string'
-                    ? scriptChildren
-                    : Array.isArray(scriptChildren)
-                    ? scriptChildren.join('')
-                    : '',
-              }
+            srcProps.dangerouslySetInnerHTML = {
+              __html: dangerouslySetInnerHTML.__html,
+            }
+          } else if (scriptChildren) {
+            // Embed inline script if provided with children
+            srcProps.dangerouslySetInnerHTML = {
+              __html:
+                typeof scriptChildren === 'string'
+                  ? scriptChildren
+                  : Array.isArray(scriptChildren)
+                  ? scriptChildren.join('')
+                  : '',
             }
+          } else {
+            throw new Error(
+              'Invalid usage of next/script. Did you forget to include a src attribute or an inline script? https://nextjs.org/docs/messages/invalid-script'
+            )
           }
 
           return (
@@ -174,9 +179,7 @@ function getPreNextWorkerScripts(context: HtmlProps, props: OriginProps) {
     )
   } catch (err) {
     if (isError(err) && err.code !== 'MODULE_NOT_FOUND') {
-      console.warn(
-        `Warning: Partytown could not be instantiated in your application due to an error. ${err.message}`
-      )
+      console.warn(`Warning: ${err.message}`)
     }
     return null
   }