Skip to content

Commit 1be58da

Browse files
committed
Merge develop into feature branch, resolving conflicts
Resolved conflicts in: - .github/workflows/ci.yml: Combined theme-ecl and theme-desy in test matrix - pnpm-lock.yaml: Used feature branch versions for tar (7.5.11) and tinyglobby (0.2.15)
2 parents 1c8f49d + 4cd60ac commit 1be58da

396 files changed

Lines changed: 6731 additions & 2201 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.

.github/workflows/auto-dependency-updater.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
with:
4444
# cache: pnpm
4545
node-version: 24
46-
- uses: pnpm/action-setup@v5
46+
- uses: pnpm/action-setup@v6
4747
id: pnpm-install
4848
with:
4949
version: 10

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
continue-on-error: true
6161
strategy:
6262
matrix:
63-
package: ['test-tag-name-transformer', 'theme-bwst', 'theme-default', 'theme-kern', 'theme-ecl']
63+
package: ['test-tag-name-transformer', 'theme-bwst', 'theme-default', 'theme-desy', 'theme-kern', 'theme-ecl']
6464
runs-on: ubuntu-latest
6565
steps:
6666
- name: Checkout

.github/workflows/cve-overview.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- uses: actions/setup-node@v6
3838
with:
3939
node-version: 24
40-
- uses: pnpm/action-setup@v5
40+
- uses: pnpm/action-setup@v6
4141
id: pnpm-install
4242
with:
4343
version: 10
@@ -77,7 +77,7 @@ jobs:
7777
- uses: actions/setup-node@v6
7878
with:
7979
node-version: 24
80-
- uses: pnpm/action-setup@v5
80+
- uses: pnpm/action-setup@v6
8181
id: pnpm-install
8282
with:
8383
version: 10

.github/workflows/draft-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
with:
3333
node-version: 24
3434
- name: Install pnpm
35-
uses: pnpm/action-setup@v5
35+
uses: pnpm/action-setup@v6
3636
id: pnpm-install
3737
with:
3838
version: 10

.github/workflows/handle-pr-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
github.event.label.name == 'codex'
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/github-script@v8
19+
- uses: actions/github-script@v9
2020
with:
2121
github-token: ${{ secrets.GITHUB_TOKEN }}
2222
script: |

.github/workflows/manage-npm-tags.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
- '@public-ui/solid'
5555
- '@public-ui/svelte'
5656
- '@public-ui/theme-default'
57+
- '@public-ui/theme-desy'
5758
- '@public-ui/theme-ecl'
5859
- '@public-ui/theme-kern'
5960
# - '@public-ui/stylelint-rules'

.github/workflows/mcp-vercel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
127127
- name: Share preview URL in PR
128128
if: github.event_name == 'pull_request'
129-
uses: actions/github-script@v8
129+
uses: actions/github-script@v9
130130
env:
131131
PREVIEW_URL: ${{ steps.deploy_preview.outputs.url }}
132132
with:

.github/workflows/publish.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
registry-url: https://registry.npmjs.org
6767

6868
- name: Install pnpm
69-
uses: pnpm/action-setup@v5
69+
uses: pnpm/action-setup@v6
7070
id: pnpm-install
7171
with:
7272
version: 10
@@ -193,27 +193,33 @@ jobs:
193193
env:
194194
NODE_AUTH_TOKEN: ${{secrets.NPMJS_GRANULAR_TOKEN}}
195195
NPM_CONFIG_PROVENANCE: true
196+
- name: Build and publish theme bwst
197+
run: pnpm publish --access public --provenance --no-git-checks --tag ${{env.prefix}}${{github.event.inputs.tag}} || echo "⚠️ Publish skipped – package already exists"
198+
working-directory: packages/themes/bwst
199+
env:
200+
NODE_AUTH_TOKEN: ${{secrets.NPMJS_GRANULAR_TOKEN}}
201+
NPM_CONFIG_PROVENANCE: true
196202
- name: Build and publish theme default
197203
run: pnpm publish --access public --provenance --no-git-checks --tag ${{env.prefix}}${{github.event.inputs.tag}} || echo "⚠️ Publish skipped – package already exists"
198204
working-directory: packages/themes/default
199205
env:
200206
NODE_AUTH_TOKEN: ${{secrets.NPMJS_GRANULAR_TOKEN}}
201207
NPM_CONFIG_PROVENANCE: true
202-
- name: Build and publish theme ecl
208+
- name: Build and publish theme desy
203209
run: pnpm publish --access public --provenance --no-git-checks --tag ${{env.prefix}}${{github.event.inputs.tag}} || echo "⚠️ Publish skipped – package already exists"
204-
working-directory: packages/themes/ecl
210+
working-directory: packages/themes/desy
205211
env:
206212
NODE_AUTH_TOKEN: ${{secrets.NPMJS_GRANULAR_TOKEN}}
207213
NPM_CONFIG_PROVENANCE: true
208-
- name: Build and publish theme kern
214+
- name: Build and publish theme ecl
209215
run: pnpm publish --access public --provenance --no-git-checks --tag ${{env.prefix}}${{github.event.inputs.tag}} || echo "⚠️ Publish skipped – package already exists"
210-
working-directory: packages/themes/kern
216+
working-directory: packages/themes/ecl
211217
env:
212218
NODE_AUTH_TOKEN: ${{secrets.NPMJS_GRANULAR_TOKEN}}
213219
NPM_CONFIG_PROVENANCE: true
214-
- name: Build and publish theme bwst
220+
- name: Build and publish theme kern
215221
run: pnpm publish --access public --provenance --no-git-checks --tag ${{env.prefix}}${{github.event.inputs.tag}} || echo "⚠️ Publish skipped – package already exists"
216-
working-directory: packages/themes/bwst
222+
working-directory: packages/themes/kern
217223
env:
218224
NODE_AUTH_TOKEN: ${{secrets.NPMJS_GRANULAR_TOKEN}}
219225
NPM_CONFIG_PROVENANCE: true

.github/workflows/security-scan-schedule.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
ref: ${{ matrix.branch }}
2525

2626
- name: Setup pnpm
27-
uses: pnpm/action-setup@v5
27+
uses: pnpm/action-setup@v6
2828
with:
2929
version: 10
3030

.github/workflows/security-scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
ref: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
3737

3838
- name: Setup pnpm
39-
uses: pnpm/action-setup@v5
39+
uses: pnpm/action-setup@v6
4040
with:
4141
version: 10
4242

0 commit comments

Comments
 (0)