Skip to content

Commit

Permalink
Merge pull request #3214 from mi6/develop
Browse files Browse the repository at this point in the history
Merge develop into main
  • Loading branch information
GCHQ-Developer-299 authored Feb 19, 2025
2 parents a618037 + 1ce4bf8 commit 9e81f31
Show file tree
Hide file tree
Showing 51 changed files with 5,716 additions and 7,044 deletions.
14 changes: 14 additions & 0 deletions .github/workflows/ic-ui-kit-v3-release-merged.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,20 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

# Triggers a workflow in the design system repo
ic-ui-kit-update-design-system:
needs: [ic-ui-kit-publish]
name: "Trigger v3 design system release workflow"
runs-on: ubuntu-latest
steps:
- name: Repository Dispatch
uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 #v3.0.0
with:
token: ${{ secrets.PUBLISH_PAT }}
repository: mi6/ic-design-system
event-type: design-system-release-v3
client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'

ic-ui-kit-develop-to-main:
needs: [ic-ui-kit-publish]
name: "Merge v3 develop into v3 main"
Expand Down
2 changes: 1 addition & 1 deletion DEVELOPMENT_RELEASE_CHECK.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
> release-check > lerna version --no-push --no-git-tag-version Changes: - @ukic/canary-docs: 2.0.0-canary.27 => 2.0.0-canary.28 - @ukic/canary-react: 2.0.0-canary.34 => 2.0.0-canary.35 - @ukic/canary-web-components: 2.0.0-canary.34 => 2.0.0-canary.35 - @ukic/nextjs: 0.2.26 => 0.2.27 (private) - @ukic/react: 2.35.0 => 2.35.1 - @ukic/web-components: 2.35.0 => 2.35.1 ? Are you sure you want to create these versions? (ynH) [56D[56C[2K[G? Are you sure you want to create these versions? (ynH) y >> Yes[1A[6D[57C[1B[2K[1A[2K[G? Are you sure you want to create these versions? Yes[53D[53C
> release-check > lerna version --no-push --no-git-tag-version Changes: - @ukic/canary-docs: 2.0.0-canary.28 => 2.0.0-canary.29 - @ukic/canary-react: 2.0.0-canary.35 => 2.0.0-canary.36 - @ukic/canary-web-components: 2.0.0-canary.35 => 2.0.0-canary.36 - @ukic/docs: 2.15.2 => 2.15.3 - @ukic/fonts: 2.6.5 => 2.6.6 - @ukic/nextjs: 0.2.27 => 0.2.28 (private) - @ukic/react: 2.35.1 => 2.35.2 - @ukic/web-components: 2.35.1 => 2.35.2 ? Are you sure you want to create these versions? (ynH) [56D[56C[2K[G? Are you sure you want to create these versions? (ynH) y >> Yes[1A[6D[57C[1B[2K[1A[2K[G? Are you sure you want to create these versions? Yes[53D[53C
21 changes: 21 additions & 0 deletions audit-ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,27 @@
"notes": "issue in 'cross-spawn' package - unable to upgrade currently",
"expiry": "6 March 2025"
}
},
{
"GHSA-h5c3-5r3r-rr8q": {
"active": true,
"notes": "issue in '@octokit/plugin-paginate-rest' package which relies on a lerna upgrade",
"expiry": "6 March 2025"
}
},
{
"GHSA-xx4v-prfh-6cgc": {
"active": true,
"notes": "issue in '@octokit/request-error' package which relies on a lerna upgrade",
"expiry": "6 March 2025"
}
},
{
"GHSA-67mh-4wv8-2f99": {
"active": true,
"notes": "issue in 'esbuild' package which is a dependency of storybook. Patched version 0.25.0 not used by Storybook yet",
"expiry": "6 March 2025"
}
}
]
}
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,6 @@
"commitizen": {
"path": "./node_modules/cz-conventional-changelog"
}
}
},
"packageManager": "^[email protected]"
}
4 changes: 4 additions & 0 deletions packages/canary-docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [2.0.0-canary.29](https://github.com/mi6/ic-ui-kit/compare/@ukic/[email protected]...@ukic/[email protected]) (2025-02-19)

**Note:** Version bump only for package @ukic/canary-docs

# 2.0.0-canary.28 (2025-02-12)

### Bug Fixes
Expand Down
22 changes: 22 additions & 0 deletions packages/canary-docs/docs.json
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,28 @@
"optional": true,
"required": false
},
{
"name": "disableAutoSort",
"type": "boolean",
"complexType": {
"original": "boolean",
"resolved": "boolean",
"references": {}
},
"mutable": false,
"attr": "disable-auto-sort",
"reflectToAttr": false,
"docs": "If `true`, the built in sort functionality will be disabled. For example, if rows will already be sorted from an external source.",
"docsTags": [],
"default": "false",
"values": [
{
"type": "boolean"
}
],
"optional": true,
"required": false
},
{
"name": "embedded",
"type": "boolean",
Expand Down
5 changes: 3 additions & 2 deletions packages/canary-docs/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"author": "mi6",
"name": "@ukic/canary-docs",
"version": "2.0.0-canary.28",
"version": "2.0.0-canary.29",
"description": "API documentation for @ukic canary components",
"main": "docs.json",
"types": "./docs.d.ts",
Expand All @@ -17,5 +17,6 @@
"url": "https://github.com/mi6/ic-ui-kit/issues",
"email": "[email protected]"
},
"license": "MIT"
"license": "MIT",
"packageManager": "^[email protected]"
}
12 changes: 12 additions & 0 deletions packages/canary-react/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [2.0.0-canary.36](https://github.com/mi6/ic-ui-kit/compare/@ukic/[email protected]...@ukic/[email protected]) (2025-02-19)

### Bug Fixes

- **canary-react:** allow IcPaginationBar items per page to be set programmatically ([1bc01f8](https://github.com/mi6/ic-ui-kit/commit/1bc01f8756e74730dd8e0de283ca15ddf2d98ca5)), closes [#2525](https://github.com/mi6/ic-ui-kit/issues/2525)
- **canary-react:** prevent IcDataTable action element clicks from selecting the table row ([72b8f01](https://github.com/mi6/ic-ui-kit/commit/72b8f0154b8158dc61e0df5e6643f69df24ed0eb))
- **canary-react:** update date input Cypress test to check helper text doesn't exist ([bd095c1](https://github.com/mi6/ic-ui-kit/commit/bd095c143fba7bb0c6d876902e49d5de25925017)), closes [#2370](https://github.com/mi6/ic-ui-kit/issues/2370)

### Features

- **canary-react:** implement disableAutoSort prop on data table ([12b1cdd](https://github.com/mi6/ic-ui-kit/commit/12b1cdd69fb6ff83da3fba7e13acc8b7144e47d1)), closes [#2415](https://github.com/mi6/ic-ui-kit/issues/2415)

# [2.0.0-canary.35](https://github.com/mi6/ic-ui-kit/compare/@ukic/[email protected]...@ukic/[email protected]) (2025-02-12)

### Bug Fixes
Expand Down
Loading

0 comments on commit 9e81f31

Please sign in to comment.