Skip to content

Fixed import & Added custom property check to travis #2778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 28, 2020
Merged

Fixed import & Added custom property check to travis #2778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9b647b
Fixed custom properties path & Added job to buildkite
AndrewMusgrave Feb 26, 2020
bc6fbb5
changelog
AndrewMusgrave Feb 26, 2020
402d233
Merge branch 'master' into fix-cp
AndrewMusgrave Feb 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ jobs:
script:
- yarn run lint

- name: 'Check Custom Properties'
script:
- yarn run check:custom-properties

- name: 'Unit Tests'
script:
- yarn run test --coverage
Expand Down
2 changes: 2 additions & 0 deletions UNRELEASED.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

### Bug fixes

- Fixed incorrect used while importing from `polaris-tokens` ([#2778](https://github.com/Shopify/polaris-react/pull/2778))
- Allow changing the `DropZone` file if allowMultiple is false ([#2737](https://github.com/Shopify/polaris-react/pull/2737))
- Fixed `DropZone` not supporting new file selection when `allowMultiple` is `false` ([#2737](https://github.com/Shopify/polaris-react/pull/2737)) ([#2737](https://github.com/Shopify/polaris-react/pull/2737))
- Fixed `DropZone` not supporting new file selection when `allowMultiple` is `false` ([#2737](https://github.com/Shopify/polaris-react/pull/2737))
Expand All @@ -15,6 +16,7 @@

### Development workflow

- Added `check:custom-property` job in travis ([#2778](https://github.com/Shopify/polaris-react/pull/2778))
- Exported missing OptionListProps ([#2777](https://github.com/Shopify/polaris-react/pull/2777))

### Dependency upgrades
Expand Down
4 changes: 2 additions & 2 deletions src/utilities/custom-properties/custom-properties.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import roleVariants from '@shopify/polaris-tokens/formats/utils/color-factory/configs/base';
import {config} from '@shopify/polaris-tokens/dist-modern/configs/base';
import {toCssCustomPropertySyntax, Tokens} from '../theme';

export const nonDesignLangaugeCustomProperties = [
Expand All @@ -13,7 +13,7 @@ export const nonDesignLangaugeCustomProperties = [
];

export const designLangaugeCustomProperties = ([] as string[]).concat(
...Object.values(roleVariants).map((variant) =>
...Object.values(config).map((variant) =>
variant.map(({name}) => toCssCustomPropertySyntax(name)),
),
...Object.keys(Tokens).map(toCssCustomPropertySyntax),
Expand Down