Skip to content
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

Add naturalWidth/naturalHeight to onLoadingComplete() callback #27695

Merged
merged 7 commits into from
Aug 2, 2021

Conversation

styfle
Copy link
Member

@styfle styfle commented Aug 2, 2021

Resolves #27213

@ijjk

This comment has been minimized.

@ijjk

This comment has been minimized.

@ijjk

This comment has been minimized.

@ijjk
Copy link
Member

ijjk commented Aug 2, 2021

Failing test suites

Commit: dca67cd

test/integration/image-component/default/test/index.test.js

  • Image Component Tests > dev mode > should callback onLoadingComplete when image is fully loaded
  • Image Component Tests > server mode > should callback onLoadingComplete when image is fully loaded
  • Image Component Tests > serverless mode > should callback onLoadingComplete when image is fully loaded
Expand output

● Image Component Tests › dev mode › should callback onLoadingComplete when image is fully loaded

TIMED OUT: loaded img4 with dimensions 20x20

loaded img4 with dimensions 21x21

  408 |
  409 |   if (hardError) {
> 410 |     throw new Error('TIMED OUT: ' + regex + '\n\n' + content)
      |           ^
  411 |   }
  412 |   return false
  413 | }

  at check (lib/next-test-utils.js:410:11)
  at Object.<anonymous> (integration/image-component/default/test/index.test.js:221:7)

● Image Component Tests › server mode › should callback onLoadingComplete when image is fully loaded

TIMED OUT: loaded img4 with dimensions 20x20

loaded img4 with dimensions 21x21

  408 |
  409 |   if (hardError) {
> 410 |     throw new Error('TIMED OUT: ' + regex + '\n\n' + content)
      |           ^
  411 |   }
  412 |   return false
  413 | }

  at check (lib/next-test-utils.js:410:11)
  at Object.<anonymous> (integration/image-component/default/test/index.test.js:221:7)

● Image Component Tests › serverless mode › should callback onLoadingComplete when image is fully loaded

TIMED OUT: loaded img4 with dimensions 20x20

loaded img4 with dimensions 21x21

  408 |
  409 |   if (hardError) {
> 410 |     throw new Error('TIMED OUT: ' + regex + '\n\n' + content)
      |           ^
  411 |   }
  412 |   return false
  413 | }

  at check (lib/next-test-utils.js:410:11)
  at Object.<anonymous> (integration/image-component/default/test/index.test.js:221:7)

@ijjk

This comment has been minimized.

Copy link
Member

@ijjk ijjk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@ijjk
Copy link
Member

ijjk commented Aug 2, 2021

Stats from current PR

Default Build (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary vercel/next.js 27213-naturalWidth-naturalHeight Change
buildDuration 13.4s 13s -373ms
buildDurationCached 3s 3s -9ms
nodeModulesSize 50.1 MB 50.1 MB ⚠️ +875 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary vercel/next.js 27213-naturalWidth-naturalHeight Change
/ failed reqs 0 0
/ total time (seconds) 2.233 2.25 ⚠️ +0.02
/ avg req/sec 1119.6 1111.09 ⚠️ -8.51
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.246 1.258 ⚠️ +0.01
/error-in-render avg req/sec 2006.56 1987.06 ⚠️ -19.5
Client Bundles (main, webpack, commons)
vercel/next.js canary vercel/next.js 27213-naturalWidth-naturalHeight Change
745.HASH.js gzip 179 B 179 B
framework-HASH.js gzip 42.2 kB 42.2 kB
main-HASH.js gzip 22.8 kB 22.8 kB
webpack-HASH.js gzip 1.5 kB 1.5 kB
Overall change 66.7 kB 66.7 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary vercel/next.js 27213-naturalWidth-naturalHeight Change
polyfills-HASH.js gzip 31.1 kB 31.1 kB
Overall change 31.1 kB 31.1 kB
Client Pages Overall increase ⚠️
vercel/next.js canary vercel/next.js 27213-naturalWidth-naturalHeight Change
_app-HASH.js gzip 980 B 980 B
_error-HASH.js gzip 194 B 194 B
amp-HASH.js gzip 312 B 312 B
css-HASH.js gzip 329 B 329 B
dynamic-HASH.js gzip 2.52 kB 2.52 kB
head-HASH.js gzip 350 B 350 B
hooks-HASH.js gzip 903 B 903 B
image-HASH.js gzip 4.1 kB 4.13 kB ⚠️ +32 B
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 12.8 kB 12.8 kB ⚠️ +32 B
Client Build Manifests Overall increase ⚠️
vercel/next.js canary vercel/next.js 27213-naturalWidth-naturalHeight Change
_buildManifest.js gzip 490 B 491 B ⚠️ +1 B
Overall change 490 B 491 B ⚠️ +1 B
Rendered Page Sizes
vercel/next.js canary vercel/next.js 27213-naturalWidth-naturalHeight Change
index.html gzip 530 B 530 B
link.html gzip 542 B 542 B
withRouter.html gzip 524 B 524 B
Overall change 1.6 kB 1.6 kB

Diffs

Diff for _buildManifest.js
@@ -17,7 +17,7 @@ self.__BUILD_MANIFEST = {
     "static\u002Fchunks\u002Fpages\u002Fhooks-5bd5f4a70a656f6678c4.js"
   ],
   "/image": [
-    "static\u002Fchunks\u002Fpages\u002Fimage-7d84b07022170030c8da.js"
+    "static\u002Fchunks\u002Fpages\u002Fimage-1ad88e6dd5c62e24187c.js"
   ],
   "/link": ["static\u002Fchunks\u002Fpages\u002Flink-7a3c1e637e71f2a0e489.js"],
   "/routerDirect": [
Diff for image-HASH.js
@@ -340,7 +340,14 @@
               loadedImageURLs.add(src);
 
               if (onLoadingComplete) {
-                onLoadingComplete();
+                var naturalWidth = img.naturalWidth,
+                  naturalHeight = img.naturalHeight; // Pass back read-only primitive values but not the
+                // underlying DOM element because it could be misused.
+
+                onLoadingComplete({
+                  naturalWidth: naturalWidth,
+                  naturalHeight: naturalHeight
+                });
               }
             });
           }

Webpack 4 Mode (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary vercel/next.js 27213-naturalWidth-naturalHeight Change
buildDuration 10.4s 10.4s ⚠️ +56ms
buildDurationCached 4s 4s -6ms
nodeModulesSize 50.1 MB 50.1 MB ⚠️ +875 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary vercel/next.js 27213-naturalWidth-naturalHeight Change
/ failed reqs 0 0
/ total time (seconds) 2.332 2.288 -0.04
/ avg req/sec 1072.2 1092.89 +20.69
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.253 1.274 ⚠️ +0.02
/error-in-render avg req/sec 1994.77 1961.9 ⚠️ -32.87
Client Bundles (main, webpack, commons)
vercel/next.js canary vercel/next.js 27213-naturalWidth-naturalHeight Change
17.HASH.js gzip 185 B 185 B
677f882d2ed8..HASH.js gzip 13.8 kB 13.8 kB
framework.HASH.js gzip 41.9 kB 41.9 kB
main-HASH.js gzip 10.6 kB 10.6 kB
webpack-HASH.js gzip 1.19 kB 1.19 kB
Overall change 67.7 kB 67.7 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary vercel/next.js 27213-naturalWidth-naturalHeight Change
polyfills-HASH.js gzip 31.3 kB 31.3 kB
Overall change 31.3 kB 31.3 kB
Client Pages
vercel/next.js canary vercel/next.js 27213-naturalWidth-naturalHeight Change
_app-HASH.js gzip 965 B 965 B
_error-HASH.js gzip 3.74 kB 3.74 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 2.94 kB 2.94 kB
withRouter-HASH.js gzip 294 B 294 B
e025d2764813..52f.css gzip 125 B 125 B
Overall change 17.7 kB 17.7 kB
Client Build Manifests
vercel/next.js canary vercel/next.js 27213-naturalWidth-naturalHeight Change
_buildManifest.js gzip 499 B 499 B
Overall change 499 B 499 B
Rendered Page Sizes
vercel/next.js canary vercel/next.js 27213-naturalWidth-naturalHeight Change
index.html gzip 578 B 578 B
link.html gzip 591 B 591 B
withRouter.html gzip 571 B 571 B
Overall change 1.74 kB 1.74 kB
Commit: 6965ed9

@kodiakhq kodiakhq bot merged commit b05cdb1 into canary Aug 2, 2021
@kodiakhq kodiakhq bot deleted the 27213-naturalWidth-naturalHeight branch August 2, 2021 23:14
@nickadamson
Copy link

Thank you so much

flybayer pushed a commit to blitz-js/next.js that referenced this pull request Aug 19, 2021
@vercel vercel locked as resolved and limited conversation to collaborators Jan 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

onLoadingComplete() should pass naturalWidth and naturalHeight
3 participants