Skip to content

Commit

Permalink
Merge branch 'canary' into MERL-1749-Faust-should-warn-if-the-secret-…
Browse files Browse the repository at this point in the history
…key-is-invalid-
  • Loading branch information
TeresaGobble committed Feb 15, 2024
2 parents 0ea3d5f + 572b253 commit bb16211
Show file tree
Hide file tree
Showing 54 changed files with 1,134 additions and 577 deletions.
5 changes: 0 additions & 5 deletions .changeset/cuddly-readers-wave.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/healthy-mayflies-end.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@faustwp/experimental-app-router': minor
---

Changed the `sameSite` property on the refresh token cookie from `strict` to `lax` for requests originating from WordPress.
5 changes: 5 additions & 0 deletions .changeset/neat-foxes-develop.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@faustwp/cli': minor
---

Added: Detect if the `NEXT_PUBLIC_WORDPRESS_URL` is a `wpengine.com` TLD and if so recommend a switch to `wpenginepowered.com`
5 changes: 0 additions & 5 deletions .changeset/odd-dolls-greet.md

This file was deleted.

48 changes: 0 additions & 48 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

66 changes: 66 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: Bug report
description: Report a bug in Faust
body:
- type: markdown
attributes:
value: >-
Thank you for taking the time to report a possible bug!
Please remember, a bug report is _not the place to ask questions_. You can
use [Discord](https://discord.gg/J2khkF9XYK) for that, or start a topic in [GitHub
Discussions](https://github.com/wpengine/faustjs/discussions).
- type: textarea
attributes:
label: Description
description: >-
Please write a brief description of the bug, including what you expected and what actually happened.
validations:
required: true
- type: textarea
attributes:
label: Steps to reproduce
description: >-
Please list all the steps needed to reproduce the bug in an *isolated* way (e.g. a clonable GitHub repository, or a Faust.js snippet that works on a clean environment ).
placeholder: >-
1. Clone the `faustwp-getting-started` example project
2. Navigate to the `wp-templates/single.js` Faust template
3. Result show X but should be Y
validations:
required: true
- type: textarea
attributes:
label: Additional context
description: >-
Add any other context about the problem here, such as screenshots, error logs, etc.
- type: input
attributes:
label: "@faustwp/core Version"
validations:
required: true
- type: input
attributes:
label: "@faustwp/cli Version"
validations:
required: true
- type: input
attributes:
label: FaustWP Plugin Version
validations:
required: true
- type: input
attributes:
label: WordPress Version
validations:
required: true
- type: textarea
attributes:
label: Additional environment details
description: Additional Faust.js packages and their versions (@faustwp/blocks, @faustwp/experimental-app-router, etc), PHP version, Hosting Platform, etc.
- type: checkboxes
attributes:
label: Please confirm that you have searched existing issues in the repo.
description: >-
You can do this by searching https://github.com/wpengine/faustjs/issues.
options:
- label: 'Yes'
required: true
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: General Help Request
url: https://github.com/wpengine/faustjs/discussions
about: For general questions and help requests, create a new topic in GitHub Discussions
- name: Headless WordPress Discord Community
url: https://discord.gg/J2khkF9XYK
about: Ask questions, discuss features, and meet new people in the Headless WordPress Discord community
12 changes: 0 additions & 12 deletions .github/workflows/audit-dependencies.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/e2e-next-example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
e2e-test-next-getting-started-example:
name: (legacy) Next Getting Started Example on Node ${{ matrix.node }}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
env:
PR_REPO: ${{github.event.pull_request.head.repo.full_name}}
PR_BRANCH: ${{github.event.pull_request.head.ref}}
Expand All @@ -20,9 +20,9 @@ jobs:
working-directory: ./
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
# Get the PR branch so we can pull the correct Next.js example path
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e-next-faustwp-example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
e2e-test-next-getting-started-example:
name: (faustwp) Next Getting Started Example on Node ${{ matrix.node }}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
env:
PR_REPO: ${{github.event.pull_request.head.repo.full_name}}
PR_BRANCH: ${{github.event.pull_request.head.ref}}
Expand All @@ -20,9 +20,9 @@ jobs:
working-directory: ./
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
# Get the PR branch so we can pull the correct Next.js example path
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e-nightly-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
e2e-nightly-test:
name: E2E app on Node ${{ matrix.node }}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
node: ['16', '18', '20']
Expand All @@ -18,10 +18,10 @@ jobs:
working-directory: ./
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/e2e-test-plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ on:
jobs:
e2e_test_plugin:
timeout-minutes: 10
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '16'
- name: Install NPM Deps
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
working-directory: plugins/faustwp
run: vendor/bin/codecept run api
- name: Upload Test Output
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: failure()
with:
name: failed-test-output
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/experimental-app-router.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ jobs:
name: "Build and Test Experimental App Router on Node.js ${{ matrix.node }} ${{ matrix.os }}"
strategy:
matrix:
os: ['ubuntu-latest']
os: ['ubuntu-22.04']
node: ['18', '20']
permissions:
checks: write
pull-requests: write
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Node.js ${{ matrix.node }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ on:

jobs:
lint_packages:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '16'
- run: npm ci
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint-plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ on:

jobs:
lint_plugin:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
Expand Down
22 changes: 13 additions & 9 deletions .github/workflows/nextjs-bundle-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ name: 'Next.js Bundle Analysis'

on:
pull_request:
branches-ignore:
- 'main'
push:
branches:
- 'canary'
Expand All @@ -25,12 +27,12 @@ jobs:
'examples/next/faustwp-getting-started',
]

runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18

Expand Down Expand Up @@ -63,7 +65,7 @@ jobs:
npm pkg set nextBundleAnalysis.budget=358400 nextBundleAnalysis.budgetPercentIncreaseRed=20 nextBundleAnalysis.showDetails=true --json
- name: Restore next build
uses: actions/cache@v3
uses: actions/cache@v4
id: restore-build-cache
env:
cache-name: cache-next-build
Expand All @@ -85,13 +87,13 @@ jobs:
run: npx -p nextjs-bundle-analysis report

- name: Upload bundle analysis report for this PR
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: bundle
path: ${{ matrix.next-dir }}/.next/analyze/__bundle_analysis.json

- name: Download bundle analysis report for base branch
uses: dawidd6/action-download-artifact@v2
uses: dawidd6/action-download-artifact@v3
if: success() && github.event.number
with:
workflow: nextjs-bundle-analysis.yml
Expand All @@ -115,22 +117,24 @@ jobs:
echo EOF >> $GITHUB_OUTPUT
- name: Find Comment
uses: peter-evans/find-comment@v2
uses: peter-evans/find-comment@v3
if: success() && github.event.number
id: fc
with:
issue-number: ${{ github.event.number }}
body-includes: '<!-- __NEXTJS_BUNDLE_@faustwp/getting-started-example -->'

- name: Create Comment
uses: peter-evans/create-or-update-comment@v2
uses: peter-evans/create-or-update-comment@v4
continue-on-error: true
if: success() && github.event.number && steps.fc.outputs.comment-id == 0
with:
issue-number: ${{ github.event.number }}
body: ${{ steps.get-comment-body.outputs.body }}

- name: Update Comment
uses: peter-evans/create-or-update-comment@v2
uses: peter-evans/create-or-update-comment@v4
continue-on-error: true
if: success() && github.event.number && steps.fc.outputs.comment-id != 0
with:
issue-number: ${{ github.event.number }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nightly-releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ on:
jobs:
release_nightly_canary:
name: Release Nightly Canary
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup Node.js 18.x
uses: actions/setup-node@master
uses: actions/setup-node@v4
with:
node-version: 18.x

Expand Down
Loading

0 comments on commit bb16211

Please sign in to comment.