@netlify/plugin-nextjs 4.2.3 → 4.2.7

package/lib/helpers/cache.js

@@ -1,10 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.saveCache = exports.restoreCache = void 0;
+const fs_1 = require("fs");
 const path_1 = require("path");
+const utils_1 = require("./utils");
+const findDistDir = (publish) => {
+    // In normal operation, the dist dir is the same as the publish dir
+    if (!(0, utils_1.shouldSkip)()) {
+        return publish;
+    }
+    // In this situation, the user has disabled the plugin, which means that they might be using next export,
+    // so we'll look in a few places to find the site root. This allows us to find the .next directory.
+    for (const root of [(0, path_1.resolve)(publish, '..'), (0, path_1.resolve)(publish, '..', '..')]) {
+        if ((0, fs_1.existsSync)((0, path_1.join)(root, 'next.config.js'))) {
+            return (0, path_1.join)(root, '.next');
+        }
+    }
+    return null;
+};
 const restoreCache = async ({ cache, publish }) => {
-    const cacheDir = (0, path_1.join)(publish, 'cache');
-    if (await cache.restore(cacheDir)) {
+    const distDir = findDistDir(publish);
+    if (!distDir) {
+        return;
+    }
+    if (await cache.restore((0, path_1.join)(distDir, 'cache'))) {
         console.log('Next.js cache restored.');
     }
     else {
@@ -13,9 +32,11 @@ const restoreCache = async ({ cache, publish }) => {
 };
 exports.restoreCache = restoreCache;
 const saveCache = async ({ cache, publish }) => {
-    const cacheDir = (0, path_1.join)(publish, 'cache');
-    const buildManifest = (0, path_1.join)(publish, 'build-manifest.json');
-    if (await cache.save(cacheDir, { digests: [buildManifest] })) {
+    const distDir = findDistDir(publish);
+    if (!distDir) {
+        return;
+    }
+    if (await cache.save((0, path_1.join)(distDir, 'cache'))) {
         console.log('Next.js cache saved.');
     }
     else {

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;
@@ -62,7 +63,7 @@ const getMiddleware = async (publish) => {
 };
 exports.getMiddleware = getMiddleware;
 // eslint-disable-next-line max-lines-per-function
-const moveStaticPages = async ({ netlifyConfig, target, i18n, }) => {
+const moveStaticPages = async ({ netlifyConfig, target, i18n, basePath, }) => {
     console.log('Moving static page files to serve from CDN...');
     const outputDir = (0, pathe_1.join)(netlifyConfig.build.publish, target === 'server' ? 'server' : 'serverless');
     const root = (0, pathe_1.join)(outputDir, 'pages');
@@ -93,9 +94,10 @@ const moveStaticPages = async ({ netlifyConfig, target, i18n, }) => {
         const isData = file.endsWith('.json');
         const source = (0, pathe_1.join)(root, file);
         const targetFile = isData ? (0, pathe_1.join)(dataDir, file) : file;
+        const targetPath = basePath ? (0, pathe_1.join)(basePath, targetFile) : targetFile;
         files.push(file);
-        filesManifest[file] = targetFile;
-        const dest = (0, pathe_1.join)(netlifyConfig.build.publish, targetFile);
+        filesManifest[file] = targetPath;
+        const dest = (0, pathe_1.join)(netlifyConfig.build.publish, targetPath);
         try {
             await (0, fs_extra_1.move)(source, dest);
         }
@@ -189,19 +191,23 @@ const moveStaticPages = async ({ netlifyConfig, target, i18n, }) => {
     // Write the manifest for use in the serverless functions
     await (0, fs_extra_1.writeJson)((0, pathe_1.join)(netlifyConfig.build.publish, 'static-manifest.json'), Object.entries(filesManifest));
     if (i18n === null || i18n === void 0 ? void 0 : i18n.defaultLocale) {
+        const rootPath = basePath ? (0, pathe_1.join)(netlifyConfig.build.publish, basePath) : netlifyConfig.build.publish;
         // Copy the default locale into the root
-        const defaultLocaleDir = (0, pathe_1.join)(netlifyConfig.build.publish, i18n.defaultLocale);
+        const defaultLocaleDir = (0, pathe_1.join)(rootPath, i18n.defaultLocale);
         if ((0, fs_extra_1.existsSync)(defaultLocaleDir)) {
-            await (0, fs_extra_1.copy)(defaultLocaleDir, `${netlifyConfig.build.publish}/`);
+            await (0, fs_extra_1.copy)(defaultLocaleDir, `${rootPath}/`);
         }
-        const defaultLocaleIndex = (0, pathe_1.join)(netlifyConfig.build.publish, `${i18n.defaultLocale}.html`);
-        const indexHtml = (0, pathe_1.join)(netlifyConfig.build.publish, 'index.html');
+        const defaultLocaleIndex = (0, pathe_1.join)(rootPath, `${i18n.defaultLocale}.html`);
+        const indexHtml = (0, pathe_1.join)(rootPath, 'index.html');
         if ((0, fs_extra_1.existsSync)(defaultLocaleIndex) && !(0, fs_extra_1.existsSync)(indexHtml)) {
-            try {
-                await (0, fs_extra_1.copy)(defaultLocaleIndex, indexHtml, { overwrite: false });
-                await (0, fs_extra_1.copy)((0, pathe_1.join)(netlifyConfig.build.publish, `${i18n.defaultLocale}.json`), (0, pathe_1.join)(netlifyConfig.build.publish, 'index.json'), { overwrite: false });
-            }
-            catch { }
+            await (0, fs_extra_1.copy)(defaultLocaleIndex, indexHtml, { overwrite: false }).catch(() => {
+                /* ignore */
+            });
+            await (0, fs_extra_1.copy)((0, pathe_1.join)(rootPath, `${i18n.defaultLocale}.json`), (0, pathe_1.join)(rootPath, 'index.json'), {
+                overwrite: false,
+            }).catch(() => {
+                /* ignore */
+            });
         }
     }
     if (shortRevalidateRoutes.length !== 0) {
@@ -220,47 +226,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 {
+            // Ignore the error
+        }
+    }
+    return null;
+};
+exports.findModuleFromBase = findModuleFromBase;

package/lib/index.js

@@ -49,7 +49,7 @@ const plugin = {
             console.log("The flag 'EXPERIMENTAL_MOVE_STATIC_PAGES' is no longer required, as it is now the default. To disable this behavior, set the env var 'SERVE_STATIC_FILES_FROM_ORIGIN' to 'true'");
         }
         if (!process.env.SERVE_STATIC_FILES_FROM_ORIGIN) {
-            await (0, files_1.moveStaticPages)({ target, netlifyConfig, i18n });
+            await (0, files_1.moveStaticPages)({ target, netlifyConfig, i18n, basePath });
         }
         await (0, redirects_1.generateStaticRedirects)({
             netlifyConfig,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.2.3",
+  "version": "4.2.7",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -53,13 +53,14 @@
   },
   "homepage": "https://github.com/netlify/netlify-plugin-nextjs#readme",
   "dependencies": {
-    "@netlify/functions": "^0.11.0",
+    "@netlify/functions": "^1.0.0",
     "@netlify/ipx": "^0.0.9",
     "@vercel/node-bridge": "^2.1.0",
     "chalk": "^4.1.2",
     "fs-extra": "^10.0.0",
     "globby": "^11.0.4",
     "moize": "^6.1.0",
+    "next": "^12.0.10",
     "node-fetch": "^2.6.6",
     "node-stream-zip": "^1.15.0",
     "outdent": "^0.8.0",
@@ -74,13 +75,16 @@
     "@babel/core": "^7.15.8",
     "@babel/preset-env": "^7.15.8",
     "@babel/preset-typescript": "^7.16.0",
-    "@netlify/build": "^26.2.2",
-    "@netlify/eslint-config-node": "^4.1.7",
+    "@netlify/build": "^26.3.3",
+    "@netlify/eslint-config-node": "^5.1.4",
+    "@reach/dialog": "^0.16.2",
+    "@reach/visually-hidden": "^0.16.0",
     "@testing-library/cypress": "^8.0.1",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.0.2",
     "@types/mocha": "^9.0.0",
     "@types/node": "^17.0.10",
+    "@types/react": "^17.0.38",
     "babel-jest": "^27.2.5",
     "cpy": "^8.1.2",
     "cypress": "^9.0.0",
@@ -88,12 +92,12 @@
     "husky": "^7.0.4",
     "jest": "^27.0.0",
     "netlify-plugin-cypress": "^2.2.0",
-    "next": "^12.0.8",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.1.2",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "rimraf": "^3.0.2",
+    "sass": "^1.49.0",
     "tmp-promise": "^3.0.2",
     "typescript": "^4.3.4"
   },