@netlify/plugin-nextjs 4.4.3 → 4.6.0

package/lib/helpers/config.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.configureHandlerFunctions = exports.getNextConfig = void 0;
+exports.configureHandlerFunctions = exports.updateRequiredServerFiles = exports.getRequiredServerFiles = exports.getNextConfig = void 0;
 const fs_extra_1 = require("fs-extra");
 const pathe_1 = require("pathe");
 const slash_1 = __importDefault(require("slash"));
@@ -26,6 +26,24 @@ const getNextConfig = async function getNextConfig({ publish, failBuild = defaul
     }
 };
 exports.getNextConfig = getNextConfig;
+/**
+ * Returns all of the NextJS configuration stored within 'required-server-files.json'
+ * To update the configuration within this file, use the 'updateRequiredServerFiles' method.
+ */
+const getRequiredServerFiles = async (publish) => {
+    const configFile = (0, pathe_1.join)(publish, 'required-server-files.json');
+    return await (0, fs_extra_1.readJSON)(configFile);
+};
+exports.getRequiredServerFiles = getRequiredServerFiles;
+/**
+ * Writes a modified configuration object to 'required-server-files.json'.
+ * To get the full configuration, use the 'getRequiredServerFiles' method.
+ */
+const updateRequiredServerFiles = async (publish, modifiedConfig) => {
+    const configFile = (0, pathe_1.join)(publish, 'required-server-files.json');
+    await (0, fs_extra_1.writeJSON)(configFile, modifiedConfig);
+};
+exports.updateRequiredServerFiles = updateRequiredServerFiles;
 const resolveModuleRoot = (moduleName) => {
     try {
         return (0, pathe_1.dirname)((0, pathe_1.relative)(process.cwd(), require.resolve(`${moduleName}/package.json`, { paths: [process.cwd()] })));
@@ -45,7 +63,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', './public/locales/**', './next-i18next.config.js', `${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)}`));
         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`);

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.findModuleFromBase = exports.shouldSkip = exports.getPreviewRewrites = exports.getApiRewrites = exports.redirectsForNextRouteWithData = exports.redirectsForNextRoute = exports.isApiRoute = exports.routeToDataRoute = exports.netlifyRoutesForNextRouteWithData = exports.toNetlifyRoute = void 0;
+exports.isNextAuthInstalled = 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");
@@ -134,3 +134,15 @@ const findModuleFromBase = ({ paths, candidates }) => {
     return null;
 };
 exports.findModuleFromBase = findModuleFromBase;
+const isNextAuthInstalled = () => {
+    try {
+        // eslint-disable-next-line import/no-unassigned-import, import/no-unresolved, node/no-missing-require
+        require('next-auth');
+        return true;
+    }
+    catch {
+        // Ignore the MODULE_NOT_FOUND error
+        return false;
+    }
+};
+exports.isNextAuthInstalled = isNextAuthInstalled;

package/lib/index.js

@@ -42,6 +42,12 @@ const plugin = {
             publish,
             failBuild,
         });
+        if ((0, utils_1.isNextAuthInstalled)()) {
+            console.log(`NextAuth package detected, setting NEXTAUTH_URL environment variable to ${process.env.URL}`);
+            const config = await (0, config_1.getRequiredServerFiles)(publish);
+            config.config.env.NEXTAUTH_URL = process.env.URL;
+            await (0, config_1.updateRequiredServerFiles)(publish, config);
+        }
         const buildId = (0, fs_extra_1.readFileSync)((0, path_1.join)(publish, 'BUILD_ID'), 'utf8').trim();
         (0, config_1.configureHandlerFunctions)({ netlifyConfig, ignore, publish: (0, path_1.relative)(process.cwd(), publish) });
         await (0, functions_1.generateFunctions)(constants, appDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.4.3",
+  "version": "4.6.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -28,6 +28,7 @@
     "tiny-glob": "^0.2.9"
   },
   "devDependencies": {
+    "@delucis/if-env": "^1.1.2",
     "@netlify/build": "^27.0.1",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",

package/src/templates/edge/utils.ts

@@ -5,6 +5,19 @@ export interface FetchEventResult {
   waitUntil: Promise<any>
 }
 
+/**
+ * This is how Next handles rewritten URLs.
+ */
+ export function relativizeURL(url: string | string, base: string | URL) {
+  const baseURL = typeof base === 'string' ? new URL(base) : base
+  const relative = new URL(url, base)
+  const origin = `${baseURL.protocol}//${baseURL.host}`
+  return `${relative.protocol}//${relative.host}` === origin
+    ? relative.toString().replace(origin, '')
+    : relative.toString()
+}
+
+
 export const addMiddlewareHeaders = async (
   originResponse: Promise<Response> | Response,
   middlewareResponse: Response,
@@ -14,7 +27,8 @@ export const addMiddlewareHeaders = async (
     return originResponse
   }
   // We need to await the response to get the origin headers, then we can add the ones from middleware.
-  const response = await originResponse
+  const res = await originResponse
+  const response = new Response(res.body, res)
   middlewareResponse.headers.forEach((value, key) => {
     response.headers.set(key, value)
   })
@@ -33,6 +47,14 @@ export const buildResponse = async ({
   request.headers.set('x-nf-next-middleware', 'skip')
   const rewrite = res.headers.get('x-middleware-rewrite')
   if (rewrite) {
+    const rewriteUrl = new URL(rewrite, request.url)
+    const baseUrl = new URL(request.url)
+    if(rewriteUrl.hostname !== baseUrl.hostname) {
+      // Netlify Edge Functions don't support proxying to external domains, but Next middleware does
+      const proxied = fetch(new Request(rewriteUrl.toString(), request))
+      return addMiddlewareHeaders(proxied, res)
+    }
+    res.headers.set('x-middleware-rewrite', relativizeURL(rewrite, request.url))
     return addMiddlewareHeaders(context.rewrite(rewrite), res)
   }
   if (res.headers.get('x-middleware-next') === '1') {