Skip to content

Commit

Permalink
Merge branch 'main' into 6261--carousel-code-coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexanderMelox authored Nov 5, 2024
2 parents a90c3df + 62f3369 commit 197210b
Show file tree
Hide file tree
Showing 59 changed files with 652 additions and 217 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,26 @@ jobs:
- name: CI build checks
run: yarn ci-check:build

format:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: '20.x'
cache: yarn
- name: Cache dependencies
uses: actions/cache@v2
with:
path: '**/node_modules'
key: lint-modules-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
- name: Install
run: yarn
- name: Check formatting of project files
run: yarn format:diff

lint:
runs-on: ubuntu-latest
steps:
Expand Down
23 changes: 13 additions & 10 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,31 @@

## Version support

| Version | Status | Ongoing support |
| ------- | ------- | --------------- |
| 2.x | Active ||
| 1.x | Active ||
| Version | Status | Ongoing support |
| ------- | ------ | --------------- |
| 2.x | Active ||
| 1.x | Active ||

Version 2.x corresponds with Carbon v11 while 1.x corresponds with Carbon v10.

Support for these versions includes the discrete version numbers of
individual packages as listed in the
Support for these versions includes the discrete version numbers of individual
packages as listed in the
[release changelogs](https://github.com/carbon-design-system/ibm-products/releases).

Please note that the **1.x version is anticipated to reach maintenance phase near the end of 2023**.
Please note that the **1.x version is anticipated to reach maintenance phase
near the end of 2023**.

## Reporting a vulnerability

**Please do not report security vulnerabilities through public GitHub issues.**

Instead, report a vulnerability through GitHub’s [security advisory feature](https://github.com/carbon-design-system/ibm-products/security/advisories/new) via new issues.
Instead, report a vulnerability through GitHub’s
[security advisory feature](https://github.com/carbon-design-system/ibm-products/security/advisories/new)
via new issues.

Please include a description of the issue, the steps you took to create the
issue, affected versions, and, if known, mitigation steps for the issue. Our team
aims to respond to all new vulnerability reports within 7 business days.
issue, affected versions, and, if known, mitigation steps for the issue. Our
team aims to respond to all new vulnerability reports within 7 business days.

Additional information on reporting vulnerabilities to IBM is available at
<https://www.ibm.com/trust/security-psirt>
Expand Down
1 change: 1 addition & 0 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
"Menlo",
"mordech",
"namor",
"nocheck",
"Neue",
"nodataemptystate",
"noninteractive",
Expand Down
7 changes: 2 additions & 5 deletions jest.e2e.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,9 @@ module.exports = {
],
testMatch: [
'<rootDir>/e2e/**/*-test.avt.e2e.js',
'<rootDir>/e2e/**/*-test.vrt.e2e.js'
],
testPathIgnorePatterns: [
'examples',
'/packages/ibm-products/',
'<rootDir>/e2e/**/*-test.vrt.e2e.js',
],
testPathIgnorePatterns: ['examples', '/packages/ibm-products/'],
transformIgnorePatterns: ['[/\\\\]node_modules[/\\\\].+\\.(js|jsx)$'],
reporters: ['default', 'jest-junit'],
};
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@
"coverage": "echo 'you can pass a name argument to specify which tests are ran such as `yarn coverage decorator` and then view the results with `yarn coverage:report`'; yarn test:c4p --coverage",
"coverage:report": "open ./packages/ibm-products/coverage/index.html",
"format": "run-p -s 'format:*'",
"format:packages": "prettier ./packages/**/*.{js,jsx,tsx,md,scss} --write --ignore-unknown",
"format:config": "prettier ./*.{js,jsx,tsx,ts,md,scss} --write --ignore-unknown",
"format:packages": "prettier ./packages/**/*.{js,jsx,tsx,ts,md,scss} --write --ignore-unknown",
"format:e2e": "prettier ./e2e/**/*.js --write --ignore-unknown",
"format:diff": "prettier --list-different '**/*.{js,jsx,md,scss,ts,tsx}' '*.{js,jsx,md,scss,ts,tsx}' '!**/{build,es,lib,storybook,ts,umd}/**' '!examples/**/*' '!scripts/**/*'",
"generate": "lerna run generate --loglevel success --scope \"@carbon/ibm-products\" --",
"lint": "run-p -s 'lint:*'",
"lint:license": "scripts/check-license.cjs -a",
Expand Down Expand Up @@ -78,6 +80,7 @@
"@testing-library/react": "^14.0.0",
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/user-event": "^14.4.3",
"@types/carbon__layout": "^0.0.3",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"accessibility-checker": "^3.1.65",
Expand Down
Loading

0 comments on commit 197210b

Please sign in to comment.