Merge branch 'heads/canary' into 2096-faustwp---content-replacement-bug

Author: colinmurphy

.github/workflows/nightly-releases.yml

@@ -22,6 +22,7 @@ on:
 
 jobs:
   release_nightly_canary:
+    if: github.repository_owner == 'wpengine'
     name: Release Nightly Canary
     runs-on: ubuntu-22.04
     steps:

.github/workflows/unit-test-plugin.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        wordpress: [ '6.7', '6.6', '6.5', '6.4', '6.3', '6.2']
+        wordpress: [ '6.8', '6.7', '6.6', '6.5', '6.4', '6.3', '6.2']
     steps:
       - name: Checkout
         uses: actions/checkout@v4

README.md

@@ -55,11 +55,11 @@ Docs are MD in [`docs`](docs/). Here are a couple things you should know!
       1.  Lines can be [highlighted](https://rehype-pretty.pages.dev/#highlight-lines) in code blocks ` ```js {1,3-5}`. There are a variety of advanced highlighting methods, see: https://rehype-pretty.pages.dev/#highlight-lines
       2.  Lines may be [diffed](https://shiki.style/packages/transformers#transformernotationdiff) in a code block:
 
-              ```js
-              console.log('hewwo') // [!code --]
-              console.log('hello') // [!code ++]
-              console.log('goodbye')
-              ```
+			```js
+			console.log('hewwo') // [!code --]
+			console.log('hello') // [!code ++]
+			console.log('goodbye')
+			```
 
 ## WordPress Plugin (FaustWP)
 

examples/next/block-support/package-lock.json

@@ -17,7 +17,7 @@
     "@faustwp/core": "^3.2.1",
     "classnames": "^2.5.1",
     "graphql": "^16.10.0",
-    "next": "^14.2.25",
+    "next": "^14.2.26",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "sass": "^1.54.9"

examples/next/block-support/package.json

@@ -28,7 +28,7 @@
 		"dev:next:getting-started": "rimraf examples/next/faustwp-getting-started/.next && npm run dev ---workspace=examples/next/faustwp-getting-started",
 		"test": "npm run build && npm test --workspace=@faustwp/core --workspace=@faustwp/cli --workspace=@faustwp/blocks --workspace=@faustwp/block-editor-utils",
 		"test:coverage": "npm run build && npm run test:coverage --workspace=@faustwp/block-editor-utils",
-		"test:format": "npm run test:format --workspace=@faustwp/cli --workspace=@faustwp/core --workspace=@faustwp/block-editor-utils",
+		"test:format": "npm run test:format --workspace=@faustwp/cli --workspace=@faustwp/core --workspace=@faustwp/block-editor-utils -- --ignore-path .eslintignore --ignore-pattern CHANGELOG.md",
 		"wpe-build": "exit 1",
 		"changeset": "changeset",
 		"version": "changeset version && node scripts/versionPlugin.js",

package.json

@@ -36,15 +36,15 @@
   // Component.js
 
   Component.config = {
-    name: 'CreateBlockBlockB',
-    editorFields: {
-      textArea: {
-        type: 'string',
-        label: 'My Message',
-        location: 'editor',
-        control: 'textarea', // <--- Render a TextAreaControl field in the Gutenberg editor
-      },
-    },
+  	name: 'CreateBlockBlockB',
+  	editorFields: {
+  		textArea: {
+  			type: 'string',
+  			label: 'My Message',
+  			location: 'editor',
+  			control: 'textarea', // <--- Render a TextAreaControl field in the Gutenberg editor
+  		},
+  	},
   };
   ```
 
@@ -78,9 +78,9 @@
 
   ```js
   <div
-    style={styles}
-    className="rich-text"
-    dangerouslySetInnerHTML={{ __html: attributes.richText }}
+  	style={styles}
+  	className="rich-text"
+  	dangerouslySetInnerHTML={{ __html: attributes.richText }}
   />
   ```
 
@@ -131,9 +131,9 @@
   import save from './save';
 
   registerFaustBlock(MyFirstBlock, {
-    blockJson: metadata,
-    editFn: Edit,
-    saveFn: save,
+  	blockJson: metadata,
+  	editFn: Edit,
+  	saveFn: save,
   });
   ```
 

packages/block-editor-utils/CHANGELOG.md

@@ -38,11 +38,11 @@
   export default function Sitemap() {}
 
   export function getServerSideProps(ctx) {
-    return getSitemapProps(ctx, {
-      sitemapIndexPath: '/sitemap_index.xml', // RankMath changes the default sitemap path to this
-      frontendUrl: process.env.NEXT_PUBLIC_SITE_URL,
-      sitemapPathsToIgnore: ['/wp-sitemap-users-*'],
-    });
+  	return getSitemapProps(ctx, {
+  		sitemapIndexPath: '/sitemap_index.xml', // RankMath changes the default sitemap path to this
+  		frontendUrl: process.env.NEXT_PUBLIC_SITE_URL,
+  		sitemapPathsToIgnore: ['/wp-sitemap-users-*'],
+  	});
   }
   ```
 
@@ -146,7 +146,7 @@
 
   ```jsx
   <ToolbarItem onKeyDown={handleKeyDown} onClick={handleClick}>
-    Log Out
+  	Log Out
   </ToolbarItem>
   ```
 
@@ -252,18 +252,18 @@
   import { FaustPage } from '@faustwp/core';
 
   type GetPageData = {
-    generalSettings: {
-      title: string;
-    };
+  	generalSettings: {
+  		title: string;
+  	};
   };
 
   type PageProps = {
-    myProp: string;
+  	myProp: string;
   };
 
   const Page: FaustPage<GetPageData, PageProps> = (props) => {
-    const { myProp, data } = props;
-    return <></>;
+  	const { myProp, data } = props;
+  	return <></>;
   };
   ```
 
@@ -332,9 +332,9 @@
   export default function Sitemap() {}
 
   export function getServerSideProps(context) {
-    return getSitemapProps(context, {
-      frontendUrl: process.env.FRONTEND_URL, // Set the FRONTEND_URL as an env var
-    });
+  	return getSitemapProps(context, {
+  		frontendUrl: process.env.FRONTEND_URL, // Set the FRONTEND_URL as an env var
+  	});
   }
   ```
 
@@ -364,7 +364,7 @@
   import { FaustHooks, FaustPlugin } from '@faustwp/core';
 
   export class MyPlugin implements FaustPlugin {
-    apply(hooks: FaustHooks) {}
+  	apply(hooks: FaustHooks) {}
   }
   ```