Skip to content

Commit ee58ad3

Browse files
Copilotjosephfusco
andauthored
Merge origin/canary into dependabot branch
Co-authored-by: josephfusco <6676674+josephfusco@users.noreply.github.com>
2 parents 1ed886e + c3b2e74 commit ee58ad3

47 files changed

Lines changed: 21048 additions & 21014 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
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+
fix[faustwp]: clean up uploaded blockset zip when extraction fails

.changeset/cute-doors-argue.md

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

.changeset/funny-ravens-run.md

Lines changed: 0 additions & 47 deletions
This file was deleted.
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+
fix[faustwp]: use home_url() in handle_generate_endpoint so Bedrock-style installs (where WordPress core lives under /wp/) match against the public REQUEST_URI
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+
fix[faustwp]: use hash_equals() for constant-time secret key comparison in REST and GraphQL permission callbacks

.changeset/silly-owls-clean.md

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

.github/workflows/check-packages.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ jobs:
2626
uses: actions/checkout@v4
2727
- name: Set up Node.js
2828
uses: ./.github/actions/cache-restore
29+
id: cache-node-modules
30+
- name: Install dependencies
31+
if: steps.cache-node-modules.outputs.cache-hit != 'true'
32+
run: npm ci
2933
- name: Check Linting
3034
run: npm run lint
3135
check_format:
@@ -37,5 +41,9 @@ jobs:
3741
uses: actions/checkout@v4
3842
- name: Set up Node.js
3943
uses: ./.github/actions/cache-restore
44+
id: cache-node-modules
45+
- name: Install dependencies
46+
if: steps.cache-node-modules.outputs.cache-hit != 'true'
47+
run: npm ci
4048
- name: Check Formatting
4149
run: npm run test:format

.github/workflows/e2e-next-faustwp-example.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,25 @@ jobs:
5454
# writing this they do not function as expected on GH actions
5555
- name: replace downloaded registry faust packages with local build
5656
run: |
57+
mkdir -p e2e-app/node_modules/@faustwp
5758
rm -rf e2e-app/node_modules/@faustwp/cli
5859
rm -rf e2e-app/node_modules/@faustwp/core
5960
cp -r packages/faustwp-cli e2e-app/node_modules/@faustwp/cli
6061
cp -r packages/faustwp-core e2e-app/node_modules/@faustwp/core
61-
chmod +x e2e-app/node_modules/.bin/faust
62+
mkdir -p e2e-app/node_modules/.bin
63+
ln -sf ../@faustwp/cli/dist/index.js e2e-app/node_modules/.bin/faust
64+
chmod +x e2e-app/node_modules/@faustwp/cli/dist/index.js
65+
# create-next-app's npm install may fail if @faustwp/* versions
66+
# are not yet published. Point deps at local builds so npm install
67+
# can resolve them and install all remaining dependencies.
68+
# --install-links copies packages instead of symlinking, avoiding
69+
# duplicate React instances from split module resolution.
70+
- name: install e2e-app dependencies
71+
working-directory: e2e-app
72+
run: |
73+
npm pkg set "dependencies.@faustwp/cli=file:../packages/faustwp-cli"
74+
npm pkg set "dependencies.@faustwp/core=file:../packages/faustwp-core"
75+
npm install --install-links
6276
- name: copy env
6377
working-directory: e2e-app
6478
run: |

.github/workflows/npm-publish.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,11 @@ jobs:
4040
- name: Install Dependencies
4141
run: npm ci
4242

43+
- name: Install legacy npm first, as a workaround for https://github.com/nodejs/node/issues/62425
44+
run: npm install -g npm@10.9.8
45+
4346
- name: Upgrade npm for OIDC support
44-
run: npm install -g npm@^11.5.1
47+
run: npm install -g npm@11.13.0
4548

4649
- name: Verify OIDC token availability
4750
run: |
@@ -63,4 +66,4 @@ jobs:
6366

6467
- name: Push tags
6568
if: inputs.push-tags
66-
run: git push --follow-tags
69+
run: git push origin --tags

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Faust.js is a toolkit for building Next.js applications for headless WordPress s
2222

2323
## System Requirements
2424

25-
- Node.js v16.0.0 or newer (v16.8.0 when using Next.js 13 and v18.17 when using Next.js 14).
25+
- Node.js v18 or newer. npm v8 or newer.
2626
- MacOS, Windows (including WSL), and Linux are supported.
2727

2828
## Documentation

0 commit comments

Comments
 (0)