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

Jump to bottom

perf(escapeStringRegexp): test before replace #34472

Merged
merged 2 commits into from Apr 16, 2022
Merged

perf(escapeStringRegexp): test before replace #34472

merged 2 commits into from Apr 16, 2022

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

@kodiakhq kodiakhq bot merged commit a001153 into vercel:canary Apr 16, 2022
@ijjk
Copy link
Member

ijjk commented Apr 16, 2022

Stats from current PR

Default Build (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary SukkaW/next.js perf-escape-regex Change
buildDuration 15.6s 15.5s -146ms
buildDurationCached 6.1s 6s -96ms
nodeModulesSize 485 MB 485 MB ⚠️ +560 B
Page Load Tests Overall increase ✓
vercel/next.js canary SukkaW/next.js perf-escape-regex Change
/ failed reqs 0 0 ✓
/ total time (seconds) 3.153 3.18 ⚠️ +0.03
/ avg req/sec 792.9 786.05 ⚠️ -6.85
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.344 1.327 -0.02
/error-in-render avg req/sec 1859.56 1883.91 +24.35
Client Bundles (main, webpack) Overall increase ⚠️
vercel/next.js canary SukkaW/next.js perf-escape-regex Change
925.HASH.js gzip 179 B 179 B ✓
framework-HASH.js gzip 42 kB 42 kB ✓
main-HASH.js gzip 28.4 kB 28.5 kB ⚠️ +15 B
webpack-HASH.js gzip 1.44 kB 1.44 kB ✓
Overall change 72.1 kB 72.1 kB ⚠️ +15 B
Legacy Client Bundles (polyfills)
vercel/next.js canary SukkaW/next.js perf-escape-regex Change
polyfills-HASH.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary SukkaW/next.js perf-escape-regex Change
_app-HASH.js gzip 1.36 kB 1.36 kB ✓
_error-HASH.js gzip 192 B 192 B ✓
amp-HASH.js gzip 309 B 309 B ✓
css-HASH.js gzip 327 B 327 B ✓
dynamic-HASH.js gzip 3.04 kB 3.04 kB ✓
head-HASH.js gzip 351 B 351 B ✓
hooks-HASH.js gzip 920 B 920 B ✓
image-HASH.js gzip 5.74 kB 5.74 kB ✓
index-HASH.js gzip 263 B 263 B ✓
link-HASH.js gzip 2.36 kB 2.36 kB ✓
routerDirect..HASH.js gzip 320 B 320 B ✓
script-HASH.js gzip 392 B 392 B ✓
withRouter-HASH.js gzip 319 B 319 B ✓
85e02e95b279..7e3.css gzip 107 B 107 B ✓
Overall change 16 kB 16 kB ✓
Client Build Manifests
vercel/next.js canary SukkaW/next.js perf-escape-regex Change
_buildManifest.js gzip 461 B 461 B ✓
Overall change 461 B 461 B ✓
Rendered Page Sizes
vercel/next.js canary SukkaW/next.js perf-escape-regex Change
index.html gzip 532 B 532 B ✓
link.html gzip 545 B 545 B ✓
withRouter.html gzip 526 B 526 B ✓
Overall change 1.6 kB 1.6 kB ✓

Diffs

Diff for main-HASH.js 
@@ -3693,8 +3693,15 @@
         value: true
       });
       exports.escapeStringRegexp = escapeStringRegexp;
+      // regexp is based on https://github.com/sindresorhus/escape-string-regexp
+      var reHasRegExp = /[|\\{}()[\]^$+*?.-]/;
+      var reReplaceRegExp = /[|\\{}()[\]^$+*?.-]/g;
       function escapeStringRegexp(str) {
-        return str.replace(/[|\\{}()[\]^$+*?.-]/g, "\\$&");
+        // see also: https://github.com/lodash/lodash/blob/2da024c3b4f9947a48517639de7560457cd4ec6c/escapeRegExp.js#L23
+        if (reHasRegExp.test(str)) {
+          return str.replace(reReplaceRegExp, "\\$&");
+        }
+        return str;
       } //# sourceMappingURL=escape-regexp.js.map
 
       /***/
Diff for index.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-f7f95d3518feca5a.js"
+      src="/_next/static/chunks/main-ff8e45037ddf7c13.js"
       defer=""
     ></script>
     <script
Diff for link.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-f7f95d3518feca5a.js"
+      src="/_next/static/chunks/main-ff8e45037ddf7c13.js"
       defer=""
     ></script>
     <script
Diff for withRouter.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-f7f95d3518feca5a.js"
+      src="/_next/static/chunks/main-ff8e45037ddf7c13.js"
       defer=""
     ></script>
     <script
Default Build with SWC (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary SukkaW/next.js perf-escape-regex Change
buildDuration 18.5s 18.1s -359ms
buildDurationCached 6.1s 6s -109ms
nodeModulesSize 485 MB 485 MB ⚠️ +560 B
Page Load Tests Overall increase ✓
vercel/next.js canary SukkaW/next.js perf-escape-regex Change
/ failed reqs 0 0 ✓
/ total time (seconds) 3.191 3.183 -0.01
/ avg req/sec 783.55 785.41 +1.86
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.383 1.335 -0.05
/error-in-render avg req/sec 1807.74 1872.17 +64.43
Client Bundles (main, webpack) Overall increase ⚠️
vercel/next.js canary SukkaW/next.js perf-escape-regex Change
925.HASH.js gzip 178 B 178 B ✓
framework-HASH.js gzip 42.3 kB 42.3 kB ✓
main-HASH.js gzip 28.9 kB 28.9 kB ⚠️ +13 B
webpack-HASH.js gzip 1.45 kB 1.45 kB ✓
Overall change 72.8 kB 72.8 kB ⚠️ +13 B
Legacy Client Bundles (polyfills)
vercel/next.js canary SukkaW/next.js perf-escape-regex Change
polyfills-HASH.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary SukkaW/next.js perf-escape-regex Change
_app-HASH.js gzip 1.35 kB 1.35 kB ✓
_error-HASH.js gzip 179 B 179 B ✓
amp-HASH.js gzip 313 B 313 B ✓
css-HASH.js gzip 325 B 325 B ✓
dynamic-HASH.js gzip 3.02 kB 3.02 kB ✓
head-HASH.js gzip 351 B 351 B ✓
hooks-HASH.js gzip 921 B 921 B ✓
image-HASH.js gzip 5.78 kB 5.78 kB ✓
index-HASH.js gzip 261 B 261 B ✓
link-HASH.js gzip 2.44 kB 2.44 kB ✓
routerDirect..HASH.js gzip 322 B 322 B ✓
script-HASH.js gzip 393 B 393 B ✓
withRouter-HASH.js gzip 317 B 317 B ✓
85e02e95b279..7e3.css gzip 107 B 107 B ✓
Overall change 16.1 kB 16.1 kB ✓
Client Build Manifests
vercel/next.js canary SukkaW/next.js perf-escape-regex Change
_buildManifest.js gzip 457 B 457 B ✓
Overall change 457 B 457 B ✓
Rendered Page Sizes
vercel/next.js canary SukkaW/next.js perf-escape-regex Change
index.html gzip 532 B 532 B ✓
link.html gzip 546 B 546 B ✓
withRouter.html gzip 527 B 527 B ✓
Overall change 1.6 kB 1.6 kB ✓

Diffs

Diff for main-HASH.js 
@@ -3693,8 +3693,15 @@
         value: true
       });
       exports.escapeStringRegexp = escapeStringRegexp;
+      // regexp is based on https://github.com/sindresorhus/escape-string-regexp
+      var reHasRegExp = /[|\\{}()[\]^$+*?.-]/;
+      var reReplaceRegExp = /[|\\{}()[\]^$+*?.-]/g;
       function escapeStringRegexp(str) {
-        return str.replace(/[|\\{}()[\]^$+*?.-]/g, "\\$&");
+        // see also: https://github.com/lodash/lodash/blob/2da024c3b4f9947a48517639de7560457cd4ec6c/escapeRegExp.js#L23
+        if (reHasRegExp.test(str)) {
+          return str.replace(reReplaceRegExp, "\\$&");
+        }
+        return str;
       } //# sourceMappingURL=escape-regexp.js.map
 
       /***/
Diff for index.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-f7f95d3518feca5a.js"
+      src="/_next/static/chunks/main-ff8e45037ddf7c13.js"
       defer=""
     ></script>
     <script
Diff for link.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-f7f95d3518feca5a.js"
+      src="/_next/static/chunks/main-ff8e45037ddf7c13.js"
       defer=""
     ></script>
     <script
Diff for withRouter.html 
@@ -19,7 +19,7 @@
       defer=""
     ></script>
     <script
-      src="/_next/static/chunks/main-f7f95d3518feca5a.js"
+      src="/_next/static/chunks/main-ff8e45037ddf7c13.js"
       defer=""
     ></script>
     <script
Commit: eb987b8

SukkaW added a commit to SukkaW/next.js that referenced this pull request Apr 18, 2022
@SukkaW
perf(escapeStringRegexp): test before replace (vercel#34472)
3838bce 
## 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

- [x] Make sure the linting passes by running `yarn lint`
@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 16, 2022
@SukkaW SukkaW deleted the perf-escape-regex branch October 24, 2023 08:34
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ijjk ijjk ijjk approved these changes

@timneutkens timneutkens Awaiting requested review from timneutkens timneutkens is a code owner

@shuding shuding Awaiting requested review from shuding shuding is a code owner

@huozhi huozhi Awaiting requested review from huozhi huozhi is a code owner

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@SukkaW @ijjk