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

Remove fix for lodash/underscore conflict [MAILPOET-5127] #4844

Conversation

samnajian
Copy link
Contributor

@samnajian samnajian commented Apr 11, 2023

Description

This PR removes the workaround added for lodash/underscore conflict since the newer versions of @wordpress/i18n are not using lodash anymore.
Also Underscore is needed on the window object in newsletter editor, because how internally it’s used by Backbone/Marionette so this line was not removed.

QA notes

No QA is needed if tests pass on the CI.

Linked PRs

Use wordpress i 18 n in all of our codebase

Linked tickets

MAILPOET-5127

@github-actions
Copy link

Pull reviewers stats

Stats of the last 90 days for mailpoet:

User Total reviews Time to review Total comments
MailPoet-Staff
🥇
1
57m
0
alex-mailpoet
🥈
7
1h 12m
4
samnajian
🥉
16
4h 45m
14
brezocordero
11
7h 7m
8
johnolek
10
11h 39m
25
JanJakes
27
13h 57m
93
▀▀▀▀
costasovo
19
14h 40m
35
▀▀
NeosinneR
2
16h 7m
1
triple0t
24
17h 9m
22
lysyjan
22
17h 46m
6
websupporter
13
19h 12m
3
rodrigoprimo
11
20h 11m
7
veljkho
7
2d 1h 41m
▀▀
0
Aschepikov
110
▀▀▀▀
3d 22h 3m
▀▀▀
0

Copy link
Contributor

@lysyjan lysyjan left a comment

Choose a reason for hiding this comment

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

👍

@lysyjan lysyjan merged commit 325dc9e into trunk Apr 12, 2023
3 checks passed
@lysyjan lysyjan deleted the MAILPOET-5127-remove-the-workaround-for-lodash-underscore-conflict branch April 12, 2023 06:37
@lysyjan lysyjan assigned samnajian and unassigned lysyjan Apr 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants