Add compatibility for Next.js v14

.github/CODEOWNERS

@@ -1 +1 @@
-* @baked-dev @jjantschulev
+* @macku

.github/workflows/pull.yml

@@ -11,28 +11,16 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  unimported:
-    name: Check unimported
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: whopio/[email protected]
-        with:
-          token: ${{ github.token }}
-          projects: "packages/codegen,packages/runtime"
-
   install:
     name: Install node modules
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 7.13.6
+      - uses: pnpm/action-setup@v3
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
           check-latest: true
           cache: pnpm
       - name: Install all packages
@@ -44,33 +32,29 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 7.13.6
+      - uses: pnpm/action-setup@v3
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
           check-latest: true
           cache: pnpm
       - name: Install all packages
         run: pnpm install
       - name: Run eslint
-        run: pnpx eslint ./ --max-warnings 0
+        run: pnpm eslint ./ --max-warnings 0
 
   build:
     name: Build packages
     needs: install
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 7.13.6
+      - uses: pnpm/action-setup@v3
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
           check-latest: true
           cache: pnpm
       - name: Install all packages
@@ -84,13 +68,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 7.13.6
+      - uses: pnpm/action-setup@v3
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
           check-latest: true
           cache: pnpm
       - name: Install all packages

.github/workflows/release.yml

@@ -25,14 +25,12 @@ jobs:
           token: ${{ github.token }}
       - uses: actions/checkout@v3
         if: steps.check.outputs.can-publish == 'true'
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 7.13.6
+      - uses: pnpm/action-setup@v3
         if: steps.check.outputs.can-publish == 'true'
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
           check-latest: true
           cache: pnpm
         if: steps.check.outputs.can-publish == 'true'

.gitignore

@@ -32,3 +32,6 @@ yarn-error.log*
 
 # turbo
 .turbo
+
+# ide
+.idea/

.nvmrc

@@ -0,0 +1 @@
+20

examples/basic-js/app/[locale]/middleware.js

@@ -1,5 +1,5 @@
 /**
- * @type {import("next-app-middleware/runtime").MiddlewareHandler<{ locale: string }>}
+ * @type {import("@cxnpl/next-app-middleware/runtime").MiddlewareHandler<{ locale: string }>}
  */
 export default () => {
   // console.log("middleware", req.params.locale);

examples/basic-js/app/[locale]/redirect/redirect.js

@@ -1,5 +1,5 @@
 /**
- * @type {import("next-app-middleware/runtime").RedirectHandler<{ locale: string }>}
+ * @type {import("@cxnpl/next-app-middleware/runtime").RedirectHandler<{ locale: string }>}
  */
 export default () => {
   return "/";

examples/basic-js/app/[locale]/rewrite/rewrite.js

@@ -1,5 +1,5 @@
 /**
- * @type {import("next-app-middleware/runtime").RewriteHandler<{ locale: string }>}
+ * @type {import("@cxnpl/next-app-middleware/runtime").RewriteHandler<{ locale: string }>}
  */
 export default ({ params: { locale } }) => {
   return `/${locale}`;

examples/basic-js/app/forward.dynamic.js

@@ -1,5 +1,5 @@
 /**
- * @type {import("next-app-middleware/runtime").DynamicForwarder}
+ * @type {import("@cxnpl/next-app-middleware/runtime").DynamicForwarder}
  */
 export const locale = () => {
   return "en";

examples/basic-js/middleware.hooks.js

@@ -1,5 +1,5 @@
 /**
- * @type {import("next-app-middleware/runtime").ResponseHook>}
+ * @type {import("@cxnpl/next-app-middleware/runtime").ResponseHook>}
  */
 export const response = (res) => {
   console.log(res.status);

examples/basic-js/next.config.js

@@ -1,10 +1,7 @@
-const { withMiddleware } = require("next-app-middleware");
+const { withMiddleware } = require("@cxnpl/next-app-middleware");
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  experimental: {
-    appDir: true,
-  },
   basePath: "/js",
 };
 

examples/basic-js/package.json

@@ -12,14 +12,14 @@
     "@next/font": "13.1.6",
     "eslint": "8.30.0",
     "eslint-config-next": "13.1.6",
-    "next": "13.1.6",
+    "next": "14.1.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
     "@types/node": "^17.0.45",
     "eslint-config-js": "workspace:^0.0.0",
-    "next-app-middleware": "workspace:0.0.0",
+    "@cxnpl/next-app-middleware": "workspace:0.0.0",
     "typescript": "^4.9.5"
   }
 }

examples/basic/app/with-middleware/[theme]/[user]/middleware.ts

@@ -1,4 +1,4 @@
-import { MiddlewareHandler } from "next-app-middleware/runtime";
+import { MiddlewareHandler } from "@cxnpl/next-app-middleware/runtime";
 
 const middleware: MiddlewareHandler<{ theme: string; user: string }> = (
   req

examples/basic/app/with-middleware/[theme]/middleware.ts

@@ -1,4 +1,4 @@
-import { MiddlewareHandler } from "next-app-middleware/runtime";
+import { MiddlewareHandler } from "@cxnpl/next-app-middleware/runtime";
 
 const middleware: MiddlewareHandler<{ theme: string }> = (req) => {
   console.log("middleware", req.params.theme);

examples/basic/app/with-middleware/[theme]/redirect/redirect.ts

@@ -1,4 +1,4 @@
-import type { RedirectHandler } from "next-app-middleware/runtime";
+import type { RedirectHandler } from "@cxnpl/next-app-middleware/runtime";
 
 const redirect: RedirectHandler<{ theme: string }> = () => {
   return "/";

examples/basic/app/with-middleware/[theme]/rewrite/rewrite.ts

@@ -1,4 +1,4 @@
-import type { RewriteHandler } from "next-app-middleware/runtime";
+import type { RewriteHandler } from "@cxnpl/next-app-middleware/runtime";
 
 const rewrite: RewriteHandler<{ theme: string }> = ({ params: { theme } }) => {
   return "/" + theme;

examples/basic/app/with-middleware/[theme]/test/[...slug]/middleware.ts

@@ -1,4 +1,4 @@
-import { MiddlewareHandler } from "next-app-middleware/runtime";
+import { MiddlewareHandler } from "@cxnpl/next-app-middleware/runtime";
 
 const middleware: MiddlewareHandler<{ slug: string[] }> = (req) => {
   console.log("middleware", req.params.slug);

examples/basic/app/with-middleware/[theme]/test/test2/[...slug2]/middleware.ts

@@ -1,4 +1,4 @@
-import { MiddlewareHandler } from "next-app-middleware/runtime";
+import { MiddlewareHandler } from "@cxnpl/next-app-middleware/runtime";
 
 const middleware: MiddlewareHandler<{ slug2: string[] }> = (req) => {
   console.log("...slug2", req.params.slug2);

examples/basic/app/with-middleware/forward.dynamic.ts

@@ -1,4 +1,4 @@
-import { DynamicForwarder } from "next-app-middleware/runtime";
+import { DynamicForwarder } from "@cxnpl/next-app-middleware/runtime";
 
 export const theme: DynamicForwarder = (req, res) => {
   const themeCookie = req.cookies.get("__theme");

examples/basic/app/with-middleware/forward.static.ts

@@ -1,4 +1,4 @@
-import { StaticForwarder } from "next-app-middleware/runtime";
+import { StaticForwarder } from "@cxnpl/next-app-middleware/runtime";
 
 export const hosted: StaticForwarder = () => {
   return true;

examples/basic/app/with-middleware/js/middleware.ts

@@ -1,4 +1,4 @@
-import { MiddlewareHandler } from "next-app-middleware/runtime";
+import { MiddlewareHandler } from "@cxnpl/next-app-middleware/runtime";
 
 const middleware: MiddlewareHandler = (req) => {
   console.log("middleware", req.url);

examples/basic/middleware.hooks.ts

@@ -3,7 +3,7 @@ import type {
   ErrorHook,
   GenericHook,
   ParamsHook,
-} from "next-app-middleware/runtime";
+} from "@cxnpl/next-app-middleware/runtime";
 import { NextResponse } from "next/server";
 
 export const response: ResponseHook = (res) => {

examples/basic/next.config.js

@@ -1,12 +1,9 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 // @ts-check
-const { withMiddleware } = require("next-app-middleware");
+const { withMiddleware } = require("@cxnpl/next-app-middleware");
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  experimental: {
-    appDir: true,
-  },
 };
 
 module.exports = withMiddleware(nextConfig);

examples/basic/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@next-app-middleware/basic-example",
+  "name": "@cxnpl/next-app-middleware-basic-example",
   "version": "0.0.0",
   "private": true,
   "scripts": {
@@ -12,7 +12,7 @@
     "@types/react": "18.0.26",
     "@types/react-dom": "18.0.9",
     "eslint": "8.29.0",
-    "next": "latest",
+    "next": "14.1.1",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "typescript": "4.9.3"
@@ -21,6 +21,6 @@
     "@types/node": "^17.0.45",
     "eslint-config-next": "13.1.6",
     "eslint-config-ts": "workspace:^0.0.0",
-    "next-app-middleware": "workspace:0.0.0"
+    "@cxnpl/next-app-middleware": "workspace:0.0.0"
   }
 }

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@whopio/next-app-middleware",
+  "name": "@cxnpl/next-app-middleware",
   "version": "0.0.5",
   "private": true,
   "scripts": {
@@ -18,8 +18,7 @@
     "node": ">=14.0.0"
   },
   "resolutions": {
-    "next": "13.2.4",
     "eslint-config-next": "13.2.4"
   },
-  "packageManager": "pnpm@7.13.6"
+  "packageManager": "pnpm@9.3.0+sha256.e1f9e8d1a16607a46dd3c158b5f7a7dc7945501d1c6222d454d63d033d1d918f"
 }

packages/codegen/.npmignore

@@ -1,4 +1,3 @@
 src
 .turbo
 tsconfig.json
-.unimportedrc.json

packages/codegen/README.md

@@ -1,3 +1,3 @@
-# @next-app-middleware/codegen
+# @cxnpl/next-app-middleware-codegen
 
-Code-generator for `next-app-middleware`
+Code-generator for `@cxnpl/next-app-middleware`

packages/codegen/package.json

@@ -1,12 +1,12 @@
 {
-  "name": "@next-app-middleware/codegen",
+  "name": "@cxnpl/next-app-middleware-codegen",
   "version": "0.0.0",
   "description": "",
   "private": false,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "repository": "whopio/next-app-middleware",
-  "bugs": "https://github.com/whopio/next-app-middleware/issues",
+  "repository": "cxnpl-forks/next-app-middleware",
+  "bugs": "https://github.com/cxnpl-forks/next-app-middleware/issues",
   "scripts": {
     "bundle": "tsup ./src/index.ts --format cjs --dts",
     "build": "pnpm run bundle --minify",
@@ -17,7 +17,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@next-app-middleware/runtime": "workspace:0.0.0",
+    "@cxnpl/next-app-middleware-runtime": "workspace:0.0.0",
     "@swc/core": "^1.3.21",
     "chokidar": "^3.5.3",
     "fs-extra": "^11.1.0",

packages/codegen/src/build/eject.ts

@@ -2,7 +2,7 @@ import {
   Branch,
   BranchTypes,
   PathSegmentSwitch,
-} from "@next-app-middleware/runtime/dist/router/ejected";
+} from "@cxnpl/next-app-middleware-runtime/dist/router/ejected";
 import { FlattenedRoute, RouteTypes, SegmentLayout } from "../types";
 
 type MatcherMap = Map<string, FlattenedRoute | MatcherMap | true>;

packages/codegen/src/build/index.ts

@@ -1,7 +1,7 @@
 import {
   Imports,
   renderRouter,
-} from "@next-app-middleware/runtime/dist/router/ejected";
+} from "@cxnpl/next-app-middleware-runtime/dist/router/ejected";
 import { transform } from "@swc/core";
 import fse from "fs-extra";
 import { join } from "path";

packages/codegen/src/build/read-config.ts

@@ -1,4 +1,4 @@
-import { RouterHooksConfig } from "@next-app-middleware/runtime/dist/router/ejected";
+import { RouterHooksConfig } from "@cxnpl/next-app-middleware-runtime/dist/router/ejected";
 import _glob from "glob";
 import { promisify } from "util";
 import logger from "../util/log";

packages/next-app-middleware/.npmignore

@@ -1,4 +1,3 @@
 src
 .turbo
 tsconfig.json
-.unimportedrc.json