Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync canary -> main #1727

Merged
merged 17 commits into from
Jan 12, 2024
Merged

Sync canary -> main #1727

merged 17 commits into from
Jan 12, 2024

Conversation

blakewilson
Copy link
Contributor

Tasks

  • I have signed a Contributor License Agreement (CLA) 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 to properly document the changes I've made.

Description

Related Issue(s):

Testing

Screenshots

Documentation Changes

Dependant PRs

theodesp and others added 17 commits December 7, 2023 11:48
@theodesp
Docs: Publish block-editor-utils README to NPM (#1664)
66c1e24 
* Docs: Update Readme for NPM

* Update breezy-drinks-wink.md
@dependabot @blakewilson
chore(deps): Bump axios, @docusaurus/core, @docusaurus/plugin-client-…
4fdb46a 
…redirects, @docusaurus/plugin-google-gtag and @docusaurus/preset-classic in /internal/legacy.faustjs.org (#1674)

* chore(deps): Bump axios, @docusaurus/core, @docusaurus/plugin-client-redirects, @docusaurus/plugin-google-gtag and @docusaurus/preset-classic

Removes [axios](https://github.com/axios/axios). It's no longer used after updating ancestor dependencies [axios](https://github.com/axios/axios), [@docusaurus/core](https://github.com/facebook/docusaurus/tree/HEAD/packages/docusaurus), [@docusaurus/plugin-client-redirects](https://github.com/facebook/docusaurus/tree/HEAD/packages/docusaurus-plugin-client-redirects), [@docusaurus/plugin-google-gtag](https://github.com/facebook/docusaurus/tree/HEAD/packages/docusaurus-plugin-google-gtag) and [@docusaurus/preset-classic](https://github.com/facebook/docusaurus/tree/HEAD/packages/docusaurus-preset-classic). These dependencies need to be updated together.


Removes `axios`

Updates `@docusaurus/core` from 2.3.1 to 3.0.1
- [Release notes](https://github.com/facebook/docusaurus/releases)
- [Changelog](https://github.com/facebook/docusaurus/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/docusaurus/commits/v3.0.1/packages/docusaurus)

Updates `@docusaurus/plugin-client-redirects` from 2.3.1 to 3.0.1
- [Release notes](https://github.com/facebook/docusaurus/releases)
- [Changelog](https://github.com/facebook/docusaurus/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/docusaurus/commits/v3.0.1/packages/docusaurus-plugin-client-redirects)

Updates `@docusaurus/plugin-google-gtag` from 2.3.1 to 3.0.1
- [Release notes](https://github.com/facebook/docusaurus/releases)
- [Changelog](https://github.com/facebook/docusaurus/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/docusaurus/commits/v3.0.1/packages/docusaurus-plugin-google-gtag)

Updates `@docusaurus/preset-classic` from 2.3.1 to 3.0.1
- [Release notes](https://github.com/facebook/docusaurus/releases)
- [Changelog](https://github.com/facebook/docusaurus/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/docusaurus/commits/v3.0.1/packages/docusaurus-preset-classic)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: indirect
- dependency-name: "@docusaurus/core"
  dependency-type: direct:production
- dependency-name: "@docusaurus/plugin-client-redirects"
  dependency-type: direct:production
- dependency-name: "@docusaurus/plugin-google-gtag"
  dependency-type: direct:production
- dependency-name: "@docusaurus/preset-classic"
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update `react` and `react-dom` dependencies

* FIx new docusaurus lints

* Update other dependencies

* Use node 18 to build legacy docs

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Blake Wilson <blake.wilson@wpengine.com>
@theodesp
Feat: Add RichText Control (#1670)
8dcda28 
* Feat: Add RichText Control

* Tests: Update RichText snapshot
@blakewilson
Merl 1306 multiple queries (#1661)
c79c8c2 
* Create FaustContext and Faust template `queries` property

* Implement new method of fetching queries with their own variables

* Remove unneeded context check

* Fix linting issues

* Allow typing for `useFaustQuery`

* Update package-lock.json

* WIP: set queries in Faust Context

* Fix types

* Remove unneeded properties of single.js

* Refactor WordPressTemplate

* Wrap up final touches for WordPressTemplate

* <WordPressTemplate/> tests

* Finish test for WordPressTemplateInternal

* update package-lock.json

* Fix failing builds

* use FaustQueries type

* Add error boundary for when both `template.queries` and `template.query` are provided

* Added changeset
@blakewilson
Remove internal/faustjs.org (#1686)
fd0edd5 
* Remove `internal/faustjs.org`

* Remove unneeded docs related files
@josephfusco
Migrate WordPress block asset files from PHP to JSON format (#1656)
205fb09 
* Improve unzipping compat

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Fix liniting issues

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Fix liniting issues

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Fix linting issues

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Clean up unused functions & tests

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Add test coverage

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Match parent class

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Fix PSR-4 warning

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Improve block tests

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Attempt to fix failing test config

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* failing tests

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Update tests

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Fix refactoring issues

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Explicitly require patchwork

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Require patchwork before anything else

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Correct path to Patchwork

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Attempt to resolve failing E2E tests

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Scope requiring patchwork to it’s relevant class

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Revert "Scope requiring patchwork to it’s relevant class"

This reverts commit 9b3371a.

* Avoid polluting codeception env with Patchwork

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Conditionally load patchwork package via env

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Only update antecedent/patchwork in lockfile

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Clean up refactor

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Use our own directories method

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Update tests to reflect function argument changes

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Clean up

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Revert "Clean up"

This reverts commit 7352acc.

* Prevent .php inclusion as faust handles dependencies

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Update block-support example deps

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Ensure --webpack-no-externals is used to remove generated php

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* leave wp deps alone

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Remove problematic CLI flag

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Handle PHP block files in the CLI w/ tests

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Resolve linting errors

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Clean up logging

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Resolve phpcs issue

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Resolve phpcs issue

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Fix asset loading

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Sync lockfile

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Resolve linting issues

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Fix linting warnings

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

* Update lockfile

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>

---------

Signed-off-by: Joe Fusco <joe.fusco@wpengine.com>
@theodesp
Add phpstan to CI workflow (#1705)
e725bda 
* build(faustwp): Add phpstan workflow

* Chore: Update composer.lock

* Fix: Fix type error in legacy example

* Fix Codeception e2e test config
@mindctrl
chore: Test WP versions 6.3 and 6.4. Drop 6.2. (#1708)
ad23377
@theodesp @mindctrl
[FaustWP] Ignore robots in plugin redirects (#1709)
5f78b15 
* Feat: Ensure robots.txt is accessible on the WP site

* Update .changeset/brave-horses-laugh.md

Co-authored-by: John Parris <john.parris@wpengine.com>

---------

Co-authored-by: John Parris <john.parris@wpengine.com>
@jasonbahl @mindctrl
fix: term_link filter (#1653)
0aa1989 
* This fixes the term_link filter callback to not modify the term link urls for GraphQL requests.

---------

Co-authored-by: John Parris <public@johnparris.com>
@mindctrl
chore: add changeset for #1653 (#1716)
41a6d9c
@dependabot
chore(deps-dev): Bump follow-redirects from 1.15.3 to 1.15.4 (#1718)
ed14144 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.3 to 1.15.4.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.15.3...v1.15.4)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
chore(deps): Bump follow-redirects in /internal/legacy.faustjs.org (#…
f1e7058 
…1719)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.3 to 1.15.4.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.15.3...v1.15.4)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@mindctrl @blakewilson
@theodesp @matthewguywright @TeresaGobble
Moves anonymous opt-in telemetry function from CLI to WP plugin (#1721)
c163fa5 
* Create process telemetry rest route (#1684)

* Create tests

* [Merl-1281] Add extra Google Analytics variables to Faust (#1689)

* Feat: Add block_editor_utils and app-router versions in telemetry events.

* Chore: Added changeset

* MERL-1343/MERL-1342: API rewrite to WP plugin vs GA (#1687)

* Removed telemetry from the CLI and moved it into the Faust WordPress plugin.

---------

Co-authored-by: Blake Wilson <blake.wilson@wpengine.com>
Co-authored-by: John Parris <john.parris@wpengine.com>

* MERL-1339: add WP notice for anonymous telemetry opt-in (#1690)

* Added checkbox for 'Enable Faust Telemetry'

* Added telemetry prompt to user page options

* Add `enable_telemetry` and `telemetry_reminder` to `sanitize_faustwp_settings()`

* Load telemetry callbacks file

* test: confirm `show_telemetry_prompt()` is hooked to `admin_notices`

* Sanitize telemetry reminder settings value by ensuring it's an integer

* Test telemetry prompt behavior

* test: confirm behavior of `should_show_telemetry_prompt()`

* fix: adjust CSS button styles to not style buttons in the telemetry prompt

* chore: adjust button classes and add aria-label attributes

* Register, enqueue, and localize telemetry script

* Register telemetry decision REST route

* test: confirm telemetry script is registered

* UX: Toggle checkbox on settings page to match user's decision.

Since this happens over REST via JS and we don't reload the page, this provides a better UX.

* test: confirm `should_show_telemetry_prompt()` returns false when telemetry disabled

* chore: add changeset

---------

Co-authored-by: John Parris <john.parris@wpengine.com>

* Generate UUID v4 for telemetry ID (#1693)

* chore: change test namespace from Unit to Integration

* chore: fix test class name to match file name

* fix: return 204 if telemetry not enabled

* test: confirm behavior of `generate_telemetry_client_id()`

* Support `telemetry_client_id` in settings sanitization function

* test: confirm generated and saved id matches retrieved id.


---------

Co-authored-by: Blake Wilson <blake.wilson@wpengine.com>

---------

Co-authored-by: Blake Wilson <blake.wilson@wpengine.com>
Co-authored-by: Theofanis Despoudis <328805+theodesp@users.noreply.github.com>
Co-authored-by: Matthew Wright <1815200+matthewguywright@users.noreply.github.com>
Co-authored-by: Teresa Gobble <teresagobble@gmail.com>
@github-actions
Version Packages (#1672)
5bad238 
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@blakewilson @josephfusco
Fix 401 token request in WordPressTemplate (#1724)
085c30d 
* Add `skip` config option to `useAuth` to skip invocation of hook

* Check for existing tokens in `ensureAuthorization` before requesting new ones

* Add changesets

* Reset the access token after each test

* Update packages/faustwp-core/tests/hooks/useAuth.test.ts

Co-authored-by: Joe Fusco <josephfusco@users.noreply.github.com>

---------

Co-authored-by: Joe Fusco <josephfusco@users.noreply.github.com>
@github-actions
Version Packages (#1726)
87000a3 
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@blakewilson blakewilson requested a review from a team as a code owner January 12, 2024 17:39
@changeset-bot changeset-bot
Copy link

changeset-bot bot commented Jan 12, 2024

⚠️ No Changeset found

Latest commit: 87000a3

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@blakewilson blakewilson merged commit 4d42e01 into main Jan 12, 2024
22 of 23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mindctrl mindctrl mindctrl approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@blakewilson @mindctrl @theodesp @josephfusco @jasonbahl