Skip to content

Commit 9acfca3

Browse files
pie-design-system-botashleynolan
pie-design-system-bot
and
ashleynolan
authored
feat: dsw-000-buttonoverflow integration (#227)
* feat: dsw-000-buttonoverflow * feat: DSW-0 updated button tests * feat: DSW-0 adding new button variants and upgrading deps * fix: DSW-0 resolutions for rimraf and glob pkgs --------- Co-authored-by: Ashley Watson-Nolan <[email protected]>
1 parent bd53472 commit 9acfca3

File tree

10 files changed

+1565
-2025
lines changed

10 files changed

+1565
-2025
lines changed

‎.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Lines changed: 541 additions & 0 deletions
Large diffs are not rendered by default.

‎.yarnrc.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
cacheFolder: ./.yarn/cache
2+
13
nodeLinker: node-modules
4+
5+
plugins:
6+
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
7+
spec: "@yarnpkg/plugin-interactive-tools"
8+
29
yarnPath: .yarn/releases/yarn-3.5.0.cjs
3-
cacheFolder: ./.yarn/cache

‎nextjs-app-v14/package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,24 @@
1414
"upgrade-pie-packages": "npx npm-check-updates \"@justeattakeaway/pie-*\" -u"
1515
},
1616
"dependencies": {
17-
"@justeattakeaway/pie-css": "0.13.0",
18-
"@justeattakeaway/pie-icons-webc": "0.25.1",
19-
"@justeattakeaway/pie-webc": "0.5.53",
17+
"@justeattakeaway/pie-css": "0.13.1",
18+
"@justeattakeaway/pie-icons-webc": "1.1.0",
19+
"@justeattakeaway/pie-webc": "0.5.56",
2020
"@lit-labs/nextjs": "0.2.0",
21-
"@lit/react": "1.0.5",
22-
"next": "14.2.3",
23-
"react": "18.2.0",
24-
"react-dom": "18.2.0",
25-
"sass": "1.69.5"
21+
"@lit/react": "1.0.6",
22+
"next": "14.2.18",
23+
"react": "18.3.1",
24+
"react-dom": "18.3.1",
25+
"sass": "1.81.0"
2626
},
2727
"devDependencies": {
28-
"@types/node": "20.9.1",
29-
"@types/react": "18.2.47",
30-
"@types/react-dom": "18.2.7",
28+
"@types/node": "20.17.9",
29+
"@types/react": "18.3.12",
30+
"@types/react-dom": "18.3.1",
3131
"deepmerge": "4.3.1",
32-
"eslint": "8.48.0",
33-
"eslint-config-next": "13.4.19",
34-
"typescript": "5.2.2"
32+
"eslint": "8.57.1",
33+
"eslint-config-next": "13.5.7",
34+
"typescript": "5.7.2"
3535
},
3636
"installConfig": {
3737
"hoistingLimits": "workspaces"

‎nextjs-app-v14/src/app/components/button/button.tsx

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,28 @@ export default function Button() {
1212
return (
1313
<NavigationLayout title="Button">
1414
<PieButton onClick={() => setCounter(counter + 1)}>Counter: {counter}</PieButton>
15+
1516
<PieDivider />
17+
1618
<h2>PIE Button - with Icon and text</h2>
1719
<PieButton>
1820
<IconSearch slot="icon"></IconSearch>
1921
Search
2022
</PieButton>
23+
24+
<PieDivider />
25+
26+
<h2>PIE Button - multi-line content</h2>
27+
<PieButton>
28+
This button has a long text that will wrap to the next line. It‘s very long
29+
</PieButton>
30+
31+
<PieDivider />
32+
33+
<h2>PIE Button - truncated content</h2>
34+
<PieButton isFullWidth>
35+
Thisisawordthatdoesntactuallyexistsothatwecanseehowthecontentistruncated
36+
</PieButton>
2137
</NavigationLayout>
2238
);
2339
}

‎nuxt-app/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
},
1616
"devDependencies": {
1717
"deepmerge": "4.3.1",
18-
"nuxt": "3.13.2",
19-
"sass": "1.70.0"
18+
"nuxt": "3.14.1592",
19+
"sass": "1.81.0"
2020
},
2121
"dependencies": {
22-
"@justeattakeaway/pie-css": "0.13.0",
23-
"@justeattakeaway/pie-icons-webc": "0.25.1",
24-
"@justeattakeaway/pie-webc": "0.5.53",
22+
"@justeattakeaway/pie-css": "0.13.1",
23+
"@justeattakeaway/pie-icons-webc": "1.1.0",
24+
"@justeattakeaway/pie-webc": "0.5.56",
2525
"just-kebab-case": "4.2.0",
26-
"nuxt-ssr-lit": "1.6.16"
26+
"nuxt-ssr-lit": "1.6.27"
2727
},
2828
"installConfig": {
2929
"hoistingLimits": "workspaces"

‎nuxt-app/pages/components/button.vue

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,37 @@
33
<pie-button @click="setCounter">
44
Counter: {{ counter }}
55
</pie-button>
6+
7+
<pie-divider></pie-divider>
8+
9+
<h2>PIE Button - with Icon and text</h2>
10+
<pie-button>
11+
<icon-search slot="icon"></icon-search>
12+
Search
13+
</pie-button>
14+
15+
<pie-divider></pie-divider>
16+
17+
<h2>PIE Button - multi-line content</h2>
18+
<pie-button>
19+
This button has a long text that will wrap to the next line. It‘s very long
20+
</pie-button>
21+
22+
<pie-divider></pie-divider>
23+
24+
<h2>PIE Button - truncated content</h2>
25+
<pie-button isFullWidth>
26+
Thisisawordthatdoesntactuallyexistsothatwecanseehowthecontentistruncated
27+
</pie-button>
628
</div>
729
</template>
830

931
<script setup lang="ts">
1032
import { ref } from 'vue';
1133
import { definePageMeta } from '#imports';
1234
import '@justeattakeaway/pie-webc/components/button.js';
35+
import '@justeattakeaway/pie-webc/components/divider.js';
36+
import '@justeattakeaway/pie-icons-webc/dist/IconSearch.js';
1337
1438
definePageMeta({
1539
title: 'Button',

‎package.json

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"upgrade-pie-packages": "turbo run upgrade-pie-packages && yarn"
2020
},
2121
"dependencies": {
22-
"commitizen": "4.3.0",
23-
"cz-customizable": "7.0.0"
22+
"commitizen": "4.3.1",
23+
"cz-customizable": "7.2.1"
2424
},
2525
"config": {
2626
"commitizen": {
@@ -31,29 +31,33 @@
3131
}
3232
},
3333
"devDependencies": {
34-
"@percy/cli": "1.28.0",
35-
"@percy/selenium-webdriver": "2.0.2",
36-
"@playwright/test": "1.41.1",
34+
"@percy/cli": "1.30.4",
35+
"@percy/selenium-webdriver": "2.1.0",
36+
"@playwright/test": "1.49.0",
3737
"@types/follow-redirects": "1.14.4",
38-
"@types/node": "20.11.13",
39-
"@wdio/browserstack-service": "8.24.1",
40-
"@wdio/cli": "8.19.0",
41-
"@wdio/local-runner": "8.19.0",
42-
"@wdio/mocha-framework": "8.19.0",
43-
"@wdio/spec-reporter": "8.19.0",
38+
"@types/node": "20.17.9",
39+
"@wdio/browserstack-service": "8.40.6",
40+
"@wdio/cli": "8.40.6",
41+
"@wdio/local-runner": "8.40.6",
42+
"@wdio/mocha-framework": "8.40.6",
43+
"@wdio/spec-reporter": "8.40.6",
4444
"cross-env": "7.0.3",
45-
"follow-redirects": "1.15.6",
45+
"follow-redirects": "1.15.9",
4646
"playwright-merge-html-reports": "0.2.8",
47-
"selenium-webdriver": "4.14.0",
48-
"turbo": "1.12.2"
47+
"selenium-webdriver": "4.27.0",
48+
"turbo": "1.13.4"
49+
},
50+
"resolutions": {
51+
"rimraf": "3.0.2",
52+
"glob": "10.4.5"
4953
},
5054
"workspaces": [
5155
"nextjs-app-v14",
5256
"nuxt-app",
5357
"vanilla-app"
5458
],
5559
"volta": {
56-
"node": "20.9.0",
60+
"node": "20.18.1",
5761
"yarn": "3.5.0"
5862
}
5963
}

‎vanilla-app/js/button.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,27 @@ import './shared.js';
55

66
document.querySelector('#app').innerHTML = `
77
<pie-button id="counter" type="button"></pie-button>
8+
89
<pie-divider></pie-divider>
10+
911
<h2>PIE Button – with icon and text</h2>
1012
<pie-button>
1113
<icon-search slot="icon"></icon-search>
1214
Search
15+
</pie-button>
16+
17+
<pie-divider></pie-divider>
18+
19+
<h2>PIE Button - multi-line content</h2>
20+
<pie-button>
21+
This button has a long text that will wrap to the next line. It‘s very long
22+
</pie-button>
23+
24+
<pie-divider></pie-divider>
25+
26+
<h2>PIE Button - truncated content</h2>
27+
<pie-button isFullWidth>
28+
Thisisawordthatdoesntactuallyexistsothatwecanseehowthecontentistruncated
1329
</pie-button>`;
1430

1531
setupCounter(document.querySelector('#counter'));

‎vanilla-app/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
},
1515
"devDependencies": {
1616
"deepmerge": "4.3.1",
17-
"vite": "4.5.3",
17+
"vite": "4.5.5",
1818
"vite-plugin-html-inject": "1.1.2"
1919
},
2020
"dependencies": {
21-
"@justeattakeaway/pie-css": "0.13.0",
22-
"@justeattakeaway/pie-icons-webc": "0.25.1",
23-
"@justeattakeaway/pie-webc": "0.5.53"
21+
"@justeattakeaway/pie-css": "0.13.1",
22+
"@justeattakeaway/pie-icons-webc": "1.1.0",
23+
"@justeattakeaway/pie-webc": "0.5.56"
2424
},
2525
"installConfig": {
2626
"hoistingLimits": "workspaces"

0 commit comments

Comments
 (0)