From 5cccea47f48e38ef55f0bac1b1607eeb73054f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=ADcholas=20Oliveira?= Date: Mon, 15 Jul 2024 18:35:12 -0300 Subject: [PATCH] feat: app router multisite --- package.json | 7 +- packages/next/src/middlewares/appMidleware.ts | 16 +++-- .../next/src/rsc/data/queries/prepareQuery.ts | 4 +- .../src/rsc/data/queries/queryAppSettings.ts | 3 +- packages/next/src/rsc/types.ts | 5 ++ projects/wp-multisite-nextjs-app/.env | 2 + projects/wp-multisite-nextjs-app/.eslintrc.js | 14 ++++ projects/wp-multisite-nextjs-app/.gitignore | 36 +++++++++++ projects/wp-multisite-nextjs-app/README.md | 36 +++++++++++ .../headstartwp.config.js | 23 +++++++ .../wp-multisite-nextjs-app/next.config.js | 16 +++++ projects/wp-multisite-nextjs-app/package.json | 27 ++++++++ .../app}/[site]/(single)/[...path]/page.tsx | 11 +++- .../src/app/[site]/author/[...path]/page.tsx | 24 +++++++ .../src/app/[site]/blog/[[...path]]/page.tsx | 61 ++++++++++++++++++ .../app/[site]/category/[...path]/page.tsx | 27 ++++++++ .../src/app/[site]/favicon.ico | Bin 0 -> 25931 bytes .../src/app/[site]/globals.css | 34 ++++++++++ .../src/app/[site]/layout.tsx | 21 ++++++ .../src/app/[site]/not-found.tsx | 13 ++++ .../src/app/[site]/page.tsx | 23 +++++++ .../app/[site]/search/[[...path]]/page.tsx | 29 +++++++++ .../src/app/[site]/tag/[...path]/page.tsx | 27 ++++++++ .../src/app/api/preview/route.ts | 7 ++ .../src/app/api/revalidate/route.ts | 7 ++ .../src/app/layout.tsx | 23 +++++++ .../src/app/not-found.tsx | 13 ++++ .../wp-multisite-nextjs-app/src/middleware.ts | 20 ++++++ .../wp-multisite-nextjs-app/tsconfig.json | 33 ++++++++++ 29 files changed, 548 insertions(+), 14 deletions(-) create mode 100644 projects/wp-multisite-nextjs-app/.env create mode 100644 projects/wp-multisite-nextjs-app/.eslintrc.js create mode 100644 projects/wp-multisite-nextjs-app/.gitignore create mode 100644 projects/wp-multisite-nextjs-app/README.md create mode 100644 projects/wp-multisite-nextjs-app/headstartwp.config.js create mode 100644 projects/wp-multisite-nextjs-app/next.config.js create mode 100644 projects/wp-multisite-nextjs-app/package.json rename projects/{wp-nextjs-app/src/app/_sites => wp-multisite-nextjs-app/src/app}/[site]/(single)/[...path]/page.tsx (54%) create mode 100644 projects/wp-multisite-nextjs-app/src/app/[site]/author/[...path]/page.tsx create mode 100644 projects/wp-multisite-nextjs-app/src/app/[site]/blog/[[...path]]/page.tsx create mode 100644 projects/wp-multisite-nextjs-app/src/app/[site]/category/[...path]/page.tsx create mode 100644 projects/wp-multisite-nextjs-app/src/app/[site]/favicon.ico create mode 100644 projects/wp-multisite-nextjs-app/src/app/[site]/globals.css create mode 100644 projects/wp-multisite-nextjs-app/src/app/[site]/layout.tsx create mode 100644 projects/wp-multisite-nextjs-app/src/app/[site]/not-found.tsx create mode 100644 projects/wp-multisite-nextjs-app/src/app/[site]/page.tsx create mode 100644 projects/wp-multisite-nextjs-app/src/app/[site]/search/[[...path]]/page.tsx create mode 100644 projects/wp-multisite-nextjs-app/src/app/[site]/tag/[...path]/page.tsx create mode 100644 projects/wp-multisite-nextjs-app/src/app/api/preview/route.ts create mode 100644 projects/wp-multisite-nextjs-app/src/app/api/revalidate/route.ts create mode 100644 projects/wp-multisite-nextjs-app/src/app/layout.tsx create mode 100644 projects/wp-multisite-nextjs-app/src/app/not-found.tsx create mode 100644 projects/wp-multisite-nextjs-app/src/middleware.ts create mode 100644 projects/wp-multisite-nextjs-app/tsconfig.json diff --git a/package.json b/package.json index 5cf581936..ecf8927b6 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,10 @@ "test:watch": "turbo run test:watch", "lint": "turbo run lint", "wp-env": "npm run wp-env:start -w=wp/headless-wp", - "dev": "turbo run dev --parallel --filter=!./projects/wp-multisite-nextjs --filter=!./projects/wp-multisite-i18n-nextjs", - "dev:app": "turbo run dev --parallel --filter=!./projects/wp-multisite-nextjs --filter=!./projects/wp-multisite-i18n-nextjs --filter=!./projects/wp-nextjs", - "dev:multisite": "turbo run dev --parallel --filter=!./projects/wp-nextjs", + "dev": "turbo run dev --parallel --filter=./projects/wp-nextjs --filter=./packages/core --filter=./packages/next", + "dev:app": "turbo run dev --parallel --filter=./projects/wp-nextjs-app --filter=./packages/core --filter=./packages/next", + "dev:app:multisite": "turbo run dev --parallel --filter=./projects/wp-multisite-nextjs-app --filter=./packages/core --filter=./packages/next", + "dev:multisite": "turbo run dev --parallel --filter=./projects/wp-multisite-nextjs --filter=./packages/core --filter=./packages/next", "prepare": "husky install", "typedoc": "typedoc", "typedoc:watch": "typedoc --watch", diff --git a/packages/next/src/middlewares/appMidleware.ts b/packages/next/src/middlewares/appMidleware.ts index 8b98096c5..96d2fdcfa 100644 --- a/packages/next/src/middlewares/appMidleware.ts +++ b/packages/next/src/middlewares/appMidleware.ts @@ -22,7 +22,7 @@ export async function AppMiddleware( options: AppMidlewareOptions = { appRouter: false }, ) { let response = NextResponse.next(); - + const currentUrl = req.nextUrl.pathname; if (isStaticAssetRequest(req) || isInternalRequest(req)) { return response; } @@ -52,16 +52,20 @@ export async function AppMiddleware( } if (isMultisiteRequest) { - const hostname = req.headers.get('host') || ''; - const url = req.nextUrl; - url.pathname = `/_sites/${hostname}${url.pathname}`; - response = NextResponse.rewrite(url); + response = NextResponse.rewrite( + new URL( + options.appRouter + ? `/${hostname}${url.pathname}` + : `/_sites/${hostname}${url.pathname}`, + url, + ), + ); response.headers.set('x-headstartwp-site', hostname); } - response.headers.set('x-headstartwp-current-url', req.nextUrl.pathname); + response.headers.set('x-headstartwp-current-url', currentUrl); return response; } diff --git a/packages/next/src/rsc/data/queries/prepareQuery.ts b/packages/next/src/rsc/data/queries/prepareQuery.ts index 79d067977..0c71b12ca 100644 --- a/packages/next/src/rsc/data/queries/prepareQuery.ts +++ b/packages/next/src/rsc/data/queries/prepareQuery.ts @@ -18,7 +18,9 @@ export function prepareQuery

( const { routeParams, ...rest } = query; const path = routeParams?.path ?? ''; - const siteConfig = routeParams?.site ? getSiteByHost(routeParams?.site) : null; + const siteConfig = routeParams?.site + ? getSiteByHost(decodeURIComponent(routeParams?.site)) + : null; if (routeParams?.site && !siteConfig) { throw new FrameworkError( diff --git a/packages/next/src/rsc/data/queries/queryAppSettings.ts b/packages/next/src/rsc/data/queries/queryAppSettings.ts index f39f654ca..df9e0f88d 100644 --- a/packages/next/src/rsc/data/queries/queryAppSettings.ts +++ b/packages/next/src/rsc/data/queries/queryAppSettings.ts @@ -7,11 +7,12 @@ import { } from '@headstartwp/core'; import { handleFetchError } from '../handleFetchError'; import { prepareQuery } from './prepareQuery'; +import { NextQueryProps } from './types'; export async function queryAppSettings< T extends AppEntity = AppEntity, P extends EndpointParams = EndpointParams, ->(q: AppQueryProps

= {}, _config: HeadlessConfig | undefined = undefined) { +>(q: AppQueryProps

& NextQueryProps

= {}, _config: HeadlessConfig | undefined = undefined) { const { config, ...query } = prepareQuery

(q, _config); try { diff --git a/packages/next/src/rsc/types.ts b/packages/next/src/rsc/types.ts index 7834f5603..7b4ebcbe0 100644 --- a/packages/next/src/rsc/types.ts +++ b/packages/next/src/rsc/types.ts @@ -1,3 +1,8 @@ export type HeadstartWPRoute = { params: { path: string[]; site?: string }; } & Params; + +export type HeadstartWPLayout = { + params: { site?: string }; + children: React.ReactNode; +} & Params; diff --git a/projects/wp-multisite-nextjs-app/.env b/projects/wp-multisite-nextjs-app/.env new file mode 100644 index 000000000..b013281ea --- /dev/null +++ b/projects/wp-multisite-nextjs-app/.env @@ -0,0 +1,2 @@ +NEXT_PUBLIC_HEADLESS_WP_URL=https://js1.10up.com +NEXT_PUBLIC_HOST_URL=https://js1.10up.com \ No newline at end of file diff --git a/projects/wp-multisite-nextjs-app/.eslintrc.js b/projects/wp-multisite-nextjs-app/.eslintrc.js new file mode 100644 index 000000000..16b1cc13e --- /dev/null +++ b/projects/wp-multisite-nextjs-app/.eslintrc.js @@ -0,0 +1,14 @@ +module.exports = { + extends: ['@10up/eslint-config/react'], + parser: '@typescript-eslint/parser', + plugins: ['@typescript-eslint'], + settings: { + jsdoc: { + mode: 'typescript', + }, + }, + rules: { + 'react/require-default-props': ['error', { functions: 'defaultArguments' }], + 'jsdoc/require-returns-type': 'off', + }, +}; diff --git a/projects/wp-multisite-nextjs-app/.gitignore b/projects/wp-multisite-nextjs-app/.gitignore new file mode 100644 index 000000000..fd3dbb571 --- /dev/null +++ b/projects/wp-multisite-nextjs-app/.gitignore @@ -0,0 +1,36 @@ +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. + +# dependencies +/node_modules +/.pnp +.pnp.js +.yarn/install-state.gz + +# testing +/coverage + +# next.js +/.next/ +/out/ + +# production +/build + +# misc +.DS_Store +*.pem + +# debug +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# local env files +.env*.local + +# vercel +.vercel + +# typescript +*.tsbuildinfo +next-env.d.ts diff --git a/projects/wp-multisite-nextjs-app/README.md b/projects/wp-multisite-nextjs-app/README.md new file mode 100644 index 000000000..c4033664f --- /dev/null +++ b/projects/wp-multisite-nextjs-app/README.md @@ -0,0 +1,36 @@ +This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app). + +## Getting Started + +First, run the development server: + +```bash +npm run dev +# or +yarn dev +# or +pnpm dev +# or +bun dev +``` + +Open [http://localhost:3000](http://localhost:3000) with your browser to see the result. + +You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file. + +This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font. + +## Learn More + +To learn more about Next.js, take a look at the following resources: + +- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API. +- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial. + +You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome! + +## Deploy on Vercel + +The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js. + +Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details. diff --git a/projects/wp-multisite-nextjs-app/headstartwp.config.js b/projects/wp-multisite-nextjs-app/headstartwp.config.js new file mode 100644 index 000000000..790cfa27d --- /dev/null +++ b/projects/wp-multisite-nextjs-app/headstartwp.config.js @@ -0,0 +1,23 @@ +/** + * Headless Config + * + * @type {import('@headstartwp/core').HeadlessConfig} + */ +module.exports = { + useWordPressPlugin: true, + + preview: { + usePostLinkForRedirect: true, + }, + + sites: [ + { + sourceUrl: process.env.NEXT_PUBLIC_HEADLESS_WP_URL, + hostUrl: 'http://site1.localhost:3000', + }, + { + sourceUrl: 'https://js1.10up.com/', + hostUrl: 'http://js1.localhost:3000', + }, + ], +}; diff --git a/projects/wp-multisite-nextjs-app/next.config.js b/projects/wp-multisite-nextjs-app/next.config.js new file mode 100644 index 000000000..c69600315 --- /dev/null +++ b/projects/wp-multisite-nextjs-app/next.config.js @@ -0,0 +1,16 @@ +const { withHeadstartWPConfig } = require('@headstartwp/next/config'); + +/** @type {import('next').NextConfig} */ +const nextConfig = { + webpack: (config) => { + // TODO: figure out why this is needed + config.resolve = { + ...config.resolve, + conditionNames: ['import'], + }; + + return config; + }, +}; + +module.exports = withHeadstartWPConfig(nextConfig); diff --git a/projects/wp-multisite-nextjs-app/package.json b/projects/wp-multisite-nextjs-app/package.json new file mode 100644 index 000000000..9300c806b --- /dev/null +++ b/projects/wp-multisite-nextjs-app/package.json @@ -0,0 +1,27 @@ +{ + "name": "@10up/wp-multisite-nextjs-app", + "version": "0.1.0", + "private": true, + "scripts": { + "dev": "next dev", + "build": "next build", + "start": "next start", + "lint": "next lint" + }, + "dependencies": { + "react": "^18", + "react-dom": "^18", + "next": "14.2.3", + "@headstartwp/core": "^1.4.3", + "@headstartwp/next": "^1.4.2" + }, + "devDependencies": { + "@10up/eslint-config": "^4.0.0", + "typescript": "^5", + "@types/node": "^20", + "@types/react": "^18", + "@types/react-dom": "^18", + "eslint": "^8", + "eslint-config-next": "14.2.3" + } +} diff --git a/projects/wp-nextjs-app/src/app/_sites/[site]/(single)/[...path]/page.tsx b/projects/wp-multisite-nextjs-app/src/app/[site]/(single)/[...path]/page.tsx similarity index 54% rename from projects/wp-nextjs-app/src/app/_sites/[site]/(single)/[...path]/page.tsx rename to projects/wp-multisite-nextjs-app/src/app/[site]/(single)/[...path]/page.tsx index 0d8d524a8..4fd359fe4 100644 --- a/projects/wp-nextjs-app/src/app/_sites/[site]/(single)/[...path]/page.tsx +++ b/projects/wp-multisite-nextjs-app/src/app/[site]/(single)/[...path]/page.tsx @@ -1,21 +1,26 @@ +import { BlocksRenderer, HtmlDecoder } from '@headstartwp/core/react'; import { HeadstartWPRoute, queryPost } from '@headstartwp/next/app'; const Single = async ({ params }: HeadstartWPRoute) => { const { data } = await queryPost({ routeParams: params, params: { - matchCurrentPath: false, + postType: ['post', 'page'], }, options: { headers: { - cache: 'no-store', + cache: 'force-cache', }, }, }); return (

-

{data.post.title.rendered}

+

+ +

+ +
); }; diff --git a/projects/wp-multisite-nextjs-app/src/app/[site]/author/[...path]/page.tsx b/projects/wp-multisite-nextjs-app/src/app/[site]/author/[...path]/page.tsx new file mode 100644 index 000000000..08eec52ea --- /dev/null +++ b/projects/wp-multisite-nextjs-app/src/app/[site]/author/[...path]/page.tsx @@ -0,0 +1,24 @@ +import { HeadstartWPRoute, queryAuthorArchive } from '@headstartwp/next/app'; +import Link from 'next/link'; + +const AuthorArchive = async ({ params }: HeadstartWPRoute) => { + const { data } = await queryAuthorArchive({ + routeParams: params, + }); + + return ( +
+

{data.queriedObject.author?.name}

+ + +
+ ); +}; + +export default AuthorArchive; diff --git a/projects/wp-multisite-nextjs-app/src/app/[site]/blog/[[...path]]/page.tsx b/projects/wp-multisite-nextjs-app/src/app/[site]/blog/[[...path]]/page.tsx new file mode 100644 index 000000000..f4aa233e0 --- /dev/null +++ b/projects/wp-multisite-nextjs-app/src/app/[site]/blog/[[...path]]/page.tsx @@ -0,0 +1,61 @@ +import { PostEntity, QueriedObject } from '@headstartwp/core'; +import { HeadstartWPRoute, queryPostOrPosts } from '@headstartwp/next/app'; +import Link from 'next/link'; +import { notFound } from 'next/navigation'; + +type ArchiveProps = { + posts: PostEntity[]; + queriedObject: QueriedObject; +}; + +const Archive = ({ posts, queriedObject }: ArchiveProps) => { + return ( +
+

{queriedObject.term?.name}

+ + +
+ ); +}; + +const BlogPage = async ({ params }: HeadstartWPRoute) => { + const { isArchive, isSingle, data } = await queryPostOrPosts({ + routeParams: params, + params: { + single: { + postType: 'post', + }, + archive: { + postType: 'post', + /** + * Specifying the _fields param reduces the amount of data queried and returned by the API. + */ + _fields: ['id', 'title', 'link'], + }, + priority: 'single', + routeMatchStrategy: 'single', + }, + }); + + if (isArchive && typeof data.posts !== 'undefined') { + return ; + } + + if (isSingle && typeof data.post !== 'undefined') { + return ( +
+

{data.post.title.rendered}

+
+ ); + } + + return notFound(); +}; + +export default BlogPage; diff --git a/projects/wp-multisite-nextjs-app/src/app/[site]/category/[...path]/page.tsx b/projects/wp-multisite-nextjs-app/src/app/[site]/category/[...path]/page.tsx new file mode 100644 index 000000000..8538d57f1 --- /dev/null +++ b/projects/wp-multisite-nextjs-app/src/app/[site]/category/[...path]/page.tsx @@ -0,0 +1,27 @@ +import { HeadstartWPRoute, queryPosts } from '@headstartwp/next/app'; +import Link from 'next/link'; + +const CategoryArchive = async ({ params }: HeadstartWPRoute) => { + const { data } = await queryPosts({ + routeParams: params, + params: { + taxonomy: 'category', + }, + }); + + return ( +
+

{data.queriedObject.term?.name}

+ +
    + {data.posts.map((post) => ( +
  • + {post.title.rendered} +
    • + ))} +
+
+ ); +}; + +export default CategoryArchive; diff --git a/projects/wp-multisite-nextjs-app/src/app/[site]/favicon.ico b/projects/wp-multisite-nextjs-app/src/app/[site]/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..718d6fea4835ec2d246af9800eddb7ffb276240c GIT binary patch literal 25931 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 LrJugUA?W`A8`#=m literal 0 HcmV?d00001 diff --git a/projects/wp-multisite-nextjs-app/src/app/[site]/globals.css b/projects/wp-multisite-nextjs-app/src/app/[site]/globals.css new file mode 100644 index 000000000..687196d61 --- /dev/null +++ b/projects/wp-multisite-nextjs-app/src/app/[site]/globals.css @@ -0,0 +1,34 @@ +.form-container { + position: fixed; + bottom: 20px; + right: 20px; + background-color: #f1f1f1; + padding: 20px; + border-radius: 5px; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); +} + +.form-container form { + display: flex; + flex-direction: column; +} + +.form-container input { + margin-bottom: 10px; + padding: 10px; + border: 1px solid #ccc; + border-radius: 3px; +} + +.form-container button { + padding: 10px; + background-color: #4CAF50; + color: white; + border: none; + border-radius: 3px; + cursor: pointer; +} + +.form-container button:hover { + background-color: #45a049; +} diff --git a/projects/wp-multisite-nextjs-app/src/app/[site]/layout.tsx b/projects/wp-multisite-nextjs-app/src/app/[site]/layout.tsx new file mode 100644 index 000000000..20ab08c6b --- /dev/null +++ b/projects/wp-multisite-nextjs-app/src/app/[site]/layout.tsx @@ -0,0 +1,21 @@ +import { HeadstartWPLayout, PreviewIndicator, queryAppSettings } from '@headstartwp/next/app'; +import { Menu, SettingsProvider, ThemeSettingsProvider } from '@headstartwp/core/react'; +import { getHeadstartWPConfig } from '@headstartwp/core'; + +const RootLayout = async ({ children, params }: Readonly) => { + console.log('SITE ROOT LAYOUT'); + + const { menu, data } = await queryAppSettings({ menu: 'primary', routeParams: params }); + + return ( + + + {menu ? : null} + {children} + + + + ); +}; + +export default RootLayout; diff --git a/projects/wp-multisite-nextjs-app/src/app/[site]/not-found.tsx b/projects/wp-multisite-nextjs-app/src/app/[site]/not-found.tsx new file mode 100644 index 000000000..0b6d8855c --- /dev/null +++ b/projects/wp-multisite-nextjs-app/src/app/[site]/not-found.tsx @@ -0,0 +1,13 @@ +import Link from 'next/link'; + +const NotFound = () => { + return ( +
+

Not Found

+

Could not find requested resource

+ Return Home +
+ ); +}; + +export default NotFound; diff --git a/projects/wp-multisite-nextjs-app/src/app/[site]/page.tsx b/projects/wp-multisite-nextjs-app/src/app/[site]/page.tsx new file mode 100644 index 000000000..0704ee397 --- /dev/null +++ b/projects/wp-multisite-nextjs-app/src/app/[site]/page.tsx @@ -0,0 +1,23 @@ +import { BlocksRenderer } from '@headstartwp/core/react'; +import { HeadstartWPRoute, queryPost } from '@headstartwp/next/app'; + +const Home = async ({ params }: HeadstartWPRoute) => { + console.log('HOME'); + const { data } = await queryPost({ + routeParams: params, + params: { + slug: 'front-page', + postType: 'page', + }, + }); + + return ( +
+
+ +
+
+ ); +}; + +export default Home; diff --git a/projects/wp-multisite-nextjs-app/src/app/[site]/search/[[...path]]/page.tsx b/projects/wp-multisite-nextjs-app/src/app/[site]/search/[[...path]]/page.tsx new file mode 100644 index 000000000..aa29ec914 --- /dev/null +++ b/projects/wp-multisite-nextjs-app/src/app/[site]/search/[[...path]]/page.tsx @@ -0,0 +1,29 @@ +import { HeadstartWPRoute, querySearch } from '@headstartwp/next/app'; +import Link from 'next/link'; + +const Search = async ({ params }: HeadstartWPRoute) => { + const { data } = await querySearch({ + routeParams: params, + }); + + if (data.pageInfo.totalItems === 0) { + return 'Nothing found'; + } + + return ( + <> +

Search Results

+
    + {data.searchResults.map((item) => ( +
  • + + {item.id} - {item.title} + +
    • + ))} +
+ + ); +}; + +export default Search; diff --git a/projects/wp-multisite-nextjs-app/src/app/[site]/tag/[...path]/page.tsx b/projects/wp-multisite-nextjs-app/src/app/[site]/tag/[...path]/page.tsx new file mode 100644 index 000000000..283091063 --- /dev/null +++ b/projects/wp-multisite-nextjs-app/src/app/[site]/tag/[...path]/page.tsx @@ -0,0 +1,27 @@ +import { HeadstartWPRoute, queryPosts } from '@headstartwp/next/app'; +import Link from 'next/link'; + +const TagArchive = async ({ params }: HeadstartWPRoute) => { + const { data } = await queryPosts({ + routeParams: params, + params: { + taxonomy: 'post_tag', + }, + }); + + return ( +
+

{data.queriedObject.term?.name}

+ +
    + {data.posts.map((post) => ( +
  • + {post.title.rendered} +
    • + ))} +
+
+ ); +}; + +export default TagArchive; diff --git a/projects/wp-multisite-nextjs-app/src/app/api/preview/route.ts b/projects/wp-multisite-nextjs-app/src/app/api/preview/route.ts new file mode 100644 index 000000000..ce26916d5 --- /dev/null +++ b/projects/wp-multisite-nextjs-app/src/app/api/preview/route.ts @@ -0,0 +1,7 @@ +import { previewRouteHandler } from '@headstartwp/next/app'; +import type { NextRequest } from 'next/server'; + +export async function GET(request: NextRequest) { + // @ts-expect-error + return previewRouteHandler(request); +} diff --git a/projects/wp-multisite-nextjs-app/src/app/api/revalidate/route.ts b/projects/wp-multisite-nextjs-app/src/app/api/revalidate/route.ts new file mode 100644 index 000000000..dc1dc3548 --- /dev/null +++ b/projects/wp-multisite-nextjs-app/src/app/api/revalidate/route.ts @@ -0,0 +1,7 @@ +import { revalidateRouteHandler } from '@headstartwp/next/app'; +import type { NextRequest } from 'next/server'; + +export async function GET(request: NextRequest) { + // @ts-expect-error + return revalidateRouteHandler(request); +} diff --git a/projects/wp-multisite-nextjs-app/src/app/layout.tsx b/projects/wp-multisite-nextjs-app/src/app/layout.tsx new file mode 100644 index 000000000..36d26353e --- /dev/null +++ b/projects/wp-multisite-nextjs-app/src/app/layout.tsx @@ -0,0 +1,23 @@ +import type { Metadata } from 'next'; +import { Inter } from 'next/font/google'; + +const inter = Inter({ subsets: ['latin'] }); + +export const metadata: Metadata = { + title: 'Create Next App', + description: 'Generated by create next app', +}; + +const RootLayout = async ({ + children, +}: Readonly<{ + children: React.ReactNode; +}>) => { + return ( + + {children} + + ); +}; + +export default RootLayout; diff --git a/projects/wp-multisite-nextjs-app/src/app/not-found.tsx b/projects/wp-multisite-nextjs-app/src/app/not-found.tsx new file mode 100644 index 000000000..0b6d8855c --- /dev/null +++ b/projects/wp-multisite-nextjs-app/src/app/not-found.tsx @@ -0,0 +1,13 @@ +import Link from 'next/link'; + +const NotFound = () => { + return ( +
+

Not Found

+

Could not find requested resource

+ Return Home +
+ ); +}; + +export default NotFound; diff --git a/projects/wp-multisite-nextjs-app/src/middleware.ts b/projects/wp-multisite-nextjs-app/src/middleware.ts new file mode 100644 index 000000000..f73062bbd --- /dev/null +++ b/projects/wp-multisite-nextjs-app/src/middleware.ts @@ -0,0 +1,20 @@ +import { AppMiddleware } from '@headstartwp/next/middlewares'; +import { NextRequest } from 'next/server'; + +export const config = { + matcher: [ + /* + * Match all paths except for: + * 1. /api routes + * 2. /_next (Next.js internals) + * 3. /fonts (inside /public) + * 4. all root files inside /public (e.g. /favicon.ico) + */ + '/((?!api|cache-healthcheck|_next|fonts[\\w-]+\\.\\w+).*)', + ], +}; + +export async function middleware(req: NextRequest) { + // @ts-expect-error + return AppMiddleware(req, { appRouter: true }); +} diff --git a/projects/wp-multisite-nextjs-app/tsconfig.json b/projects/wp-multisite-nextjs-app/tsconfig.json new file mode 100644 index 000000000..4955a8f07 --- /dev/null +++ b/projects/wp-multisite-nextjs-app/tsconfig.json @@ -0,0 +1,33 @@ +{ + "compilerOptions": { + "lib": ["dom", "dom.iterable", "esnext"], + "allowJs": true, + "skipLibCheck": true, + "strict": true, + "noEmit": true, + "esModuleInterop": true, + "module": "esnext", + "moduleResolution": "bundler", + "resolveJsonModule": true, + "isolatedModules": true, + "jsx": "preserve", + "incremental": true, + "plugins": [ + { + "name": "next" + } + ], + "noFallthroughCasesInSwitch": true, + "noImplicitAny": true, + "strictBindCallApply": true, + "strictNullChecks": true + }, + "include": [ + "next-env.d.ts", + "src/global.d.ts", + "**/*.ts", + "**/*.tsx", + ".next/types/**/*.ts" + ], + "exclude": ["node_modules"] +}