Skip to content

Commit f6a5f8c

Browse files
committed
Merge remote-tracking branch 'origin/dev'
2 parents fd47263 + ed89fa5 commit f6a5f8c

File tree

84 files changed

+2630
-415
lines changed

Some content is hidden

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

84 files changed

+2630
-415
lines changed

.eslintrc.cjs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ module.exports = {
4949
allowBlockStart: false,
5050
},
5151
],
52-
'max-len': ['error', {
53-
code: 150,
54-
ignoreTemplateLiterals: true,
55-
ignoreStrings: true,
56-
ignoreComments: true,
57-
ignorePattern: 'd="([\\s\\S]*?)"',
58-
}],
52+
// 'max-len': ['error', {
53+
// code: 150,
54+
// ignoreTemplateLiterals: true,
55+
// ignoreStrings: true,
56+
// ignoreComments: true,
57+
// ignorePattern: 'd="([\\s\\S]*?)"',
58+
// }],
5959
},
6060
};

.postcssrc.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ module.exports = {
1111
getJSON: (cssFileName, json) => {
1212
/* Ignore generate common polaris tokens style file */
1313
if (cssFileName.indexOf('@shopify/polaris-tokens') !== -1 || cssFileName.indexOf('CustomProperties') !== -1) {
14-
console.log(cssFileName);
1514
return;
1615
}
1716

.storybook/stories/GetStarted.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { Meta } from '@storybook/addon-docs';
2424

2525
Polaris Vue by Ownego is a component library for [Vue 3](https://vuejs.org/) based on [Shopify Polaris style guide](https://polaris.shopify.com/). We try to keep the package light-weight and easy to use (mostly similar with original Polaris Library).
2626

27-
**Follow Polaris React version:** [9.12.2](https://github.com/Shopify/polaris/releases/tag/%40shopify%2Fpolaris%409.12.2) - Migrated date: *Jun 3rd, 2022*.
27+
**Follow Polaris React version:** [9.19.0](https://github.com/Shopify/polaris/releases/tag/%40shopify%2Fpolaris%409.19.0) - Migrated date: *Jun 30th, 2022*.
2828

2929
<a href="https://github.com/ownego/polaris-vue"><img src="https://img.shields.io/badge/github-%23121011.svg?style=for-the-badge&logo=github&logoColor=white" alt="Github"/></a>
3030

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Polaris Vue by Ownego only supports **Vue 3.0+**.
55
Polaris Vue based on [Shopify Polaris style guide](https://polaris.shopify.com/), built especially for Vue 3.
66
We're trying to make it mostly close with Shopify style guide and get a better performance.
77

8-
**Follow Polaris React version:** [9.12.2](https://github.com/Shopify/polaris/releases/tag/%40shopify%2Fpolaris%409.12.2) - Migrated date: *Jun 3rd, 2022*.
8+
**Follow Polaris React version:** [9.19.0](https://github.com/Shopify/polaris/releases/tag/%40shopify%2Fpolaris%409.19.0) - Migrated date: *Jun 30th, 2022*.
99

1010
<br/>
1111

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@ownego/polaris-vue",
33
"version": "0.8.2",
4-
"polaris_version": "9.12.2",
4+
"polaris_version": "9.19.0",
55
"description": "Shopify Polaris UI library for Vue 3",
66
"author": "Ownego Team",
77
"keywords": [
@@ -35,14 +35,15 @@
3535
"remove-trashes": "rimraf dist/index.html dist/favicon.ico dist/images"
3636
},
3737
"dependencies": {
38-
"@shopify/polaris-icons": "^4.22.0",
38+
"@shopify/polaris-icons": "^4.23.0",
3939
"vite-svg-loader": "^3.1.2",
40-
"vue": "^3.2.31"
40+
"vue": "^3.2.31",
41+
"vue-router": "^3.1.6"
4142
},
4243
"devDependencies": {
4344
"@babel/core": "^7.17.5",
4445
"@rushstack/eslint-patch": "^1.1.0",
45-
"@shopify/polaris-tokens": "^5.1.1",
46+
"@shopify/polaris-tokens": "^5.4.0",
4647
"@shopify/typescript-configs": "^5.1.0",
4748
"@storybook/addon-a11y": "^6.5.5",
4849
"@storybook/addon-actions": "^6.5.5",
@@ -77,7 +78,7 @@
7778
"typescript": "~4.5.5",
7879
"vite": "^2.8.6",
7980
"vite-plugin-checker": "^0.4.2",
80-
"vite-plugin-dts": "^1.0.4",
81+
"vite-plugin-dts": "^1.2.0",
8182
"vite-plugin-eslint": "^1.3.0",
8283
"vite-plugin-replace": "^0.1.1",
8384
"vue-tsc": "^0.32.1"

src/classes/Avatar.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"Avatar":"Polaris-Avatar","hidden":"Polaris-Avatar--hidden","sizeExtraSmall":"Polaris-Avatar--sizeExtraSmall","sizeSmall":"Polaris-Avatar--sizeSmall","sizeMedium":"Polaris-Avatar--sizeMedium","sizeLarge":"Polaris-Avatar--sizeLarge","styleOne":"Polaris-Avatar--styleOne","styleTwo":"Polaris-Avatar--styleTwo","styleThree":"Polaris-Avatar--styleThree","styleFour":"Polaris-Avatar--styleFour","styleFive":"Polaris-Avatar--styleFive","imageHasLoaded":"Polaris-Avatar--imageHasLoaded","Image":"Polaris-Avatar__Image","Initials":"Polaris-Avatar__Initials","Svg":"Polaris-Avatar__Svg"}
1+
{"Avatar":"Polaris-Avatar","shapeSquare":"Polaris-Avatar--shapeSquare","hidden":"Polaris-Avatar--hidden","sizeExtraSmall":"Polaris-Avatar--sizeExtraSmall","sizeSmall":"Polaris-Avatar--sizeSmall","sizeMedium":"Polaris-Avatar--sizeMedium","sizeLarge":"Polaris-Avatar--sizeLarge","styleOne":"Polaris-Avatar--styleOne","styleTwo":"Polaris-Avatar--styleTwo","styleThree":"Polaris-Avatar--styleThree","styleFour":"Polaris-Avatar--styleFour","styleFive":"Polaris-Avatar--styleFive","imageHasLoaded":"Polaris-Avatar--imageHasLoaded","Image":"Polaris-Avatar__Image","Initials":"Polaris-Avatar__Initials","Svg":"Polaris-Avatar__Svg"}

src/classes/Button.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"Button":"Polaris-Button","pressed":"Polaris-Button--pressed","disabled":"Polaris-Button--disabled","connectedDisclosure":"Polaris-Button--connectedDisclosure","Content":"Polaris-Button__Content","plain":"Polaris-Button--plain","textAlignLeft":"Polaris-Button--textAlignLeft","textAlignCenter":"Polaris-Button--textAlignCenter","textAlignRight":"Polaris-Button--textAlignRight","Icon":"Polaris-Button__Icon","fullWidth":"Polaris-Button--fullWidth","hidden":"Polaris-Button--hidden","Spinner":"Polaris-Button__Spinner","primary":"Polaris-Button--primary","destructive":"Polaris-Button--destructive","outline":"Polaris-Button--outline","loading":"Polaris-Button--loading","removeUnderline":"Polaris-Button--removeUnderline","iconOnly":"Polaris-Button--iconOnly","sizeSlim":"Polaris-Button--sizeSlim","sizeLarge":"Polaris-Button--sizeLarge","monochrome":"Polaris-Button--monochrome","Text":"Polaris-Button__Text","ConnectedDisclosureWrapper":"Polaris-Button__ConnectedDisclosureWrapper","ConnectedDisclosure":"Polaris-Button__ConnectedDisclosure"}
1+
{"Button":"Polaris-Button","pressed":"Polaris-Button--pressed","disabled":"Polaris-Button--disabled","connectedDisclosure":"Polaris-Button--connectedDisclosure","Content":"Polaris-Button__Content","plain":"Polaris-Button--plain","textAlignLeft":"Polaris-Button--textAlignLeft","textAlignStart":"Polaris-Button--textAlignStart","textAlignCenter":"Polaris-Button--textAlignCenter","textAlignRight":"Polaris-Button--textAlignRight","textAlignEnd":"Polaris-Button--textAlignEnd","Icon":"Polaris-Button__Icon","fullWidth":"Polaris-Button--fullWidth","hidden":"Polaris-Button--hidden","Spinner":"Polaris-Button__Spinner","primary":"Polaris-Button--primary","destructive":"Polaris-Button--destructive","outline":"Polaris-Button--outline","loading":"Polaris-Button--loading","removeUnderline":"Polaris-Button--removeUnderline","iconOnly":"Polaris-Button--iconOnly","sizeSlim":"Polaris-Button--sizeSlim","sizeLarge":"Polaris-Button--sizeLarge","monochrome":"Polaris-Button--monochrome","Text":"Polaris-Button__Text","ConnectedDisclosureWrapper":"Polaris-Button__ConnectedDisclosureWrapper","ConnectedDisclosure":"Polaris-Button__ConnectedDisclosure"}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"ConnectedFilterControl":"Polaris-Filters-ConnectedFilterControl","CenterContainer":"Polaris-Filters-ConnectedFilterControl__CenterContainer","right":"Polaris-Filters-ConnectedFilterControl--right","Item":"Polaris-Filters-ConnectedFilterControl__Item","Item-focused":"Polaris-Filters-ConnectedFilterControl__Item--focused","ProxyButtonContainer":"Polaris-Filters-ConnectedFilterControl__ProxyButtonContainer","RightContainer":"Polaris-Filters-ConnectedFilterControl__RightContainer","MoreFiltersButtonContainer":"Polaris-Filters-ConnectedFilterControl__MoreFiltersButtonContainer","queryFieldHidden":"Polaris-Filters-ConnectedFilterControl--queryFieldHidden","RightContainerWithoutMoreFilters":"Polaris-Filters-ConnectedFilterControl__RightContainerWithoutMoreFilters","onlyButtonVisible":"Polaris-Filters-ConnectedFilterControl--onlyButtonVisible","Wrapper":"Polaris-Filters-ConnectedFilterControl__Wrapper","AuxiliaryContainer":"Polaris-Filters-ConnectedFilterControl__AuxiliaryContainer"}

src/classes/Filters.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"Filters":"Polaris-Filters","FiltersContainer":"Polaris-Filters__FiltersContainer","FiltersContainerHeader":"Polaris-Filters__FiltersContainerHeader","FiltersDesktopContainerContent":"Polaris-Filters__FiltersDesktopContainerContent","FiltersMobileContainerContent":"Polaris-Filters__FiltersMobileContainerContent","FiltersContainerFooter":"Polaris-Filters__FiltersContainerFooter","FiltersMobileContainerFooter":"Polaris-Filters__FiltersMobileContainerFooter","EmptyFooterState":"Polaris-Filters__EmptyFooterState","FilterTriggerContainer":"Polaris-Filters__FilterTriggerContainer","FilterTrigger":"Polaris-Filters__FilterTrigger","FilterTriggerTitle":"Polaris-Filters__FilterTriggerTitle","AppliedFilterBadgeContainer":"Polaris-Filters__AppliedFilterBadgeContainer","open":"Polaris-Filters--open","FilterTriggerLabelContainer":"Polaris-Filters__FilterTriggerLabelContainer","first":"Polaris-Filters--first","last":"Polaris-Filters--last","FilterNodeContainer":"Polaris-Filters__FilterNodeContainer","SearchIcon":"Polaris-Filters__SearchIcon","Backdrop":"Polaris-Filters__Backdrop","HelpText":"Polaris-Filters__HelpText","TagsContainer":"Polaris-Filters__TagsContainer"}

src/classes/Grid-Cell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"Cell":"Polaris-Grid-Cell","Cell-1-column-xs":"Polaris-Grid-Cell--cell_1ColumnXs","Cell-2-column-xs":"Polaris-Grid-Cell--cell_2ColumnXs","Cell-3-column-xs":"Polaris-Grid-Cell--cell_3ColumnXs","Cell-4-column-xs":"Polaris-Grid-Cell--cell_4ColumnXs","Cell-5-column-xs":"Polaris-Grid-Cell--cell_5ColumnXs","Cell-6-column-xs":"Polaris-Grid-Cell--cell_6ColumnXs","Cell-1-column-sm":"Polaris-Grid-Cell--cell_1ColumnSm","Cell-2-column-sm":"Polaris-Grid-Cell--cell_2ColumnSm","Cell-3-column-sm":"Polaris-Grid-Cell--cell_3ColumnSm","Cell-4-column-sm":"Polaris-Grid-Cell--cell_4ColumnSm","Cell-5-column-sm":"Polaris-Grid-Cell--cell_5ColumnSm","Cell-6-column-sm":"Polaris-Grid-Cell--cell_6ColumnSm","Cell-1-column-md":"Polaris-Grid-Cell--cell_1ColumnMd","Cell-2-column-md":"Polaris-Grid-Cell--cell_2ColumnMd","Cell-3-column-md":"Polaris-Grid-Cell--cell_3ColumnMd","Cell-4-column-md":"Polaris-Grid-Cell--cell_4ColumnMd","Cell-5-column-md":"Polaris-Grid-Cell--cell_5ColumnMd","Cell-6-column-md":"Polaris-Grid-Cell--cell_6ColumnMd","Cell-1-column-lg":"Polaris-Grid-Cell--cell_1ColumnLg","Cell-2-column-lg":"Polaris-Grid-Cell--cell_2ColumnLg","Cell-3-column-lg":"Polaris-Grid-Cell--cell_3ColumnLg","Cell-4-column-lg":"Polaris-Grid-Cell--cell_4ColumnLg","Cell-5-column-lg":"Polaris-Grid-Cell--cell_5ColumnLg","Cell-6-column-lg":"Polaris-Grid-Cell--cell_6ColumnLg","Cell-7-column-lg":"Polaris-Grid-Cell--cell_7ColumnLg","Cell-8-column-lg":"Polaris-Grid-Cell--cell_8ColumnLg","Cell-9-column-lg":"Polaris-Grid-Cell--cell_9ColumnLg","Cell-10-column-lg":"Polaris-Grid-Cell--cell_10ColumnLg","Cell-11-column-lg":"Polaris-Grid-Cell--cell_11ColumnLg","Cell-12-column-lg":"Polaris-Grid-Cell--cell_12ColumnLg","Cell-1-column-xl":"Polaris-Grid-Cell--cell_1ColumnXl","Cell-2-column-xl":"Polaris-Grid-Cell--cell_2ColumnXl","Cell-3-column-xl":"Polaris-Grid-Cell--cell_3ColumnXl","Cell-4-column-xl":"Polaris-Grid-Cell--cell_4ColumnXl","Cell-5-column-xl":"Polaris-Grid-Cell--cell_5ColumnXl","Cell-6-column-xl":"Polaris-Grid-Cell--cell_6ColumnXl","Cell-7-column-xl":"Polaris-Grid-Cell--cell_7ColumnXl","Cell-8-column-xl":"Polaris-Grid-Cell--cell_8ColumnXl","Cell-9-column-xl":"Polaris-Grid-Cell--cell_9ColumnXl","Cell-10-column-xl":"Polaris-Grid-Cell--cell_10ColumnXl","Cell-11-column-xl":"Polaris-Grid-Cell--cell_11ColumnXl","Cell-12-column-xl":"Polaris-Grid-Cell--cell_12ColumnXl"}

0 commit comments

Comments
 (0)