Skip to content

Commit 97a9798

Browse files
committed
Merge https://github.com/Shopify/polaris into layout-rebuild-batch-2
2 parents 4afece0 + 49ed527 commit 97a9798

File tree

218 files changed

+4585
-1980
lines changed

Some content is hidden

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

218 files changed

+4585
-1980
lines changed

.changeset/funny-toys-buy.md

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

.changeset/grumpy-bats-live.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@shopify/polaris': minor
3+
---
4+
5+
Add flex-direction: column-reverse to AlphaStack

.changeset/perfect-games-cough.md

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

.changeset/thirty-boats-flow.md

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

.stylelintrc.js

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,20 @@
11
/** @type {import('stylelint').Config} */
22
module.exports = {
33
extends: ['@shopify/stylelint-plugin/prettier', './stylelint-polaris'],
4-
// Disabling @shopify/stylelint-plugin/configs/core no-unknown-animations as styelint
4+
// Disabling @shopify/stylelint-plugin/configs/core no-unknown-animations as stylelint
55
// is not aware of global Polaris keyframes
66
// TODO: create custom plugin to ensure animation-names match Polaris keyframe names
77
rules: {
8-
'no-unknown-animations': undefined,
8+
'no-unknown-animations': null,
99
'value-keyword-case': ['lower', {camelCaseSvgKeywords: true}],
1010
},
1111
overrides: [
12-
{
13-
files: ['polaris-react/**/*.{css,scss}'],
14-
extends: [
15-
'@shopify/stylelint-plugin/prettier',
16-
'./stylelint-polaris/configs/internal',
17-
],
18-
},
1912
{
2013
files: ['polaris-migrator/**/tests/*.{css,scss}'],
2114
rules: {
22-
'comment-empty-line-before': undefined,
23-
'declaration-property-value-disallowed-list': undefined,
24-
'function-disallowed-list': undefined,
15+
'comment-empty-line-before': null,
16+
'declaration-property-value-disallowed-list': null,
17+
'function-disallowed-list': null,
2518
},
2619
},
2720
],

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
"rollup": "^2.70.2",
8080
"rollup-plugin-node-externals": "^4.0.0",
8181
"size-limit": "^5.0.3",
82-
"stylelint": "^14.1.0",
82+
"stylelint": "^14.15.0",
8383
"ts-node": "^10.7.0",
8484
"turbo": "^1.2.8",
8585
"typescript": "^4.6.3"

polaris-cli/CHANGELOG.md

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

3+
## 0.0.19
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`22c4107b3`](https://github.com/Shopify/polaris/commit/22c4107b3c369eb68da31980d208c09b3fc4ba37), [`77736370e`](https://github.com/Shopify/polaris/commit/77736370eeddde18a2c11da102b88646f2263d99)]:
8+
- @shopify/polaris-migrator@0.10.0
9+
310
## 0.0.18
411

512
### Patch Changes

polaris-cli/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@shopify/plugin-polaris",
3-
"version": "0.0.18",
3+
"version": "0.0.19",
44
"description": "Commands for building Shopify Apps with Polaris",
55
"license": "SEE LICENSE IN LICENSE.md",
66
"author": "Shopify <dev@shopify.com>",
@@ -24,7 +24,7 @@
2424
},
2525
"dependencies": {
2626
"@oclif/core": "^1.13.10",
27-
"@shopify/polaris-migrator": "^0.9.1"
27+
"@shopify/polaris-migrator": "^0.10.0"
2828
},
2929
"devDependencies": {
3030
"typescript": "^4.7.4"

polaris-icons/CHANGELOG.md

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

3+
## 6.7.0
4+
5+
### Minor Changes
6+
7+
- [#7816](https://github.com/Shopify/polaris/pull/7816) [`afe77e584`](https://github.com/Shopify/polaris/commit/afe77e5843f5b960574fe04433affc609d8687b1) Thanks [@allyshiasewdat](https://github.com/allyshiasewdat)! - Add returns major icon
8+
39
## 6.6.0
410

511
### Minor Changes
Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)