fix: small workarounds for alpha (#57)

* fix: add manifest back

* fix: static file order

* fix: workaround for functions v2 issues

* chore: fix public path in static tests

* chore: update manifest name

* fix: add cwd to public dir when copying public assets

* fix: revert cwd add to publish

Author: orinokai

manifest.yml

@@ -0,0 +1 @@
+name: '@netlify/next-runtime'

src/build/config.ts

@@ -1,6 +1,14 @@
+import { NetlifyConfig } from '@netlify/build'
+
 /**
  * Enable Next.js standalone mode at build time
  */
-export const setBuildConfig = () => {
+export const setBuildConfig = (netlifyConfig: NetlifyConfig) => {
   process.env.NEXT_PRIVATE_STANDALONE = 'true'
+  netlifyConfig.redirects ||= []
+  netlifyConfig.redirects.push({
+    from: '/*',
+    to: '/.netlify/functions/___netlify-server-handler',
+    status: 200,
+  })
 }

src/build/content/static.test.ts

@@ -1,9 +1,9 @@
-import { vol, fs } from 'memfs'
-import { expect, test, vi, afterEach } from 'vitest'
+import { fs, vol } from 'memfs'
 import { join } from 'node:path'
+import { afterEach, expect, test, vi } from 'vitest'
+import { fsCpHelper, mockFileSystem } from '../../../tests/index.js'
 import { BUILD_DIR } from '../constants.js'
 import { copyStaticContent } from './static.js'
-import { mockFileSystem, fsCpHelper } from '../../../tests/index.js'
 
 vi.mock('node:fs', () => fs)
 vi.mock('node:fs/promises', () => {
@@ -59,10 +59,7 @@ test('should copy files from the public directory to the publish directory', asy
 
   const filenamesInVolume = Object.keys(vol.toJSON())
   expect(filenamesInVolume).toEqual(
-    expect.arrayContaining([
-      `${PUBLISH_DIR}/public/fake-image.svg`,
-      `${PUBLISH_DIR}/public/another-asset.json`,
-    ]),
+    expect.arrayContaining([`${PUBLISH_DIR}/fake-image.svg`, `${PUBLISH_DIR}/another-asset.json`]),
   )
 })
 

src/build/content/static.ts

@@ -52,13 +52,13 @@ const copyPublicAssets = async ({
   PUBLISH_DIR,
 }: Pick<NetlifyPluginConstants, 'PUBLISH_DIR'>): Promise<void> => {
   const src = join(process.cwd(), 'public')
-  const dist = join(PUBLISH_DIR, 'public')
+  const dist = PUBLISH_DIR
   if (!existsSync(src)) {
     return
   }
 
   await mkdir(dist, { recursive: true })
-  await cp(src, dist)
+  await cp(src, dist, { recursive: true, force: true })
 }
 
 /**
@@ -67,9 +67,7 @@ const copyPublicAssets = async ({
 export const copyStaticContent = async ({
   PUBLISH_DIR,
 }: Pick<NetlifyPluginConstants, 'PUBLISH_DIR'>): Promise<void> => {
-  await Promise.all([
-    copyStaticPages(join(process.cwd(), BUILD_DIR, '.next'), PUBLISH_DIR),
-    copyStaticAssets({ PUBLISH_DIR }),
-    copyPublicAssets({ PUBLISH_DIR }),
-  ])
+  await copyPublicAssets({ PUBLISH_DIR })
+  await copyStaticAssets({ PUBLISH_DIR })
+  await copyStaticPages(join(process.cwd(), BUILD_DIR, '.next'), PUBLISH_DIR)
 }

src/build/functions/server.ts

@@ -1,9 +1,9 @@
 import { nodeFileTrace } from '@vercel/nft'
-import { writeFile, rm, mkdir, cp } from 'fs/promises'
+import { readFileSync } from 'fs'
+import { cp, mkdir, rm, writeFile } from 'fs/promises'
+import { join } from 'node:path'
 import { BUILD_DIR, PLUGIN_DIR, SERVER_HANDLER_DIR, SERVER_HANDLER_NAME } from '../constants.js'
 import { copyServerContent } from '../content/server.js'
-import { join } from 'node:path'
-import { readFileSync } from 'fs'
 
 const pkg = JSON.parse(readFileSync(join(PLUGIN_DIR, 'package.json'), 'utf-8'))
 
@@ -75,6 +75,6 @@ export const createServerHandler = async () => {
   // write the root handler file
   await writeFile(
     join(process.cwd(), SERVER_HANDLER_DIR, `${SERVER_HANDLER_NAME}.js`),
-    `import handler from './dist/run/handlers/server.js';export default handler;export const config = {path:'/*'}`,
+    `import handler from './dist/run/handlers/server.js';export default handler`,
   )
 }

src/index.ts

@@ -1,13 +1,13 @@
 import { NetlifyPluginOptions } from '@netlify/build'
-import { moveBuildOutput } from './build/move-build-output.js'
 import { setBuildConfig } from './build/config.js'
 import { uploadPrerenderedContent } from './build/content/prerendered.js'
 import { copyStaticContent } from './build/content/static.js'
 import { createEdgeHandler } from './build/functions/edge.js'
 import { createServerHandler } from './build/functions/server.js'
+import { moveBuildOutput } from './build/move-build-output.js'
 
-export const onPreBuild = () => {
-  setBuildConfig()
+export const onPreBuild = ({ netlifyConfig }: NetlifyPluginOptions) => {
+  setBuildConfig(netlifyConfig)
 }
 
 export const onBuild = async ({ constants, utils }: NetlifyPluginOptions) => {