Merge branch 'main' into release-v3.9.1

Author: ascorbic

index.js

@@ -125,6 +125,15 @@ See https://ntl.fyi/remove-plugin for instructions.
       publishDir: netlifyConfig.build.publish || PUBLISH_DIR,
       nextRoot,
     })
+
+    if (!netlifyConfig.functions['*'].included_files) {
+      // eslint-disable-next-line no-param-reassign
+      netlifyConfig.functions['*'].included_files = []
+    }
+    netlifyConfig.functions['*'].included_files.push(
+      '!node_modules/@next/swc-*/**/*',
+      '!node_modules/next/dist/compiled/@ampproject/toolbox-optimizer/**/*',
+    )
   },
 
   async onPostBuild({ netlifyConfig, packageJson, constants: { FUNCTIONS_DIST = DEFAULT_FUNCTIONS_DIST }, utils }) {

test/index.js

@@ -87,7 +87,7 @@ afterEach(async () => {
 })
 
 const DUMMY_PACKAGE_JSON = { name: 'dummy', version: '1.0.0', scripts: { build: 'next build' } }
-const netlifyConfig = { build: { command: 'npm run build' } }
+const netlifyConfig = { build: { command: 'npm run build' }, functions: { '*': {} } }
 
 describe('preBuild()', () => {
   test('fails if the build version is too old', () => {
@@ -307,7 +307,7 @@ describe('onBuild()', () => {
     await moveNextDist()
     const PUBLISH_DIR = 'publish'
     await plugin.onBuild({
-      netlifyConfig: { build: { publish: path.resolve(PUBLISH_DIR), command: 'next build' } },
+      netlifyConfig: { ...netlifyConfig, build: { publish: path.resolve(PUBLISH_DIR), command: 'next build' } },
       packageJson: DUMMY_PACKAGE_JSON,
       constants: {
         PUBLISH_DIR,