Skip to content

Commit

Permalink
Merge pull request #1488 from wpengine/canary
Browse files Browse the repository at this point in the history
Sync canary -> main
  • Loading branch information
blakewilson authored Jul 11, 2023
2 parents d30be09 + bc7ab0d commit bbf1d5c
Show file tree
Hide file tree
Showing 27 changed files with 4,255 additions and 1,955 deletions.
2 changes: 2 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
## Tasks

- [ ] I have signed a [Contributor License Agreement (CLA)](https://github.com/wpengine/faustjs#contributor-license-agreement) with WP Engine.
- [ ] If a code change, I have written testing instructions that the whole team & outside contributors can understand.
- [ ] I have written and included a comprehensive [changeset](https://github.com/wpengine/faustjs/blob/canary/DEVELOPMENT.md#deployment) to properly document the changes I've made.

## Description

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nextjs-bundle-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ jobs:
id: fc
with:
issue-number: ${{ github.event.number }}
body-includes: '<!-- __NEXTJS_BUNDLE -->'
body-includes: '<!-- __NEXTJS_BUNDLE_@faustwp/getting-started-example -->'

- name: Create Comment
uses: peter-evans/create-or-update-comment@v2
Expand Down
5 changes: 4 additions & 1 deletion DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,10 @@ After a successful release, a PR from `canary` to `main` is automatically create

Developers with full GitHub repository access can create public releases. We use [Changesets](https://github.com/atlassian/changesets) to automate the versioning and deployment process for all of our packages and plugins.

### Adding a changeset

To add a new changeset for a new feature, bugfix or other change please see the [changeset documentation](https://github.com/changesets/changesets/blob/main/docs/adding-a-changeset.md).

### Versioning

When you are ready to release, you should first create the new package and plugin versions.
Expand Down Expand Up @@ -230,4 +234,3 @@ Once deployed, the updated packages and plugin will be visible here:
### Update the docs

After a release, remember to update the docs using the [Prod Site Deployment](#prod-site-deployment) process outlined above.

6 changes: 3 additions & 3 deletions examples/next/faustwp-getting-started/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"dependencies": {
"@apollo/client": "^3.6.6",
"@faustwp/cli": "1.0.1",
"@faustwp/core": "1.0.1",
"@wordpress/base-styles": "^4.7.0",
"@wordpress/block-library": "^7.13.0",
"@faustwp/core": "1.0.3",
"@wordpress/base-styles": "^4.26.0",
"@wordpress/block-library": "^7.19.0",
"classnames": "^2.3.1",
"graphql": "^16.6.0",
"next": "^12.1.6",
Expand Down
4 changes: 2 additions & 2 deletions internal/faustjs.org/docs/faustwp/seed-query.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ export interface SeedNode {
export const SEED_QUERY = gql`
query GetSeedNode(
$id: ID = 0
$uri: String = ""
$id: ID! = 0
$uri: String! = ""
$asPreview: Boolean = false
) {
... on RootQuery @skip(if: $asPreview) {
Expand Down
Loading

2 comments on commit bbf1d5c

@headless-platform-by-wp-engine

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check out the recent updates to your Atlas environment:

App Environment URL Build
faustjs Production https://hh…wered.com ✅ (logs)

Learn more about building on Atlas in our documentation.

@headless-platform-by-wp-engine

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check out the recent updates to your Atlas environment:

App Environment URL Build
faustjs-legacy Production https://h8…wered.com ✅ (logs)

Learn more about building on Atlas in our documentation.

Please sign in to comment.