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

refactor: re-use existed escapeRegex #34470

Merged
merged 3 commits into from Feb 28, 2022
Merged

Conversation

SukkaW
Copy link
Contributor

@SukkaW SukkaW commented Feb 17, 2022

Bug

  • Related issues linked using fixes #number
  • Integration tests added
  • Errors have helpful link attached, see contributing.md

Feature

  • Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
  • Related issues linked using fixes #number
  • Integration tests added
  • Documentation added
  • Telemetry added. In case of a feature if it's used or not.
  • Errors have helpful link attached, see contributing.md

Documentation / Examples

  • Make sure the linting passes by running yarn lint

escape-regex.ts will always be included in the bundle, so not re-using it actually makes the size larger.

@ijjk

This comment has been minimized.

@ijjk
Copy link
Member

ijjk commented Feb 28, 2022

Stats from current PR

Default Build (Increase detected ⚠️)
General Overall decrease ✓
vercel/next.js canary SukkaW/next.js reuse-escape-regexp Change
buildDuration 20.3s 19.4s -869ms
buildDurationCached 7.7s 7.6s -37ms
nodeModulesSize 368 MB 368 MB -158 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary SukkaW/next.js reuse-escape-regexp Change
/ failed reqs 0 0
/ total time (seconds) 4.038 4.033 0
/ avg req/sec 619.19 619.88 +0.69
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 2.128 2.173 ⚠️ +0.04
/error-in-render avg req/sec 1174.75 1150.42 ⚠️ -24.33
Client Bundles (main, webpack) Overall increase ⚠️
vercel/next.js canary SukkaW/next.js reuse-escape-regexp Change
450.HASH.js gzip 179 B 179 B
framework-HASH.js gzip 42 kB 42 kB
main-HASH.js gzip 27.8 kB 27.8 kB ⚠️ +39 B
webpack-HASH.js gzip 1.44 kB 1.44 kB
Overall change 71.5 kB 71.5 kB ⚠️ +39 B
Legacy Client Bundles (polyfills)
vercel/next.js canary SukkaW/next.js reuse-escape-regexp Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary SukkaW/next.js reuse-escape-regexp Change
_app-HASH.js gzip 1.36 kB 1.36 kB
_error-HASH.js gzip 194 B 194 B
amp-HASH.js gzip 312 B 312 B
css-HASH.js gzip 326 B 326 B
dynamic-HASH.js gzip 2.57 kB 2.57 kB
head-HASH.js gzip 350 B 350 B
hooks-HASH.js gzip 919 B 919 B
image-HASH.js gzip 5.05 kB 5.05 kB
index-HASH.js gzip 263 B 263 B
link-HASH.js gzip 2.26 kB 2.26 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 14.7 kB 14.7 kB
Client Build Manifests
vercel/next.js canary SukkaW/next.js reuse-escape-regexp Change
_buildManifest.js gzip 460 B 460 B
Overall change 460 B 460 B
Rendered Page Sizes Overall decrease ✓
vercel/next.js canary SukkaW/next.js reuse-escape-regexp Change
index.html gzip 532 B 532 B
link.html gzip 545 B 544 B -1 B
withRouter.html gzip 526 B 526 B
Overall change 1.6 kB 1.6 kB -1 B

Diffs

Diff for main-HASH.js
@@ -3589,6 +3589,20 @@
       /***/
     },
 
+    /***/ 489: /***/ function(__unused_webpack_module, exports) {
+      "use strict";
+
+      Object.defineProperty(exports, "__esModule", {
+        value: true
+      });
+      exports.escapeStringRegexp = escapeStringRegexp;
+      function escapeStringRegexp(str) {
+        return str.replace(/[|\\{}()[\]^$+*?.-]/g, "\\$&");
+      } //# sourceMappingURL=escape-regexp.js.map
+
+      /***/
+    },
+
     /***/ 8404: /***/ function(
       __unused_webpack_module,
       exports,
@@ -7077,7 +7091,11 @@
       /***/
     },
 
-    /***/ 4095: /***/ function(__unused_webpack_module, exports) {
+    /***/ 4095: /***/ function(
+      __unused_webpack_module,
+      exports,
+      __webpack_require__
+    ) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -7085,11 +7103,7 @@
       });
       exports.getParametrizedRoute = getParametrizedRoute;
       exports.getRouteRegex = getRouteRegex;
-      // this isn't importing the escape-string-regex module
-      // to reduce bytes
-      function escapeRegex(str) {
-        return str.replace(/[|\\{}()[\]^$+*?.-]/g, "\\$&");
-      }
+      var _escapeRegexp = __webpack_require__(489);
       function parseParameter(param) {
         var optional = param.startsWith("[") && param.endsWith("]");
         if (optional) {
@@ -7127,7 +7141,7 @@
                   : "/(.+?)"
                 : "/([^/]+?)";
             } else {
-              return "/".concat(escapeRegex(segment));
+              return "/".concat((0, _escapeRegexp).escapeStringRegexp(segment));
             }
           })
           .join("");
Diff for index.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-d63ad64c32fef554.js"
+      src="/_next/static/chunks/main-4566918fec87b11c.js"
       defer=""
     ></script>
     <script
Diff for link.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-d63ad64c32fef554.js"
+      src="/_next/static/chunks/main-4566918fec87b11c.js"
       defer=""
     ></script>
     <script
Diff for withRouter.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-d63ad64c32fef554.js"
+      src="/_next/static/chunks/main-4566918fec87b11c.js"
       defer=""
     ></script>
     <script

Default Build with SWC (Increase detected ⚠️)
General Overall decrease ✓
vercel/next.js canary SukkaW/next.js reuse-escape-regexp Change
buildDuration 24s 24.1s ⚠️ +27ms
buildDurationCached 7.7s 7.6s -74ms
nodeModulesSize 368 MB 368 MB -158 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary SukkaW/next.js reuse-escape-regexp Change
/ failed reqs 0 0
/ total time (seconds) 4.105 4.022 -0.08
/ avg req/sec 609.02 621.55 +12.53
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 2.104 2.162 ⚠️ +0.06
/error-in-render avg req/sec 1188.27 1156.38 ⚠️ -31.89
Client Bundles (main, webpack) Overall increase ⚠️
vercel/next.js canary SukkaW/next.js reuse-escape-regexp Change
450.HASH.js gzip 179 B 179 B
framework-HASH.js gzip 42.1 kB 42.1 kB
main-HASH.js gzip 27.8 kB 27.9 kB ⚠️ +49 B
webpack-HASH.js gzip 1.44 kB 1.44 kB
Overall change 71.6 kB 71.6 kB ⚠️ +49 B
Legacy Client Bundles (polyfills)
vercel/next.js canary SukkaW/next.js reuse-escape-regexp Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary SukkaW/next.js reuse-escape-regexp 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.56 kB 2.56 kB
head-HASH.js gzip 342 B 342 B
hooks-HASH.js gzip 911 B 911 B
image-HASH.js gzip 5.08 kB 5.08 kB
index-HASH.js gzip 256 B 256 B
link-HASH.js gzip 2.28 kB 2.28 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 14.7 kB 14.7 kB
Client Build Manifests
vercel/next.js canary SukkaW/next.js reuse-escape-regexp Change
_buildManifest.js gzip 459 B 459 B
Overall change 459 B 459 B
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary SukkaW/next.js reuse-escape-regexp Change
index.html gzip 533 B 534 B ⚠️ +1 B
link.html gzip 547 B 547 B
withRouter.html gzip 528 B 528 B
Overall change 1.61 kB 1.61 kB ⚠️ +1 B

Diffs

Diff for main-HASH.js
@@ -3589,6 +3589,20 @@
       /***/
     },
 
+    /***/ 489: /***/ function(__unused_webpack_module, exports) {
+      "use strict";
+
+      Object.defineProperty(exports, "__esModule", {
+        value: true
+      });
+      exports.escapeStringRegexp = escapeStringRegexp;
+      function escapeStringRegexp(str) {
+        return str.replace(/[|\\{}()[\]^$+*?.-]/g, "\\$&");
+      } //# sourceMappingURL=escape-regexp.js.map
+
+      /***/
+    },
+
     /***/ 8404: /***/ function(
       __unused_webpack_module,
       exports,
@@ -7077,7 +7091,11 @@
       /***/
     },
 
-    /***/ 4095: /***/ function(__unused_webpack_module, exports) {
+    /***/ 4095: /***/ function(
+      __unused_webpack_module,
+      exports,
+      __webpack_require__
+    ) {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -7085,11 +7103,7 @@
       });
       exports.getParametrizedRoute = getParametrizedRoute;
       exports.getRouteRegex = getRouteRegex;
-      // this isn't importing the escape-string-regex module
-      // to reduce bytes
-      function escapeRegex(str) {
-        return str.replace(/[|\\{}()[\]^$+*?.-]/g, "\\$&");
-      }
+      var _escapeRegexp = __webpack_require__(489);
       function parseParameter(param) {
         var optional = param.startsWith("[") && param.endsWith("]");
         if (optional) {
@@ -7127,7 +7141,7 @@
                   : "/(.+?)"
                 : "/([^/]+?)";
             } else {
-              return "/".concat(escapeRegex(segment));
+              return "/".concat((0, _escapeRegexp).escapeStringRegexp(segment));
             }
           })
           .join("");
Diff for index.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-d63ad64c32fef554.js"
+      src="/_next/static/chunks/main-4566918fec87b11c.js"
       defer=""
     ></script>
     <script
Diff for link.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-d63ad64c32fef554.js"
+      src="/_next/static/chunks/main-4566918fec87b11c.js"
       defer=""
     ></script>
     <script
Diff for withRouter.html
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-d63ad64c32fef554.js"
+      src="/_next/static/chunks/main-4566918fec87b11c.js"
       defer=""
     ></script>
     <script
Commit: d6189fa

@kodiakhq kodiakhq bot merged commit 7ca78dd into vercel:canary Feb 28, 2022
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 31, 2022
@SukkaW SukkaW deleted the reuse-escape-regexp branch October 24, 2023 08:34
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants