static assets trailing slashes, public and some constants moving

Author: pieh

src/adapter/adapter.ts

@@ -3,6 +3,7 @@ import { dirname } from 'node:path'
 
 import type { NextAdapter } from 'next-with-adapters'
 
+import { NETLIFY_FRAMEWORKS_API_CONFIG_PATH } from './constants.js'
 import { onBuildComplete as onBuildCompleteForHeaders } from './header.js'
 import {
   modifyConfig as modifyConfigForImageCDN,
@@ -12,8 +13,6 @@ import { onBuildComplete as onBuildCompleteForMiddleware } from './middleware.js
 import { onBuildComplete as onBuildCompleteForStaticAssets } from './static-assets.js'
 import { FrameworksAPIConfig } from './types.js'
 
-const NETLIFY_FRAMEWORKS_API_CONFIG_PATH = '.netlify/v1/config.json'
-
 const adapter: NextAdapter = {
   name: 'Netlify',
   modifyConfig(config) {

src/adapter/constants.ts

@@ -8,3 +8,7 @@ export const PLUGIN_DIR = join(MODULE_DIR, '../..')
 const packageJSON = JSON.parse(readFileSync(join(PLUGIN_DIR, 'package.json'), 'utf-8'))
 
 export const GENERATOR = `${packageJSON.name}@${packageJSON.version}`
+
+export const NETLIFY_FRAMEWORKS_API_CONFIG_PATH = '.netlify/v1/config.json'
+export const NETLIFY_FRAMEWORKS_API_EDGE_FUNCTIONS = '.netlify/v1/edge-functions'
+export const NEXT_RUNTIME_STATIC_ASSETS = '.netlify/static'

src/adapter/middleware.ts

@@ -4,10 +4,9 @@ import { dirname, join, parse, relative } from 'node:path/posix'
 import { glob } from 'fast-glob'
 import { pathToRegexp } from 'path-to-regexp'
 
-import { GENERATOR, PLUGIN_DIR } from './constants.js'
+import { GENERATOR, NETLIFY_FRAMEWORKS_API_EDGE_FUNCTIONS, PLUGIN_DIR } from './constants.js'
 import type { FrameworksAPIConfig, NextConfigComplete, OnBuildCompleteContext } from './types.js'
 
-const NETLIFY_FRAMEWORKS_API_EDGE_FUNCTIONS = '.netlify/v1/edge-functions'
 const MIDDLEWARE_FUNCTION_NAME = 'middleware'
 
 const MIDDLEWARE_FUNCTION_DIR = join(

src/adapter/static-assets.ts

@@ -1,6 +1,8 @@
+import { existsSync } from 'node:fs'
 import { cp } from 'node:fs/promises'
 import { extname, join } from 'node:path/posix'
 
+import { NEXT_RUNTIME_STATIC_ASSETS } from './constants.js'
 import type { FrameworksAPIConfig, OnBuildCompleteContext } from './types.js'
 
 export async function onBuildComplete(
@@ -13,11 +15,18 @@ export async function onBuildComplete(
     try {
       let distPathname = staticFile.pathname
       if (extname(distPathname) === '' && extname(staticFile.filePath) === '.html') {
+        // FEEDBACK: should this be applied in Next.js before passing to context to adapters?
+        if (ctx.config.trailingSlash && !distPathname.endsWith('/')) {
+          distPathname += '/'
+        } else if (!ctx.config.trailingSlash && distPathname.endsWith('/')) {
+          distPathname = distPathname.slice(0, -1)
+        }
+
         // if pathname is extension-less, but source file has an .html extension, preserve it
-        distPathname += '.html'
+        distPathname += distPathname.endsWith('/') ? 'index.html' : '.html'
       }
 
-      await cp(staticFile.filePath, join('./.netlify/static', distPathname), {
+      await cp(staticFile.filePath, join(NEXT_RUNTIME_STATIC_ASSETS, distPathname), {
         recursive: true,
       })
     } catch (error) {
@@ -27,5 +36,13 @@ export async function onBuildComplete(
     }
   }
 
+  // FEEDBACK: files in public directory are not in `outputs.staticFiles`
+  if (existsSync('public')) {
+    // copy all files from public directory to static assets
+    await cp('public', NEXT_RUNTIME_STATIC_ASSETS, {
+      recursive: true,
+    })
+  }
+
   return frameworksAPIConfig
 }