Skip to content

Commit 312b73e

Browse files
committed
Merge branch 'main' into CRAFT-1822-combobox-refactor
2 parents 317c370 + 4ae010d commit 312b73e

File tree

5 files changed

+55
-21
lines changed

5 files changed

+55
-21
lines changed

.github/actions/ci/action.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ runs:
1414
- name: Setup Node
1515
uses: actions/setup-node@v4
1616
with:
17-
node-version: 20
17+
node-version: 22
1818
cache: pnpm
1919

20+
- name: Update npm to latest
21+
run: npm install -g npm@latest
22+
shell: bash
23+
2024
- name: Install dependencies
2125
run: pnpm install
2226
shell: bash

.github/workflows/build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: Checkout repository
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v5
2222

2323
- name: Installing dependencies and building packages
2424
uses: ./.github/actions/ci

.github/workflows/release.yml

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77

88
permissions:
99
id-token: write
10+
contents: read
1011

1112
jobs:
1213
release:
@@ -23,36 +24,47 @@ jobs:
2324
private_key: ${{ secrets.CT_CHANGESETS_APP_PEM }}
2425

2526
- name: Checkout
26-
uses: actions/checkout@v4
27+
uses: actions/checkout@v5
2728
with:
2829
# Pass a personal access token (using our `ct-changesets` app) to be able to trigger other workflows
2930
# https://help.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token
3031
# https://github.community/t/action-does-not-trigger-another-on-push-tag-action/17148/8
3132
token: ${{ steps.generate_github_token.outputs.token }}
3233

34+
# Ensure we are using valid node version for npm trusted publising AFTER checkout
35+
# https://docs.npmjs.com/trusted-publishers#github-actions-configuration
36+
- uses: actions/setup-node@v4
37+
with:
38+
node-version: "24"
39+
registry-url: "https://registry.npmjs.org"
40+
41+
# Ensure npm 11.5.1 or later is installed for OIDC support
42+
- name: Update npm
43+
run: npm install -g npm@latest
44+
45+
- name: Verify npm version
46+
run: npm --version
47+
3348
- name: Installing dependencies and building packages
3449
uses: ./.github/actions/ci
3550

36-
- name: Setting up authorization to NPM registry (.npmrc)
37-
run: |
38-
cat << EOF > "$HOME/.npmrc"
39-
provenance=true
40-
41-
//registry.npmjs.org/:_authToken=$NPM_TOKEN
42-
EOF
43-
env:
44-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
51+
# Configure npm registry for trusted publishing (OIDC)
52+
# This must run AFTER the CI action to override the Node setup with registry config
53+
# https://docs.npmjs.com/trusted-publishers#github-actions-configuration
54+
- name: Setup npm registry for publishing
55+
uses: actions/setup-node@v4
56+
with:
57+
node-version: "22"
58+
registry-url: "https://registry.npmjs.org"
4559

4660
- name: Storing release version for changeset
4761
id: release_version
48-
run:
49-
echo "VALUE=$(./scripts/print_release_version.sh)" >> $GITHUB_OUTPUT
62+
run: echo "VALUE=$(./scripts/print_release_version.sh)" >> $GITHUB_OUTPUT
5063
shell: bash
5164
env:
5265
GITHUB_TOKEN: ${{ steps.generate_github_token.outputs.token }}
5366

54-
- name:
55-
Creating release pull request or publishing release to npm registry
67+
- name: Creating release pull request or publishing release to npm registry
5668
id: changesets
5769
uses: changesets/[email protected]
5870
with:
@@ -67,8 +79,7 @@ jobs:
6779

6880
# Publish canary releases only if the packages weren't published already
6981
- name: Publishing canary releases to npm registry
70-
if:
71-
steps.changesets.outputs.published != 'true' && github.ref ==
82+
if: steps.changesets.outputs.published != 'true' && github.ref ==
7283
'refs/heads/main'
7384
run: |
7485
git checkout main

.npmrc

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,14 @@
22
# PNPM configuration
33
####################
44
# hint: If you don't want pnpm to fail on peer dependency issues, add "strict-peer-dependencies=false" to an .npmrc file at the root of your project.
5-
strict-peer-dependencies=false
5+
strict-peer-dependencies=false
6+
7+
####################
8+
# NPM Publishing
9+
####################
10+
provenance=true
11+
12+
# Registry configuration for npm trusted publishing
13+
# Authentication via OIDC (no auth token needed in CI)
14+
registry=https://registry.npmjs.org/
15+
//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}

package.json

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
{
22
"name": "nimbus",
33
"private": true,
4-
"workspaces": ["packages/*", "apps/*"],
4+
"workspaces": [
5+
"packages/*",
6+
"apps/*"
7+
],
58
"preconstruct": {
6-
"packages": ["packages/tokens"]
9+
"packages": [
10+
"packages/tokens"
11+
]
712
},
813
"scripts": {
914
"build": "pnpm build:tokens && pnpm run build:packages && pnpm run build:docs",
@@ -70,5 +75,9 @@
7075
"typescript-eslint": "catalog:tooling",
7176
"vite-bundle-analyzer": "catalog:tooling",
7277
"vitest": "catalog:tooling"
78+
},
79+
"engines": {
80+
"node": ">=22.10",
81+
"pnpm": ">=10"
7382
}
7483
}

0 commit comments

Comments
 (0)