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.

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

Fix main merge conflict in Deny Public Access Callback #633

Merged
merged 40 commits into from
Nov 5, 2021

Conversation

blakewilson
Copy link
Contributor

No description provided.

apmatthews and others added 30 commits October 13, 2021 09:53
* doc: (#519) adding examples for getStaticPaths

* Update API Router auth import docs

* Update API Router imports to use `@faustjs/core/api`

Co-authored-by: William Johnston <[email protected]>
* Lint plugin

* Run unit tests via docker/github actions

* Use -T in docker-compose

* Use docker command instead of docker compose

* Remove interactive tty

* List files in dir

* Simplify docker from

* Fix wp-cli

* Use wp cli from run step

* Run unit test on windows

* Test docker unit tests with macos

* Remove volume from docker compose

* inspect container

* Add working-directory to inspect step

* Use entrypoint/cmd

* Sleep for 30 secs

* Link db

* Try simplifying testing env

* Use more verbose phpunit command

* Check current dir

* Composer install

* Clean up test action

* Set sleep to 15 seconds

* Fix CircleCI test

* Update documentation

* Update action names
* chore: delete unused wp-env config

* chore: prepare for plugin file/folder rename

* refactor: plugin file/folder name to faustwp

* chore: update WPE Headless to FaustWP

* test: update e2e test db
* #590 exporting auth, moving all exports into export folder

* #590 exporting utils

* #590 exporting config

* #590 exporting client

* #590 removing most of schema.generated, exporting only getClient, config, and related types

* #590 Headless -> Faust.js

* #590 HeadlessConfig -> Config

* #590 HeadlessConfig -> ClientConfig

* chore: changeset

* fix: core test imports

* chore: updating packages

* fix: only one failing test based on no exports support from jest 27

* fix: fixing tests, updating dependencies
* Create E2E action

* Setup PHP and Node

* Ensure frontend process doesn't hang

* Don't use docker compose in exec scripts

* Add sleep for DB to accept connections

* Add working directory to setup tests step

* Use Allow root wp cli

* Setup chrome

* Fix chrome version step syntax

* Chrome/ChromeDriver is already installed on action

* Add chrome driver args for GH Actions

* e2e Click preview link and determine if correct preview page is fetched

* Revert preview link href assertion removal

* Wait for previewlinks.js to modify button href before checking preview link
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* chore: Upload test artifact upon failure

* fix: increase wait time for preview test to 14 seconds
* refactor: rename settings option to faustwp_settings

* feat: add database upgrade functions
blakewilson and others added 10 commits October 25, 2021 13:45
* feat: create wordpress.org deploy GH action

* docs: reflect new release steps

* chore: add dist ignore for plugin release

* chore: copy 10up action src

* refactor: option to specify plugin src dir

* refactor: use release-pugin local action
* fix: NPM deps install

* Squashed commit of the following:

commit 40d08d0
Author: William Johnston <[email protected]>
Date:   Fri Oct 22 13:47:00 2021 -0700

    fix: exporting components from declaration

commit 145ef99
Merge: 632a57f 4d7f981
Author: William Johnston <[email protected]>
Date:   Fri Oct 22 10:46:13 2021 -0700

    Merge branch 'canary' into next-refactor

commit 632a57f
Author: William Johnston <[email protected]>
Date:   Fri Oct 22 10:05:38 2021 -0700

    feat: (#591) adding changeset denoting breaking change

commit 7f2a760
Author: William Johnston <[email protected]>
Date:   Fri Oct 22 09:55:23 2021 -0700

    feat: (#591) limiting root @faustjs/next exports to those needed by client

commit b1ba602
Author: William Johnston <[email protected]>
Date:   Fri Oct 22 09:48:03 2021 -0700

    feat: (#591) creating @faustjs/next/components export

commit e4ad3ea
Author: William Johnston <[email protected]>
Date:   Fri Oct 22 09:46:28 2021 -0700

    feat: (#591) creating @faustjs/next/server export

commit 69b6321
Author: William Johnston <[email protected]>
Date:   Fri Oct 22 09:43:46 2021 -0700

    feat: (#591) creating @faustjs/next/log export

commit 9be7e1d
Author: William Johnston <[email protected]>
Date:   Fri Oct 22 09:41:23 2021 -0700

    feat: (#591) creating @faustjs/next/config export

commit 664bb90
Author: William Johnston <[email protected]>
Date:   Fri Oct 22 09:38:01 2021 -0700

    feat: (#591) creating @faustjs/next/utils export

commit 38888e8
Author: William Johnston <[email protected]>
Date:   Fri Oct 22 09:36:51 2021 -0700

    feat: (#591) migrating to src/gqty and exposing @faustjs/next/client

* fix: add build step

* refactor: use dev:next:getting-started command

* Revert "Squashed commit of the following:"

This reverts commit d15356f.
* feat: (#591) migrating to src/gqty and exposing @faustjs/next/client

* feat: (#591) creating @faustjs/next/utils export

* feat: (#591) creating @faustjs/next/config export

* feat: (#591) creating @faustjs/next/log export

* feat: (#591) creating @faustjs/next/server export

* feat: (#591) creating @faustjs/next/components export

* feat: (#591) limiting root @faustjs/next exports to those needed by client

* feat: (#591) adding changeset denoting breaking change

* fix: exporting components from declaration

Co-authored-by: Blake Wilson <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* doc: (#519) adding examples for getStaticPaths

* Update API Router auth import docs

* Update API Router imports to use `@faustjs/core/api`

* Breakout Hooks into individual Pages (#631)

* docs: break out hooks

* Update links to appropriate hooks url

* Logging queries guide

* Fix docs site URLs

* Fix hooks links

Co-authored-by: William Johnston <[email protected]>
@blakewilson blakewilson requested a review from a team November 5, 2021 19:05
@blakewilson blakewilson merged commit 953a767 into main Nov 5, 2021
@blakewilson blakewilson deleted the fix-main-conflict branch November 5, 2021 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants