Merge branch 'main' into ep/css-not-working-in-isr

Author: ericapisani

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  "plugin": "4.12.0"
+  "plugin": "4.12.1"
 }

plugin/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [4.12.1](https://github.com/netlify/netlify-plugin-nextjs/compare/plugin-nextjs-v4.12.0...plugin-nextjs-v4.12.1) (2022-07-12)
+
+
+### Bug Fixes
+
+* copy imageconfig into edge function dir ([#1462](https://github.com/netlify/netlify-plugin-nextjs/issues/1462)) ([58ba162](https://github.com/netlify/netlify-plugin-nextjs/commit/58ba162a9c8d02212eb044d0df9dfb3be0c11eea))
+
 ## [4.12.0](https://github.com/netlify/netlify-plugin-nextjs/compare/plugin-nextjs-v4.11.2...plugin-nextjs-v4.12.0) (2022-07-12)
 
 

plugin/package.json

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

plugin/src/helpers/edge.ts

@@ -1,8 +1,9 @@
+/* eslint-disable max-lines */
 import { promises as fs, existsSync } from 'fs'
 import { resolve, join } from 'path'
 
 import type { NetlifyConfig } from '@netlify/build'
-import { emptyDir, ensureDir, readJSON, readJson, writeJSON, writeJson } from 'fs-extra'
+import { copyFile, emptyDir, ensureDir, readJSON, readJson, writeJSON, writeJson } from 'fs-extra'
 import type { MiddlewareManifest } from 'next/dist/build/webpack/plugins/middleware-plugin'
 
 type EdgeFunctionDefinition = MiddlewareManifest['middleware']['name']
@@ -139,7 +140,13 @@ export const writeEdgeFunctions = async (netlifyConfig: NetlifyConfig) => {
         'Using Netlify Edge Functions for image format detection. Set env var "NEXT_DISABLE_EDGE_IMAGES=true" to disable.',
       )
     }
-    await copyEdgeSourceFile({ edgeFunctionDir: edgeFunctionRoot, file: 'ipx.ts' })
+    const edgeFunctionDir = join(edgeFunctionRoot, 'ipx')
+    await ensureDir(edgeFunctionDir)
+    await copyEdgeSourceFile({ edgeFunctionDir, file: 'ipx.ts', target: 'index.ts' })
+    await copyFile(
+      join('.netlify', 'functions-internal', '_ipx', 'imageconfig.json'),
+      join(edgeFunctionDir, 'imageconfig.json'),
+    )
     manifest.functions.push({
       function: 'ipx',
       path: '/_next/image*',
@@ -183,3 +190,4 @@ export const updateConfig = async (publish: string) => {
   config.config.env.NEXT_USE_NETLIFY_EDGE = 'true'
   await writeJSON(configFile, config)
 }
+/* eslint-enable max-lines */

plugin/src/templates/edge/ipx.ts

@@ -1,7 +1,7 @@
 import { Accepts } from "https://deno.land/x/[email protected]/mod.ts";
 import type { Context } from "netlify:edge";
 // Available at build time
-import imageconfig from "../functions-internal/_ipx/imageconfig.json" assert {
+import imageconfig from "./imageconfig.json" assert {
   type: "json",
 };
 

test/index.js

@@ -40,7 +40,7 @@ const chance = new Chance()
 const FIXTURES_DIR = `${__dirname}/fixtures`
 const SAMPLE_PROJECT_DIR = `${__dirname}/../demos/default`
 const constants = {
-  INTERNAL_FUNCTIONS_SRC: '.netlify/internal-functions',
+  INTERNAL_FUNCTIONS_SRC: '.netlify/functions-internal',
   PUBLISH_DIR: '.next',
   FUNCTIONS_DIST: '.netlify/functions',
 }
@@ -368,12 +368,12 @@ describe('onBuild()', () => {
 
     await plugin.onBuild(defaultArgs)
 
-    expect(existsSync(`.netlify/internal-functions/___netlify-handler/___netlify-handler.js`)).toBeTruthy()
-    expect(existsSync(`.netlify/internal-functions/___netlify-handler/bridge.js`)).toBeTruthy()
-    expect(existsSync(`.netlify/internal-functions/___netlify-handler/handlerUtils.js`)).toBeTruthy()
-    expect(existsSync(`.netlify/internal-functions/___netlify-odb-handler/___netlify-odb-handler.js`)).toBeTruthy()
-    expect(existsSync(`.netlify/internal-functions/___netlify-odb-handler/bridge.js`)).toBeTruthy()
-    expect(existsSync(`.netlify/internal-functions/___netlify-odb-handler/handlerUtils.js`)).toBeTruthy()
+    expect(existsSync(`.netlify/functions-internal/___netlify-handler/___netlify-handler.js`)).toBeTruthy()
+    expect(existsSync(`.netlify/functions-internal/___netlify-handler/bridge.js`)).toBeTruthy()
+    expect(existsSync(`.netlify/functions-internal/___netlify-handler/handlerUtils.js`)).toBeTruthy()
+    expect(existsSync(`.netlify/functions-internal/___netlify-odb-handler/___netlify-odb-handler.js`)).toBeTruthy()
+    expect(existsSync(`.netlify/functions-internal/___netlify-odb-handler/bridge.js`)).toBeTruthy()
+    expect(existsSync(`.netlify/functions-internal/___netlify-odb-handler/handlerUtils.js`)).toBeTruthy()
   })
 
   test('writes correct redirects to netlifyConfig', async () => {