Skip to content

Commit b3876cf

Browse files
authored
Merge pull request #198 from MacPaw/master
Release
2 parents 1526629 + e754cf2 commit b3876cf

File tree

10 files changed

+169
-138
lines changed

10 files changed

+169
-138
lines changed

.changeset/humble-games-cut.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@macpaw/macpaw-ui": patch
3+
---
4+
5+
Next js update to 15.5.7 to fix CVE-2025-66478 (Next.js)

.changeset/yummy-moose-draw.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

.github/actions/publish/action.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ inputs:
2323
required: false
2424
default: ''
2525
auth-token:
26-
description: 'The auth token to use'
27-
required: true
26+
description: 'The auth token to use (for private dependencies only, not required for OIDC publishing)'
27+
required: false
2828
use-public-flag:
2929
description: 'Whether to use the public flag'
3030
required: false
@@ -51,6 +51,10 @@ runs:
5151
shell: bash
5252
run: tar xf artifact.tar.gz
5353

54+
- name: Update npm for trusted publishing support
55+
shell: bash
56+
run: npm install -g npm@latest
57+
5458
- name: Publish
5559
shell: bash
5660
run: |
@@ -59,5 +63,3 @@ runs:
5963
else
6064
npm publish
6165
fi
62-
env:
63-
NODE_AUTH_TOKEN: ${{ inputs.auth-token }}

.github/workflows/release.yml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
- name: Checkout
2020
uses: actions/checkout@v3
21-
21+
2222
- name: Configure git user
2323
uses: ./.github/actions/github-config
2424
with:
@@ -30,11 +30,11 @@ jobs:
3030
id: release
3131
with:
3232
node-version: 20
33-
release-pr-title: 'chore(release): :package: version update for packages'
34-
release-commit-message: 'chore(release): version update for packages'
33+
release-pr-title: "chore(release): :package: version update for packages"
34+
release-commit-message: "chore(release): version update for packages"
3535
github-token: ${{ secrets.GITHUB_TOKEN }}
36-
release-command: 'changes:release'
37-
36+
release-command: "changes:release"
37+
3838
- name: Generate outputs
3939
id: releaseOutputs
4040
if: steps.release.outputs.release-ready == 'true'
@@ -57,13 +57,16 @@ jobs:
5757
uses: ./.github/actions/prepare-packages
5858
with:
5959
node-version: 20
60-
build-command: 'lib'
60+
build-command: "lib"
6161

6262
publish-npm:
6363
name: Publish to NPM Registry
6464
needs: prepare
6565
runs-on: ubuntu-latest
6666
continue-on-error: false
67+
permissions:
68+
id-token: write
69+
contents: read
6770
steps:
6871
- name: Cancel previous jobs
6972
uses: styfle/cancel-workflow-action@0.11.0
@@ -75,9 +78,9 @@ jobs:
7578
uses: ./.github/actions/publish
7679
with:
7780
node-version: 20
78-
registry-url: 'https://registry.npmjs.org/'
79-
artifact-name: 'package-artifact'
80-
scope: '@macpaw'
81+
registry-url: "https://registry.npmjs.org/"
82+
artifact-name: "package-artifact"
83+
scope: "@macpaw"
8184
auth-token: ${{ secrets.NPM_TOKEN }}
8285

8386
publish-github:
@@ -88,7 +91,7 @@ jobs:
8891
steps:
8992
- name: Cancel previous jobs
9093
uses: styfle/cancel-workflow-action@0.11.0
91-
94+
9295
- name: Checkout
9396
uses: actions/checkout@v3
9497

@@ -97,6 +100,6 @@ jobs:
97100
with:
98101
node-version: 20
99102
registry-url: https://npm.pkg.github.com/
100-
artifact-name: 'package-artifact'
101-
scope: '@macpaw'
103+
artifact-name: "package-artifact"
104+
scope: "@macpaw"
102105
auth-token: ${{ secrets.GITHUB_TOKEN }}

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
engine-strict=true
2+
provenance=false

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# @macpaw/macpaw-ui
22

3+
## 5.0.1
4+
5+
### Patch Changes
6+
7+
- - Fix build issue
8+
9+
## 5.0.0
10+
11+
### Major Changes
12+
13+
- 1de0d8e: - Migration to React 19
14+
- updated major dependencies to latest version
15+
- fixed all known vulnerabilities
16+
317
## 4.18.0
418

519
### Minor Changes

internal/MobileNavigation/MobileNavigation.js

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
import { Dropdown, DropdownItem, Button, MacPawLogo } from '../../src/ui';
2-
import styles from './mobileNavigation.module.css';
3-
import Link from 'next/link';
4-
import { pages } from '../config/pages';
5-
import ActiveLink from '../ActiveLink/ActiveLink';
1+
import { Dropdown, DropdownItem, Button, MacPawLogo } from "../../src/ui";
2+
import styles from "./mobileNavigation.module.css";
3+
import Link from "next/link";
4+
import { pages } from "../config/pages";
5+
import ActiveLink from "../ActiveLink/ActiveLink";
66

77
const MobileNavigation = () => {
88
return (
99
<div className={styles.container}>
1010
<div className={styles.logo}>
1111
<Link href="/">
12-
1312
<MacPawLogo />
14-
1513
</Link>
1614
</div>
1715
<Dropdown
@@ -23,12 +21,23 @@ const MobileNavigation = () => {
2321
position="right"
2422
className={styles.dropdown}
2523
>
26-
<DropdownItem component={ActiveLink} href="/docs" className={styles.navigationLink} activeClassName={styles.activeLink}>
24+
<DropdownItem
25+
component={ActiveLink}
26+
href="/docs"
27+
className={styles.navigationLink}
28+
activeClassName={styles.activeLink}
29+
>
2730
Installation
2831
</DropdownItem>
29-
{pages.map((link) => (
30-
<DropdownItem key={link} component={ActiveLink} href={`/docs/${link}`} className={styles.navigationLink} activeClassName={styles.activeLink}>
31-
{link.replace('-', ' ')}
32+
{[...pages].sort().map((link) => (
33+
<DropdownItem
34+
key={link}
35+
component={ActiveLink}
36+
href={`/docs/${link}`}
37+
className={styles.navigationLink}
38+
activeClassName={styles.activeLink}
39+
>
40+
{link.replaceAll("-", " ")}
3241
</DropdownItem>
3342
))}
3443
</Dropdown>

internal/Navigation/Navigation.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import React from 'react';
2-
import Link from 'next/link';
3-
import styles from './Navigation.module.css';
4-
import { pages } from '../config/pages';
5-
import ActiveLink from '../ActiveLink/ActiveLink';
1+
import React from "react";
2+
import Link from "next/link";
3+
import styles from "./Navigation.module.css";
4+
import { pages } from "../config/pages";
5+
import ActiveLink from "../ActiveLink/ActiveLink";
66

77
const Navigation = () => {
88
return (
@@ -12,20 +12,20 @@ const Navigation = () => {
1212
</Link>
1313
<div className={styles.navigationLinks}>
1414
<ActiveLink
15-
href={'/docs'}
15+
href={"/docs"}
1616
className={styles.navigationLink}
1717
activeClassName={styles.activeLink}
1818
>
1919
Installation
2020
</ActiveLink>
21-
{pages.sort().map((link) => (
21+
{[...pages].sort().map((link) => (
2222
<ActiveLink
2323
href={`/docs/${link}`}
2424
className={styles.navigationLink}
2525
activeClassName={styles.activeLink}
2626
key={link}
2727
>
28-
{link.replace('-', ' ')}
28+
{link.replaceAll("-", " ")}
2929
</ActiveLink>
3030
))}
3131
</div>

0 commit comments

Comments
 (0)