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.

Sign up for GitHub

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

Jump to bottom

Revert "fix: Promise.prototype.finally is object (#16620)" #16753

Merged
merged 1 commit into from
Sep 1, 2020
Merged

Revert "fix: Promise.prototype.finally is object (#16620)" #16753

merged 1 commit into from
Sep 1, 2020

Conversation

ijjk
Copy link
Member

@ijjk ijjk commented Sep 1, 2020 •
edited
Loading

This change causes a syntax error in ie11 due to arrow functions being used in the polyfill and them not being transpiled. We'll need to investigate updating this polyfill to not use arrow functions or make sure it is being transpiled correctly for ie11

x-ref: #16620
This reverts commit 6926ab7.

@ijjk ijjk added the type: next label Sep 1, 2020
@ijjk
Copy link
Member Author

ijjk commented Sep 1, 2020

Stats from current PR

Default Server Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js revert/finally-polyfill Change
buildDuration 13.4s 13.4s -52ms
nodeModulesSize 55.9 MB 55.9 MB ⚠️ +276 B
Page Load Tests Overall increase ✓
vercel/next.js canary ijjk/next.js revert/finally-polyfill Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.346 2.302 -0.04
/ avg req/sec 1065.66 1086 +20.34
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.313 1.287 -0.03
/error-in-render avg req/sec 1903.71 1943.03 +39.32
Client Bundles (main, webpack, commons) Overall increase ⚠️
vercel/next.js canary ijjk/next.js revert/finally-polyfill Change
677f882d2ed8..9ff9.js gzip 10.3 kB 10.3 kB ✓
framework.HASH.js gzip 39 kB 39 kB ✓
main-186de70..17a7.js gzip 7.34 kB 7.35 kB ⚠️ +9 B
webpack-e067..f178.js gzip 751 B 751 B ✓
Overall change 57.3 kB 57.3 kB ⚠️ +9 B
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
vercel/next.js canary ijjk/next.js revert/finally-polyfill Change
677f882d2ed8..dule.js gzip 6.13 kB 6.13 kB ✓
framework.HA..dule.js gzip 39 kB 39 kB ✓
main-f1f6abb..dule.js gzip 6.4 kB 6.41 kB ⚠️ +18 B
webpack-07c5..dule.js gzip 751 B 751 B ✓
Overall change 52.2 kB 52.3 kB ⚠️ +18 B
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js revert/finally-polyfill Change
polyfills-4b..e242.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js revert/finally-polyfill Change
_app-9a0b9e1..b37e.js gzip 1.28 kB 1.28 kB ✓
_error-ed1b0..8fbd.js gzip 3.44 kB 3.44 kB ✓
hooks-89731c..c609.js gzip 887 B 887 B ✓
index-17468f..5d83.js gzip 227 B 227 B ✓
link-ae98065..267e.js gzip 1.29 kB 1.29 kB ✓
routerDirect..924c.js gzip 284 B 284 B ✓
withRouter-7..c13d.js gzip 284 B 284 B ✓
Overall change 7.69 kB 7.69 kB ✓
Client Pages Modern
vercel/next.js canary ijjk/next.js revert/finally-polyfill Change
_app-75d3a82..dule.js gzip 625 B 625 B ✓
_error-4469a..dule.js gzip 2.29 kB 2.29 kB ✓
hooks-cbf13f..dule.js gzip 387 B 387 B ✓
index-b9a643..dule.js gzip 226 B 226 B ✓
link-cb244c4..dule.js gzip 1.26 kB 1.26 kB ✓
routerDirect..dule.js gzip 284 B 284 B ✓
withRouter-f..dule.js gzip 282 B 282 B ✓
Overall change 5.35 kB 5.35 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js revert/finally-polyfill Change
_buildManifest.js gzip 323 B 323 B ✓
_buildManife..dule.js gzip 329 B 329 B ✓
Overall change 652 B 652 B ✓
Rendered Page Sizes Overall decrease ✓
vercel/next.js canary ijjk/next.js revert/finally-polyfill Change
index.html gzip 970 B 969 B -1 B
link.html gzip 976 B 975 B -1 B
withRouter.html gzip 963 B 964 B ⚠️ +1 B
Overall change 2.91 kB 2.91 kB -1 B

Diffs

Diff for main-61451e6..e9490b1cd.js 
@@ -286,7 +286,9 @@ _N_E = (window["webpackJsonp_N_E"] = window["webpackJsonp_N_E"] || []).push([
       var _router2 = __webpack_require__("nOHt");
       /* global location */
 
-      __webpack_require__("Z577"); /// <reference types="react-dom/experimental" />
+      if (!("finally" in Promise.prototype)) {
+        Promise.prototype["finally"] = __webpack_require__("Z577");
+      }
 
       var data = JSON.parse(
         document.getElementById("__NEXT_DATA__").textContent
@@ -1158,18 +1160,22 @@ _N_E = (window["webpackJsonp_N_E"] = window["webpackJsonp_N_E"] || []).push([
     },
 
     /***/ Z577: /***/ function(module, exports) {
-      Promise.prototype.finally ||
-        (Promise.prototype.finally = function(t) {
-          if ("function" != typeof t) return this.then(t, t);
-          const e = this.constructor || Promise;
-          return this.then(
-            o => e.resolve(t()).then(() => o),
-            o =>
-              e.resolve(t()).then(() => {
-                throw o;
-              })
-          );
-        });
+      Promise.prototype.finally = function(n) {
+        if ("function" != typeof n) return this.then(n, n);
+        var t = this.constructor || Promise;
+        return this.then(
+          function(r) {
+            return t.resolve(n()).then(function() {
+              return r;
+            });
+          },
+          function(r) {
+            return t.resolve(n()).then(function() {
+              throw r;
+            });
+          }
+        );
+      };
 
       /***/
     },
Diff for main-6f59337..02.module.js 
@@ -202,7 +202,9 @@
       var _router2 = __webpack_require__("nOHt");
       /* global location */
 
-      __webpack_require__("Z577"); /// <reference types="react-dom/experimental" />
+      if (!("finally" in Promise.prototype)) {
+        Promise.prototype.finally = __webpack_require__("Z577");
+      }
 
       var data = JSON.parse(
         document.getElementById("__NEXT_DATA__").textContent
@@ -849,18 +851,22 @@
     },
 
     /***/ Z577: /***/ function(module, exports) {
-      Promise.prototype.finally ||
-        (Promise.prototype.finally = function(t) {
-          if ("function" != typeof t) return this.then(t, t);
-          const e = this.constructor || Promise;
-          return this.then(
-            o => e.resolve(t()).then(() => o),
-            o =>
-              e.resolve(t()).then(() => {
-                throw o;
-              })
-          );
-        });
+      Promise.prototype.finally = function(n) {
+        if ("function" != typeof n) return this.then(n, n);
+        var t = this.constructor || Promise;
+        return this.then(
+          function(r) {
+            return t.resolve(n()).then(function() {
+              return r;
+            });
+          },
+          function(r) {
+            return t.resolve(n()).then(function() {
+              throw r;
+            });
+          }
+        );
+      };
 
       /***/
     },
Diff for index.html 
@@ -7,7 +7,7 @@
     <noscript data-n-css="true"></noscript>
     <link
       rel="preload"
-      href="/_next/static/chunks/main-6f5933788ff95a57aa02.module.js"
+      href="/_next/static/chunks/main-b1e4cf281f42c20649dc.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -82,13 +82,13 @@
       src="/_next/static/chunks/polyfills-f73ba3fc145972ef83e9.js"
     ></script>
     <script
-      src="/_next/static/chunks/main-61451e68ed3e9490b1cd.js"
+      src="/_next/static/chunks/main-6811a87b6e57651aa82d.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/main-6f5933788ff95a57aa02.module.js"
+      src="/_next/static/chunks/main-b1e4cf281f42c20649dc.module.js"
       async=""
       crossorigin="anonymous"
       type="module"
Diff for link.html 
@@ -7,7 +7,7 @@
     <noscript data-n-css="true"></noscript>
     <link
       rel="preload"
-      href="/_next/static/chunks/main-6f5933788ff95a57aa02.module.js"
+      href="/_next/static/chunks/main-b1e4cf281f42c20649dc.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -87,13 +87,13 @@
       src="/_next/static/chunks/polyfills-f73ba3fc145972ef83e9.js"
     ></script>
     <script
-      src="/_next/static/chunks/main-61451e68ed3e9490b1cd.js"
+      src="/_next/static/chunks/main-6811a87b6e57651aa82d.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/main-6f5933788ff95a57aa02.module.js"
+      src="/_next/static/chunks/main-b1e4cf281f42c20649dc.module.js"
       async=""
       crossorigin="anonymous"
       type="module"
Diff for withRouter.html 
@@ -7,7 +7,7 @@
     <noscript data-n-css="true"></noscript>
     <link
       rel="preload"
-      href="/_next/static/chunks/main-6f5933788ff95a57aa02.module.js"
+      href="/_next/static/chunks/main-b1e4cf281f42c20649dc.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -82,13 +82,13 @@
       src="/_next/static/chunks/polyfills-f73ba3fc145972ef83e9.js"
     ></script>
     <script
-      src="/_next/static/chunks/main-61451e68ed3e9490b1cd.js"
+      src="/_next/static/chunks/main-6811a87b6e57651aa82d.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/main-6f5933788ff95a57aa02.module.js"
+      src="/_next/static/chunks/main-b1e4cf281f42c20649dc.module.js"
       async=""
       crossorigin="anonymous"
       type="module"
Serverless Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js revert/finally-polyfill Change
buildDuration 14.6s 14.8s ⚠️ +235ms
nodeModulesSize 55.9 MB 55.9 MB ⚠️ +276 B
Client Bundles (main, webpack, commons) Overall increase ⚠️
vercel/next.js canary ijjk/next.js revert/finally-polyfill Change
677f882d2ed8..9ff9.js gzip 10.3 kB 10.3 kB ✓
framework.HASH.js gzip 39 kB 39 kB ✓
main-186de70..17a7.js gzip 7.34 kB N/A N/A
webpack-e067..f178.js gzip 751 B 751 B ✓
main-363a86a..b5d2.js gzip N/A 7.35 kB N/A
Overall change 57.3 kB 57.3 kB ⚠️ +9 B
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
vercel/next.js canary ijjk/next.js revert/finally-polyfill Change
677f882d2ed8..dule.js gzip 6.13 kB 6.13 kB ✓
framework.HA..dule.js gzip 39 kB 39 kB ✓
main-f1f6abb..dule.js gzip 6.4 kB N/A N/A
webpack-07c5..dule.js gzip 751 B 751 B ✓
main-054a0c6..dule.js gzip N/A 6.41 kB N/A
Overall change 52.2 kB 52.3 kB ⚠️ +18 B
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js revert/finally-polyfill Change
polyfills-4b..e242.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js revert/finally-polyfill Change
_app-9a0b9e1..b37e.js gzip 1.28 kB 1.28 kB ✓
_error-ed1b0..8fbd.js gzip 3.44 kB 3.44 kB ✓
hooks-89731c..c609.js gzip 887 B 887 B ✓
index-17468f..5d83.js gzip 227 B 227 B ✓
link-ae98065..267e.js gzip 1.29 kB 1.29 kB ✓
routerDirect..924c.js gzip 284 B 284 B ✓
withRouter-7..c13d.js gzip 284 B 284 B ✓
Overall change 7.69 kB 7.69 kB ✓
Client Pages Modern
vercel/next.js canary ijjk/next.js revert/finally-polyfill Change
_app-75d3a82..dule.js gzip 625 B 625 B ✓
_error-4469a..dule.js gzip 2.29 kB 2.29 kB ✓
hooks-cbf13f..dule.js gzip 387 B 387 B ✓
index-b9a643..dule.js gzip 226 B 226 B ✓
link-cb244c4..dule.js gzip 1.26 kB 1.26 kB ✓
routerDirect..dule.js gzip 284 B 284 B ✓
withRouter-f..dule.js gzip 282 B 282 B ✓
Overall change 5.35 kB 5.35 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js revert/finally-polyfill Change
_buildManifest.js gzip 323 B 323 B ✓
_buildManife..dule.js gzip 329 B 329 B ✓
Overall change 652 B 652 B ✓
Serverless bundles
vercel/next.js canary ijjk/next.js revert/finally-polyfill Change
_error.js 1.03 MB 1.03 MB ✓
404.html 4.22 kB 4.22 kB ✓
hooks.html 3.86 kB 3.86 kB ✓
index.js 1.03 MB 1.03 MB ✓
link.js 1.07 MB 1.07 MB ✓
routerDirect.js 1.07 MB 1.07 MB ✓
withRouter.js 1.07 MB 1.07 MB ✓
Overall change 5.28 MB 5.28 MB ✓
Commit: 7523583

@Timer Timer merged commit 91a50d3 into vercel:canary Sep 1, 2020
@Timer Timer deleted the revert/finally-polyfill branch September 1, 2020 16:06
This was referenced May 25, 2021
Open
Open
Open
Open
Open
Open
Open
Open
@vercel vercel locked as resolved and limited conversation to collaborators Jan 30, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Timer Timer Timer approved these changes

@lfades lfades Awaiting requested review from lfades

@timneutkens timneutkens Awaiting requested review from timneutkens

Assignees
No one assigned
Labels
type: next
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ijjk @Timer