@netlify/plugin-nextjs 4.28.5 → 4.28.6

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.generateCustomHeaders = exports.configureHandlerFunctions = exports.updateRequiredServerFiles = exports.getRequiredServerFiles = exports.getNextConfig = void 0;
+exports.generateCustomHeaders = exports.configureHandlerFunctions = exports.hasManuallyAddedModule = exports.updateRequiredServerFiles = exports.getRequiredServerFiles = exports.getNextConfig = void 0;
 const destr_1 = __importDefault(require("destr"));
 const fs_extra_1 = require("fs-extra");
 const pathe_1 = require("pathe");
@@ -57,7 +57,12 @@ const resolveModuleRoot = (moduleName) => {
     }
 };
 const DEFAULT_EXCLUDED_MODULES = ['sharp', 'electron'];
-const configureHandlerFunctions = async ({ netlifyConfig, publish, ignore = [] }) => {
+const hasManuallyAddedModule = ({ netlifyConfig, moduleName, }) => 
+/* eslint-disable camelcase */
+Object.values(netlifyConfig.functions).some(({ included_files = [] }) => included_files.some((inc) => inc.includes(`node_modules/${moduleName}`)));
+exports.hasManuallyAddedModule = hasManuallyAddedModule;
+/* eslint-enable camelcase */
+const configureHandlerFunctions = async ({ netlifyConfig, publish, ignore = [], }) => {
     var _a;
     const config = await (0, exports.getRequiredServerFiles)(publish);
     const files = config.files || [];
@@ -67,19 +72,19 @@ const configureHandlerFunctions = async ({ netlifyConfig, publish, ignore = [] }
         (_a = netlifyConfig.functions)._ipx || (_a._ipx = {});
         netlifyConfig.functions._ipx.node_bundler = 'nft';
     }
-    /* eslint-enable no-underscore-dangle */
-    ;
+    // If the user has manually added the module to included_files, then don't exclude it
+    const excludedModules = DEFAULT_EXCLUDED_MODULES.filter((moduleName) => !(0, exports.hasManuallyAddedModule)({ netlifyConfig, moduleName }));
     [constants_1.HANDLER_FUNCTION_NAME, constants_1.ODB_FUNCTION_NAME, '_api_*'].forEach((functionName) => {
         var _a, _b;
         (_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', './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`, ...cssFilesToInclude, ...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`, '!**/node_modules/@next/swc*/**/*', ...cssFilesToInclude, ...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`);
         }
-        DEFAULT_EXCLUDED_MODULES.forEach((moduleName) => {
+        excludedModules.forEach((moduleName) => {
             const moduleRoot = resolveModuleRoot(moduleName);
             if (moduleRoot) {
                 netlifyConfig.functions[functionName].included_files.push(`!${moduleRoot}/**/*`);
@@ -102,11 +107,11 @@ const buildHeader = (buildHeaderParams) => {
 // configuration does not support.
 const sanitizePath = (path) => path.replace(/:[^*/]+\*$/, '*');
 /**
- * Persist NEXT.js custom headers to the Netlify configuration so the headers work with static files
+ * Persist Next.js custom headers to the Netlify configuration so the headers work with static files
  * See {@link https://nextjs.org/docs/api-reference/next.config.js/headers} for more information on custom
  * headers in Next.js
  *
- * @param nextConfig - The NextJS configuration
+ * @param nextConfig - The Next.js configuration
  * @param netlifyHeaders - Existing headers that are already configured in the Netlify configuration
  */
 const generateCustomHeaders = (nextConfig, netlifyHeaders = []) => {
@@ -149,3 +154,4 @@ const generateCustomHeaders = (nextConfig, netlifyHeaders = []) => {
     }
 };
 exports.generateCustomHeaders = generateCustomHeaders;
+/* eslint-enable max-lines */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.28.5",
+  "version": "4.28.6",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "index.js",
   "files": [