Skip to content

Commit 22d7935

Browse files
authored
chore: NO-JIRA sync-rebrand-2025-beta (#702)
Signed-off-by: Julio Ortega <julio.ortega@dialpad.com>
1 parent 9ee0810 commit 22d7935

File tree

17 files changed

+569
-296
lines changed

17 files changed

+569
-296
lines changed

.github/workflows/visual_tests.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Visual Tests
22

33
on:
44
push:
5-
branches: [ staging ]
5+
branches: [ staging, rebrand-2025-beta ]
66
pull_request:
77
types: [ unlabeled, labeled, synchronize, opened ]
88

@@ -54,8 +54,17 @@ jobs:
5454
message-id: 'missing-visual-test-label'
5555
refresh-message-position: true
5656

57+
get-branch-name:
58+
runs-on: ubuntu-latest
59+
outputs:
60+
current_branch: ${{ steps.branch-name.outputs.current_branch }}
61+
steps:
62+
- name: Get branch name
63+
id: branch-name
64+
uses: tj-actions/branch-names@v8
65+
5766
dialtone-vue-2:
58-
needs: filter-actions
67+
needs: [filter-actions, get-branch-name]
5968
if: ${{ github.event_name == 'push' || (needs.filter-actions.outputs.dialtone-vue-2 == 'true' && contains(github.event.pull_request.labels.*.name, 'visual-test-ready')) }}
6069

6170
runs-on: ubuntu-latest
@@ -93,5 +102,5 @@ jobs:
93102
- name: Run Dialtone-vue 2 Visual Tests
94103
env:
95104
PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
96-
PERCY_TARGET_BRANCH: ${{ github.base_ref }}
105+
PERCY_TARGET_BRANCH: ${{ needs.get-branch-name.outputs.current_branch == 'rebrand-2025-beta' && 'staging' || github.base_ref }}
97106
run: pnpm nx run --verbose dialtone-vue2:test:visual

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ If you don't care about theming and just want to use Dialtone with the default l
3434

3535
```css
3636
@import "@dialpad/dialtone/css-default-theme";
37-
3837
```
3938

4039
- Javascript

gulpfile.cjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const del = require('del');
2121
// ================================================================================
2222
const paths = {
2323
clean: {
24-
dist: './dist/**',
24+
dist: ['./dist/**'],
2525
},
2626
input: {
2727
css: './packages/dialtone-css/lib/dist/**',
@@ -60,7 +60,7 @@ const cleanUp = (items) => {
6060

6161
// -- Clean out dist folder
6262
const cleanDist = () => {
63-
return cleanUp([paths.clean.dist]);
63+
return cleanUp(paths.clean.dist);
6464
};
6565

6666
// ================================================================================

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
"packageExtensions": {
2020
"@dialpad/dialtone-vue@2": {
2121
"peerDependencies": {
22-
"vue": "^2.6.0"
22+
"vue": "^2.6.0",
23+
"@percy/cli-command": "1.30.9"
2324
}
2425
},
2526
"@dialpad/dialtone-vue@3": {
@@ -138,8 +139,8 @@
138139
"@dialpad/conventional-changelog-angular": "^1.1.1",
139140
"@dialpad/semantic-release-changelog-json": "^1.0.0",
140141
"@faker-js/faker": "8.4.1",
141-
"@percy/cli": "1.29.3",
142-
"@percy/storybook": "6.0.2",
142+
"@percy/cli": "1.30.9",
143+
"@percy/storybook": "6.0.3",
143144
"@semantic-release/changelog": "^6.0.3",
144145
"@semantic-release/exec": "^6.0.3",
145146
"@semantic-release/git": "^10.0.1",

packages/dialtone-emojis/release-ci.config.cjs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,9 @@ module.exports = {
5656
name: 'alpha',
5757
prerelease: true,
5858
},
59+
{
60+
name: 'rebrand-2025-beta',
61+
prerelease: true,
62+
},
5963
],
6064
};

packages/dialtone-icons/android/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
]
1313
}
1414
},
15-
"build": {
15+
"build:android": {
1616
"executor": "nx:run-commands",
1717
"dependsOn": ["clean-dist"],
1818
"options": {

packages/dialtone-icons/package.json

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,14 @@
1818
"./vue2/dist/types/src/icons/*.vue.d.ts",
1919
"./vue2/dist/types/src/illustrations/*.vue.d.ts"
2020
],
21-
"import": "./vue2/dist/components/*.js",
22-
"require": "./vue2/dist/components/*.cjs"
21+
"import": [
22+
"./vue2/dist/components/icons/*.js",
23+
"./vue2/dist/components/illustrations/*.js"
24+
],
25+
"require": [
26+
"./vue2/dist/components/icons/*.cjs",
27+
"./vue2/dist/components/illustrations/*.cjs"
28+
]
2329
},
2430
"./vue3": {
2531
"types": "./vue3/dist/types/index.d.ts",
@@ -31,8 +37,14 @@
3137
"./vue3/dist/types/src/icons/*.vue.d.ts",
3238
"./vue3/dist/types/src/illustrations/*.vue.d.ts"
3339
],
34-
"import": "./vue3/dist/components/*.js",
35-
"require": "./vue3/dist/components/*.cjs"
40+
"import": [
41+
"./vue3/dist/components/icons/*.js",
42+
"./vue3/dist/components/illustrations/*.js"
43+
],
44+
"require": [
45+
"./vue3/dist/components/icons/*.cjs",
46+
"./vue3/dist/components/illustrations/*.cjs"
47+
]
3648
},
3749
"./icons.js": "./dist/icons.js",
3850
"./illustrations.js": "./dist/illustrations.js",

packages/dialtone-icons/release-ci.config.cjs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,9 @@ module.exports = {
6060
name: 'alpha',
6161
prerelease: true,
6262
},
63+
{
64+
name: 'rebrand-2025-beta',
65+
prerelease: true,
66+
},
6367
],
6468
};

packages/dialtone-icons/vue2/package.json

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,18 @@
1313
"require": "./dist/dialtone-icons.cjs"
1414
},
1515
"./*": {
16-
"types": "./dist/types/src/**/*.d.ts",
17-
"import": "./dist/components/*.js",
18-
"require": "./dist/components/*.cjs"
16+
"types": [
17+
"./dist/types/src/icons/*.vue.d.ts",
18+
"./dist/types/src/illustrations/*.vue.d.ts"
19+
],
20+
"import": [
21+
"./dist/components/icons/*.js",
22+
"./dist/components/illustrations/*.js"
23+
],
24+
"require": [
25+
"./dist/components/icons/*.cjs",
26+
"./dist/components/illustrations/*.cjs"
27+
]
1928
}
2029
}
2130
}

packages/dialtone-icons/vue2/vite.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import { glob } from 'glob';
66
import dts from 'vite-plugin-dts';
77

88
const iconEntries = glob.sync('../src/icons/*.vue').reduce((entries, path) => {
9-
const entryName = path.replace(/^\.\.\/src\/icons\/(.*)\.vue$/, 'components/$1');
9+
const entryName = path.replace(/^\.\.\/src\/icons\/(.*)\.vue$/, 'components/icons/$1');
1010
entries[entryName] = path;
1111
return entries;
1212
}, {});
1313

1414
const illustrationEntries = glob.sync('../src/illustrations/*.vue').reduce((entries, path) => {
15-
const entryName = path.replace(/^\.\.\/src\/illustrations\/(.*)\.vue$/, 'components/$1');
15+
const entryName = path.replace(/^\.\.\/src\/illustrations\/(.*)\.vue$/, 'components/illustrations/$1');
1616
entries[entryName] = path;
1717
return entries;
1818
}, {});

0 commit comments

Comments
 (0)