Skip to content

Commit

Permalink
Merge branch 'main' into 5308--sidepanel-ai-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlexanderMelox
AlexanderMelox authored Nov 20, 2024
2 parents c44ee1a + d357f0e commit e7a476a
Show file tree
Hide file tree
Showing 14 changed files with 455 additions and 312 deletions.
25 changes: 25 additions & 0 deletions .commitlintrc.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
module.exports = {
extends: ['@commitlint/config-conventional'],
rules: {
'header-max-length': [2, 'always', 72],
'body-max-line-length': [2, 'always', 80],
'scope-case': [0, 'always', 'lower-case'],
'type-enum': [
2,
'always',
[
'build',
'ci',
'chore',
'docs',
'feat',
'fix',
'perf',
'refactor',
'revert',
'style',
'test',
],
],
},
};
60 changes: 60 additions & 0 deletions .eslintrc.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
module.exports = {
parser: '@babel/eslint-parser',
parserOptions: {
babelOptions: {
presets: ['@babel/preset-react'],
},
},
plugins: ['ssr-friendly'],
ignorePatterns: ['packages/ibm-products-web-components/**/*'],
extends: ['carbon', 'plugin:ssr-friendly/recommended'],
rules: {
'react/display-name': [0],
'react/forbid-component-props': [
2,
{
forbid: [
{
propName: 'style',
disallowedFor: ['Datagrid', 'Carousel', 'Checklist', 'Coachmark'],
message: 'Avoid using style prop',
},
],
},
],
'react/forbid-dom-props': [
2,
{
forbid: [
{
propName: 'style',
disallowedFor: ['Datagrid', 'Carousel', 'Checklist', 'Coachmark'],
message: 'Avoid using style prop',
},
],
},
],
},
overrides: [
{
files: ['*.ts', '*.tsx'],
plugins: ['@typescript-eslint'],
extends: ['plugin:@typescript-eslint/recommended'],
parser: '@typescript-eslint/parser',
rules: {
'no-unused-vars': 'off',
'@typescript-eslint/no-unused-vars': [
'error',
{
args: 'after-used',
argsIgnorePattern: '^_',
varsIgnorePattern: '^_',
},
],
'@typescript-eslint/no-empty-function': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/ban-ts-comment': 'off',
},
},
],
};
10 changes: 7 additions & 3 deletions .stylelintrc.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
module.exports = {
root: true,
extends: ['stylelint-config-ibm-products'],
extends: ['stylelint-config-carbon'],
rules: {
'import-notation': 'string',
'max-nesting-depth': null,
'scss/no-global-function-names': null,
'csstools/use-logical': null,
'scss/load-no-partial-leading-underscore': null,
'scss/double-slash-comment-inline': null,
'no-duplicate-selectors': null,
},
};
2 changes: 1 addition & 1 deletion e2e/components/EmptyState/EmptyStateV2-test.avt.e2e.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ test.describe('EmptyStateV2 @avt', () => {
test('@avt-default-state', async ({ page }) => {
await visitStory(page, {
component: 'EmptyStateV2',
id: 'experimental-patterns-empty-state-emptystatev2--default',
id: 'deprecated-empty-state-emptystatev2--default',
globals: {
carbonTheme: 'white',
},
Expand Down
144 changes: 3 additions & 141 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,139 +117,14 @@
"//resolutions:http-signature": "package 'request' deprecated but still used, asks for http-signature ~1.2.0 which indirectly has vulnerabilities",
"//resolutions:minimist": "https://security.snyk.io/vuln/SNYK-JS-MINIMIST-2429795 (version <=1.2.5)",
"resolutions": {
"cheerio": "1.0.0-rc.10",
"body-parser": "1.20.3",
"braces": "^3.0.3",
"cheerio": "1.0.0-rc.10",
"cross-spawn": "7.0.6",
"micromatch": "4.0.8",
"ws": "^8.17.1",
"@carbon/ibm-products-styles": "^2.49.0"
},
"eslintConfig": {
"parser": "@babel/eslint-parser",
"parserOptions": {
"babelOptions": {
"presets": [
"@babel/preset-react"
]
}
},
"plugins": [
"ssr-friendly"
],
"ignorePatterns": [
"packages/ibm-products-web-components/**/*"
],
"extends": [
"carbon",
"plugin:ssr-friendly/recommended"
],
"rules": {
"react/display-name": [
0
],
"react/forbid-component-props": [
2,
{
"forbid": [
{
"propName": "style",
"disallowedFor": [
"Datagrid",
"Carousel",
"Checklist",
"Coachmark"
],
"message": "Avoid using style prop"
}
]
}
],
"react/forbid-dom-props": [
2,
{
"forbid": [
{
"propName": "style",
"disallowedFor": [
"Datagrid",
"Carousel",
"Checklist",
"Coachmark"
],
"message": "Avoid using style prop"
}
]
}
]
},
"overrides": [
{
"files": [
"*.ts",
"*.tsx"
],
"plugins": [
"@typescript-eslint"
],
"extends": [
"plugin:@typescript-eslint/recommended"
],
"parser": "@typescript-eslint/parser",
"rules": {
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": [
"error",
{
"args": "after-used",
"argsIgnorePattern": "^_",
"varsIgnorePattern": "^_"
}
],
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/ban-ts-comment": "off"
}
}
]
},
"commitlint": {
"extends": [
"@commitlint/config-conventional"
],
"rules": {
"header-max-length": [
2,
"always",
72
],
"body-max-line-length": [
2,
"always",
80
],
"scope-case": [
0,
"always",
"lower-case"
],
"type-enum": [
2,
"always",
[
"build",
"ci",
"chore",
"docs",
"feat",
"fix",
"perf",
"refactor",
"revert",
"style",
"test"
]
]
}
},
"lint-staged": {
"!(examples/**/*)**/*.{js,jsx,ts,tsx}": [
"npx prettier --cache --write",
Expand All @@ -270,18 +145,5 @@
"dependencies": {
"stylelint-plugin-carbon-tokens": "2.8.0"
},
"stylelint": {
"extends": [
"stylelint-config-carbon"
],
"rules": {
"max-nesting-depth": null,
"scss/no-global-function-names": null,
"csstools/use-logical": null,
"scss/load-no-partial-leading-underscore": null,
"scss/double-slash-comment-inline": null,
"no-duplicate-selectors": null
}
},
"packageManager": "[email protected]"
}
8 changes: 4 additions & 4 deletions packages/ibm-products-web-components/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
"@carbon/motion": "^11.24.0",
"@mordech/vite-lit-loader": "^0.35.0",
"@rollup/plugin-alias": "^5.1.1",
"@rollup/plugin-commonjs": "^28.0.0",
"@rollup/plugin-commonjs": "^28.0.1",
"@rollup/plugin-node-resolve": "^15.3.0",
"@rollup/plugin-typescript": "^12.1.0",
"@rollup/plugin-typescript": "^12.1.1",
"@storybook/addon-essentials": "^8.3.6",
"@storybook/addon-links": "^8.3.6",
"@storybook/addon-storysource": "^8.3.6",
Expand All @@ -78,11 +78,11 @@
"eslint": "^9.11.1",
"eslint-config-carbon": "3.17.1",
"globby": "^14.0.2",
"happy-dom": "^15.7.4",
"happy-dom": "^15.11.6",
"postcss": "^8.4.47",
"remark-gfm": "^4.0.0",
"rimraf": "^5.0.5",
"rollup": "^3.29.5",
"rollup": "^4.27.3",
"rollup-plugin-copy": "^3.5.0",
"sass": "^1.80.6",
"storybook": "^8.2.8",
Expand Down
6 changes: 6 additions & 0 deletions packages/ibm-products-web-components/src/components/tearsheet/tearsheet.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,12 @@ $motion-duration: $duration-moderate-02;
.#{$block-class}__influencer[wide] {
@extend .#{$block-class}__influencer--wide;
}
::slotted(#{$carbon-prefix}-slug) {
display: flex;
inset-inline-end: 0;
margin-block: 6px;
margin-inline-end: 1rem;
}
}

:host(#{$prefix}-tearsheet[open]) {
Expand Down
Loading

0 comments on commit e7a476a

Please sign in to comment.