Skip to content

Commit 5b3b78e

Browse files
committed
Merge branch 'staging' into migrate-vue3-class-attrs
2 parents f0f5bae + 0027ba7 commit 5b3b78e

File tree

104 files changed

+475
-159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+475
-159
lines changed

.github/workflows/publish-android.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ jobs:
2323
filter-actions:
2424
runs-on: ubuntu-latest
2525
outputs:
26-
packages: ${{ steps.filter.outputs.changes }}
26+
packages: ${{ github.event_name == 'push' && steps.filter-path.outputs.changes || steps.filter-input.outputs.package }}
2727
steps:
2828
- name: Checkout
2929
uses: actions/checkout@v4
3030

3131
- name: Filter actions by path
3232
if: ${{ github.event_name == 'push' }}
3333
uses: dorny/paths-filter@v3
34-
id: filter
34+
id: filter-path
3535
with:
3636
base: ${{ github.ref }}
3737
list-files: 'json'
@@ -43,9 +43,9 @@ jobs:
4343
4444
- name: Filter actions by input
4545
if: ${{ github.event_name == 'workflow_dispatch' }}
46-
id: filter
46+
id: filter-input
4747
run: |
48-
echo 'changes=["${{ github.event.inputs.package }}"]' >> $GITHUB_OUTPUT
48+
echo 'package=["${{ github.event.inputs.package }}"]' >> $GITHUB_OUTPUT
4949
5050
check-dialpad-member:
5151
runs-on: ubuntu-latest
@@ -60,16 +60,16 @@ jobs:
6060

6161
publish:
6262
needs: [ check-dialpad-member, filter-actions ]
63+
if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && needs.filter-actions.outputs.packages != '[]') }}
6364
strategy:
6465
matrix:
6566
package: ${{ fromJSON(needs.filter-actions.outputs.packages) }}
66-
include:
67-
- package: dialtone-icons
68-
dir: ./packages/dialtone-icons/android
69-
- package: dialtone-tokens
70-
dir: ./packages/dialtone-tokens
7167
runs-on: ubuntu-latest
7268
steps:
69+
- name: Set working Dir
70+
run: |
71+
echo "WORKING_DIR=${{ matrix.package == 'dialtone-icons' && './packages/dialtone-icons/android' || './packages/dialtone-tokens' }}" >> $GITHUB_ENV
72+
7373
- name: Checkout
7474
uses: actions/checkout@v4
7575

@@ -107,14 +107,14 @@ jobs:
107107
distribution: 'temurin'
108108
cache: 'gradle'
109109
cache-dependency-path: |
110-
${{ matrix.dir }}/*.gradle*
111-
${{ matrix.dir }}/**/gradle-wrapper.properties
110+
${{ env.WORKING_DIR }}/*.gradle*
111+
${{ env.WORKING_DIR }}/**/gradle-wrapper.properties
112112
113113
- name: Build ${{ matrix.package }}
114114
run: pnpm nx run ${{ matrix.package }}:build:android
115115

116116
- name: Publish ${{ matrix.package }}
117-
working-directory: ${{ matrix.dir }}
117+
working-directory: ${{ env.WORKING_DIR }}
118118
env:
119119
GITHUB_USER: braddialpad
120120
run: ./gradlew publish

.github/workflows/publish-ios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Publish packages
1+
name: Publish iOS
22

33
on:
44
workflow_dispatch:

.github/workflows/publish-web.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Publish packages
1+
name: Publish Web
22

33
on:
44
workflow_dispatch:
@@ -45,15 +45,15 @@ jobs:
4545
filter-actions:
4646
runs-on: ubuntu-latest
4747
outputs:
48-
packages: ${{ steps.filter.outputs.changes }}
48+
packages: ${{ github.event_name == 'push' && steps.filter-path.outputs.changes || steps.filter-input.outputs.package }}
4949
steps:
5050
- name: Checkout
5151
uses: actions/checkout@v4
5252

5353
- name: Filter actions by path
5454
if: ${{ github.event_name == 'push' }}
5555
uses: dorny/paths-filter@v3
56-
id: filter
56+
id: filter-path
5757
with:
5858
base: ${{ github.ref }}
5959
list-files: 'json'
@@ -79,9 +79,9 @@ jobs:
7979
8080
- name: Filter actions by input
8181
if: ${{ github.event_name == 'workflow_dispatch' }}
82-
id: filter
82+
id: filter-input
8383
run: |
84-
echo 'changes=["${{ github.event.inputs.package }}"]' >> $GITHUB_OUTPUT
84+
echo 'package=["${{ github.event.inputs.package }}"]' >> $GITHUB_OUTPUT
8585
8686
check-dialpad-member:
8787
runs-on: ubuntu-latest

CHANGELOG.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
## [9.107.1](https://github.com/dialpad/dialtone/compare/dialtone/v9.107.0...dialtone/v9.107.1) (2025-04-02)
2+
3+
4+
### Bug Fixes
5+
6+
* **Ci:** NO-JIRA changelog release order ([#689](https://github.com/dialpad/dialtone/issues/689)) ([bd4c080](https://github.com/dialpad/dialtone/commit/bd4c0802a59be6fdafb8f661a9c12c64ef764656))
7+
* **Emoji Text Wrapper:** DLT-2455 skip vue3 comment vnodes when extracting text for emojis ([#686](https://github.com/dialpad/dialtone/issues/686)) ([62ad982](https://github.com/dialpad/dialtone/commit/62ad98241850ae52e7d0ceeebb83aecb65fa3ad0))
8+
9+
# [9.107.0](https://github.com/dialpad/dialtone/compare/dialtone/v9.106.1...dialtone/v9.107.0) (2025-03-31)
10+
11+
12+
### Bug Fixes
13+
14+
* **Pagination:** DLT-2373 invalid prop combination on end buttons ([#684](https://github.com/dialpad/dialtone/issues/684)) ([517debb](https://github.com/dialpad/dialtone/commit/517debbbab0c497d13d48230ab9e8d2e9a52c423))
15+
16+
17+
### Features
18+
19+
* **Editor:** DP-131851 added editor support to encase text with div tags ([#685](https://github.com/dialpad/dialtone/issues/685)) ([d0429a3](https://github.com/dialpad/dialtone/commit/d0429a30c4474e02434388b6d782e23b07ac97c8))
20+
121
## [9.106.1](https://github.com/dialpad/dialtone/compare/dialtone/v9.106.0...dialtone/v9.106.1) (2025-03-27)
222

323

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@dialpad/dialtone",
3-
"version": "9.106.1",
3+
"version": "9.107.1",
44
"packageManager": "pnpm@9.9.0",
55
"description": "Dialpad's Dialtone design system monorepo",
66
"scripts": {

packages/combinator/CHANGELOG.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"versions":[{"version":"1.0.1","title":"[1.0.1](https://github.com/dialpad/dialtone/compare/combinator/v1.0.0...combinator/v1.0.1) (2024-12-10)","date":"2024-12-10","body":"### Code Refactoring\n\n* DLT-2122 move css out of recipes ([#577](https://github.com/dialpad/dialtone/issues/577)) ([75d5a0b](https://github.com/dialpad/dialtone/commit/75d5a0bf28bedb591daf2d7788dca4323394f1ff))\n\n\n\n### Bug Fixes\n\n* **Component:** DLT-2121 move all styling to dialtone-css from vue ([#557](https://github.com/dialpad/dialtone/issues/557)) ([97de9ed](https://github.com/dialpad/dialtone/commit/97de9ed36c48e59addf4d2e99ade9cb7dfc3cc37))","parsed":{"_":["DLT-2122 move css out of recipes (#577) (75d5a0b)","Component:** DLT-2121 move all styling to dialtone-css from vue (#557) (97de9ed)"],"Code Refactoring":["DLT-2122 move css out of recipes (#577) (75d5a0b)"],"Bug Fixes":["Component:** DLT-2121 move all styling to dialtone-css from vue (#557) (97de9ed)"]}}],"title":"1.0.0 (2024-11-26)"}
1+
{"versions":[{"version":"1.0.2","title":"[1.0.2](https://github.com/dialpad/dialtone/compare/combinator/v1.0.1...combinator/v1.0.2) (2025-04-02)","date":"2025-04-02","body":"### Bug Fixes\n\n* **Ci:** NO-JIRA changelog release order ([#689](https://github.com/dialpad/dialtone/issues/689)) ([bd4c080](https://github.com/dialpad/dialtone/commit/bd4c0802a59be6fdafb8f661a9c12c64ef764656))","parsed":{"_":["Ci:** NO-JIRA changelog release order (#689) (bd4c080)"],"Bug Fixes":["Ci:** NO-JIRA changelog release order (#689) (bd4c080)"]}},{"version":"1.0.2","title":"[1.0.2](https://github.com/dialpad/dialtone/compare/combinator/v1.0.1...combinator/v1.0.2) (2025-04-02)","date":"2025-04-02","body":"### Bug Fixes\n\n* **Ci:** NO-JIRA changelog release order ([#689](https://github.com/dialpad/dialtone/issues/689)) ([bd4c080](https://github.com/dialpad/dialtone/commit/bd4c0802a59be6fdafb8f661a9c12c64ef764656))","parsed":{"_":["Ci:** NO-JIRA changelog release order (#689) (bd4c080)"],"Bug Fixes":["Ci:** NO-JIRA changelog release order (#689) (bd4c080)"]}},{"version":"1.0.1","title":"[1.0.1](https://github.com/dialpad/dialtone/compare/combinator/v1.0.0...combinator/v1.0.1) (2024-12-10)","date":"2024-12-10","body":"### Code Refactoring\n\n* DLT-2122 move css out of recipes ([#577](https://github.com/dialpad/dialtone/issues/577)) ([75d5a0b](https://github.com/dialpad/dialtone/commit/75d5a0bf28bedb591daf2d7788dca4323394f1ff))\n\n\n\n### Bug Fixes\n\n* **Component:** DLT-2121 move all styling to dialtone-css from vue ([#557](https://github.com/dialpad/dialtone/issues/557)) ([97de9ed](https://github.com/dialpad/dialtone/commit/97de9ed36c48e59addf4d2e99ade9cb7dfc3cc37))","parsed":{"_":["DLT-2122 move css out of recipes (#577) (75d5a0b)","Component:** DLT-2121 move all styling to dialtone-css from vue (#557) (97de9ed)"],"Code Refactoring":["DLT-2122 move css out of recipes (#577) (75d5a0b)"],"Bug Fixes":["Component:** DLT-2121 move all styling to dialtone-css from vue (#557) (97de9ed)"]}}],"title":"1.0.0 (2024-11-26)"}

packages/combinator/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## [1.0.2](https://github.com/dialpad/dialtone/compare/combinator/v1.0.1...combinator/v1.0.2) (2025-04-02)
2+
3+
4+
### Bug Fixes
5+
6+
* **Ci:** NO-JIRA changelog release order ([#689](https://github.com/dialpad/dialtone/issues/689)) ([bd4c080](https://github.com/dialpad/dialtone/commit/bd4c0802a59be6fdafb8f661a9c12c64ef764656))
7+
18
## [1.0.1](https://github.com/dialpad/dialtone/compare/combinator/v1.0.0...combinator/v1.0.1) (2024-12-10)
29

310

packages/combinator/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@dialpad/dialtone-combinator",
3-
"version": "1.0.1",
3+
"version": "1.0.2",
44
"description": "Dialtone vue component combinator",
55
"scripts": {
66
"lint": "eslint --ext .js,.vue --ignore-path .gitignore --fix src",

packages/combinator/release-ci.config.cjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ module.exports = {
1919
['@semantic-release/release-notes-generator', {
2020
config: '@dialpad/conventional-changelog-angular',
2121
}],
22+
['@semantic-release/changelog', { changelogFile: `${srcRoot}/CHANGELOG.md` }],
2223
['@dialpad/semantic-release-changelog-json', {
2324
changelogFile: `${srcRoot}/CHANGELOG.md`,
2425
changelogJsonFile: `${srcRoot}/CHANGELOG.json`,
2526
}],
26-
['@semantic-release/changelog', { changelogFile: `${srcRoot}/CHANGELOG.md` }],
2727
['@semantic-release/npm', { npmPublish: false }],
2828
['@semantic-release/git', {
2929
assets: [

0 commit comments

Comments
 (0)