@netlify/plugin-nextjs 4.21.1 → 4.22.0

package/README.md

@@ -0,0 +1,17 @@
+![Next.js Runtime](https://github.com/netlify/next-runtime/raw/main/next-on-netlify.png)
+
+# `@netlify/plugin-nextjs`
+
+<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>
+
+This package handles the build process for Next.js sites on Netlify. You should not normally need to install it
+yourself, as it is used automatically during builds of Next.js sites. See
+[the docs for using Next.js on Netlify](https://docs.netlify.com/integrations/frameworks/next-js/overview/) for more
+details.

package/lib/helpers/dev.js

@@ -5,8 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onPreDev = void 0;
 const path_1 = require("path");
+const stream_1 = require("stream");
 const execa_1 = __importDefault(require("execa"));
 const fs_extra_1 = require("fs-extra");
+const merge_stream_1 = __importDefault(require("merge-stream"));
 const edge_1 = require("./edge");
 const files_1 = require("./files");
 // The types haven't been updated yet
@@ -20,18 +22,27 @@ const onPreDev = async ({ constants, netlifyConfig }) => {
         // Ignore if it doesn't exist
     });
     await (0, edge_1.writeDevEdgeFunction)(constants);
-    if (!(0, fs_extra_1.existsSync)((0, path_1.resolve)(base, 'middleware.ts')) && !(0, fs_extra_1.existsSync)((0, path_1.resolve)(base, 'middleware.js'))) {
-        console.log("No middleware found. If you did intend to use middleware, create a 'middleware.ts' or 'middleware.js' file in your project root to add custom middleware.");
-    }
-    else {
-        console.log('Watching for changes in Next.js middleware...');
-        // Eventually we might want to do this via esbuild's API, but for now the CLI works fine
-        const common = [`--bundle`, `--outdir=${(0, path_1.resolve)('.netlify')}`, `--format=esm`, `--target=esnext`, '--watch'];
-        // TypeScript
-        (0, execa_1.default)(`esbuild`, [...common, (0, path_1.resolve)(base, 'middleware.ts')], { all: true }).all.pipe(process.stdout);
-        // JavaScript
-        (0, execa_1.default)(`esbuild`, [...common, (0, path_1.resolve)(base, 'middleware.js')], { all: true }).all.pipe(process.stdout);
-        // Don't return the promise because we don't want to wait for the child process to finish
-    }
+    // Eventually we might want to do this via esbuild's API, but for now the CLI works fine
+    const common = [`--bundle`, `--outdir=${(0, path_1.resolve)('.netlify')}`, `--format=esm`, `--target=esnext`, '--watch'];
+    const opts = {
+        all: true,
+        env: { ...process.env, FORCE_COLOR: '1' },
+    };
+    // TypeScript
+    const tsout = (0, execa_1.default)(`esbuild`, [...common, (0, path_1.resolve)(base, 'middleware.ts')], opts).all;
+    // JavaScript
+    const jsout = (0, execa_1.default)(`esbuild`, [...common, (0, path_1.resolve)(base, 'middleware.js')], opts).all;
+    const filter = new stream_1.Transform({
+        transform(chunk, encoding, callback) {
+            const str = chunk.toString(encoding);
+            // Skip if message includes this, because we run even when the files are missing
+            if (!str.includes('[ERROR] Could not resolve')) {
+                this.push(chunk);
+            }
+            callback();
+        },
+    });
+    (0, merge_stream_1.default)(tsout, jsout).pipe(filter).pipe(process.stdout);
+    // Don't return the promise because we don't want to wait for the child process to finish
 };
 exports.onPreDev = onPreDev;

package/lib/helpers/edge.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.enableEdgeInNextConfig = exports.writeEdgeFunctions = exports.writeDevEdgeFunction = exports.loadMiddlewareManifest = void 0;
+exports.enableEdgeInNextConfig = exports.writeEdgeFunctions = exports.writeDevEdgeFunction = exports.cleanupEdgeFunctions = exports.loadMiddlewareManifest = void 0;
 /* eslint-disable max-lines */
 const fs_1 = require("fs");
 const path_1 = require("path");
@@ -67,6 +67,10 @@ const writeEdgeFunction = async ({ edgeFunctionDefinition, edgeFunctionRoot, net
         pattern: stripLookahead(edgeFunctionDefinition.regexp),
     };
 };
+const cleanupEdgeFunctions = async ({ INTERNAL_EDGE_FUNCTIONS_SRC = '.netlify/edge-functions', }) => {
+    await (0, fs_extra_1.emptyDir)(INTERNAL_EDGE_FUNCTIONS_SRC);
+};
+exports.cleanupEdgeFunctions = cleanupEdgeFunctions;
 const writeDevEdgeFunction = async ({ INTERNAL_EDGE_FUNCTIONS_SRC = '.netlify/edge-functions', }) => {
     const manifest = {
         functions: [

package/lib/helpers/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isBundleSizeCheckDisabled = exports.getCustomImageResponseHeaders = exports.isNextAuthInstalled = exports.findModuleFromBase = exports.shouldSkip = exports.getPreviewRewrites = exports.getApiRewrites = exports.redirectsForNextRouteWithData = exports.redirectsForNextRoute = exports.isApiRoute = exports.routeToDataRoute = exports.netlifyRoutesForNextRouteWithData = exports.toNetlifyRoute = void 0;
+exports.getRemotePatterns = exports.isBundleSizeCheckDisabled = exports.getCustomImageResponseHeaders = exports.isNextAuthInstalled = exports.findModuleFromBase = exports.shouldSkip = exports.getPreviewRewrites = exports.getApiRewrites = exports.redirectsForNextRouteWithData = exports.redirectsForNextRoute = exports.isApiRoute = exports.routeToDataRoute = exports.netlifyRoutesForNextRouteWithData = exports.toNetlifyRoute = void 0;
 const globby_1 = __importDefault(require("globby"));
 const pathe_1 = require("pathe");
 const constants_1 = require("../constants");
@@ -156,4 +156,17 @@ const getCustomImageResponseHeaders = (headers) => {
 exports.getCustomImageResponseHeaders = getCustomImageResponseHeaders;
 const isBundleSizeCheckDisabled = () => process.env.DISABLE_BUNDLE_ZIP_SIZE_CHECK === '1' || process.env.DISABLE_BUNDLE_ZIP_SIZE_CHECK === 'true';
 exports.isBundleSizeCheckDisabled = isBundleSizeCheckDisabled;
+const getRemotePatterns = (experimental, images) => {
+    var _a;
+    // Where remote patterns is configured pre-v12.2.5
+    if ((_a = experimental.images) === null || _a === void 0 ? void 0 : _a.remotePatterns) {
+        return experimental.images.remotePatterns;
+    }
+    // Where remote patterns is configured after v12.2.5
+    if (images.remotePatterns) {
+        return images.remotePatterns || [];
+    }
+    return [];
+};
+exports.getRemotePatterns = getRemotePatterns;
 /* eslint-enable max-lines */

package/lib/index.js

@@ -40,11 +40,11 @@ const plugin = {
         }
         const { publish } = netlifyConfig.build;
         (0, verification_1.checkNextSiteHasBuilt)({ publish, failBuild });
-        let experimentalRemotePatterns = [];
         const { appDir, basePath, i18n, images, target, ignore, trailingSlash, outdir, experimental } = await (0, config_1.getNextConfig)({
             publish,
             failBuild,
         });
+        await (0, edge_1.cleanupEdgeFunctions)(constants);
         const middlewareManifest = await (0, edge_1.loadMiddlewareManifest)(netlifyConfig);
         let usingEdge = false;
         if ((middlewareManifest === null || middlewareManifest === void 0 ? void 0 : middlewareManifest.functions) && Object.keys(middlewareManifest.functions).length !== 0) {
@@ -67,9 +67,6 @@ const plugin = {
           `));
             }
         }
-        if (experimental.images) {
-            experimentalRemotePatterns = experimental.images.remotePatterns || [];
-        }
         if ((0, utils_1.isNextAuthInstalled)()) {
             const config = await (0, config_1.getRequiredServerFiles)(publish);
             const userDefinedNextAuthUrl = config.config.env.NEXTAUTH_URL;
@@ -101,7 +98,7 @@ const plugin = {
             imageconfig: images,
             netlifyConfig,
             basePath,
-            remotePatterns: experimentalRemotePatterns,
+            remotePatterns: (0, utils_1.getRemotePatterns)(experimental, images),
             responseHeaders: (0, utils_1.getCustomImageResponseHeaders)(netlifyConfig.headers),
         });
         await (0, redirects_1.generateRedirects)({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.21.1",
+  "version": "4.22.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -11,12 +11,13 @@
   "dependencies": {
     "@netlify/esbuild": "0.14.25",
     "@netlify/functions": "^1.2.0",
-    "@netlify/ipx": "^1.2.3",
+    "@netlify/ipx": "^1.2.4",
     "@vercel/node-bridge": "^2.1.0",
     "chalk": "^4.1.2",
     "execa": "^5.1.1",
     "fs-extra": "^10.0.0",
     "globby": "^11.0.4",
+    "merge-stream": "^2.0.0",
     "moize": "^6.1.0",
     "node-fetch": "^2.6.6",
     "node-stream-zip": "^1.15.0",
@@ -30,9 +31,10 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^27.16.1",
+    "@netlify/build": "^27.17.1",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
+    "@types/merge-stream": "^1.1.2",
     "@types/node": "^17.0.25",
     "next": "^12.2.0",
     "npm-run-all": "^4.1.5",