Skip to content

Commit

Permalink
Merge branch 'develop' into feature/wp-search-endpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
lucymtc committed Jan 26, 2024
2 parents bbbb814 + d43a409 commit acbb6e7
Show file tree
Hide file tree
Showing 34 changed files with 350 additions and 137 deletions.
19 changes: 19 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"mode": "pre",
"tag": "next",
"initialVersions": {
"@headstartwp/core": "1.2.0",
"@10up/react-hooks": "1.2.3",
"@headstartwp/next": "1.2.0",
"@10up/next-redis-cache-provider": "0.2.0",
"@10up/headless-docs": "1.0.0",
"@10up/wp-multisite-i18n-nextjs": "0.2.0",
"@10up/wp-multisite-nextjs": "0.2.0",
"@10up/wp-nextjs": "0.2.0",
"@10up/wp-nextjs-ts": "0.2.1-next.2",
"@headstartwp/headstartwp": "1.0.12"
},
"changesets": [
"wicked-bats-lay"
]
}
5 changes: 5 additions & 0 deletions .changeset/serious-feet-kick.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@headstartwp/headstartwp": patch
---

Override Yoast head values to fix seo data for search results page.
5 changes: 0 additions & 5 deletions .changeset/sweet-gorillas-admire.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/wicked-bats-lay.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@10up/next-redis-cache-provider": major
---

Suport for >= Next.js 13.5
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
cache: npm
- name: Install dependencies
run: npm install
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [20.x]

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup Node ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nextjs_bundle_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
- uses: actions/checkout@v2

- name: Set up node
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: '16.x'
node-version: '20.x'

- name: Install dependencies
uses: bahmutov/npm-install@v1
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
body="${body//'%'/'%25'}"
body="${body//$'\n'/'%0A'}"
body="${body//$'\r'/'%0D'}"
echo ::set-output name=body::$body
echo "body=$body" >> $GITHUB_OUTPUT
- name: Find Comment
uses: peter-evans/find-comment@v1
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/npm-release-next-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@v2

- name: Setup Node.js 16.x
uses: actions/setup-node@v2
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 20.x

- name: Install Dependencies
run: npm ci
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-latest-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@v2

- name: Setup Node.js 16.x
uses: actions/setup-node@v2
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 20.x

- name: Install Dependencies
run: npm ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: actions/checkout@v2

- name: Setup Node ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

Expand Down
2 changes: 1 addition & 1 deletion .gitpod.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM gitpod/workspace-full:latest

RUN bash -c ". .nvm/nvm.sh && nvm install 16 && nvm use 16 && nvm alias default 16"
RUN bash -c ". .nvm/nvm.sh && nvm install 20 && nvm use 20 && nvm alias default 20"

RUN echo "nvm use default &>/dev/null" >> ~/.bashrc.d/51-nvm-fix
9 changes: 9 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
image:
file: .gitpod.Dockerfile
tasks:
- name: Start Redis Stack
init: |
docker-compose pull
command: |
alias redis-cli="docker exec -it redis-stack redis-cli"
echo "Use redis-cli to interact with Redis here."
docker-compose up -d
gp sync-done finished
openMode: split-left
- name: Start dev server
init: npm install
command: npm run dev
7 changes: 7 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: "3.9"
services:
redis:
container_name: redis-stack
image: redis/redis-stack:latest
ports:
- "6379:6379"
12 changes: 6 additions & 6 deletions docs/package-lock.json

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

Loading

0 comments on commit acbb6e7

Please sign in to comment.