-
Notifications
You must be signed in to change notification settings - Fork 27.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix inline scripts being duplicated when used with next/script
component
#27218
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
janicklas-ralph
requested review from
huozhi,
ijjk,
leerob,
lfades,
padmaia,
shuding,
styfle and
timneutkens
as code owners
July 16, 2021 02:47
leerob
reviewed
Jul 16, 2021
This comment has been minimized.
This comment has been minimized.
styfle
changed the title
Fix #26860
Fixes inline scripts being duplicated when used with Jul 16, 2021
next/script
component
styfle
changed the title
Fixes inline scripts being duplicated when used with
Fix inline scripts being duplicated when used with Jul 16, 2021
next/script
componentnext/script
component
Co-authored-by: Lee Robinson <me@leerob.io>
This comment has been minimized.
This comment has been minimized.
timneutkens
approved these changes
Jul 16, 2021
Stats from current PRDefault Build (Decrease detected ✓)General Overall increase
|
vercel/next.js canary | janicklas-ralph/next.js script | Change | |
---|---|---|---|
buildDuration | 15s | 14.9s | -85ms |
buildDurationCached | 3.4s | 3.3s | -114ms |
nodeModulesSize | 49.5 MB | 49.5 MB |
Page Load Tests Overall decrease ⚠️
vercel/next.js canary | janicklas-ralph/next.js script | Change | |
---|---|---|---|
/ failed reqs | 0 | 0 | ✓ |
/ total time (seconds) | 2.512 | 2.606 | |
/ avg req/sec | 995.39 | 959.28 | |
/error-in-render failed reqs | 0 | 0 | ✓ |
/error-in-render total time (seconds) | 1.532 | 1.531 | 0 |
/error-in-render avg req/sec | 1632.32 | 1632.94 | +0.62 |
Client Bundles (main, webpack, commons) Overall increase ⚠️
vercel/next.js canary | janicklas-ralph/next.js script | Change | |
---|---|---|---|
359.HASH.js gzip | 2.96 kB | 2.96 kB | ✓ |
745.HASH.js gzip | 180 B | 180 B | ✓ |
framework-HASH.js gzip | 42.2 kB | 42.2 kB | ✓ |
main-HASH.js gzip | 20.9 kB | 20.9 kB | |
webpack-HASH.js gzip | 1.53 kB | 1.53 kB | ✓ |
Overall change | 67.8 kB | 67.8 kB |
Legacy Client Bundles (polyfills)
vercel/next.js canary | janicklas-ralph/next.js script | Change | |
---|---|---|---|
polyfills-HASH.js gzip | 31.1 kB | 31.1 kB | ✓ |
Overall change | 31.1 kB | 31.1 kB | ✓ |
Client Pages
vercel/next.js canary | janicklas-ralph/next.js script | Change | |
---|---|---|---|
_app-HASH.js gzip | 803 B | 803 B | ✓ |
_error-HASH.js gzip | 3.06 kB | 3.06 kB | ✓ |
amp-HASH.js gzip | 554 B | 554 B | ✓ |
css-HASH.js gzip | 329 B | 329 B | ✓ |
dynamic-HASH.js gzip | 2.52 kB | 2.52 kB | ✓ |
head-HASH.js gzip | 2.28 kB | 2.28 kB | ✓ |
hooks-HASH.js gzip | 903 B | 903 B | ✓ |
image-HASH.js gzip | 5.6 kB | 5.6 kB | ✓ |
index-HASH.js gzip | 261 B | 261 B | ✓ |
link-HASH.js gzip | 1.66 kB | 1.66 kB | ✓ |
routerDirect..HASH.js gzip | 319 B | 319 B | ✓ |
script-HASH.js gzip | 387 B | 387 B | ✓ |
withRouter-HASH.js gzip | 320 B | 320 B | ✓ |
bb14e60e810b..30f.css gzip | 125 B | 125 B | ✓ |
Overall change | 19.1 kB | 19.1 kB | ✓ |
Client Build Manifests
vercel/next.js canary | janicklas-ralph/next.js script | Change | |
---|---|---|---|
_buildManifest.js gzip | 489 B | 489 B | ✓ |
Overall change | 489 B | 489 B | ✓ |
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary | janicklas-ralph/next.js script | Change | |
---|---|---|---|
index.html gzip | 530 B | 530 B | ✓ |
link.html gzip | 543 B | 544 B | |
withRouter.html gzip | 524 B | 524 B | ✓ |
Overall change | 1.6 kB | 1.6 kB |
Diffs
Diff for main-HASH.js
@@ -3099,15 +3099,16 @@
_props$children = props.children,
children = _props$children === void 0 ? "" : _props$children,
onError = props.onError;
- var cacheKey = id || src;
+ var cacheKey = id || src; // Script has already loaded
- if (ScriptCache.has(src)) {
- if (!LoadCache.has(cacheKey)) {
- LoadCache.add(cacheKey); // Execute onLoad since the script loading has begun
+ if (cacheKey && LoadCache.has(cacheKey)) {
+ return;
+ } // Contents of this script are already loading/loaded
- ScriptCache.get(src).then(onLoad, onError);
- }
+ if (ScriptCache.has(src)) {
+ LoadCache.add(cacheKey); // Execute onLoad since the script loading has begun
+ ScriptCache.get(src).then(onLoad, onError);
return;
}
@@ -3131,9 +3132,10 @@
if (src) {
ScriptCache.set(src, loadPromise);
- LoadCache.add(cacheKey);
}
+ LoadCache.add(cacheKey);
+
if (dangerouslySetInnerHTML) {
el.innerHTML = dangerouslySetInnerHTML.__html || "";
} else if (children) {
Diff for index.html
@@ -19,7 +19,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/main-3c34c120970fcdede460.js"
+ src="/_next/static/chunks/main-57b867641a72fe856ff0.js"
defer=""
></script>
<script
Diff for link.html
@@ -19,7 +19,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/main-3c34c120970fcdede460.js"
+ src="/_next/static/chunks/main-57b867641a72fe856ff0.js"
defer=""
></script>
<script
Diff for withRouter.html
@@ -19,7 +19,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/main-3c34c120970fcdede460.js"
+ src="/_next/static/chunks/main-57b867641a72fe856ff0.js"
defer=""
></script>
<script
Webpack 4 Mode (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary | janicklas-ralph/next.js script | Change | |
---|---|---|---|
buildDuration | 12s | 12.1s | |
buildDurationCached | 4.6s | 4.6s | ✓ |
nodeModulesSize | 49.5 MB | 49.5 MB |
Page Load Tests Overall decrease ⚠️
vercel/next.js canary | janicklas-ralph/next.js script | Change | |
---|---|---|---|
/ failed reqs | 0 | 0 | ✓ |
/ total time (seconds) | 2.642 | 2.578 | -0.06 |
/ avg req/sec | 946.32 | 969.72 | +23.4 |
/error-in-render failed reqs | 0 | 0 | ✓ |
/error-in-render total time (seconds) | 1.502 | 1.622 | |
/error-in-render avg req/sec | 1664.6 | 1541.47 |
Client Bundles (main, webpack, commons) Overall increase ⚠️
vercel/next.js canary | janicklas-ralph/next.js script | Change | |
---|---|---|---|
17.HASH.js gzip | 2.98 kB | 2.98 kB | ✓ |
18.HASH.js gzip | 185 B | 185 B | ✓ |
677f882d2ed8..HASH.js gzip | 13.7 kB | 13.7 kB | ✓ |
framework.HASH.js gzip | 41.9 kB | 41.9 kB | ✓ |
main-HASH.js gzip | 8.39 kB | 8.4 kB | |
webpack-HASH.js gzip | 1.22 kB | 1.22 kB | ✓ |
Overall change | 68.4 kB | 68.4 kB |
Legacy Client Bundles (polyfills)
vercel/next.js canary | janicklas-ralph/next.js script | Change | |
---|---|---|---|
polyfills-HASH.js gzip | 31.3 kB | 31.3 kB | ✓ |
Overall change | 31.3 kB | 31.3 kB | ✓ |
Client Pages Overall increase ⚠️
vercel/next.js canary | janicklas-ralph/next.js script | Change | |
---|---|---|---|
_app-HASH.js gzip | 791 B | 791 B | ✓ |
_error-HASH.js gzip | 3.76 kB | 3.76 kB | ✓ |
amp-HASH.js gzip | 552 B | 552 B | ✓ |
css-HASH.js gzip | 333 B | 333 B | ✓ |
dynamic-HASH.js gzip | 2.71 kB | 2.71 kB | ✓ |
head-HASH.js gzip | 2.97 kB | 2.97 kB | ✓ |
hooks-HASH.js gzip | 911 B | 911 B | ✓ |
index-HASH.js gzip | 231 B | 231 B | ✓ |
link-HASH.js gzip | 1.64 kB | 1.64 kB | ✓ |
routerDirect..HASH.js gzip | 298 B | 298 B | ✓ |
script-HASH.js gzip | 3.02 kB | 3.02 kB | |
withRouter-HASH.js gzip | 294 B | 294 B | ✓ |
e025d2764813..52f.css gzip | 125 B | 125 B | ✓ |
Overall change | 17.6 kB | 17.6 kB |
Client Build Manifests Overall increase ⚠️
vercel/next.js canary | janicklas-ralph/next.js script | Change | |
---|---|---|---|
_buildManifest.js gzip | 499 B | 500 B | |
Overall change | 499 B | 500 B |
Rendered Page Sizes
vercel/next.js canary | janicklas-ralph/next.js script | Change | |
---|---|---|---|
index.html gzip | 577 B | 577 B | ✓ |
link.html gzip | 588 B | 588 B | ✓ |
withRouter.html gzip | 569 B | 569 B | ✓ |
Overall change | 1.73 kB | 1.73 kB | ✓ |
Diffs
Diff for _buildManifest.js
@@ -21,7 +21,7 @@ self.__BUILD_MANIFEST = {
"static\u002Fchunks\u002Fpages\u002FrouterDirect-6969fe7df87ea0f513b7.js"
],
"/script": [
- "static\u002Fchunks\u002Fpages\u002Fscript-7641f9178bcd404d86d5.js"
+ "static\u002Fchunks\u002Fpages\u002Fscript-bfb4064637339cad55b9.js"
],
"/withRouter": [
"static\u002Fchunks\u002Fpages\u002FwithRouter-d324ed0c40e148c2c3fc.js"
Diff for script-HASH.js
@@ -112,15 +112,16 @@ _N_E = (window["webpackJsonp_N_E"] = window["webpackJsonp_N_E"] || []).push([
_props$children = props.children,
children = _props$children === void 0 ? "" : _props$children,
onError = props.onError;
- var cacheKey = id || src;
+ var cacheKey = id || src; // Script has already loaded
- if (ScriptCache.has(src)) {
- if (!LoadCache.has(cacheKey)) {
- LoadCache.add(cacheKey); // Execute onLoad since the script loading has begun
+ if (cacheKey && LoadCache.has(cacheKey)) {
+ return;
+ } // Contents of this script are already loading/loaded
- ScriptCache.get(src).then(onLoad, onError);
- }
+ if (ScriptCache.has(src)) {
+ LoadCache.add(cacheKey); // Execute onLoad since the script loading has begun
+ ScriptCache.get(src).then(onLoad, onError);
return;
}
@@ -144,9 +145,10 @@ _N_E = (window["webpackJsonp_N_E"] = window["webpackJsonp_N_E"] || []).push([
if (src) {
ScriptCache.set(src, loadPromise);
- LoadCache.add(cacheKey);
}
+ LoadCache.add(cacheKey);
+
if (dangerouslySetInnerHTML) {
el.innerHTML = dangerouslySetInnerHTML.__html || "";
} else if (children) {
Diff for main-HASH.js
@@ -496,15 +496,16 @@ _N_E = (window["webpackJsonp_N_E"] = window["webpackJsonp_N_E"] || []).push([
_props$children = props.children,
children = _props$children === void 0 ? "" : _props$children,
onError = props.onError;
- var cacheKey = id || src;
+ var cacheKey = id || src; // Script has already loaded
- if (ScriptCache.has(src)) {
- if (!LoadCache.has(cacheKey)) {
- LoadCache.add(cacheKey); // Execute onLoad since the script loading has begun
+ if (cacheKey && LoadCache.has(cacheKey)) {
+ return;
+ } // Contents of this script are already loading/loaded
- ScriptCache.get(src).then(onLoad, onError);
- }
+ if (ScriptCache.has(src)) {
+ LoadCache.add(cacheKey); // Execute onLoad since the script loading has begun
+ ScriptCache.get(src).then(onLoad, onError);
return;
}
@@ -528,9 +529,10 @@ _N_E = (window["webpackJsonp_N_E"] = window["webpackJsonp_N_E"] || []).push([
if (src) {
ScriptCache.set(src, loadPromise);
- LoadCache.add(cacheKey);
}
+ LoadCache.add(cacheKey);
+
if (dangerouslySetInnerHTML) {
el.innerHTML = dangerouslySetInnerHTML.__html || "";
} else if (children) {
Diff for index.html
@@ -23,7 +23,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/main-bf9e28f6038a7d635fc1.js"
+ src="/_next/static/chunks/main-c62f532130943daf2b09.js"
defer=""
></script>
<script
Diff for link.html
@@ -23,7 +23,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/main-bf9e28f6038a7d635fc1.js"
+ src="/_next/static/chunks/main-c62f532130943daf2b09.js"
defer=""
></script>
<script
Diff for withRouter.html
@@ -23,7 +23,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/main-bf9e28f6038a7d635fc1.js"
+ src="/_next/static/chunks/main-c62f532130943daf2b09.js"
defer=""
></script>
<script
flybayer
pushed a commit
to blitz-js/next.js
that referenced
this pull request
Aug 19, 2021
…onent (vercel#27218) Fixes inline scripts being duplicated when used with `next/script` component ## Bug - [x] fixes vercel#26860 - [x] Integration tests added ## Documentation / Examples Updated docs to indicate that `id` is needed for inline scripts
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes inline scripts being duplicated when used with
next/script
componentBug
Documentation / Examples
Updated docs to indicate that
id
is needed for inline scripts