Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/humble-games-cut.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@macpaw/macpaw-ui": patch
---

Next js update to 15.5.7 to fix CVE-2025-66478 (Next.js)
7 changes: 0 additions & 7 deletions .changeset/yummy-moose-draw.md

This file was deleted.

10 changes: 6 additions & 4 deletions .github/actions/publish/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ inputs:
required: false
default: ''
auth-token:
description: 'The auth token to use'
required: true
description: 'The auth token to use (for private dependencies only, not required for OIDC publishing)'
required: false
use-public-flag:
description: 'Whether to use the public flag'
required: false
Expand All @@ -51,6 +51,10 @@ runs:
shell: bash
run: tar xf artifact.tar.gz

- name: Update npm for trusted publishing support
shell: bash
run: npm install -g npm@latest

- name: Publish
shell: bash
run: |
Expand All @@ -59,5 +63,3 @@ runs:
else
npm publish
fi
env:
NODE_AUTH_TOKEN: ${{ inputs.auth-token }}
27 changes: 15 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

- name: Checkout
uses: actions/checkout@v3

- name: Configure git user
uses: ./.github/actions/github-config
with:
Expand All @@ -30,11 +30,11 @@ jobs:
id: release
with:
node-version: 20
release-pr-title: 'chore(release): :package: version update for packages'
release-commit-message: 'chore(release): version update for packages'
release-pr-title: "chore(release): :package: version update for packages"
release-commit-message: "chore(release): version update for packages"
github-token: ${{ secrets.GITHUB_TOKEN }}
release-command: 'changes:release'
release-command: "changes:release"

- name: Generate outputs
id: releaseOutputs
if: steps.release.outputs.release-ready == 'true'
Expand All @@ -57,13 +57,16 @@ jobs:
uses: ./.github/actions/prepare-packages
with:
node-version: 20
build-command: 'lib'
build-command: "lib"

publish-npm:
name: Publish to NPM Registry
needs: prepare
runs-on: ubuntu-latest
continue-on-error: false
permissions:
id-token: write
contents: read
steps:
- name: Cancel previous jobs
uses: styfle/cancel-workflow-action@0.11.0
Expand All @@ -75,9 +78,9 @@ jobs:
uses: ./.github/actions/publish
with:
node-version: 20
registry-url: 'https://registry.npmjs.org/'
artifact-name: 'package-artifact'
scope: '@macpaw'
registry-url: "https://registry.npmjs.org/"
artifact-name: "package-artifact"
scope: "@macpaw"
auth-token: ${{ secrets.NPM_TOKEN }}

publish-github:
Expand All @@ -88,7 +91,7 @@ jobs:
steps:
- name: Cancel previous jobs
uses: styfle/cancel-workflow-action@0.11.0

- name: Checkout
uses: actions/checkout@v3

Expand All @@ -97,6 +100,6 @@ jobs:
with:
node-version: 20
registry-url: https://npm.pkg.github.com/
artifact-name: 'package-artifact'
scope: '@macpaw'
artifact-name: "package-artifact"
scope: "@macpaw"
auth-token: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
engine-strict=true
provenance=false
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# @macpaw/macpaw-ui

## 5.0.1

### Patch Changes

- - Fix build issue

## 5.0.0

### Major Changes

- 1de0d8e: - Migration to React 19
- updated major dependencies to latest version
- fixed all known vulnerabilities

## 4.18.0

### Minor Changes
Expand Down
31 changes: 20 additions & 11 deletions internal/MobileNavigation/MobileNavigation.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
import { Dropdown, DropdownItem, Button, MacPawLogo } from '../../src/ui';
import styles from './mobileNavigation.module.css';
import Link from 'next/link';
import { pages } from '../config/pages';
import ActiveLink from '../ActiveLink/ActiveLink';
import { Dropdown, DropdownItem, Button, MacPawLogo } from "../../src/ui";
import styles from "./mobileNavigation.module.css";
import Link from "next/link";
import { pages } from "../config/pages";
import ActiveLink from "../ActiveLink/ActiveLink";

const MobileNavigation = () => {
return (
<div className={styles.container}>
<div className={styles.logo}>
<Link href="/">

<MacPawLogo />

</Link>
</div>
<Dropdown
Expand All @@ -23,12 +21,23 @@ const MobileNavigation = () => {
position="right"
className={styles.dropdown}
>
<DropdownItem component={ActiveLink} href="/docs" className={styles.navigationLink} activeClassName={styles.activeLink}>
<DropdownItem
component={ActiveLink}
href="/docs"
className={styles.navigationLink}
activeClassName={styles.activeLink}
>
Installation
</DropdownItem>
{pages.map((link) => (
<DropdownItem key={link} component={ActiveLink} href={`/docs/${link}`} className={styles.navigationLink} activeClassName={styles.activeLink}>
{link.replace('-', ' ')}
{[...pages].sort().map((link) => (
<DropdownItem
key={link}
component={ActiveLink}
href={`/docs/${link}`}
className={styles.navigationLink}
activeClassName={styles.activeLink}
>
{link.replaceAll("-", " ")}
</DropdownItem>
))}
</Dropdown>
Expand Down
16 changes: 8 additions & 8 deletions internal/Navigation/Navigation.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import Link from 'next/link';
import styles from './Navigation.module.css';
import { pages } from '../config/pages';
import ActiveLink from '../ActiveLink/ActiveLink';
import React from "react";
import Link from "next/link";
import styles from "./Navigation.module.css";
import { pages } from "../config/pages";
import ActiveLink from "../ActiveLink/ActiveLink";

const Navigation = () => {
return (
Expand All @@ -12,20 +12,20 @@ const Navigation = () => {
</Link>
<div className={styles.navigationLinks}>
<ActiveLink
href={'/docs'}
href={"/docs"}
className={styles.navigationLink}
activeClassName={styles.activeLink}
>
Installation
</ActiveLink>
{pages.sort().map((link) => (
{[...pages].sort().map((link) => (
<ActiveLink
href={`/docs/${link}`}
className={styles.navigationLink}
activeClassName={styles.activeLink}
key={link}
>
{link.replace('-', ' ')}
{link.replaceAll("-", " ")}
</ActiveLink>
))}
</div>
Expand Down
Loading
Loading