Release by 11.06.2024 (#1238)

.github/workflows/cypress-release-branch.yml

@@ -0,0 +1,40 @@
+# Run cypress tests in release branch without conditions for all packages
+name: Cypress component testing on release branch
+
+on:
+  pull_request:
+    branches:
+      - master
+
+concurrency:
+  # New commit on branch cancels running workflows of the same branch
+  group: ${{ github.workflow }}-${{ github.head_ref }}
+  cancel-in-progress: true
+
+jobs:
+  cypress:
+    if: ${{ startsWith(github.head_ref, 'release') }}
+    strategy:
+      fail-fast: false
+      matrix:
+        scope: [web,b2c,ui]
+
+    uses: ./.github/workflows/cypress-common.yml
+    with:
+      scope: ${{ matrix.scope }}
+      with-artifacts: true
+    secrets: inherit
+
+  cypress-react-17:
+    if: ${{ startsWith(github.head_ref, 'release') }}
+    strategy:
+      fail-fast: false
+      matrix:
+        scope: [web,b2c,ui]
+
+    uses: ./.github/workflows/cypress-common.yml
+    with:
+      scope: ${{ matrix.scope }}
+      with-react-17: true
+      with-artifacts: true
+    secrets: inherit

.github/workflows/cypress.yml

@@ -13,6 +13,8 @@ concurrency:
 
 jobs:
   state:
+    # cypress checks for "release branch" run in cypress-release-branch.yml file
+    if: ${{ !startsWith(github.head_ref, 'release') }}
     uses: ./.github/workflows/change-detection.yml
     secrets: inherit
 

packages/plasma-asdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salutejs/plasma-asdk",
-  "version": "0.85.0",
+  "version": "0.85.1-dev.0",
   "description": "Salute Design System / React UI kit for Assistant web applications",
   "author": "Salute Frontend Team <[email protected]>",
   "license": "MIT",
@@ -41,7 +41,7 @@
     "@salutejs/plasma-colors": "0.13.0",
     "@salutejs/plasma-core": "1.160.0",
     "@salutejs/plasma-cy-utils": "0.92.0",
-    "@salutejs/plasma-icons": "1.193.0",
+    "@salutejs/plasma-icons": "1.193.1-dev.0",
     "@salutejs/plasma-sb-utils": "0.158.0",
     "@storybook/addon-docs": "7.6.17",
     "@storybook/addon-essentials": "7.6.17",
@@ -98,4 +98,4 @@
     "Fanil Zubairov"
   ],
   "sideEffects": false
-}
+}

packages/plasma-b2c/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salutejs/plasma-b2c",
-  "version": "1.327.0",
+  "version": "1.327.1-dev.0",
   "description": "Salute Design System / React UI kit for business-related web applications",
   "author": "Salute Frontend Team <[email protected]>",
   "license": "MIT",
@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "@salutejs/plasma-core": "1.160.0",
-    "@salutejs/plasma-hope": "1.280.0",
+    "@salutejs/plasma-hope": "1.280.1-dev.0",
     "@salutejs/plasma-new-hope": "0.87.0",
     "@salutejs/plasma-tokens-b2c": "0.50.0",
     "@salutejs/plasma-tokens-web": "1.55.0",
@@ -71,7 +71,7 @@
     "@rollup/plugin-node-resolve": "15.2.3",
     "@salutejs/plasma-colors": "0.13.0",
     "@salutejs/plasma-cy-utils": "0.92.0",
-    "@salutejs/plasma-icons": "1.193.0",
+    "@salutejs/plasma-icons": "1.193.1-dev.0",
     "@salutejs/plasma-sb-utils": "0.158.0",
     "@storybook/addon-docs": "7.6.17",
     "@storybook/addon-essentials": "7.6.17",
@@ -107,4 +107,4 @@
     "react"
   ],
   "sideEffects": false
-}
+}

packages/plasma-hope/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salutejs/plasma-hope",
-  "version": "1.280.0",
+  "version": "1.280.1-dev.0",
   "description": "Salute Design System / Internal React UI kit for web applications",
   "author": "Salute Frontend Team <[email protected]>",
   "license": "MIT",
@@ -58,7 +58,7 @@
     "@microsoft/api-extractor": "7.38.3",
     "@salutejs/plasma-colors": "0.13.0",
     "@salutejs/plasma-cy-utils": "0.92.0",
-    "@salutejs/plasma-icons": "1.193.0",
+    "@salutejs/plasma-icons": "1.193.1-dev.0",
     "@salutejs/plasma-sb-utils": "0.158.0",
     "@salutejs/plasma-tokens-b2b": "1.40.0",
     "@salutejs/plasma-tokens-b2c": "0.50.0",
@@ -113,4 +113,4 @@
     "Vasiliy Loginevskiy"
   ],
   "sideEffects": false
-}
+}

packages/plasma-icons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salutejs/plasma-icons",
-  "version": "1.193.0",
+  "version": "1.193.1-dev.0",
   "description": "Salute Design System Icons",
   "main": "index.js",
   "module": "es/index.js",
@@ -76,4 +76,4 @@
     "Чельцов Евгений Олегович"
   ],
   "sideEffects": false
-}
+}

packages/plasma-icons/scripts/utils.ts

@@ -10,6 +10,8 @@ const removeFillOpacity = (source: string) => source.replace(/fill-opacity="(.*?
 
 const setFillCurrentColor = (source: string) => source.replace(/fill="(.*?)"/gm, 'fill="currentColor"');
 
+const setStrokeCurrentColor = (source: string) => source.replace(/stroke="(.*?)"/gm, 'stroke="currentColor"');
+
 const convertCSSProperty = (source: string) =>
     source.replace(
         /([a-zA-Z-]*):(.*)/g,
@@ -33,6 +35,7 @@ export const getIconAsset = (source: string, iconName: string) => {
         removeLineBreak,
         getSvgContent,
         setFillCurrentColor,
+        setStrokeCurrentColor,
         removeFillOpacity,
         convertInlineStyleToObject,
         camelizeAttributes,