fix: revert symlinks to cp due to CLI issues (#70)

* fix: revert symlinks

* chore: fix tests

* fix: use server handler name constant in config

Author: orinokai

src/build/config.ts

@@ -2,7 +2,7 @@ import type { NetlifyPluginConstants, NetlifyPluginOptions } from '@netlify/buil
 import type { PrerenderManifest } from 'next/dist/build/index.js'
 import { readFile } from 'node:fs/promises'
 import { resolve } from 'node:path'
-import { STATIC_DIR } from './constants.js'
+import { SERVER_HANDLER_NAME, STATIC_DIR } from './constants.js'
 
 export const getPrerenderManifest = async ({
   PUBLISH_DIR,
@@ -22,7 +22,7 @@ export const setDeployConfig = ({ netlifyConfig }: Pick<NetlifyPluginOptions, 'n
   netlifyConfig.redirects ||= []
   netlifyConfig.redirects.push({
     from: '/*',
-    to: '/.netlify/functions/___netlify-server-handler',
+    to: `/.netlify/functions/${SERVER_HANDLER_NAME}`,
     status: 200,
   })
 }

src/build/content/server.ts

@@ -1,32 +1,30 @@
 import glob from 'fast-glob'
-import { mkdir, symlink } from 'node:fs/promises'
-import { dirname, join } from 'node:path'
+import { cp } from 'node:fs/promises'
+import { join } from 'node:path'
 
 /**
  * Copy App/Pages Router Javascript needed by the server handler
  */
-export const linkServerContent = async (src: string, dest: string): Promise<void> => {
+export const copyServerContent = async (src: string, dest: string): Promise<void> => {
   const paths = await glob([`*`, `server/*`, `server/chunks/*`, `server/+(app|pages)/**/*.js`], {
     cwd: src,
     extglob: true,
   })
   await Promise.all(
     paths.map(async (path: string) => {
-      await mkdir(join(dest, dirname(path)), { recursive: true })
-      await symlink(join(src, path), join(dest, path))
+      await cp(join(src, path), join(dest, path), { recursive: true })
     }),
   )
 }
 
-export const linkServerDependencies = async (src: string, dest: string): Promise<void> => {
+export const copyServerDependencies = async (src: string, dest: string): Promise<void> => {
   const paths = await glob([`**`], {
     cwd: src,
     extglob: true,
   })
   await Promise.all(
     paths.map(async (path: string) => {
-      await mkdir(join(dest, dirname(path)), { recursive: true })
-      await symlink(join(src, path), join(dest, path))
+      await cp(join(src, path), join(dest, path), { recursive: true })
     }),
   )
 }

src/build/content/static.test.ts

@@ -5,7 +5,7 @@ import { mockFileSystem } from '../../../tests/index.js'
 import { FixtureTestContext, createFsFixture } from '../../../tests/utils/fixture.js'
 import { getBlobStore } from '../blob.js'
 import { STATIC_DIR } from '../constants.js'
-import { linkStaticAssets, uploadStaticContent } from './static.js'
+import { copyStaticAssets, uploadStaticContent } from './static.js'
 
 afterEach(() => {
   vi.restoreAllMocks()
@@ -29,7 +29,7 @@ test('should clear the static directory contents', async () => {
     [`${STATIC_DIR}/remove-me.js`]: '',
   })
 
-  await linkStaticAssets({
+  await copyStaticAssets({
     constants: { PUBLISH_DIR },
   } as Pick<NetlifyPluginOptions, 'constants'>)
 
@@ -49,7 +49,7 @@ test<FixtureTestContext>('should link static content from the publish directory
     ctx,
   )
 
-  await linkStaticAssets({
+  await copyStaticAssets({
     constants: { PUBLISH_DIR },
   } as Pick<NetlifyPluginOptions, 'constants'>)
 
@@ -76,7 +76,7 @@ test<FixtureTestContext>('should link static content from the public directory t
     ctx,
   )
 
-  await linkStaticAssets({
+  await copyStaticAssets({
     constants: { PUBLISH_DIR },
   } as Pick<NetlifyPluginOptions, 'constants'>)
 

src/build/content/static.ts

@@ -1,19 +1,19 @@
 import type { NetlifyPluginOptions } from '@netlify/build'
 import glob from 'fast-glob'
 import type { PrerenderManifest } from 'next/dist/build/index.js'
-import { readFile, rm } from 'node:fs/promises'
+import { existsSync } from 'node:fs'
+import { cp, readFile, rm } from 'node:fs/promises'
 import { basename, dirname, resolve } from 'node:path'
 import { join as joinPosix } from 'node:path/posix'
 import { getBlobStore } from '../blob.js'
 import { getPrerenderManifest } from '../config.js'
 import { STATIC_DIR } from '../constants.js'
-import { linkdir } from '../files.js'
 
 export const uploadStaticContent = async ({
   constants: { PUBLISH_DIR, NETLIFY_API_TOKEN, NETLIFY_API_HOST, SITE_ID },
 }: Pick<NetlifyPluginOptions, 'constants'>): Promise<void> => {
   const dir = 'server/pages'
-  const paths = await glob(['**/*.html'], {
+  const paths = await glob('**/*.html', {
     cwd: resolve(PUBLISH_DIR, dir),
   })
 
@@ -34,7 +34,6 @@ export const uploadStaticContent = async ({
         return !Object.keys(manifest.routes).includes(route)
       })
       .map(async (path) => {
-        console.log(`Uploading static content: ${path}`)
         await blob.set(
           joinPosix(dir, path),
           await readFile(resolve(PUBLISH_DIR, dir, path), 'utf-8'),
@@ -51,10 +50,16 @@ export const uploadStaticContent = async ({
 /**
  * Move static content to the publish dir so it is uploaded to the CDN
  */
-export const linkStaticAssets = async ({
+export const copyStaticAssets = async ({
   constants: { PUBLISH_DIR },
 }: Pick<NetlifyPluginOptions, 'constants'>): Promise<void> => {
   await rm(resolve(STATIC_DIR), { recursive: true, force: true })
-  await linkdir(resolve(PUBLISH_DIR, 'static'), resolve(STATIC_DIR, '_next/static'))
-  await linkdir(resolve('public'), resolve(STATIC_DIR))
+  if (existsSync(resolve('public'))) {
+    await cp(resolve('public'), resolve(STATIC_DIR), { recursive: true })
+  }
+  if (existsSync(resolve(PUBLISH_DIR, 'static'))) {
+    await cp(resolve(PUBLISH_DIR, 'static'), resolve(STATIC_DIR, '_next/static'), {
+      recursive: true,
+    })
+  }
 }

src/build/files.test.ts

@@ -1,15 +1,15 @@
 import { NetlifyPluginOptions } from '@netlify/build'
 import { nodeFileTrace } from '@vercel/nft'
-import { mkdir, rm, symlink, writeFile } from 'fs/promises'
-import { dirname, join, resolve } from 'node:path'
+import { cp, rm, writeFile } from 'fs/promises'
+import { join, resolve } from 'node:path'
 import {
   PLUGIN_DIR,
   PLUGIN_NAME,
   PLUGIN_VERSION,
   SERVER_HANDLER_DIR,
   SERVER_HANDLER_NAME,
 } from '../constants.js'
-import { linkServerContent, linkServerDependencies } from '../content/server.js'
+import { copyServerContent, copyServerDependencies } from '../content/server.js'
 
 /**
  * Create a Netlify function to run the Next.js server
@@ -33,17 +33,16 @@ export const createServerHandler = async ({
   // copy the handler dependencies
   await Promise.all(
     [...fileList].map(async (path) => {
-      await mkdir(resolve(SERVER_HANDLER_DIR, dirname(path)), { recursive: true })
-      await symlink(resolve(PLUGIN_DIR, path), resolve(SERVER_HANDLER_DIR, path))
+      await cp(resolve(PLUGIN_DIR, path), resolve(SERVER_HANDLER_DIR, path), { recursive: true })
     }),
   )
 
   // copy the next.js standalone build output to the handler directory
-  await linkServerContent(
+  await copyServerContent(
     resolve(PUBLISH_DIR, 'standalone/.next'),
     resolve(SERVER_HANDLER_DIR, '.next'),
   )
-  await linkServerDependencies(
+  await copyServerDependencies(
     resolve(PUBLISH_DIR, 'standalone/node_modules'),
     resolve(SERVER_HANDLER_DIR, 'node_modules'),
   )

src/build/files.ts

@@ -2,7 +2,7 @@ import type { NetlifyPluginOptions } from '@netlify/build'
 import { restoreBuildCache, saveBuildCache } from './build/cache.js'
 import { setBuildConfig, setDeployConfig } from './build/config.js'
 import { uploadPrerenderedContent } from './build/content/prerendered.js'
-import { linkStaticAssets, uploadStaticContent } from './build/content/static.js'
+import { copyStaticAssets, uploadStaticContent } from './build/content/static.js'
 import { createServerHandler } from './build/functions/server.js'
 
 export const onPreBuild = async ({ constants, utils }: NetlifyPluginOptions) => {
@@ -14,7 +14,7 @@ export const onBuild = async ({ constants, utils }: NetlifyPluginOptions) => {
   await saveBuildCache({ constants, utils })
 
   return Promise.all([
-    linkStaticAssets({ constants }),
+    copyStaticAssets({ constants }),
     uploadStaticContent({ constants }),
     uploadPrerenderedContent({ constants }),
     createServerHandler({ constants }),