Allow more uses of `beforeInteractive` strategy in Script component #31276

genetschneider · 2021-11-10T22:57:50Z

This PR ensures Script component can be used in beforeInteractive strategy even if src is not specified.

Fixes #31275

genetschneider · 2021-11-10T22:59:01Z

test/integration/script-loader/test/index.test.js

+      if (id === 'scriptBeforeInteractiveDangerous') {
+        expect(script.contents().first().text()).toEqual('//hello')
+        expect(script.attr('src')).toEqual(undefined)
+        expect(typeof script.attr('src')).toBe('undefined')


ensure the type is undefined, not an empty string

ijjk · 2021-11-25T09:02:07Z

Stats from current PR

Default Build (Increase detected ⚠️)

General Overall increase ⚠️

	vercel/next.js canary	genetschneider/next.js-1 fix-before-interactive-script	Change
buildDuration	17.1s	17.3s	⚠️ +127ms
buildDurationCached	3.3s	3.4s	⚠️ +94ms
nodeModulesSize	345 MB	345 MB	⚠️ +281 B

Page Load Tests Overall increase ✓

	vercel/next.js canary	genetschneider/next.js-1 fix-before-interactive-script	Change
/ failed reqs	0	0	✓
/ total time (seconds)	2.743	2.756	⚠️ +0.01
/ avg req/sec	911.52	907.09	⚠️ -4.43
/error-in-render failed reqs	0	0	✓
/error-in-render total time (seconds)	1.203	1.172	-0.03
/error-in-render avg req/sec	2078.71	2132.87	+54.16

Client Bundles (main, webpack, commons)

	vercel/next.js canary	genetschneider/next.js-1 fix-before-interactive-script	Change
450.HASH.js gzip	179 B	179 B	✓
framework-HASH.js gzip	42.2 kB	42.2 kB	✓
main-HASH.js gzip	28.4 kB	28.4 kB	✓
webpack-HASH.js gzip	1.45 kB	1.45 kB	✓
Overall change	72.2 kB	72.2 kB	✓

Legacy Client Bundles (polyfills)

	vercel/next.js canary	genetschneider/next.js-1 fix-before-interactive-script	Change
polyfills-HASH.js gzip	31 kB	31 kB	✓
Overall change	31 kB	31 kB	✓

Client Pages

	vercel/next.js canary	genetschneider/next.js-1 fix-before-interactive-script	Change
_app-HASH.js gzip	1.37 kB	1.37 kB	✓
_error-HASH.js gzip	194 B	194 B	✓
amp-HASH.js gzip	312 B	312 B	✓
css-HASH.js gzip	327 B	327 B	✓
dynamic-HASH.js gzip	2.38 kB	2.38 kB	✓
head-HASH.js gzip	350 B	350 B	✓
hooks-HASH.js gzip	635 B	635 B	✓
image-HASH.js gzip	4.45 kB	4.45 kB	✓
index-HASH.js gzip	263 B	263 B	✓
link-HASH.js gzip	1.87 kB	1.87 kB	✓
routerDirect..HASH.js gzip	321 B	321 B	✓
script-HASH.js gzip	383 B	383 B	✓
withRouter-HASH.js gzip	318 B	318 B	✓
85e02e95b279..7e3.css gzip	107 B	107 B	✓
Overall change	13.3 kB	13.3 kB	✓

Client Build Manifests

	vercel/next.js canary	genetschneider/next.js-1 fix-before-interactive-script	Change
_buildManifest.js gzip	460 B	460 B	✓
Overall change	460 B	460 B	✓

Rendered Page Sizes Overall increase ⚠️

	vercel/next.js canary	genetschneider/next.js-1 fix-before-interactive-script	Change
index.html gzip	531 B	532 B	⚠️ +1 B
link.html gzip	545 B	545 B	✓
withRouter.html gzip	525 B	526 B	⚠️ +1 B
Overall change	1.6 kB	1.6 kB	⚠️ +2 B

Diffs

Diff for main-HASH.js

@@ -2984,7 +2984,8 @@
                 {
                   src: src,
                   onLoad: onLoad,
-                  onError: onError
+                  onError: onError,
+                  dangerouslySetInnerHTML: dangerouslySetInnerHTML
                 },
                 restProps
               )

Diff for index.html

@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-966353a8b06621ca.js"
+      src="/_next/static/chunks/main-6723a452c6f77e47.js"
       defer=""
     ></script>
     <script

Diff for link.html

@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-966353a8b06621ca.js"
+      src="/_next/static/chunks/main-6723a452c6f77e47.js"
       defer=""
     ></script>
     <script

Diff for withRouter.html

@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-966353a8b06621ca.js"
+      src="/_next/static/chunks/main-6723a452c6f77e47.js"
       defer=""
     ></script>
     <script

Default Build with SWC (Decrease detected ✓)

General Overall increase ⚠️

	vercel/next.js canary	genetschneider/next.js-1 fix-before-interactive-script	Change
buildDuration	18.8s	19.1s	⚠️ +288ms
buildDurationCached	3.4s	3.4s	⚠️ +24ms
nodeModulesSize	345 MB	345 MB	⚠️ +281 B

Page Load Tests Overall decrease ⚠️

	vercel/next.js canary	genetschneider/next.js-1 fix-before-interactive-script	Change
/ failed reqs	0	0	✓
/ total time (seconds)	2.741	2.777	⚠️ +0.04
/ avg req/sec	912.13	900.13	⚠️ -12
/error-in-render failed reqs	0	0	✓
/error-in-render total time (seconds)	1.167	1.217	⚠️ +0.05
/error-in-render avg req/sec	2141.87	2053.58	⚠️ -88.29

Client Bundles (main, webpack, commons) Overall increase ⚠️

	vercel/next.js canary	genetschneider/next.js-1 fix-before-interactive-script	Change
450.HASH.js gzip	179 B	179 B	✓
framework-HASH.js gzip	42.3 kB	42.3 kB	✓
main-HASH.js gzip	28.6 kB	28.6 kB	⚠️ +5 B
webpack-HASH.js gzip	1.44 kB	1.44 kB	✓
Overall change	72.5 kB	72.5 kB	⚠️ +5 B

Legacy Client Bundles (polyfills)

	vercel/next.js canary	genetschneider/next.js-1 fix-before-interactive-script	Change
polyfills-HASH.js gzip	31 kB	31 kB	✓
Overall change	31 kB	31 kB	✓

Client Pages

	vercel/next.js canary	genetschneider/next.js-1 fix-before-interactive-script	Change
_app-HASH.js gzip	1.35 kB	1.35 kB	✓
_error-HASH.js gzip	180 B	180 B	✓
amp-HASH.js gzip	305 B	305 B	✓
css-HASH.js gzip	321 B	321 B	✓
dynamic-HASH.js gzip	2.37 kB	2.37 kB	✓
head-HASH.js gzip	342 B	342 B	✓
hooks-HASH.js gzip	622 B	622 B	✓
image-HASH.js gzip	4.47 kB	4.47 kB	✓
index-HASH.js gzip	256 B	256 B	✓
link-HASH.js gzip	1.91 kB	1.91 kB	✓
routerDirect..HASH.js gzip	314 B	314 B	✓
script-HASH.js gzip	375 B	375 B	✓
withRouter-HASH.js gzip	309 B	309 B	✓
85e02e95b279..7e3.css gzip	107 B	107 B	✓
Overall change	13.2 kB	13.2 kB	✓

Client Build Manifests

	vercel/next.js canary	genetschneider/next.js-1 fix-before-interactive-script	Change
_buildManifest.js gzip	458 B	458 B	✓
Overall change	458 B	458 B	✓

Rendered Page Sizes Overall decrease ✓

	vercel/next.js canary	genetschneider/next.js-1 fix-before-interactive-script	Change
index.html gzip	533 B	532 B	-1 B
link.html gzip	546 B	545 B	-1 B
withRouter.html gzip	527 B	527 B	✓
Overall change	1.61 kB	1.6 kB	-2 B

Diffs

Diff for main-HASH.js

@@ -2984,7 +2984,8 @@
                 {
                   src: src,
                   onLoad: onLoad,
-                  onError: onError
+                  onError: onError,
+                  dangerouslySetInnerHTML: dangerouslySetInnerHTML
                 },
                 restProps
               )

Diff for index.html

@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-966353a8b06621ca.js"
+      src="/_next/static/chunks/main-6723a452c6f77e47.js"
       defer=""
     ></script>
     <script

Diff for link.html

@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-966353a8b06621ca.js"
+      src="/_next/static/chunks/main-6723a452c6f77e47.js"
       defer=""
     ></script>
     <script

Diff for withRouter.html

@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-966353a8b06621ca.js"
+      src="/_next/static/chunks/main-6723a452c6f77e47.js"
       defer=""
     ></script>
     <script

Commit: 0d09cad

janicklas-ralph · 2021-12-01T20:24:32Z

@genetschneider Thanks for this PR.
I am changing the implementation of beforeInteractive strategy to make it work for the next versions of react - Check this PR

I'm closing this Pr out since it won't be compatible with the new change.

genetschneider added 2 commits November 10, 2021 20:57

Allow dangerouslySetInnerHTML in beforeInteractive

cf09a60

Add tests

aa6cc98

genetschneider requested review from huozhi, ijjk, shuding and timneutkens as code owners November 10, 2021 22:57

ijjk added the type: next label Nov 10, 2021

genetschneider changed the title ~~Fix before interactive script~~ Allow more uses of beforeInteractive strategy in Script component Nov 10, 2021

genetschneider commented Nov 10, 2021

View reviewed changes

This comment has been minimized.

Sign in to view

Merge branch 'canary' into fix-before-interactive-script

0d09cad

janicklas-ralph closed this Dec 1, 2021

vercel locked as resolved and limited conversation to collaborators Jan 27, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow more uses of `beforeInteractive` strategy in Script component #31276

Allow more uses of `beforeInteractive` strategy in Script component #31276

genetschneider commented Nov 10, 2021

genetschneider Nov 10, 2021 •

edited

Loading

This comment has been minimized.

ijjk commented Nov 25, 2021

Diffs

Diffs

janicklas-ralph commented Dec 1, 2021

Allow more uses of beforeInteractive strategy in Script component #31276

Allow more uses of beforeInteractive strategy in Script component #31276

Conversation

genetschneider commented Nov 10, 2021

genetschneider Nov 10, 2021 • edited Loading

Choose a reason for hiding this comment

This comment has been minimized.

ijjk commented Nov 25, 2021

Stats from current PR

Diffs

Diffs

janicklas-ralph commented Dec 1, 2021

Allow more uses of `beforeInteractive` strategy in Script component #31276

Allow more uses of `beforeInteractive` strategy in Script component #31276

genetschneider Nov 10, 2021 •

edited

Loading