Skip to content
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

chore(project): update format:diff ignore pattern #4409

Merged
merged 2 commits into from
Oct 21, 2019
Merged

chore(project): update format:diff ignore pattern #4409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad8e665
chore(project): update format:diff ignore pattern
joshblack Oct 21, 2019
6c556a6
chore(format): run prettier
joshblack Oct 21, 2019
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"clean": "lerna run clean && lerna clean --yes && rimraf node_modules",
"doctoc": "doctoc --title '## Table of Contents'",
"format": "prettier --write '**/*.{js,md,scss,ts}' '!**/{build,es,lib,storybook,ts,umd}/**'",
"format:diff": "prettier --list-different '**/*.{js,md,scss,ts}' '!**/{build,es,lib,storybook,ts,umd,components}/**'",
"format:diff": "prettier --list-different '**/*.{js,md,scss,ts}' '!**/{build,es,lib,storybook,ts,umd}/**' '!packages/components/**'",
"lint": "eslint packages",
"lint:styles": "stylelint '**/*.{css,scss}' --config ./packages/stylelint-config-elements",
"sync": "carbon-cli sync",
Expand Down
5 changes: 3 additions & 2 deletions packages/components/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ subject to breaking changes. Please use `es`/`umd`/`scss` directories instead)

# :books: Documentation

- See our [documentation site](https://www.carbondesignsystem.com/get-started/develop/vanilla) for full
how-to docs and guidelines
- See our
[documentation site](https://www.carbondesignsystem.com/get-started/develop/vanilla)
for full how-to docs and guidelines
- [Contributing](/.github/CONTRIBUTING.md): Guidelines for making contributions
to this repo.
- [🏃‍♀️ Migration Guides](./docs/migration)
Expand Down
2 changes: 1 addition & 1 deletion packages/components/docs/migration/migrate-to-10.x.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ initial `v10` release.
| Combobox | No breaking changes |
| Content Switcher | [Migrate](../../src/components/content-switcher/migrate-to-10.x.md) |
| Copy Button | [Migrate](../../src/components/copy-button/migrate-to-10.x.md) |
| Data Table V2 | [Migrate](../../src/components/data-table/migrate-to-10.x.md) |
| Data Table V2 | [Migrate](../../src/components/data-table/migrate-to-10.x.md) |
| Data Table | Removed |
| Date Picker | TODO |
| Dropdown | [Migrate](../../src/components/dropdown/migrate-to-10.x.md) |
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/Pagination/Pagination.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export default class Pagination extends Component {
return !pageSizesChanged && !pageChanged && !pageSizeChanged
? null
: {
page: pageSizeChanged && 1 || pageChanged && page || currentPage,
page: (pageSizeChanged && 1) || (pageChanged && page) || currentPage,
pageSize: pageSizeChanged ? pageSize : currentPageSize,
prevPageSizes: pageSizes,
prevPage: page,
Expand Down