Skip to content

Commit d12b8c4

Browse files
justinconabreeglo42707glo82145
authored
Updating Tailwind to V3 (#4196)
* Updating dependencies to tailwind v3.3, updating configurations with v3 changes, fixing issues in components following upgrade * Changing tokens to use tailwind config, refactor for border radius to make more configurable * Fixing self reference in config, fixing broken index.module.css, fixing B7 issues * WIP going through tailwind TODOs and changing to tailwind values, fixing index styles, adding more config values to fix TODOs * Fixing priority issues, adding new theme values, fixing theme and tokens * Changing all media queries to use config screen sizes, adding new screen sizes to config * Fixing lint and prettier * Fixing tailwind review comments, updating tailwind doc * fix prettier * Removing checkmo from tests * fix jest test for accout menu * fixing visibility priority issues * PWA-3174::[feature]: Tailwind v3 support --------- Co-authored-by: arpit khare <[email protected]> Co-authored-by: Aanchal Pawar <[email protected]> Co-authored-by: glo82145 <[email protected]>
1 parent f58bed1 commit d12b8c4

File tree

177 files changed

+43110
-1439
lines changed

Some content is hidden

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

177 files changed

+43110
-1439
lines changed

package-lock.json

Lines changed: 42112 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
"watch:venia": "yarn venia run watch"
4747
},
4848
"dependencies": {
49-
"@material-ui/core": "~4.12.4",
5049
"caniuse-lite": "~1.0.30001335"
5150
},
5251
"devDependencies": {
@@ -88,7 +87,7 @@
8887
"lodash.debounce": "~4.0.8",
8988
"prettier": "~1.16.4",
9089
"rimraf": "~2.6.3",
91-
"tailwindcss": "~2.2.7"
90+
"tailwindcss": "~3.3.0"
9291
},
9392
"optionalDependencies": {
9493
"bundlesize": "~0.18.1",
@@ -116,4 +115,4 @@
116115
"maxSize": "100 kB"
117116
}
118117
]
119-
}
118+
}

packages/extensions/experience-platform-connector/src/__tests__/__snapshots__/utils.spec.js.snap

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ Array [
4747
},
4848
"productType": "ConfigurableProduct",
4949
"sku": "VSK02",
50-
"topLevelSku": "VSK02",
5150
},
5251
"quantity": 1,
5352
},
@@ -83,7 +82,6 @@ Array [
8382
},
8483
"productType": "SimpleProduct",
8584
"sku": "VA17-SI-NA",
86-
"topLevelSku": "VA17-SI-NA",
8785
},
8886
"quantity": 2,
8987
},
@@ -132,7 +130,6 @@ Array [
132130
},
133131
"productType": "ConfigurableProduct",
134132
"sku": "VA04",
135-
"topLevelSku": "VA04",
136133
},
137134
"quantity": 3,
138135
},

packages/extensions/experience-platform-connector/src/handlers/__tests__/__snapshots__/shoppingMiniCartView.spec.js.snap

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ Object {
4747
},
4848
"productType": "ConfigurableProduct",
4949
"sku": "VSK02",
50-
"topLevelSku": "VSK02",
5150
},
5251
"quantity": 1,
5352
},
@@ -79,7 +78,6 @@ Object {
7978
},
8079
"productType": "SimpleProduct",
8180
"sku": "VA17-SI-NA",
82-
"topLevelSku": "VA17-SI-NA",
8381
},
8482
"quantity": 2,
8583
},
@@ -124,7 +122,6 @@ Object {
124122
},
125123
"productType": "ConfigurableProduct",
126124
"sku": "VA04",
127-
"topLevelSku": "VA04",
128125
},
129126
"quantity": 3,
130127
},

packages/extensions/experience-platform-connector/src/handlers/__tests__/shoppingCartPageView.spec.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ describe('handle()', () => {
8181
},
8282
"productType": "ConfigurableProduct",
8383
"sku": "VSK02",
84-
"topLevelSku": "VSK02",
8584
},
8685
"quantity": 1,
8786
},
@@ -117,7 +116,6 @@ describe('handle()', () => {
117116
},
118117
"productType": "SimpleProduct",
119118
"sku": "VA17-SI-NA",
120-
"topLevelSku": "VA17-SI-NA",
121119
},
122120
"quantity": 2,
123121
},
@@ -166,7 +164,6 @@ describe('handle()', () => {
166164
},
167165
"productType": "ConfigurableProduct",
168166
"sku": "VA04",
169-
"topLevelSku": "VA04",
170167
},
171168
"quantity": 3,
172169
},

packages/extensions/experience-platform-connector/src/handlers/__tests__/startCheckout.spec.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ describe('handle()', () => {
9696
},
9797
"productType": "ConfigurableProduct",
9898
"sku": "VP08",
99-
"topLevelSku": "VP08",
10099
},
101100
"quantity": 3,
102101
},
@@ -139,7 +138,6 @@ describe('handle()', () => {
139138
},
140139
"productType": "ConfigurableProduct",
141140
"sku": "VA09",
142-
"topLevelSku": "VA09",
143141
},
144142
"quantity": 1,
145143
},
@@ -175,7 +173,6 @@ describe('handle()', () => {
175173
},
176174
"productType": "SimpleProduct",
177175
"sku": "VA22-SI-NA",
178-
"topLevelSku": "VA22-SI-NA",
179176
},
180177
"quantity": 1,
181178
},

packages/extensions/experience-platform-connector/src/utils.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ export const getFormattedProducts = products => {
8282
product: {
8383
name: name,
8484
sku: sku,
85-
topLevelSku: product.sku,
8685
productType: type,
8786
pricing: {
8887
regularPrice: prices.price.value,

packages/extensions/venia-sample-payments-checkmo/src/components/summary.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
.payment_type {
3636
}
3737

38-
@media (max-width: 960px) {
38+
@media screen(-lg) {
3939
.edit_text {
4040
display: none;
4141
}

packages/pagebuilder/lib/ContentTypes/Column/column.module.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
@media only screen and (max-width: 768px) {
55
.root {
6-
background-attachment: scroll !important;
7-
flex-basis: 100%;
6+
@apply !bg-scroll;
7+
@apply basis-full;
88
}
99
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
.root:empty {
2-
display: none;
1+
.root {
2+
composes: empty_hidden from global;
33
}
44

55
.root_inline {
66
composes: root;
7-
display: inline-block;
7+
@apply inline-block;
88
}

0 commit comments

Comments
 (0)