Merge branch 'main' into mk/default-edge

Author: ascorbic

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -44,7 +44,7 @@ body:
     id: runtime-version
     attributes:
       label: Next Runtime version
-      description: The version of `@netlify/next-runtime` that you are using. (This is in the build logs)
+      description: The version of `@netlify/plugin-nextjs` that you are using. (This is in the build logs)
       placeholder: x.x.x
     validations:
       required: true

.github/workflows/pre-release.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '*'
+          node-version: 'lts/*'
           cache: 'npm'
           check-latest: true
           registry-url: 'https://registry.npmjs.org'

.github/workflows/release-please.yml

@@ -21,7 +21,7 @@ jobs:
         if: ${{ steps.release.outputs.releases_created }}
       - uses: actions/setup-node@v2
         with:
-          node-version: '*'
+          node-version: 'lts/*'
           cache: 'npm'
           check-latest: true
           registry-url: 'https://registry.npmjs.org'

.github/workflows/test.yml

@@ -25,22 +25,22 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Installing with latest Node.js
+      - name: Installing with LTS Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: '*'
+          node-version: 'lts/*'
           check-latest: true
       - name: NPM Install
         run: npm install
       - name: Switching to Node.js ${{ matrix.node-version }} to run tests
         uses: actions/setup-node@v2
-        if: "${{ matrix.node-version != '*' }}"
+        if: "${{ matrix.node-version != 'lts/*' }}"
         with:
           node-version: ${{ matrix.node-version }}
           check-latest: true
       - name: Linting
         run: npm run format:ci
-        if: "${{ matrix.node-version == '*' }}"
+        if: "${{ matrix.node-version == 'lts/*' }}"
       - name: Run tests against next@latest
         run: npm test
   canary:
@@ -61,18 +61,18 @@ jobs:
     if: github.ref_name == 'main'
     steps:
       - uses: actions/checkout@v2
-      - name: Installing with latest Node.js
+      - name: Installing with LTS Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: '*'
+          node-version: 'lts/*'
           check-latest: true
       - name: NPM Install
         run: npm install
       - name: Install Next.js Canary
         run: npm install -D next@canary --legacy-peer-deps
       - name: Switching to Node.js ${{ matrix.node-version }} to run tests
         uses: actions/setup-node@v2
-        if: "${{ matrix.node-version != '*' }}"
+        if: "${{ matrix.node-version != 'lts/*' }}"
         with:
           node-version: ${{ matrix.node-version }}
           check-latest: true

README.md

@@ -3,11 +3,11 @@
 # Next.js Runtime
 
 <p align="center">
-  <a aria-label="npm version" href="https://www.npmjs.com/package/@netlify/next-runtime">
-    <img alt="" src="https://img.shields.io/npm/v/@netlify/next-runtime">
+  <a aria-label="npm version" href="https://www.npmjs.com/package/@netlify/plugin-nextjs">
+    <img alt="" src="https://img.shields.io/npm/v/@netlify/plugin-nextjs">
   </a>
-  <a aria-label="MIT License" href="https://img.shields.io/npm/l/@netlify/next-runtime">
-    <img alt="" src="https://img.shields.io/npm/l/@netlify/next-runtime">
+  <a aria-label="MIT License" href="https://img.shields.io/npm/l/@netlify/plugin-nextjs">
+    <img alt="" src="https://img.shields.io/npm/l/@netlify/plugin-nextjs">
   </a>
 </p>
 
@@ -115,14 +115,14 @@ Edge runtime or middleware is enabled it will also generate edge functions for m
 The Next.js Runtime installs automatically for new Next.js sites on Netlify. You can also install it manually like this:
 
 ```shell
-npm install -D @netlify/next-runtime
+npm install -D @netlify/plugin-nextjs
 ```
 
 ...then add the following to your `netlify.toml` file:
 
 ```toml
 [[plugins]]
-package = "@netlify/next-runtime"
+package = "@netlify/plugin-nextjs"
 ```
 
 ## Manually upgrading from an older version of the Next.js Runtime

demos/base-path/local-plugin/manifest.yml

@@ -1 +1 @@
-name: '@netlify/next-runtime-local'
+name: '@netlify/plugin-nextjs-local'

demos/base-path/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "",
   "devDependencies": {
-    "@netlify/next-runtime": "*",
+    "@netlify/plugin-nextjs": "*",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.25",
@@ -28,4 +28,4 @@
     "url": "https://github.com/netlify/next-runtime/issues"
   },
   "homepage": "https://github.com/netlify/next-runtime#readme"
-}
+}

demos/custom-routes/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "",
   "devDependencies": {
-    "@netlify/next-runtime": "*",
+    "@netlify/plugin-nextjs": "*",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.25",
@@ -29,4 +29,4 @@
     "url": "https://github.com/netlify/next-runtime/issues"
   },
   "homepage": "https://github.com/netlify/next-runtime#readme"
-}
+}

demos/default/package.json

@@ -25,7 +25,7 @@
     "react-dom": "^18.0.0"
   },
   "devDependencies": {
-    "@netlify/next-runtime": "*",
+    "@netlify/plugin-nextjs": "*",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.25",
@@ -35,4 +35,4 @@
     "npm-run-all": "^4.1.5",
     "typescript": "^4.6.3"
   }
-}
+}

demos/middleware/package.json

@@ -9,7 +9,7 @@
     "ntl": "ntl-internal"
   },
   "dependencies": {
-    "@netlify/next-runtime": "*",
+    "@netlify/plugin-nextjs": "*",
     "@netlify/next": "*",
     "next": "^12.2.0",
     "react": "18.0.0",
@@ -24,4 +24,4 @@
     "npm-run-all": "^4.1.5",
     "typescript": "^4.6.3"
   }
-}
+}

demos/next-auth/package.json

@@ -26,15 +26,15 @@
     "next": "^12.2.0",
     "next-auth": "^4.7.0",
     "nodemailer": "^6.6.3",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
   },
   "devDependencies": {
-    "@netlify/next-runtime": "*",
+    "@netlify/plugin-nextjs": "*",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.14",
-    "@types/react": "^17.0.39",
+    "@types/react": "^18.0.0",
     "husky": "^7.0.4",
     "npm-run-all": "^4.1.5",
     "typescript": "^4.5.5"
@@ -45,4 +45,4 @@
   "engines": {
     "node": ">=16.0.0"
   }
-}
+}

demos/next-auth/pages/_app.tsx

@@ -1,10 +1,9 @@
 import { SessionProvider } from "next-auth/react"
-import type { AppProps } from "next/app"
 import "./styles.css"
 
 // Use of the <SessionProvider> is mandatory to allow components that call
 // `useSession()` anywhere in your application to access the `session` object.
-export default function App({ Component, pageProps }: AppProps) {
+export default function App({ Component, pageProps }) {
   return (
     <SessionProvider session={pageProps.session} refetchInterval={0}>
       <Component {...pageProps} />

demos/next-auth/tsconfig.json

@@ -1,24 +1,27 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "target": "es5",
     "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
+      "es2019",
+      "dom"
     ],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
+    "strict": false,
     "noEmit": true,
-    "esModuleInterop": true,
-    "module": "esnext",
+    "incremental": true,
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "jsx": "preserve",
-    "incremental": true
+    "jsx": "preserve"
   },
-  "include": ["process.d.ts", "next-env.d.ts", "next-auth.d.ts", "**/*.ts", "**/*.tsx"],
-  "exclude": ["node_modules"]
+  "include": [
+    "process.d.ts",
+    "next-env.d.ts",
+    "next-auth.d.ts",
+    "**/*.ts",
+    "**/*.tsx",
+    "pages/_app.js"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
 }

demos/next-export/package.json

@@ -6,7 +6,7 @@
     "next": "^12.2.0"
   },
   "devDependencies": {
-    "@netlify/next-runtime": "*",
+    "@netlify/plugin-nextjs": "*",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.25",
@@ -28,4 +28,4 @@
     "url": "https://github.com/netlify/next-runtime/issues"
   },
   "homepage": "https://github.com/netlify/next-runtime#readme"
-}
+}

demos/nx-next-monorepo-demo/local-plugin/manifest.yml

@@ -1 +1 @@
-name: '@netlify/next-runtime-local'
+name: '@netlify/plugin-nextjs-local'

demos/plugin-wrapper/package.json

@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "devDependencies": {
-    "@netlify/next-runtime": "*",
+    "@netlify/plugin-nextjs": "*",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.25",
@@ -16,4 +16,4 @@
     "npm-run-all": "^4.1.5",
     "typescript": "^4.6.3"
   }
-}
+}

demos/server-components/package.json

@@ -16,12 +16,12 @@
     "react-dom": "^18.0.0"
   },
   "devDependencies": {
-    "@netlify/next-runtime": "*",
+    "@netlify/plugin-nextjs": "*",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.25",
     "husky": "^7.0.4",
     "npm-run-all": "^4.1.5",
     "typescript": "^4.6.3"
   }
-}
+}

demos/static-root/local-plugin/manifest.yml

@@ -1 +1 @@
-name: '@netlify/next-runtime-local'
+name: '@netlify/plugin-nextjs-local'

demos/static-root/package.json

@@ -6,7 +6,7 @@
     "next": "^12.2.0"
   },
   "devDependencies": {
-    "@netlify/next-runtime": "*",
+    "@netlify/plugin-nextjs": "*",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.25",
@@ -28,4 +28,4 @@
     "url": "https://github.com/netlify/next-runtime/issues"
   },
   "homepage": "https://github.com/netlify/next-runtime#readme"
-}
+}