@netlify/plugin-nextjs 4.2.3 → 4.2.4

package/lib/helpers/files.js

@@ -14,6 +14,7 @@ const p_limit_1 = __importDefault(require("p-limit"));
 const pathe_1 = require("pathe");
 const slash_1 = __importDefault(require("slash"));
 const constants_1 = require("../constants");
+const utils_1 = require("./utils");
 const TEST_ROUTE = /(|\/)\[[^/]+?](\/|\.html|$)/;
 const isDynamicRoute = (route) => TEST_ROUTE.test(route);
 exports.isDynamicRoute = isDynamicRoute;
@@ -220,47 +221,52 @@ const moveStaticPages = async ({ netlifyConfig, target, i18n, }) => {
     }
 };
 exports.moveStaticPages = moveStaticPages;
+/**
+ * Attempt to patch a source file, preserving a backup
+ */
 const patchFile = async ({ file, from, to }) => {
     if (!(0, fs_extra_1.existsSync)(file)) {
-        return;
+        console.warn('File was not found');
+        return false;
     }
     const content = await (0, fs_extra_1.readFile)(file, 'utf8');
     if (content.includes(to)) {
-        return;
+        console.log('File already patched');
+        return false;
     }
     const newContent = content.replace(from, to);
+    if (newContent === content) {
+        console.warn('File was not changed');
+        return false;
+    }
     await (0, fs_extra_1.writeFile)(`${file}.orig`, content);
     await (0, fs_extra_1.writeFile)(file, newContent);
+    console.log('Done');
+    return true;
 };
+/**
+ * The file we need has moved around a bit over the past few versions,
+ * so we iterate through the options until we find it
+ */
 const getServerFile = (root) => {
-    let serverFile;
-    try {
-        serverFile = require.resolve('next/dist/server/next-server', { paths: [root] });
-    }
-    catch {
-        // Ignore
-    }
-    if (!serverFile) {
-        try {
-            // eslint-disable-next-line node/no-missing-require
-            serverFile = require.resolve('next/dist/next-server/server/next-server', { paths: [root] });
-        }
-        catch {
-            // Ignore
-        }
-    }
-    return serverFile;
+    const candidates = [
+        'next/dist/server/base-server',
+        'next/dist/server/next-server',
+        'next/dist/next-server/server/next-server',
+    ];
+    return (0, utils_1.findModuleFromBase)({ candidates, paths: [root] });
 };
-const patchNextFiles = async (root) => {
+const patchNextFiles = (root) => {
     const serverFile = getServerFile(root);
     console.log(`Patching ${serverFile}`);
     if (serverFile) {
-        await patchFile({
+        return patchFile({
             file: serverFile,
             from: `let ssgCacheKey = `,
             to: `let ssgCacheKey = process.env._BYPASS_SSG || `,
         });
     }
+    return false;
 };
 exports.patchNextFiles = patchNextFiles;
 const unpatchNextFiles = async (root) => {

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.shouldSkip = exports.getPreviewRewrites = exports.getApiRewrites = exports.redirectsForNextRouteWithData = exports.redirectsForNextRoute = exports.isApiRoute = exports.routeToDataRoute = exports.netlifyRoutesForNextRouteWithData = exports.toNetlifyRoute = void 0;
+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");
@@ -116,3 +116,21 @@ const shouldSkip = () => process.env.NEXT_PLUGIN_FORCE_RUN === 'false' ||
     process.env.NETLIFY_NEXT_PLUGIN_SKIP === 'true' ||
     process.env.NETLIFY_NEXT_PLUGIN_SKIP === '1';
 exports.shouldSkip = shouldSkip;
+/**
+ * Given an array of base paths and candidate modules, return the first one that exists
+ */
+const findModuleFromBase = ({ paths, candidates }) => {
+    for (const candidate of candidates) {
+        try {
+            const modulePath = require.resolve(candidate, { paths });
+            if (modulePath) {
+                return modulePath;
+            }
+        }
+        catch (error) {
+            console.error(error);
+        }
+    }
+    return null;
+};
+exports.findModuleFromBase = findModuleFromBase;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.2.3",
+  "version": "4.2.4",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [