Skip to content

Commit 238b7b6

Browse files
committed
Merge branch 'alpha' into develop
2 parents 600a111 + eaea916 commit 238b7b6

File tree

41 files changed

+747
-28736
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+747
-28736
lines changed

.github/workflows/main.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
needs: []
1313
uses: ./.github/workflows/build.yml # Path to the reusable workflow file
1414
with:
15-
node-version: 20
15+
node-version: 22
1616
build-artifacts-name: 'build-artifacts'
1717
docs-artifacts-name: 'docs-artifacts'
1818

@@ -24,25 +24,28 @@ jobs:
2424
actions: read
2525
checks: write
2626
with:
27-
node-version: 20
27+
node-version: 22
2828
build-artifacts-name: ${{ needs.build.outputs.build-artifacts-name }}
2929

3030
publish-packages: # Job defined in a separate file (publish-packages.yml)
3131
needs: ['build', 'test']
3232
uses: ./.github/workflows/publish-packages.yml # Path to the reusable workflow file
3333
if: ${{ success() && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/alpha' || github.ref == 'refs/heads/beta') }}
3434
with:
35-
node-version: 20
35+
node-version: 22
3636
build-artifacts-name: ${{ needs.build.outputs.build-artifacts-name }}
3737
secrets: inherit
3838
permissions:
39-
contents: write
39+
contents: write # to be able to publish a GitHub release
40+
issues: write # to be able to comment on released issues
41+
pull-requests: write # to be able to comment on released pull requests
42+
id-token: write # to enable use of OIDC for trusted publishing and npm provenance
4043

4144
sync-docs-to-docusaurus: # Job defined in a separate file (sync-docs-to-docusaurus.yml)
4245
needs: ['build', 'publish-packages']
4346
uses: ./.github/workflows/sync-docs-to-docusaurus.yml
4447
if: ${{ success() && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/alpha' || github.ref == 'refs/heads/beta') }}
4548
with:
46-
node-version: 20
49+
node-version: 22
4750
docs-artifacts-name: ${{ needs.build.outputs.docs-artifacts-name }}
4851
secrets: inherit

.github/workflows/publish-packages.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212

1313
jobs:
1414
publish:
15+
name: Publish Packages
1516
runs-on: ubuntu-latest
1617
steps:
1718
# Checkout the repo

.github/workflows/sync-docs-to-docusaurus.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ jobs:
2020
steps:
2121
- name: Checkout monorepo
2222
uses: actions/checkout@v4
23+
with:
24+
fetch-depth: 0 # Fetch all history to ensure tagged commits are available
25+
fetch-tags: true # Ensure tags are fetched as well
2326

2427
- name: Checkout Docusaurus repo
2528
uses: actions/checkout@v4
@@ -46,7 +49,7 @@ jobs:
4649
# Install dependencies for Docusaurus
4750
- name: Install Docusaurus dependencies
4851
working-directory: packages/docusaurus
49-
run: pnpm install --frozen-lockfile
52+
run: pnpm install --frozen-lockfile --lockfile-dir . --ignore-workspace
5053

5154
- name: Clean Docusaurus docs (preserve _category_.json; delete empty dirs)
5255
shell: bash
@@ -73,16 +76,16 @@ jobs:
7376
7477
- name: Update package.json in Docusaurus
7578
working-directory: packages/docusaurus
76-
run: pnpm add @ongov/ontario-design-system-component-library-react@${{ steps.get_tag.outputs.version }}
79+
run: pnpm --ignore-workspace --lockfile-dir . add @ongov/ontario-design-system-component-library-react@${{ steps.get_tag.outputs.version }}
7780

7881
- name: Version Docusaurus docs
7982
working-directory: packages/docusaurus
80-
run: npx docusaurus docs:version ${{ steps.get_tag.outputs.version }}
83+
run: pnpm exec docusaurus docs:version ${{ steps.get_tag.outputs.version }}
8184

8285
- name: Create Pull Request
8386
uses: peter-evans/create-pull-request@v6
8487
with:
85-
token: ${{ secrets.DOCS_REPO_TOKEN }}
88+
token: ${{ secrets.GH_TOKEN }}
8689
path: packages/docusaurus
8790
commit-message: 'docs: update for ${{ steps.get_tag.outputs.version }}'
8891
title: 'docs: update for ${{ steps.get_tag.outputs.version }}'

.npmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
engine-strict=true
2-
node-version=22.9.0
2+
node-version=22.14.0
33
link-workspace-packages=true

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.9.0
1+
22.14.0

CHANGELOG.md

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,86 @@
1+
# 6.0.0-alpha.4 (2025-11-12)
2+
3+
- **@ongov/ontario-design-system-complete-styles:** fix(complete-styles)!: update Gulp tasks to handle pkg Sass imports def4550
4+
- **@ongov/ontario-design-system-component-library:** refactor(accordion)!: remove global isOpen prop, use per-item isOpen for initial state 774ab3f
5+
- **@ongov/ontario-design-system-design-tokens, @ongov/ontario-design-system-global-styles:** fix(global-styles)!: update gulp-sass and enable NodePackageImporter 6877ffd
6+
7+
### Bug Fixes
8+
9+
- **@ongov/ontario-design-system-component-library:** added hover state style to language toggle 5a2c251
10+
- **@ongov/ontario-design-system-component-library:** added hover state style to language toggle 6d45d42
11+
- **@ongov/ontario-design-system-component-library:** added missing styles for ontario-radio button 6b4f8b4
12+
- **@ongov/ontario-design-system-component-library:** adds aria-hidden attribute to multiple decorative icons across components 9aa7bfa
13+
- **@ongov/ontario-design-system-component-library:** fix broken loader export for angular component library e79092e
14+
- **@ongov/ontario-design-system-component-library:** refactors initializeFormContainerSettings function in fieldset component dacd942
15+
- **@ongov/ontario-design-system-component-library:** removes paragraph tags around slots in critical alert and page alert components 1e0c2e9
16+
- **@ongov/ontario-design-system-component-library:** replace zero with a spacing variable edd1671
17+
- **@ongov/ontario-design-system-component-library:** update HeaderLanguageToggleEventDetails type in accordion language toggle add2693
18+
- **@ongov/ontario-design-system-component-library:** updated paths for the language toggle event ac8a773
19+
- added hover state style to language toggle ([#133](undefined/ongov/ontario-design-system/issues/133)) 92f1b5f
20+
- adds html and string options for hint text and hint expander 2136659
21+
- **angular:** roll back typescript version to be compatible for angular compiler 5552f20
22+
- **ci:** fix JUnit publish task, update snapshots, update docker-compose to include build for apps 8a0ad33
23+
- **component-library:** refactor SCSS imports to use pkg namespace 5cbb64f
24+
- **components-documentation:** rollback docusaurus devdeps b/c we're not at react19 860a2b5
25+
- **jest:** move svgTransform to .cjs to support require() in ESM context 049181a
26+
- **nextjs:** update to use label prop for dynamic button text 8952a73
27+
- **ontario-task:** updates ontario-task to set default task status properly, fixes broken unit tests 3945269
28+
- **srr:** improve hydration safety across compnents via default props, validation and error handling a6f18a7
29+
- **srr:** improve hydration safety across compnents via default props, validation and error handling 30394b8
30+
- **srr:** Optimize Components for SSR (Pt 1) ([#52](undefined/ongov/ontario-design-system/issues/52)) 526f7df
31+
- **ssr:** improves SSR optimizations across components 7e4c371
32+
- **SSR:** Optimize Components for SSR (Pt 2) ([#60](undefined/ongov/ontario-design-system/issues/60)) e1083a7
33+
- **tsconfig:** downgrade TypeScript target and lib to ES2017 for compatibility f779a68
34+
- updates docker image, reruns snapshot tests, adds new fonts to nextjs build 4e2863e
35+
36+
### Build System
37+
38+
- **@ongov/ontario-design-system-component-library-react, @ongov/ontario-design-system-component-library:** fix react-component-library build errors 1e05e9a
39+
40+
### Features
41+
42+
- **@ongov/ontario-design-system-component-library-angular, @ongov/ontario-design-system-component-library-react, @ongov/ontario-design-system-component-library, @ongov/ontario-design-system-global-styles:** create ontario-form-container component and update naming d5200b7
43+
- **@ongov/ontario-design-system-component-library-react:** added documentation for Next.js support f3c9553
44+
- **@ongov/ontario-design-system-component-library:** add spacing config, snapshots, and logic for form container integration f9378ee
45+
- **@ongov/ontario-design-system-component-library:** adds new sort icon svgs, generates new sort icon components, fixes icon generator script 61095eb
46+
- **accordion:** add AccordionChangeDetailReasons enum and update README docs e2b3f6c
47+
- **accordion:** emit accordionChange with full context (open indexes, changed index, reason) 347046e
48+
- added consistent naming conventions 0ef72a5
49+
- added documentation for Next.js support ([#59](undefined/ongov/ontario-design-system/issues/59)) 4182dd9
50+
- added link for ontario-card 33a5099
51+
- added more colour types for ontario badge 8939ceb
52+
- added more tests for heading leel, highlight colour, and heading content type 766ca8a
53+
- added more tests for highligh colour and heading type 4edd8f9
54+
- added playwright to the repo e085722
55+
- added test pace for ontario-card 39c3ad7
56+
- added test page for ontario-callout 391c5e0
57+
- added test page for ontario-critical-alert bf05b52
58+
- added testing page for aside df92f59
59+
- added testing page for badge cff01a3
60+
- added testing page for badge a924974
61+
- added testing page for ontario-card-collection 429fa66
62+
- added testing page for ontario-search-box b816757
63+
- adds hint-text test page with hint content type variants f060126
64+
- adds ontario-hint-expander page with hint content type variants 6d46bdf
65+
- adds page alert testing page with type props a6a6b0e
66+
- adds test page for ontario-input component 50a914a
67+
- adds textarea page with multiple variants to nextjs vrt poc cf72996
68+
- creating test page for ontario-aside 7e1be5b
69+
70+
### BREAKING CHANGES
71+
72+
- **@ongov/ontario-design-system-component-library:** Ontario accordion component `isOpen` global prop has been removed. To set the
73+
`isOpen` status of an accordion section, add the `isOpen` prop to the
74+
`accordionData` prop list.
75+
- **@ongov/ontario-design-system-complete-styles:** Style imports from the Complete Styles package now use
76+
the `pkg:` prefix and must be resolved using `NodePackageImporter()`
77+
when compiling Sass in external projects.
78+
- **@ongov/ontario-design-system-design-tokens, @ongov/ontario-design-system-global-styles:** Style imports from the Global Styles package now use
79+
the `pkg:` prefix and must be resolved using `NodePackageImporter()`
80+
when compiling Sass in external projects.
81+
- **@ongov/ontario-design-system-component-library-react, @ongov/ontario-design-system-component-library:** `component` folder in the component-library moved from `dist`
82+
to the root of the package
83+
184
# 6.0.0-alpha.3 (2025-09-08)
285

386
### Bug Fixes

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "6.0.0-alpha.3",
2+
"version": "6.0.0-alpha.4",
33
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
44
"npmClient": "pnpm"
55
}

package.json

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "root",
3-
"version": "6.0.0-alpha.3",
3+
"version": "6.0.0-alpha.4",
44
"private": true,
55
"workspaces": [
66
"packages/*"
@@ -26,10 +26,10 @@
2626
"@commitlint/cli": "^19.5.0",
2727
"@commitlint/config-conventional": "^19.5.0",
2828
"@semantic-release/changelog": "^6.0.3",
29-
"@semantic-release/commit-analyzer": "^13.0.0",
29+
"@semantic-release/commit-analyzer": "^13.0.1",
3030
"@semantic-release/git": "^10.0.1",
31-
"@semantic-release/github": "^11.0.0",
32-
"@semantic-release/npm": "^12.0.1",
31+
"@semantic-release/github": "12.0.2",
32+
"@semantic-release/npm": "^13.1.1",
3333
"@types/js-yaml": "^4.0.9",
3434
"@types/node": "^22.10.10",
3535
"bash-color": "^0.0.4",
@@ -39,8 +39,8 @@
3939
"lerna": "^8.1.9",
4040
"prettier": "^3.3.3",
4141
"pretty-quick": "^4.0.0",
42-
"semantic-release": "^24.1.2",
43-
"semantic-release-lerna": "^2.9.0",
42+
"semantic-release": "^25.0.2",
43+
"semantic-release-lerna": "^2.13.0",
4444
"ts-node": "^10.9.2"
4545
},
4646
"optionalDependencies": {
@@ -55,5 +55,10 @@
5555
"@nrwl/nx-win32-x64-msvc": "15.9.3",
5656
"bl": "^6.0.18"
5757
},
58-
"packageManager": "pnpm@10.2.0"
58+
"packageManager": "pnpm@10.2.0",
59+
"pnpm": {
60+
"patchedDependencies": {
61+
"@semantic-release/github@12.0.2": "patches/@semantic-release__github@12.0.2.patch"
62+
}
63+
}
5964
}

packages/app-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "app-angular",
3-
"version": "6.0.0-alpha.3",
3+
"version": "6.0.0-alpha.4",
44
"type": "module",
55
"scripts": {
66
"ng": "ng",

packages/app-nextjs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "app-nextjs",
3-
"version": "6.0.0-alpha.3",
3+
"version": "6.0.0-alpha.4",
44
"private": true,
55
"scripts": {
66
"prebuild": "pnpm run copy:assets",

0 commit comments

Comments
 (0)