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

[Manual Backport 2.x] Replace node-sass with sass-embedded (#5338) #5593

Merged
merged 1 commit into from
Dec 18, 2023

Conversation

AMoo-Miki
Copy link
Collaborator

@AMoo-Miki AMoo-Miki commented Dec 11, 2023

Replace node-sass with sass-embedded #5338

  • Dart's sass uses a lot more memory that node-sass which causes failures with CI on Windows when building platform plugins: pagefile size was bumped.

(cherry picked from commit f822702)

@AMoo-Miki AMoo-Miki changed the title Replace node-sass with sass-embedded (#5338) [Manual Backport] Replace node-sass with sass-embedded (#5338) Dec 11, 2023
Copy link

codecov bot commented Dec 11, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (b635c4b) 66.98% compared to head (110c5bf) 66.94%.
Report is 1 commits behind head on 2.x.

Additional details and impacted files
@@            Coverage Diff             @@
##              2.x    #5593      +/-   ##
==========================================
- Coverage   66.98%   66.94%   -0.04%     
==========================================
  Files        3287     3287              
  Lines       63266    63266              
  Branches    10052    10052              
==========================================
- Hits        42378    42355      -23     
- Misses      18449    18518      +69     
+ Partials     2439     2393      -46     
Flag Coverage Δ
Linux_1 35.24% <ø> (ø)
Linux_2 ?
Linux_3 ?
Linux_4 35.49% <ø> (+<0.01%) ⬆️
Windows_1 35.27% <ø> (ø)
Windows_2 55.09% <ø> (ø)
Windows_3 43.84% <ø> (ø)
Windows_4 35.49% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

* Dart's `sass` uses a lot more memory that `node-sass` which causes failures with CI on Windows when building platform plugins: pagefile size was bumped.

Signed-off-by: Miki <miki@amazon.com>

(cherry picked from commit f822702)
Signed-off-by: Miki <miki@amazon.com>
@AMoo-Miki
Copy link
Collaborator Author

CHANGELOG seems to have the entry needed; skipping the workflow for it.

@AMoo-Miki AMoo-Miki added the Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry label Dec 12, 2023
@AMoo-Miki AMoo-Miki changed the title [Manual Backport] Replace node-sass with sass-embedded (#5338) [Manual Backport 2.x] Replace node-sass with sass-embedded (#5338) Dec 12, 2023
Copy link
Member

@joshuarrrr joshuarrrr left a comment

Choose a reason for hiding this comment

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

@AMoo-Miki Mostly looks good to me. My only hesitation is about the OUI version bump to a non-released version. Is that strictly necessary here?

"@elastic/eui": "npm:@opensearch-project/oui@1.3.0",
"@elastic/eui": "npm:@opensearch-project/oui@1.4.0-alpha.2",
Copy link
Member

Choose a reason for hiding this comment

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

I don't think we want alpha versions in 2.x branch? In main it makes sense, but we should keep 2.x releasable.

Copy link
Collaborator

@ZilongX ZilongX Dec 12, 2023

Choose a reason for hiding this comment

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

plus 1, maybe just keep it in main for now

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is temporary until OUI 1.4 is released.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, but it makes the 2.x branch unreleasable, which I thought we wanted to avoid.

@@ -27,7 +27,7 @@
"del": "^6.1.1",
"getopts": "^2.2.5",
"pegjs": "0.10.0",
"sass-loader": "npm:@amoo-miki/sass-loader@10.4.1-node-sass-9.0.0-libsass-3.6.5",
"sass-loader": "npm:@amoo-miki/sass-loader@10.4.1-node-sass-9.0.0-libsass-3.6.5-with-sass-embedded.rc1",
Copy link
Member

Choose a reason for hiding this comment

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

This patch is getting increasingly gross 🤢

Copy link
Collaborator

@ZilongX ZilongX Dec 12, 2023

Choose a reason for hiding this comment

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

since it's an npm fork, can we give it a more friendly name, also are we able to keep sass-loader up to date since the official one is already at 13.3.2 https://github.com/webpack-contrib/sass-loader/tree/v13.3.2, it might cause future troubles in case we need to bump sass-loader version down the road

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@ZilongX we can only use sass-loader@9 with our ancient webpack@4.

@AMoo-Miki AMoo-Miki merged commit 462dd3d into opensearch-project:2.x Dec 18, 2023
68 of 70 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry v2.12.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants