fix: publish from subdirectory (#1756)

* fix: publish from subdirectory

* chore: fix nx demo

* chore: remove log

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

Author: ascorbic

demos/nx-next-monorepo-demo/package-lock.json

@@ -12,7 +12,7 @@
     "@netlify/plugin-nextjs": "file:plugin-wrapper",
     "@nrwl/next": "15.0.11",
     "core-js": "^3.6.5",
-    "next": "12.3.1",
+    "next": "^13.0.2",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "regenerator-runtime": "0.13.10",

demos/nx-next-monorepo-demo/package.json

@@ -1,7 +1,6 @@
 /* eslint-disable max-lines */
 import { cpus } from 'os'
 
-import type { NetlifyConfig } from '@netlify/build'
 import { yellowBright } from 'chalk'
 import { existsSync, readJson, move, copy, writeJson, readFile, writeFile, ensureDir, readFileSync } from 'fs-extra'
 import globby from 'globby'
@@ -60,11 +59,11 @@ export const matchesRewrite = (file: string, rewrites: Rewrites): boolean => {
   return matchesRedirect(file, rewrites.beforeFiles)
 }
 
-export const getMiddleware = async (publish: string): Promise<Array<string>> => {
+export const getMiddleware = async (distDir: string): Promise<Array<string>> => {
   if (process.env.NEXT_DISABLE_NETLIFY_EDGE !== 'true' && process.env.NEXT_DISABLE_NETLIFY_EDGE !== '1') {
     return []
   }
-  const manifestPath = join(publish, 'server', 'middleware-manifest.json')
+  const manifestPath = join(distDir, 'server', 'middleware-manifest.json')
   if (existsSync(manifestPath)) {
     const manifest = await readJson(manifestPath, { throws: false })
     return manifest?.sortedMiddleware ?? []
@@ -74,32 +73,28 @@ export const getMiddleware = async (publish: string): Promise<Array<string>> =>
 
 // eslint-disable-next-line max-lines-per-function
 export const moveStaticPages = async ({
-  netlifyConfig,
-  target,
+  distDir,
   i18n,
   basePath,
+  publishDir,
 }: {
-  netlifyConfig: NetlifyConfig
-  target: 'server' | 'serverless' | 'experimental-serverless-trace'
+  distDir: string
   i18n: NextConfig['i18n']
   basePath?: string
+  publishDir
 }): Promise<void> => {
   console.log('Moving static page files to serve from CDN...')
-  const outputDir = join(netlifyConfig.build.publish, target === 'server' ? 'server' : 'serverless')
+  const outputDir = join(distDir, 'server')
   const root = join(outputDir, 'pages')
-  const buildId = readFileSync(join(netlifyConfig.build.publish, 'BUILD_ID'), 'utf8').trim()
+  const buildId = readFileSync(join(distDir, 'BUILD_ID'), 'utf8').trim()
   const dataDir = join('_next', 'data', buildId)
-  await ensureDir(join(netlifyConfig.build.publish, dataDir))
+  await ensureDir(join(publishDir, dataDir))
   // Load the middleware manifest so we can check if a file matches it before moving
-  const middlewarePaths = await getMiddleware(netlifyConfig.build.publish)
+  const middlewarePaths = await getMiddleware(distDir)
   const middleware = middlewarePaths.map((path) => path.slice(1))
 
-  const prerenderManifest: PrerenderManifest = await readJson(
-    join(netlifyConfig.build.publish, 'prerender-manifest.json'),
-  )
-  const { redirects, rewrites }: RoutesManifest = await readJson(
-    join(netlifyConfig.build.publish, 'routes-manifest.json'),
-  )
+  const prerenderManifest: PrerenderManifest = await readJson(join(distDir, 'prerender-manifest.json'))
+  const { redirects, rewrites }: RoutesManifest = await readJson(join(distDir, 'routes-manifest.json'))
 
   const isrFiles = new Set<string>()
 
@@ -128,7 +123,7 @@ export const moveStaticPages = async ({
     files.push(file)
     filesManifest[file] = targetPath
 
-    const dest = join(netlifyConfig.build.publish, targetPath)
+    const dest = join(publishDir, targetPath)
 
     try {
       await move(source, dest)
@@ -242,10 +237,10 @@ export const moveStaticPages = async ({
   }
 
   // Write the manifest for use in the serverless functions
-  await writeJson(join(netlifyConfig.build.publish, 'static-manifest.json'), Object.entries(filesManifest))
+  await writeJson(join(distDir, 'static-manifest.json'), Object.entries(filesManifest))
 
   if (i18n?.defaultLocale) {
-    const rootPath = basePath ? join(netlifyConfig.build.publish, basePath) : netlifyConfig.build.publish
+    const rootPath = basePath ? join(publishDir, basePath) : publishDir
     // Copy the default locale into the root
     const defaultLocaleDir = join(rootPath, i18n.defaultLocale)
     if (existsSync(defaultLocaleDir)) {
@@ -427,12 +422,13 @@ export const unpatchNextFiles = async (root: string): Promise<void> => {
 export const movePublicFiles = async ({
   appDir,
   outdir,
-  publish,
+  publishDir,
 }: {
   appDir: string
   outdir?: string
-  publish: string
+  publishDir: string
 }): Promise<void> => {
+  await ensureDir(publishDir)
   // `outdir` is a config property added when using Next.js with Nx. It's typically
   // a relative path outside of the appDir, e.g. '../../dist/apps/<app-name>', and
   // the parent directory of the .next directory.
@@ -441,7 +437,7 @@ export const movePublicFiles = async ({
   // directory from the original app directory.
   const publicDir = outdir ? join(appDir, outdir, 'public') : join(appDir, 'public')
   if (existsSync(publicDir)) {
-    await copy(publicDir, `${publish}/`)
+    await copy(publicDir, `${publishDir}/`)
   }
 }
 /* eslint-enable max-lines */

package-lock.json

@@ -7,7 +7,7 @@ import type { PrerenderManifest, SsgRoute } from 'next/dist/build'
 import { outdent } from 'outdent'
 import { join } from 'pathe'
 
-import { HANDLER_FUNCTION_PATH, HIDDEN_PATHS, ODB_FUNCTION_PATH } from '../constants'
+import { HANDLER_FUNCTION_PATH, ODB_FUNCTION_PATH } from '../constants'
 
 import { getMiddleware } from './files'
 import { ApiRouteConfig } from './functions'
@@ -25,14 +25,6 @@ import {
 const matchesMiddleware = (middleware: Array<string>, route: string): boolean =>
   middleware.some((middlewarePath) => route.startsWith(middlewarePath))
 
-const generateHiddenPathRedirects = ({ basePath }: Pick<NextConfig, 'basePath'>): NetlifyConfig['redirects'] =>
-  HIDDEN_PATHS.map((path) => ({
-    from: `${basePath}${path}`,
-    to: '/404.html',
-    status: 404,
-    force: true,
-  }))
-
 const generateLocaleRedirects = ({
   i18n,
   basePath,
@@ -66,21 +58,6 @@ const generateLocaleRedirects = ({
   return redirects
 }
 
-export const generateStaticRedirects = ({
-  netlifyConfig,
-  nextConfig: { i18n, basePath },
-}: {
-  netlifyConfig: NetlifyConfig
-  nextConfig: Pick<NextConfig, 'i18n' | 'basePath'>
-}) => {
-  // Static files are in `static`
-  netlifyConfig.redirects.push({ from: `${basePath}/_next/static/*`, to: `/static/:splat`, status: 200 })
-
-  if (i18n) {
-    netlifyConfig.redirects.push({ from: `${basePath}/:locale/_next/static/*`, to: `/static/:splat`, status: 200 })
-  }
-}
-
 /**
  * Routes that match middleware need to always use the SSR function
  * This generates a rewrite for every middleware in every locale, both with and without a splat
@@ -243,8 +220,6 @@ export const generateRedirects = async ({
     join(netlifyConfig.build.publish, 'routes-manifest.json'),
   )
 
-  netlifyConfig.redirects.push(...generateHiddenPathRedirects({ basePath }))
-
   if (i18n && i18n.localeDetection !== false) {
     netlifyConfig.redirects.push(...generateLocaleRedirects({ i18n, basePath, trailingSlash }))
   }