@netlify/plugin-nextjs 4.2.5 → 4.2.8

package/lib/constants.js

@@ -9,6 +9,7 @@ exports.HIDDEN_PATHS = [
     '/cache/*',
     '/server/*',
     '/serverless/*',
+    '/trace',
     '/traces',
     '/routes-manifest.json',
     '/build-manifest.json',

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

@@ -63,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');
@@ -94,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);
         }
@@ -190,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) {

package/lib/helpers/functions.js

@@ -13,7 +13,7 @@ const getPageResolver_1 = require("../templates/getPageResolver");
 const generateFunctions = async ({ FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC, PUBLISH_DIR }, appDir) => {
     const functionsDir = INTERNAL_FUNCTIONS_SRC || FUNCTIONS_SRC;
     const functionDir = (0, pathe_1.join)(process.cwd(), functionsDir, constants_1.HANDLER_FUNCTION_NAME);
-    const publishDir = (0, pathe_1.relative)(functionDir, (0, pathe_1.join)(process.cwd(), PUBLISH_DIR));
+    const publishDir = (0, pathe_1.relative)(functionDir, (0, pathe_1.resolve)(PUBLISH_DIR));
     const writeHandler = async (func, isODB) => {
         const handlerSource = await (0, getHandler_1.getHandler)({ isODB, publishDir, appDir: (0, pathe_1.relative)(functionDir, appDir) });
         await (0, fs_extra_1.ensureDir)((0, pathe_1.join)(functionsDir, func));

package/lib/helpers/verification.js

@@ -66,7 +66,7 @@ const checkNextSiteHasBuilt = ({ publish, failBuild, }) => {
             ? `Your publish directory is set to "out", but in most cases it should be ".next".`
             : `In most cases it should be set to ".next", unless you have chosen a custom "distDir" in your Next config.`;
         return failBuild((0, outdent_1.outdent) `
-      The directory "${path_1.default.relative(process.cwd(), publish)}" does not contain a Next.js production build. Perhaps the build command was not run, or you specified the wrong publish directory.
+      The directory "${publish}" does not contain a Next.js production build. Perhaps the build command was not run, or you specified the wrong publish directory.
       ${outWarning}
       If you are using "next export" then you should set the environment variable NETLIFY_NEXT_PLUGIN_SKIP to "true".
     `);
@@ -82,7 +82,7 @@ exports.checkNextSiteHasBuilt = checkNextSiteHasBuilt;
 const checkForRootPublish = ({ publish, failBuild, }) => {
     if (path_1.default.resolve(publish) === path_1.default.resolve('.')) {
         failBuild((0, outdent_1.outdent) `
-      Your publish directory is pointing to the base directory of your site. This is not supported for Next.js sites, and is probably a mistake. 
+      Your publish directory is pointing to the base directory of your site. This is not supported for Next.js sites, and is probably a mistake.
       In most cases it should be set to ".next", unless you have chosen a custom "distDir" in your Next config, or the Next site is in a subdirectory.
     `);
     }

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/lib/templates/getHandler.js

@@ -14,6 +14,9 @@ const { augmentFsModule, getMaxAge, getMultiValueHeaders, getNextServer } = requ
 // eslint-disable-next-line max-params
 const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') => {
     var _a;
+    // Change working directory into the site root
+    const dir = path.resolve(__dirname, app);
+    process.chdir(dir);
     // This is just so nft knows about the page entrypoints. It's not actually used
     try {
         // eslint-disable-next-line node/no-missing-require
@@ -45,7 +48,7 @@ const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') =>
         const NextServer = getNextServer();
         const nextServer = new NextServer({
             conf,
-            dir: path.resolve(__dirname, app),
+            dir,
             customServer: false,
             hostname: url.hostname,
             port,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.2.5",
+  "version": "4.2.8",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -53,8 +53,8 @@
   },
   "homepage": "https://github.com/netlify/netlify-plugin-nextjs#readme",
   "dependencies": {
-    "@netlify/functions": "^0.11.0",
-    "@netlify/ipx": "^0.0.9",
+    "@netlify/functions": "^1.0.0",
+    "@netlify/ipx": "^0.0.10",
     "@vercel/node-bridge": "^2.1.0",
     "chalk": "^4.1.2",
     "fs-extra": "^10.0.0",
@@ -75,8 +75,8 @@
     "@babel/core": "^7.15.8",
     "@babel/preset-env": "^7.15.8",
     "@babel/preset-typescript": "^7.16.0",
-    "@netlify/build": "^26.2.3",
-    "@netlify/eslint-config-node": "^5.1.4",
+    "@netlify/build": "^26.5.0",
+    "@netlify/eslint-config-node": "^5.1.6",
     "@reach/dialog": "^0.16.2",
     "@reach/visually-hidden": "^0.16.0",
     "@testing-library/cypress": "^8.0.1",