Merge branch 'canary' of https://github.com/wpengine/faustjs into pat…

…ch-1
wpengine · Oct 29, 2024 · 9fc2596 · 9fc2596
2 parents be14fbb + 9011492
commit 9fc2596
Show file tree

Hide file tree

Showing 11 changed files with 1,282 additions and 2,759 deletions.
diff --git a/.changeset/smart-pumas-act.md b/.changeset/smart-pumas-act.md
@@ -0,0 +1,7 @@
+---
+'@faustwp/blocks': major
+---
+
+Updates the GraphQL fragment associated with the CoreQuote component to be compatible with WordPress 6.6
+
+Adds `legacyBehavior` to CoreButton link to work on Next.js v13.
diff --git a/internal/legacy.faustjs.org/package-lock.json b/internal/legacy.faustjs.org/package-lock.json
diff --git a/internal/legacy.faustjs.org/package.json b/internal/legacy.faustjs.org/package.json
@@ -17,10 +17,10 @@
     "write-heading-ids": "docusaurus write-heading-ids"
   },
   "dependencies": {
-    "@docusaurus/core": "^3.0.1",
-    "@docusaurus/plugin-client-redirects": "^3.0.1",
-    "@docusaurus/plugin-google-gtag": "^3.0.1",
-    "@docusaurus/preset-classic": "^3.0.1",
+    "@docusaurus/core": "^3.5.2",
+    "@docusaurus/plugin-client-redirects": "^3.5.2",
+    "@docusaurus/plugin-google-gtag": "^3.5.2",
+    "@docusaurus/preset-classic": "^3.5.2",
     "@mdx-js/react": "^3.0.0",
     "@svgr/webpack": "^8.1.0",
     "clsx": "^2.0.0",
@@ -42,5 +42,11 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
+  },
+  "overrides": {
+    "express": "^4.17.1",
+    "serve-handler": {
+      "path-to-regexp": "3.3.0"
+    }
   }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/blocks/src/blocks/CoreButton.tsx b/packages/blocks/src/blocks/CoreButton.tsx
@@ -35,7 +35,7 @@ export function CoreButton(props: CoreButtonFragmentProps) {
         aria-label={attributes?.text}
         id={attributes?.anchor}
         className={attributes?.cssClassName}>
-        <Link href={attributes?.url}>
+        <Link legacyBehavior href={attributes?.url}>
           <a
             target={linkTarget}
             className={attributes?.linkClassName}

diff --git a/packages/blocks/src/blocks/CoreQuote.tsx b/packages/blocks/src/blocks/CoreQuote.tsx
@@ -6,7 +6,7 @@ import { getStyles } from '../utils/index.js';
 
 export type CoreQuoteFragmentProps = ContentBlock & {
   attributes?: {
-    align?: string;
+    textAlign?: string;
     anchor?: string;
     backgroundColor?: string;
     citation?: string;
@@ -52,7 +52,7 @@ CoreQuote.fragments = {
   entry: gql`
     fragment CoreQuoteBlockFragment on CoreQuote {
       attributes {
-        align
+        textAlign
         anchor
         backgroundColor
         citation

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -63,7 +63,7 @@
   "author": "WP Engine",
   "license": "MIT",
   "dependencies": {
-    "cookie": "^0.4.1",
+    "cookie": "^0.7.0",
     "deepmerge": "^4.2.2",
     "gqty": "^2.3.0",
     "isomorphic-fetch": "^3.0.0",

diff --git a/plugins/faustwp/CHANGELOG.md b/plugins/faustwp/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Faust
 
+## 1.5.0
+
+### Minor Changes
+
+- 011cd931: - Added a custom PluginUpdater class to enable FaustWP plugin updates from an external API endpoint.
+
 ## 1.4.1
 
 ### Patch Changes

diff --git a/plugins/faustwp/faustwp.php b/plugins/faustwp/faustwp.php
@@ -9,7 +9,7 @@
  * License URI: https://www.gnu.org/licenses/gpl-2.0.html
  * Text Domain: faustwp
  * Domain Path: /languages
- * Version: 1.4.1
+ * Version: 1.5.0
  * Requires PHP: 7.2
  * Requires at least: 5.7
  * Update URI: false

diff --git a/plugins/faustwp/package.json b/plugins/faustwp/package.json
@@ -1,5 +1,5 @@
 {
   "name": "@faustwp/wordpress-plugin",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "private": true
 }
diff --git a/plugins/faustwp/readme.txt b/plugins/faustwp/readme.txt
@@ -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.6.1
-Stable tag: 1.4.1
+Stable tag: 1.5.0
 Requires PHP: 7.2
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -54,6 +54,12 @@ plugins/faustwp/.wordpress-org/screenshot-3.png
 
 == Changelog ==
 
+= 1.5.0 =
+
+### Minor Changes
+
+- 011cd931: - Added a custom PluginUpdater class to enable FaustWP plugin updates from an external API endpoint.
+
 = 1.4.1 =
 
 ### Patch Changes
@@ -66,10 +72,4 @@ plugins/faustwp/.wordpress-org/screenshot-3.png
 
 - 9ff1df86: Introduces a new setting on the Faust settings page that allows users to opt-in or out of Faust removing Nav Menu Locations that are not registered on the Faust Settings page.
 
-= 1.3.2 =
-
-### Patch Changes
-
-- 84076cd1: Bug: Fixes issue with blocks not showing in the block editor when running blockset command on WP >=v6.5
-
 [View the full changelog](https://github.com/wpengine/faustjs/blob/canary/plugins/faustwp/CHANGELOG.md)