Skip to content

Commit 15c38fa

Browse files
committed
Merge remote-tracking branch 'origin/canary' into update-starter-example
# Conflicts: # package-lock.json
2 parents cffa478 + 7b05d91 commit 15c38fa

4 files changed

Lines changed: 249 additions & 68 deletions

File tree

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,13 @@
1-
## Tasks
2-
31
- [ ] I have signed a [Contributor License Agreement (CLA)](https://github.com/wpengine/faustjs#contributor-license-agreement) with WP Engine.
4-
- [ ] If a code change, I have written testing instructions that the whole team & outside contributors can understand.
5-
- [ ] 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.
62

73
## Description
84

9-
<!--
10-
Include a summary of the change and some contextual information.
11-
-->
12-
13-
## Related Issue(s):
5+
<!-- What does this PR do and why? -->
146

15-
<!--
16-
Provide the GitHub issue(s) number for issue tracking purposes, use the following syntax:
7+
## Related Issues
178

18-
- #1234
19-
-->
9+
<!-- Link related issues: #1234 -->
2010

2111
## Testing
2212

23-
<!--
24-
Describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Also list any relevant details for your test configuration such as how to test the changes locally or in staging.
25-
-->
26-
27-
## Screenshots
28-
29-
<!--
30-
If this is a visual change include relevant screenshots about the behavior of the application before and after this change.
31-
-->
32-
33-
## Documentation Changes
34-
35-
<!--
36-
List corresponding changes to the documentation.
37-
-->
38-
39-
## Dependant PRs
40-
41-
<!--
42-
List any dependent PR's that are awaiting review. Use the following syntax:
43-
44-
- #1234
45-
-->
13+
<!-- How can this be tested? -->

examples/next/tutorial/package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/next/tutorial/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@apollo/client": "^3.13.9",
1515
"@faustwp/blocks": "^6.1.3",
1616
"@faustwp/cli": "^3.2.4",
17-
"@faustwp/core": "^3.3.2",
17+
"@faustwp/core": "^3.3.6",
1818
"graphql": "^16.11.0",
1919
"next": "^15.5.2",
2020
"next-secure-headers": "^2.2.0",

0 commit comments

Comments
 (0)