Skip to content

Commit

Permalink
Merge branch 'canary' into fix/blockset-issue-1633
Browse files Browse the repository at this point in the history
  • Loading branch information
josephfusco authored Dec 6, 2023
2 parents 5cd554d + 22a64b6 commit df1b6f5
Show file tree
Hide file tree
Showing 16 changed files with 46 additions and 43 deletions.
5 changes: 0 additions & 5 deletions .changeset/four-books-invent.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/smooth-cooks-warn.md

This file was deleted.

9 changes: 0 additions & 9 deletions .changeset/violet-taxis-report.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/yellow-foxes-complain.md

This file was deleted.

4 changes: 2 additions & 2 deletions examples/next/app-router/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"dependencies": {
"@apollo/client": "^3.8.0",
"@apollo/experimental-nextjs-app-support": "^0.5.1",
"@faustwp/cli": "^1.2.0",
"@faustwp/cli": "^1.2.1",
"@faustwp/core": "^1.2.0",
"@faustwp/experimental-app-router": "^0.2.1",
"@faustwp/experimental-app-router": "^0.2.2",
"graphql": "^16.7.1",
"next": "^14.0.1",
"react": "^18.3.0-canary-ce2bc58a9-20231102",
Expand Down
2 changes: 1 addition & 1 deletion examples/next/faustwp-getting-started/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"@apollo/client": "^3.6.6",
"@faustwp/cli": "^1.2.0",
"@faustwp/cli": "^1.2.1",
"@faustwp/core": "^1.2.0",
"@wordpress/base-styles": "^4.36.0",
"@wordpress/block-library": "^7.19.0",
Expand Down
7 changes: 4 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions packages/experimental-app-router/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# @faustwp/experimental-app-router

## 0.2.2

### Patch Changes

- 626207b: Added: New util for fetching data on the client side. In a client component (`use client`), you can now use Apollo's `useQuery` to fetch data once your application is wrapped with the `<FaustProvider>` component. This new component is available via:

```tsx
import { FaustProvider } from '@faustwp/experimental-app-router/ssr';
```

## 0.2.1

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/experimental-app-router/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@faustwp/experimental-app-router",
"type": "module",
"version": "0.2.1",
"version": "0.2.2",
"description": "Experimental: A Faust package to support Next.js' App Router",
"exports": {
".": "./dist/index.js",
Expand Down Expand Up @@ -58,7 +58,7 @@
"devDependencies": {
"@apollo/client": "^3.8.0",
"@apollo/experimental-nextjs-app-support": "^0.5.1",
"@faustwp/cli": "^1.1.3",
"@faustwp/cli": "^1.2.1",
"@faustwp/core": "^1.1.2",
"@testing-library/jest-dom": "^5.17.0",
"@types/node": "^20.4.6",
Expand Down
6 changes: 6 additions & 0 deletions packages/faustwp-cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @faustwp/cli

## 1.2.1

### Patch Changes

- c75ab2b: Bug: Quote blockset "output-path" to prevent issues with space in paths.

## 1.2.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/faustwp-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@faustwp/cli",
"version": "1.2.0",
"version": "1.2.1",
"description": "This modules provides a CLI to develop, build, and serve your Faust apps",
"main": "dist/index.js",
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion packages/faustwp-cli/src/blockset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ export async function compileBlocks(): Promise<void> {
args = args.concat([
'--no-watch',
`--webpack-src-dir=${FAUST_BLOCKS_SRC_DIR}`,
`--output-path=${FAUST_BUILD_DIR}`,
`--output-path="${FAUST_BUILD_DIR}"`,
]);
const res = spawnSync(command, args, {
shell: true,
Expand Down
8 changes: 8 additions & 0 deletions plugins/faustwp/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Faust

## 1.1.2

### Patch Changes

- 78a061a: Fixed a bug that caused links to files in wp-content to be rewritten to the Faust Front-end site URL when they should not have been.
- 2559958: Bug Fix: Fixed missing call to autosave when using Post/Page previews.
- 75f5c80: Fixed a bug where links were rewritten to the Faust Front-end Site URL when using the post editor, resulting in those rewritten links being saved to the post content and guid fields when they shouldn't be. These links are now saved with the URL pointing to the WP site, as they should be. They are still rewritten at runtime to link to the Front-end Site URL when appropriate.

## 1.1.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion plugins/faustwp/faustwp.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* License URI: https://www.gnu.org/licenses/gpl-2.0.html
* Text Domain: faustwp
* Domain Path: /languages
* Version: 1.1.1
* Version: 1.1.2
* Requires PHP: 7.2
* Requires at least: 5.7
*
Expand Down
2 changes: 1 addition & 1 deletion plugins/faustwp/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@faustwp/wordpress-plugin",
"version": "1.1.1",
"version": "1.1.2",
"private": true
}
16 changes: 9 additions & 7 deletions plugins/faustwp/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Contributors: antpb, apmatthe, blakewpe, chriswiegman, claygriffiths, jasonkonen
Tags: faustjs, faust, headless, decoupled, composable-architecture
Requires at least: 5.7
Tested up to: 6.4
Stable tag: 1.1.1
Stable tag: 1.1.2
Requires PHP: 7.2
License: GPLv2 or later
License URI: https://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -54,6 +54,14 @@ plugins/faustwp/.wordpress-org/screenshot-3.png

== Changelog ==

= 1.1.2 =

### Patch Changes

- 78a061a: Fixed a bug that caused links to files in wp-content to be rewritten to the Faust Front-end site URL when they should not have been.
- 2559958: Bug Fix: Fixed missing call to autosave when using Post/Page previews.
- 75f5c80: Fixed a bug where links were rewritten to the Faust Front-end Site URL when using the post editor, resulting in those rewritten links being saved to the post content and guid fields when they shouldn't be. These links are now saved with the URL pointing to the WP site, as they should be. They are still rewritten at runtime to link to the Front-end Site URL when appropriate.

= 1.1.1 =

### Patch Changes
Expand All @@ -70,10 +78,4 @@ plugins/faustwp/.wordpress-org/screenshot-3.png

- d3d30aa: Added support for authenticated WPGraphQL introspection queries using FAUST_SECRET_KEY. It is no longer required to enable "Public Introspection" in WPGraphQL.

= 1.0.4 =

### Patch Changes

- fcc6d37: Fixed a bug in the block editor screen where the preview link was missing the `p` and `previewPathName` query arguments after saving a draft.

[View the full changelog](https://github.com/wpengine/faustjs/blob/canary/plugins/faustwp/CHANGELOG.md)

0 comments on commit df1b6f5

Please sign in to comment.