Skip to content

Commit 6bd0a34

Browse files
Merge pull request #274 from InformaticsMatters/dev
chore: merge dev to main
2 parents 147005e + 14f3a10 commit 6bd0a34

File tree

7 files changed

+610
-266
lines changed

7 files changed

+610
-266
lines changed
Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ on:
77
- dev
88

99
permissions:
10-
contents: read
10+
contents: write
11+
issues: write
12+
pull-requests: write
1113
id-token: write
1214

1315
concurrency:
@@ -35,18 +37,25 @@ jobs:
3537
with:
3638
node-version: 22.21.1
3739
cache: pnpm
40+
registry-url: "https://registry.npmjs.org"
41+
42+
- name: Upgrade npm to latest
43+
run: npm install -g npm@latest
3844

3945
- name: Install dependencies
4046
run: pnpm install --frozen-lockfile
4147

48+
- name: Build package
49+
run: pnpm build
50+
4251
- uses: actions/create-github-app-token@v2
4352
id: app-token
4453
with:
4554
app-id: ${{ secrets.APP_ID }}
4655
private-key: ${{ secrets.APP_PRIVATE_KEY }}
4756

4857
- name: Semantic Release
49-
uses: cycjimmy/semantic-release-action@v4
58+
uses: cycjimmy/semantic-release-action@v6
5059
id: semantic
5160
env:
5261
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
# [6.0.0-dev.1](https://github.com/InformaticsMatters/squonk-react-mui-theme/compare/5.0.0...6.0.0-dev.1) (2025-12-30)
2+
3+
4+
* perf!: enable native colour in theme ([d93d059](https://github.com/InformaticsMatters/squonk-react-mui-theme/commit/d93d05988cc9751c7cbf0ff04bd7b4b4d78ba962))
5+
6+
7+
### Bug Fixes
8+
9+
* add @emotion/react and @emotion/styled as peer dependencies in package.json to fix transpilation issue ([442856e](https://github.com/InformaticsMatters/squonk-react-mui-theme/commit/442856e290f3e23eb8a0b9e1a52c4f7840427181))
10+
11+
12+
### BREAKING CHANGES
13+
14+
* @mui/material >= 7.3 is now required
15+
116
# [5.0.0](https://github.com/InformaticsMatters/squonk-react-mui-theme/compare/4.0.0...5.0.0) (2025-03-30)
217

318

README.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Material-UI theme for Squonk applications. Can be used independently with just M
1111

1212
### Material UI
1313

14-
The colour scheme provides both a light and a dark theme. Mui v6 will automatically switch between schemes via media queries, taking into account the users system preference.
14+
The colour scheme provides both a light and a dark theme. Mui v7 will automatically switch between schemes via media queries, taking into account the users system preference.
1515

1616
```tsx
1717
import { CssBaseline } from '@material-ui/core';
@@ -41,14 +41,6 @@ import { ThemeProvider } from '@emotion/react';
4141
<ThemeProvider theme={theme}>{...}</ThemeProvider>
4242
```
4343

44-
### Styled Components
45-
46-
```tsx
47-
import { ThemeProvider } from 'styled-components';
48-
49-
<ThemeProvider theme={theme}>{...}</ThemeProvider>
50-
```
51-
5244
# Release Strategy
5345

5446
- Conventional commit messages are used to trigger new builds

package.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "@squonk/mui-theme",
3-
"version": "5.0.0",
3+
"version": "6.0.0-dev.1",
44
"type": "module",
55
"description": "MUI theme used on Squonk products",
66
"sideEffects": false,
7-
"repositoryUrl": "https://github.com/InformaticsMatters/squonk-react-mui-theme.git",
7+
"repository": "https://github.com/InformaticsMatters/squonk-react-mui-theme",
88
"license": "Apache-2.0",
99
"private": false,
10-
"homepage": "https://github.com/InformaticsMatters/squonk-react-mui-theme/",
10+
"homepage": "https://github.com/InformaticsMatters/squonk-react-mui-theme",
1111
"main": "./dist/index.cjs",
1212
"module": "./dist/index.js",
1313
"types": "./dist/index.d.cts",
@@ -22,7 +22,8 @@
2222
"import": "./dist/index.js"
2323
},
2424
"./package.json": "./package.json"
25-
}
25+
},
26+
"provenance": true
2627
},
2728
"scripts": {
2829
"prepare": "husky install",
@@ -33,20 +34,20 @@
3334
"format": "eslint --fix --cache --max-warnings=0"
3435
},
3536
"peerDependencies": {
36-
"@mui/material": ">5"
37+
"@mui/material": ">=7.3",
38+
"@emotion/react": ">=11",
39+
"@emotion/styled": ">=11"
3740
},
3841
"devDependencies": {
39-
"@mui/material": "7.0.1",
42+
"@mui/material": "7.3.6",
4043
"@semantic-release/changelog": "6.0.3",
4144
"@semantic-release/exec": "7.1.0",
4245
"@semantic-release/git": "10.0.1",
43-
"@semantic-release/github": "11.0.1",
44-
"@semantic-release/npm": "12.0.1",
4546
"@squonk/eslint-config": "3.0.0",
4647
"eslint": "9.25.1",
4748
"husky": "8.0.1",
4849
"lint-staged": "15.5.0",
49-
"semantic-release": "24.2.3",
50+
"semantic-release": "25.0.2",
5051
"tsdown": "0.18.3",
5152
"tslib": "2.8.1",
5253
"typescript": "5.8.2"

0 commit comments

Comments
 (0)