Merge branch 'ep-create-edge-function-demo' of github.com:netlify/next-runtime into ep-create-edge-function-demo

Author: ericapisani

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,71 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: 'CodeQL'
+
+on:
+  push:
+    branches: ['main', v3]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: ['main']
+  schedule:
+    - cron: '25 21 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ['javascript']
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+
+          # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+          # queries: security-extended,security-and-quality
+
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+      #   If the Autobuild fails above, remove it and uncomment the following three lines.
+      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+      # - run: |
+      #   echo "Run, Build Application using script"
+      #   ./location_of_script_within_repo/buildscript.sh
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2

.prettierignore

@@ -22,6 +22,6 @@ lib
 tsconfig.json
 demos/nx-next-monorepo-demo
 
-packages/runtime/CHANGELOG.md
+**/CHANGELOG.md
 packages/runtime/lib
 packages/runtime/dist-types

.release-please-manifest.json

@@ -1,4 +1,4 @@
 {
-  "packages/runtime": "4.21.1",
+  "packages/runtime": "4.21.2",
   "packages/next": "1.1.1"
 }

README.md

@@ -2,19 +2,8 @@
 
 # Next.js Runtime
 
-<p align="center">
-  <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/plugin-nextjs">
-    <img alt="" src="https://img.shields.io/npm/l/@netlify/plugin-nextjs">
-  </a>
-</p>
-
-## What's new in this version
-
-For full details of everything that's new, check out
-[the v4 release notes](https://github.com/netlify/next-runtime/blob/main/docs/release-notes/v4.md)
+Next.js is supported natively on Netlify, and in most cases you will not need to install or configure anything. This
+repo includes the packages used to support Next.js on Netlify.
 
 ## Deploying
 
@@ -55,21 +44,9 @@ by targeting the `/_next/image/*` route:
 
 ## Next.js Middleware on Netlify
 
-Next.js Middleware works out of the box on Netlify, but check out the
-[docs on some caveats](https://github.com/netlify/next-runtime/blob/main/docs/middleware.md). By default, middleware
-runs using SSR. For better results, you should enable [Netlify Edge Functions](#netlify-edge-functions), which ensures
-middleware runs at the edge. To use Netlify Edge Functions for middleware or to enable
-[edge server rendering](https://nextjs.org/blog/next-12-2#edge-server-rendering-experimental), set the environment
-variable `NEXT_USE_NETLIFY_EDGE` to `true`.
-
-### No nested middleware in Next 12.2.0
-
-In Next 12.2.0, nested middleware [has been deprecated](https://nextjs.org/docs/messages/middleware-upgrade-guide) in
-favor of root level middleware. If you are not using edge functions then this means that you won't get the benefits of
-using a CDN, and ISR will not work.
-
-To fix this issue, you can run your middleware on [Netlify Edge Functions](#netlify-edge-functions) by setting the
-environment variable `NEXT_USE_NETLIFY_EDGE` to `true`.
+Next.js Middleware works out of the box on Netlify. By default, middleware runs using Netlify Edge Functions. For legacy
+support for running Middleware at the origin, set the environment variable `NEXT_DISABLE_NETLIFY_EDGE` to `true`. Be
+aware that this will result in slower performance, as all pages that match middleware must use SSR.
 
 ## Monorepos
 
@@ -127,11 +104,12 @@ package = "@netlify/plugin-nextjs"
 
 ## Manually upgrading from an older version of the Next.js Runtime
 
-If you previously set these values, they're no longer needed and can be removed:
+If you previously set these values, they're no longer needed and should be removed:
 
 - `distDir` in your `next.config.js`
 - `node_bundler = "esbuild"` in `netlify.toml`
 - `external_node_modules` in `netlify.toml`
+- The environment variable `NEXT_USE_NETLIFY_EDGE` can be removed as this is now the default
 
 The `serverless` and `experimental-serverless-trace` targets are deprecated in Next 12, and all builds with this Next
 Runtime will now use the default `server` target. If you previously set the target in your `next.config.js`, you should
@@ -144,5 +122,6 @@ files must be placed in `public`, not in the root of the site.
 
 ## Feedback
 
-If you think you have found a bug in this repo, [please open an issue](https://github.com/netlify/next-runtime/issues).
-If you have comments or feature requests, [see the dicussion board](https://github.com/netlify/next-runtime/discussions)
+If you think you have found a bug in Next.js on Netlify,
+[please open an issue](https://github.com/netlify/next-runtime/issues). If you have comments or feature requests,
+[see the discussion board](https://github.com/netlify/next-runtime/discussions)