Skip to content

Commit 5e3f3e7

Browse files
Merge branch 'main' into main
2 parents 8d262f9 + ad0c4b2 commit 5e3f3e7

83 files changed

Lines changed: 1023 additions & 399 deletions

File tree

Some content is hidden

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

.changeset/strong-bikes-cheer.md

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

.github/actions/setup-deps/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ name: 'Setup Dependencies'
22
runs:
33
using: 'composite'
44
steps:
5-
- run: npm install -g corepack@0.31.0
5+
- run: npm install -g corepack@0.34.5
66
shell: bash
77

88
- run: corepack enable
99
shell: bash
1010

1111
- name: Setup Node.js LTS
12-
uses: actions/setup-node@v3
12+
uses: actions/setup-node@v6
1313
with:
1414
node-version: lts/*
1515
registry-url: 'https://registry.npmjs.org'

.github/workflows/publish.yml

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ name: Publish
22

33
on:
44
workflow_dispatch:
5+
inputs:
6+
tag:
7+
description: 'The npm tag to publish to'
8+
required: true
9+
type: choice
10+
options:
11+
- latest
12+
- test
513

614
permissions:
715
contents: write
@@ -11,9 +19,10 @@ jobs:
1119
publish:
1220
name: Publish
1321
runs-on: ubuntu-latest
14-
environment: release
22+
timeout-minutes: 10
23+
environment: Release
1524
steps:
16-
- uses: actions/checkout@main
25+
- uses: actions/checkout@v6
1726
with:
1827
fetch-depth: 0
1928
persist-credentials: true # needed for git push
@@ -27,10 +36,21 @@ jobs:
2736
git config --global user.name 'Thinkmill Release Bot'
2837
git config --global user.email 'automation+github@thinkmill.com.au'
2938
30-
- name: npm publish, git tag
31-
run: pnpm changeset publish
39+
- name: version packages
40+
if: inputs.tag != 'latest'
41+
run: |
42+
pnpm changeset version --snapshot ${{ inputs.tag }}
43+
git commit -a -m 'rc'
3244
env:
33-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
34-
NPM_CONFIG_PROVENANCE: true
45+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
46+
47+
- name: npm publish, git tag
48+
run: pnpm changeset publish --tag ${{ inputs.tag }}
49+
50+
# reset, then we have a tagged dangling commit
51+
- name: git push
52+
if: inputs.tag != 'latest'
53+
run: |
54+
git reset HEAD~1 --hard
3555
36-
- run: git push origin --follow-tags
56+
- run: git push origin --tags

.github/workflows/publish_snapshot.yml

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

.github/workflows/tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
index: [1, 2]
2121
steps:
2222
- name: Checkout repo
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v6
2424

2525
- uses: ./.github/actions/setup-deps
2626

@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: Checkout repo
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v6
3636

3737
- uses: ./.github/actions/setup-deps
3838

@@ -47,7 +47,7 @@ jobs:
4747
runs-on: ubuntu-latest
4848
steps:
4949
- name: Checkout repo
50-
uses: actions/checkout@v3
50+
uses: actions/checkout@v6
5151

5252
- uses: ./.github/actions/setup-deps
5353

@@ -59,7 +59,7 @@ jobs:
5959
runs-on: ubuntu-latest
6060
steps:
6161
- name: Checkout repo
62-
uses: actions/checkout@v3
62+
uses: actions/checkout@v6
6363

6464
- uses: ./.github/actions/setup-deps
6565

.github/workflows/version_packages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Pull Request
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@main
14+
- uses: actions/checkout@v6
1515
with:
1616
fetch-depth: 0
1717
persist-credentials: false

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.13.1
1+
24.12.0

design-system/docs/.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.13.1
1+
24.12.0

design-system/docs/CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
# @voussoir/docs
22

3+
## 0.0.70
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`cd6d68b`](https://github.com/Thinkmill/keystatic/commit/cd6d68b7d280ba02956c5da483d3555f576111f1)]:
8+
- @keystar/ui@0.7.21
9+
- @keystatic/core@0.5.50
10+
- @keystatic/next@5.0.4
11+
12+
## 0.0.69
13+
14+
### Patch Changes
15+
16+
- Updated dependencies [[`e049a3d`](https://github.com/Thinkmill/keystatic/commit/e049a3d74afd4397a12f5d6104d3e63d5a9797ba), [`6006584`](https://github.com/Thinkmill/keystatic/commit/60065843fd73da2d9ed973f6d478bd7159fce883), [`ed066f0`](https://github.com/Thinkmill/keystatic/commit/ed066f0bc74037fc7f1f5fb2792e483fc091fd1d), [`bb2bc34`](https://github.com/Thinkmill/keystatic/commit/bb2bc34c3f0a35e1033f9927293e1d9f61eda4fd), [`fe3dc55`](https://github.com/Thinkmill/keystatic/commit/fe3dc55763165dfe38910ac558fe0ad97410d536), [`ded5ea7`](https://github.com/Thinkmill/keystatic/commit/ded5ea7dcfc59ea3d9358ba8af778a39167c9d50), [`63c767b`](https://github.com/Thinkmill/keystatic/commit/63c767bbb8b9bbc96c30535862bcccfbbc4ea346)]:
17+
- @keystatic/core@0.5.49
18+
- @keystar/ui@0.7.20
19+
- @keystatic/next@5.0.4
20+
321
## 0.0.68
422

523
### Patch Changes

design-system/docs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@keystar/docs",
3-
"version": "0.0.68",
3+
"version": "0.0.70",
44
"private": true,
55
"license": "MIT",
66
"scripts": {
@@ -51,7 +51,7 @@
5151
"@storybook/nextjs": "^7.4.6",
5252
"@storybook/preview-api": "^7.4.6",
5353
"@storybook/react": "^7.4.6",
54-
"@types/node": "22.13.1",
54+
"@types/node": "25.0.3",
5555
"@types/react": "^19.0.8",
5656
"babel-loader": "^8.2.5",
5757
"playroom": "^0.28.0",

0 commit comments

Comments
 (0)