Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f2b4a01
ci: fix website main-page in pr
kayman233 Sep 14, 2023
46487cb
Update versions
Salute-Eva Sep 14, 2023
9d6fdd1
chore(github): add pull request template
Yakutoc Sep 5, 2023
0b43cfe
chore: add "patch-package" dep
Yakutoc Sep 19, 2023
5dba1fb
chore: patch for @auto-it/(core,npm) logic
Yakutoc Sep 20, 2023
aa82bbe
ci(publish): delete unnecessary manual version update
Yakutoc Sep 20, 2023
b95d33e
chore: fix version for private packages
Yakutoc Sep 20, 2023
17a63e1
ci(publish): sync package-lock files state (includes private packages)
Yakutoc Sep 20, 2023
7d33dd4
chore(lint-packages): delete unnecessary check for private packages
Yakutoc Sep 20, 2023
0599d52
ci("PR Documentation and Storybook"): delete "HAS_PLASMA_WEBSITE" flag
Yakutoc Sep 15, 2023
9619655
Update versions
Salute-Eva Sep 20, 2023
de05b9a
chore: update package-locks
Salute-Eva Sep 20, 2023
4df62fd
feat(plasma-ui): add prop "buttonsDirection"
Yakutoc Sep 14, 2023
81ee35d
Update versions
Salute-Eva Sep 21, 2023
923b8ad
chore: update package-locks
Salute-Eva Sep 21, 2023
499a455
ci: new endpoint for perftool-send-report
akhdrv Sep 19, 2023
019fac6
chore: up perftool
akhdrv Sep 19, 2023
2a4235d
feat(plasma-new-hope): 🚀 boostrap && init
Yeti-or Aug 16, 2023
7bf9ac2
Update versions
Salute-Eva Sep 21, 2023
5704f89
chore: update package-locks
Salute-Eva Sep 21, 2023
5846129
fix(plasma-ui,plasma-web,plasma-b2c): Button Spinner checked color
Yeti-or Sep 22, 2023
5634b90
Update versions
Salute-Eva Sep 24, 2023
394acc9
fix(deps): update dependency react-scripts to v4.0.3
renovate[bot] Sep 25, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
## Release Notes

Короткое резюме вносимых изменений.

### What/why Changed

Более подробное описание решаемой проблемы.

По возможности приложите скриншоты решенной проблемы в формате "до/после".

#### Прежде чем перевести в статус "requested a review" убедитесь

- Добавлен номер issue (если есть);
- Добавлены/обновлены **cypress тесты** если PR касается визуальной составляющей;
- Поставлены соответствующие **label**, например если PR касается plasma-ui то и label должен быть соответствующий;
46 changes: 4 additions & 42 deletions .github/actions/update-package-lock/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ inputs:
description: 'Commit message when updated package-lock'
required: false
default: 'chore: update package-locks [skip ci]'
tag:
description: 'publish tag: canary,dev,latest. For example, tag === "dev" run => npm install @salutejs/plasma-b2c@dev'
required: false
token:
description: 'A Github Token'
required: true
Expand All @@ -20,9 +17,12 @@ runs:
- name: Update package-lock's
shell: bash
run: |
# Sync package-lock file state (root level)
npm i --no-audit --no-progress --package-lock-only
# Remove the node_modules directory from all packages
lerna clean -y
lerna exec --no-private -- npm i --no-audit --no-progress --package-lock-only --ignore-scripts
# Sync package-lock files state (includes private packages)
lerna exec -- npm i --no-audit --no-progress --ignore-scripts --package-lock-only --lockfile-version 2
# root deps don't update correctly on first regeneration O_o
npm i --no-audit --no-progress --package-lock-only

Expand All @@ -39,41 +39,3 @@ runs:
branch: ${{ steps.branch_name.outputs.BRANCH }}
author_name: Salute Frontend Team
author_email: salute.developers@gmail.com

# [NOTE]: Временное решение.
# Как только научим plugin npm для auto изменять версии в приватных пакетах при публикации RC версии данный шаг будет удален
# Перечисленные пакеты приватные и у них нет в зависимостях приватных пакетов
# Если мы попробуем установить приватный пакет то получим ошибку
- name: Update dependencies versions in private packages by dev tag
if: ${{ inputs.tag == 'dev' }}
shell: bash
run: |
lerna_ls=$(npx lerna ls --json)
# Получаем и сохраняем версию пакета, например "@salutejs/plasma-core@1.128.0"
core=@salutejs/plasma-core@$(echo $lerna_ls | jq -r -c '.[] | select( .name == "@salutejs/plasma-core" ) | .version')
tokens_b2b=@salutejs/plasma-tokens-b2b@$(echo $lerna_ls | jq -r -c '.[] | select( .name == "@salutejs/plasma-tokens-b2b" ) | .version')
tokens_b2c=@salutejs/plasma-tokens-b2c@$(echo $lerna_ls | jq -r -c '.[] | select( .name == "@salutejs/plasma-tokens-b2c" ) | .version')
tokens_web=@salutejs/plasma-tokens-web@$(echo $lerna_ls | jq -r -c '.[] | select( .name == "@salutejs/plasma-tokens-web" ) | .version')
web=@salutejs/plasma-web@$(echo $lerna_ls | jq -r -c '.[] | select( .name == "@salutejs/plasma-web" ) | .version')
tokens=@salutejs/plasma-tokens@$(echo $lerna_ls | jq -r -c '.[] | select( .name == "@salutejs/plasma-tokens" ) | .version')
tokens_utils=@salutejs/plasma-tokens-utils@$(echo $lerna_ls | jq -r -c '.[] | select( .name == "@salutejs/plasma-tokens-utils" ) | .version')
typo=@salutejs/plasma-typo@$(echo $lerna_ls | jq -r -c '.[] | select( .name == "@salutejs/plasma-typo" ) | .version')
b2c=@salutejs/plasma-b2c@$(echo $lerna_ls | jq -r -c '.[] | select( .name == "@salutejs/plasma-b2c" ) | .version')
icons=@salutejs/plasma-icons@$(echo $lerna_ls | jq -r -c '.[] | select( .name == "@salutejs/plasma-icons" ) | .version')
colors=@salutejs/plasma-colors@$(echo $lerna_ls | jq -r -c '.[] | select( .name == "@salutejs/plasma-colors" ) | .version')

npm i $core $tokens_b2b $web --no-audit --no-progress --save-exact --prefix="./utils/plasma-docs-ui"
npm i $tokens $tokens_utils $typo --no-audit --no-progress --save-exact --prefix="./utils/plasma-tokens-native"
npm i $b2c $icons $tokens_b2c $typo --no-audit --no-progress --save-exact --legacy-peer-deps --prefix="./website/plasma-website"
npm i $b2c $colors $icons $tokens_b2b $tokens_b2c $tokens_utils $tokens_web $typo --no-audit --no-progress --save-exact --prefix="./website/plasma-theme-builder"

# [NOTE]: Временное решение.
- name: Commit & Push changes files
if: ${{ inputs.tag == 'dev' }}
uses: actions-js/push@master
with:
github_token: ${{ inputs.token }}
message: "Update versions"
branch: ${{ steps.branch_name.outputs.BRANCH }}
author_name: Salute Frontend Team
author_email: salute.developers@gmail.com
5 changes: 1 addition & 4 deletions .github/processing-scope.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,13 @@ module.exports = () => {
const HAS_PLASMA_UI_DOCS = packagesList.includes('@salutejs/plasma-ui-docs');
const HAS_PLASMA_WEB_DOCS = packagesList.includes('@salutejs/plasma-web-docs');
const HAS_PLASMA_TEMPLE_DOCS = packagesList.includes('@salutejs/plasma-temple-docs');
const HAS_PLASMA_WEBSITE = packagesList.includes('@salutejs/plasma-website');

const HAS_PLASMA_UI = packagesList.includes('@salutejs/plasma-ui');
const HAS_PLASMA_WEB = packagesList.includes('@salutejs/plasma-web');
const HAS_PLASMA_B2C = packagesList.includes('@salutejs/plasma-b2c');
const HAS_PLASMA_TEMPLE = packagesList.includes('@salutejs/plasma-temple');

const HAS_DOCUMENTATION_CHANGED =
HAS_PLASMA_UI_DOCS || HAS_PLASMA_WEB_DOCS || HAS_PLASMA_TEMPLE_DOCS || HAS_PLASMA_WEBSITE;
const HAS_DOCUMENTATION_CHANGED = HAS_PLASMA_UI_DOCS || HAS_PLASMA_WEB_DOCS || HAS_PLASMA_TEMPLE_DOCS;

/**
* List short packages name
Expand All @@ -70,7 +68,6 @@ module.exports = () => {
HAS_PLASMA_UI_DOCS,
HAS_PLASMA_WEB_DOCS,
HAS_PLASMA_TEMPLE_DOCS,
HAS_PLASMA_WEBSITE,
HAS_PLASMA_UI,
HAS_PLASMA_WEB,
HAS_PLASMA_B2C,
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/change-detection.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ on:
HAS_PLASMA_TEMPLE_DOCS:
description: ""
value: ${{ jobs.run.outputs.HAS_PLASMA_TEMPLE_DOCS }}
HAS_PLASMA_WEBSITE:
description: ""
value: ${{ jobs.run.outputs.HAS_PLASMA_WEBSITE }}
HAS_PLASMA_UI:
description: ""
value: ${{ jobs.run.outputs.HAS_PLASMA_UI }}
Expand All @@ -58,7 +55,6 @@ jobs:
HAS_PLASMA_UI_DOCS: ${{ steps.set-output.outputs.HAS_PLASMA_UI_DOCS }}
HAS_PLASMA_WEB_DOCS: ${{ steps.set-output.outputs.HAS_PLASMA_WEB_DOCS }}
HAS_PLASMA_TEMPLE_DOCS: ${{ steps.set-output.outputs.HAS_PLASMA_TEMPLE_DOCS }}
HAS_PLASMA_WEBSITE: ${{ steps.set-output.outputs.HAS_PLASMA_WEBSITE }}
HAS_PLASMA_TEMPLE: ${{ steps.set-output.outputs.HAS_PLASMA_TEMPLE }}
HAS_PLASMA_B2C: ${{ steps.set-output.outputs.HAS_PLASMA_B2C }}
HAS_PLASMA_WEB: ${{ steps.set-output.outputs.HAS_PLASMA_WEB }}
Expand Down Expand Up @@ -104,7 +100,6 @@ jobs:
echo "HAS_PLASMA_UI_DOCS=${{ fromJSON(steps.scope.outputs.result).HAS_PLASMA_UI_DOCS }}" >> $GITHUB_OUTPUT
echo "HAS_PLASMA_WEB_DOCS=${{ fromJSON(steps.scope.outputs.result).HAS_PLASMA_WEB_DOCS }}" >> $GITHUB_OUTPUT
echo "HAS_PLASMA_TEMPLE_DOCS=${{ fromJSON(steps.scope.outputs.result).HAS_PLASMA_TEMPLE_DOCS }}" >> $GITHUB_OUTPUT
echo "HAS_PLASMA_WEBSITE=${{ fromJSON(steps.scope.outputs.result).HAS_PLASMA_WEBSITE }}" >> $GITHUB_OUTPUT
echo "HAS_DOCUMENTATION_CHANGED=${{ fromJSON(steps.scope.outputs.result).HAS_DOCUMENTATION_CHANGED }}" >> $GITHUB_OUTPUT
echo "HAS_PLASMA_TEMPLE=${{ fromJSON(steps.scope.outputs.result).HAS_PLASMA_TEMPLE }}" >> $GITHUB_OUTPUT
echo "HAS_PLASMA_B2C=${{ fromJSON(steps.scope.outputs.result).HAS_PLASMA_B2C }}" >> $GITHUB_OUTPUT
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cypress-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ jobs:

- name: Set default scope
if: ${{ inputs.scope != 'temple' }}
run: echo "SCOPE={b2c,web,core,hope,icons,typo,tokens,tokens-utils,tokens-native,cy-utils,ui}" >> $GITHUB_ENV
run: echo "SCOPE={b2c,web,core,hope,new-hope,icons,typo,tokens,tokens-utils,tokens-native,cy-utils,ui}" >> $GITHUB_ENV

- name: Set scope from "Plasma-temple"
if: ${{ inputs.scope == 'temple' }}
run: echo "SCOPE={b2c,web,core,hope,icons,typo,tokens,tokens-utils,tokens-native,cy-utils,ui,temple}" >> $GITHUB_ENV
run: echo "SCOPE={b2c,web,core,hope,new-hope,icons,typo,tokens,tokens-utils,tokens-native,cy-utils,ui,temple}" >> $GITHUB_ENV

- name: Install React 17
if: ${{ inputs.with-react-17 }}
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/documentation-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ jobs:
enumeration.push('plasma-hope');
}

if (!enumeration.includes('plasma-new-hope')) {
enumeration.push('plasma-new-hope');
}

if (!enumeration.includes('plasma-tokens-utils')) {
enumeration.push('plasma-tokens-utils');
}
Expand Down Expand Up @@ -90,11 +94,10 @@ jobs:

# TODO: https://github.com/salute-developers/plasma/issues/603
- name: Plasma Website
if: ${{ needs.scope.outputs.HAS_PLASMA_WEBSITE == 'true' }}
run: |
export NODE_OPTIONS=--openssl-legacy-provider
npm run build --prefix="./website/plasma-website"
cp -R ./website/plasma-website/build/ ./s3_build/${PR_NAME}
cp -R ./website/plasma-website/build/. ./s3_build/${PR_NAME}

- name: Plasma UI Docs
if: ${{ needs.scope.outputs.HAS_PLASMA_UI_DOCS == 'true' && needs.scope.outputs.HAS_PLASMA_UI == 'true' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/performance-test-base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: ./.github/actions/prepare-environment

- name: Lerna bootstrap
run: npx lerna bootstrap --scope=@salutejs/plasma-{core,hope,web,b2c,ui,icons}
run: npx lerna bootstrap --scope=@salutejs/plasma-{core,hope,new-hope,web,b2c,ui,icons}

- name: Install s3cmd
run: pip3 install s3cmd
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/performance-test-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
run: npm ci --no-progress

- name: Lerna bootstrap for PR
run: npx lerna bootstrap --scope=@salutejs/plasma-{core,hope,web,b2c,ui,icons}
run: npx lerna bootstrap --scope=@salutejs/plasma-{core,hope,new-hope,web,b2c,ui,icons}

- name: Restore perftool cache
run: >
Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
run: npm ci --no-progress

- name: Lerna bootstrap for ${{ github.event.pull_request.base.ref }}
run: npx lerna bootstrap --scope=@salutejs/plasma-{core,hope,web,b2c,ui,icons}
run: npx lerna bootstrap --scope=@salutejs/plasma-{core,hope,new-hope,web,b2c,ui,icons}

- name: Run performance test for ${{ github.event.pull_request.base.ref }}
run: >
Expand Down Expand Up @@ -227,5 +227,6 @@ jobs:
run: >
./scripts/perftool-send-report.js
--reportPath /home/runner/work/plasma/plasma/perftest/comparison.json
--referrer https://github.com/${{ github.repository }}/pull/${{ github.event.number }}
env:
GITHUB_SHA: ${{ github.sha }}
4 changes: 0 additions & 4 deletions .github/workflows/publish-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ on:
commit-message:
type: string
default: 'chore: update package-locks [skip ci]'
tag:
type: string
description: 'publish tag: canary,dev,latest. For example, tag === "dev" run => npm install @salutejs/plasma-b2c@dev'
secrets:
gh_token:
required: true
Expand Down Expand Up @@ -58,5 +55,4 @@ jobs:
uses: ./.github/actions/update-package-lock
with:
commit-message: ${{ inputs.commit-message }}
tag: ${{ inputs.tag }}
token: ${{ secrets.gh_token }}
1 change: 0 additions & 1 deletion .github/workflows/publish-rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
with:
with-update-package-lock: true
commit-message: "chore: update package-locks"
tag: "dev"
secrets:
gh_token: ${{ secrets.GH_TOKEN }}
npm_registry_token: ${{ secrets.NPM_REGISTRY_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/required-primary-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
npm i --no-progress --no-audit react@17 react-dom@17 @types/react@17.0.40 @types/react-dom@17 --prefix="./packages/plasma-web"

- name: Lerna bootstrap by scope
run: npx lerna bootstrap --scope=@salutejs/plasma-{ui,web,b2c,temple,hope,core}
run: npx lerna bootstrap --scope=@salutejs/plasma-{ui,web,b2c,temple,hope,new-hope,core}

- name: Unit tests for React 17
run: npm run test -- --scope=@salutejs/plasma-{ui,web,b2c,temple}
Loading