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

Support interrupts and focus in react-profiling-mode test #65200

Merged
merged 3 commits into from May 6, 2024

Conversation

eps1lon
Copy link
Member

@eps1lon eps1lon commented Apr 30, 2024

Some tests relied on the afterAll of a prior describe block. This breaks support of describe.skip and describe.only. The tests also produces git diffs when interrupted which can be confusing.

We can just use an environment variable in the config.

Closes NEXT-3263

@ijjk ijjk added created-by: Next.js team PRs by the Next.js team tests labels Apr 30, 2024
@ijjk
Copy link
Member

ijjk commented Apr 30, 2024

Stats from current PR

Default Build (Increase detected ⚠️)
General
vercel/next.js canary vercel/next.js sebbie/profiling-test-interrupt Change
buildDuration 16s 21s ⚠️ +5.1s
buildDurationCached 8.6s 6.9s N/A
nodeModulesSize 360 MB 360 MB N/A
nextStartRea..uration (ms) 393ms 394ms N/A
Client Bundles (main, webpack)
vercel/next.js canary vercel/next.js sebbie/profiling-test-interrupt Change
1103-HASH.js gzip 31.9 kB 31.9 kB N/A
1a9f679d-HASH.js gzip 53.5 kB 53.5 kB N/A
335-HASH.js gzip 5.05 kB 5.09 kB N/A
7953.HASH.js gzip 169 B 169 B
framework-HASH.js gzip 45.2 kB 45.2 kB
main-app-HASH.js gzip 231 B 228 B N/A
main-HASH.js gzip 31.6 kB 31.5 kB N/A
webpack-HASH.js gzip 1.65 kB 1.65 kB N/A
Overall change 45.4 kB 45.4 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary vercel/next.js sebbie/profiling-test-interrupt Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary vercel/next.js sebbie/profiling-test-interrupt Change
_app-HASH.js gzip 192 B 193 B N/A
_error-HASH.js gzip 192 B 193 B N/A
amp-HASH.js gzip 507 B 511 B N/A
css-HASH.js gzip 341 B 343 B N/A
dynamic-HASH.js gzip 2.52 kB 2.52 kB
edge-ssr-HASH.js gzip 266 B 265 B N/A
head-HASH.js gzip 362 B 365 B N/A
hooks-HASH.js gzip 392 B 392 B
image-HASH.js gzip 4.27 kB 4.32 kB N/A
index-HASH.js gzip 268 B 268 B
link-HASH.js gzip 2.69 kB 2.7 kB N/A
routerDirect..HASH.js gzip 329 B 328 B N/A
script-HASH.js gzip 397 B 397 B
withRouter-HASH.js gzip 324 B 324 B
1afbb74e6ecf..834.css gzip 106 B 106 B
Overall change 4 kB 4 kB
Client Build Manifests
vercel/next.js canary vercel/next.js sebbie/profiling-test-interrupt Change
_buildManifest.js gzip 483 B 484 B N/A
Overall change 0 B 0 B
Rendered Page Sizes
vercel/next.js canary vercel/next.js sebbie/profiling-test-interrupt Change
index.html gzip 527 B 526 B N/A
link.html gzip 540 B 539 B N/A
withRouter.html gzip 522 B 521 B N/A
Overall change 0 B 0 B
Edge SSR bundle Size
vercel/next.js canary vercel/next.js sebbie/profiling-test-interrupt Change
edge-ssr.js gzip 94.7 kB 94.7 kB N/A
page.js gzip 182 kB 181 kB N/A
Overall change 0 B 0 B
Middleware size
vercel/next.js canary vercel/next.js sebbie/profiling-test-interrupt Change
middleware-b..fest.js gzip 626 B 623 B N/A
middleware-r..fest.js gzip 156 B 156 B
middleware.js gzip 25.7 kB 25.7 kB
edge-runtime..pack.js gzip 839 B 839 B
Overall change 26.7 kB 26.7 kB
Next Runtimes
vercel/next.js canary vercel/next.js sebbie/profiling-test-interrupt Change
app-page-exp...dev.js gzip 171 kB 171 kB N/A
app-page-exp..prod.js gzip 98.7 kB 98.4 kB N/A
app-page-tur..prod.js gzip 100 kB 99.9 kB N/A
app-page-tur..prod.js gzip 94.5 kB 94.3 kB N/A
app-page.run...dev.js gzip 157 kB 157 kB N/A
app-page.run..prod.js gzip 93.2 kB 93 kB N/A
app-route-ex...dev.js gzip 21.5 kB 21.5 kB N/A
app-route-ex..prod.js gzip 15.2 kB 15.2 kB N/A
app-route-tu..prod.js gzip 15.2 kB 15.2 kB N/A
app-route-tu..prod.js gzip 15 kB 15 kB N/A
app-route.ru...dev.js gzip 21.3 kB 21.3 kB N/A
app-route.ru..prod.js gzip 15 kB 15 kB N/A
pages-api-tu..prod.js gzip 9.55 kB 9.55 kB
pages-api.ru...dev.js gzip 9.82 kB 9.82 kB
pages-api.ru..prod.js gzip 9.55 kB 9.55 kB
pages-turbo...prod.js gzip 21.5 kB 21.5 kB
pages.runtim...dev.js gzip 22.1 kB 22.1 kB
pages.runtim..prod.js gzip 21.5 kB 21.5 kB
server.runti..prod.js gzip 51.6 kB 51.6 kB N/A
Overall change 94 kB 94 kB
build cache Overall increase ⚠️
vercel/next.js canary vercel/next.js sebbie/profiling-test-interrupt Change
0.pack gzip 1.62 MB 1.62 MB ⚠️ +445 B
index.pack gzip 114 kB 113 kB N/A
Overall change 1.62 MB 1.62 MB ⚠️ +445 B
Diff details
Diff for edge-ssr.js

Diff too large to display

Diff for image-HASH.js
@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [8358],
   {
-    /***/ 7935: /***/ (
+    /***/ 1058: /***/ (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/image",
         function () {
-          return __webpack_require__(7013);
+          return __webpack_require__(4286);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 7890: /***/ (module, exports, __webpack_require__) => {
+    /***/ 6659: /***/ (module, exports, __webpack_require__) => {
       "use strict";
       /* __next_internal_client_entry_do_not_use__  cjs */
       Object.defineProperty(exports, "__esModule", {
@@ -40,15 +40,15 @@
         __webpack_require__(967)
       );
       const _head = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(5820)
+        __webpack_require__(8338)
       );
-      const _getimgprops = __webpack_require__(829);
-      const _imageconfig = __webpack_require__(1247);
-      const _imageconfigcontextsharedruntime = __webpack_require__(6709);
-      const _warnonce = __webpack_require__(928);
-      const _routercontextsharedruntime = __webpack_require__(3546);
+      const _getimgprops = __webpack_require__(1664);
+      const _imageconfig = __webpack_require__(6442);
+      const _imageconfigcontextsharedruntime = __webpack_require__(983);
+      const _warnonce = __webpack_require__(2615);
+      const _routercontextsharedruntime = __webpack_require__(397);
       const _imageloader = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(7301)
+        __webpack_require__(4085)
       );
       // This is replaced by webpack define plugin
       const configEnv = {
@@ -129,8 +129,11 @@
         });
       }
       function getDynamicProps(fetchPriority) {
-        if (Boolean(_react.use)) {
-          // In React 19.0.0 or newer, we must use camelCase
+        const [majorStr, minorStr] = _react.version.split(".", 2);
+        const major = parseInt(majorStr, 10);
+        const minor = parseInt(minorStr, 10);
+        if (major > 18 || (major === 18 && minor >= 3)) {
+          // In React 18.3.0 or newer, we must use camelCase
           // prop to avoid "Warning: Invalid DOM property".
           // See https://github.com/facebook/react/pull/25927
           return {
@@ -376,7 +379,7 @@
       /***/
     },
 
-    /***/ 829: /***/ (
+    /***/ 1664: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -392,9 +395,9 @@
           return getImgProps;
         },
       });
-      const _warnonce = __webpack_require__(928);
-      const _imageblursvg = __webpack_require__(6319);
-      const _imageconfig = __webpack_require__(1247);
+      const _warnonce = __webpack_require__(2615);
+      const _imageblursvg = __webpack_require__(1808);
+      const _imageconfig = __webpack_require__(6442);
       const VALID_LOADING_VALUES =
         /* unused pure expression or super */ null && [
           "lazy",
@@ -769,7 +772,7 @@
       /***/
     },
 
-    /***/ 6319: /***/ (__unused_webpack_module, exports) => {
+    /***/ 1808: /***/ (__unused_webpack_module, exports) => {
       "use strict";
       /**
        * A shared function, used on both client and server, to generate a SVG blur placeholder.
@@ -824,7 +827,7 @@
       /***/
     },
 
-    /***/ 3484: /***/ (
+    /***/ 8265: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -851,10 +854,10 @@
         },
       });
       const _interop_require_default = __webpack_require__(1478);
-      const _getimgprops = __webpack_require__(829);
-      const _imagecomponent = __webpack_require__(7890);
+      const _getimgprops = __webpack_require__(1664);
+      const _imagecomponent = __webpack_require__(6659);
       const _imageloader = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(7301)
+        __webpack_require__(4085)
       );
       function getImageProps(imgProps) {
         const { props } = (0, _getimgprops.getImgProps)(imgProps, {
@@ -886,7 +889,7 @@
       /***/
     },
 
-    /***/ 7301: /***/ (__unused_webpack_module, exports) => {
+    /***/ 4085: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -921,7 +924,7 @@
       /***/
     },
 
-    /***/ 7013: /***/ (
+    /***/ 4286: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -938,8 +941,8 @@
 
       // EXTERNAL MODULE: ./node_modules/.pnpm/react@18.3.1/node_modules/react/jsx-runtime.js
       var jsx_runtime = __webpack_require__(2676);
-      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_react-dom@18.3.1_react@18.3.1/node_modules/next/image.js
-      var next_image = __webpack_require__(4841);
+      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_react-dom@18.3.1_react@18.3.1/node_modules/next/image.js
+      var next_image = __webpack_require__(7053);
       var image_default = /*#__PURE__*/ __webpack_require__.n(next_image); // CONCATENATED MODULE: ./pages/nextjs.png
       /* harmony default export */ const nextjs = {
         src: "/_next/static/media/nextjs.cae0b805.png",
@@ -969,12 +972,12 @@
       /***/
     },
 
-    /***/ 4841: /***/ (
+    /***/ 7053: /***/ (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) => {
-      module.exports = __webpack_require__(3484);
+      module.exports = __webpack_require__(8265);
 
       /***/
     },
@@ -984,7 +987,7 @@
     /******/ var __webpack_exec__ = (moduleId) =>
       __webpack_require__((__webpack_require__.s = moduleId));
     /******/ __webpack_require__.O(0, [2888, 9774, 179], () =>
-      __webpack_exec__(7935)
+      __webpack_exec__(1058)
     );
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;
Diff for 1103-HASH.js

Diff too large to display

Diff for 335-HASH.js
@@ -1,8 +1,8 @@
 "use strict";
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
-  [335],
+  [8982],
   {
-    /***/ 335: /***/ (module, exports, __webpack_require__) => {
+    /***/ 8982: /***/ (module, exports, __webpack_require__) => {
       /* __next_internal_client_entry_do_not_use__  cjs */
       Object.defineProperty(exports, "__esModule", {
         value: true,
@@ -13,25 +13,25 @@
           return Image;
         },
       });
-      const _interop_require_default = __webpack_require__(5113);
-      const _interop_require_wildcard = __webpack_require__(9036);
-      const _jsxruntime = __webpack_require__(7059);
+      const _interop_require_default = __webpack_require__(1741);
+      const _interop_require_wildcard = __webpack_require__(4397);
+      const _jsxruntime = __webpack_require__(8588);
       const _react = /*#__PURE__*/ _interop_require_wildcard._(
-        __webpack_require__(6307)
+        __webpack_require__(8230)
       );
       const _reactdom = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(4430)
+        __webpack_require__(4690)
       );
       const _head = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(1500)
+        __webpack_require__(7332)
       );
-      const _getimgprops = __webpack_require__(281);
-      const _imageconfig = __webpack_require__(5808);
-      const _imageconfigcontextsharedruntime = __webpack_require__(4647);
-      const _warnonce = __webpack_require__(646);
-      const _routercontextsharedruntime = __webpack_require__(5861);
+      const _getimgprops = __webpack_require__(1308);
+      const _imageconfig = __webpack_require__(4709);
+      const _imageconfigcontextsharedruntime = __webpack_require__(4366);
+      const _warnonce = __webpack_require__(3834);
+      const _routercontextsharedruntime = __webpack_require__(1436);
       const _imageloader = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(6526)
+        __webpack_require__(2235)
       );
       // This is replaced by webpack define plugin
       const configEnv = {
@@ -113,8 +113,11 @@
         });
       }
       function getDynamicProps(fetchPriority) {
-        if (Boolean(_react.use)) {
-          // In React 19.0.0 or newer, we must use camelCase
+        const [majorStr, minorStr] = _react.version.split(".", 2);
+        const major = parseInt(majorStr, 10);
+        const minor = parseInt(minorStr, 10);
+        if (major > 18 || (major === 18 && minor >= 3)) {
+          // In React 18.3.0 or newer, we must use camelCase
           // prop to avoid "Warning: Invalid DOM property".
           // See https://github.com/facebook/react/pull/25927
           return {
@@ -360,7 +363,7 @@
       /***/
     },
 
-    /***/ 9032: /***/ (
+    /***/ 3211: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -374,9 +377,9 @@
           return AmpStateContext;
         },
       });
-      const _interop_require_default = __webpack_require__(5113);
+      const _interop_require_default = __webpack_require__(1741);
       const _react = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(6307)
+        __webpack_require__(8230)
       );
       const AmpStateContext = _react.default.createContext({});
       if (false) {
@@ -385,7 +388,7 @@
       /***/
     },
 
-    /***/ 5607: /***/ (__unused_webpack_module, exports) => {
+    /***/ 7873: /***/ (__unused_webpack_module, exports) => {
       Object.defineProperty(exports, "__esModule", {
         value: true,
       });
@@ -407,7 +410,7 @@
       /***/
     },
 
-    /***/ 281: /***/ (
+    /***/ 1308: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -421,9 +424,9 @@
           return getImgProps;
         },
       });
-      const _warnonce = __webpack_require__(646);
-      const _imageblursvg = __webpack_require__(1258);
-      const _imageconfig = __webpack_require__(5808);
+      const _warnonce = __webpack_require__(3834);
+      const _imageblursvg = __webpack_require__(8181);
+      const _imageconfig = __webpack_require__(4709);
       const VALID_LOADING_VALUES =
         /* unused pure expression or super */ null && [
           "lazy",
@@ -798,7 +801,7 @@
       /***/
     },
 
-    /***/ 1500: /***/ (module, exports, __webpack_require__) => {
+    /***/ 7332: /***/ (module, exports, __webpack_require__) => {
       /* __next_internal_client_entry_do_not_use__  cjs */
       Object.defineProperty(exports, "__esModule", {
         value: true,
@@ -819,19 +822,19 @@
           return defaultHead;
         },
       });
-      const _interop_require_default = __webpack_require__(5113);
-      const _interop_require_wildcard = __webpack_require__(9036);
-      const _jsxruntime = __webpack_require__(7059);
+      const _interop_require_default = __webpack_require__(1741);
+      const _interop_require_wildcard = __webpack_require__(4397);
+      const _jsxruntime = __webpack_require__(8588);
       const _react = /*#__PURE__*/ _interop_require_wildcard._(
-        __webpack_require__(6307)
+        __webpack_require__(8230)
       );
       const _sideeffect = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(2511)
+        __webpack_require__(2032)
       );
-      const _ampcontextsharedruntime = __webpack_require__(9032);
-      const _headmanagercontextsharedruntime = __webpack_require__(4779);
-      const _ampmode = __webpack_require__(5607);
-      const _warnonce = __webpack_require__(646);
+      const _ampcontextsharedruntime = __webpack_require__(3211);
+      const _headmanagercontextsharedruntime = __webpack_require__(9165);
+      const _ampmode = __webpack_require__(7873);
+      const _warnonce = __webpack_require__(3834);
       function defaultHead(inAmpMode) {
         if (inAmpMode === void 0) inAmpMode = false;
         const head = [
@@ -1007,7 +1010,7 @@
       /***/
     },
 
-    /***/ 1258: /***/ (__unused_webpack_module, exports) => {
+    /***/ 8181: /***/ (__unused_webpack_module, exports) => {
       /**
        * A shared function, used on both client and server, to generate a SVG blur placeholder.
        */
@@ -1061,7 +1064,7 @@
       /***/
     },
 
-    /***/ 4647: /***/ (
+    /***/ 4366: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1075,11 +1078,11 @@
           return ImageConfigContext;
         },
       });
-      const _interop_require_default = __webpack_require__(5113);
+      const _interop_require_default = __webpack_require__(1741);
       const _react = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(6307)
+        __webpack_require__(8230)
       );
-      const _imageconfig = __webpack_require__(5808);
+      const _imageconfig = __webpack_require__(4709);
       const ImageConfigContext = _react.default.createContext(
         _imageconfig.imageConfigDefault
       );
@@ -1089,7 +1092,7 @@
       /***/
     },
 
-    /***/ 5808: /***/ (__unused_webpack_module, exports) => {
+    /***/ 4709: /***/ (__unused_webpack_module, exports) => {
       Object.defineProperty(exports, "__esModule", {
         value: true,
       });
@@ -1136,7 +1139,7 @@
       /***/
     },
 
-    /***/ 6526: /***/ (__unused_webpack_module, exports) => {
+    /***/ 2235: /***/ (__unused_webpack_module, exports) => {
       Object.defineProperty(exports, "__esModule", {
         value: true,
       });
@@ -1169,7 +1172,7 @@
       /***/
     },
 
-    /***/ 5861: /***/ (
+    /***/ 1436: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1183,9 +1186,9 @@
           return RouterContext;
         },
       });
-      const _interop_require_default = __webpack_require__(5113);
+      const _interop_require_default = __webpack_require__(1741);
       const _react = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(6307)
+        __webpack_require__(8230)
       );
       const RouterContext = _react.default.createContext(null);
       if (false) {
@@ -1194,7 +1197,7 @@
       /***/
     },
 
-    /***/ 2511: /***/ (
+    /***/ 2032: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -1208,7 +1211,7 @@
           return SideEffect;
         },
       });
-      const _react = __webpack_require__(6307);
+      const _react = __webpack_require__(8230);
       const isServer = typeof window === "undefined";
       const useClientOnlyLayoutEffect = isServer
         ? () => {}
Diff for main-HASH.js

Diff too large to display

Diff for app-page-exp..ntime.dev.js
failed to diff
Diff for app-page-exp..time.prod.js

Diff too large to display

Diff for app-page-tur..time.prod.js

Diff too large to display

Diff for app-page-tur..time.prod.js

Diff too large to display

Diff for app-page.runtime.dev.js

Diff too large to display

Diff for app-page.runtime.prod.js

Diff too large to display

Diff for app-route-ex..ntime.dev.js

Diff too large to display

Diff for app-route-ex..time.prod.js

Diff too large to display

Diff for app-route-tu..time.prod.js

Diff too large to display

Diff for app-route-tu..time.prod.js

Diff too large to display

Diff for app-route.runtime.dev.js

Diff too large to display

Diff for app-route.ru..time.prod.js

Diff too large to display

Diff for server.runtime.prod.js

Diff too large to display

Commit: bed9437

@eps1lon eps1lon marked this pull request as ready for review April 30, 2024 12:15
@@ -1,3 +1,3 @@
module.exports = {
reactProductionProfiling: true,
reactProductionProfiling: process.env.REACT_PRODUCTION_PROFILING === 'true',
Copy link
Member

Choose a reason for hiding this comment

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

Let's use a TEST_ prefix indicating this is for testing only

Suggested change
reactProductionProfiling: process.env.REACT_PRODUCTION_PROFILING === 'true',
reactProductionProfiling: process.env.TEST_REACT_PRODUCTION_PROFILING === 'true',

Copy link
Member Author

Choose a reason for hiding this comment

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

makes sense.

@ijjk
Copy link
Member

ijjk commented May 3, 2024

Tests Passed

@eps1lon eps1lon merged commit 7cfe6fd into canary May 6, 2024
79 of 80 checks passed
@eps1lon eps1lon deleted the sebbie/profiling-test-interrupt branch May 6, 2024 05:28
@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 20, 2024
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.

None yet

3 participants