chore: move middleware support into separate package

Author: ascorbic

.gitignore

@@ -146,8 +146,7 @@ Temporary Items
 .netlify
 demos/default/.next
 .parcel-cache
-packages/runtime/lib
-packages/runtime/dist-types
+packages/*/lib
 
 # Cypress
 cypress/screenshots

demos/middleware/middleware.ts

@@ -1,7 +1,7 @@
 import { NextResponse } from 'next/server'
 import type { NextRequest } from 'next/server'
 
-import { MiddlewareRequest } from '@netlify/plugin-nextjs/middleware'
+import { MiddlewareRequest } from '@netlify/next'
 
 export async function middleware(req: NextRequest) {
   let response

demos/middleware/package.json

@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "@netlify/plugin-nextjs": "*",
+    "@netlify/next": "*",
     "next": "^12.2.0",
     "react": "18.0.0",
     "react-dom": "18.0.0"

package-lock.json

@@ -0,0 +1,38 @@
+{
+  "name": "@netlify/next",
+  "version": "0.0.1",
+  "description": "Enhanced Next.js features on Netlify",
+  "main": "lib/index.js",
+  "files": [
+    "lib/**/*"
+  ],
+  "devDependencies": {
+    "@types/node": "^17.0.25",
+    "next": "^12.2.0",
+    "npm-run-all": "^4.1.5",
+    "typescript": "^4.6.3"
+  },
+  "scripts": {
+    "prepublishOnly": "run-s clean build",
+    "clean": "rimraf lib",
+    "build": "tsc",
+    "watch": "tsc --watch",
+    "prepare": "npm run build"
+  },
+  "peerDependencies": {
+    "next": ">=12.2.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/netlify/netlify-plugin-nextjs.git"
+  },
+  "author": "",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/netlify/netlify-plugin-nextjs/issues"
+  },
+  "homepage": "https://github.com/netlify/netlify-plugin-nextjs#readme",
+  "engines": {
+    "node": ">=12.0.0"
+  }
+}

packages/next/package.json

@@ -0,0 +1 @@
+export * from './middleware'

packages/next/src/index.ts

@@ -1,4 +1,4 @@
-import { NextURL } from 'next/dist/server/web/next-url'
+import type { NextURL } from 'next/dist/server/web/next-url'
 import { NextResponse } from 'next/server'
 import type { NextRequest } from 'next/server'
 

packages/runtime/src/middleware/html-rewriter.ts renamed to packages/next/src/middleware/html-rewriter.ts

@@ -0,0 +1,12 @@
+{
+    "extends": "../../tsconfig.json",
+    "compilerOptions": {
+        "declaration": true /* Generates corresponding '.d.ts' file. */,
+        "outDir": "./lib" /* Redirect output structure to the directory. */,
+        "rootDir": "./src", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+    },
+    "include": [
+        "src/**/*.ts",
+        "src/**/*.js"
+    ]
+}

packages/runtime/src/middleware/index.ts renamed to packages/next/src/middleware/index.ts

@@ -2,8 +2,6 @@
     "extends": "../../tsconfig.json",
     "compilerOptions": {
         "outDir": "./lib" /* Redirect output structure to the directory. */,
-        "declaration": true /* Generates corresponding '.d.ts' file. */,
-        "declarationDir": "./dist-types",
         "rootDir": "./src", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
     },
     "include": [

packages/runtime/src/middleware/request.ts renamed to packages/next/src/middleware/request.ts

@@ -1,6 +1,7 @@
 {
   "bootstrap-sha": "62a4ce414f5b02f539902f88dd4b548df5cfa8ef",
   "packages": {
-    "packages/runtime": {}
+    "packages/runtime": {},
+    "packages/next": {}
   }
 }