Skip to content

Commit 136be6b

Browse files
committed
Merge remote-tracking branch 'origin/canary' into dynamic-templates
2 parents d2a0ce0 + 97ec3e8 commit 136be6b

40 files changed

Lines changed: 18355 additions & 16468 deletions

File tree

.changeset/sparkly-dodos-fold.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
'@faustwp/block-editor-utils': patch
3+
'@faustwp/core': patch
4+
'@faustwp/cli': patch
5+
'@faustwp/blocks': patch
6+
---
7+
8+
Publish release after NPM auth changes

.changeset/wp-6.9-support.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@faustwp/wordpress-plugin": patch
3+
---
4+
5+
Add WordPress 6.9 to the CI test matrix and update the plugin "Tested up to" header to 6.9.

.github/actions/run-coverage/action.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,22 @@ inputs:
99
runs:
1010
using: 'composite'
1111
steps:
12-
# We are currently fixed at 2.1.2 since 2.2 was throwing errors
13-
# Remove this when the issue has been resolved.
14-
- uses: ArtiomTr/jest-coverage-report-action@v2.1.2
12+
# Run coverage tests manually to use correct dependencies from npm ci.
13+
# This ensures the lockfile and package.json overrides are respected,
14+
# avoiding test-exclude/glob version incompatibility issues on Node 22.
15+
- name: Run coverage tests
16+
shell: bash
17+
working-directory: ${{ inputs.working-directory }}
18+
run: npm run test:coverage:ci
19+
20+
# Use the action only for report generation, not for running tests
21+
- uses: ArtiomTr/jest-coverage-report-action@v2.3.1
1522
with:
16-
# tell to the action to not attach comment.
1723
output: report-markdown
18-
test-script: npm run test:coverage:ci
24+
coverage-file: report.json
25+
base-coverage-file: report.json
1926
working-directory: ${{ inputs.working-directory }}
2027
annotations: none
21-
continue-on-error: FALSE
28+
skip-step: all
29+
continue-on-error: false
2230

.github/workflows/release-packages.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ on:
55
branches:
66
- canary
77

8+
permissions:
9+
contents: write # For creating releases/tags
10+
pull-requests: write # For creating version PRs
11+
id-token: write # For npm OIDC authentication
12+
813
jobs:
914
release_packages:
1015
name: Release Packages
@@ -16,22 +21,15 @@ jobs:
1621
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
1722
fetch-depth: 0
1823

19-
- name: Setup Node.js 18.x
24+
- name: Setup Node.js 22.x
2025
uses: actions/setup-node@v4
2126
with:
22-
node-version: 18.x
27+
node-version: 22.x
28+
registry-url: 'https://registry.npmjs.org'
2329

2430
- name: Install Dependencies
2531
run: npm ci
2632

27-
- name: Create .npmrc
28-
run: |
29-
cat << EOF > "$HOME/.npmrc"
30-
//registry.npmjs.org/:_authToken=$NPM_TOKEN
31-
EOF
32-
env:
33-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
34-
3533
- name: Create Release Pull Request or Publish to npm
3634
id: changesets
3735
uses: changesets/action@v1
@@ -41,7 +39,6 @@ jobs:
4139
version: npm run version
4240
env:
4341
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
4542
- name: Save Plugin version
4643
run: |
4744
json=${{ toJSON(steps.changesets.outputs.publishedPackages) }}

.github/workflows/unit-test-plugin.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-22.04
1414
strategy:
1515
matrix:
16-
wordpress: [ '6.8', '6.7', '6.6', '6.5', '6.4', '6.3', '6.2']
16+
wordpress: [ '6.9', '6.8', '6.7', '6.6', '6.5', '6.4', '6.3' ]
1717
steps:
1818
- name: Checkout
1919
uses: actions/checkout@v4
@@ -28,8 +28,9 @@ jobs:
2828
docker compose up -d
2929
3030
- name: Wait for db
31+
working-directory: ./plugins/faustwp
3132
run: |
32-
while ! mysqladmin ping --host=127.0.0.1 --port=33066 --password=$MYSQL_ROOT_PASSWORD --silent; do
33+
until docker compose exec -T db mysqladmin ping -pwordpress --silent; do
3334
sleep 1
3435
done
3536

docs/reference/get-styles/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The `getStyles` is a helper function that is used to calculate the inline styles
77

88
## API
99

10-
The `getStyles` has the following signatur
10+
The `getStyles` has the following signature:
1111
```ts
1212
function getStyles<T extends BlockWithAttributes>(
1313
theme: BlocksTheme,

0 commit comments

Comments
 (0)