@netlify/plugin-nextjs 4.0.0-rc.0 → 4.0.0-rc.1

package/lib/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DYNAMIC_PARAMETER_REGEX = exports.OPTIONAL_CATCH_ALL_REGEX = exports.CATCH_ALL_REGEX = exports.DEFAULT_FUNCTIONS_SRC = exports.HANDLER_FUNCTION_PATH = exports.ODB_FUNCTION_PATH = exports.HIDDEN_PATHS = exports.IMAGE_FUNCTION_NAME = exports.ODB_FUNCTION_NAME = exports.HANDLER_FUNCTION_NAME = void 0;
+exports.DIVIDER = exports.MINIMUM_REVALIDATE_SECONDS = exports.DYNAMIC_PARAMETER_REGEX = exports.OPTIONAL_CATCH_ALL_REGEX = exports.CATCH_ALL_REGEX = exports.DEFAULT_FUNCTIONS_SRC = exports.HANDLER_FUNCTION_PATH = exports.ODB_FUNCTION_PATH = exports.HIDDEN_PATHS = exports.IMAGE_FUNCTION_NAME = exports.ODB_FUNCTION_NAME = exports.HANDLER_FUNCTION_NAME = void 0;
 exports.HANDLER_FUNCTION_NAME = '___netlify-handler';
 exports.ODB_FUNCTION_NAME = '___netlify-odb-handler';
 exports.IMAGE_FUNCTION_NAME = '_ipx';
@@ -22,3 +22,7 @@ exports.DEFAULT_FUNCTIONS_SRC = 'netlify/functions';
 exports.CATCH_ALL_REGEX = /\/\[\.{3}(.*)](.json)?$/;
 exports.OPTIONAL_CATCH_ALL_REGEX = /\/\[{2}\.{3}(.*)]{2}(.json)?$/;
 exports.DYNAMIC_PARAMETER_REGEX = /\/\[(.*?)]/g;
+exports.MINIMUM_REVALIDATE_SECONDS = 60;
+exports.DIVIDER = `
+────────────────────────────────────────────────────────────────
+`;

package/lib/helpers/config.js

@@ -13,7 +13,7 @@ const defaultFailBuild = (message, { error }) => {
 };
 const getNextConfig = async function getNextConfig({ publish, failBuild = defaultFailBuild, }) {
     try {
-        const { config, appDir, ignore } = await (0, fs_extra_1.readJSON)((0, pathe_1.join)(publish, 'required-server-files.json'));
+        const { config, appDir, ignore } = await fs_extra_1.readJSON(pathe_1.join(publish, 'required-server-files.json'));
         if (!config) {
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
@@ -28,7 +28,7 @@ const getNextConfig = async function getNextConfig({ publish, failBuild = defaul
 exports.getNextConfig = getNextConfig;
 const resolveModuleRoot = (moduleName) => {
     try {
-        return (0, pathe_1.dirname)((0, pathe_1.relative)(process.cwd(), require.resolve(`${moduleName}/package.json`, { paths: [process.cwd()] })));
+        return pathe_1.dirname(pathe_1.relative(process.cwd(), require.resolve(`${moduleName}/package.json`, { paths: [process.cwd()] })));
     }
     catch (error) {
         return null;
@@ -45,7 +45,7 @@ const configureHandlerFunctions = ({ netlifyConfig, publish, ignore = [] }) => {
         (_a = netlifyConfig.functions)[functionName] || (_a[functionName] = { included_files: [], external_node_modules: [] });
         netlifyConfig.functions[functionName].node_bundler = 'nft';
         (_b = netlifyConfig.functions[functionName]).included_files || (_b.included_files = []);
-        netlifyConfig.functions[functionName].included_files.push('.env', '.env.local', '.env.production', '.env.production.local', `${publish}/server/**`, `${publish}/serverless/**`, `${publish}/*.json`, `${publish}/BUILD_ID`, `${publish}/static/chunks/webpack-middleware*.js`, `!${publish}/server/**/*.js.nft.json`, ...ignore.map((path) => `!${(0, slash_1.default)(path)}`));
+        netlifyConfig.functions[functionName].included_files.push('.env', '.env.local', '.env.production', '.env.production.local', `${publish}/server/**`, `${publish}/serverless/**`, `${publish}/*.json`, `${publish}/BUILD_ID`, `${publish}/static/chunks/webpack-middleware*.js`, `!${publish}/server/**/*.js.nft.json`, ...ignore.map((path) => `!${slash_1.default(path)}`));
         const nextRoot = resolveModuleRoot('next');
         if (nextRoot) {
             netlifyConfig.functions[functionName].included_files.push(`!${nextRoot}/dist/server/lib/squoosh/**/*.wasm`, `!${nextRoot}/dist/next-server/server/lib/squoosh/**/*.wasm`, `!${nextRoot}/dist/compiled/webpack/bundle4.js`, `!${nextRoot}/dist/compiled/webpack/bundle5.js`, `!${nextRoot}/dist/compiled/terser/bundle.min.js`);

package/lib/helpers/files.js

@@ -7,6 +7,7 @@ const { outdent } = require('outdent');
 const pLimit = require('p-limit');
 const { join } = require('pathe');
 const slash = require('slash');
+const { MINIMUM_REVALIDATE_SECONDS, DIVIDER } = require('../constants');
 const TEST_ROUTE = /(|\/)\[[^/]+?](\/|\.html|$)/;
 const isDynamicRoute = (route) => TEST_ROUTE.test(route);
 const stripLocale = (rawPath, locales = []) => {
@@ -64,12 +65,16 @@ exports.moveStaticPages = async ({ netlifyConfig, target, i18n }) => {
     const prerenderManifest = await readJson(join(netlifyConfig.build.publish, 'prerender-manifest.json'));
     const { redirects, rewrites } = await readJson(join(netlifyConfig.build.publish, 'routes-manifest.json'));
     const isrFiles = new Set();
+    const shortRevalidateRoutes = [];
     Object.entries(prerenderManifest.routes).forEach(([route, { initialRevalidateSeconds }]) => {
         if (initialRevalidateSeconds) {
             // Find all files used by ISR routes
             const trimmedPath = route.slice(1);
             isrFiles.add(`${trimmedPath}.html`);
             isrFiles.add(`${trimmedPath}.json`);
+            if (initialRevalidateSeconds < MINIMUM_REVALIDATE_SECONDS) {
+                shortRevalidateRoutes.push({ Route: route, Revalidate: initialRevalidateSeconds });
+            }
         }
     });
     const files = [];
@@ -77,10 +82,10 @@ exports.moveStaticPages = async ({ netlifyConfig, target, i18n }) => {
     const moveFile = async (file) => {
         const isData = file.endsWith('.json');
         const source = join(root, file);
-        const target = isData ? join(dataDir, file) : file;
+        const targetFile = isData ? join(dataDir, file) : file;
         files.push(file);
-        filesManifest[file] = target;
-        const dest = join(netlifyConfig.build.publish, target);
+        filesManifest[file] = targetFile;
+        const dest = join(netlifyConfig.build.publish, targetFile);
         try {
             await move(source, dest);
         }
@@ -99,7 +104,7 @@ exports.moveStaticPages = async ({ netlifyConfig, target, i18n }) => {
     const matchedRewrites = new Set();
     // Limit concurrent file moves to number of cpus or 2 if there is only 1
     const limit = pLimit(Math.max(2, cpus().length));
-    const promises = pages.map(async (rawPath) => {
+    const promises = pages.map((rawPath) => {
         const filePath = slash(rawPath);
         // Don't move ISR files, as they're used for the first request
         if (isrFiles.has(filePath)) {
@@ -138,8 +143,7 @@ exports.moveStaticPages = async ({ netlifyConfig, target, i18n }) => {
         The following middleware matched statically-rendered pages:
 
         ${yellowBright([...matchingMiddleware].map((mid) => `- /${mid}/_middleware`).join('\n'))}
-
-        ────────────────────────────────────────────────────────────────
+        ${DIVIDER}
       `);
         // There could potentially be thousands of matching pages, so we don't want to spam the console with this
         if (matchedPages.size < 50) {
@@ -147,8 +151,7 @@ exports.moveStaticPages = async ({ netlifyConfig, target, i18n }) => {
           The following files matched middleware and were not moved to the CDN:
 
           ${yellowBright([...matchedPages].map((mid) => `- ${mid}`).join('\n'))}
-
-          ────────────────────────────────────────────────────────────────
+          ${DIVIDER}
         `);
         }
     }
@@ -161,8 +164,7 @@ exports.moveStaticPages = async ({ netlifyConfig, target, i18n }) => {
           The following files matched redirects and were not moved to the CDN:
 
           ${yellowBright([...matchedRedirects].map((mid) => `- ${mid}`).join('\n'))}
-
-          ────────────────────────────────────────────────────────────────
+          ${DIVIDER}
         `);
         }
         if (matchedRewrites.size < 50 && matchedRewrites.size !== 0) {
@@ -170,8 +172,7 @@ exports.moveStaticPages = async ({ netlifyConfig, target, i18n }) => {
           The following files matched beforeFiles rewrites and were not moved to the CDN:
 
           ${yellowBright([...matchedRewrites].map((mid) => `- ${mid}`).join('\n'))}
-
-          ────────────────────────────────────────────────────────────────
+          ${DIVIDER}
         `);
         }
     }
@@ -193,6 +194,20 @@ exports.moveStaticPages = async ({ netlifyConfig, target, i18n }) => {
             catch { }
         }
     }
+    if (shortRevalidateRoutes.length !== 0) {
+        console.log(outdent `
+      The following routes use "revalidate" values of under ${MINIMUM_REVALIDATE_SECONDS} seconds, which is not supported.
+      They will use a revalidate time of ${MINIMUM_REVALIDATE_SECONDS} seconds instead.
+    `);
+        console.table(shortRevalidateRoutes);
+        // TODO: add these docs
+        // console.log(
+        //   outdent`
+        //     For more information, see https://ntl.fyi/next-revalidate-time
+        //     ${DIVIDER}
+        //   `,
+        // )
+    }
 };
 const patchFile = async ({ file, from, to }) => {
     if (!existsSync(file)) {

package/lib/helpers/functions.js

@@ -9,14 +9,14 @@ 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 bridgeFile = require.resolve('@vercel/node/dist/bridge');
-    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 functionDir = pathe_1.join(process.cwd(), functionsDir, constants_1.HANDLER_FUNCTION_NAME);
+    const publishDir = pathe_1.relative(functionDir, pathe_1.join(process.cwd(), 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));
-        await (0, fs_extra_1.writeFile)((0, pathe_1.join)(functionsDir, func, `${func}.js`), handlerSource);
-        await (0, fs_extra_1.copyFile)(bridgeFile, (0, pathe_1.join)(functionsDir, func, 'bridge.js'));
-        await (0, fs_extra_1.copyFile)((0, pathe_1.join)(__dirname, '..', '..', 'lib', 'templates', 'handlerUtils.js'), (0, pathe_1.join)(functionsDir, func, 'handlerUtils.js'));
+        const handlerSource = await getHandler_1.getHandler({ isODB, publishDir, appDir: pathe_1.relative(functionDir, appDir) });
+        await fs_extra_1.ensureDir(pathe_1.join(functionsDir, func));
+        await fs_extra_1.writeFile(pathe_1.join(functionsDir, func, `${func}.js`), handlerSource);
+        await fs_extra_1.copyFile(bridgeFile, pathe_1.join(functionsDir, func, 'bridge.js'));
+        await fs_extra_1.copyFile(pathe_1.join(__dirname, '..', '..', 'lib', 'templates', 'handlerUtils.js'), pathe_1.join(functionsDir, func, 'handlerUtils.js'));
     };
     await writeHandler(constants_1.HANDLER_FUNCTION_NAME, false);
     await writeHandler(constants_1.ODB_FUNCTION_NAME, true);
@@ -28,25 +28,25 @@ exports.generateFunctions = generateFunctions;
  */
 const generatePagesResolver = async ({ constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS_SRC }, netlifyConfig, target, }) => {
     const functionsPath = INTERNAL_FUNCTIONS_SRC || FUNCTIONS_SRC;
-    const jsSource = await (0, getPageResolver_1.getPageResolver)({
+    const jsSource = await getPageResolver_1.getPageResolver({
         netlifyConfig,
         target,
     });
-    await (0, fs_extra_1.writeFile)((0, pathe_1.join)(functionsPath, constants_1.ODB_FUNCTION_NAME, 'pages.js'), jsSource);
-    await (0, fs_extra_1.writeFile)((0, pathe_1.join)(functionsPath, constants_1.HANDLER_FUNCTION_NAME, 'pages.js'), jsSource);
+    await fs_extra_1.writeFile(pathe_1.join(functionsPath, constants_1.ODB_FUNCTION_NAME, 'pages.js'), jsSource);
+    await fs_extra_1.writeFile(pathe_1.join(functionsPath, constants_1.HANDLER_FUNCTION_NAME, 'pages.js'), jsSource);
 };
 exports.generatePagesResolver = generatePagesResolver;
 // Move our next/image function into the correct functions directory
 const setupImageFunction = async ({ constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS_SRC }, imageconfig = {}, netlifyConfig, basePath, }) => {
     const functionsPath = INTERNAL_FUNCTIONS_SRC || FUNCTIONS_SRC;
     const functionName = `${constants_1.IMAGE_FUNCTION_NAME}.js`;
-    const functionDirectory = (0, pathe_1.join)(functionsPath, constants_1.IMAGE_FUNCTION_NAME);
-    await (0, fs_extra_1.ensureDir)(functionDirectory);
-    await (0, fs_extra_1.writeJSON)((0, pathe_1.join)(functionDirectory, 'imageconfig.json'), {
+    const functionDirectory = pathe_1.join(functionsPath, constants_1.IMAGE_FUNCTION_NAME);
+    await fs_extra_1.ensureDir(functionDirectory);
+    await fs_extra_1.writeJSON(pathe_1.join(functionDirectory, 'imageconfig.json'), {
         ...imageconfig,
         basePath: [basePath, constants_1.IMAGE_FUNCTION_NAME].join('/'),
     });
-    await (0, fs_extra_1.copyFile)((0, pathe_1.join)(__dirname, '..', '..', 'lib', 'templates', 'ipx.js'), (0, pathe_1.join)(functionDirectory, functionName));
+    await fs_extra_1.copyFile(pathe_1.join(__dirname, '..', '..', 'lib', 'templates', 'ipx.js'), pathe_1.join(functionDirectory, functionName));
     const imagePath = imageconfig.path || '/_next/image';
     netlifyConfig.redirects.push({
         from: `${imagePath}*`,

package/lib/helpers/redirects.js

@@ -1,9 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateRedirects = void 0;
-const chalk_1 = require("chalk");
 const fs_extra_1 = require("fs-extra");
-const outdent_1 = require("outdent");
+const globby_1 = __importDefault(require("globby"));
 const pathe_1 = require("pathe");
 const constants_1 = require("../constants");
 const utils_1 = require("./utils");
@@ -35,8 +37,8 @@ const generateLocaleRedirects = ({ i18n, basePath, trailingSlash, }) => {
     });
     return redirects;
 };
-const generateRedirects = async ({ netlifyConfig, nextConfig: { i18n, basePath, trailingSlash }, }) => {
-    const { dynamicRoutes, routes: staticRoutes } = await (0, fs_extra_1.readJSON)((0, pathe_1.join)(netlifyConfig.build.publish, 'prerender-manifest.json'));
+const generateRedirects = async ({ netlifyConfig, nextConfig: { i18n, basePath, trailingSlash, appDir }, }) => {
+    const { dynamicRoutes, routes: staticRoutes } = await fs_extra_1.readJSON(pathe_1.join(netlifyConfig.build.publish, 'prerender-manifest.json'));
     netlifyConfig.redirects.push(...constants_1.HIDDEN_PATHS.map((path) => ({
         from: `${basePath}${path}`,
         to: '/404.html',
@@ -49,7 +51,6 @@ const generateRedirects = async ({ netlifyConfig, nextConfig: { i18n, basePath,
     const dataRedirects = [];
     const pageRedirects = [];
     const isrRedirects = [];
-    let hasIsr = false;
     const dynamicRouteEntries = Object.entries(dynamicRoutes);
     const staticRouteEntries = Object.entries(staticRoutes);
     staticRouteEntries.forEach(([route, { dataRoute, initialRevalidateSeconds }]) => {
@@ -61,20 +62,20 @@ const generateRedirects = async ({ netlifyConfig, nextConfig: { i18n, basePath,
         if ((i18n === null || i18n === void 0 ? void 0 : i18n.defaultLocale) && route.startsWith(`/${i18n.defaultLocale}/`)) {
             route = route.slice(i18n.defaultLocale.length + 1);
         }
-        hasIsr = true;
-        isrRedirects.push(...(0, utils_1.netlifyRoutesForNextRoute)(dataRoute), ...(0, utils_1.netlifyRoutesForNextRoute)(route));
+        isrRedirects.push(...utils_1.netlifyRoutesForNextRoute(dataRoute), ...utils_1.netlifyRoutesForNextRoute(route));
     });
     dynamicRouteEntries.forEach(([route, { dataRoute, fallback }]) => {
         // Add redirects if fallback is "null" (aka blocking) or true/a string
         if (fallback === false) {
             return;
         }
-        pageRedirects.push(...(0, utils_1.netlifyRoutesForNextRoute)(route));
-        dataRedirects.push(...(0, utils_1.netlifyRoutesForNextRoute)(dataRoute));
+        pageRedirects.push(...utils_1.netlifyRoutesForNextRoute(route));
+        dataRedirects.push(...utils_1.netlifyRoutesForNextRoute(dataRoute));
     });
     if (i18n) {
         netlifyConfig.redirects.push({ from: `${basePath}/:locale/_next/static/*`, to: `/static/:splat`, status: 200 });
     }
+    const publicFiles = await globby_1.default('**/*', { cwd: pathe_1.join(appDir, 'public') });
     // This is only used in prod, so dev uses `next dev` directly
     netlifyConfig.redirects.push(
     // Static files are in `static`
@@ -89,20 +90,24 @@ const generateRedirects = async ({ netlifyConfig, nextConfig: { i18n, basePath,
         to: constants_1.HANDLER_FUNCTION_PATH,
         status: 200,
     }, 
-    // Preview mode gets forced to the function, to bypess pre-rendered pages
-    {
+    // Preview mode gets forced to the function, to bypass pre-rendered pages, but static files need to be skipped
+    ...publicFiles.map((file) => ({
+        from: `${basePath}/${file}`,
+        // This is a no-op, but we do it to stop it matching the following rule
+        to: `${basePath}/${file}`,
+        conditions: { Cookie: ['__prerender_bypass', '__next_preview_data'] },
+        status: 200,
+    })), {
         from: `${basePath}/*`,
         to: constants_1.HANDLER_FUNCTION_PATH,
         status: 200,
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore The conditions type is incorrect
         conditions: { Cookie: ['__prerender_bypass', '__next_preview_data'] },
         force: true,
     }, 
     // ISR redirects are handled by the regular function. Forced to avoid pre-rendered pages
     ...isrRedirects.map((redirect) => ({
         from: `${basePath}${redirect}`,
-        to: process.env.EXPERIMENTAL_ODB_TTL ? constants_1.ODB_FUNCTION_PATH : constants_1.HANDLER_FUNCTION_PATH,
+        to: constants_1.ODB_FUNCTION_PATH,
         status: 200,
         force: true,
     })), 
@@ -121,10 +126,5 @@ const generateRedirects = async ({ netlifyConfig, nextConfig: { i18n, basePath,
     })), 
     // Everything else is handled by the regular function
     { from: `${basePath}/*`, to: constants_1.HANDLER_FUNCTION_PATH, status: 200 });
-    if (hasIsr) {
-        console.log((0, chalk_1.yellowBright)((0, outdent_1.outdent) `
-        You have some pages that use ISR (pages that use getStaticProps with revalidate set), which is not currently fully-supported by this plugin. Be aware that results may be unreliable.
-      `));
-    }
 };
 exports.generateRedirects = generateRedirects;

package/lib/helpers/verification.js

@@ -63,13 +63,13 @@ exports.checkZipSize = async (file, maxSize = LAMBDA_MAX_SIZE) => {
         console.warn(`Could not check zip size because ${file} does not exist`);
         return;
     }
-    const size = await promises.stat(file).then(({ size }) => size);
-    if (size < maxSize) {
+    const fileSize = await promises.stat(file).then(({ size }) => size);
+    if (fileSize < maxSize) {
         return;
     }
     // We don't fail the build, because the actual hard max size is larger so it might still succeed
     console.log(redBright(outdent `
-      The function zip ${yellowBright(relative(process.cwd(), file))} size is ${prettyBytes(size)}, which is larger than the maximum supported size of ${prettyBytes(maxSize)}.
+      The function zip ${yellowBright(relative(process.cwd(), file))} size is ${prettyBytes(fileSize)}, which is larger than the maximum supported size of ${prettyBytes(maxSize)}.
       There are a few reasons this could happen. You may have accidentally bundled a large dependency, or you might have a
       large number of pre-rendered pages included.
     `));

package/lib/index.js

@@ -42,7 +42,7 @@ module.exports = {
         await setupImageFunction({ constants, imageconfig: images, netlifyConfig, basePath });
         await generateRedirects({
             netlifyConfig,
-            nextConfig: { basePath, i18n, trailingSlash },
+            nextConfig: { basePath, i18n, trailingSlash, appDir },
         });
     },
     async onPostBuild({ netlifyConfig, utils: { cache, functions, failBuild }, constants: { FUNCTIONS_DIST } }) {

package/lib/templates/getHandler.js

@@ -68,7 +68,7 @@ const makeHandler = () =>
         // Sending SWR headers causes undefined behaviour with the Netlify CDN
         const cacheHeader = (_c = multiValueHeaders['cache-control']) === null || _c === void 0 ? void 0 : _c[0];
         if (cacheHeader === null || cacheHeader === void 0 ? void 0 : cacheHeader.includes('stale-while-revalidate')) {
-            if (requestMode === 'odb' && process.env.EXPERIMENTAL_ODB_TTL) {
+            if (requestMode === 'odb') {
                 requestMode = 'isr';
                 const ttl = getMaxAge(cacheHeader);
                 // Long-expiry TTL is basically no TTL

package/lib/templates/getPageResolver.js

@@ -14,14 +14,14 @@ const constants_1 = require("../constants");
 const getPageResolver = async ({ netlifyConfig, target }) => {
     const functionDir = path_1.posix.resolve(path_1.posix.join('.netlify', 'functions', constants_1.HANDLER_FUNCTION_NAME));
     const root = path_1.posix.join(netlifyConfig.build.publish, target === 'server' ? 'server' : 'serverless', 'pages');
-    const pages = await (0, tiny_glob_1.default)('**/*.js', {
+    const pages = await tiny_glob_1.default('**/*.js', {
         cwd: root,
         dot: true,
     });
     const pageFiles = pages
-        .map((page) => `require.resolve('${path_1.posix.relative(functionDir, path_1.posix.join(root, (0, slash_1.default)(page)))}')`)
+        .map((page) => `require.resolve('${path_1.posix.relative(functionDir, path_1.posix.join(root, slash_1.default(page)))}')`)
         .sort();
-    return (0, outdent_1.outdent) `
+    return outdent_1.outdent `
     // This file is purely to allow nft to know about these pages. It should be temporary.
     exports.resolvePages = () => {
         try {

package/lib/templates/handlerUtils.js

@@ -11,7 +11,7 @@ const os_1 = require("os");
 const path_1 = __importDefault(require("path"));
 const stream_1 = require("stream");
 const util_1 = require("util");
-const streamPipeline = (0, util_1.promisify)(stream_1.pipeline);
+const streamPipeline = util_1.promisify(stream_1.pipeline);
 const downloadFile = async (url, destination) => {
     console.log(`Downloading ${url} to ${destination}`);
     const httpx = url.startsWith('https') ? https_1.default : http_1.default;
@@ -21,7 +21,7 @@ const downloadFile = async (url, destination) => {
                 reject(new Error(`Failed to download ${url}: ${response.statusCode} ${response.statusMessage || ''}`));
                 return;
             }
-            const fileStream = (0, fs_1.createWriteStream)(destination);
+            const fileStream = fs_1.createWriteStream(destination);
             streamPipeline(response, fileStream)
                 .then(resolve)
                 .catch((error) => {
@@ -78,7 +78,7 @@ const augmentFsModule = ({ promises, staticManifest, pageRoot, getBase, }) => {
     const staticFiles = new Map(staticManifest);
     const downloadPromises = new Map();
     // Yes, you can cache stuff locally in a Lambda
-    const cacheDir = path_1.default.join((0, os_1.tmpdir)(), 'next-static-cache');
+    const cacheDir = path_1.default.join(os_1.tmpdir(), 'next-static-cache');
     // Grab the real fs.promises.readFile...
     const readfileOrig = promises.readFile;
     const statsOrig = promises.stat;
@@ -90,7 +90,7 @@ const augmentFsModule = ({ promises, staticManifest, pageRoot, getBase, }) => {
             // We only want the part after `pages/`
             const filePath = file.slice(pageRoot.length + 1);
             // Is it in the CDN and not local?
-            if (staticFiles.has(filePath) && !(0, fs_1.existsSync)(file)) {
+            if (staticFiles.has(filePath) && !fs_1.existsSync(file)) {
                 // This name is safe to use, because it's one that was already created by Next
                 const cacheFile = path_1.default.join(cacheDir, filePath);
                 const url = `${base}/${staticFiles.get(filePath)}`;
@@ -99,11 +99,11 @@ const augmentFsModule = ({ promises, staticManifest, pageRoot, getBase, }) => {
                     await downloadPromises.get(url);
                 }
                 // Have we already cached it? We download every time if running locally to avoid staleness
-                if ((!(0, fs_1.existsSync)(cacheFile) || process.env.NETLIFY_DEV) && base) {
+                if ((!fs_1.existsSync(cacheFile) || process.env.NETLIFY_DEV) && base) {
                     await promises.mkdir(path_1.default.dirname(cacheFile), { recursive: true });
                     try {
                         // Append the path to our host and we can load it like a regular page
-                        const downloadPromise = (0, exports.downloadFile)(url, cacheFile);
+                        const downloadPromise = exports.downloadFile(url, cacheFile);
                         downloadPromises.set(url, downloadPromise);
                         await downloadPromise;
                     }
@@ -122,7 +122,7 @@ const augmentFsModule = ({ promises, staticManifest, pageRoot, getBase, }) => {
         if (file.startsWith(pageRoot)) {
             // We only want the part after `pages/`
             const cacheFile = path_1.default.join(cacheDir, file.slice(pageRoot.length + 1));
-            if ((0, fs_1.existsSync)(cacheFile)) {
+            if (fs_1.existsSync(cacheFile)) {
                 return statsOrig(cacheFile, options);
             }
         }

package/lib/templates/ipx.js

@@ -5,7 +5,7 @@ exports.handler = void 0;
 const ipx_1 = require("@netlify/ipx");
 // @ts-ignore Injected at build time
 const imageconfig_json_1 = require("./imageconfig.json");
-exports.handler = (0, ipx_1.createIPXHandler)({
+exports.handler = ipx_1.createIPXHandler({
     basePath: imageconfig_json_1.basePath,
     domains: imageconfig_json_1.domains,
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.0.0-rc.0",
+  "version": "4.0.0-rc.1",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -55,7 +55,7 @@
   "homepage": "https://github.com/netlify/netlify-plugin-nextjs#readme",
   "dependencies": {
     "@netlify/functions": "^0.10.0",
-    "@netlify/ipx": "^0.0.7",
+    "@netlify/ipx": "^0.0.8",
     "@vercel/node": "^1.11.2-canary.4",
     "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": "^20.0.4",
-    "@netlify/eslint-config-node": "^3.3.11",
+    "@netlify/build": "^20.1.0",
+    "@netlify/eslint-config-node": "^4.0.0",
     "@testing-library/cypress": "^8.0.1",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.0.2",