Skip to content

Commit 37cacc5

Browse files
committed
Merge branch 'main' into v11-major
* main: Disallow text transform in stylelint-polaris coverage rules (#8244) Add new z-index token names (#8245) Version Packages (#8236) [Layout foundations][Batch 3] Rebuild components with layout primitives (#7950) [Backdrop] Call `onClick` regardless of `setClosing` prop presence (#8237)
2 parents b348834 + 0ee4325 commit 37cacc5

File tree

39 files changed

+279
-279
lines changed

39 files changed

+279
-279
lines changed

.changeset/big-carrots-rescue.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/fuzzy-timers-kneel.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@shopify/polaris-tokens': minor
3+
---
4+
5+
Added new z-index tokens that will be the default in v7.0.0

.changeset/metal-queens-look.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@shopify/stylelint-polaris': minor
3+
'@shopify/polaris': patch
4+
---
5+
6+
Disallow text-transform property in Stylelint Polaris

polaris-cli/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# @shopify/polaris-cli
22

3+
## 0.1.1
4+
35
## 0.1.0
46

57
### Minor Changes

polaris-cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@shopify/polaris-cli",
3-
"version": "0.1.0",
3+
"version": "0.1.1",
44
"description": "Commands for building Shopify Apps with Polaris",
55
"license": "SEE LICENSE IN LICENSE.md",
66
"author": "Shopify <dev@shopify.com>",

polaris-migrator/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"devDependencies": {
5252
"@types/is-git-clean": "^1.1.0",
5353
"@types/jscodeshift": "^0.11.5",
54-
"@shopify/polaris": "^10.24.2",
54+
"@shopify/polaris": "^10.25.0",
5555
"plop": "^3.1.1",
5656
"plop-dir": "^0.0.5",
5757
"prettier": "^2.7.1",

polaris-react/CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
# Changelog
22

3+
## 10.25.0
4+
5+
### Minor Changes
6+
7+
- [#7950](https://github.com/Shopify/polaris/pull/7950) [`286c63a84`](https://github.com/Shopify/polaris/commit/286c63a8402873f02cdbd9e469169531ee03111b) Thanks [@laurkim](https://github.com/laurkim)! - Updated `Tabs` component to use layout primitives
8+
9+
* [#7950](https://github.com/Shopify/polaris/pull/7950) [`286c63a84`](https://github.com/Shopify/polaris/commit/286c63a8402873f02cdbd9e469169531ee03111b) Thanks [@laurkim](https://github.com/laurkim)! - Updated `OptionList` to use new layout primitives
10+
11+
- [#7950](https://github.com/Shopify/polaris/pull/7950) [`286c63a84`](https://github.com/Shopify/polaris/commit/286c63a8402873f02cdbd9e469169531ee03111b) Thanks [@laurkim](https://github.com/laurkim)! - Updated `Popover` to use new layout primitives
12+
13+
### Patch Changes
14+
15+
- [#7950](https://github.com/Shopify/polaris/pull/7950) [`286c63a84`](https://github.com/Shopify/polaris/commit/286c63a8402873f02cdbd9e469169531ee03111b) Thanks [@laurkim](https://github.com/laurkim)! - Remove unused class in Page Header
16+
17+
* [#7950](https://github.com/Shopify/polaris/pull/7950) [`286c63a84`](https://github.com/Shopify/polaris/commit/286c63a8402873f02cdbd9e469169531ee03111b) Thanks [@laurkim](https://github.com/laurkim)! - Rebuilt Page Header with layout components
18+
19+
- [#8237](https://github.com/Shopify/polaris/pull/8237) [`17fa970db`](https://github.com/Shopify/polaris/commit/17fa970db66213fe659ee231e750f7054a72dc97) Thanks [@loic-d](https://github.com/loic-d)! - Fixed Backdrop onClick callback when setClosing is missing
20+
321
## 10.24.2
422

523
### Patch Changes

polaris-react/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Otherwise include the CSS in your HTML. We suggest copying the styles file into
3333
```html
3434
<link
3535
rel="stylesheet"
36-
href="https://unpkg.com/@shopify/polaris@10.24.2/build/esm/styles.css"
36+
href="https://unpkg.com/@shopify/polaris@10.25.0/build/esm/styles.css"
3737
/>
3838
```
3939

@@ -70,7 +70,7 @@ If React doesn’t make sense for your application, you can use a CSS-only versi
7070
```html
7171
<link
7272
rel="stylesheet"
73-
href="https://unpkg.com/@shopify/polaris@10.24.2/build/esm/styles.css"
73+
href="https://unpkg.com/@shopify/polaris@10.25.0/build/esm/styles.css"
7474
/>
7575
```
7676

polaris-react/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@shopify/polaris",
33
"description": "Shopify’s admin product component library",
4-
"version": "10.24.2",
4+
"version": "10.25.0",
55
"private": false,
66
"license": "SEE LICENSE IN LICENSE.md",
77
"author": "Shopify <dev@shopify.com>",

polaris-react/src/components/AppProvider/AppProvider.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ body {
1111
line-height: var(--p-font-line-height-2);
1212
font-weight: var(--p-font-weight-regular);
1313

14+
// stylelint-disable-next-line -- generated by polaris-migrator DO NOT COPY
1415
text-transform: initial;
1516
letter-spacing: initial;
1617

0 commit comments

Comments
 (0)