Skip to content

Commit

Permalink
Merge pull request #2772 from mi6/develop
Browse files Browse the repository at this point in the history
Develop -> Main
  • Loading branch information
GCHQ-Developer-299 authored Nov 13, 2024
2 parents 8955173 + 53df1ac commit 0f7c009
Show file tree
Hide file tree
Showing 73 changed files with 3,811 additions and 1,697 deletions.
3 changes: 2 additions & 1 deletion .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,8 @@
"packages/**/src/components/**/test/basic/__snapshots__/*.spec.*.snap",
"packages/react/cypress-image-diff-html-report/**",
"packages/canary-react/cypress-image-diff-html-report/**",
"vscode-data.json"
"vscode-data.json",
"packages/web-components/src/global/ag-theme-icds.css"
],
"import": ["@cspell/dict-la/cspell-ext.json", "@cspell/dict-lorem-ipsum/cspell-ext.json", "@cspell/dict-html-symbol-entities/cspell-ext.json", "@cspell/dict-scientific-terms-gb/cspell-ext.json"]
}
32 changes: 32 additions & 0 deletions .github/workflows/cherry-pick.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Cherry pick into v3.0.0/develop
permissions: read-all

on:
pull_request:
branches:
- develop
types: ["closed"]

jobs:
cherry_pick_release_v3_0:
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
name: Cherry pick into v3.0.0/develop
if: ${{ github.event.pull_request.merged == true }}
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
with:
fetch-depth: 0
- name: Cherry pick into v3.0.0/develop
uses: carloscastrojumo/github-cherry-pick-action@c980652a80bb76d11b6cdc38efb0a5cee28ff4e6 #v1.0.10
with:
branch: v3.0.0/develop
labels: |
cherry-pick
title: '[v3 cherry-pick] {old_title}'
body: 'Cherry picking #{old_pull_request_id} onto this branch'
env:
GITHUB_TOKEN: ${{ secrets.CHERRY_PAT }}
20 changes: 10 additions & 10 deletions audit-ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,70 +4,70 @@
"GHSA-pfrx-2q88-qq97": {
"active": true,
"notes": "requires upgrade to [email protected], which is a breaking change",
"expiry": "9 November 2024"
"expiry": "9 December 2024"
}
},
{
"GHSA-c2qf-rxjj-qqgw": {
"active": true,
"notes": "requires lerna v7, which is a breaking change",
"expiry": "9 November 2024"
"expiry": "9 December 2024"
}
},
{
"GHSA-7fh5-64p2-3v2j": {
"active": true,
"notes": "requires upgrade to postcss v8.4.31, which doesn't align with the version used by @storybook/addon-postcss",
"expiry": "9 November 2024"
"expiry": "9 December 2024"
}
},
{
"GHSA-f5x3-32g6-xq36": {
"active": true,
"notes": "issue in 'tar' package used by '@lerna/legacy-package-management' v6.6.2 - no current fix",
"expiry": "9 November 2024"
"expiry": "9 December 2024"
}
},
{
"GHSA-2p57-rm9w-gvfp": {
"active": true,
"notes": "issue in 'ip' package <= 2.0.1 - no current fix",
"expiry": "9 November 2024"
"expiry": "9 December 2024"
}
},
{
"GHSA-grv7-fg5c-xmjg": {
"active": true,
"notes": "braces package has a vulnerability which is fixed in v3.0.3, but cannot currrently upgrade",
"expiry": "9 November 2024"
"expiry": "9 December 2024"
}
},
{
"GHSA-3h5v-q93c-6h6q": {
"active": true,
"notes": "ws package has a vulnerability but requires multiple package upgrades to fix",
"expiry": "9 November 2024"
"expiry": "9 December 2024"
}
},
{
"GHSA-952p-6rrq-rcjv": {
"active": true,
"notes": "issue in 'micromatch' package, we're currently on the highest version available so no fix",
"expiry": "9 November 2024"
"expiry": "9 December 2024"
}
},
{
"GHSA-m6fv-jmcg-4jfg": {
"active": true,
"notes": "issue in 'send' package within 'serve-static' package being v0.18.0, fix requires 0.19.0",
"expiry": "9 November 2024"
"expiry": "9 December 2024"
}
},
{
"GHSA-p6mc-m468-83gw": {
"active": true,
"notes": "issue in 'lodash.set' package use by '@cypress-audit/lighthouse>lighthouse' - no current fix",
"expiry": "9 November 2024"
"expiry": "9 December 2024"
}
}
]
Expand Down
32 changes: 27 additions & 5 deletions packages/canary-docs/docs.json
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,28 @@
"optional": false,
"required": true
},
{
"name": "columnHeaderTruncation",
"type": "boolean",
"complexType": {
"original": "boolean",
"resolved": "boolean",
"references": {}
},
"mutable": false,
"attr": "column-header-truncation",
"reflectToAttr": false,
"docs": "Determines whether the column header should be truncated and display a tooltip. Default is `false`.",
"docsTags": [],
"default": "false",
"values": [
{
"type": "boolean"
}
],
"optional": false,
"required": false
},
{
"name": "columns",
"type": "IcDataTableColumnObject[]",
Expand Down Expand Up @@ -1160,8 +1182,8 @@
"ic-loading-indicator",
"ic-typography",
"ic-link",
"ic-button",
"ic-tooltip",
"ic-button",
"ic-empty-state",
"ic-pagination-bar"
],
Expand All @@ -1170,21 +1192,21 @@
"ic-loading-indicator",
"ic-typography",
"ic-link",
"ic-button",
"ic-tooltip",
"ic-button",
"ic-empty-state",
"ic-pagination-bar"
],
"ic-loading-indicator": [
"ic-typography"
],
"ic-tooltip": [
"ic-typography"
],
"ic-button": [
"ic-loading-indicator",
"ic-tooltip"
],
"ic-tooltip": [
"ic-typography"
],
"ic-empty-state": [
"ic-typography"
],
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 0f7c009

Please sign in to comment.