@netlify/plugin-nextjs 4.39.4 → 4.40.0

package/lib/helpers/edge.js

@@ -196,7 +196,7 @@ exports.getEdgeFunctionPatternForPage = getEdgeFunctionPatternForPage;
  * Writes Edge Functions for the Next middleware
  */
 // eslint-disable-next-line max-lines-per-function
-const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
+const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, constants: { PACKAGE_PATH = '' }, }) => {
     var _a;
     const generator = await (0, functionsMetaData_1.getPluginVersion)();
     const manifest = {
@@ -204,7 +204,7 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
         layers: [],
         version: 1,
     };
-    const edgeFunctionRoot = (0, path_1.resolve)('.netlify', 'edge-functions');
+    const edgeFunctionRoot = (0, path_1.resolve)(PACKAGE_PATH, '.netlify', 'edge-functions');
     await (0, fs_extra_1.emptyDir)(edgeFunctionRoot);
     const { publish } = netlifyConfig.build;
     const nextConfigFile = await (0, config_1.getRequiredServerFiles)(publish);

package/lib/helpers/functions.js

@@ -21,7 +21,7 @@ const files_1 = require("./files");
 const functionsMetaData_1 = require("./functionsMetaData");
 const pack_1 = require("./pack");
 const utils_1 = require("./utils");
-const generateFunctions = async ({ FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC, PUBLISH_DIR }, appDir, apiLambdas, ssrLambdas) => {
+const generateFunctions = async ({ INTERNAL_FUNCTIONS_SRC, PUBLISH_DIR, PACKAGE_PATH = '', FUNCTIONS_SRC = (0, pathe_1.join)(PACKAGE_PATH, constants_1.DEFAULT_FUNCTIONS_SRC), }, appDir, apiLambdas, ssrLambdas) => {
     const publish = (0, pathe_1.resolve)(PUBLISH_DIR);
     const functionsDir = (0, pathe_1.resolve)(INTERNAL_FUNCTIONS_SRC || FUNCTIONS_SRC);
     const functionDir = (0, pathe_1.join)(functionsDir, constants_1.HANDLER_FUNCTION_NAME);
@@ -95,15 +95,15 @@ 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 ({ INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC = constants_1.DEFAULT_FUNCTIONS_SRC, PUBLISH_DIR, }) => {
+const generatePagesResolver = async ({ INTERNAL_FUNCTIONS_SRC, PUBLISH_DIR, PACKAGE_PATH = '', FUNCTIONS_SRC = (0, pathe_1.join)(PACKAGE_PATH, constants_1.DEFAULT_FUNCTIONS_SRC), }) => {
     const functionsPath = INTERNAL_FUNCTIONS_SRC || FUNCTIONS_SRC;
-    const jsSource = await (0, getPageResolver_1.getResolverForPages)(PUBLISH_DIR);
+    const jsSource = await (0, getPageResolver_1.getResolverForPages)(PUBLISH_DIR, PACKAGE_PATH);
     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);
 };
 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, IS_LOCAL }, imageconfig = {}, netlifyConfig, basePath, remotePatterns, responseHeaders, }) => {
+const setupImageFunction = async ({ constants: { IS_LOCAL, INTERNAL_FUNCTIONS_SRC, PACKAGE_PATH = '', FUNCTIONS_SRC = (0, pathe_1.join)(PACKAGE_PATH, constants_1.DEFAULT_FUNCTIONS_SRC), }, imageconfig = {}, netlifyConfig, basePath, remotePatterns, responseHeaders, }) => {
     const imagePath = imageconfig.path || '/_next/image';
     if ((0, destr_1.default)(process.env.DISABLE_IPX)) {
         // If no image loader is specified, need to redirect to a 404 page since there's no

package/lib/index.js

@@ -128,7 +128,7 @@ const plugin = {
             buildId,
             apiLambdas,
         });
-        await (0, edge_1.writeEdgeFunctions)({ netlifyConfig, routesManifest });
+        await (0, edge_1.writeEdgeFunctions)({ constants, netlifyConfig, routesManifest });
     },
     async onPostBuild({ netlifyConfig: { build: { publish }, redirects, headers, }, utils: { status, cache, functions, build: { failBuild }, }, constants: { FUNCTIONS_DIST }, }) {
         await (0, cache_1.saveCache)({ cache, publish });

package/lib/templates/getPageResolver.js

@@ -39,8 +39,8 @@ const getResolverForDependencies = ({ dependencies, functionDir, }) => {
   `;
 };
 exports.getResolverForDependencies = getResolverForDependencies;
-const getResolverForPages = async (publish) => {
-    const functionDir = (0, pathe_1.resolve)('.netlify', 'functions', constants_1.HANDLER_FUNCTION_NAME);
+const getResolverForPages = async (publish, packagePath) => {
+    const functionDir = (0, pathe_1.resolve)(packagePath, '.netlify', 'functions', constants_1.HANDLER_FUNCTION_NAME);
     const dependencies = await (0, exports.getAllPageDependencies)(publish);
     return (0, exports.getResolverForDependencies)({ dependencies, functionDir });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.39.4",
+  "version": "4.40.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "index.js",
   "files": [
@@ -37,7 +37,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^29.20.1",
+    "@netlify/build": "^29.20.4",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",