Skip to content

fix: context dependency with complex require#10028

Merged
SyMind merged 9 commits intomainfrom
fix-template-str-with-define
Apr 17, 2025
Merged

fix: context dependency with complex require#10028
SyMind merged 9 commits intomainfrom
fix-template-str-with-define

Conversation

@SyMind
Copy link
Copy Markdown
Member

@SyMind SyMind commented Apr 15, 2025 •
edited
Loading

Summary

Fix context dependency template string with define plugin.

let file = "..";
require(`${process.env.DIR}/${file}`);

We unset the expression as it doesn't match to a single expression.

Relate #7906

Checklist

  • Tests updated (or not required).
  • Documentation updated (or not required).

@github-actions github-actions bot added release: bug fix release: bug related release(mr only) team The issue/pr is created by the member of Rspack. labels Apr 15, 2025
@netlify
Copy link
Copy Markdown

netlify bot commented Apr 15, 2025 •
edited
Loading

✅ Deploy Preview for rspack canceled.

Name Link
🔨 Latest commit 24c3739
🔍 Latest deploy log https://app.netlify.com/sites/rspack/deploys/6800867e30fe000008fbeed6

@SyMind SyMind marked this pull request as ready for review April 15, 2025 03:57
@SyMind SyMind force-pushed the fix-template-str-with-define branch from 62803a3 to 91f78a0 Compare April 15, 2025 03:59
ahabhgk
ahabhgk previously approved these changes Apr 15, 2025
View reviewed changes
@ahabhgk
Copy link
Copy Markdown
Contributor

ahabhgk commented Apr 15, 2025

There are some comments can be deleted since we clone the expr now

@SyMind SyMind marked this pull request as draft April 15, 2025 04:13
@codspeed-hq
Copy link
Copy Markdown

codspeed-hq bot commented Apr 15, 2025 •
edited
Loading

CodSpeed Performance Report

Merging #10028 will not alter performance

Comparing fix-template-str-with-define (24c3739) with main (5a49a01)

Summary

✅ 11 untouched benchmarks

@SyMind SyMind changed the title fix: context dependency template string with define plugin fix: context dependency with complex require Apr 16, 2025
@SyMind SyMind force-pushed the fix-template-str-with-define branch from 6fe9203 to 91f78a0 Compare April 16, 2025 02:30
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 16, 2025 •
edited
Loading

📝 Benchmark detail: Open

Name Base (2025-04-16 fc07d1e) Current Change
10000_big_production-mode_disable-minimize + exec 35.4 s ± 184 ms 36.4 s ± 286 ms +2.61 %
10000_development-mode + exec 1.8 s ± 45 ms 1.78 s ± 144 ms -1.60 %
10000_development-mode_hmr + exec 746 ms ± 13 ms 738 ms ± 28 ms -1.05 %
10000_production-mode + exec 2.27 s ± 27 ms 2.23 s ± 104 ms -1.74 %
10000_production-mode_persistent-cold + exec 2.48 s ± 15 ms 2.41 s ± 38 ms -2.70 %
10000_production-mode_persistent-hot + exec 1.71 s ± 34 ms 1.7 s ± 31 ms -0.57 %
arco-pro_development-mode + exec 1.79 s ± 75 ms 1.79 s ± 92 ms +0.17 %
arco-pro_development-mode_hmr + exec 381 ms ± 0.96 ms 382 ms ± 2.3 ms +0.14 %
arco-pro_production-mode + exec 3.38 s ± 95 ms 3.46 s ± 138 ms +2.38 %
arco-pro_production-mode_generate-package-json-webpack-plugin + exec 3.55 s ± 197 ms 3.58 s ± 178 ms +0.90 %
arco-pro_production-mode_persistent-cold + exec 3.52 s ± 237 ms 3.55 s ± 143 ms +0.64 %
arco-pro_production-mode_persistent-hot + exec 2.16 s ± 33 ms 2.26 s ± 247 ms +4.82 %
arco-pro_production-mode_traverse-chunk-modules + exec 3.49 s ± 126 ms 3.51 s ± 106 ms +0.44 %
large-dyn-imports_development-mode + exec 2.04 s ± 46 ms 1.98 s ± 42 ms -3.13 %
large-dyn-imports_production-mode + exec 2.09 s ± 6 ms 2.06 s ± 194 ms -1.59 %
threejs_development-mode_10x + exec 1.62 s ± 43 ms 1.59 s ± 22 ms -2.06 %
threejs_development-mode_10x_hmr + exec 845 ms ± 18 ms 835 ms ± 8.3 ms -1.15 %
threejs_production-mode_10x + exec 5.27 s ± 48 ms 5.23 s ± 77 ms -0.74 %
threejs_production-mode_10x_persistent-cold + exec 5.34 s ± 84 ms 5.32 s ± 312 ms -0.32 %
threejs_production-mode_10x_persistent-hot + exec 4.5 s ± 52 ms 4.45 s ± 22 ms -1.21 %
10000_big_production-mode_disable-minimize + rss memory 9285 MiB ± 103 MiB 9127 MiB ± 34.4 MiB -1.71 %
10000_development-mode + rss memory 655 MiB ± 15.1 MiB 678 MiB ± 30.4 MiB +3.49 %
10000_development-mode_hmr + rss memory 816 MiB ± 35.7 MiB 802 MiB ± 26.8 MiB -1.73 %
10000_production-mode + rss memory 635 MiB ± 12.7 MiB 678 MiB ± 54.6 MiB +6.76 %
10000_production-mode_persistent-cold + rss memory 729 MiB ± 15.4 MiB 788 MiB ± 43.2 MiB +8.15 %
10000_production-mode_persistent-hot + rss memory 719 MiB ± 43.6 MiB 755 MiB ± 27.7 MiB +4.90 %
arco-pro_development-mode + rss memory 579 MiB ± 38.7 MiB 608 MiB ± 57.6 MiB +5.14 %
arco-pro_development-mode_hmr + rss memory 493 MiB ± 42.8 MiB 516 MiB ± 28.3 MiB +4.64 %
arco-pro_production-mode + rss memory 659 MiB ± 68.7 MiB 757 MiB ± 70 MiB +14.90 %
arco-pro_production-mode_generate-package-json-webpack-plugin + rss memory 694 MiB ± 119 MiB 744 MiB ± 103 MiB +7.30 %
arco-pro_production-mode_persistent-cold + rss memory 742 MiB ± 40.2 MiB 810 MiB ± 124 MiB +9.15 %
arco-pro_production-mode_persistent-hot + rss memory 624 MiB ± 78.9 MiB 733 MiB ± 45.5 MiB +17.57 %
arco-pro_production-mode_traverse-chunk-modules + rss memory 684 MiB ± 58.5 MiB 707 MiB ± 76.6 MiB +3.39 %
large-dyn-imports_development-mode + rss memory 654 MiB ± 8.21 MiB 682 MiB ± 17.1 MiB +4.33 %
large-dyn-imports_production-mode + rss memory 540 MiB ± 3.73 MiB 570 MiB ± 7.2 MiB +5.67 %
threejs_development-mode_10x + rss memory 593 MiB ± 13.5 MiB 641 MiB ± 17.6 MiB +8.10 %
threejs_development-mode_10x_hmr + rss memory 724 MiB ± 38.5 MiB 743 MiB ± 18.3 MiB +2.59 %
threejs_production-mode_10x + rss memory 928 MiB ± 51.5 MiB 935 MiB ± 105 MiB +0.76 %
threejs_production-mode_10x_persistent-cold + rss memory 1018 MiB ± 31 MiB 1027 MiB ± 78.9 MiB +0.82 %
threejs_production-mode_10x_persistent-hot + rss memory 859 MiB ± 90.9 MiB 890 MiB ± 50.8 MiB +3.56 %

@SyMind SyMind marked this pull request as ready for review April 16, 2025 08:58
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 17, 2025 •
edited
Loading

📝 Benchmark detail: Open

Name Base (2025-04-17 c5c10eb) Current Change
10000_big_production-mode_disable-minimize + exec 35.8 s ± 745 ms 35.7 s ± 499 ms -0.31 %
10000_development-mode + exec 1.83 s ± 30 ms 1.77 s ± 14 ms -3.36 %
10000_development-mode_hmr + exec 748 ms ± 7 ms 733 ms ± 27 ms -2.03 %
10000_production-mode + exec 2.29 s ± 52 ms 2.23 s ± 48 ms -2.48 %
10000_production-mode_persistent-cold + exec 2.46 s ± 41 ms 2.43 s ± 67 ms -1.38 %
10000_production-mode_persistent-hot + exec 1.73 s ± 48 ms 1.7 s ± 24 ms -1.93 %
arco-pro_development-mode + exec 1.75 s ± 77 ms 1.77 s ± 86 ms +0.79 %
arco-pro_development-mode_hmr + exec 381 ms ± 0.95 ms 381 ms ± 1.3 ms -0.02 %
arco-pro_production-mode + exec 3.4 s ± 101 ms 3.5 s ± 168 ms +2.84 %
arco-pro_production-mode_generate-package-json-webpack-plugin + exec 3.56 s ± 80 ms 3.61 s ± 171 ms +1.37 %
arco-pro_production-mode_persistent-cold + exec 3.5 s ± 203 ms 3.61 s ± 298 ms +3.16 %
arco-pro_production-mode_persistent-hot + exec 2.17 s ± 60 ms 2.2 s ± 51 ms +1.61 %
arco-pro_production-mode_traverse-chunk-modules + exec 3.43 s ± 175 ms 3.46 s ± 199 ms +1.00 %
large-dyn-imports_development-mode + exec 2.03 s ± 39 ms 1.99 s ± 22 ms -2.21 %
large-dyn-imports_production-mode + exec 2.08 s ± 30 ms 2.07 s ± 137 ms -0.30 %
threejs_development-mode_10x + exec 1.6 s ± 25 ms 1.58 s ± 39 ms -1.02 %
threejs_development-mode_10x_hmr + exec 838 ms ± 9.4 ms 838 ms ± 13 ms +0.02 %
threejs_production-mode_10x + exec 5.28 s ± 373 ms 5.24 s ± 222 ms -0.70 %
threejs_production-mode_10x_persistent-cold + exec 5.35 s ± 415 ms 5.31 s ± 252 ms -0.86 %
threejs_production-mode_10x_persistent-hot + exec 4.47 s ± 64 ms 4.45 s ± 56 ms -0.35 %
10000_big_production-mode_disable-minimize + rss memory 9316 MiB ± 591 MiB 9151 MiB ± 119 MiB -1.77 %
10000_development-mode + rss memory 632 MiB ± 17.3 MiB 654 MiB ± 27.1 MiB +3.51 %
10000_development-mode_hmr + rss memory 806 MiB ± 19.1 MiB 793 MiB ± 31.3 MiB -1.62 %
10000_production-mode + rss memory 629 MiB ± 21.5 MiB 671 MiB ± 32.8 MiB +6.74 %
10000_production-mode_persistent-cold + rss memory 725 MiB ± 27.6 MiB 757 MiB ± 47.2 MiB +4.48 %
10000_production-mode_persistent-hot + rss memory 732 MiB ± 42.4 MiB 749 MiB ± 32.8 MiB +2.37 %
arco-pro_development-mode + rss memory 580 MiB ± 62.6 MiB 580 MiB ± 33.9 MiB +0.12 %
arco-pro_development-mode_hmr + rss memory 471 MiB ± 28 MiB 510 MiB ± 22.6 MiB +8.21 %
arco-pro_production-mode + rss memory 670 MiB ± 58.7 MiB 686 MiB ± 63.4 MiB +2.35 %
arco-pro_production-mode_generate-package-json-webpack-plugin + rss memory 704 MiB ± 49.2 MiB 720 MiB ± 24.5 MiB +2.36 %
arco-pro_production-mode_persistent-cold + rss memory 734 MiB ± 90.6 MiB 753 MiB ± 72.8 MiB +2.60 %
arco-pro_production-mode_persistent-hot + rss memory 608 MiB ± 22 MiB 654 MiB ± 54.9 MiB +7.43 %
arco-pro_production-mode_traverse-chunk-modules + rss memory 650 MiB ± 39.2 MiB 700 MiB ± 67.8 MiB +7.71 %
large-dyn-imports_development-mode + rss memory 651 MiB ± 2.98 MiB 663 MiB ± 8.66 MiB +1.83 %
large-dyn-imports_production-mode + rss memory 536 MiB ± 6.21 MiB 552 MiB ± 5.32 MiB +2.97 %
threejs_development-mode_10x + rss memory 597 MiB ± 14.7 MiB 594 MiB ± 18.8 MiB -0.51 %
threejs_development-mode_10x_hmr + rss memory 720 MiB ± 23.5 MiB 701 MiB ± 19 MiB -2.59 %
threejs_production-mode_10x + rss memory 900 MiB ± 77.1 MiB 896 MiB ± 66.7 MiB -0.51 %
threejs_production-mode_10x_persistent-cold + rss memory 1001 MiB ± 48.6 MiB 1001 MiB ± 71 MiB -0.05 %
threejs_production-mode_10x_persistent-hot + rss memory 864 MiB ± 33.3 MiB 888 MiB ± 42.9 MiB +2.73 %

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 17, 2025 •
edited
Loading

📝 Ecosystem CI detail: Open

suite result
rsbuild ✅ success
modernjs ❌ failure
rsdoctor ❌ failure
rslib ✅ success
rspress ✅ success
examples ✅ success
plugin ✅ success
lynx-stack ❌ failure
nuxt ✅ success
devserver ❌ failure

@SyMind SyMind merged commit ab638c0 into main Apr 17, 2025
90 checks passed
@SyMind SyMind deleted the fix-template-str-with-define branch April 17, 2025 08:15
@SyMind SyMind mentioned this pull request Apr 21, 2025
Closed
@renovate renovate bot mentioned this pull request May 25, 2025
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ahabhgk ahabhgk ahabhgk approved these changes

Assignees

No one assigned

Labels

release: bug fix release: bug related release(mr only) team The issue/pr is created by the member of Rspack.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@SyMind @ahabhgk