@netlify/plugin-nextjs 4.29.1 → 4.29.2-alpha-isr-404.0

package/lib/helpers/files.js

@@ -293,7 +293,7 @@ const getDependenciesOfFile = async (file) => {
         return [];
     }
     const dependencies = await (0, fs_extra_1.readJson)(nft, 'utf8');
-    return dependencies.files.map((dep) => (0, pathe_1.resolve)(file, dep));
+    return dependencies.files.map((dep) => (0, pathe_1.resolve)((0, pathe_1.dirname)(file), dep));
 };
 exports.getDependenciesOfFile = getDependenciesOfFile;
 const baseServerReplacements = [
@@ -303,7 +303,7 @@ const baseServerReplacements = [
         `checkIsManualRevalidate(process.env._REVALIDATE_SSG ? { headers: { 'x-prerender-revalidate': this.renderOpts.previewProps.previewModeId } } : req, this.renderOpts.previewProps)`,
     ],
     // ensure ISR 404 pages send the correct SWR cache headers
-    [`private: isPreviewMode || is404Page && cachedData`, `private: isPreviewMode && cachedData`],
+    [`private: isPreviewMode || is404Page`, `private: isPreviewMode || false`],
 ];
 const nextServerReplacements = [
     [

package/lib/helpers/functions.js

@@ -36,7 +36,7 @@ const generateFunctions = async ({ FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS
         await (0, fs_extra_1.copyFile)(node_bridge_1.default, (0, pathe_1.join)(functionsDir, functionName, 'bridge.js'));
         await (0, fs_extra_1.copyFile)((0, pathe_1.join)(__dirname, '..', '..', 'lib', 'templates', 'handlerUtils.js'), (0, pathe_1.join)(functionsDir, functionName, 'handlerUtils.js'));
         const resolveSourceFile = (file) => (0, pathe_1.join)(publish, 'server', file);
-        const resolverSource = await (0, getPageResolver_1.getSinglePageResolver)({
+        const resolverSource = await (0, getPageResolver_1.getResolverForSourceFiles)({
             functionsDir,
             // These extra pages are always included by Next.js
             sourceFiles: [compiled, 'pages/_app.js', 'pages/_document.js', 'pages/_error.js'].map(resolveSourceFile),
@@ -58,12 +58,9 @@ exports.generateFunctions = generateFunctions;
  * Writes a file in each function directory that contains references to every page entrypoint.
  * This is just so that the nft bundler knows about them. We'll eventually do this better.
  */
-const generatePagesResolver = async ({ constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS_SRC, PUBLISH_DIR }, target, }) => {
+const generatePagesResolver = async ({ INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS_SRC, PUBLISH_DIR, }) => {
     const functionsPath = INTERNAL_FUNCTIONS_SRC || FUNCTIONS_SRC;
-    const jsSource = await (0, getPageResolver_1.getPageResolver)({
-        publish: PUBLISH_DIR,
-        target,
-    });
+    const jsSource = await (0, getPageResolver_1.getResolverForPages)(PUBLISH_DIR);
     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);
 };

package/lib/index.js

@@ -94,7 +94,7 @@ const plugin = {
         await (0, config_1.configureHandlerFunctions)({ netlifyConfig, ignore, publish: (0, path_1.relative)(process.cwd(), publish) });
         const apiRoutes = await (0, functions_1.getExtendedApiRouteConfigs)(publish, appDir);
         await (0, functions_1.generateFunctions)(constants, appDir, apiRoutes);
-        await (0, functions_1.generatePagesResolver)({ target, constants });
+        await (0, functions_1.generatePagesResolver)(constants);
         await (0, files_1.movePublicFiles)({ appDir, outdir, publish });
         await (0, files_1.patchNextFiles)(appDir);
         if (!(0, destr_1.default)(process.env.SERVE_STATIC_FILES_FROM_ORIGIN)) {

package/lib/templates/getPageResolver.js

@@ -3,28 +3,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSinglePageResolver = exports.getPageResolver = void 0;
-const path_1 = require("path");
+exports.getResolverForSourceFiles = exports.getResolverForPages = exports.getResolverForDependencies = exports.getAllPageDependencies = exports.getUniqueDependencies = void 0;
+const globby_1 = __importDefault(require("globby"));
 const outdent_1 = require("outdent");
 const pathe_1 = require("pathe");
-const slash_1 = __importDefault(require("slash"));
-const tiny_glob_1 = __importDefault(require("tiny-glob"));
 const constants_1 = require("../constants");
 const files_1 = require("../helpers/files");
 // Generate a file full of require.resolve() calls for all the pages in the
 // build. This is used by the nft bundler to find all the pages.
-const getPageResolver = async ({ publish, target }) => {
-    const functionDir = path_1.posix.resolve(path_1.posix.join('.netlify', 'functions', constants_1.HANDLER_FUNCTION_NAME));
-    const root = path_1.posix.resolve((0, slash_1.default)(publish), target === 'server' ? 'server' : 'serverless', 'pages');
-    const pages = await (0, tiny_glob_1.default)('**/*.js', {
+const getUniqueDependencies = async (sourceFiles) => {
+    const dependencies = await Promise.all(sourceFiles.map((sourceFile) => (0, files_1.getDependenciesOfFile)(sourceFile)));
+    return [...new Set([...sourceFiles, ...dependencies.flat()])].sort();
+};
+exports.getUniqueDependencies = getUniqueDependencies;
+const getAllPageDependencies = async (publish) => {
+    const root = (0, pathe_1.resolve)(publish, 'server');
+    const pageFiles = await (0, globby_1.default)('{pages,app}/**/*.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)))}')`)
-        .sort();
-    return (0, outdent_1.outdent) `
-    // This file is purely to allow nft to know about these pages. It should be temporary.
+    // We don't use `absolute: true` because that returns Windows paths on Windows.
+    // Instead we use pathe to normalize the paths.
+    return (0, exports.getUniqueDependencies)(pageFiles.map((pageFile) => (0, pathe_1.join)(root, pageFile)));
+};
+exports.getAllPageDependencies = getAllPageDependencies;
+const getResolverForDependencies = ({ dependencies, functionDir, }) => {
+    const pageFiles = dependencies.map((file) => `require.resolve('${(0, pathe_1.relative)(functionDir, file)}')`);
+    return (0, outdent_1.outdent /* javascript */) `
+    // This file is purely to allow nft to know about these pages. 
     exports.resolvePages = () => {
         try {
             ${pageFiles.join('\n        ')}
@@ -32,24 +38,17 @@ const getPageResolver = async ({ publish, target }) => {
     }
   `;
 };
-exports.getPageResolver = getPageResolver;
-/**
- * API routes only need the dependencies for a single entrypoint, so we use the
- * NFT trace file to get the dependencies.
- */
-const getSinglePageResolver = async ({ functionsDir, sourceFiles, }) => {
-    const dependencies = await Promise.all(sourceFiles.map((sourceFile) => (0, files_1.getDependenciesOfFile)(sourceFile)));
+exports.getResolverForDependencies = getResolverForDependencies;
+const getResolverForPages = async (publish) => {
+    const functionDir = (0, pathe_1.resolve)('.netlify', 'functions', constants_1.HANDLER_FUNCTION_NAME);
+    const dependencies = await (0, exports.getAllPageDependencies)(publish);
+    return (0, exports.getResolverForDependencies)({ dependencies, functionDir });
+};
+exports.getResolverForPages = getResolverForPages;
+const getResolverForSourceFiles = async ({ functionsDir, sourceFiles, }) => {
     // We don't need the actual name, just the relative path.
     const functionDir = (0, pathe_1.resolve)(functionsDir, 'functionName');
-    const deduped = [...new Set(dependencies.flat())];
-    const pageFiles = [...sourceFiles, ...deduped]
-        .map((file) => `require.resolve('${(0, pathe_1.relative)(functionDir, file)}')`)
-        .sort();
-    return (0, outdent_1.outdent /* javascript */) `
-    // This file is purely to allow nft to know about these pages. 
-      try {
-          ${pageFiles.join('\n        ')}
-      } catch {}
-  `;
+    const dependencies = await (0, exports.getUniqueDependencies)(sourceFiles);
+    return (0, exports.getResolverForDependencies)({ dependencies, functionDir });
 };
-exports.getSinglePageResolver = getSinglePageResolver;
+exports.getResolverForSourceFiles = getResolverForSourceFiles;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.29.1",
+  "version": "4.29.2-alpha-isr-404.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "index.js",
   "files": [
@@ -36,12 +36,12 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^28.1.13",
+    "@netlify/build": "^28.1.15",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",
     "@types/node": "^17.0.25",
-    "next": "^13.0.0",
+    "next": "^13.0.3",
     "npm-run-all": "^4.1.5",
     "typescript": "^4.6.3"
   },