Merge branch 'develop' into feature/app-router-preview-handler

10up · Jul 11, 2024 · 163fbcf · 163fbcf
2 parents 98bae20 + 96ea386
commit 163fbcf
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -32,6 +32,11 @@
       "import": "./dist/mjs/react/index.js",
       "types": "./dist/mjs/react/index.d.ts"
     },
+    "./rsc": {
+      "import": "./dist/mjs/rsc/index.js",
+      "require": "./dist/cjs/rsc/index.js",
+      "types": "./dist/mjs/rsc/index.d.ts"
+    },
     "./test": "./test/server.ts"
   },
   "files": [

diff --git a/packages/core/rsc.d.ts b/packages/core/rsc.d.ts
@@ -0,0 +1 @@
+export * from './dist/mjs/rsc';
diff --git a/packages/core/rsc.js b/packages/core/rsc.js
@@ -0,0 +1,2 @@
+// eslint-disable-next-line import/extensions
+module.exports = require('./dist/cjs/rsc');
diff --git a/projects/wp-nextjs-app/src/app/globals.css b/projects/wp-nextjs-app/src/app/globals.css
@@ -31,4 +31,4 @@
 
 .form-container button:hover {
   background-color: #45a049;
-}
+}
diff --git a/projects/wp-nextjs-app/src/app/middleware.ts b/projects/wp-nextjs-app/src/app/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 });
+}