Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into benelan/input-incre…
Browse files Browse the repository at this point in the history
…ment-bigdecimal

* origin/master:
  test(tabs): delay story due to potential timing chromatic diff (#6437)
  build(deps): Bump chromatic from 6.14.0 to 6.17.1 (#6571)
  build(deps): Bump postcss from 8.4.20 to 8.4.21 (#6570)
  build(deps): Bump eslint-config-prettier from 8.6.0 to 8.7.0 (#6572)
  ci(eslint): ignore private/internal code for jsdoc rules (#6416)
  • Loading branch information
benelan committed Mar 8, 2023
2 parents da95105 + f0dd928 commit 7cddcac
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 66 deletions.
15 changes: 12 additions & 3 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,19 @@
"curly": "error",
"jest/expect-expect": "off",
"jest/no-export": "warn",
"jsdoc/require-jsdoc": "off",
"jsdoc/check-tag-names": "off",
"jsdoc/require-jsdoc": "off",
"lines-between-class-members": ["error", "always"],
"no-multiple-empty-lines": ["error", { "max": 1 }],
"no-unneeded-ternary": "error",
"no-eval": "error",
"no-implied-eval": "error",
"no-multiple-empty-lines": [
"error",
{
"max": 1
}
],
"no-new-func": "error",
"no-unneeded-ternary": "error",
"react/forbid-component-props": [
"warn",
{
Expand Down Expand Up @@ -130,6 +135,10 @@
"settings": {
"react": {
"pragma": "h"
},
"jsdoc": {
"ignoreInternal": true,
"ignorePrivate": true
}
}
}
117 changes: 58 additions & 59 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,13 @@
"chalk": "4.1.2",
"cheerio": "1.0.0-rc.10",
"chokidar": "3.5.3",
"chromatic": "6.14.0",
"chromatic": "6.17.1",
"concurrently": "7.6.0",
"conventional-changelog-cli": "2.2.2",
"cpy-cli": "^4.0.0",
"dedent": "0.7.0",
"eslint": "8.35.0",
"eslint-config-prettier": "8.6.0",
"eslint-config-prettier": "8.7.0",
"eslint-plugin-jest": "27.2.1",
"eslint-plugin-jsdoc": "39.6.4",
"eslint-plugin-prettier": "4.2.1",
Expand All @@ -135,7 +135,7 @@
"jest-cli": "27.4.5",
"lint-staged": "13.1.0",
"markdownlint-cli": "0.33.0",
"postcss": "8.4.20",
"postcss": "8.4.21",
"prettier": "2.8.1",
"puppeteer": "10.0.0",
"quicktype-core": "6.1.0",
Expand Down
5 changes: 4 additions & 1 deletion src/components/tabs/tabs.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ export const disabledTabsAndMediumIconsForLargeTabsTitle_TestOnly = (): string =
</calcite-tabs>
`;

export const TabChilrenWithPercentageHeights = (): string => html`
export const TabChildrenWithPercentageHeights = (): string => html`
<calcite-tabs style="height: 250px;">
<calcite-tab-nav slot="title-group">
<calcite-tab-title selected>Boats</calcite-tab-title>
Expand All @@ -174,3 +174,6 @@ export const TabChilrenWithPercentageHeights = (): string => html`
</calcite-tab>
</calcite-tabs>
`;
TabChildrenWithPercentageHeights.parameters = {
chromatic: { delay: 1000 }
};

0 comments on commit 7cddcac

Please sign in to comment.