plasma-new-hope: Resolve potential conflict by master branch #809

Yakutoc · 2023-10-12T04:52:30Z

Release Notes

Исправлена разница между master branch в package.json для plasma-new-hope.

What/why Changed

Исправляем разницу между dev и master после влитых hotfix.

Разница в порядке объявлении скрипта build:styled-components:cjs

Diff

🐤 Download canary assets:

borderRadius

borderRadius_default_react-native--canary.809.6503415677.ts
borderRadius_plasma_b2c_react-native--canary.809.6503415677.ts
borderRadius_plasma_web_react-native--canary.809.6503415677.ts
borderRadius_sberHealth_react-native--canary.809.6503415677.ts
borderRadius_sbermarket_business_react-native--canary.809.6503415677.ts
borderRadius_sbermarket_metro_react-native--canary.809.6503415677.ts
borderRadius_sbermarket_react-native--canary.809.6503415677.ts
borderRadius_sbermarket_selgros_react-native--canary.809.6503415677.ts
borderRadius_sbermarket_wlbusiness_react-native--canary.809.6503415677.ts
borderRadius_sberonline_react-native--canary.809.6503415677.ts
borderRadius_sberprime_react-native--canary.809.6503415677.ts
borderRadius_stylesSalute_react-native--canary.809.6503415677.ts

color

color_default_ios-swift--canary.809.6503415677.swift
color_default_kotlin--canary.809.6503415677.kt
color_default_react-native--canary.809.6503415677.ts
color_default_xml--canary.809.6503415677.xml
color_plasma_b2c_ios-swift--canary.809.6503415677.swift
color_plasma_b2c_kotlin--canary.809.6503415677.kt
color_plasma_b2c_react-native--canary.809.6503415677.ts
color_plasma_b2c_xml--canary.809.6503415677.xml
color_plasma_web_ios-swift--canary.809.6503415677.swift
color_plasma_web_kotlin--canary.809.6503415677.kt
color_plasma_web_react-native--canary.809.6503415677.ts
color_plasma_web_xml--canary.809.6503415677.xml
color_sberHealth_ios-swift--canary.809.6503415677.swift
color_sberHealth_kotlin--canary.809.6503415677.kt
color_sberHealth_react-native--canary.809.6503415677.ts
color_sberHealth_xml--canary.809.6503415677.xml
color_sbermarket_business_ios-swift--canary.809.6503415677.swift
color_sbermarket_business_kotlin--canary.809.6503415677.kt
color_sbermarket_business_react-native--canary.809.6503415677.ts
color_sbermarket_business_xml--canary.809.6503415677.xml
color_sbermarket_ios-swift--canary.809.6503415677.swift
color_sbermarket_kotlin--canary.809.6503415677.kt
color_sbermarket_metro_ios-swift--canary.809.6503415677.swift
color_sbermarket_metro_kotlin--canary.809.6503415677.kt
color_sbermarket_metro_react-native--canary.809.6503415677.ts
color_sbermarket_metro_xml--canary.809.6503415677.xml
color_sbermarket_react-native--canary.809.6503415677.ts
color_sbermarket_selgros_ios-swift--canary.809.6503415677.swift
color_sbermarket_selgros_kotlin--canary.809.6503415677.kt
color_sbermarket_selgros_react-native--canary.809.6503415677.ts
color_sbermarket_selgros_xml--canary.809.6503415677.xml
color_sbermarket_wlbusiness_ios-swift--canary.809.6503415677.swift
color_sbermarket_wlbusiness_kotlin--canary.809.6503415677.kt
color_sbermarket_wlbusiness_react-native--canary.809.6503415677.ts
color_sbermarket_wlbusiness_xml--canary.809.6503415677.xml
color_sbermarket_xml--canary.809.6503415677.xml
color_sberonline_ios-swift--canary.809.6503415677.swift
color_sberonline_kotlin--canary.809.6503415677.kt
color_sberonline_react-native--canary.809.6503415677.ts
color_sberonline_xml--canary.809.6503415677.xml
color_sberprime_ios-swift--canary.809.6503415677.swift
color_sberprime_kotlin--canary.809.6503415677.kt
color_sberprime_react-native--canary.809.6503415677.ts
color_sberprime_xml--canary.809.6503415677.xml
color_stylesSalute_ios-swift--canary.809.6503415677.swift
color_stylesSalute_kotlin--canary.809.6503415677.kt
color_stylesSalute_react-native--canary.809.6503415677.ts
color_stylesSalute_xml--canary.809.6503415677.xml

shadow

shadow_default_react-native--canary.809.6503415677.ts
shadow_plasma_b2c_react-native--canary.809.6503415677.ts
shadow_plasma_web_react-native--canary.809.6503415677.ts
shadow_sberHealth_react-native--canary.809.6503415677.ts
shadow_sbermarket_business_react-native--canary.809.6503415677.ts
shadow_sbermarket_metro_react-native--canary.809.6503415677.ts
shadow_sbermarket_react-native--canary.809.6503415677.ts
shadow_sbermarket_selgros_react-native--canary.809.6503415677.ts
shadow_sbermarket_wlbusiness_react-native--canary.809.6503415677.ts
shadow_sberonline_react-native--canary.809.6503415677.ts
shadow_sberprime_react-native--canary.809.6503415677.ts
shadow_stylesSalute_react-native--canary.809.6503415677.ts

spacing

spacing_default_react-native--canary.809.6503415677.ts
spacing_plasma_b2c_react-native--canary.809.6503415677.ts
spacing_plasma_web_react-native--canary.809.6503415677.ts
spacing_sberHealth_react-native--canary.809.6503415677.ts
spacing_sbermarket_business_react-native--canary.809.6503415677.ts
spacing_sbermarket_metro_react-native--canary.809.6503415677.ts
spacing_sbermarket_react-native--canary.809.6503415677.ts
spacing_sbermarket_selgros_react-native--canary.809.6503415677.ts
spacing_sbermarket_wlbusiness_react-native--canary.809.6503415677.ts
spacing_sberonline_react-native--canary.809.6503415677.ts
spacing_sberprime_react-native--canary.809.6503415677.ts
spacing_stylesSalute_react-native--canary.809.6503415677.ts

typo

typo_mage_ios-swift--canary.809.6503415677.swift
typo_mage_kotlin--canary.809.6503415677.kt
typo_mage_react-native--canary.809.6503415677.ts
typo_plasma_ios-swift--canary.809.6503415677.swift
typo_plasma_kotlin--canary.809.6503415677.kt
typo_plasma_react-native--canary.809.6503415677.ts
typo_ruler_ios-swift--canary.809.6503415677.swift
typo_ruler_kotlin--canary.809.6503415677.kt
typo_ruler_react-native--canary.809.6503415677.ts
typo_sage_ios-swift--canary.809.6503415677.swift
typo_sage_kotlin--canary.809.6503415677.kt
typo_sage_react-native--canary.809.6503415677.ts
typo_sbermarket_ios-swift--canary.809.6503415677.swift
typo_sbermarket_kotlin--canary.809.6503415677.kt
typo_sbermarket_react-native--canary.809.6503415677.ts
typo_soulmate_ios-swift--canary.809.6503415677.swift
typo_soulmate_kotlin--canary.809.6503415677.kt
typo_soulmate_react-native--canary.809.6503415677.ts

📦 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]
# or 
yarn add @salutejs/[email protected]
yarn add @salutejs/[email protected]
yarn add @salutejs/[email protected]

Salute-Eva · 2023-10-12T04:55:55Z

Theme Builder app deployed!

http://plasma.sberdevices.ru/pr/plasma-theme-builder-pr-809/

Salute-Eva · 2023-10-12T05:05:22Z

Documentation preview deployed!

website: http://plasma.sberdevices.ru/pr/pr-809/
b2c storybook: http://plasma.sberdevices.ru/pr/pr-809/b2c-storybook/
web storybook: http://plasma.sberdevices.ru/pr/pr-809/web-storybook/
new-hope storybook: http://plasma.sberdevices.ru/pr/pr-809/new-hope-storybook/

Salute-Eva · 2023-10-13T02:50:56Z

Theme Builder app deployed!

http://plasma.sberdevices.ru/pr/plasma-theme-builder-pr-809/

Salute-Eva · 2023-10-13T03:00:37Z

Documentation preview deployed!

website: http://plasma.sberdevices.ru/pr/pr-809/
b2c storybook: http://plasma.sberdevices.ru/pr/pr-809/b2c-storybook/
web storybook: http://plasma.sberdevices.ru/pr/pr-809/web-storybook/
new-hope storybook: http://plasma.sberdevices.ru/pr/pr-809/new-hope-storybook/

Salute-Eva · 2023-10-13T10:05:54Z

🚀 This PR is included in version: @salutejs/[email protected], @salutejs/[email protected], @salutejs/[email protected], @salutejs/[email protected], @salutejs/[email protected], @salutejs/[email protected], @salutejs/[email protected] 🚀

Yakutoc self-assigned this Oct 12, 2023

Yakutoc marked this pull request as ready for review October 12, 2023 05:13

Yakutoc requested review from Yeti-or, neretin-trike and kayman233 as code owners October 12, 2023 05:13

Yakutoc removed the request for review from kayman233 October 12, 2023 05:13

neretin-trike approved these changes Oct 12, 2023

View reviewed changes

chore(plasma-new-hope): resolve potential conflict by master branch

a398eb2

Yakutoc force-pushed the fix-after-hotfix branch from f17be91 to a398eb2 Compare October 13, 2023 02:47

Yeti-or approved these changes Oct 13, 2023

View reviewed changes

Yakutoc added this pull request to the merge queue Oct 13, 2023

Merged via the queue into dev with commit 46d16e9 Oct 13, 2023
20 checks passed

Yakutoc deleted the fix-after-hotfix branch October 13, 2023 08:12

This was referenced Oct 13, 2023

fix(plasma-hope/docs): update react file drop & fix docs #812

Merged

feat(plasma-ui): add placement for Confirm #787

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

plasma-new-hope: Resolve potential conflict by master branch #809

plasma-new-hope: Resolve potential conflict by master branch #809

Yakutoc commented Oct 12, 2023 •

edited by Salute-Eva

Loading

Salute-Eva commented Oct 12, 2023

Salute-Eva commented Oct 12, 2023

Salute-Eva commented Oct 13, 2023

Salute-Eva commented Oct 13, 2023

Salute-Eva commented Oct 13, 2023

plasma-new-hope: Resolve potential conflict by master branch #809

plasma-new-hope: Resolve potential conflict by master branch #809

Conversation

Yakutoc commented Oct 12, 2023 • edited by Salute-Eva Loading

Release Notes

What/why Changed

Diff

Salute-Eva commented Oct 12, 2023

Salute-Eva commented Oct 12, 2023

Salute-Eva commented Oct 13, 2023

Salute-Eva commented Oct 13, 2023

Salute-Eva commented Oct 13, 2023

Yakutoc commented Oct 12, 2023 •

edited by Salute-Eva

Loading