Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into release_2024-09-18
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/plasma-asdk/package-lock.json
#	packages/plasma-asdk/package.json
#	packages/plasma-b2c/package-lock.json
#	packages/plasma-b2c/package.json
#	packages/plasma-b2c/src/components/TextField/TextField.stories.tsx
#	packages/plasma-new-hope/package-lock.json
#	packages/plasma-new-hope/package.json
#	packages/plasma-new-hope/src/components/TextField/TextField.tsx
#	packages/plasma-new-hope/src/examples/plasma_b2c/components/TextField/TextField.stories.tsx
#	packages/plasma-web/package-lock.json
#	packages/plasma-web/package.json
#	packages/plasma-web/src/components/TextField/TextField.stories.tsx
#	packages/sdds-cs/package-lock.json
#	packages/sdds-cs/package.json
#	packages/sdds-dfa/package-lock.json
#	packages/sdds-dfa/package.json
#	packages/sdds-finportal/package-lock.json
#	packages/sdds-finportal/package.json
#	packages/sdds-serv/package-lock.json
#	packages/sdds-serv/package.json
#	utils/plasma-docs-ui/package.json
#	website/plasma-b2c-docs/package.json
#	website/plasma-theme-builder/package.json
#	website/plasma-ui-docs/package.json
#	website/plasma-web-docs/package.json
#	website/plasma-website/package.json
#	website/sdds-cs-docs/package.json
#	website/sdds-dfa-docs/package.json
#	website/sdds-serv-docs/package.json
  • Loading branch information
Yakutoc committed Sep 18, 2024
2 parents 525112a + ffd0b4d commit 38076e5
Show file tree
Hide file tree
Showing 371 changed files with 13,835 additions and 5,957 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cypress-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:

- name: Save artifacts
if: ${{ failure() || inputs.with-artifacts }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Test Artifacts
path: /home/runner/work/plasma/plasma/cypress
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
96 changes: 48 additions & 48 deletions packages/plasma-asdk/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions packages/plasma-asdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@salutejs/plasma-asdk",
"version": "0.148.0",
"version": "0.155.1-dev.0",
"description": "Salute Design System / React UI kit for Assistant web applications",
"author": "Salute Frontend Team <[email protected]>",
"license": "MIT",
Expand All @@ -19,8 +19,8 @@
"directory": "packages/plasma-asdk"
},
"dependencies": {
"@salutejs/plasma-new-hope": "0.141.0",
"@salutejs/plasma-tokens": "1.98.0",
"@salutejs/plasma-new-hope": "0.147.1-dev.0",
"@salutejs/plasma-tokens": "1.98.1-dev.0",
"@salutejs/plasma-tokens-b2b": "1.42.0",
"@salutejs/plasma-typo": "0.40.0"
},
Expand All @@ -39,10 +39,10 @@
"@babel/preset-typescript": "7.24.1",
"@microsoft/api-extractor": "7.38.3",
"@salutejs/plasma-colors": "0.13.0",
"@salutejs/plasma-core": "1.179.0",
"@salutejs/plasma-cy-utils": "0.110.0",
"@salutejs/plasma-icons": "1.204.0",
"@salutejs/plasma-sb-utils": "0.177.0",
"@salutejs/plasma-core": "1.179.1-dev.0",
"@salutejs/plasma-cy-utils": "0.110.1-dev.0",
"@salutejs/plasma-icons": "1.205.0-dev.0",
"@salutejs/plasma-sb-utils": "0.177.1-dev.0",
"@storybook/addon-docs": "7.6.17",
"@storybook/addon-essentials": "7.6.17",
"@storybook/addons": "7.6.17",
Expand Down
Loading

0 comments on commit 38076e5

Please sign in to comment.