Skip to content

Commit

Permalink
Revert "Merge branch 'main' into 3457-component-accordion"
Browse files Browse the repository at this point in the history
This reverts commit de63197, reversing
changes made to bcdb86b.
  • Loading branch information
schaertim committed Nov 13, 2024
1 parent de63197 commit 2019083
Show file tree
Hide file tree
Showing 216 changed files with 2,385 additions and 6,285 deletions.
6 changes: 0 additions & 6 deletions .changeset/2024-11-10-update-icons.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/big-socks-dress.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/cuddly-gifts-film.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/dirty-mayflies-taste.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/fast-bats-poke.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/fifty-dodos-wait.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/fifty-students-call.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/gold-chefs-rule.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/grumpy-parrots-wonder.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/neat-suits-provide.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/new-goats-impress.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/popular-mirrors-cross.md

This file was deleted.

16 changes: 0 additions & 16 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"changesets": [
"2024-10-17-update-icons",
"2024-10-27-update-icons",
"2024-11-10-update-icons",
"beige-jobs-do",
"big-frogs-admire",
"breezy-cups-add",
Expand All @@ -33,25 +32,17 @@
"cold-baboons-appear",
"cold-panthers-vanish",
"cuddly-bears-check",
"cuddly-gifts-film",
"dirty-mayflies-taste",
"eight-turkeys-matter",
"eleven-keys-work",
"empty-islands-kneel",
"fair-actors-scream",
"fast-bats-poke",
"fast-fans-wash",
"fifty-dodos-wait",
"fifty-students-call",
"five-hornets-sin",
"friendly-insects-breathe",
"funny-shrimps-care",
"giant-games-swim",
"gold-chairs-grin",
"gold-chefs-rule",
"gorgeous-flowers-flow",
"great-humans-talk",
"grumpy-parrots-wonder",
"heavy-rats-explode",
"kind-buses-trade",
"kind-papayas-provide",
Expand All @@ -60,33 +51,26 @@
"loud-dingos-remember",
"lovely-deers-itch",
"lovely-mirrors-travel",
"neat-suits-provide",
"nervous-rocks-shop",
"new-goats-impress",
"ninety-nails-float",
"pink-weeks-relate",
"plenty-apricots-raise",
"popular-games-rush",
"proud-actors-knock",
"proud-cheetahs-act",
"proud-moons-impress",
"quick-eagles-watch",
"quiet-apes-rhyme",
"rare-dryers-count",
"red-cobras-cry",
"red-lies-lick",
"rich-timers-listen",
"selfish-bats-run",
"selfish-ways-know",
"shaggy-experts-give",
"sharp-baboons-smile",
"sharp-crews-watch",
"shiny-ears-care",
"shy-walls-exercise",
"silver-coins-invent",
"six-spiders-smoke",
"sixty-items-promise",
"slimy-rockets-pull",
"strange-bottles-impress",
"tame-terms-push",
"three-lies-do",
Expand Down
6 changes: 0 additions & 6 deletions .changeset/proud-cheetahs-act.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/quick-buses-give.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/rare-dryers-count.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/rich-timers-listen.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/shy-walls-exercise.md

This file was deleted.

23 changes: 3 additions & 20 deletions .github/ISSUE_TEMPLATE/component-v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,14 @@ body:
options:
- label: Tokens for this component are ready
- type: textarea
id: tasksdesign
id: tasks
attributes:
label: Tasks design
description: Default tasks for the design team. Can be edited later according to needs.
value: |
```[tasklist]
### 🎨 Design
- [ ] Design component according to WIKIT
- [ ] Update dependencies
- [ ] Add & test compo in layout examples
- [ ] Designer review
- [ ] Documentation: Overview and usage (about, compo overview, compo props, usage, examples)
- [ ] Documentation: Technical documentation (anatomy, accessibility)
- [ ] Documentation: Review (content correctness, understandability, gaps)
```
- type: textarea
id: tasksdev
attributes:
label: Tasks development
label: Tasks
description: Default tasks for the dev team. Can be edited later according to needs.
value: |
```[tasklist]
### 💻 Development
### 💻 Tasks
- [ ] Review Design (All states present? Possible to implement?)
- [ ] Tokenization
- [ ] HTML/CSS implementation
- [ ] Web component implementation
- [ ] Documentation in Storybook
Expand Down
54 changes: 54 additions & 0 deletions .github/workflows/build-tokens.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,57 @@ jobs:

- name: Build tokens & dependencies
run: pnpm --filter design-system-tokens... build

- name: Create Summary
id: summary
uses: actions/github-script@v7
with:
script: |
const fs = require('fs')
const path = require('path')
const inputFileNames = fs.readdirSync('packages/tokens/tokensstudio-generated')
const inputFiles = inputFileNames.map(fileName => ({
type: path.extname(fileName).replace(/^\./, ''),
name: fileName,
content: fs.readFileSync(`packages/tokens/tokensstudio-generated/${fileName}`, 'utf8')
}))
const outputOrder = [
'index.scss',
'core.scss',
'scheme.scss',
'device.scss',
'channel.scss',
'theme.scss',
'components.scss',
]
const outputFileNames = fs.readdirSync('packages/tokens/dist')
const outputFiles = outputFileNames
.map(fileName => ({
type: path.extname(fileName).replace(/^\./, ''),
name: fileName,
content: fs.readFileSync(`packages/tokens/dist/${fileName}`, 'utf8')
}))
.map(({ type, name, content }) => {
if (type === 'scss') content = content.replaceAll('\n\n', '\n \n').replaceAll('$', '$').replaceAll(' ', '  ')
return { type, name, content }
})
.sort((a, b) => (outputOrder.includes(a.name) ? outputOrder.indexOf(a.name) : 1000) - (outputOrder.includes(b.name) ? outputOrder.indexOf(b.name) : 1000))
return `# Token Build
## Input
${inputFiles.map(({ type, name, content }) => `<details>
<summary><code>${name}</code></summary>
<pre lang="${type}">${content}</pre>
</details>`).join('\n')}
## Output
${outputFiles.map(({ type, name, content }) => `<details>
<summary><code>${name}</code></summary>
<pre lang="${type}">${content}</pre>
</details>`).join('\n')}
`
- name: Output Summary
run: echo -e ${{ steps.summary.outputs.result }} >> $GITHUB_STEP_SUMMARY
33 changes: 7 additions & 26 deletions .github/workflows/create-token-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ name: Create Token PR
on:
push:
branches:
- tokens/*
- tokens/v*

jobs:
create_pr:
Expand Down Expand Up @@ -46,17 +46,8 @@ jobs:
echo "exists=false" >> $GITHUB_OUTPUT
fi
# If the branch does not exit, create it
- name: Create PR Branch
if: steps.pr-branch.outputs.exists == 'false'
run: |
git checkout -b ${{ steps.pr-branch.outputs.name }} ${{ github.ref_name }}
git push --set-upstream origin ${{ steps.pr-branch.outputs.name }}
env:
GITHUB_TOKEN: ${{ secrets.SWISSPOSTDEVS_ACCESS_TOKEN }}

# If the branch exits, update it
- name: Update PR Branch
# If the branch exits, update the PR
- name: Update PR
if: steps.pr-branch.outputs.exists == 'true'
run: |
git checkout ${{ steps.pr-branch.outputs.name }}
Expand All @@ -65,22 +56,12 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.SWISSPOSTDEVS_ACCESS_TOKEN }}

# Check if a PR already exist
- name: Get PR
id: pr
run: |
if [[ -n $(gh pr list --head "${{ steps.pr-branch.outputs.name }}") ]]; then
echo "exists=true" >> $GITHUB_OUTPUT
else
echo "exists=false" >> $GITHUB_OUTPUT
fi
env:
GITHUB_TOKEN: ${{ secrets.SWISSPOSTDEVS_ACCESS_TOKEN }}

# If the PR does not exit, create it
# If the branch does not exit, create the PR
- name: Create PR
if: steps.pr.outputs.exists == 'false'
if: steps.pr-branch.outputs.exists == 'false'
run: |
git checkout -b ${{ steps.pr-branch.outputs.name }} ${{ github.ref_name }}
git push --set-upstream origin ${{ steps.pr-branch.outputs.name }}
gh pr create --title "chore(tokens): :art: update tokens" --body "Merge this PR to update the tokens in the main branch." --base main
env:
GITHUB_TOKEN: ${{ secrets.SWISSPOSTDEVS_ACCESS_TOKEN }}
8 changes: 0 additions & 8 deletions packages/components-angular/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
# @swisspost/design-system-components-angular-workspace

## 1.1.10-next.4

### Patch Changes

- Updated dependencies:
- @swisspost/design-system-styles@9.0.0-next.4
- @swisspost/design-system-components@9.0.0-next.4

## 1.1.10-next.3

### Patch Changes
Expand Down
28 changes: 14 additions & 14 deletions packages/components-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@swisspost/design-system-components-angular-workspace",
"version": "1.1.10-next.4",
"version": "1.1.10-next.3",
"scripts": {
"start": "ng serve --port 9210",
"build": "ng build components",
Expand All @@ -10,28 +10,28 @@
},
"private": true,
"dependencies": {
"@angular/animations": "18.2.10",
"@angular/common": "18.2.10",
"@angular/compiler": "18.2.10",
"@angular/core": "18.2.10",
"@angular/forms": "18.2.10",
"@angular/platform-browser": "18.2.10",
"@angular/platform-browser-dynamic": "18.2.10",
"@angular/router": "18.2.10",
"@swisspost/design-system-components": "workspace:9.0.0-next.4",
"@swisspost/design-system-styles": "workspace:9.0.0-next.4",
"@angular/animations": "18.2.9",
"@angular/common": "18.2.9",
"@angular/compiler": "18.2.9",
"@angular/core": "18.2.9",
"@angular/forms": "18.2.9",
"@angular/platform-browser": "18.2.9",
"@angular/platform-browser-dynamic": "18.2.9",
"@angular/router": "18.2.9",
"@swisspost/design-system-components": "workspace:9.0.0-next.3",
"@swisspost/design-system-styles": "workspace:9.0.0-next.3",
"rxjs": "7.8.1",
"tslib": "2.6.3",
"zone.js": "0.14.8"
},
"devDependencies": {
"@angular-devkit/build-angular": "18.2.11",
"@angular-devkit/build-angular": "18.2.10",
"@angular-eslint/builder": "18.4.0",
"@angular-eslint/eslint-plugin": "18.4.0",
"@angular-eslint/eslint-plugin-template": "18.4.0",
"@angular-eslint/template-parser": "18.4.0",
"@angular/cli": "18.2.11",
"@angular/compiler-cli": "18.2.10",
"@angular/cli": "18.2.10",
"@angular/compiler-cli": "18.2.9",
"@cypress/schematic": "2.5.2",
"@typescript-eslint/eslint-plugin": "7.18.0",
"@typescript-eslint/parser": "7.18.0",
Expand Down
Loading

0 comments on commit 2019083

Please sign in to comment.