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.

Sign up for GitHub

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

feat(plasma-new-hope): add emotion support #1276

Merged
merged 1 commit into from
Jul 2, 2024
Merged

feat(plasma-new-hope): add emotion support #1276

merged 1 commit into from
Jul 2, 2024

Conversation

Yeti-or
Copy link
Contributor

@Yeti-or Yeti-or commented Jul 1, 2024 •
edited by Yakutoc
Loading

Support emotion engine

  • добавлена поддержка пакета @emotion

What/why changed

Для поддержки пакет @emotion расширили возможности в пакете plasma-new-hope

В целом алгоритм такой же как и с работой styled-components.

Делаем копию списка компонентов и заменяем использование пакетов

import { styled } from '@linaria/react' //-> @emotion/styled
import { css } from '@linaria/core' // -> @emotion/react

И появилась новая директория emotion на уровне самого пакета поставки

Screenshot 2024-07-02 at 18 26 05
📦 Published PR as canary version: Canary Versions

✨ Test out this PR locally via:

npm install @salutejs/[email protected]
npm install @salutejs/[email protected]
npm install @salutejs/[email protected]
npm install @salutejs/[email protected]
npm install @salutejs/[email protected]
npm install @salutejs/[email protected]
# or 
yarn add @salutejs/[email protected]
yarn add @salutejs/[email protected]
yarn add @salutejs/[email protected]
yarn add @salutejs/[email protected]
yarn add @salutejs/[email protected]
yarn add @salutejs/[email protected]

@Yeti-or Yeti-or deployed to internal July 1, 2024 14:04 — with GitHub Actions Active
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 1, 2024

Theme Builder app deployed!

https://plasma.sberdevices.ru/pr/plasma-theme-builder-pr-1276/

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 1, 2024

Documentation preview deployed!

website:https://plasma.sberdevices.ru/pr/pr-1276/
caldera-online storybook: https://plasma.sberdevices.ru/pr/pr-1276/caldera-online-storybook/
asdk storybook: https://plasma.sberdevices.ru/pr/pr-1276/asdk-storybook/
b2c storybook: https://plasma.sberdevices.ru/pr/pr-1276/b2c-storybook/
new-hope storybook: https://plasma.sberdevices.ru/pr/pr-1276/new-hope-storybook/
web storybook: https://plasma.sberdevices.ru/pr/pr-1276/web-storybook/
sdds-serv storybook: https://plasma.sberdevices.ru/pr/pr-1276/sdds-serv-storybook/
ui storybook: https://plasma.sberdevices.ru/pr/pr-1276/ui-storybook/

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 1, 2024

⚡ Component performance testing

Result: 🟢 OK

@Yeti-or Yeti-or force-pushed the yeti-or.emotion branch from 179f1e5 to 6b862d3 Compare July 1, 2024 14:57
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 1, 2024

⚡ Component performance testing

Result: 🟢 OK

@Yakutoc Yakutoc force-pushed the yeti-or.emotion branch from 6b862d3 to 168891f Compare July 2, 2024 10:54
Yakutoc
Yakutoc reviewed Jul 2, 2024
View reviewed changes
packages/caldera-online/api/caldera-online.api.md
@@ -94,7 +95,7 @@ export { addFocus }
// @public (undocumented)
export const BodyL: FunctionComponent<PropsType< {
size: {
l: string;
l: PolymorphicClassName;
Copy link
Collaborator

Choose a reason for hiding this comment

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

[Note]:

Изменения связанные с тем как описывают типы пакеты @emotion/react и @linaria

для @linaria это просто string, то для @emotion/react

export interface SerializedStyles {
    name: string;
    styles: string;
    map?: string;
    next?: SerializedStyles;
}

export type PolymorphicClassName = string | SerializedStyles;

поэтому запись стало такой

Copy link
Collaborator

Choose a reason for hiding this comment

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

В файле - packages/plasma-new-hope/src/engines/types.ts находятся эти изменения.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 2, 2024

⚡ Component performance testing

Result: 💀 WASTED

Performance tests are broken.
If the current changes are the cause, please fix it immediately in this PR. If not, please schedule their repair.
For any questions, come to the Speed team.

Yakutoc
Yakutoc reviewed Jul 2, 2024
View reviewed changes
packages/plasma-new-hope/emotion/package.json
@@ -0,0 +1,5 @@
{
"module": "es/index.js",
Copy link
Collaborator

Choose a reason for hiding this comment

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

Сделано по аналогии со styled-components

У нас так же есть суб директория - packages/plasma-new-hope/styled-components в которой лежит package.json с точно таким же описанием.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 2, 2024

⚡ Component performance testing

Result: 🟢 OK

@Yakutoc
Copy link
Collaborator

Yakutoc commented Jul 2, 2024

@Yeti-or @neretin-trike

https://app.renovatebot.com/package-diff?name=@salutejs/plasma-web&npm&from=1.341.1-dev.0&to=1.342.0-canary.1276.9746511529.0#d2h-826447

Вроде ожидаемо и все корректно

@Yakutoc Yakutoc marked this pull request as ready for review July 2, 2024 12:13
@Yakutoc Yakutoc force-pushed the yeti-or.emotion branch from 74ba530 to 2622881 Compare July 2, 2024 12:45
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 2, 2024

⚡ Component performance testing

Result: 🟢 OK

Yeti-or
Yeti-or commented Jul 2, 2024
View reviewed changes
packages/plasma-new-hope/scripts/replace-linaria_sc.sh
@@ -9,6 +9,7 @@ perl -p -i -e "s/import { styled } from '\@linaria\/react'/import styled from 's
perl -p -i -e "s/import { css } from '\@linaria\/core'/import { css } from 'styled-components'/g" $files

rm -rf src-sc/engines/linaria.tsx
perl -p -i -e "s/import { css as cssLibrary } from '\@linaria\/core'/import { css as cssLibrary } from 'styled-components'/g" src-sc/engines/index.ts
perl -p -i -e "s/linaria/styled-components/g" src-sc/engines/index.ts src-sc/engines/common.tsx
rm -rf src-sc/engines/emotion.tsx
Copy link
Contributor Author

Choose a reason for hiding this comment

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

👍

@Yeti-or Yeti-or added this pull request to the merge queue Jul 2, 2024
Merged via the queue into dev with commit 581bcc2 Jul 2, 2024
29 checks passed
@Yeti-or Yeti-or deleted the yeti-or.emotion branch July 2, 2024 13:25
@Salute-Eva Salute-Eva mentioned this pull request Jul 11, 2024
Merged
This was referenced Jul 24, 2024
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neretin-trike neretin-trike neretin-trike approved these changes

@Yakutoc Yakutoc Yakutoc approved these changes

Assignees

@Yeti-or Yeti-or

Labels
plasma-infra
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Yeti-or @Yakutoc @neretin-trike